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

public/static/weightCheckInOut.html

@@ -145,11 +145,11 @@
             <td class="col" colspan="1">{{tableData.updateDate}}</td>
           </tr>
           <tr class="row">
-            <td class="col col-bgc">毛重（公斤）</td>
+            <td class="col col-bgc">毛重（吨）</td>
             <td class="col" colspan="2">{{tableData.grossWeight*1000}}</td>
-            <td class="col col-bgc">皮重（公斤）</td>
+            <td class="col col-bgc">皮重（吨）</td>
             <td class="col" colspan="2">{{tableData.tare*1000}}</td>
-            <td class="col col-bgc">净重（公斤）</td>
+            <td class="col col-bgc">净重（吨）</td>
             <td class="col" colspan="2">{{tableData.netWeight*1000}}</td>
           </tr>
         </table>

src/lang/zh.js

@@ -514,6 +514,7 @@ export default {
     warehouseManagementDelivery: '出库',
     warehouseManagementIossRecord: '盘损详情',
     warehouseManagementLook: '仓库管理查看',
+    warehouseManagementMintor: '库点监控',
     warehouseManagementDelete: '仓库管理删除',
     warehouseManagementIoss: '仓库管理盘损',
     warehouseManagementRecord: '记录',
@@ -4820,6 +4821,7 @@ export default {
     warehouseManagementGross: '毛重检斤',
     warehouseManagementTare: '皮重检斤',
     warehouseManagementDelivery: '出库',
+    warehouseManagementMintor: '库点监控',
     warehouseManagementLook: '仓库管理查看',
     warehouseManagementDelete: '仓库管理删除',
     warehouseManagementIoss: '仓库管理盘损',

src/views/platformaudit/component/router/route.js

@@ -95,7 +95,7 @@ const platformauditRouter = {
       meta: {
         title: 'grainPulseDynamic',
         shortcutEntrance: 'grainPulseDynamic',
-        module: 'audit.grainMerchant.grainMerchantInfo',
+        module: 'audit.grainMerchant.grainMerchantInfo.review',
         permissicon: [],
         keepAlive: true
       },

src/views/statisticalReport/autoSettlementList.vue

@@ -225,7 +225,7 @@
               @click="changesettlementWeight(scope.row)"
               v-if="
                 (scope.row.settlementWeightchange &&
-                  scope.row.status == '未审核') ||
+                  scope.row.approveStatus == '待物流部审核') ||
                 (scope.row.settlementWeightchange &&
                   scope.row.status == '已驳回')
               "
@@ -235,7 +235,7 @@
               v-if="
                 (!scope.row.settlementWeightchange &&
                   scope.row.settlementWeight &&
-                  scope.row.status == '未审核') ||
+                  scope.row.approveStatus == '待物流部审核') ||
                 (!scope.row.settlementWeightchange &&
                   scope.row.settlementWeight &&
                   scope.row.status == '已驳回')
@@ -271,7 +271,7 @@
               @click="changedeductionAmount(scope.row)"
               v-if="
                 (scope.row.deductionAmountchange &&
-                  scope.row.status == '未审核') ||
+                  scope.row.approveStatus == '待物流部审核') ||
                 (scope.row.deductionAmountchange &&
                   scope.row.status == '已驳回')
               "
@@ -281,7 +281,7 @@
               v-if="
                 (!scope.row.deductionAmountchange &&
                   scope.row.deductionAmount &&
-                  scope.row.status == '未审核') ||
+                  scope.row.approveStatus == '待物流部审核') ||
                 (!scope.row.deductionAmountchange &&
                   scope.row.deductionAmount &&
                   scope.row.status == '已驳回')
