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

# Conflicts:
#	src/layout/index/top/index.vue

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(){debugger
+  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/layout/index/top/index.vue

@@ -51,7 +51,7 @@
       </div>
       <div class="compName-row">
         <!-- <span class="compName">{{compName}}</span> -->
-        <el-select @change='compNameChange' v-model="compName" placeholder="请选择">
+        <el-select style='width:260px;' @change='compNameChange' v-model="compName" placeholder="请选择">
         <el-option
           v-for="item in compNameoptions"
           :key="item"
@@ -176,7 +176,10 @@
     changePasswordByPwd,
     getcomp
   } from '@/model/indexRx'
+  import { fastLogin, logout, login,complogin, getRoule, getCurrentUserInfo, companyInfo, isLandBased, getAccountLoginHistoryCount, updateShowInfo }
+  from '@/model/indexRx'
   import Cookies from 'js-cookie'
+  import { setToken, getCompanyId, clearStorage } from '@/utils/auth'
   import {
     mapActions,
     mapGetters,
@@ -186,6 +189,10 @@
     fullscreenToggel,
     listenfullscreen
   } from '@/utils/util'
+  import {
+  getTenantInfoByUser,
+} from '@/model/signIn/index'
+  import notification from '../../../notification'
   import topMenu from './top-menu'
   import topSearch from './top-search'
   import topTheme from './top-theme'
