前端

public/static/print.html

@@ -44,7 +44,7 @@
           <div class="name">{{name}}价格对照表（按水分）</div>
           <div class="price">价格单位：元/公斤</div>
         </div>
-         <el-table :data="tableData" style="width: 600px" :row-class-name="tableRowClassName">
+         <el-table :data="tableData" style="width: 600px" :row-class-name="tableRowClassName" :row-style="{height:'45px'}">
            <el-table-column prop="waterMin" label="水分下限(%)">
            </el-table-column>
            <el-table-column prop="waterMax" label="水分上限(%)">

src/styles/media.scss

@@ -66,7 +66,7 @@
   padding: 0;
   // padding-bottom: 20px;
   width: calc(100% - 200px);
-  height: calc(100% - 50px);
+  // height: calc(100% - 50px);
   box-sizing: border-box;
   overflow: hidden;
   .el-tabs__item {

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -78,7 +78,6 @@
     purchasePriceLook,
     purchasePriceDel
   } from '@/model/houseSelfCollect/index'
-  import acquisitionManagementAdd from './acquisitionManagementAdd.vue'
   import {
     getHp
   } from '@/utils/getHasPermission'
@@ -268,7 +267,7 @@
           // this.tableData = response.records
           // this.getList()
           localStorage.setItem('pricePrintList', JSON.stringify(response.detailPrints));
