ccjgmwz 3 years ago
parent
commit
ac284543a9

+ 42 - 42
src/views/customerFundManagement/customerFundAdd.vue

@@ -325,13 +325,13 @@ export default {
       //   })
     },
     commit() {
-      if (!this.imageUrl3) {
-        this.$message({
-          message: '请上传银行卡正面',
-          type: 'warning',
-        })
-        return
-      }
+      // if (!this.imageUrl3) {
+      //   this.$message({
+      //     message: '请上传银行卡正面',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       if (
         !this.customerList.customerName &&
         this.customerList.customerType == '个人客户'
@@ -352,41 +352,41 @@ export default {
         })
         return
       }
-      if (!this.customerList.bankCard) {
-        this.$message({
-          message: '请输入输入银行卡号',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.customerList.bankDeposit) {
-        this.$message({
-          message: '请输入开户行',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.customerList.bankDepositBranch) {
-        this.$message({
-          message: '请输入开户支行',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.customerList.customerPhone) {
-        this.$message({
-          message: '请输入手机号',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.customerList.customerPhone.length != 11) {
-        this.$message({
-          message: '输入的手机号有误,请重新输入',
-          type: 'warning',
-        })
-        return
-      }
+      // if (!this.customerList.bankCard) {
+      //   this.$message({
+      //     message: '请输入输入银行卡号',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.customerList.bankDeposit) {
+      //   this.$message({
+      //     message: '请输入开户行',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.customerList.bankDepositBranch) {
+      //   this.$message({
+      //     message: '请输入开户支行',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.customerList.customerPhone) {
+      //   this.$message({
+      //     message: '请输入手机号',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (this.customerList.customerPhone.length != 11) {
+      //   this.$message({
+      //     message: '输入的手机号有误,请重新输入',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       this.customerList.compId = localStorage.getItem('ws-pf_compId')
 
       this.$confirm('确定提交客户信息?', '提示', {

+ 2 - 2
src/views/houseSelfCollect/weightCheck.vue

@@ -12,7 +12,7 @@
     </el-row>
     <div class="substance">
       <div class="left">
-        <BalanceAlert v-if='isShowBalance' ref="weightChild" :deptBudgetList1='deptBudgetList'
+        <BalanceAlert v-if='isShowBalance' ref="weightChild" :deptBudgetList='deptBudgetList'
             :information='information' v-on:balanceListen="setVal"></BalanceAlert>
         <div class="top">
           <div class="car-type">{{carWeightInfo.type}}</div>
@@ -275,7 +275,7 @@
       this.warehouseName = this.$route.query.warehouseName
       localStorage.setItem('ck', this.warehouseName)
       this.weighingList.warehouseName = this.$route.query.warehouseName
-      // this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+      this.deptBudgetList.warehouseName = this.$route.query.warehouseName
       this.weighingList.number = this.$route.query.number
       this.weighingList.binNumber = this.$route.query.binNumber
       this.weighingList.customerNumberCard = this.$route.query.customerNumberCard

+ 2 - 2
src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -22,7 +22,7 @@
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <div class="balance-row">
-          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList1='deptBudgetList'
+          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
             :information='information' v-on:balanceListen="setVal"></BalanceAlert>
           <div class="top">
             <div class="car-type">皮重</div>
@@ -421,7 +421,7 @@
       return {
         //有没有称
         isShowBalance: false,
-        information: '',
+        information: '皮重检斤',
         deptBudgetList2: [],
         isSelectType: true,
         isGetCost: false,

+ 3 - 2
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -22,7 +22,7 @@
           <span v-show="this.$route.query.warehouseType == 2"> (临) </span>
         </h2>
         <div class="balance-row">
-          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList1='deptBudgetList'
+          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
             :information='information' v-on:balanceListen="setVal"></BalanceAlert>
           <div class="top">
             <div class="car-type">毛重</div>
@@ -397,6 +397,7 @@
             value: '3',
           },
         ],
+        information:'毛重检斤',
         readonly: true,
         typeList: ['干粮', '潮粮'],
         qualityInspectorList: [],
@@ -520,7 +521,7 @@
       this.dataList.statusFlag = this.$route.statusFlag
       this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
       console.log(this.dataList)
-      if (this.$route.query.automaticWeightAcquisition == '0') {
+      if (this.$route.query.automaticWeightAcquisition == '1') {
         this.isShowBalance = true
       }
       this.getList()

+ 1 - 1
src/views/warehouse/warehouseManagementTare.vue

@@ -21,7 +21,7 @@
           <span v-show="this.deptBudgetList.warehouseType == 2">(临)</span>
         </h2>
         <div class="balance-row">
-          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList1='deptBudgetList'
+          <BalanceAlert v-if='isShowBalance' class="left" ref="weightChild" :deptBudgetList='deptBudgetList'
             :information='information' v-on:balanceListen="setVal"></BalanceAlert>
           <div class="top">
             <div class="car-type">皮重</div>