Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -968,15 +968,16 @@ export default {
     },
     customerChange(e) {
       let customers = e.split('(')
+      this.deptBudgetList.bankCard = customers[1].split(')')[0]
       this.deptBudgetList.customerName = customers[0]
+      
       for (let i = 0; i < this.customerList1.length; i++) {
-        // console.log(this.customerList1[i].customerName, this.customerList1[i])
-        if (this.customerList1[i].customerName == this.deptBudgetList.customerName) {
+        if (this.customerList1[i].customerName == this.deptBudgetList.customerName && this.customerList1[i].bankCard == this.deptBudgetList.bankCard) {
           // console.log(this.customerList1[i])
           this.deptBudgetList.customerNumberCard = this.customerList1[i].customerNumberCard
+          this.deptBudgetList.customerPhone = this.customerList1[i].customerPhone
         }
       }
-      this.deptBudgetList.customerPhone = customers[1].split(')')[0]
     },
     waterContentChange(type) {
           //客户

src/views/profitable/cashout.vue

@@ -510,6 +510,13 @@
         }
         if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'&&this.deptBudgetList.flag!="是"){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
+            if(!this.feeDetailsDistributions[i].goodsSource){
+              this.$message({
+                message: '货源不能为空!',
+                type: 'warning',
+              })
+              return
+            }
             if(!this.feeDetailsDistributions[i].distributionMoney&&this.mode!="暂不分配"){
               this.$message({
                 message: '分配金额不能为空!',