-          window.open( "../../../static/print.html?name=" + row.goodsName)
+          window.open( '../../../static/print.html?name=' + row.goodsName)
         })
       },
       validate() {

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -353,7 +353,7 @@
           this.getData()
           break;
         case '审核中':
-          // this.isEdit = false;
+          this.isEdit = true;
           this.submitName = '通过'
           this.getData()
           break;
@@ -381,6 +381,10 @@
           this.makeLookPriceList()
           if(this.$route.query.type != '新增'){
                let _data = this.priceList
+              this.checkList1 = []
+              this.checkList2 = []
+              this.checkList3 = []
+              this.checkList4 = []
               for (let i = 0; i < _data.length; i++) {
                 if (i == 0) this.checkList1 = _data[i].checkList
                 if (i == 1) this.checkList2 = _data[i].checkList
@@ -484,6 +488,11 @@
       // 复选框变化监听
       changeLevel(val, index) {
         let _data = this.priceList
+        
+        this.checkList1 = []
+        this.checkList2 = []
+        this.checkList3 = []
+        this.checkList4 = []
         for (let i = 0; i < _data.length; i++) {
           let _childData = _data[i].checkList
           for (let k = 0; k < _childData.length; k++) {
@@ -737,7 +746,7 @@
           if (_baseWaterValidate(100, 100000, '', '', 'saleLimit', parseFloat(this.baseInfoForm.saleLimit))) {
             that.$message.error('销售上限输入错误!');
           } else {
-            this.$message.error('销售上限不能为空！');
+            that.$message.error('销售上限不能为空！');
           }
           return false
         }
@@ -750,7 +759,7 @@
           if (_item.basicUnitPrice == '' || _baseWaterValidate(0, 50, 2, '', 'deductWeight', parseFloat(_item
               .basicUnitPrice))) {
             if (_item.basicUnitPrice == '') {
-              this.$message.error('基准单价不能为空！');
+              that.$message.error('基准单价不能为空！');
             } else {
               that.$message.error('基准单价输入错误,0-50数字最多保留两位小数！');
             }
@@ -760,13 +769,14 @@
             this.$message.error('等级不能为空！');
             return false
           }
+          var arr = []
           for (let j = 0; j < _item.detailList.length; j++) {
             let _item1 = _item.detailList[j]
             if (_item1.type == 4) {
               if (_item1.jfprice == '' || _baseWaterValidate(0, 100, 3, '', 'deductWeight', parseFloat(_item1
                   .jfprice))) {
                 if (_item1.jfprice == '') {
-                  this.$message.error('降幅价格不能为空！');
+                  that.$message.error('降幅价格不能为空！');
                 } else {
                   that.$message.error('降幅输入错误！');
                 }
@@ -775,14 +785,19 @@
             } else {
               if (_item1.water == '' || _baseWaterValidate(0, 100, 1, 0.5, 'waterBase', parseFloat(_item1.water))) {
                 if (_item1.water == '') {
-                  this.$message.error('分界水分不能为空！')
+                  that.$message.error('分界水分不能为空！')
                 } else {
                   that.$message.error('分界值输入错误！');
                 }
                 return false
               }
+              arr.push(_item1.water)
             }
           }
+          if(!this.isIncrease(arr,arr.length)){
+            that.$message.error('水分大小排序错误！');
+            return false
+          }
         }
         return true
       },
@@ -797,6 +812,12 @@
         this.checkList = [...new Set(_list)];
         console.log(this.checkList)
       },
+      isIncrease(arr,len){
+        if(len == 1){
+          return true
+        }
+        return (arr[len - 2] <= arr[len - 1]) && this.isIncrease(arr,len - 1)
+      },
       // 提交
       submit() {
           let isValidate = false
@@ -960,22 +981,21 @@
 
             //获取基准在x轴索引
 
-              let index = function(){
-              for(let index=0;index<_priceList[i].detailList.length;index++){
-                        if(_priceList[i].detailList[index].water==that.baseInfoForm.waterBase){
-                          return index
-                }
-              }
-           } 
-           console.log(index())
-          for (let j = index(); j > 0; j--) {
+          let index = 0
+          for(;index<_priceList[i].detailList.length;index++){
+              if(_priceList[i].detailList[index].water==that.baseInfoForm.waterBase){
+                break
+            }
+          }
+           console.log(index)
+          for (let j = index; j >= 0; j--) {
               if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
                 if (_priceList[i].detailList[j].type != 1) {
                   let baseprice = ''
-                  if (j == index()) {
+                  if (j == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
-                    baseprice = parseFloat(_priceList[i].basicUnitPrice + (parseFloat(_priceList[i].detailList[j + 2]
+                    baseprice = parseFloat(parseFloat(_priceList[i].basicUnitPrice) + (parseFloat(_priceList[i].detailList[j + 2]
                       .water) - parseFloat(_priceList[i].detailList[j].water)) / 0.1 * parseFloat(_priceList[i]
                       .detailList[j + 1].jfprice))
                   }
@@ -993,7 +1013,6 @@
                 }
               }
             }
-
             // for (let j = (_priceList[i].detailList.length + 1) / 2 - 1; j > 0; j--) {
             //   if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
             //     if (_priceList[i].detailList[j].type != 1) {
@@ -1021,14 +1040,14 @@
             // }
             this.left.push(_leftObj)
             console.log('this.left', this.left)
-                  for (let k = index(); k <= _priceList[i].detailList.length; k++) {
+                  for (let k = index; k <= _priceList[i].detailList.length; k++) {
               if (_priceList[i].detailList[k] && _priceList[i].detailList[k].type != 4) {
                 if (_priceList[i].detailList[k].type != 3) {
                   let baseprice = ''
-                  if (k == index()) {
+                  if (k == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
-                    baseprice = parseFloat(_priceList[i].basicUnitPrice - (parseFloat(_priceList[i].detailList[k]
+                    baseprice = parseFloat(parseFloat(_priceList[i].basicUnitPrice) - (parseFloat(_priceList[i].detailList[k]
                       .water) - parseFloat(_priceList[i].detailList[k - 2].water)) / 0.1 * parseFloat(_priceList[i]
                       .detailList[k - 1].jfprice))
                   }
@@ -1103,7 +1122,7 @@
           let tmp = ''
           for (let k = 0; k < _list.length; k++) {
             if (_waterMax >= _list[k].priceEnd && _waterMax < _list[k].priceStart) {
-              tmp = parseFloat(_list[k].baseprice + _list[k].jfprice * ((_list[k].priceStart - (_waterMax )) / 0.1 + 1))
+              tmp = parseFloat(_list[k].baseprice + _list[k].jfprice * ((_list[k].priceStart - (_waterMax )) / 0.1))
             }
           }
           _listResult.push(tmp)

src/views/houseSelfCollect/inspectInfo.vue

@@ -138,8 +138,8 @@
     packList
   } from '@/model/contarct/index'
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
-  import html2canvas from "html2canvas"
-  import axios from "axios"
+  import html2canvas from 'html2canvas'
+  import axios from 'axios'
   export default {
     components: {
       inspectInfoPrint,
@@ -152,8 +152,8 @@
         inspect: {
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
-          natureOfGrainPurchase:"贸易粮",
-          type:"潮粮"
+          natureOfGrainPurchase:'贸易粮',
+          type:'潮粮'
         },
         disabled: false,
         disabled1: false,
@@ -171,7 +171,7 @@
         typeList: ['干粮', '潮粮'],
         purchasePriceList: [],
         id: '',
-        imgUrl:"",
+        imgUrl:'',
         printData:{},
         num:0,
         tipFlag:true
@@ -186,8 +186,8 @@
            this.inspect = {
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
-          natureOfGrainPurchase:"贸易粮",
-          type:"潮粮"
+          natureOfGrainPurchase:'贸易粮',
+          type:'潮粮'
         }
       }
       this.cangid = this.$route.query.cangid
@@ -205,6 +205,10 @@
         this.disabled1 = true
         this.information = '编辑'
       }
+      else{
+        this.disabled1 = false
+        this.disabled = false
+      }
       this.calculation()
       this.getList(this.id)
     },
@@ -232,16 +236,16 @@
         console.log(this.getdate())
         let number = '000' + this.count
         number = number.substring(number.length - 4, number.length)
-        this.inspect.qualityNo = 'ZCRK' + this.getdate() + this.cangNo + number //ZCRK+8位时间+3位仓库编号+4位序列号
+        this.inspect.qualityNo = 'SGRK' + this.getdate() + this.cangNo + number //SGRK+8位时间+3位仓库编号+4位序列号
       },
       closeDialog() {
         html2canvas(this.$refs.saveImg.$el).then(canvas => {
-          let dataURL = canvas.toDataURL("image/png");
+          let dataURL = canvas.toDataURL('image/png');
           this.imgUrl = dataURL;
-          if (this.imgUrl !== "") {
-            let b = this.dataURLtoFile(this.imgUrl, "printImg")
+          if (this.imgUrl !== '') {
+            let b = this.dataURLtoFile(this.imgUrl, 'printImg')
             let formdata = new FormData();
-            formdata.append("file", b);
+            formdata.append('file', b);
             axios({
               method: 'post',
               url: 'https://www.zthymaoyi.com/upload/admin',
@@ -257,13 +261,13 @@
             this.dialogTableVisible = true;
           }
         })
-        this.types = ""
+        this.types = ''
         // this.inspect = [] 
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
       },
       typeChange(){
-        if(this.inspect.type == "干粮" && this.inspect.goodsName){
+        if(this.inspect.type == '干粮' && this.inspect.goodsName){
            getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
                 .toPromise()
                 .then((response) => { 
@@ -272,7 +276,7 @@
         }
       },
       closePrint(){
-           this.types = ""
+           this.types = ''
         // this.inspect = [] 
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
@@ -371,7 +375,7 @@
           })
           return
         }
-        if(this.inspect.type == "干粮"){
+        if(this.inspect.type == '干粮'){
           if(!this.inspect.dryGrainPrice){
             this.$message({
               message:'干粮价格不能为空',
@@ -577,7 +581,7 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
-                      console.log(this.inspect,"cdsklh")
+                      console.log(this.inspect,'cdsklh')
                     })
                   this.isShowPrint = true
                 })
@@ -588,7 +592,7 @@
         }
       },
       cancel() {
-        this.types = ""
+        this.types = ''
         // this.inspect = [] 
         this.$router.push({
           path: 'inspectionManagement'
@@ -644,7 +648,7 @@
               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
             }
           }
-          if(this.inspect.type == "干粮"){
+          if(this.inspect.type == '干粮'){
              getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
                 .toPromise()
                 .then((response) => { 

src/views/houseSelfCollect/inspectionManagement.vue

@@ -81,7 +81,7 @@
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
-      <el-table-column prop="qualityDate" label="质检时间"></el-table-column>
+      <el-table-column prop="updateDate" label="质检时间"></el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="400" label="操作">
         <template slot-scope="scope">
@@ -145,13 +145,13 @@ export default {
       warehouseName: '',
       inspect: [],
       warehouseList: [],
-      cangid: "", //仓库id
-      warehouseCount: "",
-      warehouseNo: "",
+      cangid: '', //仓库id
+      warehouseCount: '',
+      warehouseNo: '',
       isShowPrint: false,
       printData: {},
-      deductWeight:"",//扣重比
-      saleLimit:"",
+      deductWeight:'',//扣重比
+      saleLimit:'',
       purchasePriceList:[]
 
     }
@@ -258,21 +258,22 @@ export default {
               purchasePriceList: response[i].purchasePriceList,
               No:response[i].commonWarehouseNo
             })
+            if (this.cangid&&this.cangid == response[i].id) {
+              this.warehouseName = response[i].warehouseName
+              this.warehouseCount =  response[i].count
+              this.warehouseNo =  response[i].commonWarehouseNo
+              this.purchasePriceList =  response[i].purchasePriceList
+            } 
           }
-          if(this.warehouseList.length > 0){
+          if(this.warehouseList.length > 0 && !this.cangid){
             this.warehouseName = this.warehouseList[0].value
-             if (this.cangid) {
-            this.warehouseName = this.WAREHOUSE[1].payname
-               } 
-          else {
-            this.WAREHOUSE[1].payname = this.warehouseList[0].value
-          }
             this.warehouseCount =  this.warehouseList[0].count
             this.warehouseNo =  this.warehouseList[0].No
             this.cangid =  this.warehouseList[0].id
             this.purchasePriceList =  this.warehouseList[0].purchasePriceList
-            this.getList()
+            this.WAREHOUSE[1].payname = this.warehouseList[0].value
           }
+          this.getList()
         })
     },
     getList() {

src/views/houseSelfCollect/paymentManagement.vue

@@ -3,9 +3,24 @@
   <div>
     <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
-        <ws-button type="primary" @click="screen(2)">待结算</ws-button>
+        <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
-        <ws-button type="primary"  @click="screen()">全部</ws-button>
+        <ws-button type="primary"  @click="screen()">全部</ws-button> -->
+        <ws-button
+            :type="searchType == 0 ? 'primary' : ''"
+            @click="screen(0)"
+            >待审核</ws-button
+          >
+          <ws-button
+            :type="searchType == 2 ? 'primary' : ''"
+            @click="screen(2)"
+            >待结算</ws-button
+          >
+          <ws-button
+            :type="searchType == -1 ? 'primary' : ''"
+            @click="screen(-1)"
+            >全部</ws-button
+          >
         <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
         <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
@@ -95,23 +110,23 @@
         <template scope="scope">
           
           <el-button
-            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-show="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="settlement(1, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
           >结算</el-button>
           <el-button
-            v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
+            v-show="scope.row.approveStatus || scope.row.status == '已驳回'"
             @click="settlement(2, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
           >查看</el-button>
           <el-button
-            v-if=" scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction "
+            v-show=" scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction "
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
           <el-button
             type="danger"
-            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-show="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="del(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
           >删除</el-button>
@@ -214,7 +229,7 @@ export default {
       deptCircularPage: {},
       deptBudgetTotal: 0,
       paymentForm: false,
-      searchType: '',
+      searchType: -1,
       searchTypeText: '',
       searchKeyWord: '',
       warehouseList: [],
@@ -307,11 +322,19 @@ export default {
       )
     },
     getList() {
+      this.payments = {
+        amountNotPayable: 0,
+        paymentDate: ''
+      }
+      var searchParam = ''
+      if(this.searchType != -1){
+        searchParam = this.searchType
+      }
       getpayment({
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchKeyWord: this.searchKeyWord,
-        searchType: this.searchType,
+        searchType: searchParam,
         warehouseName: this.warehouseName,
         managementType: 1
       })

src/views/houseSelfCollect/settlement.vue

@@ -404,7 +404,7 @@
     >
       <paymentPrint :printData="printData" ref="saveImg"></paymentPrint>
       <div style="text-align:center">
-        <el-button type="primary" @click="closePrint">关闭</el-button>
+        <el-button type="primary" @click="closeDialog">关闭</el-button>
         <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
@@ -460,6 +460,7 @@ export default {
         let dataURL = canvas.toDataURL('image/png')
         this.imgUrl = dataURL
         if (this.imgUrl !== '') {
+          debugger
           let b = this.dataURLtoFile(this.imgUrl, 'printImage')
           let formdata = new FormData()
           formdata.append('file', b)
@@ -473,12 +474,13 @@ export default {
             settlementEdit(this.paymentList)
               .toPromise()
               .then((response) => {})
+            this.paymentList = [] 
+
           })
           this.dialogTableVisible = true
           
         }
       })
-      this.paymentList = [] 
       this.isShowPrint = false
       this.$router.push({path:'paymentManagement'})
     },

src/views/houseSelfCollect/weighingManagement.vue

@@ -97,7 +97,7 @@
         <template slot-scope="scope">
           <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' " v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`" >毛重</el-button >
           <!-- scope.row.paymentManagement.status == '待结算' && -->
-          <el-button :disabled = "scope.row.allow == 2" @click="weightCheck(scope.row, 2)"  v-if="scope.row.status == '已称毛重' || scope.row.status == '已称皮重' " v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
+          <el-button :disabled = "scope.row.allow == 2" @click="weightCheck(scope.row, 2)"  v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') " v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
           <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
         </template>
       </el-table-column>
@@ -163,7 +163,7 @@ export default {
         qualityInspectionManagement:{},
       },
       purchasePriceList:[],
-      allowEdit:"",
+      allowEdit:'',
       disabled:false
     }
   },
@@ -282,10 +282,8 @@ export default {
         .then((response) => {
           for(let i = 0 ; i < response.records.length ; i++){
             if(response.records[i].paymentManagement){
-              if(response.records[i].paymentManagement.status == '待结算'){
-                  response.records[i].allow = 1
-              }else{
-                response.records[i].allow = 2
+              if(response.records[i].paymentManagement.approveStatus || response.records[i].paymentManagement.status != '待结算'){
+                  response.records[i].allow = 2
               }
             }else{
               response.records[i].allow = 1

src/views/houseSelfCollect/weightCheck.vue

@@ -21,15 +21,18 @@
         <h2 class="bg-left titleup">实时监控</h2>
         <div class="bottom">
           <div class="video1">
-            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" v-if="!video1Src">
+            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" v-if="!video1Src">
             <div v-if="!video1Src">监控视频未连接</div>
             <video v-if="video1Src" controls="controls" :src="video1Src"  autoplay="autoplay" class="video-content"
-              mediatype="video"></video>
+              mediatype="video"></video> -->
+              <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
           </div>
           <div class="vide2">
-            <img src="../../../public/img/quesheng@2x.png" alt="" class="img2" v-if="!video2Src">
+            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img2" v-if="!video2Src">
             <div v-if="!video2Src">监控视频未连接</div>
-            <video src="" v-if="video2Src" class="video-content"></video>
+            <video src="" v-if="video2Src" class="video-content"></video> -->
+            <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
+          
           </div>
         </div>
       </div>
@@ -93,7 +96,7 @@
             </div>
           </div>
           <div class="bottom">
-            <el-table ref="singleTable" :data="carList" height="250" highlight-current-row
+            <el-table ref="singleTable" :data="carList" height="550" highlight-current-row
               @current-change="handleCurrentChange" style="width: 100%;overflow:auto">
               <el-table-column property="number" label="编号">
               </el-table-column>
@@ -150,8 +153,8 @@
     getweighingList
   } from '@/model/houseSelfCollect/index'
   import weightCheckPrint from './component/weightCheckPrint.vue'
-  import html2canvas from "html2canvas"
-  import axios from "axios"
+  import html2canvas from 'html2canvas'
+  import axios from 'axios'
   export default {
     components: {
       weightCheckPrint,
@@ -165,8 +168,8 @@
         pList: [],
         mList: [],
         index: 0,
-        video1Src: '',
-        video2Src: '',
+        video1Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001',
+        video2Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002',
         currentPage: 1,
         pageSize: 10,
         carList: [],
@@ -213,7 +216,7 @@
       }
       this.weighingList.grossWeight = this.$route.query.grossWeight
       this.purchasePriceList = this.$route.query.purchasePriceList
-      console.log(this.purchasePriceList, "上限")
+      console.log(this.purchasePriceList, '上限')
       this.allowEdit = this.$route.query.allowEdit
       if (this.allowEdit == 0) {
         this.disabled = true
@@ -277,7 +280,7 @@
         this.mList = [];
         this.pList = [];
         let that = this
-        console.log(this.common.commonWeighingList, "commonWeighingList")
+        console.log(this.common.commonWeighingList, 'commonWeighingList')
         let _list = this.common.commonWeighingList
         for (let i = 0; i < _list.length; i++) {
           if(_list[i].allow == 2){
@@ -291,7 +294,7 @@
             this.pList.push(_list[i])
           }
         }
-        if (this.information == "毛重") {
+        if (this.information == '毛重') {
           this.index = 0
           this.carList = this.mList
           if (this.mList.length != 0) {
@@ -335,10 +338,10 @@
       },
       tabClick(val) {
         this.index = val
-        if (this.information == "皮重") {
-          this.information = "毛重"
+        if (this.information == '皮重') {
+          this.information = '毛重'
         } else {
-          this.information = "皮重"
+          this.information = '皮重'
         }
         this.getList()
       },
@@ -381,17 +384,17 @@
               this.reader.releaseLock();
               break;
             }
-            var result = "";
+            var result = '';
             //2。获取16进制字符串
             // var receData = HexConvert.ByteToString(value);
             // console.log("receData",receData);
             var flag = false;
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
-              if (tmp == "+") {
+              if (tmp == '+') {
                 flag = true
               }
-              if (flag && result.length < 6 && tmp != "+") {
+              if (flag && result.length < 6 && tmp != '+') {
                 result += tmp
               }
             }
@@ -469,7 +472,7 @@
         }
         if (
           this.weighingList.grossWeight < 1 ||
-          this.weighingList.grossWeight > 100000
+          this.weighingList.grossWeight > 200000
         ) {
           this.$message({
             message: '毛重输入错误',
@@ -555,13 +558,13 @@
                 .toPromise()
                 .then((response) => {
                   for (let i = 0; i < this.purchasePriceList.length; i++) {
-                    console.log(this.purchasePriceList, "shangxiang")
+                    console.log(this.purchasePriceList, 'shangxiang')
                     if (
                       this.weighingList.goodsName == this.purchasePriceList[i].goodsName
                     ) {
                       //累计售粮超上限不能完成毛检保存
                       let count = (this.purchasePriceList[i].saleLimit - response / 1000).toFixed(2)
-                      console.log(this.weighingList.grossWeight / 1000, "毛重转吨")
+                      console.log(this.weighingList.grossWeight / 1000, '毛重转吨')
                       if (count - this.weighingList.grossWeight / 1000 < 0) {
                         this.$alert(
                           '该客户累计销售' +
@@ -618,7 +621,7 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
-                      this.inspect.a = "中天"
+                      this.inspect.a = '中天'
                       // this.tableData = response
                       this.isShowPrint = true
                     })

src/views/outboundManagement/qualityInspection.vue

@@ -218,7 +218,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     print() {
       this.inspect.warehouseName = this.warehouseName

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -422,14 +422,14 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     // 随机验证码
     verifyinit() {
       var arr = []
       for (var i = 48; i < 123; i++) {
         if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+        if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function() {
@@ -535,7 +535,7 @@ export default {
       // this.dataList.outputCity = CodeToText[value[1]]
     },
     sendWarehousechange(e) {
-          console.log("sendWarehousechange",e)
+          console.log('sendWarehousechange',e)
 
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].warehouseName == e) {
@@ -550,7 +550,7 @@ export default {
               this.warehouseList[i].warehouseCity
             ][this.warehouseList[i].warehouseArea].code
           this.selectedOptions = tmp
-          console.log("sendWarehousechange",this.warehouseList[i])
+          console.log('sendWarehousechange',this.warehouseList[i])
           this.dataList.receiveWarehouseId = this.warehouseList[i].id
         }
       }
@@ -607,22 +607,9 @@ export default {
           this.freightPayerList = response
         })
     },
-    getdate() {
-      var date = new Date()
-      var year = date.getFullYear() //获取完整的年份(4位)
-      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var datetime = date.getDate() //获取当前日(1-31)
-      if (mouth < 10) {
-        mouth = '0' + mouth
-      }
-      if (datetime < 10) {
-        datetime = '0' + datetime
-      }
-      return year + mouth + datetime
-    },
     MathRand()
 {
-var Num="";
+var Num='';
 for(var i=0;i<4;i++)
 {
 Num+=Math.floor(Math.random()*10);

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -511,7 +511,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     dataFilter(val) {
       // console.log(val,"名")

src/views/purchasingManagement/procurementPlanLook.vue

@@ -285,14 +285,14 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     // 随机验证码
     verifyinit() {
       var arr = []
       for (var i = 48; i < 123; i++) {
         if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+        if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function() {

src/views/salesManagement/salesPlanAdd.vue

@@ -508,11 +508,11 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
 MathRand()
 {
-var Num="";
+var Num='';
 for(var i=0;i<4;i++)
 {
 Num+=Math.floor(Math.random()*10);
@@ -683,25 +683,12 @@ return Num
           this.freightPayerList = response
         })
     },
-    getdate() {
-      var date = new Date()
-      var year = date.getFullYear() //获取完整的年份(4位)
-      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var datetime = date.getDate() //获取当前日(1-31)
-      if (mouth < 10) {
-        mouth = '0' + mouth
-      }
-      if (datetime < 10) {
-        datetime = '0' + datetime
-      }
-      return year + mouth + datetime
-    },
     // 随机验证码
     verifyinit() {
       var arr = []
       for (var i = 48; i < 123; i++) {
         if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+        if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function () {

src/views/salesManagement/salesPlanEdit.vue

@@ -449,7 +449,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     dataFilter(val) {
       // console.log(val,"名")

src/views/salesManagement/salesPlanLook.vue

@@ -287,14 +287,14 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     // 随机验证码
     verifyinit() {
       var arr = []
       for (var i = 48; i < 123; i++) {
         if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+        if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function() {

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -509,7 +509,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
 
     dataFilter(val) {

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -34,6 +34,7 @@
             placeholder="请输入任务编号"
             maxlength="20"
             size="small"
+            disabled
           ></el-input>
         </el-form-item>
         <el-form-item prop="taskType" label="任务类型" span="1">
@@ -202,7 +203,7 @@
         <div class="driver">
           <span>运输阶段{{ item.key }} {{ item.processNo }}</span>
           <img
-            v-if="!endflag"
+            v-if="endflag == '0' "
             width="22"
             height="22"
             class="add"
@@ -422,7 +423,6 @@ export default {
   data() {
     let self = this
     return {
-      flag: 2,
       checkList: [],
       deptBudgetList: {
         taskNo: '',
@@ -628,14 +628,14 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     // 随机验证码
     verifyinit() {
       var arr = []
       for (var i = 48; i < 123; i++) {
         if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+        if (i > 90 ) continue
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function () {
@@ -694,6 +694,7 @@ export default {
         })
       xialaNo({
         compId: this.compId,
+        flag: 8,
       })
         .toPromise()
         .then((response) => {
@@ -734,7 +735,7 @@ export default {
         receiveDetailedAddress: '',
         sender: '',
         receiver: '',
-        key: this.deptBudgetList.tranProcessInfoList.length,
+        key: this.deptBudgetList.tranProcessInfoList.length + 1,
         senderPhone: '',
         receiverPhone: '',
         endFlag: '0',

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -239,6 +239,9 @@
               >编辑</span
             >
             <el-divider
+            v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.edit`
+              "
               direction="vertical"
               v-if="scope.row.taskId == null"
             ></el-divider>
@@ -402,6 +405,7 @@ export default {
         path: 'tranManagementWarehouseInOuttaskedit',
         query: {
           relevanceId: item.relevanceId,
+          inOutFlag: item.inOutFlag
         },
       })
     },

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -281,12 +281,13 @@
               v-model="dataList1.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
+              @change="selectwarehouseName1"
             >
               <el-option
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
-                :value="item.warehouseName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -458,11 +459,11 @@
               v-model="dataList1.agent"
               placeholder="请选择经办人"
               filterable
-              :filter-method="dataFilter"
+              :filter-method="dataFilter1"
               @change="selectstaff1"
             >
               <el-option
-                v-for="item in options"
+                v-for="item in options1"
                 :key="item.value"
                 :label="item.staffName"
                 :value="item.staffName"
@@ -712,6 +713,8 @@ import {
   addoreditoutput,
   getGoodsName,
 } from '@/model/tasksport/index'
+
+import { mapGetters } from 'vuex'
 import { pullDown, getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -784,9 +787,10 @@ export default {
       goodnameList: [],
       checked: true,
       form: {},
-
       staffList: [],
+      staffList1: [],
       options: [],
+      options1: [],
       storageType: [],
       storageType1: [],
       outContractNo: [],
@@ -886,7 +890,7 @@ export default {
     },
     MathRand()
 {
-var Num="";
+var Num='';
 for(var i=0;i<4;i++)
 {
 Num+=Math.floor(Math.random()*10);
@@ -916,6 +920,24 @@ return Num
         this.options = this.staffList
       }
     },
+    dataFilter1(val) {
+      // console.log(val,"名")
+      this.deptBudgetList.staffList1 = val
+      if (val) {
+        //val存在
+        this.options = this.staffList1.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options1 = this.staffList1
+      }
+    },
     weightchange(e) {
       if (this.dataList.taskTypeKey == 4) {
         this.$set(this.dataList, 'weight', e)
@@ -975,14 +997,34 @@ return Num
       }
     },
     selectwarehouseName(e) {
-      //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:e})
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-          //  this.agent = response
-        })
+      for(var i=0;i<this.warehouseNameList.length;i++){
+        if(this.warehouseNameList[i].id == e){
+          this.dataList.warehouseName = this.warehouseNameList[i].warehouseName
+          //经办人
+          getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:e})
+            .toPromise()
+            .then((response) => {
+              this.options = response
+              this.staffList = response
+              //  this.agent = response
+            })
+        }
+      }
+    },
+    selectwarehouseName1(e) {
+      for(var i=0;i<this.warehouseNameList.length;i++){
+        if(this.warehouseNameList[i].id == e){
+          this.dataList1.warehouseName = this.warehouseNameList[i].warehouseName
+          //经办人
+          getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:e})
+            .toPromise()
+            .then((response) => {
+              this.options1 = response
+              this.staffList1 = response
+              //  this.agent = response
+            })
+        }
+      }
     },
     changecontract1(e) {
       if (this.dataList1.taskTypeKey != 3) {
@@ -1033,8 +1075,12 @@ return Num
           addoreditoutput(list)
             .toPromise()
             .then((response) => {
+              var that = this
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+              setTimeout(function(){
+                that.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+              },2000)
+
             })
     },
     //提交按钮

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -913,7 +913,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     reject() {
       this.outerVisible = true
@@ -923,7 +923,7 @@ export default {
       var arr = []
       for (var i = 48; i < 123; i++) {
         if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+        if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function () {
@@ -935,7 +935,7 @@ export default {
     },
     MathRand()
 {
-var Num="";
+var Num='';
 for(var i=0;i<4;i++)
 {
 Num+=Math.floor(Math.random()*10);

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -35,7 +35,7 @@
       </div>
       </div>
       <div class="ding"></div>
-       <div v-if="dataList.taskTypeKey == 1&dataList.taskTypeKey == 3||dataList1.taskTypeKey == 1&dataList.taskTypeKey1 == 3" class="center1">
+       <div v-if="dataList.taskTypeKey == 1||(dataList.taskTypeKey == 3&&inOutFlag ==1)" class="center1">
           <img
             style="position: relative; top: 40px; left: 300px;" 
             width="19"
@@ -239,7 +239,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-show="dataList.taskTypeKey != 1||dataList1.taskTypeKey != 1" class="center1">
+      <div v-show="dataList.taskTypeKey == 2||dataList.taskTypeKey == 4||(dataList.taskTypeKey == 3&&inOutFlag == 2)" class="center1">
         <img
             style="position: relative; top: 40px; left: 300px;" 
             width="19"
@@ -768,6 +768,7 @@ export default {
         },
       },
       accessoryTFs: false,
+      inOutFlag:1
     }
   },
   activated() {
@@ -793,14 +794,14 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
     // 随机验证码
     verifyinit() {
       var arr = []
       for (var i = 48; i < 123; i++) {
         if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+        if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function () {
@@ -1087,6 +1088,7 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
+      this.inOutFlag = this.$route.query.inOutFlag
       if (this.$route.query.relevanceId) {
         outexamine({ relevanceId: this.$route.query.relevanceId })
           .toPromise()
@@ -1094,17 +1096,17 @@ export default {
             if (response.length > 1) {
               this.dataList = response[0]
               this.dataList1 = response[1]
-                console.log(this.dataList1.inOutTaskNo,'入库任务')
+              console.log(this.dataList1.inOutTaskNo,'入库任务')
             } else {
-               if(response[0].taskTypeKey==3){
+              if(response[0].taskTypeKey==3){
                 this.deletetask=true
                 this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf('C') + 1,response[0].inOutTaskNo.length)
               }
               if(response[0].taskTypeKey==2){
-              this.dataList1 = response[0]
-            }else{
-              this.dataList = response[0]
-            }
+                this.dataList1 = response[0]
+              }else{
+                this.dataList = response[0]
+              }
             }
           })
       } else {

src/views/tranManagement/tranManagementDriver.vue

@@ -233,7 +233,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="操作" >
+        <el-table-column prop="address" label="操作" width="300" >
           <template slot-scope="scope">
             <el-button size="medium" type="text" class="record" @click="look(scope.row)"
               >查看</el-button

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -152,7 +152,7 @@
         </el-table-column>
         <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <template v-if="scope.row.receivingStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementShipping.vue

@@ -146,7 +146,7 @@
         </el-table-column>
         <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div class="record" @click="handleLook(scope.row)">查看</div>
             <div class="adjustment" @click="shipping(scope.row)">船次</div>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -147,7 +147,7 @@
         </el-table-column>
         <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <template v-if="scope.row.feedbackStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -146,7 +146,7 @@
         </el-table-column>
         <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div
               class="record"

src/views/tranManagement/tranManagementVehicle.vue

@@ -146,7 +146,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="createDate" label="接单时间"> </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div class="record" @click="nocomplete(scope.row)">查看</div>
             <div class="adjustment" @click="warehousing(scope.row)">派车</div>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -619,51 +619,59 @@ export default {
     },
     //提交按钮
     submit() {
-      for (var i = this.index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        if (!this.deptBudgetList.tranCarInfoList[i].driver) {
-          this.$message({
-            message: '姓名不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        for(var j = 0 ; j < this.carList.length ; j++){   
-           if (this.carList[j].driverName == this.deptBudgetList.tranCarInfoList[i].driver && this.carList[j].disableStatusFlag == 1) { 
+      if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输单价！',
+          type: 'warning',
+        })
+      }
+      else{
+        for (var i = this.index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          if (!this.deptBudgetList.tranCarInfoList[i].driver) {
             this.$message({
-              message: this.deptBudgetList.tranCarInfoList[i].driver+'该司机已被禁用！',
+              message: '姓名不能为空！',
               type: 'warning',
             })
             return
           }
-        }  
-      }
-      this.$confirm(`提交成功后，任务将下发给司机，是否确定提交？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              var tranCarInfo = {}
-              tranCarInfo.id = this.deptBudgetList.id
-              tranCarInfo.infoId = this.deptBudgetList.infoId
-              tranCarInfo.tranCarInfoList = this.deptBudgetList.tranCarInfoList
-              dispatchCat(tranCarInfo)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('提交成功')
-                  this.$router.go(-1)
-                })
-            } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
+          for(var j = 0 ; j < this.carList.length ; j++){   
+            if (this.carList[j].driverName == this.deptBudgetList.tranCarInfoList[i].driver && this.carList[j].disableStatusFlag == 1) { 
+              this.$message({
+                message: this.deptBudgetList.tranCarInfoList[i].driver+'该司机已被禁用！',
+                type: 'warning',
+              })
+              return
             }
-          })
-        })
-        .catch(() => {
-          return false
+          }  
+        }
+        this.$confirm(`提交成功后，任务将下发给司机，是否确定提交？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
         })
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                var tranCarInfo = {}
+                tranCarInfo.id = this.deptBudgetList.id
+                tranCarInfo.infoId = this.deptBudgetList.infoId
+                tranCarInfo.tranCarInfoList = this.deptBudgetList.tranCarInfoList
+                dispatchCat(tranCarInfo)
+                  .toPromise()
+                  .then((response) => {
+                    this.$message.success('提交成功')
+                    this.$router.go(-1)
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
+              }
+            })
+          })
+          .catch(() => {
+            return false
+          })
+        }
     },
 
     handleClose() {

src/views/warehouse/warehouseManagementAdd.vue

@@ -633,6 +633,7 @@ export default {
                 this.deptBudgetList.warehousePositionInfoList =
                   this.freightspace
                 this.deptBudgetList.totalStorage = this.totalStorage
+                this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.toString()
                 if (this.radio == 2) {
                   this.deptBudgetList.warehousetype == 2
                 }

src/views/warehouse/warehouseManagementDelivery.vue

@@ -742,21 +742,14 @@ export default {
           return
         }
         if (
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.bulkDensity
-              ).indexOf('.') +
-                1) >
-              0)
+          (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
+              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList.warehouseInOutDetail.bulkDensity < 0
         ) {
           this.$message({
-            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
+            message: '容重输入错误',
             type: 'warning',
           })
           return
@@ -1189,22 +1182,15 @@ export default {
           })
           return
         }
-        if (
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.bulkDensity
-              ).indexOf('.') +
-                1) >
-              0)
+          if (
+          (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
+              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList.warehouseInOutDetail.bulkDensity < 0
         ) {
           this.$message({
-            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
+            message: '容重输入错误',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -924,20 +924,14 @@ export default {
           return
         }
         if (
-          this.dataList.warehouseInOutDetail.bulkDensity < 1 ||
-          this.dataList.warehouseInOutDetail.bulkDensity > 40 ||
-          (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
-            '.'
-          ) != -1 &&
+          (this.dataList.warehouseInOutDetail.bulkDensity &&
+            String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
             String(this.dataList.warehouseInOutDetail.bulkDensity).length -
-              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
-                '.'
-              ) +
-                1) >
-              0)
+              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.dataList.warehouseInOutDetail.bulkDensity > 1000 || this.dataList.warehouseInOutDetail.bulkDensity < 0
         ) {
           this.$message({
-            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
+            message: '容重输入错误',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -1135,20 +1135,14 @@ export default {
           return
         }
         if (
-          this.dataList.warehouseInOutDetail.bulkDensity < 1 ||
-          this.dataList.warehouseInOutDetail.bulkDensity > 40 ||
-          (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
-            '.'
-          ) != -1 &&
+          (this.dataList.warehouseInOutDetail.bulkDensity &&
+            String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
             String(this.dataList.warehouseInOutDetail.bulkDensity).length -
-              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
-                '.'
-              ) +
-                1) >
-              0)
+              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.dataList.warehouseInOutDetail.bulkDensity > 1000 || this.dataList.warehouseInOutDetail.bulkDensity < 0
         ) {
           this.$message({
-            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
+            message: '容重输入错误',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementPut.vue

@@ -839,7 +839,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.carNo > 7) {
+      if (this.deptBudgetList.carNo.length > 7) {
         this.$message({
           message: '车牌号输入错误,请输入7个字符之内',
           type: 'warning'
@@ -1037,22 +1037,15 @@ export default {
           return
         }
         if (
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.bulkDensity
-              ).indexOf('.') +
-                1) >
-              0)
+          (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
+              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList.warehouseInOutDetail.bulkDensity < 0
         ) {
           this.$message({
-            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
-            type: 'warning'
+            message: '容重输入错误',
+            type: 'warning',
           })
           return
         }
@@ -1514,22 +1507,15 @@ export default {
           return
         }
         if (
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity < 1 ||
-          this.deptBudgetList.warehouseInOutDetail.bulkDensity > 40 ||
-          (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf(
-            '.'
-          ) != -1 &&
-            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity)
-              .length -
-              (String(
-                this.deptBudgetList.warehouseInOutDetail.bulkDensity
-              ).indexOf('.') +
-                1) >
-              0)
+          (this.deptBudgetList.warehouseInOutDetail.bulkDensity &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+            String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).length -
+              (String(this.deptBudgetList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
+              2) || this.deptBudgetList.warehouseInOutDetail.bulkDensity > 1000 || this.deptBudgetList.warehouseInOutDetail.bulkDensity < 0
         ) {
           this.$message({
-            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
-            type: 'warning'
+            message: '容重输入错误',
+            type: 'warning',
           })
           return
         }

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -365,7 +365,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      return year +'' + mouth + datetime
     },
 
     dataFilter(val) {