@@ -373,9 +380,9 @@
     },
     methods: {
       ...mapActions('common', ['setLocalVessels']),
-      ...mapActions('user', ['complogin', 'fastLogin']),
+      ...mapActions('user', ['getUserInfo','toSetShow']),
       payCode() {
-        console.log("input", this.barCode)
+        console.log('input', this.barCode)
         this.btnStatus = {
           status1: false,
           status2: false,
@@ -386,13 +393,13 @@
         }
         // let _userCompId = "2710b21efc1e4393930c5dc800010dc4"
         // let _qualityNo = "SGRK202112140060003"
-         
+         debugger
         let _userCompId = this.barCode.split('&')[0]
         let _qualityNo = this.barCode.split('&')[1]
         let _userHouseId = this.barCode.split('&')[2]
         this.cangid = this.barCode.split('&')[2]
-        if(_userCompId.indexOf(",") != -1){
-         _userCompId =  _userCompId.split(",")[1]
+        if(_userCompId.indexOf(',') != -1){
+         _userCompId =  _userCompId.split(',')[1]
         }
         this.tmp = {
           compId: _userCompId,
@@ -411,13 +418,119 @@
         
       },
       compNameChange(){
-        this.complogin({username:this.UserInfo.loginInfo.userMobilePhone,
+      //   this.complogin({username:this.UserInfo.loginInfo.userMobilePhone,
+      // password: localStorage.getItem('ws-pf_pass'),
+      // companyName: this.compName})
+      var userInfo={
+        username:this.UserInfo.loginInfo.userMobilePhone,
       password: localStorage.getItem('ws-pf_pass'),
-      companyName: this.compName})
-      console.log(localStorage.getItem('status'))
-      if(localStorage.getItem('status')==1){
-        this.compName=localStorage.getItem('ws-pf_compName')
+      companyName: this.compName
       }
+      // var status=0
+      const redirect = this.$route.query.redirect
+    const { username, password, domainName, companyName } = userInfo
+      complogin({
+        username: username.trim(),
+        password: password,
+        domainName: domainName,
+        companyName: companyName
+      }).toPromise().then((res)=>{
+        if(res.data.code=='AUTH_001'){
+          Message({showClose: true,
+            message: '公司不可切换',
+            type: 'error'
+          });
+          this.compName=localStorage.getItem('ws-pf_compName')
+          localStorage.setItem('status', 1)
+        }else{
+          const { compId,
+            tenantId,
+            vesselId,
+            vesselBankFlag,
+            clientFag,
+            userId
+          } = res.data.data
+          // {TYPE='' MESSAGE} [第一次,失效].indexOf(type){type,msg,到期时间}
+          // EventBus.$emit('success', '登录成功')
+          localStorage.setItem('ws-pf_compId', compId)
+          localStorage.setItem('status', 2)
+          localStorage.setItem('ws-pf_userId', userId)
+          localStorage.setItem('ws-pf_tenantId', tenantId)
+          localStorage.setItem('ws-pf_vesselId', vesselId) // 仅适用于一条船
+          localStorage.setItem('ws-pf_vesselBankFlag', vesselBankFlag) // 当前登录人是船端还是岸端的人员
+          localStorage.setItem('ws-pf_clientFag', clientFag)
+          notification.setSessionId(userId) // 设置通知唯一标识
+          notification.start() // 开始监听通知
+          // 查询当前租户服务类型
+          isLandBased().toPromise().then(response => {
+            localStorage.setItem('ws-pf_serviceTypeFlag', response)
+          })
+        companyInfo({ compId: compId }).toPromise().then((res1)=>{
+            localStorage.setItem('ws-pf_organMonetaryKey', res1.organizationMonetaryKey)
+            localStorage.setItem('ws-pf_compName', res1.compName)
+            localStorage.setItem('ws-pf_compDomainName', res1.compDomainName)
+            localStorage.setItem('ws-pf_organMonetaryValue', res1.organizationMonetaryValue)
+           this.getUserInfo({ vesselBankFlag, compName:res1.compName })
+          })
+          
+          
+          this.toSetShow( userId)
+          setToken('Admin-Token')
+          localStorage.setItem('ws_login_type', 2)
+            Cookies.set('ws_login_companyShortName', companyName, {
+              expires: 365,
+            })
+            Cookies.set('ws_login_account', username, {
+              expires: 365,
+            })
+            console.log(username, password, domainName, companyName)
+            var rememberMe = Cookies.get('ws_login_rememberMe') === '1'
+            if (rememberMe) {
+              Cookies.set('ws_login_pwd', password, {
+                expires: 365,
+              })
+              Cookies.set('ws_login_rememberMe', 1, {
+                expires: 365
+              })
+            } else {
+              Cookies.remove('ws_login_companyShortName')
+              Cookies.remove('ws_login_account')
+              Cookies.remove('ws_login_pwd')
+              Cookies.set('ws_login_rememberMe', 0, {
+                expires: 365
+              })
+            }
+            console.log(redirect)
+            
+            if (redirect) {
+              this.$router.push(redirect)
+            } else {
+              this.$router.push('/')
+            }
+              let newList = {
+                companyName: companyName,
+                username: username,
+                password: password,
+              }
+              getTenantInfoByUser(newList).toPromise().then((res2)=>{
+                console.log(res2)
+                localStorage.setItem(
+                'ws_login_getTenantInfoByUser',
+                JSON.stringify({
+                  ...res2,
+                  loginInfo: res.data.data
+                }))
+                this.$router.go(0)
+              })
+           
+            localStorage.setItem(
+              'ws_login_accountId',
+              JSON.stringify(res.data.data.accountId)
+            )
+            
+        }
+      })
+      console.log(localStorage.getItem('status'))
           // } else {
           //   this.$message.error("您输入的用户名或密码错误!")
           //   return false
@@ -447,6 +560,7 @@
       },
       // 二维码获取数据
       async getQRCodeData(tmp) {
+        debugger
         await getQRCodeData(tmp)
           .toPromise()
           .then((response) => { 
@@ -483,12 +597,12 @@
         this.$refs['hiddenFocus'].focus()
       },
       focus() {
-        console.log("当前焦点状态")
-         this.barCode = ''
+        console.log('当前焦点状态')
+        this.barCode = ''
         this.isOpenCodeGun = true
       },
       blur() {
-        console.log("当前已失去焦点状态")
+        console.log('当前已失去焦点状态')
         this.isOpenCodeGun = false
       },
       goToPage(type) {debugger

src/store/modules/user.js

@@ -134,104 +134,10 @@ const actions = {
     return data
   },
   
-  async complogin({ commit, dispatch }, userInfo) {
-    var status=0
-    const { username, password, domainName, companyName } = userInfo
-      complogin({
-        username: username.trim(),
-        password: password,
-        domainName: domainName,
-        companyName: companyName
-      }).toPromise().then((res)=>{
-        console.log(res)
-        if(res.data.code=='AUTH_001'){
-          Message({showClose: true,
-            message: '公司不可切换',
-            type: 'error'
-          });
-          localStorage.setItem('status', 1)
-        }else{
-          const { compId,
-            tenantId,
-            vesselId,
-            vesselBankFlag,
-            clientFag,
-            userId
-          } = res.data.data
-          // {TYPE='' MESSAGE} [第一次,失效].indexOf(type){type,msg,到期时间}
-          // EventBus.$emit('success', '登录成功')
-          localStorage.setItem('ws-pf_compId', compId)
-          localStorage.setItem('status', 2)
-          localStorage.setItem('ws-pf_userId', userId)
-          localStorage.setItem('ws-pf_tenantId', tenantId)
-          localStorage.setItem('ws-pf_vesselId', vesselId) // 仅适用于一条船
-          localStorage.setItem('ws-pf_vesselBankFlag', vesselBankFlag) // 当前登录人是船端还是岸端的人员
-          localStorage.setItem('ws-pf_clientFag', clientFag)
-          notification.setSessionId(userId) // 设置通知唯一标识
-          notification.start() // 开始监听通知
-          // 查询当前租户服务类型
-          isLandBased().toPromise().then(response => {
-            localStorage.setItem('ws-pf_serviceTypeFlag', response)
-          })
-        companyInfo({ compId: compId }).toPromise().then((res1)=>{
-            localStorage.setItem('ws-pf_organMonetaryKey', res1.organizationMonetaryKey)
-            localStorage.setItem('ws-pf_compName', res1.compName)
-            localStorage.setItem('ws-pf_compDomainName', res1.compDomainName)
-            localStorage.setItem('ws-pf_organMonetaryValue', res1.organizationMonetaryValue)
-            dispatch('getUserInfo', { vesselBankFlag, compName:res1.compName })
-          })
-          
-          
-          dispatch('toSetShow', userId)
-          setToken('Admin-Token')
-          localStorage.setItem('ws_login_type', 2)
-            Cookies.set('ws_login_companyShortName', companyName, {
-              expires: 365,
-            })
-            Cookies.set('ws_login_account', username, {
-              expires: 365,
-            })
-            console.log(username, password, domainName, companyName)
-            var rememberMe = Cookies.get('ws_login_rememberMe') === '1'
-            if (rememberMe) {
-              Cookies.set('ws_login_pwd', password, {
-                expires: 365,
-              })
-              Cookies.set('ws_login_rememberMe', 1, {
-                expires: 365
-              })
-            } else {
-              Cookies.remove('ws_login_companyShortName')
-              Cookies.remove('ws_login_account')
-              Cookies.remove('ws_login_pwd')
-              Cookies.set('ws_login_rememberMe', 0, {
-                expires: 365
-              })
-            }
-              let newList = {
-                companyName: companyName,
-                username: username,
-                password: password,
-              }
-              getTenantInfoByUser(newList).toPromise().then((res2)=>{
-                console.log(res2)
-                localStorage.setItem(
-                'ws_login_getTenantInfoByUser',
-                JSON.stringify({
-                  ...res2,
-                  loginInfo: res.data.data
-                }))
-              })
-           
-            localStorage.setItem(
-              'ws_login_accountId',
-              JSON.stringify(res.data.data.accountId)
-            )
-        }
-        status=2
-      })
+  // async complogin({ commit, dispatch }, userInfo) {
+    
       
-  },
+  // },
   async fastLogin({ dispatch }, userInfo) {
     const { mobilePhone, veriCode } = userInfo
     const data = await fastLogin({

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/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -9,7 +9,7 @@
         </ws-button>
       </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
+        <span style="width: 98px; display: inline-block; color: #8890b1">状态：</span>
         <ws-select v-model="searchTypeText" placeholder class="typeselect" @change="selecttaskType" :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
@@ -503,7 +503,7 @@
   }
 
   .findValue {
-    width: 0%;
+    // width: 0%;
     margin-left: 25%;
   }
 

src/views/warehouse/warehouseManagementGross.vue

@@ -480,6 +480,7 @@
                     :value="item.carNo"
                   />
                 </el-select>
+              <span style='padding-left:10px;'>发货重量（吨）：{{deptBudgetList.loadNetWeight}}</span>  
               </ws-form-item>
               <!--船名  -->
               <ws-form-item
@@ -610,7 +611,6 @@
                   size="small"
                 />
               </ws-form-item>
-
               <!-- onkeyup="value=value.replace(/[^\A-\Z0-9\u4E00-\u9FA5\.]/g,'')" -->
             </ws-info-table>
           </div>
@@ -1068,6 +1068,9 @@ export default {
           this.deptBudgetList.freight = Math.round(
             this.tranCarInfoList[i].tranPrice
           )
+          if(this.deptBudgetList.inOutType=='移库入库'){
+            this.deptBudgetList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
+          }
         }
       }
     },
@@ -2266,6 +2269,7 @@ export default {
         console.log(this.deptBudgetList1[i])
         if (this.deptBudgetList1[i].inOutTaskNo == e) {
           var data = this.deptBudgetList1[i]
+          
           if (this.deptBudgetList1[i].contractNo) {
             this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
           } else {
@@ -2277,6 +2281,7 @@ export default {
         if (
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
         ) {
+          console.log(this.outContractNo[i])
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           this.deptBudgetList.grade = this.outContractNo[i].grade

src/views/warehouse/warehouseManagementList.vue

@@ -228,7 +228,7 @@
             </el-form-item>
             <!--仓库名称-->
             <el-form-item label="仓库名称" span="1" prop="warehouseName">
-              <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称">
+              <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable  clearable>
                 <el-option v-for="item in packtypeList" :key="item.constKey" :label="item.warehouseName"
                   :value="item.warehouseName" />
               </el-select>

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()
@@ -861,20 +862,20 @@
           })
           return
         }
-        if (!this.dataList.carNo) {
-          this.$message({
-            message: '车牌号不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.dataList.carNo.length > 7) {
-          this.$message({
-            message: '车牌号输入错误,请输入7个字符之内',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.dataList.carNo) {
+        //   this.$message({
+        //     message: '车牌号不能为空',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (this.dataList.carNo.length > 7) {
+        //   this.$message({
+        //     message: '车牌号输入错误,请输入7个字符之内',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (this.dataList.boxNo && this.dataList.boxNo.length > 20) {
           this.$message({
             message: '箱号-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>
@@ -718,13 +718,13 @@
           })
           return
         }
-        if (this.deptBudgetList.carNo.length > 7) {
-          this.$message({
-            message: '车牌号输入错误,请输入7个字符之内',
-            type: 'warning',
-          })
-          return
-        }
+        // if (this.deptBudgetList.carNo.length > 7) {
+        //   this.$message({
+        //     message: '车牌号输入错误,请输入7个字符之内',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',

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 = ''