update 标准化活动

src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue

@@ -195,6 +195,11 @@ export default {
         this.$message.warning(this.$t('businessSupport.standardizationActivity.pleaseSelectNode'))
         return
       }
+      // 只能加四级
+      if (this.selectedNode.level + '' === '3') {
+        this.$message.warning(this.$t('businessSupport.standardizationActivity.addUpToFourLevels'))
+        return
+      }
       this.$refs.modalForm.add({ pid: this.selectedNodeId, pName: this.selectedNode.name, level: this.selectedNode.level + 1 })
     },
     handleEdit () {

src/views/businessSupport/standardizationActivity/modules/ContactModal.vue

@@ -123,7 +123,7 @@ export default {
     handleOk () {
       this.form.validateFields((errors, values) => {
         if (!errors) {
-          const formData = Object.assign({}, values)
+          const formData = Object.assign(this.model, values)
           this.$emit('ok', formData)
           this.close()
         }

src/views/businessSupport/standardizationActivity/modules/GroupModal.vue

@@ -25,8 +25,9 @@
                    :label="$t('businessSupport.standardizationActivity.ourPersonnel')">
         <user-selection :placeholder="$t('pleaseSelect') + $t('businessSupport.standardizationActivity.ourPersonnel')"
                         type="radio"
-                        v-decorator="['personnel', validatorRules.personnel]"
+                        v-decorator="['personnelId', validatorRules.personnelId]"
-                        @listChange="handleUserChange" />
+                        @listChange="handleUserChange"
+                        @nameChange="handleUserNameChange" />
       </a-form-item>
       <!--工号-->
       <a-form-item :labelCol="labelCol"
@@ -54,6 +55,7 @@
         <a-input :placeholder="$t('pleaseEnter') + $t('department')"
                  @change="event => event.target.value = event.target.value.trim()"
                  :maxLength="50"
+                 disabled
                  v-decorator="['department', validatorRules.department]" />
       </a-form-item>
       <!--电话-->
@@ -63,6 +65,7 @@
         <a-input :placeholder="$t('pleaseEnter') + $t('businessSupport.standardizationActivity.phone')"
                  @change="event => event.target.value = event.target.value.trim()"
                  :maxLength="50"
+                 disabled
                  v-decorator="['phone', validatorRules.phone]" />
       </a-form-item>
       <!--邮箱-->
@@ -72,6 +75,7 @@
         <a-input :placeholder="$t('pleaseEnter') + $t('user.mailbox')"
                  @change="event => event.target.value = event.target.value.trim()"
                  :maxLength="50"
+                 disabled
                  v-decorator="['mailbox', validatorRules.mailbox]" />
       </a-form-item>
       <!--身份-->
@@ -117,8 +121,11 @@ export default {
           validateTrigger: 'blur'
         },
         // 我司人员
-        personnel: {
+        personnelId: {
-          rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('businessSupport.standardizationActivity.ourPersonnel') }],
+          rules: [{
+            required: true,
+            message: this.$t('pleaseEnter') + this.$t('businessSupport.standardizationActivity.ourPersonnel')
+          }],
           validateTrigger: 'change'
         },
         // 工号
@@ -164,7 +171,7 @@ export default {
     handleOk () {
       this.form.validateFields((errors, values) => {
         if (!errors) {
-          const formData = Object.assign({}, values)
+          const formData = Object.assign(this.model, values)
           this.$emit('ok', formData)
           this.close()
         }
@@ -182,10 +189,15 @@ export default {
       const data = list[0] || {}
       const obj = {
         jobNum: data.username, // 工号
-        mailbox: data.email // 邮箱
+        mailbox: data.email, // 邮箱
+        department: data.orgCodeTxt, // 部门
+        phone: data.phone // 电话
       }
       this.form.setFieldsValue(obj)
     },
+    handleUserNameChange (name) {
+      this.model.personnel = name
+    },
     /**
      * 校验电话
      * @param rule
@@ -221,6 +233,12 @@ export default {
         return
       }
       callback(this.$t('user.enterMailboxCorrect'))
+    },
+    handleDepartChange (departInfo) {
+      const names = departInfo.map(tt => {
+        return tt.text
+      })
+      this.model.department_dictText = names.join(',')
     }
   }
 }

src/views/businessSupport/standardizationActivity/modules/MeetingModal.vue

@@ -33,7 +33,7 @@
                    :wrapperCol="wrapperCol"
                    :label="$t('workCenter.enStandardRevision.conferee')">
         <user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.enStandardRevision.conferee')"
-                        v-decorator="['personnel', validatorRules.personnel]" />
+                        v-decorator="['personnelId', validatorRules.personnelId]" @nameChange="handleUserNameChange"/>
       </a-form-item>
     </a-form>
   </j-modal>
@@ -79,7 +79,7 @@ export default {
           validateTrigger: 'blur'
         },
         // 参会人员
-        personnel: {
+        personnelId: {
           rules: [{
             required: true,
             message: this.$t('pleaseSelect') + this.$t('workCenter.enStandardRevision.conferee')
@@ -104,7 +104,7 @@ export default {
     handleOk () {
       this.form.validateFields((errors, values) => {
         if (!errors) {
-          const formData = Object.assign({}, values)
+          const formData = Object.assign(this.model, values)
           this.$emit('ok', formData)
           this.close()
         }
@@ -117,6 +117,9 @@ export default {
       this.visible = false
       this.model = {}
       this.form.resetFields()
+    },
+    handleUserNameChange (name) {
+      this.model.personnel = name
     }
   }
 }

src/views/businessSupport/standardizationActivity/modules/PaymentModal.vue

@@ -26,7 +26,7 @@
         <j-date :placeholder="$t('pleaseSelect') + $t('businessSupport.standardizationActivity.year')"
                 show-type="year"
                 date-format="YYYY"
-                 v-decorator="['year', validatorRules.year]" />
+                v-decorator="['year', validatorRules.year]" />
       </a-form-item>
       <!--状态-->
       <a-form-item :labelCol="labelCol"
@@ -37,7 +37,8 @@
           :placeholder="$t('pleaseSelect') + $t('status')"
           :type="'select'"
           :triggerChange="false"
-          dictCode="split_status" />
+          dictCode="pay_state"
+          @change="handleStateChange" />
       </a-form-item>
       <!--计划内-->
       <a-form-item :labelCol="labelCol"
@@ -71,6 +72,8 @@
 </template>
 
 <script>
+import { PayState } from '../../../../enums/commonEnums'
+
 export default {
   name: 'PaymentModal',
   data () {
@@ -137,7 +140,7 @@ export default {
             message: this.$t('pleaseEnter') + this.$t('businessSupport.standardizationActivity.expenseReimbursement')
           }],
           validateTrigger: 'blur'
-        },
+        }
       }
     }
   },
@@ -156,7 +159,7 @@ export default {
     handleOk () {
       this.form.validateFields((errors, values) => {
         if (!errors) {
-          const formData = Object.assign({}, values)
+          const formData = Object.assign(this.model, values)
           this.$emit('ok', formData)
           this.close()
         }
@@ -169,6 +172,9 @@ export default {
       this.visible = false
       this.model = {}
       this.form.resetFields()
+    },
+    handleStateChange (value) {
+      this.model.state_dictText = PayState.nameOfIndex(value)
     }
   }
 }

src/views/businessSupport/standardizationActivity/modules/StandardizationActivityDrawer.vue

@@ -251,15 +251,13 @@ export default {
     handleOk () {
       this.form.validateFields((errors, values) => {
         if (!errors) {
-          const formData = Object.assign(this.model, values)
+          const formData = {
-          // 联络人联系方式
+            lawsStandardization: Object.assign(this.model, values), // 基础信息
-          formData.standardizationLiaisonList = this.contactDataSource
+            standardizationLiaisonList: this.contactDataSource, //联络人联系方式
-          // 集团参与情况
+            standardizationGroupList: this.groupDataSource, // 集团参与情况
-          formData.standardizationGroupList = this.groupDataSource
+            standardizationPayments: this.paymentDataSource, // 支付记录
-          // 支付记录
+            standardizationMeetings: this.meetingDataSource // 参会记录
-          formData.standardizationPayments = this.paymentDataSource
+          }
-          // 参会记录
-          formData.standardizationMeetings = this.meetingDataSource
           this.confirmLoading = true
           let submitFunc
           if (this.model.id) {

src/views/businessSupport/standardizationActivity/tables/MeetingTable.vue

@@ -17,7 +17,7 @@
       <template v-slot:file="{text, record, index}">
         <a-button type="primary"
                   class="button-text"
-                  @click="clickButtonToUpload(text, index, 'feeData')">
+                  @click="clickButtonToUpload(text, index, 'meetingData')">
           {{
             (text === 'null' || text === '' || text === null || text === undefined) ? $t('uploadFile.clickUpload') : $t('uploadFile.viewUploadedFiles')
           }}

src/views/businessSupport/standardizationActivity/tables/PaymentTable.vue

@@ -75,7 +75,7 @@ export default {
         {
           title: this.$t('status'),
           width: 150,
-          dataIndex: 'state'
+          dataIndex: 'state_dictText'
         },
         // 计划内
         {