@@ -781,10 +781,10 @@ export default {
         this.driverPayeeList.payeeName=item.driverPayeeInfoList[0].payeeName
         for (var i = 0; i < item.driverPayeeInfoList.length; i++){
           if(item.driverPayeeInfoList[i].bankCard==item.cardNo){
-            this.driverPayeeList[i].radio="1"
+            this.driverPayeeList[i].radio='1'
           }
           else{
-            this.driverPayeeList[i].radio="2"
+            this.driverPayeeList[i].radio='2'
           }
           console.log(this.driverPayeeList[i].radio)
         }
@@ -1252,7 +1252,7 @@ export default {
     },
     //列表
     getList() {
-      console.log(this.contractNo,"this.contractNo值")
+      console.log(this.contractNo,'this.contractNo值')
       autoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,

src/views/taskManagement/moveWarehouseTask.vue

@@ -289,6 +289,7 @@ export default {
           this.searchType = this.taskTypeList[i].type
         }
       }
+      this.getList()
     },
 
     getSpanArr(data) {

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -86,6 +86,7 @@
           <template slot-scope="scope">
             <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
+
               ">查看</span>
             <!-- <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider> -->
             <span class="corles" v-hasPermission="

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -133,7 +133,6 @@
             </el-select>
           </el-form-item>
           <!-- 入库类型 -->
-          {{storageType1}}
           <el-form-item label="入库类型">
             <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList1.inOutType"
               placeholder="请选择入库类型" class="typeselect" @change="selectstorageType1">
@@ -233,7 +232,7 @@
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
             <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.inOutType"
-              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType">
+              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType1">
               <el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
@@ -448,7 +447,8 @@
           taskTypeKey: '1'
         },
         dataList1: {
-          taskTypeKey: '1'
+          taskTypeKey: '1',
+          inOutType:''
         },
         historyList: [],
         pickerBeginDateBefore: {
@@ -1419,6 +1419,12 @@
         switch (e) {
           case '采购入库':
             this.flag = 0
+            break
+              case '暂存入库':
+            this.flag = 0
+            break
+              case '贸易服务入库':
+            this.flag = 0
             break
           case '退库':
             this.flag = 2

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -909,7 +909,7 @@ export default {
   width: 72px;
 }
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 16.66%;
+  width: 220px;
   color: #8890b1;
   font-size: 14px;
 }

src/views/warehouse/component/router/index.js

@@ -34,7 +34,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'costmanagement',
         shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
+        module: 'warehouseManagement.costControl.View',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -117,6 +117,22 @@ const warehouseManagementRouter = {
       },
       hidden: true
     },
