Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0

src/views/MarketingCenter/ContractCapitalManagement/index.vue

@@ -12,7 +12,7 @@
       <span style="margin-left: 10px">销售经理</span>
       <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @clear="clear()"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageSize = 10;PageCurrent = 1;tableData2=[];getTableData()">查询收款计划</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增收款计划</el-button>
+      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增收款计划</el-button>
       <el-badge :value="value" :max="99" class="item">
         <el-button size="small" type="text" @click="AccountsReceivable">查看收款信息</el-button>
       </el-badge>
@@ -490,6 +490,7 @@ export default {
     }
     return {
       entryName2: [],
+      count1: 0,
       type: '',
       a: 1,
       b: 1,
@@ -576,7 +577,7 @@ export default {
       rules: { // 表单验证规则
         ContractNumberValue: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
         TotalContractAmount: [{ required: true, message: '请输入合同总金额', trigger: 'blur' }],
-        entryNameValue: [{ required: true, message: '请输入项目名称', trigger: 'change' }]
+        entryNameValue: [{ required: true, message: '请选择项目名称', trigger: 'change' }]
       },
       rules1: { // 表单验证规则
         ThisPayment: [
@@ -819,9 +820,11 @@ export default {
       this.peoplename = ''
     },
     searchProjectName() {
+      if (this.form2.entryNameValue !== '' && this.form2.entryNameValue !== null) {
         searchProjectName(this.form2.entryNameValue).then(response => {
           this.form2.ContractNumberValue = response.data[0].合同编号
         })
+      }
     },
     handleEdit(row) {
       this.contractTotal = parseFloat(row.合同总金额)
@@ -1025,8 +1028,14 @@ export default {
         })
       })
     },
-    ADD() {
-      this.addForm('form2')
+    ADD(formName) {
+      this.form2.entryNameValue = ''
+      this.form2.ContractNumberValue = ''
+      this.form2.TotalContractAmount = ''
+      this.count1 = this.count1 + 1
+      if (this.count1 !== 1) {
+        this.$refs[formName].resetFields()
+      }
       this.dialogFormVisible2 = true
       this.temp = 1
     },