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

src/components/balanceAlert.vue

@@ -5,7 +5,7 @@
     <div class="title" v-else>皮重</div>
     <div class="number" v-if="information.indexOf('毛重') > -1">{{grossWeightVal}} kg</div>
     <div class="number" v-else>{{tareVal}} KG</div>
-
+    
     <div class="btn" @click="sendVal">确定</div>
   </div>
 </template>
@@ -14,34 +14,28 @@
 
 export default {
   name: 'balanceAlert',
-  props: ['deptBudgetList1', 'information'],
+  props: ['deptBudgetList', 'information'],
   data () {
     return {
      param: 9600,
      grossWeightVal:'',
-     tareVal:'',
-     deptBudgetList:this.deptBudgetList1
+     tareVal:''
     }
   },
   activated(){
-
+   
   },
   mounted(){
  console.log('11111111111111111111111111111111111')
-    console.log(this.deptBudgetList1)
+    console.log(this.deptBudgetList)
     this.openPort()
   },
   computed: {
-
+    
   },
   created () {
-
+    
   },
-   watch: {
-      deptBudgetList1: function (deptBudgetList1) {debugger
-        this.deptBudgetList = deptBudgetList1
-      }
-    },
   methods: {
     sendVal(){
       console.log(this.grossWeightVal)
@@ -51,7 +45,7 @@ export default {
       }else{
         this.$emit('balanceListen',this.tareVal)
       }
-
+      
     },
    async closePort() {
       console.log('closePort')
@@ -78,7 +72,7 @@ export default {
           }
         // 监听来自串行设备的数据
         while (true) {
-
+          
           const { value, done } = await this.reader.read()
           // console.log("value",value);
           if (done) {
@@ -111,7 +105,6 @@ export default {
           //   }
           // }
           console.log('value:', value)
-          debugger
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
@@ -120,7 +113,7 @@ export default {
               this.deptBudgetList.warehouseName == '哈尔滨依兰库'||
               this.deptBudgetList.warehouseName == '龙江金信库')
           ) {
-
+            
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -167,7 +160,7 @@ export default {
             if(value.length > 10){
                for (var i = 0; i < value.length; i++) {
                   var tmp = String.fromCharCode(value[i])
-
+                  
                   // if (value[0] != 49 && value[0] != 2) {
                   //   // if (
                   //   //   value[value.length - 1] == 48 &&
@@ -193,19 +186,19 @@ export default {
                   if (
                     flag &&
                     result.length < 7 &&
-                    tmp != String.fromCharCode(32)
+                    tmp != String.fromCharCode(32) 
                     // &&
                     // !(
                     //   value[value.length - 1] == 48 && value[value.length - 2] == 48
                     // )
                   ) {
-                    if(i > 0&& value[i] == 48&& value[i-1] == 32){
+                    if(i > 0&& value[i] == 48&& value[i-1] == 32 && result){
                       break
                     }
                     else{
                       result += tmp
                     }
-
+                    
                   }
                   // if (flag1 && tmp != String.fromCharCode(32)) {
                   //   // if (
@@ -222,7 +215,7 @@ export default {
                   // }
                 }
             }
-
+            
             if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
                 this.grossWeightVal = parseInt(

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('确定提交客户信息？', '提示', {

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

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,

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()

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>

src/views/workNotification/utils/index.js

@@ -2,6 +2,7 @@ import HandleType from '../types/handleType'
 
 // 根据业务类型和业务码获取对应url
 export function code2Url (type, code, state) {
+  console.log(type,code)
   switch (type) {
     // 判断 出入库
     case 'INOUTTASK':
@@ -23,13 +24,24 @@ export function code2Url (type, code, state) {
       return payment(code, state)
     case 'TRADE':
       return warehouseReceiptRegulation(code, state)
-      case 'ROLE':
+    case 'ROLE':
       return stock(code, state)
+    case 'TRANSPORTATION':
+      return trantask(code,state)
     default:
       return ''
   }
 }
-
+// 运输任务
+export function trantask(code, state){
+  let url = ''
+  switch (code) {
+    case 'TRANSPORTATION-SETTLEMENT-REPORT':
+      url = 'applicationDetail'
+      break
+  }
+  return url
+}
 export function checkNavigation (code, state) {
   // 航海
   let url = ''