+    {
+      path: 'warehouseManagementMintor',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementMintor'),
+      name: 'warehouseManagementMintor',
+      meta: {
+        title: 'warehouseManagementMintor',
+        shortcutEntrance: 'warehouseManagementMintor',
+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
+
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
     {
 
       path: 'warehouseManagementPut',

src/views/warehouse/costmanagement.vue

@@ -1,4 +1,4 @@
-<!--仓库管理-->
+<!--成本管理-->
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="15">
@@ -14,6 +14,8 @@
             <el-radio-button label="2">临时仓库</el-radio-button>
           </el-radio-group>
           <ws-button class="find" type="primary" @click="warehouselocation()"
+          v-hasPermission="
+           `warehouseManagement.costControl.add`"
           >库点费用</ws-button>
         </div>
       </template>
@@ -72,10 +74,10 @@
         <el-table-column prop="address" label="操作" width="200">
           <template slot-scope="scope">
             <div class="record" v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
+           `warehouseManagement.costControl.edit`
           " @click="edit(scope.row)">修改</div>
             <div class="adjustment" v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
+           `warehouseManagement.costControl.detail`
           " @click="weightedsubsidiary(scope.row)">加权明细</div>
           </template>
         </el-table-column>

src/views/warehouse/warehouseManagementDelivery.vue

@@ -648,16 +648,16 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.deptBudgetList.contractNo.length < 6 ||
+      //   this.deptBudgetList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       //自检员
       if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
         if (
@@ -845,7 +845,7 @@ export default {
           return
         }
       }
-      console.log(this.deptBudgetList,"出库！！！！！")
+      console.log(this.deptBudgetList,'出库！！！！！')
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',

src/views/warehouse/warehouseManagementGross.vue

@@ -529,7 +529,7 @@
           >保存</el-button
         >
         <el-button
-        v-else
+          v-if="!allowEdit"
           class="bg-bottom-up"
           type="primary"
           size="small"
@@ -851,7 +851,7 @@ export default {
       }
       if (
         this.deptBudgetList.grossWeight < 0 ||
-        this.deptBudgetList.grossWeight > 10000 ||
+        this.deptBudgetList.grossWeight > 500000 ||
         (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
           String(this.deptBudgetList.grossWeight).length -
             (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
@@ -872,7 +872,7 @@ export default {
       }
       if (
         this.deptBudgetList.tare < 0 ||
-        this.deptBudgetList.tare > 10000 ||
+        this.deptBudgetList.tare > 5000000 ||
         (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
           String(this.deptBudgetList.tare).length -
             (String(this.deptBudgetList.tare).indexOf('.') + 1) >
@@ -1108,16 +1108,16 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.deptBudgetList.contractNo.length < 6 ||
+      //   this.deptBudgetList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       if (!this.deptBudgetList.addressUrl) {
         this.$message({
           message: '附件不能为空',
@@ -1607,16 +1607,16 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.deptBudgetList.contractNo.length < 6 ||
+      //   this.deptBudgetList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       // if (this.deptBudgetList.netWeight > this.$route.query.capacity) {
       //   this.$message({
       //     message: '入库量大于该仓库容量！',

src/views/warehouse/warehouseManagementList.vue

@@ -172,6 +172,9 @@
             <div class="adjustment" v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.view`
           " @click="loss(scope.row)">盘损</div>
+          <div class="adjustment" v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="mintor(scope.row)">监控</div>
           </template>
         </el-table-column>
       </el-table>
@@ -545,6 +548,10 @@ export default {
         },
       })
     },
+    mintor(){
+      this.$router.push({ path: 'warehouseManagementMintor' })
+
+    },
     changeradio(e) {
       this.getList()
     },

src/views/warehouse/warehouseManagementMintor.vue

@@ -0,0 +1,240 @@
+<!--仓库详情-->
+<template style="background: #d3dce6;">
+  <div class="container">
+    <el-row>
+      <el-col :span="20">
+        <h2 class="bg-left title">查看库点监控</h2>
+      </el-col>
+      <el-col :span="4" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnWarehouse()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div style="height:90vh;background: #d3dce6;">
+      <el-row :gutter="20" >
+        <div v-for="(item,index) in dataList">
+          <el-col :span="7" v-if="item.Status =='ON'">
+            <iframe :src='"https://live.eliangeyun.com/play.html?serial="+item.DeviceID+"&code="+item.ID+"&aspect=fullscreen"'  width="440" height="360" allowfullscreen ="true"
+                webkitallowfullscreen="true"
+                mozallowfullscreen="true"
+                allow="autoplay; fullscreen; microphone;"></iframe>
+          </el-col>
+        </div>
+      </el-row>
+    </div>
+    
+  </div>
+</template>
+<script>
+import axios from 'axios'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    axios
+  },
+  watch: {
+  },
+  data() {
+    return {
+      dataList:[]
+    }
+  },
+  activated() {
+    this.loaddata()
+  },
+  computed: {
+  },
+  methods: {
+    returnWarehouse() {
+      this.$router.push({ path: 'warehouseManagementList' })
+    },
+    loaddata(){
+      axios.get('https://live.eliangeyun.com/api/v1/device/channellist')
+        .then(resp =>{
+          this.dataList = resp.data.ChannelList
+          for(var i=0;i<this.dataList.length;i++){
+            console.log('ssss',this.dataList[i].Status);
+          }
+
+        }).catch(err =>{
+          console.log(err);
+        });
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+ .el-row {
+    margin-bottom: 20px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .el-col {
+    border-radius: 4px;
+  }
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+  .bg-purple {
+    background: #d3dce6;
+  }
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+.center {
+  position: relative;
+  margin-top: 100px;
+  top: 30px;
+  width: 90%;
+  height: 500px;
+  margin: 0 auto;
+}
+.container .bg-left {
+  padding-left: 40px;
+}
+.bg-right {
+  padding: 16px;
+  text-align: right;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+/deep/.el-form-item {
+  width: 33.33%;
+}
+.forlist {
+  width: 16.67%;
+}
+/deep/.forlist .el-form-item__label {
+  width: 60% !important;
+}
+
+	.sign1 {
+		width: 376px;
+		height: 376px;
+		top: 40px;
+	}
+//文字基本信息
+.center h3 {
+  margin-left: 42px;
+}
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+//背景
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+  width: 30%;
+  text-align: center;
+}
+//多选框
+/deep/.el-input__inner {
+  display: inline-block;
+  background-color: #fff;
+}
+/deep/.ws-info-table .warehouseName.el-form-item .el-form-item__content {
+  background: #fff;
+  border: none;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.ws-info-table {
+  border-left: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrl {
+  margin: 0 10px;
+  border-radius: 3px;
+}
+</style>

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -253,7 +253,9 @@ export default {
             solidGrainWater:row.solidGrainWater,
             pureWeight:row.pureWeight,
             deductionAmount:row.deductionAmount,
-            deductionWeight:row.deductionWeight
+            deductionWeight:row.deductionWeight,
+            allowEdit:row.allowEdit
+
           },
         })
       } else if (row.inOutFlag == 1) {
@@ -293,7 +295,8 @@ export default {
             solidGrainWater:row.solidGrainWater,
             pureWeight:row.pureWeight,
             deductionAmount:row.deductionAmount,
-            deductionWeight:row.deductionWeight
+            deductionWeight:row.deductionWeight,
+            allowEdit:row.allowEdit
           },
         })
       }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -673,7 +673,7 @@ export default {
             }
           }
           if(parseInt(result)){
-              this.dataList.grossWeight = parseInt(result)
+              this.dataList.tare = parseInt(result)
           }
           setTimeout(1000)
           // value 是一个 Uint8Array
@@ -1081,16 +1081,16 @@ export default {
         })
         return
       }
-      if (
-        this.dataList.contractNo.length < 6 ||
-        this.dataList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.dataList.contractNo.length < 6 ||
+      //   this.dataList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
 
       if (this.dataList.netWeight > this.$route.query.capacity) {
         this.$message({

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -565,7 +565,7 @@ export default {
             }
           }
           if(parseInt(result)){
-              this.dataList.tare = parseInt(result)
+              this.dataList.grossWeight = parseInt(result)
           }
           setTimeout(1000)
           // value 是一个 Uint8Array
@@ -833,16 +833,16 @@ export default {
         })
         return
       }
-      if (
-        this.dataList.contractNo.length < 6 ||
-        this.dataList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.dataList.contractNo.length < 6 ||
+      //   this.dataList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
 
       if (this.dataList.netWeight > this.$route.query.capacity) {
         this.$message({

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -743,16 +743,16 @@ export default {
         })
         return
       }
-      if (
-        this.dataList.contractNo.length < 6 ||
-        this.dataList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.dataList.contractNo.length < 6 ||
+      //   this.dataList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
 
       if (this.dataList.netWeight > this.$route.query.capacity) {
         this.$message({

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -1022,16 +1022,16 @@ export default {
         })
         return
       }
-      if (
-        this.dataList.contractNo.length < 6 ||
-        this.dataList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.dataList.contractNo.length < 6 ||
+      //   this.dataList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
 
       if (this.dataList.netWeight > this.$route.query.capacity) {
         this.$message({

src/views/warehouse/warehouseManagementPut.vue

@@ -1040,16 +1040,16 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.deptBudgetList.contractNo.length < 6 ||
+      //   this.deptBudgetList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       if (!this.deptBudgetList.addressUrl) {
         this.$message({
           message: '附件不能为空',
@@ -1537,16 +1537,16 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.deptBudgetList.contractNo.length < 6 ||
+      //   this.deptBudgetList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       // if (this.deptBudgetList.netWeight > this.$route.query.capacity) {
       //   this.$message({
       //     message: '入库量大于该仓库容量！',

src/views/warehouse/warehouseManagementTare.vue

@@ -241,7 +241,7 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-      <div class="small-title">上传磅单照片</div>
+      <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
             action="https://www.zthymaoyi.com/upload/admin"
             :show-file-list="false"
@@ -256,7 +256,7 @@
           </el-upload>
           <div v-if='deptBudgetList.addressUrl!=""'>
             <img style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
-          </div>
+          </div> -->
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--自检员-->
@@ -354,7 +354,7 @@
           >保存</el-button
         >
         <el-button
-        v-else
+          v-if="!allowEdit"
           class="bg-bottom-up"
           type="primary"
           size="small"
@@ -670,7 +670,7 @@ export default {
       }
       if (this.information == '皮重检斤'&&(
         this.deptBudgetList.tare < 0 ||
-        this.deptBudgetList.tare > 10000 ||
+        this.deptBudgetList.tare > 200000 ||
         (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
           String(this.deptBudgetList.tare).length -
             (String(this.deptBudgetList.tare).indexOf('.') + 1) >
@@ -704,16 +704,16 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
-      ) {
-        this.$message({
-          message: '合同编号长度不符合要求,请输入6-20个字符之内',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   this.deptBudgetList.contractNo.length < 6 ||
+      //   this.deptBudgetList.contractNo.length > 20
+      // ) {
+      //   this.$message({
+      //     message: '合同编号长度不符合要求,请输入6-20个字符之内',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       //自检员
       if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
         if (
@@ -953,7 +953,7 @@ export default {
       }
       if (
         this.deptBudgetList.grossWeight <= 0 ||
-        this.deptBudgetList.grossWeight > 10000 ||
+        this.deptBudgetList.grossWeight > 5000000 ||
         (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
           String(this.deptBudgetList.grossWeight).length -
             (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
@@ -974,7 +974,7 @@ export default {
       }
       if (
         this.deptBudgetList.tare < 0 ||
-        this.deptBudgetList.tare > 10000 ||
+        this.deptBudgetList.tare > 500000 ||
         (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
           String(this.deptBudgetList.tare).length -
             (String(this.deptBudgetList.tare).indexOf('.') + 1) >
@@ -995,7 +995,7 @@ export default {
       }
       if (
         this.deptBudgetList.netWeight <= 0 ||
-        this.deptBudgetList.netWeight >= 10000
+        this.deptBudgetList.netWeight >= 5000000
       ) {
         this.$message({
           message: '净重输入错误！',

src/views/warehouse/warehouselocation.vue

@@ -1,4 +1,4 @@
-<!--仓库管理-->
+<!--库点费用-->
 <template>
   <div>
       <el-row>
@@ -24,8 +24,7 @@
     <el-row>
       <el-col class='bg-left' :span="12">
         <div style='align-items:center;' class='flex'>
-          <ws-button class="find" type="primary" @click="addlist()"
-          >添加</ws-button>
+          <ws-button class="find" type="primary" @click="addlist()" v-hasPermission="`warehouseManagement.costControl.delete`">添加</ws-button>
           <div style='align-items:center;' class='flex'>
               <div :class='{"forbidden":forbidden==true}' @click='minus'><i class="el-icon-arrow-left"></i></div>
               <ws-select
@@ -111,7 +110,7 @@
         <el-table-column prop="address" label="操作" width="200">
           <template slot-scope="scope">
             <div class="adjustment" v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
+           `warehouseManagement.costControl.audit`
           " @click="editlist(scope.row)">编辑</div>
           </template>
         </el-table-column>

src/views/warehouse/weightedsubsidiary.vue

@@ -1,4 +1,4 @@
-<!--仓库管理-->
+<!--加权明细-->
 <template>
   <div>
       <el-row>

vue.config.js

@@ -141,8 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.107:8090/',
-        // target: 'http://192.168.1.122:9100/',
+        // target: 'http://192.168.1.107:8090/',
+        target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',