bug修改

src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

@@ -36,7 +36,7 @@
                                   @change="handleSignedCompanyChange"></company-select>
                 </a-form-item>
               </a-col>
-              <a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: 0">
+              <a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: -2px">
                 <a-form-item label="签订联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <select-contacts placeholder="请选择签订联系人"
                                    :selected-company="selectedCompany"
@@ -331,7 +331,6 @@ export default {
       form: this.$form.createForm(this),
       confirmLoading: false,
       model: {},
-      temporaryModel: {}, // 编辑数据临时保存
       title: '',
       labelCol: {
         xs: { span: 24 },
@@ -439,6 +438,9 @@ export default {
       this.rateNum = 6 / 100
     },
     edit(id) {
+      if (!id) {
+        return
+      }
       this.title = '编辑收入合同'
       this.confirmLoading = true
       const param = {
@@ -476,7 +478,6 @@ export default {
         this.accountsReceivableNum = record.accountsReceivableAmount
         this.amountReceivedNum = record.amountReceived
         this.model = Object.assign({}, record)
-        this.temporaryModel = Object.assign({}, record)
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
           this.confirmLoading = false
@@ -535,18 +536,12 @@ export default {
       })
     },
     handleCancle() {
-      this.model = this.temporaryModel
-      // 处理联系人信息回显
-      this.isCancel = true
-      this.model.signedContactsId = this.model.signedContactsTemporaryId
-      this.selectedContact = {
-        id: this.model.signedContactsTemporaryId,
-        name: this.model.signedContactsTemporaryName
+      if (this.model.id) {
+        this.edit(this.model.id)
+      } else {
+        this.form.resetFields()
+        this.$refs.installmentForm.form.resetFields()
       }
-      this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
-        this.confirmLoading = false
-      })
     },
     installmentFormOk(value) {
       this.installmentList = value.installmentList
@@ -762,6 +757,9 @@ export default {
         case 'accountsReceivableAmount':
           callback('请输入应收金额')
           break
+        case 'noTaxAmount':
+          callback('请输入未税金额')
+          break
         case 'amountReceived':
           callback('请输入已收金额')
           break