更新

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/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/warehouse/component/router/index.js

@@ -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/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

@@ -173,6 +173,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,471 @@
+<!--仓库详情-->
+<template>
+  <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 class="center">
+      <el-radio-group v-model="warehouseType" @change="warehouseTypechange">
+        <el-radio label="1">常用仓库</el-radio>
+        <el-radio label="2">临时仓库</el-radio>
+      </el-radio-group>
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <div class="small-title">基本信息</div>
+        <!--基本信息-->
+        <ws-info-table>
+          <!--仓库名称-->
+          <ws-form-item
+            class="warehouseName"
+            label="仓库名称"
+            span="1"
+            prop="warehouseName"
+          >
+            <ws-select
+              v-model="deptBudgetList.warehouseName"
+              placeholder="请输入仓库名称"
+              class="typeselect"
+              @change="selectpackingMethod"
+            >
+              <ws-option
+                v-for="item in packtypeList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </ws-select>
+          </ws-form-item>
+          <!--负责人-->
+          <ws-form-item label="负责人" span="1" prop="personCharge">
+            {{ deptBudgetList.personCharge }}
+          </ws-form-item>
+          <!--负责人电话-->
+          <ws-form-item
+            label="负责人电话"
+            span="1"
+            prop="personPhone"
+            class="readonly"
+          >
+            {{ deptBudgetList.personPhone }}
+          </ws-form-item>
+           <ws-form-item label="其他负责人" span="1" prop="otherPersonCharge">
+            {{ deptBudgetList.otherPersonCharge }}
+          </ws-form-item>
+          <!--仓库所在地-->
+          <ws-form-item label="仓库所在地" span="1" prop="warehouseLocation">
+            {{ deptBudgetList.warehousePrivate
+            }}{{ deptBudgetList.warehouseCity
+            }}{{ deptBudgetList.warehouseArea }}
+          </ws-form-item>
+          <!--详细地址-->
+          <ws-form-item
+            label="详细地址"
+            span="1"
+            prop="detailedAddress"
+            class="readonly"
+          >
+            {{ deptBudgetList.detailedAddress }}
+          </ws-form-item>
+          <!--总储量（吨)-->
+          <ws-form-item
+            v-show="warehouseType == '1'"
+            label="总储量（吨)"
+            span="1"
+            prop="totalStorage"
+             
+          >
+            {{ totalStorage }}
+          </ws-form-item>
+        </ws-info-table>
+
+        <div
+          v-for="(item, index) in deptBudgetList.warehousePositionInfoList"
+          :key="index"
+        >
+          <ws-info-table>
+            <!--仓位编号-->
+            <ws-form-item
+              label="仓位编号"
+              span="1"
+              prop="binNumber"
+              class="forlist"
+            >
+              {{ item.binNumber }}
+            </ws-form-item>
+            <!--最大储量（吨）-->
+            <ws-form-item
+              label="最大储量（吨）"
+              span="1"
+              prop="maxStorage"
+              class="forlist"
+            >
+              {{ item.maxStorage }}
+            </ws-form-item>
+            <!--现有储量-->
+            <ws-form-item
+              :label="'现有储量(' + item.nowStorage + '吨)'"
+              span="1"
+              prop="detailStorage"
+            >
+              {{ item.detailStorage }}
+            </ws-form-item>
+            <!--备注（选填）-->
+            <ws-form-item label="备注（选填）" span="1" prop="remark">
+              {{ item.remark }}
+            </ws-form-item>
+          </ws-info-table>
+        </div>
+        <div class="small-title" v-show="warehouseType == '1'">仓库照片</div>
+        <div class="addressUrls">
+          <div v-for="(items, index) in addressUrls" class="addressUrl">
+            <img
+              v-show="addressUrls.length > 0"
+              width="100"
+              height="100"
+              :src="items"
+              alt=""
+            />
+          </div>
+        </div>
+      </ws-form>
+    </div>
+    <div style="text-align: right; padding: 10px">
+      <el-button
+        class="bg-bottom-up"
+        type="primary"
+        size="small"
+        @click="returnWarehouse()"
+        >关闭</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import { xiala, billoperatehis, getLook } from '@/model/warehouse/index'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      radio: 1,
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      unitList: [],
+      warehouseType: '1',
+      // 提交类型
+      submitType: true,
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: [],
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {},
+      historyList: [],
+
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+      addressUrls: [],
+    }
+  },
+  activated() {
+    // this.selectpackingMethod()
+    this.showType = this.isShow
+    this.loaddata()
+  },
+  computed: {
+    totalStorage: function () {
+      var sum = 0
+      if (this.deptBudgetList.warehousePositionInfoList) {
+        for (
+          var i = 0;
+          i < this.deptBudgetList.warehousePositionInfoList.length;
+          i++
+        ) {
+          sum += Number(
+            this.deptBudgetList.warehousePositionInfoList[i].maxStorage
+          )
+        }
+      }
+      return sum
+    },
+  },
+  methods: {
+    //返回按钮
+    returnWarehouse() {
+       this.deptBudgetList = {}
+          this.addressUrls = []
+      this.$router.push({ path: 'warehouseManagementList' })
+    },
+    warehouseTypechange() {
+      this.addressUrls = []
+      this.deptBudgetList = {}
+      this.loaddata()
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    selectpackingMethod(e) {
+      console.log(e)
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].warehouseName == e) {
+          this.getLook(this.packtypeList[i].id)
+        }
+      }
+    },
+    loaddata() {
+      // 仓库名称
+      xiala({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        warehouseType: this.warehouseType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.packtypeList = response
+        })
+    },
+    getLook(compId1) {
+      getLook({
+        id: compId1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          this.addressUrls = this.deptBudgetList.addressUrl.split(',')
+          this.addressUrls.pop()
+        })
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.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;
+}
+
+//文字基本信息
+.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

@@ -254,7 +254,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) {
@@ -294,7 +296,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: '净重输入错误！',