Merge remote-tracking branch 'origin/24年2月变更' into 24年2月变更

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -204,7 +204,7 @@
                     <a-input
                       @change="event => event.target.value = event.target.value.trim()"
                       :maxLength="50"
-                      v-decorator="['standardProjectList['+index+'].standardNumber', validatorRules.standProjectStandardNumber]"
+                      v-decorator="['standardProjectList['+index+'].standardNo', validatorRules.standProjectStandardNumber]"
                       placeholder="请输入标准编号"></a-input>
                   </a-form-item>
                 </a-col>
@@ -220,7 +220,8 @@
                 <a-col :xxl="8" :xl="10"  :sm="24">
                   <a-form-item label="标准类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <j-dict-select-tag
-                      dict-code=""
+                      dict-code="standard_type"
+                      :triggerChange="true"
                       v-decorator="['standardProjectList['+index+'].standardType',validatorRules.standProjectStandardType]"
                       placeholder="请输入标准类别"></j-dict-select-tag>
                   </a-form-item>
@@ -228,15 +229,16 @@
                 <a-col :xxl="8" :xl="10"  :sm="24">
                   <a-form-item label="制修订" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <j-dict-select-tag
-                      dict-code=""
-                      v-decorator="['standardProjectList['+index+'].edit', validatorRules.standProjectEdit]"
+                      dict-code="preparation_and_revision"
+                      :triggerChange="true"
+                      v-decorator="['standardProjectList['+index+'].preparationAndRevision', validatorRules.standProjectEdit]"
                       placeholder="请输入制修订"></j-dict-select-tag>
                   </a-form-item>
                 </a-col>
                 <a-col :xxl="8" :xl="10"  :sm="24">
                   <a-form-item label="宣贯人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <select-principal placeholder="请选择宣贯人"
-                                      v-decorator="['standardProjectList['+index+'].propagator', validatorRules.standProjectPropagator]">
+                                      v-decorator="['standardProjectList['+index+'].promoter', validatorRules.standProjectPropagator]">
                     </select-principal>
                   </a-form-item>
                 </a-col>
@@ -246,7 +248,7 @@
                                    placeholder="请选择宣贯时间"
                                    format="YYYY-MM-DD"
                                    valueFormat="YYYY-MM-DD"
-                                   v-decorator="['standardProjectList['+index+'].promulgationTime', validatorRules.standProjectPromulgationTime]">
+                                   v-decorator="['standardProjectList['+index+'].promotionTime', validatorRules.standProjectPromulgationTime]">
                     </a-date-picker>
                   </a-form-item>
                 </a-col>
@@ -255,7 +257,7 @@
                     <a-input
                       @change="event => event.target.value = event.target.value.trim()"
                       :maxLength="50"
-                      v-decorator="['standardProjectList['+index+'].promotionPlace',validatorRules.standProjectPromotionPlace]"
+                      v-decorator="['standardProjectList['+index+'].promotionLocation',validatorRules.standProjectPromotionPlace]"
                       placeholder="请输入宣贯地点"></a-input>
                   </a-form-item>
                 </a-col>
@@ -860,13 +862,13 @@ export default {
         if((this.model.standardProjectList || []).length === 0) {
           // 标准项目列表
           this.model.standardProjectList = [{
-            standardNumber: undefined,
+            standardNo: undefined,
             standardName: undefined,
             standardType: undefined,
-            edit: undefined,
-            propagator: undefined,
-            promulgationTime: undefined,
-            promotionPlace: undefined
+            preparationAndRevision: undefined,
+            promoter: undefined,
+            promotionTime: undefined,
+            promotionLocation: undefined
           }]
         }
         this.model.isAddQuestion = this.model.isAddQuestion || 0 // 处理历史数据的问题
@@ -892,13 +894,13 @@ export default {
         }]
         // 标准项目列表
         this.model.standardProjectList = [{
-          standardNumber: undefined,
+          standardNo: undefined,
           standardName: undefined,
           standardType: undefined,
-          edit: undefined,
-          propagator: undefined,
-          promulgationTime: undefined,
-          promotionPlace: undefined
+          preparationAndRevision: undefined,
+          promoter: undefined,
+          promotionTime: undefined,
+          promotionLocation: undefined
         }]
         // 新增取路由参数
         this.meetingType = this.$route.query.meetingType
@@ -950,10 +952,12 @@ export default {
               this.tbMeetingType = Number(this.model.tbMeetingType)
               // 标准宣贯或者学习培训
               this.$refs.standardMeetingType.setCurrentDictOptions(arr.splice(0, 2))
+              otherKeys.push('standardProjectList')
             }
           }
           setTimeout(() => {
-            this.form.setFieldsValue(pick(this.model, 'signInTime', 'tbMeetingType', 'meetingCostsVip', 'isAddQuestion', 'standardProjectList', ...otherKeys))
+            console.log('------------otherKeys', otherKeys)
+            this.form.setFieldsValue(pick(this.model, 'signInTime', 'tbMeetingType', 'meetingCostsVip', 'isAddQuestion', ...otherKeys))
           })
         }
         // 如果是工作组会议 赋值工作组
@@ -1545,13 +1549,13 @@ export default {
     addStandardProject(index) {
       const {form} = this
       const obj = {
-        standardNumber: undefined,
+        standardNo: undefined,
         standardName: undefined,
         standardType: undefined,
-        edit: undefined,
-        propagator: undefined,
-        promulgationTime: undefined,
-        promotionPlace: undefined
+        preparationAndRevision: undefined,
+        promoter: undefined,
+        promotionTime: undefined,
+        promotionLocation: undefined
       }
       const keys = form.getFieldValue('standardProjectList')
       // 增加数据后重新赋值