lilei 3 лет назад
Родитель
Сommit
bd33f781f1

+ 8 - 1
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -108,7 +108,7 @@
         :disabled="spinning"
         id="expenseReimbursementAddsubmit-btn"
         size="large"
-        @click="openDepartUserModal = true"
+        @click="beforeSubmit"
         style="padding: 0 60px;">提交</a-button>
     </div>
     <!-- 费用明细 -->
@@ -277,6 +277,13 @@ export default {
         }
       })
     },
+    beforeSubmit () {
+      if (this.total) {
+        this.openDepartUserModal = true
+      } else {
+        this.$message.info('请新增费用明细')
+      }
+    },
     // 提交信息
     handleSubmit (data) {
       this.spinning = true

+ 14 - 6
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -22,6 +22,7 @@
               <dingDepartUser
                 id="departUser-approvers"
                 v-model="form.approvers"
+                @change="changeApprovers"
                 allowClear
                 placeholder="请选择审批人员"
               ></dingDepartUser>
@@ -66,12 +67,12 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        approvers: undefined, // 审批人
-        ccList: undefined // 抄送人
+        approvers: [], // 审批人
+        ccList: [] // 抄送人
       },
       rules: {
         approvers: [
-          { required: true, message: '请选择审批人', trigger: 'change' }
+          { required: true, type: 'array', message: '请选择审批人', trigger: 'change' }
         ]
         // ccList: [
         //   { required: true, message: '请选择抄送人', trigger: 'change' }
@@ -80,6 +81,10 @@ export default {
     }
   },
   methods: {
+    changeApprovers (value) {
+      this.form.approvers = value
+      this.$refs.ruleForm.clearValidate()
+    },
     // 确定
     handleSave (e) {
       e.preventDefault()
@@ -87,9 +92,12 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))
-          form.approvers = form.approvers.join(',')
-          form.ccList = form.ccList.join(',')
-          console.log(form)
+          if (form.approvers) {
+            form.approvers = form.approvers.join(',')
+          }
+          if (form.ccList) {
+            form.ccList = form.ccList.join(',')
+          }
           this.$emit('submit', form)
           this.$emit('close')
         } else {