chitanda 发布系统代码

app_CRM/src/components/app-picker/app-picker.vue

@@ -134,7 +134,7 @@ export default class AppPicker extends Vue {
      * @type {string}
      * @memberof AppPicker
      */
-    @Prop() public editortype?: string;
+    @Prop({ default: '' }) public editortype?: string;
 
     /**
      * 视图参数（如：视图name，title，width，height）
@@ -176,6 +176,14 @@ export default class AppPicker extends Vue {
      */
     @Prop() public valueitem!: string;
 
+    /**
+     * 编辑器额外填充参数
+     *
+     * @type {string}
+     * @memberof AppPicker
+     */
+    @Prop() public extraFillParams?: any;
+
     /**
      * 值
      *
@@ -358,6 +366,16 @@ export default class AppPicker extends Vue {
      */
     public onACSelect(item: any): void {
         this.selectValue = item[this.deMajorField];
+        if (isExist(this.extraFillParams)) {
+            for (const key in this.extraFillParams) {
+                if (this.extraFillParams.hasOwnProperty(key)) {
+                    const self = this.extraFillParams[key];
+                    if (isExist(item[self.key])) {
+                        this.$emit('formitemvaluechange', { name: self.value, value: item[self.key]});
+                    }
+                }
+            }
+        }
         if (this.valueitem) {
             this.$emit('formitemvaluechange', { name: this.valueitem, value: item[this.deKeyField] });
         }
@@ -391,6 +409,14 @@ export default class AppPicker extends Vue {
      * 清除
      */
     public onClear($event: any): void {
+        if (isExist(this.extraFillParams)) {
+                for (const key in this.extraFillParams) {
+                    if (this.extraFillParams.hasOwnProperty(key)) {
+                        const self = this.extraFillParams[key];
+                        this.$emit('formitemvaluechange', { name: self.value, value: ''});
+                    }
+                }
+            }
         if (this.valueitem) {
             this.$emit('formitemvaluechange', { name: this.valueitem, value: '' });
         }
@@ -631,13 +657,22 @@ export default class AppPicker extends Vue {
         if (result.datas && Array.isArray(result.datas)) {
             Object.assign(item, result.datas[0]);
         }
-
         if (this.data) {
+            if (isExist(this.extraFillParams)) {
+                for (const key in this.extraFillParams) {
+                    if (this.extraFillParams.hasOwnProperty(key)) {
+                        const self = this.extraFillParams[key];
+                        if (isExist(item[self.key])) {
+                            this.$emit('formitemvaluechange', { name: self.value, value: item[self.key]});
+                        }
+                    }
+                }
+            }
             if (this.valueitem) {
-                this.$emit('formitemvaluechange', { name: this.valueitem, value: item[this.deKeyField]?item[this.deKeyField]:item["srfkey"] });
+                this.$emit('formitemvaluechange', { name: this.valueitem, value: item[this.deKeyField] ? item[this.deKeyField] : item["srfkey"] });
             }
             if (this.name) {
-                this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField]?item[this.deMajorField]:item["srfmajortext"] });
+                this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField] ? item[this.deMajorField] : item["srfmajortext"] });
             }
         }
     }
@@ -740,7 +775,6 @@ export default class AppPicker extends Vue {
         }
     }
 
-
 }
 </script>
 <style lang="less">

app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html

@@ -57,7 +57,7 @@
   valueitem='customerid' 
   :value="data.customername"
   :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], height: 800, placement:'' }"
-  :extraFillParams="[{ key: 'type', value: 'type2' }, { key: 'name', value: 'name2' }]"
+  :extraFillParams="[{ key: 'customertype', value: 'customertype' }]"
   style=""  
   @formitemvaluechange="onFormItemValueChange($event)">
 </app-picker>

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -4769,7 +4769,7 @@
 
 
     <!--输出实体[INCIDENT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-97-59">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-98-59">
         <createTable tableName="INCIDENT">
                 <column name="LASTONHOLDTIME" remarks="" type="DATETIME">
                 </column>
@@ -11357,43 +11357,43 @@
        <addForeignKeyConstraint baseColumnNames="RESOURCESPECID" baseTableName="SERVICE" constraintName="DER1N_SERVICE__RESOURCESPEC__R" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="RESOURCESPECID" referencedTableName="RESOURCESPEC" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-260">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__PRIMA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-261">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-261">
        <addForeignKeyConstraint baseColumnNames="RESPONSIBLECONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__RESPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-262">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-262">
        <addForeignKeyConstraint baseColumnNames="CONTRACTDETAILID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACTDETAIL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTDETAILID" referencedTableName="CONTRACTDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-263">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-263">
        <addForeignKeyConstraint baseColumnNames="CONTRACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACT__CONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTID" referencedTableName="CONTRACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-264">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-264">
        <addForeignKeyConstraint baseColumnNames="ENTITLEMENTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__ENTITLEMENT__E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ENTITLEMENTID" referencedTableName="ENTITLEMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-265">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-265">
        <addForeignKeyConstraint baseColumnNames="EXISTINGCASE" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__EXIS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-266">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-266">
        <addForeignKeyConstraint baseColumnNames="MASTERID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__MAST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-267">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-267">
        <addForeignKeyConstraint baseColumnNames="PARENTCASEID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__PARE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-268">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-268">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__PRODUCT__PRODU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-269">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-269">
        <addForeignKeyConstraint baseColumnNames="FIRSTRESPONSEBYKPIID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLAKPIINSTANCE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAKPIINSTANCEID" referencedTableName="SLAKPIINSTANCE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-271">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-271">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-272">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-272">
        <addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SUBJECT__SUBJE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-97-273">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-98-273">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__TRANSACTIONCUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENTCUSTOMER]外键关系 -->