3 yıl önce · 6499bcec09
--- a/public/static/weightCheck.html
+++ b/public/static/weightCheck.html
@@ -10,6 +10,7 @@
 
				       table tr td {
			
 
				         border: 2px solid #333333;
			
 
				         padding: 5px 0;
			
 
				+        height: 43px;
			
 
				       }
			
 
				 
			
 
				       #app {
			
@@ -19,8 +20,8 @@
 
				 
			
 
				       .content {
			
 
				         width: 1000px;
			
 
				-        height: 583px;
			
 
				-        margin: auto;
			
 
				+        padding: 70px 20px 20px 20px;
			
 
				+        font-size: 18px;
			
 
				         position: absolute;
			
 
				         top: 0;
			
 
				         bottom: 0;
			
@@ -42,12 +43,11 @@
 
				       .bottom-row1 {
			
 
				         display: flex;
			
 
				         /* justify-content: space-between; */
			
 
				-        margin: 20px 0;
			
 
				+        margin-top: 5px 0;
			
 
				       }
			
 
				 
			
 
				       .bottom-row2 {
			
 
				         display: flex;
			
 
				-        margin: 10px 0;
			
 
				       }
			
 
				 
			
 
				       img {
			
@@ -57,11 +57,11 @@
 
				       }
			
 
				 
			
 
				       .config {
			
 
				-        margin-top: 20px;
			
 
				+        margin-top: 10px;
			
 
				         margin-right: 240px;
			
 
				       }
			
 
				       .autograph{
			
 
				-    margin-top: 20px;
			
 
				+    margin-top: 10px;
			
 
				      }
			
 
				       .bottom-row3 {
			
 
				         margin: 10px 0;
			
@@ -69,12 +69,14 @@
 
				 
			
 
				       .title {
			
 
				         text-align: center;
			
 
				-        font-size: 24px;
			
 
				+        font-size: 36px;
			
 
				+        font-weight: 500;
			
 
				       }
			
 
				 
			
 
				       .number {
			
 
				         text-align: right;
			
 
				         margin-bottom: 10px;
			
 
				+        margin-top: 20px;
			
 
				       }
			
 
				 
			
 
				       .small-row {
			
@@ -120,7 +122,8 @@
 
				   <body>
			
 
				     <div id="app">
			
 
				       <div class="content" v-if="bigContent">
			
 
				-        <div class="title">粮食检斤单</div>
			
 
				+        <div class="title">{{tableData.compName}}</div>
			
 
				+        <div class="title">入库检斤单</div>
			
 
				         <div class="number">{{tableData.number}}</div>
			
 
				         <table class="table">
			
 
				           <tr class="row">
			
@@ -156,7 +159,8 @@
 
				             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
			
 
				             <td class="col col-bgc">热损伤（%）</td>
			
 
				             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
			
 
				-            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
			
 
				+            <td class="col col-bgc">质检时间</td>
			
 
				+            <td class="col" >{{tableData.qualityInspectionManagement.qualityDate}}</td>
			
 
				           </tr>
			
 
				           <tr class="row">
			
 
				             <td class="col col-bgc">杂质（%）</td>
			
--- a/public/static/weightCheckInOut.html
+++ b/public/static/weightCheckInOut.html
@@ -0,0 +1,231 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+  <head>
			
 
				+    <meta charset="utf-8">
			
 
				+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
			
 
				+    <title></title>
			
 
				+    <style>
			
 
				+      table,
			
 
				+      table tr th,
			
 
				+      table tr td {
			
 
				+        border: 2px solid #333333;
			
 
				+        padding: 5px 0;
			
 
				+        height: 55px;
			
 
				+      }
			
 
				+
			
 
				+      #app {
			
 
				+        /* height: 98vh;
			
 
				+        position: relative; */
			
 
				+      }
			
 
				+
			
 
				+      .content {
			
 
				+        width: 1000px;
			
 
				+        padding: 70px 20px 20px 20px;
			
 
				+        font-size: 22px;
			
 
				+        position: absolute;
			
 
				+        top: 0;
			
 
				+        bottom: 0;
			
 
				+        left: 0;
			
 
				+        right: 0;
			
 
				+      }
			
 
				+
			
 
				+      table {
			
 
				+        width: 100%;
			
 
				+        text-align: center;
			
 
				+        border-collapse: collapse;
			
 
				+        border: 3px solid #333333;
			
 
				+      }
			
 
				+
			
 
				+      .col-bgc {
			
 
				+        background: #f6f7fb;
			
 
				+      }
			
 
				+
			
 
				+      .bottom-row1 {
			
 
				+        display: flex;
			
 
				+        /* justify-content: space-between; */
			
 
				+        margin-top: 5px 0;
			
 
				+      }
			
 
				+
			
 
				+      .bottom-row2 {
			
 
				+        display: flex;
			
 
				+      }
			
 
				+
			
 
				+      img {
			
 
				+        width: 41px;
			
 
				+        height: 41px;
			
 
				+        margin-right: 118px;
			
 
				+      }
			
 
				+
			
 
				+      .config {
			
 
				+        margin-top: 10px;
			
 
				+        margin-right: 240px;
			
 
				+      }
			
 
				+      .autograph{
			
 
				+    margin-top: 10px;
			
 
				+     }
			
 
				+      .bottom-row3 {
			
 
				+        margin: 10px 0;
			
 
				+      }
			
 
				+
			
 
				+      .title {
			
 
				+        text-align: center;
			
 
				+        font-size: 36px;
			
 
				+        font-weight: 500;
			
 
				+        margin-bottom: 20px;
			
 
				+      }
			
 
				+
			
 
				+      .number {
			
 
				+        text-align: right;
			
 
				+        margin-bottom: 10px;
			
 
				+        margin-top: 20px;
			
 
				+      }
			
 
				+
			
 
				+      .small-row {
			
 
				+        display: flex;
			
 
				+      }
			
 
				+
			
 
				+      .small-content {
			
 
				+        width: 400px;
			
 
				+        margin: 0 auto;
			
 
				+        border: 1px solid #ccc;
			
 
				+        padding: 20px 20px 160px 20px;
			
 
				+        position: absolute;
			
 
				+        top: 0;
			
 
				+        bottom: 0;
			
 
				+        left: 0;
			
 
				+        right: 0;
			
 
				+        margin: auto;
			
 
				+        height: 450px;
			
 
				+      }
			
 
				+
			
 
				+      .small-title {
			
 
				+        text-align: center;
			
 
				+        font-size: 18px;
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        align-items: center;
			
 
				+      }
			
 
				+
			
 
				+      .small-row {
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        margin: 10px;
			
 
				+      }
			
 
				+
			
 
				+      .small-img {
			
 
				+        margin-right: 0;
			
 
				+      }
			
 
				+      .sign{
			
 
				+        margin-right: 100px;
			
 
				+      }
			
 
				+    </style>
			
 
				+  </head>
			
 
				+  <body>
			
 
				+    <div id="app">
			
 
				+      <div class="content" v-if="true">
			
 
				+        <div v-if="tableData.inOutFlag == '2'"  class="title">{{tableData.companyName}}</div>
			
 
				+        <div v-else  class="title">{{tableData.contractManagementInfo.seller}}</div>
			
 
				+        <div v-if="tableData.inOutFlag == '2'" class="title">入库检斤单</div>
			
 
				+        <div v-else class="title">出库检斤单</div>
			
 
				+        <table class="table">
			
 
				+          <tr class="row">
			
 
				+            <td class="col col-bgc">送货单位</td>
			
 
				+            <td class="col" colspan="4">{{tableData.contractManagementInfo.seller}}</td>
			
 
				+            <td class="col col-bgc">车牌号</td>
			
 
				+            <td class="col" colspan="1">{{tableData.carNo}}</td>
			
 
				+            <td class="col col-bgc">货名</td>
			
 
				+            <td class="col" colspan="1">{{tableData.goodsName}}</td>
			
 
				+          </tr>
			
 
				+          <tr class="row">
			
 
				+            <td class="col col-bgc">收货单位</td>
			
 
				+            <td class="col" colspan="4">{{tableData.contractManagementInfo.buyer}}</td>
			
 
				+            <td class="col col-bgc">类型</td>
			
 
				+            <td class="col"colspan="1">{{tableData.type}}</td>
			
 
				+            <td class="col col-bgc">检斤时间</td>
			
 
				+            <td class="col" colspan="1">{{tableData.updateDate}}</td>
			
 
				+          </tr>
			
 
				+          <tr class="row">
			
 
				+            <td class="col col-bgc">毛重（公斤）</td>
			
 
				+            <td class="col" colspan="2">{{tableData.grossWeight*1000}}</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" colspan="2">{{tableData.netWeight*1000}}</td>
			
 
				+          </tr>
			
 
				+        </table>
			
 
				+        <div class="bottom">
			
 
				+          <div class="bottom-row1">
			
 
				+            <div>检斤员：{{tableData.backOffice}}</div>
			
 
				+          </div>
			
 
				+          <div class="bottom-row2">
			
 
				+            <div class="config">收货单位签名或盖章：</div>
			
 
				+            <div class="autograph">客户签名：</div>
			
 
				+          </div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+  </body>
			
 
				+  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
			
 
				+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
			
 
				+  <script type="text/javascript">
			
 
				+    new Vue({
			
 
				+      el: '#app',
			
 
				+      data: {
			
 
				+        tableData: {
			
 
				+          // qualityInspectionManagement:{}
			
 
				+        },
			
 
				+        name: "",
			
 
				+        bigContent: false,
			
 
				+        smallContent: false
			
 
				+      },
			
 
				+      computed: {},
			
 
				+      methods: {
			
 
				+        tableRowClassName({
			
 
				+          row,
			
 
				+          rowIndex
			
 
				+        }) {
			
 
				+          if (rowIndex === 1) {
			
 
				+            return 'warning-row';
			
 
				+          } else if (rowIndex === 3) {
			
 
				+            return 'success-row';
			
 
				+          }
			
 
				+          return '';
			
 
				+        },
			
 
				+        getQueryVariable(variable) {
			
 
				+          var query = window.location.search.substring(1);
			
 
				+          var vars = query.split("&");
			
 
				+          for (var i = 0; i < vars.length; i++) {
			
 
				+            var pair = vars[i].split("=");
			
 
				+            if (pair[0] == variable) {
			
 
				+              return pair[1];
			
 
				+            }
			
 
				+          }
			
 
				+          return (false);
			
 
				+        },
			
 
				+        printSmall() {},
			
 
				+        printBig() {},
			
 
				+      },
			
 
				+      mounted() {
			
 
				+        let _data = decodeURIComponent(this.getQueryVariable("tableData"))
			
 
				+        let _type = decodeURIComponent(this.getQueryVariable("type"))
			
 
				+        if (_type == 2) {
			
 
				+          this.bigContent = true
			
 
				+          this.smallContent = false
			
 
				+        } else {
			
 
				+          this.smallContent = true
			
 
				+          this.bigContent = false
			
 
				+        }
			
 
				+        console.log(_data,"sddsd")
			
 
				+        this.tableData = JSON.parse(_data)
			
 
				+        console.log(this.tableData)
			
 
				+        document.title = "粮食检斤单"
			
 
				+        window.print()
			
 
				+        window.onafterprint = function(event) {
			
 
				+          window.history.back(-1)
			
 
				+        };
			
 
				+      },
			
 
				+      watch: {}
			
 
				+    })
			
 
				+  </script>
			
 
				+
			
 
				+</html>
			
--- a/src/api/V2/warehouse/index.js
+++ b/src/api/V2/warehouse/index.js
@@ -44,6 +44,9 @@ export const API_POST_WAREHOUSE_CLEARANCEE = '/warehouseBaseInfo/api/editCleared
 
				 
			
 
				 //临时出入库合同编号下拉
			
 
				 export const API_GET_WAREHOUSE_NO = '/warehouseBaseInfo/selectContractNoList'
			
 
				+
			
 
				+//获取检斤打印数据
			
 
				+export const API_GET_PRINT_INFO = '/warehouseBaseInfo/getPrintInfo'
			
 
				 // 获取负责人
			
 
				 export const API_GET_STAFF = '/staff/query/getStaffListByCompIdAndWarehouseId'
			
 
				 //临时仓库记录
			
@@ -69,7 +72,12 @@ export const API_POST_EDIT_INVENTORYCOSTINFO = '/inventoryCostInfo/api/editInven
 
				 export const API_GET_WEIGHTEDDETAILS = '/weightedDetails/selectInventoryCostInfo'
			
 
				 // 库
			
 
				 export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
			
 
				-
			
 
				+// 出入库任务负责人
			
 
				+export const API_GET_WAREHOUSERESPONSIBLE = "/warehouseBaseInfo/selectResponsible"
			
 
				+// 出入库任务
			
 
				+export const API_GET_WAREHOUSETASK = "/inOutWarehouseTask/selectWarehouseTask"
			
 
				+// 修改经办人
			
 
				+export const API_GET_CHECKORUPDATE = "/inOutWarehouseTask/api/checkOrUpdateInOutTask"
			
 
				 
			
 
				 
			
 
				 
			
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -508,6 +508,9 @@ export default {
 
				     warehouseManagementAdd: '仓库管理添加',
			
 
				     warehouseManagementEdit: '仓库管理编辑',
			
 
				     warehouseManagementPut: '入库',
			
 
				+    warehouseManagementNoWeight: '检斤待完成',
			
 
				+    warehouseManagementGross: '入库检斤',
			
 
				+    warehouseManagementTare: '出库检斤',
			
 
				     warehouseManagementDelivery: '出库',
			
 
				     warehouseManagementIossRecord: '盘损详情',
			
 
				     warehouseManagementLook: '仓库管理查看',
			
@@ -554,6 +557,8 @@ export default {
 
				     tranManagementDriverAdd: '添加司机',
			
 
				     tranManagementDriverLook: '查看司机',
			
 
				     warehouseManagementPerfectDelivery: '编辑',
			
 
				+    warehouseManagementNoWeightIn: '入库检斤',
			
 
				+    warehouseManagementNoWeightOut: '出库检斤',
			
 
				     tranManagementTransport: '运输任务',
			
 
				     tranManagementDriverEdit: '编辑司机',
			
 
				     // 任务管理
			
@@ -4811,6 +4816,9 @@ export default {
 
				     warehouseManagementAdd: '仓库管理添加',
			
 
				     warehouseManagementEdit: '仓库管理编辑',
			
 
				     warehouseManagementPut: '入库',
			
 
				+    warehouseManagementNoWeight: '检斤待完成',
			
 
				+    warehouseManagementGross: '毛重检斤',
			
 
				+    warehouseManagementTare: '皮重检斤',
			
 
				     warehouseManagementDelivery: '出库',
			
 
				     warehouseManagementLook: '仓库管理查看',
			
 
				     warehouseManagementDelete: '仓库管理删除',
			
@@ -4820,6 +4828,8 @@ export default {
 
				     warehouseManagementNoComplete: '待完成',
			
 
				     warehouseManagementPerfectput: '编辑',
			
 
				     warehouseManagementPerfectDelivery: '编辑',
			
 
				+    warehouseManagementNoWeightOut: '出库检斤',
			
 
				+    warehouseManagementNoWeightIn: '入库检斤',
			
 
				     warehouseManagementPutOut: '任务',
			
 
				     warehouseManagementPutOutLook: '查看',
			
 
				 
			
--- a/src/model/warehouse/index.js
+++ b/src/model/warehouse/index.js
@@ -22,6 +22,7 @@ import {
 
				     API_POST_WAREHOUSE_ADD,
			
 
				     API_POST_WAREHOUSE_CLEARANCEE,
			
 
				     API_GET_WAREHOUSE_NO,
			
 
				+    API_GET_PRINT_INFO,
			
 
				     API_GET_STAFF,
			
 
				     API_GET_WAREHOUSE_RECORDSS,
			
 
				     API_GET_GOODSNAME_XIALA,
			
@@ -33,7 +34,10 @@ import {
 
				     API_POST_ADD_INVENTORYCOSTINFO,
			
 
				     API_POST_EDIT_INVENTORYCOSTINFO,
			
 
				     API_GET_WEIGHTEDDETAILS,
			
 
				-    API_GET_WAREHOUSE
			
 
				+    API_GET_WAREHOUSE,
			
 
				+    API_GET_WAREHOUSERESPONSIBLE,
			
 
				+    API_GET_WAREHOUSETASK,
			
 
				+    API_GET_CHECKORUPDATE
			
 
				 } from '@/api/V2/warehouse'
			
 
				 // import { app } from 'electron'
			
 
				 // 列表
			
@@ -87,6 +91,8 @@ export const goodsnameXiala = appRx.get(API_GET_GOODSNAME_XIALA, errorCatcher, e
 
				 export const completeList = appRx.get(API_GET_WAREHOUSE_LIST, errorCatcher, errorHandle, filter)
			
 
				 //临时出入库合同编号下拉
			
 
				 export const xialaNo = appRx.get(API_GET_WAREHOUSE_NO, errorCatcher, errorHandle, filter)
			
 
				+//获取检斤打印数据
			
 
				+export const getPrintInfo = appRx.get(API_GET_PRINT_INFO, errorCatcher, errorHandle, filter)
			
 
				 //任务列表
			
 
				 export const taskList = appRx.get(API_GET_WAREHOUSE_TASKLIST,errorCatcher, errorHandle, filter)
			
 
				 // 成本管理
			
@@ -103,7 +109,9 @@ export const editinventory = appRx.post(API_POST_EDIT_INVENTORYCOSTINFO,errorCat
 
				 export const weighteddetails = appRx.get(API_GET_WEIGHTEDDETAILS,errorCatcher, errorHandle, filter)
			
 
				 // 编辑库点费用
			
 
				 export const getwarehousebase = appRx.get(API_GET_WAREHOUSE,errorCatcher, errorHandle, filter)
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				+//负责人
			
 
				+export const getsponsible = appRx.get(API_GET_WAREHOUSERESPONSIBLE,errorCatcher, errorHandle, filter)
			
 
				+//出入库任务
			
 
				+export const getwarehousetask = appRx.get(API_GET_WAREHOUSETASK,errorCatcher, errorHandle, filter)
			
 
				+//修改经办人
			
 
				+export const postcheckorupdate = appRx.post(API_GET_CHECKORUPDATE,errorCatcher, errorHandle, filter)
			
--- a/src/views/contractManagement/futuresPurchaseContractAdd.vue
+++ b/src/views/contractManagement/futuresPurchaseContractAdd.vue
@@ -40,7 +40,7 @@
 
				           <ws-input
			
 
				             v-model="deptBudgetList.contractNo"
			
 
				             placeholder="请输入合同编号"
			
 
				-            maxlength="20"
			
 
				+            maxlength="50"
			
 
				             size="small"
			
 
				           />
			
 
				         </ws-form-item>
			
@@ -695,6 +695,8 @@ export default {
 
				     //cg.viewBudget
			
 
				     //cg.viewSpareMoney
			
 
				     // this.getVesselData();
			
 
				+    this.selectedOptions=[]
			
 
				+    this.selectedOptions1 = []
			
 
				     this.deptBudgetList.packingMethod = '散装'
			
 
				     this.deptBudgetList.packingMethodKey = 1
			
 
				     this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'
			
@@ -853,10 +855,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
--- a/src/views/contractManagement/futuresPurchaseContractEdit.vue
+++ b/src/views/contractManagement/futuresPurchaseContractEdit.vue
@@ -996,10 +996,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
--- a/src/views/contractManagement/futuresSalesContractAdd.vue
+++ b/src/views/contractManagement/futuresSalesContractAdd.vue
@@ -40,7 +40,7 @@
 
				           <ws-input
			
 
				             v-model="deptBudgetList.contractNo"
			
 
				             placeholder="请输入合同编号"
			
 
				-            maxlength="20"
			
 
				+            maxlength="50"
			
 
				             size="small"
			
 
				           />
			
 
				         </ws-form-item>
			
@@ -682,8 +682,8 @@ export default {
 
				           { required: true, message: '请输入活动名称', trigger: 'blur' },
			
 
				           {
			
 
				             min: 6,
			
 
				-            max: 20,
			
 
				-            message: '长度在 6 到 20 个字符',
			
 
				+            max: 50,
			
 
				+            message: '长度在 6 到 50 个字符',
			
 
				             trigger: 'blur',
			
 
				           },
			
 
				         ],
			
@@ -854,10 +854,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
@@ -1452,8 +1452,8 @@ export default {
 
				           this.deptBudgetList.compId = this.compId
			
 
				           this.deptBudgetList.contractType = 1
			
 
				           this.deptBudgetList.goodsType = 2
			
 
				-           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
			
 
				-            this.deptBudgetList.deliveryArea = "特别行政区"
			
 
				+           if(this.deptBudgetList.deliveryProvince =='澳门特别行政区' || this.deptBudgetList.deliveryProvince == '澳门特别行政区'){
			
 
				+            this.deptBudgetList.deliveryArea = '特别行政区'
			
 
				           }else{ 
			
 
				                  this.deptBudgetList.deliveryArea =  CodeToText[this.selectedOptions[2]]
			
 
				           }
			
--- a/src/views/contractManagement/futuresSalesContractEdit.vue
+++ b/src/views/contractManagement/futuresSalesContractEdit.vue
@@ -980,10 +980,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
@@ -1583,8 +1583,8 @@ export default {
 
				           this.deptBudgetList.compId = this.compId
			
 
				           this.deptBudgetList.contractType = 1
			
 
				           this.deptBudgetList.goodsType = 2
			
 
				-           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
			
 
				-            this.deptBudgetList.deliveryArea = "特别行政区"
			
 
				+           if(this.deptBudgetList.deliveryProvince =='澳门特别行政区' || this.deptBudgetList.deliveryProvince == '澳门特别行政区'){
			
 
				+            this.deptBudgetList.deliveryArea = '特别行政区'
			
 
				           }else{ 
			
 
				                  this.deptBudgetList.deliveryArea =  CodeToText[this.selectedOptions[2]]
			
 
				           }
			
--- a/src/views/contractManagement/purchaseContractAdd.vue
+++ b/src/views/contractManagement/purchaseContractAdd.vue
@@ -39,7 +39,7 @@
 
				           <ws-input
			
 
				             v-model="deptBudgetList.contractNo"
			
 
				             placeholder="请输入合同编号"
			
 
				-            maxlength="20"
			
 
				+            maxlength="50"
			
 
				             size="small"
			
 
				           />
			
 
				         </ws-form-item>
			
@@ -628,8 +628,8 @@ export default {
 
				           { required: true, message: '请输入活动名称', trigger: 'blur' },
			
 
				           {
			
 
				             min: 6,
			
 
				-            max: 20,
			
 
				-            message: '长度在 6 到 20 个字符',
			
 
				+            max: 50,
			
 
				+            message: '长度在 6 到 50 个字符',
			
 
				             trigger: 'blur',
			
 
				           },
			
 
				         ],
			
@@ -639,6 +639,8 @@ export default {
 
				     }
			
 
				   },
			
 
				   activated() {
			
 
				+    this.selectedOptions=[]
			
 
				+    this.selectedOptions1 = []
			
 
				     this.deptBudgetList.packingMethod = '散装'
			
 
				     this.deptBudgetList.packingMethodKey = 1
			
 
				     this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'
			
@@ -772,10 +774,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
--- a/src/views/contractManagement/purchaseContractEdit.vue
+++ b/src/views/contractManagement/purchaseContractEdit.vue
@@ -848,10 +848,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
@@ -1377,13 +1377,13 @@ export default {
 
				         
			
 
				           this.deptBudgetList.compId = this.compId
			
 
				           this.deptBudgetList.contractType = 2
			
 
				-           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
			
 
				-            this.deptBudgetList.deliveryArea = "特别行政区"
			
 
				+           if(this.deptBudgetList.deliveryProvince =='澳门特别行政区' || this.deptBudgetList.deliveryProvince == '澳门特别行政区'){
			
 
				+            this.deptBudgetList.deliveryArea = '特别行政区'
			
 
				           }else{ 
			
 
				                  this.deptBudgetList.deliveryArea =  CodeToText[this.selectedOptions1[2]]
			
 
				           }
			
 
				-             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
			
 
				-            this.deptBudgetList.sourceArea = "特别行政区"
			
 
				+             if(this.deptBudgetList.sourceProvince =='澳门特别行政区' || this.deptBudgetList.sourceProvince == '澳门特别行政区'){
			
 
				+            this.deptBudgetList.sourceArea = '特别行政区'
			
 
				           }else{
			
 
				                this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
			
 
				           }
			
--- a/src/views/contractManagement/salesContractAdd.vue
+++ b/src/views/contractManagement/salesContractAdd.vue
@@ -43,7 +43,7 @@
 
				             <ws-input
			
 
				               v-model="deptBudgetList.contractNo"
			
 
				               placeholder="请输入合同编号"
			
 
				-              maxlength="20"
			
 
				+              maxlength="50"
			
 
				               size="small"
			
 
				               :rules="ruleDeptBudget"
			
 
				             />
			
@@ -639,8 +639,8 @@ export default {
 
				           { required: true, message: '请输入活动名称', trigger: 'blur' },
			
 
				           {
			
 
				             min: 6,
			
 
				-            max: 20,
			
 
				-            message: '长度在 6 到 20 个字符',
			
 
				+            max: 50,
			
 
				+            message: '长度在 6 到 50 个字符',
			
 
				             trigger: 'blur',
			
 
				           },
			
 
				         ],
			
@@ -750,10 +750,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
--- a/src/views/contractManagement/salesContractEdit.vue
+++ b/src/views/contractManagement/salesContractEdit.vue
@@ -815,10 +815,10 @@ export default {
 
				       }
			
 
				       if (
			
 
				         this.deptBudgetList.contractNo.length < 6 ||
			
 
				-        this.deptBudgetList.contractNo.length > 20
			
 
				+        this.deptBudgetList.contractNo.length > 50
			
 
				       ) {
			
 
				         this.$message({
			
 
				-          message: '合同编号长度不符合要求,请输入6到20个字符之内！',
			
 
				+          message: '合同编号长度不符合要求,请输入6到50个字符之内！',
			
 
				           type: 'warning',
			
 
				         })
			
 
				         return
			
--- a/src/views/houseSelfCollect/inspectInfo.vue
+++ b/src/views/houseSelfCollect/inspectInfo.vue
@@ -567,14 +567,17 @@
 
				         }
			
 
				         this.inspect.warehouseName = this.warehouseName
			
 
				         this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				-        this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
			
 
				         if (this.types == 1) {
			
 
				+          this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
			
 
				           this.$confirm('确定保存质检信息？', '提示', {
			
 
				               confirmButtonText: '确定',
			
 
				               cancelButtonText: '取消',
			
 
				               type: 'warning',
			
 
				             })
			
 
				             .then(() => {
			
 
				+              if(!this.inspect.tidalGrainPrice||this.inspect.tidalGrainPrice=='NaN'){
			
 
				+                this.inspect.tidalGrainPrice = 0
			
 
				+              }
			
 
				               inspectAdd(this.inspect)
			
 
				                 .toPromise()
			
 
				                 .then((response) => {
			
@@ -595,6 +598,7 @@
 
				               return false
			
 
				             })
			
 
				         } else if (this.types == 3) {
			
 
				+          this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
			
 
				           this.inspect.flag=0
			
 
				           this.$confirm('确定保存初检信息？', '提示', {
			
 
				               confirmButtonText: '确定',
			
@@ -636,7 +640,7 @@
 
				             })
			
 
				         }else if (this.types == 5) {
			
 
				           this.inspect.flag=2
			
 
				-          this.inspect.reInspector=sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
			
 
				+          // this.inspect.reInspector=sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
			
 
				           this.$confirm('确定保存质检信息？', '提示', {
			
 
				               confirmButtonText: '确定',
			
 
				               cancelButtonText: '取消',
			
@@ -709,11 +713,14 @@
 
				 
			
 
				       waterContentChange(type) {
			
 
				         if (this.inspect.goodsName&&type!='water') {
			
 
				-          getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
			
 
				-          .toPromise()
			
 
				-          .then((response) => { 
			
 
				-            this.$set(this.inspect,'dryGrainPrice',response)
			
 
				-          })
			
 
				+          if(!this.inspect.dryGrainPrice||this.inspect.dryGrainPrice == 0){
			
 
				+            getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
			
 
				+            .toPromise()
			
 
				+            .then((response) => { 
			
 
				+              this.$set(this.inspect,'dryGrainPrice',response)
			
 
				+            })
			
 
				+          }
			
 
				+          
			
 
				           for (var i = 0; i < this.purchasePriceList.length; i++) {
			
 
				             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
			
 
				               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
			
--- a/src/views/houseSelfCollect/inspectionManagement.vue
+++ b/src/views/houseSelfCollect/inspectionManagement.vue
@@ -79,8 +79,6 @@
 
				            <span class="water-left">{{scope.row.buckleMiscellaneous}} </span> 
			
 
				           <span class="water-line">|</span> 
			
 
				           <span class="water-right">{{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span> 
			
 
				-           <!-- <div v-if="scope.row.paramType == 1"> <span>{{scope.row.buckleMiscellaneous}} | {{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span></div> -->
			
 
				-         <!-- <div v-else>{{scope.row.reBuckleMiscellaneous}}</div> -->
			
 
				          </div>
			
 
				         </template>
			
 
				        </el-table-column>
			
@@ -97,7 +95,7 @@
 
				       </el-table-column>
			
 
				       <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 prop="qualityInspector" label="质检员" width="100px">
			
 
				           <template scope="scope">
			
 
				             <span>{{scope.row.qualityInspector}}</span>
			
 
				             <span v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
			
@@ -106,7 +104,7 @@
 
				 
			
 
				 
			
 
				       </el-table-column>
			
 
				-      <el-table-column prop="updateDate" label="质检时间"></el-table-column>
			
 
				+      <el-table-column prop="updateDate" label="质检时间"  width="90px"></el-table-column>
			
 
				       <el-table-column prop="status" label="状态">
			
 
				         <template slot-scope="scope">
			
 
				           <span v-if='scope.row.confirm=="1"'>
			
@@ -119,15 +117,14 @@
 
				       </el-table-column>
			
 
				       <el-table-column width="500" label="操作">
			
 
				         <template slot-scope="scope">
			
 
				-          <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
			
 
				+           <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
			
 
				           <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
			
 
				           <div v-show="scope.row.confirm !='1' && scope.row.status == '已复检'" style="display: inline-block;">
			
 
				            <el-button @click="inspectInfo(scope.row, 5)" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button></div>
			
 
				            <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm !='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
			
 
				-            <!-- <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">初检</el-button>
			
 
				-            <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">确认</el-button>
			
 
				-            <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.status!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">复检</el-button> -->
			
 
				-          <el-button @click="del(scope.row)" v-if="!scope.row.weighingManagement || scope.row.weighingManagement.status=='已质检'" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
			
 
				+          <div  style="display: inline-block;" v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已质检'">
			
 
				+            <el-button @click="del(scope.row)" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
			
 
				+          </div>
			
 
				           <el-button @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
			
 
				         </template>
			
 
				       </el-table-column>
			
@@ -232,6 +229,7 @@ export default {
 
				       })
			
 
				     },
			
 
				     warehouseNameChange(e) {
			
 
				+      // console.log(e)
			
 
				       for(let i = 0 ; i < this.warehouseList.length; i++){
			
 
				         if(this.warehouseList[i].value == e){
			
 
				            this.warehouseName = this.warehouseList[i].value
			
@@ -336,6 +334,7 @@ export default {
 
				       })
			
 
				         .toPromise()
			
 
				         .then((response) => {
			
 
				+          console.log(response)
			
 
				           this.inspect = response.records
			
 
				           this.deptBudgetTotal = response.total
			
 
				         })
			
--- a/src/views/houseSelfCollect/settlement.vue
+++ b/src/views/houseSelfCollect/settlement.vue
@@ -69,7 +69,7 @@
 
				                 <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
			
 
				             </ws-form-item>
			
 
				              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
			
 
				-                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" />
			
 
				+                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" disabled placeholder="请输入干粮单价" maxlength="100" size="small" />
			
 
				             </ws-form-item>
			
 
				              <ws-form-item v-if='paymentList.type=="干粮"' label="净重（公斤）" span="1" prop="waterContent">
			
 
				                 <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />
			
--- a/src/views/houseSelfCollect/weighingManagement.vue
+++ b/src/views/houseSelfCollect/weighingManagement.vue
@@ -166,7 +166,7 @@ export default {
 
				         qualityInspectionManagement:{},
			
 
				       },
			
 
				       purchasePriceList:[],
			
 
				-      allowEdit:'',
			
 
				+      allowEdit:false,
			
 
				       disabled:false
			
 
				     }
			
 
				   },
			
@@ -275,6 +275,7 @@ export default {
 
				             this.warehouseId=_wareHouse.id
			
 
				              this.warehouseNo =_wareHouse.commonWarehouseNo
			
 
				              this.monitorUrl1=_wareHouse.monitorUrl1
			
 
				+              this.allowEdit = _wareHouse.allowEdit
			
 
				              this.monitorUrl2=_wareHouse.monitorUrl2
			
 
				           } else {
			
 
				             if (this.cangid&&this.cangid == response[i].id) {
			
--- a/src/views/houseSelfCollect/weightCheck.vue
+++ b/src/views/houseSelfCollect/weightCheck.vue
@@ -168,6 +168,16 @@
 
				     components: {
			
 
				       weightCheckPrint,
			
 
				     },
			
 
				+    watch:{
			
 
				+      weighingList:{//深度监听，可监听到对象、数组的变化
			
 
				+         handler(val, oldVal){
			
 
				+           if(val.tare){
			
 
				+             this.weighingList.netWeight = this.weighingList.grossWeight - val.tare
			
 
				+           }
			
 
				+         },
			
 
				+         deep:true //true 深度监听
			
 
				+     }
			
 
				+    },
			
 
				     data() {
			
 
				       return {
			
 
				         currentPage: 1,
			
@@ -195,7 +205,7 @@
 
				           buckleMiscellaneous: 0,
			
 
				         },
			
 
				         tpyeNo: '',
			
 
				-        disabled: false,
			
 
				+        disabled: true,
			
 
				         relationId: '',
			
 
				         warehouseId: '',
			
 
				         purchasePriceList: [],
			
@@ -229,7 +239,9 @@
 
				       if (!this.$route.query.grossWeight) {
			
 
				         this.$route.query.grossWeight = 0
			
 
				       }
			
 
				-      this.weighingList.grossWeight = this.$route.query.grossWeight
			
 
				+      else{
			
 
				+        this.weighingList.grossWeight = this.$route.query.grossWeight
			
 
				+      }
			
 
				       // this.purchasePriceList = this.$route.query.purchasePriceList
			
 
				       // console.log(this.purchasePriceList, '上限')
			
 
				       this.allowEdit = this.$route.query.allowEdit
			
@@ -420,9 +432,13 @@
 
				               }
			
 
				             }
			
 
				             if (this.tpyeNo != 2) {
			
 
				-              this.weighingList.grossWeight = parseInt(result)
			
 
				+              if(parseInt(result)){
			
 
				+                this.weighingList.grossWeight = parseInt(result)
			
 
				+              }
			
 
				             } else {
			
 
				-              this.weighingList.tare = parseInt(result)
			
 
				+              if(parseInt(result)){
			
 
				+                this.weighingList.tare = parseInt(result)
			
 
				+              }
			
 
				             }
			
 
				             setTimeout(1000)
			
 
				             // value 是一个 Uint8Array
			
--- a/src/views/outboundManagement/weighing.vue
+++ b/src/views/outboundManagement/weighing.vue
@@ -46,13 +46,13 @@
 
				 									:value="item.value" />
			
 
				 							</ws-select>
			
 
				 						</ws-form-item>
			
 
				-						<ws-form-item label="毛重（公斤）" span="1" prop="grossWeight" v-if="this.types == 1">
			
 
				+						<ws-form-item label="毛重（公斤）" span="1" prop="grossWeight" v-if="this.types == 1 || this.types == 4">
			
 
				 							<ws-input v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重"
			
 
				 								maxlength="100" size="small"  />
			
 
				 						</ws-form-item>
			
 
				-						<el-button type="primary" v-if="this.types == 1" @click="openPort">重新获取</el-button>
			
 
				+						<el-button type="primary" v-if="this.types == 1|| this.types == 4" @click="openPort">重新获取</el-button>
			
 
				 
			
 
				-						<ws-form-item label="皮重（公斤）" span="1" prop="tare">
			
 
				+						<ws-form-item label="皮重（公斤）"  v-if="this.types == 2|| this.types == 3" span="1" prop="tare">
			
 
				 							<!-- <ws-input v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small"
			
 
				 								disabled /> -->
			
 
				 								<ws-input @input="calculation" v-model="weighingList.tare" placeholder="未获取到皮重" 
			
@@ -60,29 +60,13 @@
 
				 								<!-- <ws-input @input="calculation" v-model="weighingList.tare" placeholder="未获取到皮重" 
			
 
				 								maxlength="100" size="small"/> -->
			
 
				 						</ws-form-item>
			
 
				-						<el-button type="primary" v-if="this.types == 2 || this.types == null" @click="openPort">重新获取</el-button>
			
 
				+						<el-button type="primary" v-if="this.types == 2 || this.types == 3" @click="openPort">重新获取</el-button>
			
 
				 						<!-- <div class="formItem"> -->
			
 
				-						<ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="this.types == 1">
			
 
				+						<ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="(this.types == 1&&this.weighingList.tare)||(this.types == 2&&this.weighingList.grossWeight)">
			
 
				 							<ws-input v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"
			
 
				 								disabled />
			
 
				 						</ws-form-item>
			
 
				 						<!-- </div> -->
			
 
				-						<div class="bangdan">
			
 
				-							<el-form-item label="上传磅单" v-if="this.types == 1">
			
 
				-							</el-form-item>
			
 
				-							<!-- <el-upload action="https://www.zthymaoyi.com/upload/admin" 
			
 
				-								list-type="picture-card"
			
 
				-								:on-success="(res, file) => {handlePictureCardPreview1(res)}"
			
 
				-								:on-remove="handleRemove" class="photo2" v-if="this.types == 1">
			
 
				-								<i class="el-icon-plus"></i>
			
 
				-							</el-upload> -->
			
 
				-							<ws-upload ref="upload" :comp-id="compId" :appendix-ids="weighingList.addressUrl"
			
 
				-								:size-limit="size" @onChange="onChange" v-if="this.types == 1"
			
 
				-								accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				-							<el-dialog :visible.sync="dialogVisible" v-if="this.types == 1">
			
 
				-								<img width="100%" :src="weighingList.addressUrl" alt="" />
			
 
				-							</el-dialog>
			
 
				-						</div>
			
 
				 					</ws-info-table>
			
 
				 					<div class="but">
			
 
				 						<el-button @click="cancel" type="primary">取消</el-button>
			
@@ -112,7 +96,7 @@
 
				 			return {
			
 
				 				inspect: {},
			
 
				 				types: 3,
			
 
				-				information: '添加皮重',
			
 
				+				information: '',
			
 
				 				weighingList: {
			
 
				 					carNumber: '',
			
 
				 					storageNumber: '',
			
@@ -167,7 +151,7 @@
 
				 			this.relationId = this.$route.query.relationId
			
 
				 			this.warehouseId = this.$route.query.warehouseId
			
 
				 			if (this.types == 1) {
			
 
				-				this.information = '毛重'
			
 
				+				this.information = '编辑毛重'
			
 
				 				this.disabled = true
			
 
				 				this.disabled1 = true
			
 
				 				this.disabled2 = true
			
@@ -175,8 +159,14 @@
 
				 				this.information = '编辑皮重'
			
 
				 				this.disabled1 = true
			
 
				 				this.disabled2 = true
			
 
				-			} else {
			
 
				+			} else if(this.types == 3) {
			
 
				+				this.information = '添加皮重'
			
 
				 				this.disabled2 = true
			
 
				+				this.disabled1 = false
			
 
				+			}else if(this.types == 4) {
			
 
				+				this.information = '添加毛重'
			
 
				+				this.disabled2 = true
			
 
				+				this.disabled1 = false
			
 
				 			}
			
 
				 			this.getList(id)
			
 
				 		},
			
@@ -203,17 +193,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
			
 
				 					}
			
 
				 				}
			
@@ -301,7 +291,7 @@
 
				 					})
			
 
				 			},
			
 
				 			print() {
			
 
				-				if (this.types == null || this.types == 2) {
			
 
				+				if (this.types == 1 || this.types == 2) {
			
 
				 					if (!this.weighingList.contractNo) {
			
 
				 						this.$message({
			
 
				 							message: '合同编号不能为空',
			
--- a/src/views/outboundManagement/weighingManagement.vue
+++ b/src/views/outboundManagement/weighingManagement.vue
@@ -3,7 +3,8 @@
 
				 	<div>
			
 
				 		<BaseHeaderLayout :leftSpan="12">
			
 
				 			<template slot="left">
			
 
				-				<ws-button type="primary" @click="weighing(3)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加</ws-button>
			
 
				+				<ws-button type="primary" @click="weighing(3)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加皮重</ws-button>
			
 
				+				<ws-button type="primary" @click="weighing(4)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加毛重</ws-button>
			
 
				 			</template>
			
 
				 			<!-- <template slot="left"> </template> -->
			
 
				 			<template slot="right">
			
--- a/src/views/platformaudit/grainPulseDynamic.vue
+++ b/src/views/platformaudit/grainPulseDynamic.vue
@@ -139,7 +139,7 @@
 
				         </el-form-item>
			
 
				         <el-form-item label="附件" :label-width="formLabelWidth">
			
 
				           <div :key="index" v-for="(item, index) in SettledCompanyDynamicsList.address">
			
 
				-          <img style="float:left" v-if="item" :src="item" class="avatar">
			
 
				+          <img  style="float:left" v-if="item" :src="item" class="avatar">
			
 
				           </div>
			
 
				         </el-form-item>
			
 
				       </el-form>
			
@@ -153,6 +153,7 @@
 
				         </span>
			
 
				       </div>
			
 
				     </el-dialog>
			
 
				+    
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
@@ -186,7 +187,7 @@ export default {
 
				       dialogViewSpareMoney: false,
			
 
				       // 表格显示数据
			
 
				       tableDate: [],
			
 
				-
			
 
				+      wrapstatus:false,
			
 
				       // 是否显示
			
 
				       showType: true,
			
 
				       // 年
			
@@ -196,6 +197,7 @@ export default {
 
				       deptBudgetTotal: 0,
			
 
				       searchTypeText: '待审核',
			
 
				       searchKeyWord: '',
			
 
				+      imgUrl:'',
			
 
				       // 提交类型
			
 
				       submitType: true,
			
 
				       size: 10,
			
@@ -232,6 +234,7 @@ export default {
 
				     this.showType = this.isShow
			
 
				   },
			
 
				   methods: {
			
 
				+    
			
 
				     getSpanArr(data) {
			
 
				       let that = this
			
 
				       //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
			
@@ -616,4 +619,7 @@ export default {
 
				   height: 178px;
			
 
				   display: block;
			
 
				 }
			
 
				+.shade{
			
 
				+background:rgba(0,0,0,0.1);
			
 
				+}
			
 
				 </style>
			
--- a/src/views/platformaudit/grainmerchantreview.vue
+++ b/src/views/platformaudit/grainmerchantreview.vue
@@ -255,27 +255,27 @@
 
				         style="display: inline-block; margin: 5px"
			
 
				         v-if='accessoryimages.businessLicenseAddressUrl'
			
 
				       >
			
 
				-        <img width="100" height="100" :src="accessoryimages.businessLicenseAddressUrl" alt="" />
			
 
				+        <img  @click='magnify(accessoryimages.businessLicenseAddressUrl)' width="100" height="100" :src="accessoryimages.businessLicenseAddressUrl" alt="" />
			
 
				       </div>
			
 
				       <div
			
 
				         style="display: inline-block; margin: 5px"
			
 
				       >
			
 
				-        <img width="100" height="100" :src="accessoryimages.cardAddressUrl" alt="" />
			
 
				+        <img @click='magnify(accessoryimages.cardAddressUrl)' width="100" height="100" :src="accessoryimages.cardAddressUrl" alt="" />
			
 
				       </div>
			
 
				       <div
			
 
				         style="display: inline-block; margin: 5px"
			
 
				       >
			
 
				-        <img width="100" height="100" :src="accessoryimages.cardAddressUrl1" alt="" />
			
 
				+        <img @click='magnify(accessoryimages.cardAddressUrl1)' width="100" height="100" :src="accessoryimages.cardAddressUrl1" alt="" />
			
 
				       </div>
			
 
				       <div
			
 
				         style="display: inline-block; margin: 5px"
			
 
				       >
			
 
				-        <img width="100" height="100" :src="accessoryimages.payeeAddressUrl" alt="" />
			
 
				+        <img @click='magnify(accessoryimages.payeeAddressUrl)' width="100" height="100" :src="accessoryimages.payeeAddressUrl" alt="" />
			
 
				       </div>
			
 
				       <div
			
 
				         style="display: inline-block; margin: 5px"
			
 
				       >
			
 
				-        <img width="100" height="100" :src="accessoryimages.payeeAddressUrl1" alt="" />
			
 
				+        <img @click='magnify(accessoryimages.payeeAddressUrl1)' width="100" height="100" :src="accessoryimages.payeeAddressUrl1" alt="" />
			
 
				       </div>
			
 
				     </WinseaContentModal>
			
 
				     <WinseaContentModal
			
@@ -284,8 +284,11 @@
 
				       @on-cancel="handleClose1"
			
 
				     >
			
 
				       <p>查看附件</p>
			
 
				-      <img width="100" height="100" :src="accessurl" alt="" />
			
 
				+      <img @click='magnify(item)' width="100" height="100" :src="accessurl" alt="" />
			
 
				     </WinseaContentModal>
			
 
				+    <div @click='colseshade' class='shade' v-if='wrapstatus'>
			
 
				+      <img style='width:60%;' :src="imgUrl" alt="">
			
 
				+    </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
@@ -322,6 +325,7 @@ export default {
 
				       tableDate: [],
			
 
				       // 是否显示
			
 
				       showType: true,
			
 
				+      wrapstatus:false,
			
 
				       // 年
			
 
				       year: '',
			
 
				       accessoryimages:{},
			
@@ -385,6 +389,13 @@ export default {
 
				     this.showType = this.isShow
			
 
				   },
			
 
				   methods: {
			
 
				+    magnify(item){
			
 
				+      this.wrapstatus=true
			
 
				+      this.imgUrl=item
			
 
				+    },
			
 
				+    colseshade(){
			
 
				+      this.wrapstatus=false
			
 
				+    },
			
 
				     expandsHandle(row) {
			
 
				       row.expandsStatus = !row.expandsStatus
			
 
				       this.$refs.expandstable.toggleRowExpansion(row)
			
@@ -685,4 +696,22 @@ export default {
 
				 /deep/.el-table td {
			
 
				   border-right: 1px solid #eee;
			
 
				 }
			
 
				+.shade{
			
 
				+background:rgba(0,0,0,0.1);
			
 
				+position:fixed;
			
 
				+width:100%;
			
 
				+height:100%;
			
 
				+top:0;left:0;
			
 
				+z-index:1026;
			
 
				+text-align:center;
			
 
				+overflow: scroll;
			
 
				+}
			
 
				+.shade img{
			
 
				+  position:absolute;
			
 
				+  top:0;
			
 
				+  left:0;
			
 
				+  bottom:0;
			
 
				+  right:0;
			
 
				+  margin:auto;
			
 
				+}
			
 
				 </style>
			
--- a/src/views/taskManagement/tranManagementWarehouseInOutTask.vue
+++ b/src/views/taskManagement/tranManagementWarehouseInOutTask.vue
@@ -3,76 +3,36 @@
 
				   <div class="container">
			
 
				     <BaseHeaderLayout :leftSpan="12">
			
 
				       <template slot="left">
			
 
				-        <ws-button
			
 
				-          type="primary"
			
 
				-          @click="handleAdd()"
			
 
				-          v-hasPermission="
			
 
				+        <ws-button type="primary" @click="handleAdd()" v-hasPermission="
			
 
				             `warehouseManagement.warehouse.warehouseInfoTask.add`
			
 
				-          "
			
 
				-        >
			
 
				-          <img
			
 
				-            width="13"
			
 
				-            height="13"
			
 
				-            style="
			
 
				+          ">
			
 
				+          <img width="13" height="13" style="
			
 
				               vertical-align: text-top;
			
 
				               position: relative;
			
 
				               top: 2px;
			
 
				               left: -4px;
			
 
				-            "
			
 
				-            src="../../../public/img/header-add.png"
			
 
				-            alt
			
 
				-          />添加
			
 
				+            " src="../../../public/img/header-add.png" alt />添加
			
 
				         </ws-button>
			
 
				       </template>
			
 
				       <template slot="right">
			
 
				-        <span style="width: 70px; display: inline-block; color: #8890b1"
			
 
				-          >状态：</span
			
 
				-        >
			
 
				-        <ws-select
			
 
				-          v-model="searchTypeText"
			
 
				-          placeholder
			
 
				-          class="typeselect"
			
 
				-          @change="selecttaskType"
			
 
				-          :value="searchType"
			
 
				-        >
			
 
				-          <ws-option
			
 
				-            v-for="item in taskTypeList"
			
 
				-            :key="item.value"
			
 
				-            :label="item.value"
			
 
				-            :value="item.value"
			
 
				-            style="color: #8890b1"
			
 
				-          />
			
 
				+        <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
			
 
				+        <ws-select v-model="searchTypeText" placeholder class="typeselect" @change="selecttaskType" :value="searchType">
			
 
				+          <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
			
 
				+            style="color: #8890b1" />
			
 
				         </ws-select>
			
 
				-        <ws-input
			
 
				-          v-model="searchKeyWord"
			
 
				-          placeholder="可按合同编号或任务编号查找"
			
 
				-          clearable
			
 
				-          maxlength="500"
			
 
				-          type="input"
			
 
				-        ></ws-input>
			
 
				+        <ws-input v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找" clearable maxlength="500" type="input"></ws-input>
			
 
				         <ws-button class="find" type="primary" @click="lookUp()">
			
 
				-          <img
			
 
				-            width="16"
			
 
				-            height="16"
			
 
				-            style="
			
 
				+          <img width="16" height="16" style="
			
 
				               vertical-align: text-top;
			
 
				               position: relative;
			
 
				               top: 0px;
			
 
				               left: -7px;
			
 
				-            "
			
 
				-            src="../../../public/img/sousuo.png"
			
 
				-            alt
			
 
				-          />
			
 
				+            " src="../../../public/img/sousuo.png" alt />
			
 
				         </ws-button>
			
 
				       </template>
			
 
				     </BaseHeaderLayout>
			
 
				     <div class="navv">
			
 
				-      <el-table
			
 
				-        class="wenzi"
			
 
				-        :data="gainList.records"
			
 
				-        style="width: 100%"
			
 
				-        height="780"
			
 
				-      >
			
 
				+      <el-table class="wenzi" :data="gainList.records" style="width: 100%" height="780">
			
 
				         <el-table-column type="index" label="序号">
			
 
				           <template scope="scope">
			
 
				             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
			
@@ -100,543 +60,511 @@
 
				             </div>
			
 
				           </template> -->
			
 
				         </el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="warehouseName"
			
 
				-          class="table_td"
			
 
				-          label="库房名"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="inOutType"
			
 
				-          class="table_td"
			
 
				-          label="出入库类型"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="goodsName"
			
 
				-          class="table_td"
			
 
				-          label="货名"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="weight"
			
 
				-          class="table_td"
			
 
				-          label="重量（吨）"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="predictDate"
			
 
				-          class="table_td"
			
 
				-          label="预计日期"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="publisher"
			
 
				-          class="table_td"
			
 
				-          label="发布者"
			
 
				-        ></el-table-column>
			
 
				+        <el-table-column prop="warehouseName" class="table_td" label="库房名"></el-table-column>
			
 
				+        <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
			
 
				+        <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
			
 
				+        <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
			
 
				+        <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
			
 
				+        <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
			
 
				         <el-table-column prop="taskStatus" label="状态">
			
 
				           <template slot-scope="scope">
			
 
				-             <template>
			
 
				-                <span slot="reference">
			
 
				-                  <span
			
 
				-                    v-if="scope.row.taskStatus == '待审核'"
			
 
				-                    class="executory"
			
 
				-                  ></span>
			
 
				-                  <span
			
 
				-                    v-if="scope.row.taskStatus == '执行中'"
			
 
				-                    class="inExecution"
			
 
				-                  ></span>
			
 
				-                  <span
			
 
				-                    v-if="scope.row.taskStatus == '已完成'"
			
 
				-                    class="done"
			
 
				-                  ></span>
			
 
				-                  {{ scope.row.taskStatus }}
			
 
				-                </span>
			
 
				-              </template>
			
 
				-            <img
			
 
				-              v-if="scope.row.taskStatus == '执行中'"
			
 
				-              width="17"
			
 
				-              height="18"
			
 
				-              style="vertical-align: text-top; position: relative; top: -1px"
			
 
				-              src="../../../public/img/edit.png"
			
 
				-              @click="editClick(scope.row)"
			
 
				-              alt
			
 
				-            />
			
 
				+            <template>
			
 
				+              <span slot="reference">
			
 
				+                <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
			
 
				+                <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
			
 
				+                <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
			
 
				+                {{ scope.row.taskStatus }}
			
 
				+              </span>
			
 
				+            </template>
			
 
				+            <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
			
 
				+              style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
			
 
				+              @click="editClick(scope.row)" alt />
			
 
				           </template>
			
 
				         </el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="establishDate"
			
 
				-          class="table_td"
			
 
				-          label="创建时间"
			
 
				-        ></el-table-column>
			
 
				+        <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
			
 
				         <el-table-column prop="seller" label="操作" width="300">
			
 
				           <template slot-scope="scope">
			
 
				-            <span
			
 
				-              class="corles"
			
 
				-              @click="nocomplete(scope.row)"
			
 
				-              v-hasPermission="
			
 
				+            <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="
			
 
				                 `warehouseManagement.warehouse.warehouseInfoTask.View`
			
 
				-              "
			
 
				-              >查看</span
			
 
				-            >
			
 
				-            <span  v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit` ">
			
 
				-             <el-divider
			
 
				-              direction="vertical"
			
 
				-              v-if="scope.row.taskStatus == '待审核'"
			
 
				-            ></el-divider>
			
 
				-            </span>
			
 
				-           
			
 
				-            <span
			
 
				-              class="corles"
			
 
				-              v-hasPermission="
			
 
				+
			
 
				+              ">查看</span>
			
 
				+            <!-- <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider> -->
			
 
				+            <span class="corles" v-hasPermission="
			
 
				                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
			
 
				-              "
			
 
				-              v-if="scope.row.taskStatus == '待审核'"
			
 
				-              @click="audit(scope.row)"
			
 
				-              >审核</span
			
 
				-            >
			
 
				-            <el-divider
			
 
				-              direction="vertical"
			
 
				-              class="divider"
			
 
				-              v-if="
			
 
				+              " v-if="scope.row.taskStatus == '待审核'" @click="audit(scope.row)">审核</span>
			
 
				+            <el-divider direction="vertical" class="divider" v-if="
			
 
				                 scope.row.taskStatus == '待审核' ||
			
 
				                 scope.row.taskStatus == '执行中' ||
			
 
				                 scope.row.taskStatus == '已驳回'
			
 
				-              "
			
 
				-            ></el-divider>
			
 
				-            <span
			
 
				-              class="corles"
			
 
				-              v-hasPermission="
			
 
				+              "></el-divider>
			
 
				+            <span class="corles" v-hasPermission="
			
 
				                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
			
 
				-              "
			
 
				-              v-if="
			
 
				+              " v-if="
			
 
				                 scope.row.taskStatus == '待审核' ||
			
 
				                 scope.row.taskStatus == '执行中' ||
			
 
				                 scope.row.taskStatus == '已驳回'
			
 
				-              "
			
 
				-              @click="delivery(scope.row)"
			
 
				-              >编辑</span
			
 
				-            >
			
 
				-            <el-divider
			
 
				-            v-hasPermission="
			
 
				+              " @click="delivery(scope.row)">编辑</span>
			
 
				+            <el-divider v-hasPermission="
			
 
				                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
			
 
				-              "
			
 
				-              direction="vertical"
			
 
				-              v-if="scope.row.taskId == null"
			
 
				-            ></el-divider>
			
 
				-            <span
			
 
				-              class="corles"
			
 
				-              v-hasPermission="
			
 
				+              " direction="vertical" v-if="scope.row.taskId == null"></el-divider>
			
 
				+            <span class="corles" v-hasPermission="
			
 
				                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
			
 
				-              "
			
 
				-              v-if="scope.row.taskId == null"
			
 
				-              @click="deleteclick(scope.row)"
			
 
				-              >删除</span
			
 
				-            >
			
 
				+              " v-if="scope.row.taskId == null" @click="deleteclick(scope.row)">删除</span>
			
 
				           </template>
			
 
				         </el-table-column>
			
 
				       </el-table>
			
 
				-      <el-pagination
			
 
				-        @size-change="handleSizeChange"
			
 
				-        @current-change="handleCurrentChange"
			
 
				-        :current-page="currentPage"
			
 
				-        :page-size="pageSize"
			
 
				-        layout="total, sizes, prev, pager, next, jumper"
			
 
				-        :total="deptBudgetTotal"
			
 
				-      ></el-pagination>
			
 
				+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
			
 
				+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				-import { getoreditoutput, outdelete, movestates } from '@/model/tasksport/index'
			
 
				-import { downloadFile } from '@/utils/batchDown'
			
 
				-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()
			
 
				+  import {
			
 
				+    getoreditoutput,
			
 
				+    outdelete,
			
 
				+    movestates
			
 
				+  } from '@/model/tasksport/index'
			
 
				+  import {
			
 
				+    downloadFile
			
 
				+  } from '@/utils/batchDown'
			
 
				+  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,
			
 
				     },
			
 
				-    isShow(val) {
			
 
				-      this.showType = val
			
 
				+    watch: {
			
 
				+      vesselId(val) {
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      isShow(val) {
			
 
				+        this.showType = val
			
 
				+      },
			
 
				     },
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      //弹出框
			
 
				-      dialogViewSpareMoney: false,
			
 
				-      dialogApproveFormVisible: false,
			
 
				-      // 船舶类型
			
 
				-      monetaryKey: null,
			
 
				-      // 表格显示数据
			
 
				-      tableDate: [],
			
 
				+    data() {
			
 
				+      return {
			
 
				+        //弹出框
			
 
				+        dialogViewSpareMoney: false,
			
 
				+        dialogApproveFormVisible: false,
			
 
				+        // 船舶类型
			
 
				+        monetaryKey: null,
			
 
				+        // 表格显示数据
			
 
				+        tableDate: [],
			
 
				 
			
 
				-      // 是否显示
			
 
				-      showType: true,
			
 
				-      // 年
			
 
				-      year: '',
			
 
				-      gainList: [],
			
 
				-      currentPage: 1,
			
 
				-      primary: '1',
			
 
				-      pageSize: 10,
			
 
				-      searchType: 1,
			
 
				-      searchTypeText: '待审核',
			
 
				-      searchKeyWord: '',
			
 
				-      contractType: 2,
			
 
				-      taskTypeList: [
			
 
				-        { value: '待审核', type: 1 },
			
 
				-        { value: '执行中', type: 3 },
			
 
				-        { value: '已驳回', type: 2 },
			
 
				-        { value: '已完成', type: 4 },
			
 
				-        { value: '全部任务', type: '' },
			
 
				-      ],
			
 
				-      // 提交类型
			
 
				-      submitType: true,
			
 
				-      size: 10,
			
 
				-      spanArr: [],
			
 
				-      warehouseName: '',
			
 
				-      deptBudgetTotal: 0,
			
 
				-      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-      deptCircularPage: {},
			
 
				-      historyList: [],
			
 
				-      pickerBeginDateBefore: {
			
 
				-        disabledDate: (time) => {
			
 
				-          return time.getTime() > Date.now()
			
 
				+        // 是否显示
			
 
				+        showType: true,
			
 
				+        // 年
			
 
				+        year: '',
			
 
				+        gainList: [],
			
 
				+        currentPage: 1,
			
 
				+        primary: '1',
			
 
				+        pageSize: 10,
			
 
				+        searchType: 1,
			
 
				+        searchTypeText: '待审核',
			
 
				+        searchKeyWord: '',
			
 
				+        contractType: 2,
			
 
				+        taskTypeList: [{
			
 
				+            value: '待审核',
			
 
				+            type: 1
			
 
				+          },
			
 
				+          {
			
 
				+            value: '执行中',
			
 
				+            type: 3
			
 
				+          },
			
 
				+          {
			
 
				+            value: '已驳回',
			
 
				+            type: 2
			
 
				+          },
			
 
				+          {
			
 
				+            value: '已完成',
			
 
				+            type: 4
			
 
				+          },
			
 
				+          {
			
 
				+            value: '全部任务',
			
 
				+            type: ''
			
 
				+          },
			
 
				+        ],
			
 
				+        // 提交类型
			
 
				+        submitType: true,
			
 
				+        size: 10,
			
 
				+        spanArr: [],
			
 
				+        warehouseName: '',
			
 
				+        deptBudgetTotal: 0,
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+        deptCircularPage: {},
			
 
				+        historyList: [],
			
 
				+        pickerBeginDateBefore: {
			
 
				+          disabledDate: (time) => {
			
 
				+            return time.getTime() > Date.now()
			
 
				+          },
			
 
				         },
			
 
				-      },
			
 
				-      accessoryTFs: false,
			
 
				-    }
			
 
				-  },
			
 
				-  activated() {
			
 
				-    this.getList()
			
 
				-    this.showType = this.isShow
			
 
				-  },
			
 
				-  mounted() {
			
 
				-    this.getList()
			
 
				-    this.showType = this.isShow
			
 
				-  },
			
 
				-  methods: {
			
 
				-    //添加
			
 
				-    handleAdd() {
			
 
				-      this.$router.push({ path: 'tranManagementWarehouseInOuttaskAdd' })
			
 
				+        accessoryTFs: false,
			
 
				+      }
			
 
				     },
			
 
				-    //查找
			
 
				-    lookUp() {
			
 
				-      this.currentPage = 1
			
 
				+    activated() {
			
 
				       this.getList()
			
 
				+      this.showType = this.isShow
			
 
				     },
			
 
				-    deleteclick(row) {
			
 
				-      var text = ''
			
 
				-      if (
			
 
				-        (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
			
 
				-        (row.taskTypeKey == 4 && row.inOutType == '销售出库') ||
			
 
				-        (row.taskTypeKey == 4 && row.inOutType == '退库')
			
 
				-      ) {
			
 
				-        text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
			
 
				-      } else {
			
 
				-        text = `任务删除后不可恢复，是否确定删除？`
			
 
				-      }
			
 
				-      //cancelButtonClass: "btn-custom-cancel"
			
 
				-      this.$confirm(text, {
			
 
				-        confirmButtonText: '确定',
			
 
				-        cancelButtonText: '取消',
			
 
				-        type: 'warning',
			
 
				-      })
			
 
				-        .then(() => {
			
 
				-          outdelete({
			
 
				-            id: row.id,
			
 
				-            relevanceId: row.relevanceId,
			
 
				-            inOutFlag: row.inOutFlag,
			
 
				-          })
			
 
				-            .toPromise()
			
 
				-            .then((response) => {
			
 
				-              this.getList()
			
 
				-            })
			
 
				+    mounted() {
			
 
				+      this.getList()
			
 
				+      this.showType = this.isShow
			
 
				+    },
			
 
				+    methods: {
			
 
				+      //添加
			
 
				+      handleAdd() {
			
 
				+        this.$router.push({
			
 
				+          path: 'tranManagementWarehouseInOuttaskAdd'
			
 
				         })
			
 
				-        .catch(() => {
			
 
				-          return false
			
 
				+      },
			
 
				+      //查找
			
 
				+      lookUp() {
			
 
				+        this.currentPage = 1
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      deleteclick(row) {
			
 
				+        var text = ''
			
 
				+        if (
			
 
				+          (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
			
 
				+          (row.taskTypeKey == 4 && row.inOutType == '销售出库') ||
			
 
				+          (row.taskTypeKey == 4 && row.inOutType == '退库')
			
 
				+        ) {
			
 
				+          text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
			
 
				+        } else {
			
 
				+          text = `任务删除后不可恢复，是否确定删除？`
			
 
				+        }
			
 
				+        //cancelButtonClass: "btn-custom-cancel"
			
 
				+        this.$confirm(text, {
			
 
				+            confirmButtonText: '确定',
			
 
				+            cancelButtonText: '取消',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          .then(() => {
			
 
				+            outdelete({
			
 
				+                id: row.id,
			
 
				+                relevanceId: row.relevanceId,
			
 
				+                inOutFlag: row.inOutFlag,
			
 
				+              })
			
 
				+              .toPromise()
			
 
				+              .then((response) => {
			
 
				+                this.getList()
			
 
				+              })
			
 
				+          })
			
 
				+          .catch(() => {
			
 
				+            return false
			
 
				+          })
			
 
				+      },
			
 
				+      getList() {
			
 
				+        getoreditoutput({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            currentPage: this.currentPage,
			
 
				+            pageSize: this.pageSize,
			
 
				+            searchType: this.searchType,
			
 
				+            searchKeyWord: this.searchKeyWord,
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.gainList = response
			
 
				+            this.currentPage = response.current
			
 
				+            this.pageSize = response.size
			
 
				+            this.deptBudgetTotal = response.total
			
 
				+          })
			
 
				+      },
			
 
				+      //编辑
			
 
				+      delivery(item) {
			
 
				+        this.$router.push({
			
 
				+          path: 'tranManagementWarehouseInOuttaskedit',
			
 
				+          query: {
			
 
				+            relevanceId: item.relevanceId,
			
 
				+            inOutFlag: item.inOutFlag
			
 
				+          },
			
 
				         })
			
 
				-    },
			
 
				-    getList() {
			
 
				-      getoreditoutput({
			
 
				-        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-        currentPage: this.currentPage,
			
 
				-        pageSize: this.pageSize,
			
 
				-        searchType: this.searchType,
			
 
				-        searchKeyWord: this.searchKeyWord,
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.gainList = response
			
 
				-          this.currentPage = response.current
			
 
				-          this.pageSize = response.size
			
 
				-          this.deptBudgetTotal = response.total
			
 
				+      },
			
 
				+      audit(item) {
			
 
				+        this.$router.push({
			
 
				+          path: 'tranManagementWarehouseInOuttaskaudit',
			
 
				+          query: {
			
 
				+            relevanceId: item.relevanceId,
			
 
				+            taskId: item.taskId,
			
 
				+            businessKey: item.id,
			
 
				+            workflowId: item.workflowId,
			
 
				+          },
			
 
				         })
			
 
				-    },
			
 
				-    //编辑
			
 
				-    delivery(item) {
			
 
				-      this.$router.push({
			
 
				-        path: 'tranManagementWarehouseInOuttaskedit',
			
 
				-        query: {
			
 
				-          relevanceId: item.relevanceId,
			
 
				-          inOutFlag: item.inOutFlag
			
 
				-        },
			
 
				-      })
			
 
				-    },
			
 
				-    audit(item) {
			
 
				-      this.$router.push({
			
 
				-        path: 'tranManagementWarehouseInOuttaskaudit',
			
 
				-        query: {
			
 
				-          relevanceId: item.relevanceId,
			
 
				-          taskId: item.taskId,
			
 
				-          businessKey: item.id,
			
 
				-          workflowId: item.workflowId,
			
 
				-        },
			
 
				-      })
			
 
				-    },
			
 
				-    getSpanArr(data) {
			
 
				-      let that = this
			
 
				+      },
			
 
				+      getSpanArr(data) {
			
 
				+        let that = this
			
 
				 
			
 
				-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
			
 
				+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
			
 
				 
			
 
				-      that.spanArr = []
			
 
				+        that.spanArr = []
			
 
				 
			
 
				-      that.pos = 0
			
 
				+        that.pos = 0
			
 
				 
			
 
				-      //遍历数据
			
 
				+        //遍历数据
			
 
				 
			
 
				-      data.forEach((item, index) => {
			
 
				-        //判断是否是第一项
			
 
				+        data.forEach((item, index) => {
			
 
				+          //判断是否是第一项
			
 
				 
			
 
				-        // if (index === 0) {
			
 
				-        //   this.spanArr.push(1)
			
 
				-        //   this.pos = 0
			
 
				-        // } else {
			
 
				-        //不是第一项时，就根据标识去存储
			
 
				-        if (data[index].warehouseNumViewList.length > 1) {
			
 
				-          // 查找到符合条件的数据时每次要把之前存储的数据+1
			
 
				-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
			
 
				-          this.spanArr.push(0)
			
 
				-        } else {
			
 
				-          // 没有符合的数据时，要记住当前的index
			
 
				-          this.spanArr.push(1)
			
 
				-          this.pos = index
			
 
				+          // if (index === 0) {
			
 
				+          //   this.spanArr.push(1)
			
 
				+          //   this.pos = 0
			
 
				+          // } else {
			
 
				+          //不是第一项时，就根据标识去存储
			
 
				+          if (data[index].warehouseNumViewList.length > 1) {
			
 
				+            // 查找到符合条件的数据时每次要把之前存储的数据+1
			
 
				+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
			
 
				+            this.spanArr.push(0)
			
 
				+          } else {
			
 
				+            // 没有符合的数据时，要记住当前的index
			
 
				+            this.spanArr.push(1)
			
 
				+            this.pos = index
			
 
				+          }
			
 
				+          // }
			
 
				+        })
			
 
				+      },
			
 
				+      //查看//传参
			
 
				+      nocomplete(row) {
			
 
				+        this.$router.push({
			
 
				+          path: 'inOutWarehousetaskEdit',
			
 
				+          query: {
			
 
				+            relevanceId: row.relevanceId,
			
 
				+            businessKey: row.id,
			
 
				+            workflowId: row.workflowId,
			
 
				+          },
			
 
				+        })
			
 
				+      },
			
 
				+      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()          // 秒
			
 
				+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
			
 
				         }
			
 
				-        // }
			
 
				-      })
			
 
				-    },
			
 
				-    //查看//传参
			
 
				-    nocomplete(row) {
			
 
				-      this.$router.push({
			
 
				-        path: 'inOutWarehousetaskEdit',
			
 
				-        query: {
			
 
				-          relevanceId: row.relevanceId,
			
 
				-          businessKey: row.id,
			
 
				-          workflowId: row.workflowId,
			
 
				-        },
			
 
				-      })
			
 
				-    },
			
 
				-    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')
			
 
				-          )
			
 
				+        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()
			
 
				-    },
			
 
				-    editClick(row) {
			
 
				-      var status = ''
			
 
				-      if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
			
 
				-        status = '执行中'
			
 
				-      } else if (row.taskStatus == '执行中') {
			
 
				-        status = '已完成'
			
 
				-      }
			
 
				-      //cancelButtonClass: "btn-custom-cancel"
			
 
				-      this.$confirm(`是否将状态改为${status}`, {
			
 
				-        confirmButtonText: '确定',
			
 
				-        cancelButtonText: '取消',
			
 
				-        type: 'warning',
			
 
				-      })
			
 
				-        .then(() => {
			
 
				-          movestates({ id: row.id })
			
 
				-            .toPromise()
			
 
				-            .then((response) => {
			
 
				-              this.$notify.success({
			
 
				-                title: '成功',
			
 
				-                message: '状态修改成功',
			
 
				+        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()
			
 
				+      },
			
 
				+      editClick(row) {
			
 
				+        var status = ''
			
 
				+        if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
			
 
				+          status = '执行中'
			
 
				+        } else if (row.taskStatus == '执行中') {
			
 
				+          status = '已完成'
			
 
				+        }
			
 
				+        //cancelButtonClass: "btn-custom-cancel"
			
 
				+        this.$confirm(`是否将状态改为${status}`, {
			
 
				+            confirmButtonText: '确定',
			
 
				+            cancelButtonText: '取消',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          .then(() => {
			
 
				+            movestates({
			
 
				+                id: row.id
			
 
				               })
			
 
				-              this.getList()
			
 
				-            })
			
 
				-            .catch((response) => {
			
 
				-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				-            })
			
 
				-        })
			
 
				-        .catch(() => {
			
 
				-          return false
			
 
				-        })
			
 
				-    },
			
 
				-    selecttaskType(e) {
			
 
				-      for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				-        if (this.taskTypeList[i].value == e) {
			
 
				-          this.searchType = this.taskTypeList[i].type
			
 
				+              .toPromise()
			
 
				+              .then((response) => {
			
 
				+                this.$notify.success({
			
 
				+                  title: '成功',
			
 
				+                  message: '状态修改成功',
			
 
				+                })
			
 
				+                this.getList()
			
 
				+              })
			
 
				+              .catch((response) => {
			
 
				+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              })
			
 
				+          })
			
 
				+          .catch(() => {
			
 
				+            return false
			
 
				+          })
			
 
				+      },
			
 
				+      selecttaskType(e) {
			
 
				+        for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				+          if (this.taskTypeList[i].value == e) {
			
 
				+            this.searchType = this.taskTypeList[i].type
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-      this.currentPage=1,
			
 
				-      this.getList()
			
 
				-    },
			
 
				-    handleExamine(row) {
			
 
				-      this.$router.push({
			
 
				-        name: 'salesContractExamine',
			
 
				-        query: { id: row.id },
			
 
				-      })
			
 
				-    },
			
 
				-    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				-    handleCloe() {
			
 
				-      this.dialogViewSpareMoney = false
			
 
				-    },
			
 
				-    history(row) {
			
 
				-      billoperatehis({ id: row.id })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.historyList = response
			
 
				+        this.currentPage = 1,
			
 
				+          this.getList()
			
 
				+      },
			
 
				+      handleExamine(row) {
			
 
				+        this.$router.push({
			
 
				+          name: 'salesContractExamine',
			
 
				+          query: {
			
 
				+            id: row.id
			
 
				+          },
			
 
				         })
			
 
				+      },
			
 
				+      // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+      handleCloe() {
			
 
				+        this.dialogViewSpareMoney = false
			
 
				+      },
			
 
				+      history(row) {
			
 
				+        billoperatehis({
			
 
				+            id: row.id
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.historyList = response
			
 
				+          })
			
 
				+      },
			
 
				+      find() {
			
 
				+        this.currentPage = 1
			
 
				+        this.getList()
			
 
				+      },
			
 
				     },
			
 
				-    find() {
			
 
				-      this.currentPage = 1
			
 
				-      this.getList()
			
 
				-    },
			
 
				-  },
			
 
				-}
			
 
				+  }
			
 
				 </script>
			
 
				 <style lang="scss" scoped>
			
 
				-.vertical-text-left {
			
 
				-  width: 62px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.el-button--primary {
			
 
				-  background-color: #5878e8;
			
 
				-  border-color: #5878e8;
			
 
				-}
			
 
				-.el-button--default {
			
 
				-  color: #8890b1;
			
 
				-  border-color: #e8eaf1;
			
 
				-}
			
 
				-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
			
 
				-  width: 30px;
			
 
				-  margin-left: 0;
			
 
				-  border-top-left-radius: 0px;
			
 
				-  border-bottom-left-radius: 0px;
			
 
				-}
			
 
				-/deep/.findValue .el-input__inner {
			
 
				-  border-top-right-radius: 0px;
			
 
				-  border-bottom-right-radius: 0px;
			
 
				-}
			
 
				-.completed.el-button--default {
			
 
				-  border-color: #5878e8;
			
 
				-  background-color: #f6f7fc;
			
 
				-  color: #5878e8;
			
 
				-}
			
 
				-.putstorage.el-button--default,
			
 
				-.deliverystorage.el-button--default {
			
 
				-  border-color: #8890b1;
			
 
				-  background-color: #fff;
			
 
				-  color: #8890b1;
			
 
				-}
			
 
				-/deep/.el-table td,
			
 
				-/deep/.el-table th.is-leaf {
			
 
				-  border-right: 1px solid #e9ecf7;
			
 
				-  text-align: center;
			
 
				-}
			
 
				-/deep/.el-table tr td:first-child,
			
 
				-/deep/.el-table tr th.is-leaf:first-child {
			
 
				-  border-left: 1px solid #e9ecf7;
			
 
				-}
			
 
				+  .vertical-text-left {
			
 
				+    width: 62px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .el-button--primary {
			
 
				+    background-color: #5878e8;
			
 
				+    border-color: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .el-button--default {
			
 
				+    color: #8890b1;
			
 
				+    border-color: #e8eaf1;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
			
 
				+    width: 30px;
			
 
				+    margin-left: 0;
			
 
				+    border-top-left-radius: 0px;
			
 
				+    border-bottom-left-radius: 0px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.findValue .el-input__inner {
			
 
				+    border-top-right-radius: 0px;
			
 
				+    border-bottom-right-radius: 0px;
			
 
				+  }
			
 
				+
			
 
				+  .completed.el-button--default {
			
 
				+    border-color: #5878e8;
			
 
				+    background-color: #f6f7fc;
			
 
				+    color: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .putstorage.el-button--default,
			
 
				+  .deliverystorage.el-button--default {
			
 
				+    border-color: #8890b1;
			
 
				+    background-color: #fff;
			
 
				+    color: #8890b1;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-table td,
			
 
				+  /deep/.el-table th.is-leaf {
			
 
				+    border-right: 1px solid #e9ecf7;
			
 
				+    text-align: center;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-table tr td:first-child,
			
 
				+  /deep/.el-table tr th.is-leaf:first-child {
			
 
				+    border-left: 1px solid #e9ecf7;
			
 
				+  }
			
 
				+
			
 
				+  .el-row {
			
 
				+    height: 50px;
			
 
				+  }
			
 
				+
			
 
				+  .findValue {
			
 
				+    width: 0%;
			
 
				+    margin-left: 25%;
			
 
				+  }
			
 
				+
			
 
				+  .search {
			
 
				+    margin-left: -250px;
			
 
				+  }
			
 
				+
			
 
				+  .Value {
			
 
				+    width: 300px;
			
 
				+    margin-left: 766px;
			
 
				+  }
			
 
				+
			
 
				+  .el-pagination {
			
 
				+    text-align: center;
			
 
				+  }
			
 
				+
			
 
				+  .winseaview-main {
			
 
				+    background: #e8ecf6;
			
 
				+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
			
 
				+  }
			
 
				+
			
 
				+  .spans {
			
 
				+    display: table-caption;
			
 
				+    width: 17px;
			
 
				+    line-height: 19px;
			
 
				+  }
			
 
				+
			
 
				+  //执行样式
			
 
				+  .executory,
			
 
				+  .inExecution,
			
 
				+  .done {
			
 
				+    width: 6px;
			
 
				+    height: 6px;
			
 
				+    display: inline-block;
			
 
				+    border-radius: 50%;
			
 
				+    position: relative;
			
 
				+    top: -1px;
			
 
				+    font-size: 14px;
			
 
				+  }
			
 
				+
			
 
				+  .executory {
			
 
				+    background: #ff9f24;
			
 
				+  }
			
 
				+
			
 
				+  .inExecution {
			
 
				+    background: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .done {
			
 
				+    background: #50cad4;
			
 
				+  }
			
 
				+
			
 
				+  .el-select {
			
 
				+    width: 30%;
			
 
				+    margin-right: 10px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.typeselect .el-input__inner {
			
 
				+    color: #8890b1;
			
 
				+  }
			
 
				 
			
 
				-.el-row {
			
 
				-  height: 50px;
			
 
				-}
			
 
				-.findValue {
			
 
				-  width: 0%;
			
 
				-  margin-left: 25%;
			
 
				-}
			
 
				-.search {
			
 
				-  margin-left: -250px;
			
 
				-}
			
 
				-.Value {
			
 
				-  width: 300px;
			
 
				-  margin-left: 766px;
			
 
				-}
			
 
				-.el-pagination {
			
 
				-  text-align: center;
			
 
				-}
			
 
				-.winseaview-main {
			
 
				-  background: #e8ecf6;
			
 
				-  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
			
 
				-}
			
 
				-.spans {
			
 
				-  display: table-caption;
			
 
				-  width: 17px;
			
 
				-  line-height: 19px;
			
 
				-}
			
 
				-//执行样式
			
 
				-.executory,
			
 
				-.inExecution,
			
 
				-.done {
			
 
				-  width: 6px;
			
 
				-  height: 6px;
			
 
				-  display: inline-block;
			
 
				-  border-radius: 50%;
			
 
				-  position: relative;
			
 
				-  top: -1px;
			
 
				-  font-size: 14px;
			
 
				-}
			
 
				-.executory {
			
 
				-  background: #ff9f24;
			
 
				-}
			
 
				-.inExecution {
			
 
				-  background: #5878e8;
			
 
				-}
			
 
				-.done {
			
 
				-  background: #50cad4;
			
 
				-}
			
 
				-.el-select {
			
 
				-  width: 30%;
			
 
				-  margin-right: 10px;
			
 
				-}
			
 
				-/deep/.typeselect .el-input__inner {
			
 
				-  color: #8890b1;
			
 
				-}
			
 
				-.corles {
			
 
				-  color: #5878e8;
			
 
				-  font-size: 14px;
			
 
				-}
			
 
				+  .corles {
			
 
				+    color: #5878e8;
			
 
				+    font-size: 14px;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
+++ b/src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
@@ -7,13 +7,8 @@
 
				       </el-col>
			
 
				       <el-col :span="12" class="bg-right">
			
 
				         <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
			
 
				-          <img
			
 
				-            width="6"
			
 
				-            height="10"
			
 
				-            style="vertical-align: bottom; margin-right: 3px"
			
 
				-            src="../../../public/img/lujing.png"
			
 
				-            alt
			
 
				-          />返回
			
 
				+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
			
 
				+            src="../../../public/img/lujing.png" alt />返回
			
 
				         </el-button>
			
 
				       </el-col>
			
 
				     </el-row>
			
@@ -28,13 +23,8 @@
 
				       </div>
			
 
				       <div class="ding"></div>
			
 
				       <div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
			
 
				-        <img
			
 
				-          style="position: relative; top: 40px; left: 300px"
			
 
				-          width="19"
			
 
				-          height="19"
			
 
				-          src="../../../public/img/cangku.png"
			
 
				-          alt
			
 
				-        />
			
 
				+        <img style="position: relative; top: 40px; left: 300px" width="19" height="19"
			
 
				+          src="../../../public/img/cangku.png" alt />
			
 
				         <!--出库=-->
			
 
				         <div class="small-title">
			
 
				           <h3>出库任务({{ inOutTaskNo }})</h3>
			
@@ -42,586 +32,281 @@
 
				         <el-form ref="dataList" :model="dataList" label-width="140px" input-width="300px">
			
 
				           <!-- 仓库名 -->
			
 
				           <el-form-item label="仓库名">
			
 
				-            <el-select
			
 
				-              v-model="dataList.warehouseName"
			
 
				-              placeholder="请选择仓库名"
			
 
				-              class="typeselect"
			
 
				-              @change="selectwarehouseName"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in warehouseNameList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.warehouseName"
			
 
				-                :value="item.id"
			
 
				-              />
			
 
				+            <el-select v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect"
			
 
				+              @change="selectwarehouseName">
			
 
				+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
			
 
				+                :value="item.id" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!-- 出库类型 -->
			
 
				           <el-form-item label="出库类型">
			
 
				-            <el-select
			
 
				-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
			
 
				-              v-model="dataList.inOutType"
			
 
				-              placeholder="请选择出库类型"
			
 
				-              class="typeselect"
			
 
				-              @change="selectstorageType"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in storageType"
			
 
				-                :key="item.constKey"
			
 
				-                v-if="
			
 
				+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.inOutType"
			
 
				+              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType">
			
 
				+              <el-option v-for="item in storageType" :key="item.constKey" v-if="
			
 
				                   (dataList.taskTypeKey == 1 &&
			
 
				                     item.constValue != '移库出库') ||
			
 
				                   (dataList.taskTypeKey == 3 &&
			
 
				                     item.constValue == '移库出库') ||
			
 
				                   (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
			
 
				-                "
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              />
			
 
				+                " :label="item.constValue" :value="item.constValue" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!-- 合同编号 -->
			
 
				           <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
			
 
				-            <el-select
			
 
				-              @change="changecontract"
			
 
				-              v-model="dataList.contractNo"
			
 
				-              placeholder="请输入合同编号"
			
 
				-              class="typeselect"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in contractNoList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.contractNo"
			
 
				-                :value="item.contractNo"
			
 
				-              ></el-option>
			
 
				+            <el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect">
			
 
				+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
			
 
				+                :value="item.contractNo"></el-option>
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
			
 
				-            <el-input
			
 
				-              @input="selectTaskNo"
			
 
				-              v-model="dataList.moveTaskNo"
			
 
				-              placeholder="请输入移库任务编号"
			
 
				-              class="typeselect"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in contractNoList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.contractNo"
			
 
				-                :value="item.contractNo"
			
 
				-              ></el-option>
			
 
				+            <el-input @input="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
			
 
				+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
			
 
				+                :value="item.contractNo"></el-option>
			
 
				             </el-input>
			
 
				           </el-form-item>
			
 
				           <!-- 货名 -->
			
 
				           <el-form-item label="货名" class="huom">
			
 
				-            <el-select
			
 
				-              :disabled="dataList.taskTypeKey != 3"
			
 
				-              v-model="dataList.goodsName"
			
 
				-              placeholder="货名"
			
 
				-              class="huom"
			
 
				-              @change="selectgoodsName"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in goodnameList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              ></el-option>
			
 
				+            <el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名" class="huom"
			
 
				+              @change="selectgoodsName">
			
 
				+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
			
 
				+                :value="item.constValue"></el-option>
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--重量（吨）-->
			
 
				           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              @input="weightchange1"
			
 
				-              v-model="dataList.weight"
			
 
				-              placeholder="请输入重量"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量" maxlength="120" size="small"
			
 
				+              class="huom" />
			
 
				           </el-form-item>
			
 
				           <!-- 品级 -->
			
 
				           <el-form-item label="品级">
			
 
				-            <el-select
			
 
				-              v-model="dataList.grade"
			
 
				-              placeholder
			
 
				-              class="typeselect"
			
 
				-              @change="selectpackingMethod"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in gradeList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              />
			
 
				+            <el-select v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod">
			
 
				+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
			
 
				+                :value="item.constValue" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--容重(克/升)>=-->
			
 
				           <el-form-item label="容重(克/升)>=">
			
 
				-            <el-input
			
 
				-              @input="bulkDensitychange"
			
 
				-              v-model="dataList.bulkDensity"
			
 
				-              placeholder="请输入容重"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120"
			
 
				+              size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--水分（%）<=-->
			
 
				           <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              @input="waterContentchange"
			
 
				-              v-model="dataList.waterContent"
			
 
				-              placeholder="请输入水分占比"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="waterContentchange" v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120"
			
 
				+              size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--单价(元/吨)-->
			
 
				           <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              @input="unitPricechange"
			
 
				-              v-model="dataList.unitPrice"
			
 
				-              placeholder="请输入单价"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120"
			
 
				+              size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--预计出库日期-->
			
 
				           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
			
 
				-            <el-date-picker
			
 
				-              v-model="dataList.predictDate"
			
 
				-              type="date"
			
 
				-              placeholder="请选择预计出库日期"
			
 
				-              value-format="yyyy-MM-dd"
			
 
				-            />
			
 
				+            <el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
			
 
				+              value-format="yyyy-MM-dd" />
			
 
				           </el-form-item>
			
 
				           <!--经办人-->
			
 
				           <el-form-item label="出库经办人">
			
 
				-            <el-select
			
 
				-              v-model="dataList.agent"
			
 
				-              placeholder="请选择经办人"
			
 
				-              filterable
			
 
				-              :filter-method="dataFilter"
			
 
				-              @change="selectstaff"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in options"
			
 
				-                :key="item.value"
			
 
				-                :label="item.staffName"
			
 
				-                :value="item.staffName"
			
 
				-              />
			
 
				+            <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
			
 
				+              @change="selectstaff">
			
 
				+              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--业务描述=-->
			
 
				           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
			
 
				-            <el-input
			
 
				-              v-model="dataList.businessDescribe"
			
 
				-              placeholder="请输入业务描述，不超过150字"
			
 
				-              maxlength="150"
			
 
				-              size="large"
			
 
				-            />
			
 
				+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
			
 
				           </el-form-item>
			
 
				         </el-form>
			
 
				       </div>
			
 
				       <div v-show="dataList.taskTypeKey != 1" class="center1">
			
 
				-        <img
			
 
				-          style="position: relative; top: 40px; left: 300px"
			
 
				-          width="19"
			
 
				-          height="19"
			
 
				-          src="../../../public/img/cangku.png"
			
 
				-          alt
			
 
				-        />
			
 
				+        <img style="position: relative; top: 40px; left: 300px" width="19" height="19"
			
 
				+          src="../../../public/img/cangku.png" alt />
			
 
				         <div class="small-title">
			
 
				           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
			
 
				         </div>
			
 
				         <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
			
 
				           <!-- 仓库名 -->
			
 
				           <el-form-item label="仓库名">
			
 
				-            <el-select
			
 
				-              v-model="dataList1.warehouseName"
			
 
				-              placeholder="请选择仓库名"
			
 
				-              class="typeselect"
			
 
				-              @change="selectwarehouseName1"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in warehouseNameList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.warehouseName"
			
 
				-                :value="item.id"
			
 
				-              />
			
 
				+            <el-select v-model="dataList1.warehouseName" placeholder="请选择仓库名" class="typeselect"
			
 
				+              @change="selectwarehouseName1">
			
 
				+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
			
 
				+                :value="item.id" />
			
 
				             </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"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in storageType1"
			
 
				-                :key="item.constKey"
			
 
				-                v-if="
			
 
				+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList1.inOutType"
			
 
				+              placeholder="请选择入库类型" class="typeselect" @change="selectstorageType1">
			
 
				+              <el-option v-for="item in storageType1" :key="item.constKey" v-if="
			
 
				                   (dataList1.taskTypeKey == 2 &&
			
 
				                     item.constValue != '移库入库') ||
			
 
				                   (dataList1.taskTypeKey == 3 &&
			
 
				                     item.constValue == '移库入库') ||
			
 
				                   (dataList1.taskTypeKey == 4 && item.constValue == '退库')
			
 
				-                "
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              />
			
 
				+                " :label="item.constValue" :value="item.constValue" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!-- 合同编号 -->
			
 
				           <el-form-item v-if="dataList1.taskTypeKey != 3" label="合同编号">
			
 
				-            <el-select
			
 
				-              @change="changecontract1"
			
 
				-              v-model="dataList1.contractNo"
			
 
				-              placeholder="请输入合同编号"
			
 
				-              class="typeselect"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in contractNoList1"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.contractNo"
			
 
				-                :value="item.contractNo"
			
 
				-              ></el-option>
			
 
				+            <el-select @change="changecontract1" v-model="dataList1.contractNo" placeholder="请输入合同编号"
			
 
				+              class="typeselect">
			
 
				+              <el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo"
			
 
				+                :value="item.contractNo"></el-option>
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
			
 
				-            <el-input
			
 
				-              disabled
			
 
				-              v-model="dataList1.moveTaskNo"
			
 
				-              placeholder="请输入移库任务编号"
			
 
				-              class="typeselect"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in contractNoList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.contractNo"
			
 
				-                :value="item.contractNo"
			
 
				-              ></el-option>
			
 
				+            <el-input disabled v-model="dataList1.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
			
 
				+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
			
 
				+                :value="item.contractNo"></el-option>
			
 
				             </el-input>
			
 
				           </el-form-item>
			
 
				           <!-- 货名 -->
			
 
				           <el-form-item label="货名" class="huom">
			
 
				-            <el-select
			
 
				-              :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3"
			
 
				-              v-model="dataList.goodsName"
			
 
				-              placeholder="货名"
			
 
				-              class="huom"
			
 
				-              @change="selectgoodsName1"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in goodnameList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              ></el-option>
			
 
				+            <el-select :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3" v-model="dataList.goodsName"
			
 
				+              placeholder="货名" class="huom" @change="selectgoodsName1">
			
 
				+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
			
 
				+                :value="item.constValue"></el-option>
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--重量（吨）-->
			
 
				           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              @input="weightchange"
			
 
				-              v-model="dataList1.weight"
			
 
				-              placeholder="请输入重量"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量" maxlength="120" size="small"
			
 
				+              class="huom" />
			
 
				           </el-form-item>
			
 
				           <!-- 品级 -->
			
 
				           <el-form-item label="品级">
			
 
				-            <el-select
			
 
				-              :disabled="dataList.taskTypeKey == 3"
			
 
				-              v-model="dataList1.grade"
			
 
				-              placeholder
			
 
				-              class="typeselect"
			
 
				-              @change="selectpackingMethod1"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in gradeList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              />
			
 
				+            <el-select :disabled="dataList.taskTypeKey == 3" v-model="dataList1.grade" placeholder class="typeselect"
			
 
				+              @change="selectpackingMethod1">
			
 
				+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
			
 
				+                :value="item.constValue" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--容重(克/升)>=-->
			
 
				           <el-form-item label="容重(克/升)>=">
			
 
				-            <el-input
			
 
				-              @input="bulkDensitychange"
			
 
				-              :disabled="dataList.taskTypeKey == 3"
			
 
				-              v-model="dataList1.bulkDensity"
			
 
				-              placeholder="请输入容重"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="bulkDensitychange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.bulkDensity"
			
 
				+              placeholder="请输入容重" maxlength="120" size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--水分（%）<=-->
			
 
				           <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              @input="waterContentchange"
			
 
				-              :disabled="dataList.taskTypeKey == 3"
			
 
				-              v-model="dataList1.waterContent"
			
 
				-              placeholder="请输入水分占比"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.waterContent"
			
 
				+              placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--单价(元/吨)-->
			
 
				           <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              @input="unitPricechange"
			
 
				-              :disabled="dataList.taskTypeKey == 3"
			
 
				-              v-model="dataList1.unitPrice"
			
 
				-              placeholder="请输入单价"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.unitPrice"
			
 
				+              placeholder="请输入单价" maxlength="120" size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--预计出库日期-->
			
 
				           <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
			
 
				-            <el-date-picker
			
 
				-              v-model="dataList1.predictDate"
			
 
				-              type="date"
			
 
				-              placeholder="请选择预计入库日期"
			
 
				-              value-format="yyyy-MM-dd"
			
 
				-            />
			
 
				+            <el-date-picker v-model="dataList1.predictDate" type="date" placeholder="请选择预计入库日期"
			
 
				+              value-format="yyyy-MM-dd" />
			
 
				           </el-form-item>
			
 
				           <!--经办人-->
			
 
				           <el-form-item label="入库经办人">
			
 
				-            <el-select
			
 
				-              v-model="dataList1.agent"
			
 
				-              placeholder="请选择经办人"
			
 
				-              filterable
			
 
				-              :filter-method="dataFilter1"
			
 
				-              @change="selectstaff1"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in options1"
			
 
				-                :key="item.value"
			
 
				-                :label="item.staffName"
			
 
				-                :value="item.staffName"
			
 
				-              />
			
 
				+            <el-select v-model="dataList1.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter1"
			
 
				+              @change="selectstaff1">
			
 
				+              <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--业务描述=-->
			
 
				           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
			
 
				-            <el-input
			
 
				-              v-model="dataList1.businessDescribe"
			
 
				-              placeholder="请输入业务描述，不超过150字"
			
 
				-              maxlength="150"
			
 
				-              size="large"
			
 
				-            />
			
 
				+            <el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
			
 
				           </el-form-item>
			
 
				         </el-form>
			
 
				       </div>
			
 
				       <div v-if="dataList.taskTypeKey == 4" class="center1">
			
 
				         <!--出库=-->
			
 
				         <div class="small-title">
			
 
				-          <img
			
 
				-            style="position: relative; top: 40px; left: -22px"
			
 
				-            width="19"
			
 
				-            height="19"
			
 
				-            src="../../../public/img/cangku.png"
			
 
				-            alt
			
 
				-          />
			
 
				+          <img style="position: relative; top: 40px; left: -22px" width="19" height="19"
			
 
				+            src="../../../public/img/cangku.png" alt />
			
 
				           <h3>出库任务({{ inOutTaskNo }})</h3>
			
 
				         </div>
			
 
				         <el-form ref="dataList" :model="dataList" label-width="140px">
			
 
				           <!-- 仓库名 -->
			
 
				           <el-form-item label="仓库名">
			
 
				-            <el-select
			
 
				-              v-model="dataList.warehouseName"
			
 
				-              placeholder="请选择仓库名"
			
 
				-              class="typeselect"
			
 
				-              @change="selectwarehouseName"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in warehouseNameList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.warehouseName"
			
 
				-                :value="item.id"
			
 
				-              />
			
 
				+            <el-select v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect"
			
 
				+              @change="selectwarehouseName">
			
 
				+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
			
 
				+                :value="item.id" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!-- 出库类型 -->
			
 
				           <el-form-item label="出库类型">
			
 
				-            <el-select
			
 
				-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
			
 
				-              v-model="dataList.inOutType"
			
 
				-              placeholder="请选择出库类型"
			
 
				-              class="typeselect"
			
 
				-              @change="selectstorageType"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in storageType"
			
 
				-                :key="item.constKey"
			
 
				-                v-if="
			
 
				+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.inOutType"
			
 
				+              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType">
			
 
				+              <el-option v-for="item in storageType" :key="item.constKey" v-if="
			
 
				                   (dataList.taskTypeKey == 1 &&
			
 
				                     item.constValue != '移库出库') ||
			
 
				                   (dataList.taskTypeKey == 3 &&
			
 
				                     item.constValue == '移库出库') ||
			
 
				                   (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
			
 
				-                "
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              />
			
 
				+                " :label="item.constValue" :value="item.constValue" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!-- 合同编号 -->
			
 
				           <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
			
 
				-            <el-select
			
 
				-              @change="changecontract"
			
 
				-              v-model="dataList.contractNo"
			
 
				-              placeholder="请输入合同编号"
			
 
				-              class="typeselect"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in contractNoList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.contractNo"
			
 
				-                :value="item.contractNo"
			
 
				-              ></el-option>
			
 
				+            <el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect">
			
 
				+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
			
 
				+                :value="item.contractNo"></el-option>
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
			
 
				-            <el-select
			
 
				-              @change="selectTaskNo"
			
 
				-              v-model="dataList.moveTaskNo"
			
 
				-              placeholder="请输入移库任务编号"
			
 
				-              class="typeselect"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in contractNoList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.contractNo"
			
 
				-                :value="item.contractNo"
			
 
				-              ></el-option>
			
 
				+            <el-select @change="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
			
 
				+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
			
 
				+                :value="item.contractNo"></el-option>
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!-- 货名 -->
			
 
				           <el-form-item label="货名" class="huom">
			
 
				-            <el-select
			
 
				-              :disabled="dataList.taskTypeKey != 3"
			
 
				-              v-model="dataList.goodsName"
			
 
				-              placeholder="货名"
			
 
				-              class="huom"
			
 
				-              @change="selectgoodsName"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in goodnameList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              ></el-option>
			
 
				+            <el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名" class="huom"
			
 
				+              @change="selectgoodsName">
			
 
				+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
			
 
				+                :value="item.constValue"></el-option>
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--重量（吨）-->
			
 
				           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              :disabled="dataList.taskTypeKey == 4"
			
 
				-              v-model="dataList.weight"
			
 
				-              placeholder="请输入重量"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量"
			
 
				+              maxlength="120" size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!-- 品级 -->
			
 
				           <el-form-item label="品级">
			
 
				-            <el-select
			
 
				-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
			
 
				-              v-model="dataList.grade"
			
 
				-              placeholder
			
 
				-              class="typeselect"
			
 
				-              @change="selectpackingMethod"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in gradeList"
			
 
				-                :key="item.constKey"
			
 
				-                :label="item.constValue"
			
 
				-                :value="item.constValue"
			
 
				-              />
			
 
				+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.grade"
			
 
				+              placeholder class="typeselect" @change="selectpackingMethod">
			
 
				+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
			
 
				+                :value="item.constValue" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--容重(克/升)>=-->
			
 
				           <el-form-item label="容重(克/升)>=">
			
 
				-            <el-input
			
 
				-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
			
 
				-              v-model="dataList.bulkDensity"
			
 
				-              placeholder="请输入容重"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.bulkDensity"
			
 
				+              placeholder="请输入容重" maxlength="120" size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--水分（%）<=-->
			
 
				           <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
			
 
				-              v-model="dataList.waterContent"
			
 
				-              placeholder="请输入水分占比"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.waterContent"
			
 
				+              placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--单价(元/吨)-->
			
 
				           <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
			
 
				-            <el-input
			
 
				-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
			
 
				-              v-model="dataList.unitPrice"
			
 
				-              placeholder="请输入单价"
			
 
				-              maxlength="120"
			
 
				-              size="small"
			
 
				-              class="huom"
			
 
				-            />
			
 
				+            <el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.unitPrice"
			
 
				+              placeholder="请输入单价" maxlength="120" size="small" class="huom" />
			
 
				           </el-form-item>
			
 
				           <!--预计出库日期-->
			
 
				           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
			
 
				-            <el-date-picker
			
 
				-              v-model="dataList.predictDate"
			
 
				-              type="date"
			
 
				-              placeholder="请选择预计出库日期"
			
 
				-              value-format="yyyy-MM-dd"
			
 
				-            />
			
 
				+            <el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
			
 
				+              value-format="yyyy-MM-dd" />
			
 
				           </el-form-item>
			
 
				           <!--经办人-->
			
 
				           <el-form-item label="出库经办人">
			
 
				-            <el-select
			
 
				-              v-model="dataList.agent"
			
 
				-              placeholder="请选择经办人"
			
 
				-              filterable
			
 
				-              :filter-method="dataFilter"
			
 
				-              @change="selectstaff"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in options"
			
 
				-                :key="item.value"
			
 
				-                :label="item.staffName"
			
 
				-                :value="item.staffName"
			
 
				-              />
			
 
				+            <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
			
 
				+              @change="selectstaff">
			
 
				+              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
			
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <!--业务描述=-->
			
 
				           <el-form-item label="业务描述">
			
 
				-            <el-input
			
 
				-              v-model="dataList.businessDescribe"
			
 
				-              placeholder="请输入业务描述，不超过150字"
			
 
				-              maxlength="150"
			
 
				-              size="large"
			
 
				-            />
			
 
				+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
			
 
				           </el-form-item>
			
 
				         </el-form>
			
 
				       </div>
			
@@ -633,1470 +318,1529 @@
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				-import {
			
 
				-  getwarehousename,
			
 
				-  xialaNo,
			
 
				-  addoreditoutput,
			
 
				-  getGoodsName
			
 
				-} from '@/model/tasksport/index'
			
 
				+  import {
			
 
				+    getwarehousename,
			
 
				+    xialaNo,
			
 
				+    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'
			
 
				-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
			
 
				-import { dayjs, EventBus } from 'base-core-lib'
			
 
				-export default {
			
 
				-  name: 'viewSpareMoney',
			
 
				-  components: {
			
 
				-    WsUpload,
			
 
				-    Pagination
			
 
				-  },
			
 
				-  watch: {
			
 
				-    // vesselId(val) {
			
 
				-    //   this.getList()
			
 
				-    // },
			
 
				-    isShow(val) {
			
 
				-      this.showType = val
			
 
				+  import {
			
 
				+    mapGetters
			
 
				+  } from 'vuex'
			
 
				+  import {
			
 
				+    pullDown,
			
 
				+    getstaff
			
 
				+  } from '@/model/warehouse/index'
			
 
				+  import Pagination from '@/components/Pagination'
			
 
				+  import WsUpload from '@/components/WsUpload'
			
 
				+  // import { dayjs, fmoney, EventBus } from 'base-core-lib'
			
 
				+  import {
			
 
				+    dayjs,
			
 
				+    EventBus
			
 
				+  } from 'base-core-lib'
			
 
				+  export default {
			
 
				+    name: 'viewSpareMoney',
			
 
				+    components: {
			
 
				+      WsUpload,
			
 
				+      Pagination
			
 
				     },
			
 
				-    flag(val) {
			
 
				-      xialaNo({
			
 
				-        compId: this.compId,
			
 
				-        flag: val
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          if (
			
 
				-            this.dataList1.taskTypeKey == 2 ||
			
 
				-            this.dataList1.taskTypeKey == 4
			
 
				-          ) {
			
 
				-            this.contractNoList1 = response
			
 
				-            if (this.dataList1.taskTypeKey == 2) {
			
 
				+    watch: {
			
 
				+      // vesselId(val) {
			
 
				+      //   this.getList()
			
 
				+      // },
			
 
				+      isShow(val) {
			
 
				+        this.showType = val
			
 
				+      },
			
 
				+      flag(val) {
			
 
				+        xialaNo({
			
 
				+            compId: this.compId,
			
 
				+            flag: val
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            if (
			
 
				+              this.dataList1.taskTypeKey == 2 ||
			
 
				+              this.dataList1.taskTypeKey == 4
			
 
				+            ) {
			
 
				+              this.contractNoList1 = response
			
 
				+              if (this.dataList1.taskTypeKey == 2) {
			
 
				+                this.contractNoList = response
			
 
				+              }
			
 
				+            } else {
			
 
				               this.contractNoList = response
			
 
				             }
			
 
				-          } else {
			
 
				-            this.contractNoList = response
			
 
				-          }
			
 
				-        })
			
 
				-    }
			
 
				-  },
			
 
				-  computed: {
			
 
				-    ...mapGetters(['deptBudgetList'])
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      flag: 1,
			
 
				-      //弹出框
			
 
				-      dialogViewSpareMoney: false,
			
 
				-      dialogApproveFormVisible: false,
			
 
				-      // 船舶类型
			
 
				-      monetaryKey: null,
			
 
				-      // 表格显示数据
			
 
				-      tableDate: [],
			
 
				-      // 是否显示
			
 
				-      showType: true,
			
 
				-      disabled: false,
			
 
				-      // 年
			
 
				-      year: '',
			
 
				-      contractNoList: [],
			
 
				-      contractNoList1: [],
			
 
				-      deptBudgetTotal: 0,
			
 
				-      readonly: true,
			
 
				-      currentPage: 1,
			
 
				-      pageSize: 10,
			
 
				-      searchType: 1,
			
 
				-      searchKeyWord: '',
			
 
				-      radio: '1',
			
 
				-      contractType: 2,
			
 
				-      startDate: null,
			
 
				-      endDate: null,
			
 
				-      goodnameList: [],
			
 
				-      checked: true,
			
 
				-      form: {},
			
 
				-      staffList: [],
			
 
				-      staffList1: [],
			
 
				-      options: [],
			
 
				-      options1: [],
			
 
				-      storageType: [],
			
 
				-      storageType1: [],
			
 
				-      outContractNo: [],
			
 
				-      // 提交类型
			
 
				-      submitType: true,
			
 
				-      status: [],
			
 
				-      warehouseNameList: [],
			
 
				-      warehouseNameList1: [],
			
 
				-      appendixIdsAdd: '',
			
 
				-      uploadSuccess: {},
			
 
				-      deletetask: false,
			
 
				-      warehouseInOutDetail: {},
			
 
				-      onChange: {},
			
 
				-      deptBudgetList1: [],
			
 
				-      gradeList: [],
			
 
				-      rules: {
			
 
				-        netWeight: [
			
 
				-          {
			
 
				+          })
			
 
				+      }
			
 
				+    },
			
 
				+    computed: {
			
 
				+      ...mapGetters(['deptBudgetList'])
			
 
				+    },
			
 
				+    data() {
			
 
				+      return {
			
 
				+        flag: 1,
			
 
				+        //弹出框
			
 
				+        dialogViewSpareMoney: false,
			
 
				+        dialogApproveFormVisible: false,
			
 
				+        // 船舶类型
			
 
				+        monetaryKey: null,
			
 
				+        // 表格显示数据
			
 
				+        tableDate: [],
			
 
				+        // 是否显示
			
 
				+        showType: true,
			
 
				+        disabled: false,
			
 
				+        // 年
			
 
				+        year: '',
			
 
				+        contractNoList: [],
			
 
				+        contractNoList1: [],
			
 
				+        deptBudgetTotal: 0,
			
 
				+        readonly: true,
			
 
				+        currentPage: 1,
			
 
				+        pageSize: 10,
			
 
				+        searchType: 1,
			
 
				+        searchKeyWord: '',
			
 
				+        radio: '1',
			
 
				+        contractType: 2,
			
 
				+        startDate: null,
			
 
				+        endDate: null,
			
 
				+        goodnameList: [],
			
 
				+        checked: true,
			
 
				+        form: {},
			
 
				+        staffList: [],
			
 
				+        staffList1: [],
			
 
				+        options: [],
			
 
				+        options1: [],
			
 
				+        storageType: [],
			
 
				+        storageType1: [],
			
 
				+        outContractNo: [],
			
 
				+        // 提交类型
			
 
				+        submitType: true,
			
 
				+        status: [],
			
 
				+        warehouseNameList: [],
			
 
				+        warehouseNameList1: [],
			
 
				+        appendixIdsAdd: '',
			
 
				+        uploadSuccess: {},
			
 
				+        deletetask: false,
			
 
				+        warehouseInOutDetail: {},
			
 
				+        onChange: {},
			
 
				+        deptBudgetList1: [],
			
 
				+        gradeList: [],
			
 
				+        rules: {
			
 
				+          netWeight: [{
			
 
				             required: true,
			
 
				             type: 'number',
			
 
				             message: '请输入活动名称',
			
 
				             trigger: 'blur'
			
 
				+          }]
			
 
				+        },
			
 
				+        size: 10,
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+        deptCircularPage: {},
			
 
				+        packtypeList: {},
			
 
				+        date: {
			
 
				+          year: dayjs().format('YYYY'),
			
 
				+          month: dayjs().format('MM')
			
 
				+        },
			
 
				+        contractList: [],
			
 
				+        inOutTaskNo: '',
			
 
				+        inOutTaskNo1: '',
			
 
				+        dataList: {
			
 
				+          taskTypeKey: '1'
			
 
				+        },
			
 
				+        dataList1: {
			
 
				+          taskTypeKey: '1'
			
 
				+        },
			
 
				+        historyList: [],
			
 
				+        pickerBeginDateBefore: {
			
 
				+          disabledDate: time => {
			
 
				+            return time.getTime() > Date.now()
			
 
				           }
			
 
				-        ]
			
 
				-      },
			
 
				-      size: 10,
			
 
				-      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-      deptCircularPage: {},
			
 
				-      packtypeList: {},
			
 
				-      date: {
			
 
				-        year: dayjs().format('YYYY'),
			
 
				-        month: dayjs().format('MM')
			
 
				-      },
			
 
				-      contractList: [],
			
 
				-      inOutTaskNo: '',
			
 
				-      inOutTaskNo1: '',
			
 
				-      dataList: { taskTypeKey: '1' },
			
 
				-      dataList1: { taskTypeKey: '1' },
			
 
				-      historyList: [],
			
 
				-      pickerBeginDateBefore: {
			
 
				-        disabledDate: time => {
			
 
				-          return time.getTime() > Date.now()
			
 
				-        }
			
 
				-      },
			
 
				-      accessoryTFs: false
			
 
				-    }
			
 
				-  },
			
 
				-  activated() {
			
 
				-    this.getList()
			
 
				-  },
			
 
				-  methods: {
			
 
				-    //返回按钮
			
 
				-    revert() {
			
 
				-      this.$router.go(-1)
			
 
				-    },
			
 
				-    returnsales() {
			
 
				-      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
			
 
				-    },
			
 
				-    // 获取当前年月日
			
 
				-    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)
			
 
				-      var hour = date.getHours()
			
 
				-      var minutes = date.getMinutes()
			
 
				-      var seconds = date.getSeconds()
			
 
				-      if (mouth < 10) {
			
 
				-        mouth = '0' + mouth
			
 
				-      }
			
 
				-      if (datetime < 10) {
			
 
				-        datetime = '0' + datetime
			
 
				-      }
			
 
				-      if (hour < 10) {
			
 
				-        hour = '0' + hour
			
 
				-      }
			
 
				-      if (minutes < 10) {
			
 
				-        minutes = '0' + minutes
			
 
				+        },
			
 
				+        accessoryTFs: false
			
 
				       }
			
 
				-      if (seconds < 10) {
			
 
				-        seconds = '0' + seconds
			
 
				-      }
			
 
				-      return year + '' + mouth + datetime + hour + minutes + seconds
			
 
				-    },
			
 
				-    // 随机验证码
			
 
				-    verifyinit() {
			
 
				-      var arr = []
			
 
				-      for (var i = 48; i < 57; i++) {
			
 
				-        arr.push(String.fromCharCode(i))
			
 
				-      }
			
 
				-      arr.sort(function() {
			
 
				-        return Math.random() - 0.5
			
 
				-      })
			
 
				-      arr.length = 4
			
 
				-
			
 
				-      return arr.join('')
			
 
				     },
			
 
				-    MathRand() {
			
 
				-      var Num = ''
			
 
				-      for (var i = 0; i < 4; i++) {
			
 
				-        Num += Math.floor(Math.random() * 10)
			
 
				-      }
			
 
				-      return Num
			
 
				-    },
			
 
				-    selectTaskNo(e) {
			
 
				-      if (this.dataList.taskTypeKey == 3) {
			
 
				-        this.$set(this.dataList1, 'moveTaskNo', e)
			
 
				-      }
			
 
				+    activated() {
			
 
				+      this.getList()
			
 
				     },
			
 
				-    dataFilter(val) {
			
 
				-      // console.log(val,"名")
			
 
				-      this.deptBudgetList.staffList = val
			
 
				-      if (val) {
			
 
				-        //val存在
			
 
				-        this.options = this.staffList.filter(item => {
			
 
				-          if (
			
 
				-            !!~item.staffName.indexOf(val) ||
			
 
				-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
			
 
				-          ) {
			
 
				-            return true
			
 
				-          }
			
 
				+    methods: {
			
 
				+      //返回按钮
			
 
				+      revert() {
			
 
				+        this.$router.go(-1)
			
 
				+      },
			
 
				+      returnsales() {
			
 
				+        this.$router.push({
			
 
				+          path: 'tranManagementWarehouseInOuttask'
			
 
				         })
			
 
				-      } else {
			
 
				-        //val为空时，还原数组
			
 
				-        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
			
 
				-          }
			
 
				+      },
			
 
				+      // 获取当前年月日
			
 
				+      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)
			
 
				+        var hour = date.getHours()
			
 
				+        var minutes = date.getMinutes()
			
 
				+        var seconds = date.getSeconds()
			
 
				+        if (mouth < 10) {
			
 
				+          mouth = '0' + mouth
			
 
				+        }
			
 
				+        if (datetime < 10) {
			
 
				+          datetime = '0' + datetime
			
 
				+        }
			
 
				+        if (hour < 10) {
			
 
				+          hour = '0' + hour
			
 
				+        }
			
 
				+        if (minutes < 10) {
			
 
				+          minutes = '0' + minutes
			
 
				+        }
			
 
				+        if (seconds < 10) {
			
 
				+          seconds = '0' + seconds
			
 
				+        }
			
 
				+        return year + '' + mouth + datetime + hour + minutes + seconds
			
 
				+      },
			
 
				+      // 随机验证码
			
 
				+      verifyinit() {
			
 
				+        var arr = []
			
 
				+        for (var i = 48; i < 57; i++) {
			
 
				+          arr.push(String.fromCharCode(i))
			
 
				+        }
			
 
				+        arr.sort(function() {
			
 
				+          return Math.random() - 0.5
			
 
				         })
			
 
				-      } else {
			
 
				-        //val为空时，还原数组
			
 
				-        this.options1 = this.staffList1
			
 
				-      }
			
 
				-    },
			
 
				-    weightchange(e) {
			
 
				-      if (this.dataList.taskTypeKey == 4) {
			
 
				-        this.$set(this.dataList, 'weight', e)
			
 
				-      }
			
 
				-    },
			
 
				-    weightchange1(e) {
			
 
				-      if (this.dataList.taskTypeKey == 3) {
			
 
				-        this.$set(this.dataList1, 'weight', e)
			
 
				-      }
			
 
				-    },
			
 
				-    bulkDensitychange(e) {
			
 
				-      if (this.dataList.taskTypeKey == 4) {
			
 
				-        this.$set(this.dataList, 'bulkDensity', e)
			
 
				-      } else if (this.dataList1.taskTypeKey == 3) {
			
 
				-        this.$set(this.dataList1, 'bulkDensity', e)
			
 
				-      }
			
 
				-    },
			
 
				-    waterContentchange(e) {
			
 
				-      if (this.dataList.taskTypeKey == 4) {
			
 
				-        this.$set(this.dataList, 'waterContent', e)
			
 
				-      } else if (this.dataList1.taskTypeKey == 3) {
			
 
				-        this.$set(this.dataList1, 'waterContent', e)
			
 
				-      }
			
 
				-    },
			
 
				-    unitPricechange(e) {
			
 
				-      if (this.dataList.taskTypeKey == 4) {
			
 
				-        this.$set(this.dataList, 'unitPrice', e)
			
 
				-      } else if (this.dataList1.taskTypeKey == 3) {
			
 
				-        this.$set(this.dataList1, 'unitPrice', e)
			
 
				-      }
			
 
				-    },
			
 
				-    changecontract(e) {
			
 
				-      if (this.dataList.taskTypeKey != 3) {
			
 
				-        for (let i = 0; i < this.contractNoList.length; i++) {
			
 
				-          if (this.contractNoList[i].contractNo == e) {
			
 
				-            getGoodsName({
			
 
				-              contractId: this.contractNoList[i].id,
			
 
				-              contractNo: this.contractNoList[i].contractNo
			
 
				-            })
			
 
				-              .toPromise()
			
 
				-              .then(response => {
			
 
				-                this.$set(this.dataList, 'goodsName', response.goodsName)
			
 
				-                this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
			
 
				-                this.$set(this.dataList, 'grade', response.grade)
			
 
				-                this.$set(this.dataList, 'gradeKey', response.gradeKey)
			
 
				-                this.$set(this.dataList, 'waterContent', response.waterContent)
			
 
				-                this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
			
 
				-                this.$set(this.dataList, 'weight', response.weight)
			
 
				-                this.$set(
			
 
				-                  this.dataList,
			
 
				-                  'unitPrice',
			
 
				-                  response.unitContractPrice
			
 
				-                )
			
 
				-              })
			
 
				-          }
			
 
				+        arr.length = 4
			
 
				+
			
 
				+        return arr.join('')
			
 
				+      },
			
 
				+      MathRand() {
			
 
				+        var Num = ''
			
 
				+        for (var i = 0; i < 4; i++) {
			
 
				+          Num += Math.floor(Math.random() * 10)
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectwarehouseName(e) {
			
 
				-      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
			
 
				+        return Num
			
 
				+      },
			
 
				+      selectTaskNo(e) {
			
 
				+        if (this.dataList.taskTypeKey == 3) {
			
 
				+          this.$set(this.dataList1, 'moveTaskNo', e)
			
 
				+        }
			
 
				+      },
			
 
				+      dataFilter(val) {
			
 
				+        // console.log(val,"名")
			
 
				+        this.deptBudgetList.staffList = val
			
 
				+        if (val) {
			
 
				+          //val存在
			
 
				+          this.options = this.staffList.filter(item => {
			
 
				+            if (
			
 
				+              !!~item.staffName.indexOf(val) ||
			
 
				+              !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
			
 
				+            ) {
			
 
				+              return true
			
 
				+            }
			
 
				           })
			
 
				-            .toPromise()
			
 
				-            .then(response => {
			
 
				-              this.options = response
			
 
				-              this.staffList = response
			
 
				-              //  this.agent = response
			
 
				-            })
			
 
				+        } else {
			
 
				+          //val为空时，还原数组
			
 
				+          this.options = this.staffList
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    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
			
 
				+      },
			
 
				+      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
			
 
				+            }
			
 
				           })
			
 
				-            .toPromise()
			
 
				-            .then(response => {
			
 
				-              this.options1 = response
			
 
				-              this.staffList1 = response
			
 
				-              //  this.agent = response
			
 
				-            })
			
 
				+        } else {
			
 
				+          //val为空时，还原数组
			
 
				+          this.options1 = this.staffList1
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    changecontract1(e) {
			
 
				-      if (this.dataList1.taskTypeKey != 3) {
			
 
				-        for (let i = 0; i < this.contractNoList.length; i++) {
			
 
				-          if (this.contractNoList[i].contractNo == e) {
			
 
				-            getGoodsName({
			
 
				-              contractId: this.contractNoList[i].id,
			
 
				-              contractNo: this.contractNoList[i].contractNo
			
 
				-            })
			
 
				+      },
			
 
				+      weightchange(e) {
			
 
				+        if (this.dataList.taskTypeKey == 4) {
			
 
				+          this.$set(this.dataList, 'weight', e)
			
 
				+        }
			
 
				+      },
			
 
				+      weightchange1(e) {
			
 
				+        if (this.dataList.taskTypeKey == 3) {
			
 
				+          this.$set(this.dataList1, 'weight', e)
			
 
				+        }
			
 
				+      },
			
 
				+      bulkDensitychange(e) {
			
 
				+        if (this.dataList.taskTypeKey == 4) {
			
 
				+          this.$set(this.dataList, 'bulkDensity', e)
			
 
				+        } else if (this.dataList1.taskTypeKey == 3) {
			
 
				+          this.$set(this.dataList1, 'bulkDensity', e)
			
 
				+        }
			
 
				+      },
			
 
				+      waterContentchange(e) {
			
 
				+        if (this.dataList.taskTypeKey == 4) {
			
 
				+          this.$set(this.dataList, 'waterContent', e)
			
 
				+        } else if (this.dataList1.taskTypeKey == 3) {
			
 
				+          this.$set(this.dataList1, 'waterContent', e)
			
 
				+        }
			
 
				+      },
			
 
				+      unitPricechange(e) {
			
 
				+        if (this.dataList.taskTypeKey == 4) {
			
 
				+          this.$set(this.dataList, 'unitPrice', e)
			
 
				+        } else if (this.dataList1.taskTypeKey == 3) {
			
 
				+          this.$set(this.dataList1, 'unitPrice', e)
			
 
				+        }
			
 
				+      },
			
 
				+      changecontract(e) {
			
 
				+        if (this.dataList.taskTypeKey != 3) {
			
 
				+          for (let i = 0; i < this.contractNoList.length; i++) {
			
 
				+            if (this.contractNoList[i].contractNo == e) {
			
 
				+              getGoodsName({
			
 
				+                  contractId: this.contractNoList[i].id,
			
 
				+                  contractNo: this.contractNoList[i].contractNo
			
 
				+                })
			
 
				+                .toPromise()
			
 
				+                .then(response => {
			
 
				+                  this.$set(this.dataList, 'goodsName', response.goodsName)
			
 
				+                  this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
			
 
				+                  this.$set(this.dataList, 'grade', response.grade)
			
 
				+                  this.$set(this.dataList, 'gradeKey', response.gradeKey)
			
 
				+                  this.$set(this.dataList, 'waterContent', response.waterContent)
			
 
				+                  this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
			
 
				+                  this.$set(this.dataList, 'weight', response.weight)
			
 
				+                  this.$set(
			
 
				+                    this.dataList,
			
 
				+                    'unitPrice',
			
 
				+                    response.unitContractPrice
			
 
				+                  )
			
 
				+                })
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+      },
			
 
				+      selectwarehouseName(e) {
			
 
				+        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.$set(this.dataList1, 'goodsName', response.goodsName)
			
 
				-                this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
			
 
				-                this.$set(this.dataList1, 'grade', response.grade)
			
 
				-                this.$set(this.dataList1, 'gradeKey', response.gradeKey)
			
 
				-                this.$set(this.dataList1, 'waterContent', response.waterContent)
			
 
				-                this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
			
 
				-                this.$set(this.dataList1, 'weight', response.weight)
			
 
				-                this.$set(
			
 
				-                  this.dataList1,
			
 
				-                  'unitPrice',
			
 
				-                  response.unitContractPrice
			
 
				-                )
			
 
				+                this.options = response
			
 
				+                this.staffList = response
			
 
				+                //  this.agent = response
			
 
				               })
			
 
				           }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectstaff(e) {
			
 
				-      for (var i = 0; i < this.staffList.length; i++) {
			
 
				-        if (this.staffList[i].staffName == e) {
			
 
				-          this.dataList.agentKey = this.staffList[i].staffId
			
 
				+      },
			
 
				+      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
			
 
				+              })
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectstaff1(e) {
			
 
				-      for (var i = 0; i < this.staffList.length; i++) {
			
 
				-        if (this.staffList[i].staffName == e) {
			
 
				-          this.dataList1.agentKey = this.staffList[i].staffId
			
 
				+      },
			
 
				+      changecontract1(e) {
			
 
				+        if (this.dataList1.taskTypeKey != 3) {
			
 
				+          for (let i = 0; i < this.contractNoList.length; i++) {
			
 
				+            if (this.contractNoList[i].contractNo == e) {
			
 
				+              getGoodsName({
			
 
				+                  contractId: this.contractNoList[i].id,
			
 
				+                  contractNo: this.contractNoList[i].contractNo
			
 
				+                })
			
 
				+                .toPromise()
			
 
				+                .then(response => {
			
 
				+                  this.$set(this.dataList1, 'goodsName', response.goodsName)
			
 
				+                  this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
			
 
				+                  this.$set(this.dataList1, 'grade', response.grade)
			
 
				+                  this.$set(this.dataList1, 'gradeKey', response.gradeKey)
			
 
				+                  this.$set(this.dataList1, 'waterContent', response.waterContent)
			
 
				+                  this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
			
 
				+                  this.$set(this.dataList1, 'weight', response.weight)
			
 
				+                  this.$set(
			
 
				+                    this.dataList1,
			
 
				+                    'unitPrice',
			
 
				+                    response.unitContractPrice
			
 
				+                  )
			
 
				+                })
			
 
				+            }
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    requestadd(list, status) {
			
 
				-      list.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				-      list.publisher =
			
 
				-        sessionStorage.getItem('ws-pf_roleName') +
			
 
				-        sessionStorage.getItem('ws-pf_staffName')
			
 
				-      addoreditoutput(list)
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          var that = this
			
 
				-          this.$message.success('添加成功')
			
 
				-          setTimeout(function() {
			
 
				-            that.dataList={taskTypeKey:1}
			
 
				-            that.dataList1={}
			
 
				-            that.$router.push({ path: 'tranManagementWarehouseInOuttask' })
			
 
				-          }, 2000)
			
 
				-        })
			
 
				-    },
			
 
				-    //提交按钮
			
 
				-    submit() {
			
 
				-      if (this.dataList.taskTypeKey == 1) {
			
 
				-        if (!this.dataList.warehouseName) {
			
 
				-          this.$message({
			
 
				-            message: '仓库名不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+      },
			
 
				+      selectstaff(e) {
			
 
				+        for (var i = 0; i < this.staffList.length; i++) {
			
 
				+          if (this.staffList[i].staffName == e) {
			
 
				+            this.dataList.agentKey = this.staffList[i].staffId
			
 
				+          }
			
 
				         }
			
 
				-        if (!this.dataList.contractNo) {
			
 
				-          this.$message({
			
 
				-            message: '合同编号不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+      },
			
 
				+      selectstaff1(e) {
			
 
				+        for (var i = 0; i < this.staffList.length; i++) {
			
 
				+          if (this.staffList[i].staffName == e) {
			
 
				+            this.dataList1.agentKey = this.staffList[i].staffId
			
 
				+          }
			
 
				         }
			
 
				-        if (!this.dataList.weight) {
			
 
				-          this.$message({
			
 
				-            message: '重量（吨）不能为空！',
			
 
				-            type: 'warning'
			
 
				+      },
			
 
				+      requestadd(list, status) {
			
 
				+        list.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+        list.publisher =
			
 
				+          sessionStorage.getItem('ws-pf_roleName') +
			
 
				+          sessionStorage.getItem('ws-pf_staffName')
			
 
				+        addoreditoutput(list)
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            var that = this
			
 
				+            this.$message.success('添加成功')
			
 
				+            setTimeout(function() {
			
 
				+              that.dataList = {
			
 
				+                taskTypeKey: 1
			
 
				+              }
			
 
				+              that.dataList1 = {}
			
 
				+              that.$router.push({
			
 
				+                path: 'tranManagementWarehouseInOuttask'
			
 
				+              })
			
 
				+            }, 2000)
			
 
				           })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          isNaN(this.dataList.weight) ||
			
 
				-          (String(this.dataList.weight).indexOf('.') != -1 &&
			
 
				-            String(this.dataList.weight).length -
			
 
				+      },
			
 
				+      //提交按钮
			
 
				+      submit() {
			
 
				+        if (this.dataList.taskTypeKey == 1) {
			
 
				+          if (!this.dataList.warehouseName) {
			
 
				+            this.$message({
			
 
				+              message: '仓库名不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.contractNo) {
			
 
				+            this.$message({
			
 
				+              message: '合同编号不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.weight) {
			
 
				+            this.$message({
			
 
				+              message: '重量（吨）不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            isNaN(this.dataList.weight) ||
			
 
				+            (String(this.dataList.weight).indexOf('.') != -1 &&
			
 
				+              String(this.dataList.weight).length -
			
 
				               (String(this.dataList.weight).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList.weight < 0 ||
			
 
				-          this.dataList.weight > 200000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '重量输入有误！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.bulkDensity) {
			
 
				-          this.$message({
			
 
				-            message: '容重不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          this.dataList.bulkDensity < 500 ||
			
 
				-          this.dataList.bulkDensity > 1000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList.bulkDensity).indexOf('.') != -1 &&
			
 
				-          String(this.dataList.bulkDensity).length -
			
 
				+            this.dataList.weight < 0 ||
			
 
				+            this.dataList.weight > 200000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '重量输入有误！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.bulkDensity) {
			
 
				+            this.$message({
			
 
				+              message: '容重不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            this.dataList.bulkDensity < 500 ||
			
 
				+            this.dataList.bulkDensity > 1000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList.bulkDensity).indexOf('.') != -1 &&
			
 
				+            String(this.dataList.bulkDensity).length -
			
 
				             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
			
 
				             0
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重需输入整数',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.waterContent) {
			
 
				-          this.$message({
			
 
				-            message: '水分不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (this.dataList.waterContent < 0 || this.dataList.waterContent > 40) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList.waterContent).indexOf('.') != -1 &&
			
 
				-          String(this.dataList.waterContent).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重需输入整数',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.waterContent) {
			
 
				+            this.$message({
			
 
				+              message: '水分不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (this.dataList.waterContent < 0 || this.dataList.waterContent > 40) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList.waterContent).indexOf('.') != -1 &&
			
 
				+            String(this.dataList.waterContent).length -
			
 
				             (String(this.dataList.waterContent).indexOf('.') + 1) >
			
 
				             1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.unitPrice) {
			
 
				-          this.$message({
			
 
				-            message: '单价不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          (this.dataList.unitPrice &&
			
 
				-            String(this.dataList.unitPrice).indexOf('.') != -1 &&
			
 
				-            String(this.dataList.unitPrice).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.unitPrice) {
			
 
				+            this.$message({
			
 
				+              message: '单价不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            (this.dataList.unitPrice &&
			
 
				+              String(this.dataList.unitPrice).indexOf('.') != -1 &&
			
 
				+              String(this.dataList.unitPrice).length -
			
 
				               (String(this.dataList.unitPrice).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList.unitPrice > 100000 ||
			
 
				-          this.dataList.unitPrice < 1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '单价输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.predictDate) {
			
 
				-          this.$message({
			
 
				-            message: '预计出库日期不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.agent) {
			
 
				-          this.$message({
			
 
				-            message: '出库经办人不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.businessDescribe) {
			
 
				-          this.$message({
			
 
				-            message: '业务描述不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+            this.dataList.unitPrice > 100000 ||
			
 
				+            this.dataList.unitPrice < 1
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '单价输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.predictDate) {
			
 
				+            this.$message({
			
 
				+              message: '预计出库日期不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.agent) {
			
 
				+            this.$message({
			
 
				+              message: '出库经办人不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.businessDescribe) {
			
 
				+            this.$message({
			
 
				+              message: '业务描述不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				 
			
 
				-      if (this.dataList.taskTypeKey == 2) {
			
 
				-        if (!this.dataList1.warehouseName) {
			
 
				-          this.$message({
			
 
				-            message: '仓库名不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.contractNo) {
			
 
				-          this.$message({
			
 
				-            message: '合同编号不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.weight) {
			
 
				-          this.$message({
			
 
				-            message: '重量（吨）不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          isNaN(this.dataList1.weight) ||
			
 
				-          (String(this.dataList1.weight).indexOf('.') != -1 &&
			
 
				-            String(this.dataList1.weight).length -
			
 
				+        if (this.dataList.taskTypeKey == 2) {
			
 
				+          if (!this.dataList1.warehouseName) {
			
 
				+            this.$message({
			
 
				+              message: '仓库名不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.contractNo) {
			
 
				+            this.$message({
			
 
				+              message: '合同编号不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.weight) {
			
 
				+            this.$message({
			
 
				+              message: '重量（吨）不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            isNaN(this.dataList1.weight) ||
			
 
				+            (String(this.dataList1.weight).indexOf('.') != -1 &&
			
 
				+              String(this.dataList1.weight).length -
			
 
				               (String(this.dataList1.weight).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList1.weight < 0 ||
			
 
				-          this.dataList1.weight > 200000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '重量输入有误！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.bulkDensity) {
			
 
				-          this.$message({
			
 
				-            message: '容重不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          this.dataList1.bulkDensity < 500 ||
			
 
				-          this.dataList1.bulkDensity > 1000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
			
 
				-          String(this.dataList1.bulkDensity).length -
			
 
				+            this.dataList1.weight < 0 ||
			
 
				+            this.dataList1.weight > 200000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '重量输入有误！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.bulkDensity) {
			
 
				+            this.$message({
			
 
				+              message: '容重不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            this.dataList1.bulkDensity < 500 ||
			
 
				+            this.dataList1.bulkDensity > 1000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
			
 
				+            String(this.dataList1.bulkDensity).length -
			
 
				             (String(this.dataList1.bulkDensity).indexOf('.') + 1) >
			
 
				             0
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重需输入整数',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.waterContent) {
			
 
				-          this.$message({
			
 
				-            message: '水分不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          this.dataList1.waterContent < 0 ||
			
 
				-          this.dataList1.waterContent > 40
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList1.waterContent).indexOf('.') != -1 &&
			
 
				-          String(this.dataList1.waterContent).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重需输入整数',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.waterContent) {
			
 
				+            this.$message({
			
 
				+              message: '水分不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            this.dataList1.waterContent < 0 ||
			
 
				+            this.dataList1.waterContent > 40
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList1.waterContent).indexOf('.') != -1 &&
			
 
				+            String(this.dataList1.waterContent).length -
			
 
				             (String(this.dataList1.waterContent).indexOf('.') + 1) >
			
 
				             1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.unitPrice) {
			
 
				-          this.$message({
			
 
				-            message: '单价不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          (this.dataList1.unitPrice &&
			
 
				-            String(this.dataList1.unitPrice).indexOf('.') != -1 &&
			
 
				-            String(this.dataList1.unitPrice).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.unitPrice) {
			
 
				+            this.$message({
			
 
				+              message: '单价不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            (this.dataList1.unitPrice &&
			
 
				+              String(this.dataList1.unitPrice).indexOf('.') != -1 &&
			
 
				+              String(this.dataList1.unitPrice).length -
			
 
				               (String(this.dataList1.unitPrice).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList1.unitPrice > 100000 ||
			
 
				-          this.dataList1.unitPrice < 1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '单价输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.predictDate) {
			
 
				-          this.$message({
			
 
				-            message: '预计入库日期不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.agent) {
			
 
				-          this.$message({
			
 
				-            message: '入库经办人不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.businessDescribe) {
			
 
				-          this.$message({
			
 
				-            message: '业务描述不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-      }
			
 
				-      if (this.dataList.taskTypeKey == 3) {
			
 
				-        if (!this.dataList.warehouseName) {
			
 
				-          this.$message({
			
 
				-            message: '出库仓库名不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.warehouseName) {
			
 
				-          this.$message({
			
 
				-            message: '入库仓库名不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.moveTaskNo) {
			
 
				-          this.$message({
			
 
				-            message: '移库任务编号不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.weight) {
			
 
				-          this.$message({
			
 
				-            message: '重量（吨）不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+            this.dataList1.unitPrice > 100000 ||
			
 
				+            this.dataList1.unitPrice < 1
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '单价输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.predictDate) {
			
 
				+            this.$message({
			
 
				+              message: '预计入库日期不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.agent) {
			
 
				+            this.$message({
			
 
				+              message: '入库经办人不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.businessDescribe) {
			
 
				+            this.$message({
			
 
				+              message: '业务描述不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				         }
			
 
				-        if (
			
 
				-          isNaN(this.dataList1.weight) ||
			
 
				-          (String(this.dataList1.weight).indexOf('.') != -1 &&
			
 
				-            String(this.dataList1.weight).length -
			
 
				+        if (this.dataList.taskTypeKey == 3) {
			
 
				+          if (!this.dataList.warehouseName) {
			
 
				+            this.$message({
			
 
				+              message: '出库仓库名不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.warehouseName) {
			
 
				+            this.$message({
			
 
				+              message: '入库仓库名不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.moveTaskNo) {
			
 
				+            this.$message({
			
 
				+              message: '移库任务编号不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.weight) {
			
 
				+            this.$message({
			
 
				+              message: '重量（吨）不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            isNaN(this.dataList1.weight) ||
			
 
				+            (String(this.dataList1.weight).indexOf('.') != -1 &&
			
 
				+              String(this.dataList1.weight).length -
			
 
				               (String(this.dataList1.weight).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList1.weight < 0 ||
			
 
				-          this.dataList1.weight > 200000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '重量输入有误！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.bulkDensity) {
			
 
				-          this.$message({
			
 
				-            message: '容重不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          this.dataList1.bulkDensity < 500 ||
			
 
				-          this.dataList1.bulkDensity > 1000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
			
 
				-          String(this.dataList1.bulkDensity).length -
			
 
				+            this.dataList1.weight < 0 ||
			
 
				+            this.dataList1.weight > 200000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '重量输入有误！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.bulkDensity) {
			
 
				+            this.$message({
			
 
				+              message: '容重不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            this.dataList1.bulkDensity < 500 ||
			
 
				+            this.dataList1.bulkDensity > 1000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
			
 
				+            String(this.dataList1.bulkDensity).length -
			
 
				             (String(this.dataList1.bulkDensity).indexOf('.') + 1) >
			
 
				             0
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重需输入整数',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.waterContent) {
			
 
				-          this.$message({
			
 
				-            message: '水分不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          this.dataList1.waterContent < 0 ||
			
 
				-          this.dataList1.waterContent > 40
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList1.waterContent).indexOf('.') != -1 &&
			
 
				-          String(this.dataList1.waterContent).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重需输入整数',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.waterContent) {
			
 
				+            this.$message({
			
 
				+              message: '水分不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            this.dataList1.waterContent < 0 ||
			
 
				+            this.dataList1.waterContent > 40
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList1.waterContent).indexOf('.') != -1 &&
			
 
				+            String(this.dataList1.waterContent).length -
			
 
				             (String(this.dataList1.waterContent).indexOf('.') + 1) >
			
 
				             1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.unitPrice) {
			
 
				-          this.$message({
			
 
				-            message: '单价不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          (this.dataList1.unitPrice &&
			
 
				-            String(this.dataList1.unitPrice).indexOf('.') != -1 &&
			
 
				-            String(this.dataList1.unitPrice).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.unitPrice) {
			
 
				+            this.$message({
			
 
				+              message: '单价不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            (this.dataList1.unitPrice &&
			
 
				+              String(this.dataList1.unitPrice).indexOf('.') != -1 &&
			
 
				+              String(this.dataList1.unitPrice).length -
			
 
				               (String(this.dataList1.unitPrice).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList1.unitPrice > 100000 ||
			
 
				-          this.dataList1.unitPrice < 1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '单价输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.predictDate) {
			
 
				-          this.$message({
			
 
				-            message: '预计出库日期不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.predictDate) {
			
 
				-          this.$message({
			
 
				-            message: '预计入库日期不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.agent) {
			
 
				-          this.$message({
			
 
				-            message: '出库经办人不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.agent) {
			
 
				-          this.$message({
			
 
				-            message: '入库经办人不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.businessDescribe) {
			
 
				-          this.$message({
			
 
				-            message: '业务描述不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+            this.dataList1.unitPrice > 100000 ||
			
 
				+            this.dataList1.unitPrice < 1
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '单价输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.predictDate) {
			
 
				+            this.$message({
			
 
				+              message: '预计出库日期不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.predictDate) {
			
 
				+            this.$message({
			
 
				+              message: '预计入库日期不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.agent) {
			
 
				+            this.$message({
			
 
				+              message: '出库经办人不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.agent) {
			
 
				+            this.$message({
			
 
				+              message: '入库经办人不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.businessDescribe) {
			
 
				+            this.$message({
			
 
				+              message: '业务描述不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				 
			
 
				-      if (this.dataList1.taskTypeKey == 4) {
			
 
				-        if (!this.dataList.warehouseName) {
			
 
				-          this.$message({
			
 
				-            message: '出库仓库名不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.warehouseName) {
			
 
				-          this.$message({
			
 
				-            message: '入库仓库名不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.contractNo) {
			
 
				-          this.$message({
			
 
				-            message: '合同编号不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.contractNo) {
			
 
				-          this.$message({
			
 
				-            message: '合同编号不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.weight) {
			
 
				-          this.$message({
			
 
				-            message: '重量（吨）不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          isNaN(this.dataList1.weight) ||
			
 
				-          (String(this.dataList1.weight).indexOf('.') != -1 &&
			
 
				-            String(this.dataList1.weight).length -
			
 
				+        if (this.dataList1.taskTypeKey == 4) {
			
 
				+          if (!this.dataList.warehouseName) {
			
 
				+            this.$message({
			
 
				+              message: '出库仓库名不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.warehouseName) {
			
 
				+            this.$message({
			
 
				+              message: '入库仓库名不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.contractNo) {
			
 
				+            this.$message({
			
 
				+              message: '合同编号不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.contractNo) {
			
 
				+            this.$message({
			
 
				+              message: '合同编号不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.weight) {
			
 
				+            this.$message({
			
 
				+              message: '重量（吨）不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            isNaN(this.dataList1.weight) ||
			
 
				+            (String(this.dataList1.weight).indexOf('.') != -1 &&
			
 
				+              String(this.dataList1.weight).length -
			
 
				               (String(this.dataList1.weight).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList1.weight < 0 ||
			
 
				-          this.dataList1.weight > 200000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '重量输入有误！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.bulkDensity) {
			
 
				-          this.$message({
			
 
				-            message: '容重不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          this.dataList1.bulkDensity < 500 ||
			
 
				-          this.dataList1.bulkDensity > 1000
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
			
 
				-          String(this.dataList1.bulkDensity).length -
			
 
				+            this.dataList1.weight < 0 ||
			
 
				+            this.dataList1.weight > 200000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '重量输入有误！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.bulkDensity) {
			
 
				+            this.$message({
			
 
				+              message: '容重不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            this.dataList1.bulkDensity < 500 ||
			
 
				+            this.dataList1.bulkDensity > 1000
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
			
 
				+            String(this.dataList1.bulkDensity).length -
			
 
				             (String(this.dataList1.bulkDensity).indexOf('.') + 1) >
			
 
				             0
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '容重需输入整数',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.waterContent) {
			
 
				-          this.$message({
			
 
				-            message: '水分不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          this.dataList1.waterContent < 0 ||
			
 
				-          this.dataList1.waterContent > 40
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          String(this.dataList1.waterContent).indexOf('.') != -1 &&
			
 
				-          String(this.dataList1.waterContent).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '容重需输入整数',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.waterContent) {
			
 
				+            this.$message({
			
 
				+              message: '水分不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            this.dataList1.waterContent < 0 ||
			
 
				+            this.dataList1.waterContent > 40
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            String(this.dataList1.waterContent).indexOf('.') != -1 &&
			
 
				+            String(this.dataList1.waterContent).length -
			
 
				             (String(this.dataList1.waterContent).indexOf('.') + 1) >
			
 
				             1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '水分输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList1.unitPrice) {
			
 
				-          this.$message({
			
 
				-            message: '单价不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (
			
 
				-          (this.dataList1.unitPrice &&
			
 
				-            String(this.dataList1.unitPrice).indexOf('.') != -1 &&
			
 
				-            String(this.dataList1.unitPrice).length -
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '水分输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.unitPrice) {
			
 
				+            this.$message({
			
 
				+              message: '单价不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (
			
 
				+            (this.dataList1.unitPrice &&
			
 
				+              String(this.dataList1.unitPrice).indexOf('.') != -1 &&
			
 
				+              String(this.dataList1.unitPrice).length -
			
 
				               (String(this.dataList1.unitPrice).indexOf('.') + 1) >
			
 
				               2) ||
			
 
				-          this.dataList1.unitPrice > 100000 ||
			
 
				-          this.dataList1.unitPrice < 1
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '单价输入错误',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				-        }
			
 
				-        if (!this.dataList.predictDate) {
			
 
				-          this.$message({
			
 
				-            message: '预计出库日期不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+            this.dataList1.unitPrice > 100000 ||
			
 
				+            this.dataList1.unitPrice < 1
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '单价输入错误',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.predictDate) {
			
 
				+            this.$message({
			
 
				+              message: '预计出库日期不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.predictDate) {
			
 
				+            this.$message({
			
 
				+              message: '预计入库日期不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.agent) {
			
 
				+            this.$message({
			
 
				+              message: '出库经办人不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList1.agent) {
			
 
				+            this.$message({
			
 
				+              message: '入库经办人不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				+          if (!this.dataList.businessDescribe) {
			
 
				+            this.$message({
			
 
				+              message: '业务描述不能为空！',
			
 
				+              type: 'warning'
			
 
				+            })
			
 
				+            return
			
 
				+          }
			
 
				         }
			
 
				-        if (!this.dataList1.predictDate) {
			
 
				-          this.$message({
			
 
				-            message: '预计入库日期不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+        // this.dataList.goodsNameKey =
			
 
				+        // this.dataList.positionId =
			
 
				+        // this.dataList.baseId =
			
 
				+        this.dataList.inOutFlag = 1
			
 
				+        this.dataList1.inOutFlag = 2
			
 
				+        if (this.dataList.taskTypeKey == 1) {
			
 
				+          this.dataList.inOutTaskNo = this.inOutTaskNo
			
 
				+          this.requestadd(this.dataList)
			
 
				+        } else if (this.dataList1.taskTypeKey == 2) {
			
 
				+          this.dataList1.inOutTaskNo = this.inOutTaskNo1
			
 
				+          this.requestadd(this.dataList1)
			
 
				+        } else if (
			
 
				+          this.dataList.taskTypeKey == 3 ||
			
 
				+          this.dataList.taskTypeKey == 4
			
 
				+        ) {
			
 
				+          this.dataList.inOutTaskNo = this.inOutTaskNo
			
 
				+          this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
			
 
				+          if (this.dataList.taskTypeKey == 3) {
			
 
				+            this.dataList.businessDescribe = this.dataList1.businessDescribe
			
 
				+          } else {
			
 
				+            this.dataList1.businessDescribe = this.dataList.businessDescribe
			
 
				+          }
			
 
				+          this.requestadd(this.dataList, 'repetition')
			
 
				+          this.dataList1.inOutTaskNo = this.inOutTaskNo1
			
 
				+          this.dataList1.relevanceId = this.dataList.relevanceId
			
 
				+          this.dataList1.goodsName = this.dataList.goodsName
			
 
				+          this.requestadd(this.dataList1, 'repetition')
			
 
				         }
			
 
				-        if (!this.dataList.agent) {
			
 
				-          this.$message({
			
 
				-            message: '出库经办人不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+      },
			
 
				+      tarechange(e) {
			
 
				+        if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				+          this.dataList.netWeight = Number(
			
 
				+            this.dataList.grossWeight - this.dataList.tare
			
 
				+          )
			
 
				         }
			
 
				-        if (!this.dataList1.agent) {
			
 
				-          this.$message({
			
 
				-            message: '入库经办人不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+      },
			
 
				+      grossWeightchange(e) {
			
 
				+        if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				+          this.dataList.netWeight = Number(
			
 
				+            this.dataList.grossWeight - this.dataList.tare
			
 
				+          )
			
 
				         }
			
 
				-        if (!this.dataList.businessDescribe) {
			
 
				-          this.$message({
			
 
				-            message: '业务描述不能为空！',
			
 
				-            type: 'warning'
			
 
				-          })
			
 
				-          return
			
 
				+      },
			
 
				+      selectgoodsName(e) {
			
 
				+        for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				+          if (this.goodnameList[i].constValue == e) {
			
 
				+            this.dataList.goodsNameKey = this.goodnameList[i].constKey
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-      // this.dataList.goodsNameKey =
			
 
				-      // this.dataList.positionId = 
			
 
				-      // this.dataList.baseId = 
			
 
				-      this.dataList.inOutFlag = 1
			
 
				-      this.dataList1.inOutFlag = 2
			
 
				-      if (this.dataList.taskTypeKey == 1) {
			
 
				-        this.dataList.inOutTaskNo = this.inOutTaskNo
			
 
				-        this.requestadd(this.dataList)
			
 
				-      } else if (this.dataList1.taskTypeKey == 2) {
			
 
				-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
			
 
				-        this.requestadd(this.dataList1)
			
 
				-      } else if (
			
 
				-        this.dataList.taskTypeKey == 3 ||
			
 
				-        this.dataList.taskTypeKey == 4
			
 
				-      ) {
			
 
				-        this.dataList.inOutTaskNo = this.inOutTaskNo
			
 
				-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
			
 
				-        if (this.dataList.taskTypeKey == 3) {
			
 
				-          this.dataList.businessDescribe = this.dataList1.businessDescribe
			
 
				-        } else {
			
 
				-          this.dataList1.businessDescribe = this.dataList.businessDescribe
			
 
				+      },
			
 
				+      selectgoodsName1(e) {
			
 
				+        for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				+          if (this.goodnameList[i].constValue == e) {
			
 
				+            this.dataList1.goodsNameKey = this.goodnameList[i].constKey
			
 
				+          }
			
 
				         }
			
 
				-        this.requestadd(this.dataList, 'repetition')
			
 
				-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
			
 
				-        this.dataList1.relevanceId = this.dataList.relevanceId
			
 
				-        this.dataList1.goodsName = this.dataList.goodsName
			
 
				-        this.requestadd(this.dataList1, 'repetition')
			
 
				-      }
			
 
				-    },
			
 
				-    tarechange(e) {
			
 
				-      if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				-        this.dataList.netWeight = Number(
			
 
				-          this.dataList.grossWeight - this.dataList.tare
			
 
				-        )
			
 
				-      }
			
 
				-    },
			
 
				-    grossWeightchange(e) {
			
 
				-      if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				-        this.dataList.netWeight = Number(
			
 
				-          this.dataList.grossWeight - this.dataList.tare
			
 
				-        )
			
 
				-      }
			
 
				-    },
			
 
				-    selectgoodsName(e) {
			
 
				-      for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				-        if (this.goodnameList[i].constValue == e) {
			
 
				-          this.dataList.goodsNameKey = this.goodnameList[i].constKey
			
 
				+      },
			
 
				+      selectpackingMethod(e) {
			
 
				+        for (var i = 0; i < this.gradeList.length; i++) {
			
 
				+          if (this.gradeList[i].constValue == e) {
			
 
				+            this.dataList.gradeKey = this.gradeList[i].constKey
			
 
				+            if (this.dataList.taskTypeKey == 3) {
			
 
				+              this.$set(this.dataList1, 'grade', e)
			
 
				+              this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
			
 
				+            }
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectgoodsName1(e) {
			
 
				-      for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				-        if (this.goodnameList[i].constValue == e) {
			
 
				-          this.dataList1.goodsNameKey = this.goodnameList[i].constKey
			
 
				+      },
			
 
				+      selectpackingMethod1(e) {
			
 
				+        for (var i = 0; i < this.gradeList.length; i++) {
			
 
				+          if (this.gradeList[i].constValue == e) {
			
 
				+            this.dataList1.packingMethodKey = this.gradeList[i].constKey
			
 
				+            if (this.dataList1.taskTypeKey == 4) {
			
 
				+              this.$set(this.dataList, 'grade', e)
			
 
				+              this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
			
 
				+            }
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectpackingMethod(e) {
			
 
				-      for (var i = 0; i < this.gradeList.length; i++) {
			
 
				-        if (this.gradeList[i].constValue == e) {
			
 
				-          this.dataList.gradeKey = this.gradeList[i].constKey
			
 
				-          if (this.dataList.taskTypeKey == 3) {
			
 
				-            this.$set(this.dataList1, 'grade', e)
			
 
				-            this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
			
 
				+      },
			
 
				+      selectstorageType(e) {
			
 
				+        switch (e) {
			
 
				+          case '采购出库':
			
 
				+            this.flag = 0
			
 
				+            break
			
 
				+          case '销售出库':
			
 
				+            this.flag = 1
			
 
				+            break
			
 
				+        }
			
 
				+        for (var i = 0; i < this.storageType.length; i++) {
			
 
				+          if (this.storageType[i].constValue == e) {
			
 
				+            this.dataList.inOutTypeKey = this.storageType[i].constKey
			
 
				           }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectpackingMethod1(e) {
			
 
				-      for (var i = 0; i < this.gradeList.length; i++) {
			
 
				-        if (this.gradeList[i].constValue == e) {
			
 
				-          this.dataList1.packingMethodKey = this.gradeList[i].constKey
			
 
				-          if (this.dataList1.taskTypeKey == 4) {
			
 
				-            this.$set(this.dataList, 'grade', e)
			
 
				-            this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
			
 
				+      },
			
 
				+      selectstorageType1(e) {debugger
			
 
				+        switch (e) {
			
 
				+          case '采购入库':
			
 
				+            this.flag = 0
			
 
				+            break
			
 
				+          case '退库':
			
 
				+            this.flag = 2
			
 
				+            break
			
 
				+        }
			
 
				+        for (var i = 0; i < this.storageType1.length; i++) {
			
 
				+          if (this.storageType1[i].constValue == e) {
			
 
				+            this.dataList1.inOutTypeKey = this.storageType1[i].constKey
			
 
				           }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectstorageType(e) {
			
 
				-      switch (e) {
			
 
				-        case '采购出库':
			
 
				-          this.flag = 0
			
 
				-          break
			
 
				-        case '销售出库':
			
 
				+      },
			
 
				+      handleClose() {
			
 
				+        this.accessoryTFs = false
			
 
				+      },
			
 
				+      handleSizeChange(val) {
			
 
				+        console.log(`每页 ${val} 条`)
			
 
				+        this.pageSize = val
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      businessDescriptionchange(e) {
			
 
				+        console.log(e)
			
 
				+      },
			
 
				+      handleCurrentChange(val) {
			
 
				+        this.currentPage = val
			
 
				+        console.log(`当前页: ${val}`)
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      tasknumber() {
			
 
				+        if (this.dataList.taskTypeKey == 1) {
			
 
				+          this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
			
 
				+        } else if (this.dataList.taskTypeKey == 2) {
			
 
				+          this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
			
 
				+        } else if (this.dataList.taskTypeKey == 3) {
			
 
				+          var random = this.getdate() + this.MathRand()
			
 
				+          this.inOutTaskNo = 'YKC' + random
			
 
				+          this.inOutTaskNo1 = 'YKR' + random
			
 
				+        } else if (this.dataList.taskTypeKey == 4) {
			
 
				+          var random = this.getdate() + this.MathRand()
			
 
				+          this.inOutTaskNo = 'TCC' + random
			
 
				+          this.inOutTaskNo1 = 'TCR' + random
			
 
				+        }
			
 
				+      },
			
 
				+      tasktypechange(e) {
			
 
				+        if (!this.$route.query.relevanceId) {
			
 
				+          this.tasknumber()
			
 
				+        }
			
 
				+        this.dataList1.taskTypeKey = e
			
 
				+        if (this.dataList.taskTypeKey == 1) {
			
 
				+          this.dataList.inOutType = '销售出库'
			
 
				+          this.dataList.inOutTypeKey = '1'
			
 
				           this.flag = 1
			
 
				-          break
			
 
				-      }
			
 
				-      for (var i = 0; i < this.storageType.length; i++) {
			
 
				-        if (this.storageType[i].constValue == e) {
			
 
				-          this.dataList.inOutTypeKey = this.storageType[i].constKey
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectstorageType1(e) {
			
 
				-      switch (e) {
			
 
				-        case '采购入库':
			
 
				+        if (this.dataList1.taskTypeKey == 2) {
			
 
				+          this.dataList1.inOutType = '采购入库'
			
 
				+          this.dataList1.inOutTypeKey = '1'
			
 
				           this.flag = 0
			
 
				-          break
			
 
				-        case '退库':
			
 
				+        } else if (this.dataList1.taskTypeKey == 3) {
			
 
				+          this.disabled = true
			
 
				+          this.dataList1.inOutType = '移库入库'
			
 
				+          this.dataList1.inOutTypeKey = '3'
			
 
				+          this.dataList.inOutType = '移库出库'
			
 
				+          this.dataList.inOutTypeKey = '3'
			
 
				+        } else if (this.dataList1.taskTypeKey == 4) {
			
 
				+          this.disabled = true
			
 
				+          this.dataList1.inOutType = '退库'
			
 
				+          this.dataList1.inOutTypeKey = '6'
			
 
				+          this.dataList.inOutType = '销售出库'
			
 
				           this.flag = 2
			
 
				-          break
			
 
				-      }
			
 
				-      for (var i = 0; i < this.storageType1.length; i++) {
			
 
				-        if (this.storageType1[i].constValue == e) {
			
 
				-          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
			
 
				+          this.dataList.inOutTypeKey = '1'
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    handleClose() {
			
 
				-      this.accessoryTFs = false
			
 
				-    },
			
 
				-    handleSizeChange(val) {
			
 
				-      console.log(`每页 ${val} 条`)
			
 
				-      this.pageSize = val
			
 
				-      this.getList()
			
 
				-    },
			
 
				-    businessDescriptionchange(e) {
			
 
				-      console.log(e)
			
 
				-    },
			
 
				-    handleCurrentChange(val) {
			
 
				-      this.currentPage = val
			
 
				-      console.log(`当前页: ${val}`)
			
 
				-      this.getList()
			
 
				-    },
			
 
				-    tasknumber() {
			
 
				-      if (this.dataList.taskTypeKey == 1) {
			
 
				-        this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
			
 
				-      } else if (this.dataList.taskTypeKey == 2) {
			
 
				-        this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
			
 
				-      } else if (this.dataList.taskTypeKey == 3) {
			
 
				-        var random = this.getdate() + this.MathRand()
			
 
				-        this.inOutTaskNo = 'YKC' + random
			
 
				-        this.inOutTaskNo1 = 'YKR' + random
			
 
				-      } else if (this.dataList.taskTypeKey == 4) {
			
 
				-        var random = this.getdate() + this.MathRand()
			
 
				-        this.inOutTaskNo = 'TCC' + random
			
 
				-        this.inOutTaskNo1 = 'TCR' + random
			
 
				-      }
			
 
				-    },
			
 
				-    tasktypechange(e) {
			
 
				-      if (!this.$route.query.relevanceId) {
			
 
				+      },
			
 
				+      GetRandomNum(Min, Max) {
			
 
				+        var Range = Max - Min
			
 
				+        var Rand = Math.random()
			
 
				+        return Min + Math.round(Rand * Range)
			
 
				+      },
			
 
				+      getList() {
			
 
				         this.tasknumber()
			
 
				-      }
			
 
				-      this.dataList1.taskTypeKey = e
			
 
				-      if (this.dataList.taskTypeKey == 1) {
			
 
				-        this.dataList.inOutType = '销售出库'
			
 
				-        this.dataList.inOutTypeKey = '1'
			
 
				-        this.flag = 1
			
 
				-      }
			
 
				-      if (this.dataList1.taskTypeKey == 2) {
			
 
				-        this.dataList1.inOutType = '采购入库'
			
 
				-        this.dataList1.inOutTypeKey = '1'
			
 
				-        this.flag = 0
			
 
				-      } else if (this.dataList1.taskTypeKey == 3) {
			
 
				-        this.disabled = true
			
 
				-        this.dataList1.inOutType = '移库入库'
			
 
				-        this.dataList1.inOutTypeKey = '3'
			
 
				-        this.dataList.inOutType = '移库出库'
			
 
				-        this.dataList.inOutTypeKey = '3'
			
 
				-      } else if (this.dataList1.taskTypeKey == 4) {
			
 
				-        this.disabled = true
			
 
				-        this.dataList1.inOutType = '退库'
			
 
				-        this.dataList1.inOutTypeKey = '6'
			
 
				-        this.dataList.inOutType = '销售出库'
			
 
				-        this.flag = 2
			
 
				-        this.dataList.inOutTypeKey = '1'
			
 
				-      }
			
 
				-    },
			
 
				-    GetRandomNum(Min, Max) {
			
 
				-      var Range = Max - Min
			
 
				-      var Rand = Math.random()
			
 
				-      return Min + Math.round(Rand * Range)
			
 
				-    },
			
 
				-    getList() {
			
 
				-      this.tasknumber()
			
 
				-      this.$set(this.dataList, 'inOutType', '销售出库')
			
 
				-      this.$set(this.dataList, 'inOutTypeKey', '1')
			
 
				-      this.$set(this.dataList, 'goodsName', '玉米')
			
 
				-      this.$set(this.dataList, 'goodsNameKey', '1')
			
 
				-      this.$set(this.dataList, 'grade', '一等品')
			
 
				-      this.$set(this.dataList, 'gradeKey', '1')
			
 
				-      this.$set(this.dataList1, 'goodsName', '玉米')
			
 
				-      this.$set(this.dataList1, 'goodsNameKey', '1')
			
 
				-      this.$set(this.dataList1, 'grade', '一等品')
			
 
				-      this.$set(this.dataList1, 'gradeKey', '1')
			
 
				-      // 货名
			
 
				-      pullDown({ constId: 'CON2' })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          this.goodnameList = response
			
 
				-        })
			
 
				-      // 品级
			
 
				-      pullDown({ constId: 'CON3' })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          this.gradeList = response
			
 
				-        })
			
 
				-      pullDown({ constId: 'CON6' })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          this.storageType = response
			
 
				-        })
			
 
				-      pullDown({ constId: 'CON5' })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          this.storageType1 = response
			
 
				-        })
			
 
				-      xialaNo({
			
 
				-        compId: this.compId,
			
 
				-        flag: this.flag
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          this.contractNoList = response
			
 
				-          // this.contractNoList1 = response
			
 
				-        })
			
 
				-      // //临时仓库入库类型
			
 
				-      // pullDown({ constId: 'WARE1' })
			
 
				-      //   .toPromise()
			
 
				-      //   .then((response) => {
			
 
				-      //     this.storageType = respons
			
 
				-      //   })
			
 
				-      // //临时仓库出库类型
			
 
				-      // pullDown({ constId: 'WARE2' })
			
 
				-      //   .toPromise()
			
 
				-      //   .then((response) => {
			
 
				-      //     this.deliveryType = response
			
 
				-      //   })
			
 
				-      //仓库名
			
 
				-      getwarehousename({
			
 
				-        compId: this.compId,
			
 
				-        warehouseType: 1
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          this.warehouseNameList = response
			
 
				-          getwarehousename({
			
 
				+        this.$set(this.dataList, 'inOutType', '销售出库')
			
 
				+        this.$set(this.dataList, 'inOutTypeKey', '1')
			
 
				+        this.$set(this.dataList, 'goodsName', '玉米')
			
 
				+        this.$set(this.dataList, 'goodsNameKey', '1')
			
 
				+        this.$set(this.dataList, 'grade', '一等品')
			
 
				+        this.$set(this.dataList, 'gradeKey', '1')
			
 
				+        this.$set(this.dataList1, 'goodsName', '玉米')
			
 
				+        this.$set(this.dataList1, 'goodsNameKey', '1')
			
 
				+        this.$set(this.dataList1, 'grade', '一等品')
			
 
				+        this.$set(this.dataList1, 'gradeKey', '1')
			
 
				+        // 货名
			
 
				+        pullDown({
			
 
				+            constId: 'CON2'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            this.goodnameList = response
			
 
				+          })
			
 
				+        // 品级
			
 
				+        pullDown({
			
 
				+            constId: 'CON3'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            this.gradeList = response
			
 
				+          })
			
 
				+        pullDown({
			
 
				+            constId: 'CON6'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            this.storageType = response
			
 
				+          })
			
 
				+        pullDown({
			
 
				+            constId: 'CON5'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            this.storageType1 = response
			
 
				+          })
			
 
				+        xialaNo({
			
 
				             compId: this.compId,
			
 
				-            warehouseType: 2
			
 
				+            flag: this.flag
			
 
				           })
			
 
				-            .toPromise()
			
 
				-            .then(response => {
			
 
				-              for (var i = 0; i < response.length; i++) {
			
 
				-                this.warehouseNameList.push(response[i])
			
 
				-              }
			
 
				-            })
			
 
				-        })
			
 
				-    },
			
 
				-    selecttaskType(e) {
			
 
				-      for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				-        if (this.taskTypeList[i].value == e) {
			
 
				-          this.searchType = this.taskTypeList[i].type
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            this.contractNoList = response
			
 
				+            // this.contractNoList1 = response
			
 
				+          })
			
 
				+        // //临时仓库入库类型
			
 
				+        // pullDown({ constId: 'WARE1' })
			
 
				+        //   .toPromise()
			
 
				+        //   .then((response) => {
			
 
				+        //     this.storageType = respons
			
 
				+        //   })
			
 
				+        // //临时仓库出库类型
			
 
				+        // pullDown({ constId: 'WARE2' })
			
 
				+        //   .toPromise()
			
 
				+        //   .then((response) => {
			
 
				+        //     this.deliveryType = response
			
 
				+        //   })
			
 
				+        //仓库名
			
 
				+        getwarehousename({
			
 
				+            compId: this.compId,
			
 
				+            warehouseType: 1
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then(response => {
			
 
				+            this.warehouseNameList = response
			
 
				+            getwarehousename({
			
 
				+                compId: this.compId,
			
 
				+                warehouseType: 2
			
 
				+              })
			
 
				+              .toPromise()
			
 
				+              .then(response => {
			
 
				+                for (var i = 0; i < response.length; i++) {
			
 
				+                  this.warehouseNameList.push(response[i])
			
 
				+                }
			
 
				+              })
			
 
				+          })
			
 
				+      },
			
 
				+      selecttaskType(e) {
			
 
				+        for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				+          if (this.taskTypeList[i].value == e) {
			
 
				+            this.searchType = this.taskTypeList[i].type
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    fujian(row) {
			
 
				-      if (
			
 
				-        row.receiveAttachmentPath === null ||
			
 
				-        row.receiveAttachmentPath === ''
			
 
				-      ) {
			
 
				-        EventBus.$emit(
			
 
				-          'warning',
			
 
				-          this.$t('system.noticeCircular.NoInformation')
			
 
				-        )
			
 
				-      } else {
			
 
				-        this.accessoryTFs = true
			
 
				-      }
			
 
				-      this.appendixIdss = row.receiveAttachmentPath
			
 
				-    },
			
 
				-    handleExamine(row) {
			
 
				-      this.$router.push({
			
 
				-        name: 'salesContractExamine',
			
 
				-        query: { id: row.id }
			
 
				-      })
			
 
				-    },
			
 
				-
			
 
				-    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				-    handleCloe() {
			
 
				-      this.dialogViewSpareMoney = false
			
 
				-    },
			
 
				-    history(row) {
			
 
				-      console.log(row)
			
 
				-      billoperatehis({ id: row.id })
			
 
				-        .toPromise()
			
 
				-        .then(response => {
			
 
				-          this.historyList = response
			
 
				+      },
			
 
				+      fujian(row) {
			
 
				+        if (
			
 
				+          row.receiveAttachmentPath === null ||
			
 
				+          row.receiveAttachmentPath === ''
			
 
				+        ) {
			
 
				+          EventBus.$emit(
			
 
				+            'warning',
			
 
				+            this.$t('system.noticeCircular.NoInformation')
			
 
				+          )
			
 
				+        } else {
			
 
				+          this.accessoryTFs = true
			
 
				+        }
			
 
				+        this.appendixIdss = row.receiveAttachmentPath
			
 
				+      },
			
 
				+      handleExamine(row) {
			
 
				+        this.$router.push({
			
 
				+          name: 'salesContractExamine',
			
 
				+          query: {
			
 
				+            id: row.id
			
 
				+          }
			
 
				         })
			
 
				+      },
			
 
				+
			
 
				+      // 关闭 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>
			
 
				-/deep/.basicInformation {
			
 
				-  .el-info-table {
			
 
				-    border: none;
			
 
				+  /deep/.basicInformation {
			
 
				+    .el-info-table {
			
 
				+      border: none;
			
 
				+      position: relative;
			
 
				+    }
			
 
				+
			
 
				+    .el-form-item {
			
 
				+      width: 33.3333%;
			
 
				+      border: none;
			
 
				+      margin: 0;
			
 
				+
			
 
				+      .el-form-item__label {
			
 
				+        text-align: left;
			
 
				+        font-size: 14px;
			
 
				+        font-family: PingFangSC-Regular, PingFang SC;
			
 
				+        font-weight: 400;
			
 
				+        color: #8890b1;
			
 
				+      }
			
 
				+
			
 
				+      .el-form-item__content {
			
 
				+        padding-left: 0px;
			
 
				+        padding-right: 10px;
			
 
				+        // background: #fff;
			
 
				+        white-space: nowrap;
			
 
				+        height: 40px;
			
 
				+        display: flex;
			
 
				+        -webkit-box-align: center;
			
 
				+        align-items: center;
			
 
				+        text-align: left;
			
 
				+        overflow: hidden;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-radio {
			
 
				+    color: #606266;
			
 
				+    font-weight: 500;
			
 
				+    line-height: 1;
			
 
				+    cursor: pointer;
			
 
				+    white-space: nowrap;
			
 
				+    outline: 0;
			
 
				+    margin-right: 30px;
			
 
				+    margin-top: 15px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-radio__inner {
			
 
				+    border: 1px solid #dcdfe6;
			
 
				+    border-radius: 100%;
			
 
				+    width: 14px;
			
 
				+    height: 14px;
			
 
				+    background-color: #fff;
			
 
				+    cursor: pointer;
			
 
				+    -webkit-box-sizing: border-box;
			
 
				+    box-sizing: border-box;
			
 
				+    margin-left: 100px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-radio__input {
			
 
				+    white-space: nowrap;
			
 
				+    cursor: pointer;
			
 
				+    outline: 0;
			
 
				+    line-height: 1;
			
 
				+    vertical-align: middle;
			
 
				+    margin-top: -1px;
			
 
				+  }
			
 
				+
			
 
				+  .title {
			
 
				     position: relative;
			
 
				+    padding-left: 10px;
			
 
				+  }
			
 
				+
			
 
				+  .title::before {
			
 
				+    content: '';
			
 
				+    display: inline-block;
			
 
				+    width: 5px;
			
 
				+    height: 30px;
			
 
				+    background: #5473e8;
			
 
				+    position: absolute;
			
 
				+    left: 0;
			
 
				   }
			
 
				-  .el-form-item {
			
 
				-    width: 33.3333%;
			
 
				+
			
 
				+  .el-form {
			
 
				+    padding: 0 15%;
			
 
				+    display: flex;
			
 
				+    flex-wrap: wrap;
			
 
				+    margin-left: -50px;
			
 
				+    margin-top: 15px;
			
 
				+    width: 110%;
			
 
				+  }
			
 
				+
			
 
				+  .el-button--primary {
			
 
				+    background-color: #5878e8;
			
 
				+    border-color: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .el-col {
			
 
				+    background: #f6f7fc;
			
 
				+  }
			
 
				+
			
 
				+  .bg-right {
			
 
				+    text-align: right;
			
 
				+    padding: 16px 20px;
			
 
				+  }
			
 
				+
			
 
				+  .center {
			
 
				+    position: relative;
			
 
				+    top: 50px;
			
 
				+    width: 40%;
			
 
				+    height: 2000px;
			
 
				+    margin: 0 auto;
			
 
				+    margin-right: 180px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-form-item__label {
			
 
				+    width: 160px;
			
 
				+  }
			
 
				+
			
 
				+  .inspector {
			
 
				+    width: 50%;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-form-item--small .el-form-item__label,
			
 
				+  .el-form-item--small .el-form-item__content {
			
 
				+    text-align: left;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-input--small {
			
 
				+    font-size: 13px;
			
 
				+    position: relative;
			
 
				+    display: inline-block;
			
 
				+  }
			
 
				+
			
 
				+  .center1 .small-title {
			
 
				+    margin-left: 323px;
			
 
				+  }
			
 
				+
			
 
				+  .center1 {
			
 
				+    width: 90%;
			
 
				+    margin: 0 auto;
			
 
				+    margin-left: 10px;
			
 
				+    margin-top: 25px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-input--small .el-input__inner {
			
 
				+    height: 32px;
			
 
				+    line-height: 32px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-select {
			
 
				+    display: inline-block;
			
 
				+    position: relative;
			
 
				+    width: 100%;
			
 
				+  }
			
 
				+
			
 
				+  .annu {
			
 
				+    height: 81px;
			
 
				+    background: #ffffff;
			
 
				+    border-radius: 4px;
			
 
				+  }
			
 
				+
			
 
				+  .basicInformation .el-form-item {
			
 
				+    width: 50.3333%;
			
 
				     border: none;
			
 
				     margin: 0;
			
 
				-    .el-form-item__label {
			
 
				-      text-align: left;
			
 
				-      font-size: 14px;
			
 
				-      font-family: PingFangSC-Regular, PingFang SC;
			
 
				-      font-weight: 400;
			
 
				-      color: #8890b1;
			
 
				-    }
			
 
				-    .el-form-item__content {
			
 
				-      padding-left: 0px;
			
 
				-      padding-right: 10px;
			
 
				-      // background: #fff;
			
 
				-      white-space: nowrap;
			
 
				-      height: 40px;
			
 
				-      display: flex;
			
 
				-      -webkit-box-align: center;
			
 
				-      align-items: center;
			
 
				-      text-align: left;
			
 
				-      overflow: hidden;
			
 
				-    }
			
 
				   }
			
 
				-}
			
 
				-/deep/.el-radio {
			
 
				-  color: #606266;
			
 
				-  font-weight: 500;
			
 
				-  line-height: 1;
			
 
				-  cursor: pointer;
			
 
				-  white-space: nowrap;
			
 
				-  outline: 0;
			
 
				-  margin-right: 30px;
			
 
				-  margin-top: 15px;
			
 
				-}
			
 
				-/deep/.el-radio__inner {
			
 
				-  border: 1px solid #dcdfe6;
			
 
				-  border-radius: 100%;
			
 
				-  width: 14px;
			
 
				-  height: 14px;
			
 
				-  background-color: #fff;
			
 
				-  cursor: pointer;
			
 
				-  -webkit-box-sizing: border-box;
			
 
				-  box-sizing: border-box;
			
 
				-  margin-left: 100px;
			
 
				-}
			
 
				-/deep/.el-radio__input {
			
 
				-  white-space: nowrap;
			
 
				-  cursor: pointer;
			
 
				-  outline: 0;
			
 
				-  line-height: 1;
			
 
				-  vertical-align: middle;
			
 
				-  margin-top: -1px;
			
 
				-}
			
 
				-.title {
			
 
				-  position: relative;
			
 
				-  padding-left: 10px;
			
 
				-}
			
 
				-.title::before {
			
 
				-  content: '';
			
 
				-  display: inline-block;
			
 
				-  width: 5px;
			
 
				-  height: 30px;
			
 
				-  background: #5473e8;
			
 
				-  position: absolute;
			
 
				-  left: 0;
			
 
				-}
			
 
				-.el-form {
			
 
				-  padding: 0 15%;
			
 
				-  display: flex;
			
 
				-  flex-wrap: wrap;
			
 
				-  margin-left: -50px;
			
 
				-  margin-top: 15px;
			
 
				-  width: 110%;
			
 
				-}
			
 
				-.el-button--primary {
			
 
				-  background-color: #5878e8;
			
 
				-  border-color: #5878e8;
			
 
				-}
			
 
				-.el-col {
			
 
				-  background: #f6f7fc;
			
 
				-}
			
 
				-.bg-right {
			
 
				-  text-align: right;
			
 
				-  padding: 16px 20px;
			
 
				-}
			
 
				-.center {
			
 
				-  position: relative;
			
 
				-  top: 50px;
			
 
				-  width: 40%;
			
 
				-  height: 2000px;
			
 
				-  margin: 0 auto;
			
 
				-  margin-right: 180px;
			
 
				-}
			
 
				-/deep/.el-form-item__label {
			
 
				-  width: 160px;
			
 
				-}
			
 
				-.inspector {
			
 
				-  width: 50%;
			
 
				-}
			
 
				-/deep/.el-form-item--small .el-form-item__label,
			
 
				-.el-form-item--small .el-form-item__content {
			
 
				-  text-align: left;
			
 
				-}
			
 
				-/deep/.el-input--small {
			
 
				-  font-size: 13px;
			
 
				-  position: relative;
			
 
				-  display: inline-block;
			
 
				-}
			
 
				-.center1 .small-title {
			
 
				-  margin-left: 323px;
			
 
				-}
			
 
				-.center1 {
			
 
				-  width: 90%;
			
 
				-  margin: 0 auto;
			
 
				-  margin-left: 10px;
			
 
				-  margin-top: 25px;
			
 
				-}
			
 
				-/deep/.el-input--small .el-input__inner {
			
 
				-  height: 32px;
			
 
				-  line-height: 32px;
			
 
				-}
			
 
				-/deep/.el-select {
			
 
				-  display: inline-block;
			
 
				-  position: relative;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.annu {
			
 
				-  height: 81px;
			
 
				-  background: #ffffff;
			
 
				-  border-radius: 4px;
			
 
				-}
			
 
				 
			
 
				-.basicInformation .el-form-item {
			
 
				-  width: 50.3333%;
			
 
				-  border: none;
			
 
				-  margin: 0;
			
 
				-}
			
 
				-.huom {
			
 
				-  width: 100px;
			
 
				-}
			
 
				-.el-form {
			
 
				-  font-size: 14px;
			
 
				-  font-family: PingFangSC-Regular, PingFang SC;
			
 
				-  font-weight: 400;
			
 
				-  color: #8890b1;
			
 
				-  line-height: 16px;
			
 
				-}
			
 
				-.a {
			
 
				-  margin-left: -32px;
			
 
				-}
			
 
				-.el-radio-group {
			
 
				-  margin-left: 251px;
			
 
				-}
			
 
				-.ding {
			
 
				-  height: 23px;
			
 
				-  background: #e8ecf6;
			
 
				-  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
			
 
				-}
			
 
				-.winseaview-view {
			
 
				-  padding: 0 0 20px;
			
 
				-}
			
 
				-.container {
			
 
				-  overflow: scroll;
			
 
				-  height: 93vh;
			
 
				-}
			
 
				-.el-radio-group {
			
 
				-  font-size: 0;
			
 
				-  margin-top: 20px;
			
 
				-}
			
 
				-/deep/.el-form {
			
 
				-  padding: 0 15%;
			
 
				-  display: -webkit-box;
			
 
				-  display: -ms-flexbox;
			
 
				-  display: flex;
			
 
				-  -ms-flex-wrap: wrap;
			
 
				-  flex-wrap: wrap;
			
 
				-  margin-left: 130px;
			
 
				-  margin-top: 15px;
			
 
				-  width: 110%;
			
 
				-}
			
 
				-</style>
			
 
				+  .huom {
			
 
				+    width: 100px;
			
 
				+  }
			
 
				+
			
 
				+  .el-form {
			
 
				+    font-size: 14px;
			
 
				+    font-family: PingFangSC-Regular, PingFang SC;
			
 
				+    font-weight: 400;
			
 
				+    color: #8890b1;
			
 
				+    line-height: 16px;
			
 
				+  }
			
 
				+
			
 
				+  .a {
			
 
				+    margin-left: -32px;
			
 
				+  }
			
 
				+
			
 
				+  .el-radio-group {
			
 
				+    margin-left: 251px;
			
 
				+  }
			
 
				+
			
 
				+  .ding {
			
 
				+    height: 23px;
			
 
				+    background: #e8ecf6;
			
 
				+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
			
 
				+  }
			
 
				+
			
 
				+  .winseaview-view {
			
 
				+    padding: 0 0 20px;
			
 
				+  }
			
 
				+
			
 
				+  .container {
			
 
				+    overflow: scroll;
			
 
				+    height: 93vh;
			
 
				+  }
			
 
				+
			
 
				+  .el-radio-group {
			
 
				+    font-size: 0;
			
 
				+    margin-top: 20px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-form {
			
 
				+    padding: 0 15%;
			
 
				+    display: -webkit-box;
			
 
				+    display: -ms-flexbox;
			
 
				+    display: flex;
			
 
				+    -ms-flex-wrap: wrap;
			
 
				+    flex-wrap: wrap;
			
 
				+    margin-left: 130px;
			
 
				+    margin-top: 15px;
			
 
				+    width: 110%;
			
 
				+  }
			
 
				+</style>
			
--- a/src/views/warehouse/component/router/index.js
+++ b/src/views/warehouse/component/router/index.js
@@ -130,6 +130,33 @@ const warehouseManagementRouter = {
 
				       },
			
 
				       hidden: true
			
 
				     },
			
 
				+    
			
 
				+    {
			
 
				+
			
 
				+      path: 'warehouseManagementGross',
			
 
				+      component: () =>
			
 
				+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementGross'),
			
 
				+      name: 'warehouseManagementGross',
			
 
				+      meta: {
			
 
				+        title: 'warehouseManagementGross',
			
 
				+        shortcutEntrance: 'warehouseManagementGross',
			
 
				+        module: 'warehouseManagement.warehouse.warehouseInfo.in',
			
 
				+      },
			
 
				+      hidden: true
			
 
				+    },
			
 
				+    {
			
 
				+
			
 
				+      path: 'warehouseManagementTare',
			
 
				+      component: () =>
			
 
				+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementTare'),
			
 
				+      name: 'warehouseManagementTare',
			
 
				+      meta: {
			
 
				+        title: 'warehouseManagementTare',
			
 
				+        shortcutEntrance: 'warehouseManagementTare',
			
 
				+        module: 'warehouseManagement.warehouse.warehouseInfo.in',
			
 
				+      },
			
 
				+      hidden: true
			
 
				+    },
			
 
				     {
			
 
				       path: 'warehouseManagementDelete',
			
 
				       component: () =>
			
@@ -208,7 +235,20 @@ const warehouseManagementRouter = {
 
				       },
			
 
				       hidden: true
			
 
				     },
			
 
				-
			
 
				+    {
			
 
				+      path: 'warehouseManagementNoWeight',
			
 
				+      component: () =>
			
 
				+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoWeight'),
			
 
				+      name: 'warehouseManagementNoWeight',
			
 
				+      meta: {
			
 
				+        title: 'warehouseManagementNoWeight',
			
 
				+        shortcutEntrance: 'warehouseManagementNoWeight',
			
 
				+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
			
 
				+        permissicon: [],
			
 
				+        keepAlive: true
			
 
				+      },
			
 
				+      hidden:true
			
 
				+    },
			
 
				     {
			
 
				       path: 'warehouseManagementNoComplete',
			
 
				             
			
@@ -239,6 +279,21 @@ const warehouseManagementRouter = {
 
				       },
			
 
				       hidden: true
			
 
				     },
			
 
				+    {
			
 
				+      path: 'warehouseManagementNoWeightIn',
			
 
				+      component: () =>
			
 
				+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoWeightIn'),
			
 
				+      name: 'warehouseManagementNoWeightIn',
			
 
				+      meta: {
			
 
				+        title: 'warehouseManagementNoWeightIn',
			
 
				+        shortcutEntrance: 'warehouseManagementNoWeightIn',
			
 
				+        module: 'warehouseManagement.warehouse.warehouseInfo.in',
			
 
				+        permissicon: [],
			
 
				+        keepAlive: true
			
 
				+        // module: 'procurement.sparepart.applDetail'
			
 
				+      },
			
 
				+      hidden: true
			
 
				+    },
			
 
				     {
			
 
				       path: 'warehouseManagementPerfectDelivery',
			
 
				       component: () =>
			
@@ -254,6 +309,21 @@ const warehouseManagementRouter = {
 
				       },
			
 
				       hidden: true
			
 
				     },
			
 
				+    {
			
 
				+      path: 'warehouseManagementNoWeightOut',
			
 
				+      component: () =>
			
 
				+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoWeightOut'),
			
 
				+      name: 'warehouseManagementNoWeightOut',
			
 
				+      meta: {
			
 
				+        title: 'warehouseManagementNoWeightOut',
			
 
				+        shortcutEntrance: 'warehouseManagementNoWeightOut',
			
 
				+        module: 'warehouseManagement.warehouse.warehouseInfo.out',
			
 
				+        permissicon: [],
			
 
				+        keepAlive: true
			
 
				+        // module: 'procurement.sparepart.applDetail'
			
 
				+      },
			
 
				+      hidden: true
			
 
				+    },
			
 
				     // 出入库任务
			
 
				     {
			
 
				       path: 'warehouseManagementPutOut',
			
@@ -279,7 +349,7 @@ const warehouseManagementRouter = {
 
				       meta: {
			
 
				         title: 'warehouseManagementPutOutLook',
			
 
				         shortcutEntrance: 'warehouseManagementPutOutLook',
			
 
				-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
			
 
				+        module: 'warehouseManagement.warehouse.warehouseInfo',
			
 
				         permissicon: [],
			
 
				         keepAlive: true
			
 
				         // module: 'procurement.sparepart.applDetail'
			
@@ -290,12 +360,12 @@ const warehouseManagementRouter = {
 
				     {
			
 
				       path: 'tranManagementWarehouseInOutTask',
			
 
				       component: () =>
			
 
				-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTask'),
			
 
				+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/tranManagementWarehouseInOutTask'),
			
 
				       name: 'tranManagementWarehouseInOutTask',
			
 
				       meta: {
			
 
				         title: 'tranManagementWarehouseInOutTask',
			
 
				         shortcutEntrance: 'tranManagementWarehouseInOutTask',
			
 
				-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
			
 
				+        module: 'warehouseManagement.warehouse.warehouseInfo',
			
 
				         permissicon: [],
			
 
				         keepAlive: true
			
 
				         // module: 'procurement.sparepart.applDetail'
			
--- a/src/views/warehouse/tranManagementWarehouseInOutTask.vue
+++ b/src/views/warehouse/tranManagementWarehouseInOutTask.vue
@@ -0,0 +1,683 @@
 
				+<!--出入库任务-->
			
 
				+<template>
			
 
				+  <div class="container">
			
 
				+    <BaseHeaderLayout :leftSpan="12">
			
 
				+      <template slot="left">
			
 
				+        <ws-button
			
 
				+          type="primary"
			
 
				+          @click="handleAdd()"
			
 
				+          v-hasPermission="
			
 
				+            `warehouseManagement.warehouse.warehouseInfoTask.add`
			
 
				+          "
			
 
				+        >
			
 
				+          <img
			
 
				+            width="13"
			
 
				+            height="13"
			
 
				+            style="
			
 
				+              vertical-align: text-top;
			
 
				+              position: relative;
			
 
				+              top: 2px;
			
 
				+              left: -4px;
			
 
				+            "
			
 
				+            src="../../../public/img/header-add.png"
			
 
				+            alt
			
 
				+          />添加
			
 
				+        </ws-button>
			
 
				+      </template>
			
 
				+      <template slot="right">
			
 
				+        <span style="width: 70px; display: inline-block; color: #8890b1"
			
 
				+          >状态：</span
			
 
				+        >
			
 
				+        <ws-select
			
 
				+          v-model="searchTypeText"
			
 
				+          placeholder
			
 
				+          class="typeselect"
			
 
				+          @change="selecttaskType"
			
 
				+          :value="searchType"
			
 
				+        >
			
 
				+          <ws-option
			
 
				+            v-for="item in taskTypeList"
			
 
				+            :key="item.value"
			
 
				+            :label="item.value"
			
 
				+            :value="item.value"
			
 
				+            style="color: #8890b1"
			
 
				+          />
			
 
				+        </ws-select>
			
 
				+        <ws-input
			
 
				+          v-model="searchKeyWord"
			
 
				+          placeholder="可按合同编号或任务编号查找"
			
 
				+          clearable
			
 
				+          maxlength="500"
			
 
				+          type="input"
			
 
				+        ></ws-input>
			
 
				+        <ws-button class="find" type="primary" @click="lookUp()">
			
 
				+          <img
			
 
				+            width="16"
			
 
				+            height="16"
			
 
				+            style="
			
 
				+              vertical-align: text-top;
			
 
				+              position: relative;
			
 
				+              top: 0px;
			
 
				+              left: -7px;
			
 
				+            "
			
 
				+            src="../../../public/img/sousuo.png"
			
 
				+            alt
			
 
				+          />
			
 
				+        </ws-button>
			
 
				+      </template>
			
 
				+    </BaseHeaderLayout>
			
 
				+    <div class="navv">
			
 
				+      <el-table
			
 
				+        class="wenzi"
			
 
				+        :data="gainList.records"
			
 
				+        style="width: 100%"
			
 
				+        height="780"
			
 
				+      >
			
 
				+        <el-table-column type="index" label="序号">
			
 
				+          <template scope="scope">
			
 
				+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
			
 
				+            <span v-else>{{ scope.$index + 1 }}</span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
			
 
				+        <el-table-column prop="contractNo" label="合同编号" width="80">
			
 
				+          <!-- <template scope="scope">
			
 
				+            <div
			
 
				+              v-if="
			
 
				+                scope.row.inOutType == '移库入库' ||
			
 
				+                scope.row.inOutType == '移库出库'
			
 
				+              "
			
 
				+            >
			
 
				+              {{ scope.row.moveTaskNo }}
			
 
				+            </div>
			
 
				+            <div
			
 
				+              v-if="
			
 
				+                scope.row.inOutType != '移库入库' ||
			
 
				+                scope.row.inOutType != '移库出库'
			
 
				+              "
			
 
				+            >
			
 
				+              {{ scope.row.contractNo }}
			
 
				+            </div>
			
 
				+          </template> -->
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          prop="warehouseName"
			
 
				+          class="table_td"
			
 
				+          label="库房名"
			
 
				+        ></el-table-column>
			
 
				+        <el-table-column
			
 
				+          prop="inOutType"
			
 
				+          class="table_td"
			
 
				+          label="出入库类型"
			
 
				+        ></el-table-column>
			
 
				+        <el-table-column
			
 
				+          prop="goodsName"
			
 
				+          class="table_td"
			
 
				+          label="货名"
			
 
				+        ></el-table-column>
			
 
				+        <el-table-column
			
 
				+          prop="weight"
			
 
				+          class="table_td"
			
 
				+          label="重量（吨）"
			
 
				+        ></el-table-column>
			
 
				+        <el-table-column
			
 
				+          prop="predictDate"
			
 
				+          class="table_td"
			
 
				+          label="预计日期"
			
 
				+        ></el-table-column>
			
 
				+        <el-table-column
			
 
				+          prop="publisher"
			
 
				+          class="table_td"
			
 
				+          label="经办人"
			
 
				+        >
			
 
				+          <template slot-scope="scope">
			
 
				+             <template>
			
 
				+                <span v-if="!scope.row.editstatus" slot="reference">
			
 
				+                  {{ scope.row.publisher }}
			
 
				+                </span>
			
 
				+                 <el-select
			
 
				+                 class='staff'
			
 
				+              v-if="scope.row.editstatus"
			
 
				+                  v-model="scope.row.publisher"
			
 
				+              placeholder="请选择经办人"
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter"
			
 
				+              @change="(event)=>{selectstaff(event, scope.row)}"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+              </template>
			
 
				+            <img
			
 
				+             v-if="!scope.row.editstatus"
			
 
				+              width="17"
			
 
				+              height="18"
			
 
				+              style="vertical-align: text-top; position: relative; top: -1px"
			
 
				+              src="../../../public/img/edit.png"
			
 
				+              @click="editClick1(scope.row)"
			
 
				+              alt
			
 
				+            />
			
 
				+            <i v-if="scope.row.editstatus" @click='checkstaff' class="el-icon-check"></i>
			
 
				+          </template></el-table-column>
			
 
				+        <el-table-column prop="taskStatus" label="状态">
			
 
				+          <template slot-scope="scope">
			
 
				+             <template>
			
 
				+                <span slot="reference">
			
 
				+                  <span
			
 
				+                    v-if="scope.row.taskStatus == '执行中'"
			
 
				+                    class="inExecution"
			
 
				+                  ></span>
			
 
				+                  <span
			
 
				+                    v-if="scope.row.taskStatus == '已完成'"
			
 
				+                    class="done"
			
 
				+                  ></span>
			
 
				+                  {{ scope.row.taskStatus }}
			
 
				+                </span>
			
 
				+              </template>
			
 
				+            <img
			
 
				+              v-if="scope.row.taskStatus == '执行中'"
			
 
				+              width="17"
			
 
				+              height="18"
			
 
				+              style="vertical-align: text-top; position: relative; top: -1px"
			
 
				+              src="../../../public/img/edit.png"
			
 
				+              @click="editClick(scope.row)"
			
 
				+              alt
			
 
				+            />
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column
			
 
				+          prop="establishDate"
			
 
				+          class="table_td"
			
 
				+          label="创建时间"
			
 
				+        ></el-table-column>
			
 
				+        <el-table-column prop="seller" label="操作" width="300">
			
 
				+          <template slot-scope="scope">
			
 
				+            <span
			
 
				+              class="corles"
			
 
				+              @click="nocomplete(scope.row)"
			
 
				+              >查看</span
			
 
				+            >
			
 
				+            
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+      </el-table>
			
 
				+      <el-pagination
			
 
				+        @size-change="handleSizeChange"
			
 
				+        @current-change="handleCurrentChange"
			
 
				+        :current-page="currentPage"
			
 
				+        :page-size="pageSize"
			
 
				+        layout="total, sizes, prev, pager, next, jumper"
			
 
				+        :total="deptBudgetTotal"
			
 
				+      ></el-pagination>
			
 
				+    </div>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+import {
			
 
				+  getwarehousetask,
			
 
				+  postcheckorupdate,
			
 
				+  getstaff
			
 
				+} from '@/model/warehouse/index'
			
 
				+import { getoreditoutput, outdelete, movestates } from '@/model/tasksport/index'
			
 
				+import { downloadFile } from '@/utils/batchDown'
			
 
				+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,
			
 
				+      id:'',
			
 
				+      staff:'',
			
 
				+      tableDate: [],
			
 
				+      options:[],
			
 
				+      staffList:[],
			
 
				+      // 是否显示
			
 
				+      showType: true,
			
 
				+      // 年
			
 
				+      year: '',
			
 
				+      gainList: [],
			
 
				+      currentPage: 1,
			
 
				+      primary: '1',
			
 
				+      pageSize: 10,
			
 
				+      searchType: 3,
			
 
				+      searchTypeText: '执行中',
			
 
				+      searchKeyWord: '',
			
 
				+      contractType: 2,
			
 
				+      publisherList:[],
			
 
				+      taskTypeList: [
			
 
				+        { value: '执行中', type: 3 },
			
 
				+        { value: '已完成', type: 4 }
			
 
				+      ],
			
 
				+      // 提交类型
			
 
				+      submitType: true,
			
 
				+      size: 10,
			
 
				+      spanArr: [],
			
 
				+      warehouseName: '',
			
 
				+      deptBudgetTotal: 0,
			
 
				+      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+      deptCircularPage: {},
			
 
				+      historyList: [],
			
 
				+      pickerBeginDateBefore: {
			
 
				+        disabledDate: (time) => {
			
 
				+          return time.getTime() > Date.now()
			
 
				+        },
			
 
				+      },
			
 
				+      accessoryTFs: false,
			
 
				+    }
			
 
				+  },
			
 
				+  activated() {
			
 
				+    this.getList()
			
 
				+    this.showType = this.isShow
			
 
				+  },
			
 
				+  methods: {
			
 
				+     dataFilter(val) {
			
 
				+      // console.log(val,"名")
			
 
				+      this.deptBudgetList.staffList = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options = this.staffList.filter(item => {
			
 
				+          if (
			
 
				+            !!~item.staffName.indexOf(val) ||
			
 
				+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options = this.staffList
			
 
				+      }
			
 
				+    },
			
 
				+    checkstaff(){
			
 
				+ postcheckorupdate({id:this.id,publisher:this.staff}).toPromise()
			
 
				+            .then((response) => {
			
 
				+              this.$notify.success({
			
 
				+                title: '成功',
			
 
				+                message: '经办人修改成功',
			
 
				+              })
			
 
				+              this.getList()
			
 
				+            })
			
 
				+    },
			
 
				+    selectstaff(e,item) {
			
 
				+      this.id=item.id
			
 
				+      this.staff=e
			
 
				+      console.log(e,item)
			
 
				+     
			
 
				+    },
			
 
				+    //添加
			
 
				+    handleAdd() {
			
 
				+      this.$router.push({ path: 'tranManagementWarehouseInOuttaskAdd' })
			
 
				+    },
			
 
				+    //查找
			
 
				+    lookUp() {
			
 
				+      this.currentPage = 1
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    deleteclick(row) {
			
 
				+      var text = ''
			
 
				+      if (
			
 
				+        (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
			
 
				+        (row.taskTypeKey == 4 && row.inOutType == '销售出库') ||
			
 
				+        (row.taskTypeKey == 4 && row.inOutType == '退库')
			
 
				+      ) {
			
 
				+        text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
			
 
				+      } else {
			
 
				+        text = `任务删除后不可恢复，是否确定删除？`
			
 
				+      }
			
 
				+      //cancelButtonClass: "btn-custom-cancel"
			
 
				+      this.$confirm(text, {
			
 
				+        confirmButtonText: '确定',
			
 
				+        cancelButtonText: '取消',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          outdelete({
			
 
				+            id: row.id,
			
 
				+            relevanceId: row.relevanceId,
			
 
				+            inOutFlag: row.inOutFlag,
			
 
				+          })
			
 
				+            .toPromise()
			
 
				+            .then((response) => {
			
 
				+              this.getList()
			
 
				+            })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    getList() {
			
 
				+      console.log(this.$route)
			
 
				+      getwarehousetask({
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+        currentPage: this.currentPage,
			
 
				+        pageSize: this.pageSize,
			
 
				+        searchType: this.searchType,
			
 
				+        searchKeyWord: this.searchKeyWord,
			
 
				+        stringList:this.$route.query.stringList.toString()
			
 
				+      })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          for (let i = 0; i < response.records.length; i++) {
			
 
				+            response.records[i].editstatus=false
			
 
				+          }
			
 
				+          this.gainList = response
			
 
				+          this.currentPage = response.current
			
 
				+          this.pageSize = response.size
			
 
				+          this.deptBudgetTotal = response.total
			
 
				+        })
			
 
				+    },
			
 
				+    //编辑
			
 
				+    delivery(item) {
			
 
				+      this.$router.push({
			
 
				+        path: 'tranManagementWarehouseInOuttaskedit',
			
 
				+        query: {
			
 
				+          relevanceId: item.relevanceId,
			
 
				+          inOutFlag: item.inOutFlag
			
 
				+        },
			
 
				+      })
			
 
				+    },
			
 
				+    audit(item) {
			
 
				+      this.$router.push({
			
 
				+        path: 'tranManagementWarehouseInOuttaskaudit',
			
 
				+        query: {
			
 
				+          relevanceId: item.relevanceId,
			
 
				+          taskId: item.taskId,
			
 
				+          businessKey: item.id,
			
 
				+          workflowId: item.workflowId,
			
 
				+        },
			
 
				+      })
			
 
				+    },
			
 
				+    getSpanArr(data) {
			
 
				+      let that = this
			
 
				+
			
 
				+      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
			
 
				+
			
 
				+      that.spanArr = []
			
 
				+
			
 
				+      that.pos = 0
			
 
				+
			
 
				+      //遍历数据
			
 
				+
			
 
				+      data.forEach((item, index) => {
			
 
				+        //判断是否是第一项
			
 
				+
			
 
				+        // if (index === 0) {
			
 
				+        //   this.spanArr.push(1)
			
 
				+        //   this.pos = 0
			
 
				+        // } else {
			
 
				+        //不是第一项时，就根据标识去存储
			
 
				+        if (data[index].warehouseNumViewList.length > 1) {
			
 
				+          // 查找到符合条件的数据时每次要把之前存储的数据+1
			
 
				+          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
			
 
				+          this.spanArr.push(0)
			
 
				+        } else {
			
 
				+          // 没有符合的数据时，要记住当前的index
			
 
				+          this.spanArr.push(1)
			
 
				+          this.pos = index
			
 
				+        }
			
 
				+        // }
			
 
				+      })
			
 
				+    },
			
 
				+    //查看//传参
			
 
				+    nocomplete(row) {
			
 
				+      this.$router.push({
			
 
				+        path: 'warehouseManagementPutOutLook',
			
 
				+        query: {
			
 
				+          relevanceId: row.relevanceId,
			
 
				+          businessKey: row.id,
			
 
				+          workflowId: row.workflowId,
			
 
				+        },
			
 
				+      })
			
 
				+    },
			
 
				+    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()
			
 
				+    },
			
 
				+    editClick(row) {
			
 
				+      var status = ''
			
 
				+      if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
			
 
				+        status = '执行中'
			
 
				+      } else if (row.taskStatus == '执行中') {
			
 
				+        status = '已完成'
			
 
				+      }
			
 
				+      //cancelButtonClass: "btn-custom-cancel"
			
 
				+      this.$confirm(`是否将状态改为${status}`, {
			
 
				+        confirmButtonText: '确定',
			
 
				+        cancelButtonText: '取消',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          movestates({ id: row.id })
			
 
				+            .toPromise()
			
 
				+            .then((response) => {
			
 
				+              this.$notify.success({
			
 
				+                title: '成功',
			
 
				+                message: '状态修改成功',
			
 
				+              })
			
 
				+              this.getList()
			
 
				+            })
			
 
				+            .catch((response) => {
			
 
				+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+            })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    editClick1(row) {
			
 
				+      console.log(row)
			
 
				+     row.editstatus=true
			
 
				+     var arr=JSON.parse(this.$route.query.warehouseBaseInfoList)
			
 
				+     for (let i = 0; i < arr.length; i++) {
			
 
				+       if(arr[i].warehouseName==row.warehouseName){
			
 
				+console.log(arr[i])
			
 
				+          getstaff({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            warehouseId: arr[i].id
			
 
				+          })
			
 
				+            .toPromise()
			
 
				+            .then(response => {
			
 
				+              this.options = response
			
 
				+              this.staffList = response
			
 
				+              //  this.agent = response
			
 
				+            })
			
 
				+       }
			
 
				+       
			
 
				+     }
			
 
				+         
			
 
				+          
			
 
				+    },
			
 
				+    selecttaskType(e) {
			
 
				+      for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				+        if (this.taskTypeList[i].value == e) {
			
 
				+          this.searchType = this.taskTypeList[i].type
			
 
				+        }
			
 
				+      }
			
 
				+      this.currentPage=1,
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    handleExamine(row) {
			
 
				+      this.$router.push({
			
 
				+        name: 'salesContractExamine',
			
 
				+        query: { id: row.id },
			
 
				+      })
			
 
				+    },
			
 
				+    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+    handleCloe() {
			
 
				+      this.dialogViewSpareMoney = false
			
 
				+    },
			
 
				+    history(row) {
			
 
				+      billoperatehis({ id: row.id })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.historyList = response
			
 
				+        })
			
 
				+    },
			
 
				+    find() {
			
 
				+      this.currentPage = 1
			
 
				+      this.getList()
			
 
				+    },
			
 
				+  },
			
 
				+}
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+.vertical-text-left {
			
 
				+  width: 62px;
			
 
				+  text-align: right;
			
 
				+}
			
 
				+.el-button--primary {
			
 
				+  background-color: #5878e8;
			
 
				+  border-color: #5878e8;
			
 
				+}
			
 
				+.el-button--default {
			
 
				+  color: #8890b1;
			
 
				+  border-color: #e8eaf1;
			
 
				+}
			
 
				+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
			
 
				+  width: 30px;
			
 
				+  margin-left: 0;
			
 
				+  border-top-left-radius: 0px;
			
 
				+  border-bottom-left-radius: 0px;
			
 
				+}
			
 
				+/deep/.findValue .el-input__inner {
			
 
				+  border-top-right-radius: 0px;
			
 
				+  border-bottom-right-radius: 0px;
			
 
				+}
			
 
				+.completed.el-button--default {
			
 
				+  border-color: #5878e8;
			
 
				+  background-color: #f6f7fc;
			
 
				+  color: #5878e8;
			
 
				+}
			
 
				+.putstorage.el-button--default,
			
 
				+.deliverystorage.el-button--default {
			
 
				+  border-color: #8890b1;
			
 
				+  background-color: #fff;
			
 
				+  color: #8890b1;
			
 
				+}
			
 
				+/deep/.el-table td,
			
 
				+/deep/.el-table th.is-leaf {
			
 
				+  border-right: 1px solid #e9ecf7;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+/deep/.el-table tr td:first-child,
			
 
				+/deep/.el-table tr th.is-leaf:first-child {
			
 
				+  border-left: 1px solid #e9ecf7;
			
 
				+}
			
 
				+
			
 
				+.el-row {
			
 
				+  height: 50px;
			
 
				+}
			
 
				+.findValue {
			
 
				+  width: 0%;
			
 
				+  margin-left: 25%;
			
 
				+}
			
 
				+.search {
			
 
				+  margin-left: -250px;
			
 
				+}
			
 
				+.Value {
			
 
				+  width: 300px;
			
 
				+  margin-left: 766px;
			
 
				+}
			
 
				+.el-pagination {
			
 
				+  text-align: center;
			
 
				+}
			
 
				+.winseaview-main {
			
 
				+  background: #e8ecf6;
			
 
				+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
			
 
				+}
			
 
				+.spans {
			
 
				+  display: table-caption;
			
 
				+  width: 17px;
			
 
				+  line-height: 19px;
			
 
				+}
			
 
				+//执行样式
			
 
				+.executory,
			
 
				+.inExecution,
			
 
				+.done {
			
 
				+  width: 6px;
			
 
				+  height: 6px;
			
 
				+  display: inline-block;
			
 
				+  border-radius: 50%;
			
 
				+  position: relative;
			
 
				+  top: -1px;
			
 
				+  font-size: 14px;
			
 
				+}
			
 
				+.executory {
			
 
				+  background: #ff9f24;
			
 
				+}
			
 
				+.inExecution {
			
 
				+  background: #5878e8;
			
 
				+}
			
 
				+.done {
			
 
				+  background: #50cad4;
			
 
				+}
			
 
				+.el-select {
			
 
				+  width: 30%;
			
 
				+  margin-right: 10px;
			
 
				+}
			
 
				+.el-select.staff{
			
 
				+  width:85%;
			
 
				+  display:inline-block;
			
 
				+  margin-right:2px;
			
 
				+}
			
 
				+/deep/.typeselect .el-input__inner {
			
 
				+  color: #8890b1;
			
 
				+}
			
 
				+.corles {
			
 
				+  color: #5878e8;
			
 
				+  font-size: 14px;
			
 
				+}
			
 
				+</style>
			
--- a/src/views/warehouse/warehouseManagementDelivery.vue
+++ b/src/views/warehouse/warehouseManagementDelivery.vue
@@ -1038,7 +1038,7 @@ export default {
 
				         })
			
 
				         return
			
 
				       }
			
 
				-      if (!this.deptBudgetList.deliveryType) {
			
 
				+      if (!this.deptBudgetList.inOutType) {
			
 
				         this.$message({
			
 
				           message: '出库类型不能为空！',
			
 
				           type: 'warning',
			
--- a/src/views/warehouse/warehouseManagementGross.vue
+++ b/src/views/warehouse/warehouseManagementGross.vue
@@ -0,0 +1,2203 @@
 
				+// 入库登记
			
 
				+<template>
			
 
				+  <div class="container">
			
 
				+    <el-row>
			
 
				+      <el-col :span="20">
			
 
				+        <h2 class="bg-left title">{{information}}</h2>
			
 
				+      </el-col>
			
 
				+      <el-col :span="4" class="bg-right">
			
 
				+        <el-button
			
 
				+          class="bg-bottom"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="revert()"
			
 
				+        >
			
 
				+          <img
			
 
				+            width="6"
			
 
				+            height="10"
			
 
				+            style="vertical-align: bottom; margin-right: 3px"
			
 
				+            src="../../../public/img/lujing.png"
			
 
				+            alt
			
 
				+          />返回
			
 
				+        </el-button>
			
 
				+      </el-col>
			
 
				+    </el-row>
			
 
				+
			
 
				+    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
			
 
				+      <div class="basicInformation">
			
 
				+        <h2>
			
 
				+          <img
			
 
				+            style="position: relative; top: 2px"
			
 
				+            width="19"
			
 
				+            height="19"
			
 
				+            src="../../../public/img/cangku.png"
			
 
				+            alt
			
 
				+          />
			
 
				+          {{ deptBudgetList.warehouseName }}
			
 
				+          <span class="position" v-show="this.$route.query.warehouseType == 1"
			
 
				+            >{{ deptBudgetList.binNumber }}仓位</span
			
 
				+          >
			
 
				+          <span v-show="this.$route.query.warehouseType == 2">(临)</span>
			
 
				+        </h2>
			
 
				+        <ws-info-table>
			
 
				+          <!--合同编号-->
			
 
				+          <ws-form-item label="合同编号" span="1" prop="contractNo">
			
 
				+            <el-select
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter1"
			
 
				+              v-model="deptBudgetList.contractNo"
			
 
				+              placeholder="请选择合同编号或移库任务编号"
			
 
				+              class="typeselect"
			
 
				+              @change="contractNoChange"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options1"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.contractNo"
			
 
				+                :value="item.contractNo"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <!-- 货名 -->
			
 
				+          <ws-form-item label="货名" span="1">
			
 
				+            <ws-select
			
 
				+              disabled
			
 
				+              v-model="deptBudgetList.goodsName"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectgoodsName"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in goodnameList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="类型" span="1" prop="type">
			
 
				+            <ws-select v-model="deptBudgetList.type" @change="typeChange">
			
 
				+              <ws-option
			
 
				+                v-for="item in typeList"
			
 
				+                :key="item"
			
 
				+                :label="item"
			
 
				+                :value="item"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <!--毛重（公斤）-->
			
 
				+          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="grossWeightchange"
			
 
				+              v-model="deptBudgetList.grossWeight"
			
 
				+              placeholder="请输入毛重"
			
 
				+              maxlength="20"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              size="small"
			
 
				+            />
			
 
				+              <el-button type="primary" v-if="information == '毛重检斤'" @click="openPort">重新获取</el-button>
			
 
				+
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--皮重（公斤）-->
			
 
				+          <ws-form-item
			
 
				+            label="皮重（公斤）"
			
 
				+            span="1"
			
 
				+            prop="tare"
			
 
				+            class="readonly"
			
 
				+
			
 
				+          >
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="tarechange"
			
 
				+              v-model="deptBudgetList.tare"
			
 
				+              placeholder="请输入皮重"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+              <el-button type="primary" v-if="information == '皮重检斤'" @click="openPort">重新获取</el-button>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item
			
 
				+            label="扣重（公斤）"
			
 
				+            span="1"
			
 
				+            prop="deductionWeight"
			
 
				+            class="readonly"
			
 
				+          >
			
 
				+            <ws-input
			
 
				+              @input="tarechange"
			
 
				+              v-model="deptBudgetList.deductionWeight"
			
 
				+              placeholder="请输入扣重"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--净重（公斤）-->
			
 
				+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
			
 
				+            <ws-input
			
 
				+              disabled
			
 
				+              v-model="deptBudgetList.netWeight"
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item
			
 
				+            v-if="deptBudgetList.type == '潮粮'"
			
 
				+            label="扣重比"
			
 
				+            span="1"
			
 
				+            prop="buckleWeightRatio"
			
 
				+            class="readonly"
			
 
				+          >
			
 
				+            <ws-input
			
 
				+              @input="pureweight"
			
 
				+              v-model="deptBudgetList.buckleWeightRatio"
			
 
				+              placeholder="请输入扣重比"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item
			
 
				+            v-if="deptBudgetList.type == '潮粮'"
			
 
				+            label="干粮水分占比"
			
 
				+            span="1"
			
 
				+            prop="solidGrainWater"
			
 
				+            class="readonly"
			
 
				+          >
			
 
				+            <ws-input
			
 
				+              @input="pureweight"
			
 
				+              v-model="deptBudgetList.solidGrainWater"
			
 
				+              placeholder="请输入干粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item
			
 
				+            v-if="deptBudgetList.type == '潮粮'"
			
 
				+            label="潮粮水分占比"
			
 
				+            span="1"
			
 
				+            prop="tidalGrainWater"
			
 
				+            class="readonly"
			
 
				+          >
			
 
				+            <ws-input
			
 
				+              @input="pureweight(1)"
			
 
				+              v-model="deptBudgetList.tidalGrainWater"
			
 
				+              placeholder="请输入潮粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item
			
 
				+            v-if="deptBudgetList.type == '潮粮'"
			
 
				+            label="纯重"
			
 
				+            span="1"
			
 
				+            prop="pureWeight"
			
 
				+            class="readonly"
			
 
				+          >
			
 
				+            <ws-input
			
 
				+              disabled
			
 
				+              v-model="deptBudgetList.pureWeight"
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--净重（公斤）-->
			
 
				+          <ws-form-item label="扣款（元/公斤）" span="1" prop="deductionAmount">
			
 
				+            <ws-input
			
 
				+            @input="kkInput(deptBudgetList.deductionAmount)"
			
 
				+              v-model="deptBudgetList.deductionAmount"
			
 
				+              placeholder="请输入扣款金额"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!-- 品级 -->
			
 
				+          <ws-form-item label="品级" span="1" class="readonly">
			
 
				+            <ws-select
			
 
				+              v-model="deptBudgetList.grade"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectpackingMethod"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in gradeList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--经办人-->
			
 
				+          <ws-form-item label="经办人" span="1" prop="agent">
			
 
				+            <el-select
			
 
				+              v-model="deptBudgetList.agent"
			
 
				+              placeholder="请选择经办人"
			
 
				+              filterable
			
 
				+              clearable
			
 
				+              :filter-method="dataFilter"
			
 
				+              @change="selectstaff"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <!--出库日期-->
			
 
				+          <ws-form-item
			
 
				+            label="入库日期"
			
 
				+            span="1"
			
 
				+            prop="inOutDate"
			
 
				+            class="deliverydate"
			
 
				+          >
			
 
				+            <el-date-picker
			
 
				+              v-model="deptBudgetList.inOutDate"
			
 
				+              placeholder="请选择入库日期"
			
 
				+              type="date"
			
 
				+              value-format="yyyy-MM-dd"
			
 
				+            ></el-date-picker>
			
 
				+          </ws-form-item>
			
 
				+          <!-- 入库类型 -->
			
 
				+          <ws-form-item label="入库类型" span="1">
			
 
				+            <ws-select
			
 
				+              v-model="deptBudgetList.inOutType"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectstorageType"
			
 
				+              :disabled="isSelectType"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in storageType"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--车牌号  -->
			
 
				+          <ws-form-item label="车牌号" span="1" prop="carNo">
			
 
				+            <ws-input
			
 
				+              v-if="!carstatus"
			
 
				+              v-model="deptBudgetList.carNo"
			
 
				+              placeholder="请输入车牌号"
			
 
				+              maxlength="7"
			
 
				+              size="small"
			
 
				+            />
			
 
				+            <el-select
			
 
				+              v-if="carstatus"
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter2"
			
 
				+              v-model="deptBudgetList.carNo"
			
 
				+              placeholder="请选择车牌号"
			
 
				+              class="typeselect"
			
 
				+              @change="carChange"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options2"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.carNo + '(' + item.tranCarNo + ')'"
			
 
				+                :value="item.carNo"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="成本" span="1" prop="cost">
			
 
				+            <ws-input
			
 
				+              :disabled="disabled1"
			
 
				+              v-model="deptBudgetList.cost"
			
 
				+              placeholder="请输入成本"
			
 
				+              size="small"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+            />
			
 
				+            <img
			
 
				+              width="17"
			
 
				+              height="18"
			
 
				+              style="vertical-align: text-top; position: relative; top: -1px"
			
 
				+              src="../../../public/img/edit.png"
			
 
				+              @click="editClick(1)"
			
 
				+              alt=""
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="运费" span="1" prop="freight">
			
 
				+            <ws-input
			
 
				+              :disabled="disabled2"
			
 
				+              v-model="deptBudgetList.freight"
			
 
				+              placeholder="请输入运费"
			
 
				+              size="small"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+            />
			
 
				+            <img
			
 
				+              width="17"
			
 
				+              height="18"
			
 
				+              style="vertical-align: text-top; position: relative; top: -1px"
			
 
				+              src="../../../public/img/edit.png"
			
 
				+              @click="editClick(2)"
			
 
				+              alt=""
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!-- onkeyup="value=value.replace(/[^\A-\Z0-9\u4E00-\u9FA5\.]/g,'')" -->
			
 
				+        </ws-info-table>
			
 
				+        <div
			
 
				+          v-show="
			
 
				+            this.$route.query.warehouseType == 2 &&
			
 
				+            this.deptBudgetList.createType == 2
			
 
				+          "
			
 
				+        >
			
 
				+          <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
			
 
				+          <ws-info-table
			
 
				+            v-show="checked == true && this.deptBudgetList.createType == 2"
			
 
				+          >
			
 
				+            <!-- 出库类型 -->
			
 
				+            <ws-form-item label="出库类型" span="1" prop="temporaryOutType">
			
 
				+              <!-- v-model="deptBudgetList.deliveryType" -->
			
 
				+              <ws-select
			
 
				+                v-model="deptBudgetList.temporaryOutType"
			
 
				+                placeholder
			
 
				+                class="typeselect"
			
 
				+              >
			
 
				+                <ws-option
			
 
				+                  v-for="item in deliveryType"
			
 
				+                  :key="item.constKey"
			
 
				+                  :label="item.constValue"
			
 
				+                  :value="item.constValue"
			
 
				+                />
			
 
				+              </ws-select>
			
 
				+            </ws-form-item>
			
 
				+            <!-- 出库合同编号 -->
			
 
				+            <ws-form-item label="出库合同编号" span="1">
			
 
				+              <ws-select
			
 
				+                v-model="deptBudgetList.outContractNo"
			
 
				+                placeholder="请选择合同编号或移库任务编号"
			
 
				+                class="typeselect"
			
 
				+              >
			
 
				+                <ws-option
			
 
				+                  v-for="item in outContractNo"
			
 
				+                  :key="item.constKey"
			
 
				+                  :label="item.contractNo"
			
 
				+                  :value="item.contractNo"
			
 
				+                />
			
 
				+              </ws-select>
			
 
				+            </ws-form-item>
			
 
				+          </ws-info-table>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <!-- <div class="small-title">上传磅单照片</div>
			
 
				+      <el-upload
			
 
				+        action="https://www.zthymaoyi.com/upload/admin"
			
 
				+        :show-file-list="false"
			
 
				+        :on-success="
			
 
				+          (res) => {
			
 
				+            uploadSuccessHandle1(res)
			
 
				+          }
			
 
				+        "
			
 
				+        class="avatar-uploader"
			
 
				+        accept=".jpg, .jpeg, .png, .gif"
			
 
				+      >
			
 
				+      <el-button size="small" type="primary">点击上传</el-button>
			
 
				+      </el-upload> -->
			
 
				+      <div v-if='deptBudgetList.addressUrl!=""'>
			
 
				+        <img
			
 
				+          style="width: 100px; height: 100px"
			
 
				+          :src="deptBudgetList.addressUrl"
			
 
				+          alt=""
			
 
				+        />
			
 
				+      </div>
			
 
				+      <div class="small-title">化验数据（选填）</div>
			
 
				+      <div class="inspector">
			
 
				+        <!--自检员-->
			
 
				+        <!-- <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+          <ws-input
			
 
				+            v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
			
 
				+            placeholder="请输入质检员姓名"
			
 
				+            maxlength="10"
			
 
				+            size="small"
			
 
				+          />
			
 
				+        </ws-form-item> -->
			
 
				+                 
			
 
				+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+            <el-select
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
			
 
				+              placeholder="请选择质检员"
			
 
				+              filterable
			
 
				+              clearable
			
 
				+              @change="qualityInspectorChange"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in qualityInspectorList"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+      </div>
			
 
				+
			
 
				+      <div class="neifor">
			
 
				+        <ws-info-table>
			
 
				+          <!--水分（%）<=-->
			
 
				+          <ws-form-item label="水分（%）" span="1" prop="waterContent">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.waterContent"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              placeholder="请输入水分占比"
			
 
				+              maxlength="40"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--杂质（%）<=-->
			
 
				+          <ws-form-item label="杂质（%）" span="1" prop="impurity">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.impurity"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              placeholder="请输入杂质占比"
			
 
				+              maxlength="40"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--容重(克/升)-->
			
 
				+          <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              placeholder="请输入容重"
			
 
				+              maxlength="40"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--霉变粒（%）<=-->
			
 
				+          <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              placeholder="请输入霉变粒占比"
			
 
				+              maxlength="40"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--热损伤（%）<=-->
			
 
				+          <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              placeholder="请输入热损伤占比"
			
 
				+              maxlength="40"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--不完善粒（%）<=-->
			
 
				+          <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
			
 
				+              type="number"
			
 
				+              @mousewheel.native.prevent
			
 
				+              placeholder="请输入不完善粒占比"
			
 
				+              maxlength="40"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+        </ws-info-table>
			
 
				+      </div>
			
 
				+      <div style="text-align: right; padding: 10px">
			
 
				+        <el-button
			
 
				+        v-if="information == '毛重检斤'"
			
 
				+          class="bg-bottom-up"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="temporaryStorage()"
			
 
				+          >保存</el-button
			
 
				+        >
			
 
				+        <el-button
			
 
				+        v-else
			
 
				+          class="bg-bottom-up"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="submit()"
			
 
				+          >提交</el-button
			
 
				+        >
			
 
				+      </div>
			
 
				+    </ws-form>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+import {
			
 
				+  pullDown,
			
 
				+  addstorageputList,
			
 
				+  xialaNo,
			
 
				+  getstaff,
			
 
				+} from '@/model/warehouse/index'
			
 
				+import Pagination from '@/components/Pagination'
			
 
				+import WsUpload from '@/components/WsUpload'
			
 
				+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
			
 
				+import { dayjs, EventBus } from 'base-core-lib'
			
 
				+export default {
			
 
				+  name: 'viewSpareMoney',
			
 
				+  components: {
			
 
				+    WsUpload,
			
 
				+    Pagination,
			
 
				+  },
			
 
				+  watch: {
			
 
				+    // vesselId(val) {
			
 
				+    //   this.getList()
			
 
				+    // },
			
 
				+    isShow(val) {
			
 
				+      this.showType = val
			
 
				+    },
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      qualityInspectorList:[],
			
 
				+      isGetCost:false,
			
 
				+      isSelectType:true,
			
 
				+      //弹出框
			
 
				+      dialogViewSpareMoney: false,
			
 
				+      dialogApproveFormVisible: false,
			
 
				+      // 船舶类型
			
 
				+      monetaryKey: null,
			
 
				+      // 表格显示数据
			
 
				+      tableDate: [],
			
 
				+      // 是否显示
			
 
				+      showType: true,
			
 
				+      typeList: ['干粮', '潮粮'],
			
 
				+      // 年
			
 
				+      year: '',
			
 
				+      carstatus: false,
			
 
				+      deptBudgetTotal: 0,
			
 
				+      currentPage: 1,
			
 
				+      pageSize: 10,
			
 
				+      searchType: 1,
			
 
				+      searchKeyWord: '',
			
 
				+      contractType: 2,
			
 
				+      startDate: null,
			
 
				+      endDate: null,
			
 
				+      goodnameList: {},
			
 
				+      checked: true,
			
 
				+      agent: [],
			
 
				+      staffList: [],
			
 
				+      options: [],
			
 
				+      options1: [],
			
 
				+      options2: [],
			
 
				+      outContractNo1: [],
			
 
				+      outContractNo: [],
			
 
				+
			
 
				+      // 提交类型
			
 
				+      submitType: true,
			
 
				+      storageType: [],
			
 
				+      deliveryType: [],
			
 
				+      readonly: true,
			
 
				+      appendixIdsAdd: '',
			
 
				+      uploadSuccess: {},
			
 
				+      onChange: {},
			
 
				+      gradeList: [],
			
 
				+      rules: {
			
 
				+        
			
 
				+      },
			
 
				+      size: 10,
			
 
				+      disabled1: true,
			
 
				+      disabled2: true,
			
 
				+      tranCarInfoList: [],
			
 
				+      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+      deptCircularPage: {},
			
 
				+      packtypeList: {},
			
 
				+      date: {
			
 
				+        year: dayjs().format('YYYY'),
			
 
				+        month: dayjs().format('MM'),
			
 
				+      },
			
 
				+      contractList: [],
			
 
				+      deptBudgetList: {
			
 
				+        type: '干粮',
			
 
				+        freight: 0,
			
 
				+        cost: '',
			
 
				+        addressUrl:'',
			
 
				+        warehouseInOutDetail: {},
			
 
				+        deductionAmount:0,
			
 
				+      },
			
 
				+      historyList: [],
			
 
				+      cost:'',
			
 
				+      pickerBeginDateBefore: {
			
 
				+        disabledDate: (time) => {
			
 
				+          return time.getTime() > Date.now()
			
 
				+        },
			
 
				+      },
			
 
				+      accessoryTFs: false,
			
 
				+      allowEdit: true,
			
 
				+      information:''
			
 
				+    }
			
 
				+  },
			
 
				+  mounted() {
			
 
				+    this.information = this.$route.query.information
			
 
				+    if(this.$route.query.allowEdit == 1){
			
 
				+      this.allowEdit = false
			
 
				+    }
			
 
				+    else{
			
 
				+      this.allowEdit = true
			
 
				+    }
			
 
				+    this.deptBudgetList.baseId = this.$route.query.baseId
			
 
				+    this.deptBudgetList.positionId = this.$route.query.positionId
			
 
				+    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
			
 
				+    this.deptBudgetList.binNumber = this.$route.query.binNumber
			
 
				+    this.deptBudgetList.warehouseType = this.$route.query.warehouseType
			
 
				+    this.deptBudgetList.createType = this.$route.query.createType
			
 
				+    this.getList()
			
 
				+    this.deptBudgetList.grade = '一等品'
			
 
				+    this.deptBudgetList.gradeKey = '1'
			
 
				+    this.deptBudgetList.inOutTypeFlag=1
			
 
				+       if(this.deptBudgetList.cost){
			
 
				+        if(this.deptBudgetList.cost>this.deptBudgetList.deductionAmount){
			
 
				+           this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
			
 
				+          }
			
 
				+       else{
			
 
				+         
			
 
				+       }
			
 
				+      }
			
 
				+    // if (this.deptBudgetList.warehouseType == 1) {
			
 
				+    //   // this.deptBudgetList.inOutType = '采购入库'
			
 
				+    //   this.deptBudgetList.inOutTypeKey = '1'
			
 
				+    // } else {
			
 
				+    //   // this.deptBudgetList.inOutType = '退库'
			
 
				+    //   this.deptBudgetList.inOutTypeKey = '1'
			
 
				+    // }
			
 
				+  },
			
 
				+  methods: {
			
 
				+    async closePort() {
			
 
				+      console.log('closePort');
			
 
				+      this.reader.cancel()
			
 
				+    },
			
 
				+    async openPort() {
			
 
				+      console.log('openPort', navigator);
			
 
				+      if ('serial' in navigator) {
			
 
				+        // The Web Serial API is supported.
			
 
				+        console.log('the Web Serial API is supported.');
			
 
				+        console.log(this.param);
			
 
				+        const port = await navigator.serial.requestPort();
			
 
				+        await port.open({
			
 
				+          baudRate: this.param
			
 
				+        }); // set baud rate
			
 
				+        this.reader = port.readable.getReader();
			
 
				+        // 监听来自串行设备的数据
			
 
				+        while (true) {
			
 
				+          const {
			
 
				+            value,
			
 
				+            done
			
 
				+          } = await this.reader.read();
			
 
				+          // console.log("value",value);
			
 
				+          if (done) {
			
 
				+            // 允许稍后关闭串口。
			
 
				+            this.reader.releaseLock();
			
 
				+            break;
			
 
				+          }
			
 
				+          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 == '+') {
			
 
				+              flag = true
			
 
				+            }
			
 
				+            if (flag && result.length < 6 && tmp != '+') {
			
 
				+              result += tmp
			
 
				+            }
			
 
				+          }
			
 
				+          if (this.information != '毛重检斤') {
			
 
				+            if(parseInt(result)){
			
 
				+              this.deptBudgetList.grossWeight = parseInt(result)
			
 
				+            }
			
 
				+          } else {
			
 
				+            if(parseInt(result)){
			
 
				+              this.deptBudgetList.tare = parseInt(result)
			
 
				+            }
			
 
				+          }
			
 
				+          setTimeout(1000)
			
 
				+          // value 是一个 Uint8Array
			
 
				+        }
			
 
				+        await port.close();
			
 
				+      } else {
			
 
				+        console.log('the Web Serial API is not supported.', navigator);
			
 
				+      }
			
 
				+    },
			
 
				+    qualityInspectorChange(e){
			
 
				+      console.log(e)
			
 
				+    },
			
 
				+    kkInput(val){
			
 
				+      console.log(val)
			
 
				+      if(this.isGetCost){
			
 
				+        if(this.deptBudgetList.cost>val){
			
 
				+           this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
			
 
				+          }
			
 
				+      }
			
 
				+    },
			
 
				+    uploadSuccessHandle1(res) {
			
 
				+      this.deptBudgetList.addressUrl = res.url
			
 
				+      console.log(this.deptBudgetList.addressUrl)
			
 
				+    },
			
 
				+    dataFilter1(val) {
			
 
				+      console.log(val)
			
 
				+      this.deptBudgetList.contractNo = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options1 = this.outContractNo1.filter((item) => {
			
 
				+          if (
			
 
				+            !!~item.contractNo.indexOf(val) ||
			
 
				+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options1 = this.outContractNo
			
 
				+      }
			
 
				+    },
			
 
				+    dataFilter2(val) {
			
 
				+      this.deptBudgetList.carNo = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options1 = this.outContractNo1.filter((item) => {
			
 
				+          if (
			
 
				+            !!~item.carNo.indexOf(val) ||
			
 
				+            !!~item.carNo.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options2 = this.tranCarInfoList
			
 
				+      }
			
 
				+    },
			
 
				+    editClick(status) {
			
 
				+      this.isGetCost = false
			
 
				+      if (status == 1) {
			
 
				+        this.disabled1 = !this.disabled1
			
 
				+      } else {
			
 
				+        this.disabled2 = !this.disabled2
			
 
				+      }
			
 
				+    },
			
 
				+    //返回按钮
			
 
				+    revert() {
			
 
				+      this.$router.push({ path: 'warehouseManagementList' })
			
 
				+    },
			
 
				+    carChange(e) {
			
 
				+      for (let i = 0; i < this.tranCarInfoList.length; i++) {
			
 
				+        if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
			
 
				+          this.deptBudgetList.tranCarNo=this.tranCarInfoList[i].tranCarNo
			
 
				+          this.deptBudgetList.freight = this.tranCarInfoList[i].tranPrice
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    dataFilter(val) {
			
 
				+      // console.log(val,"名")
			
 
				+      this.deptBudgetList.staffList = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options = this.staffList.filter((item) => {
			
 
				+          if (
			
 
				+            !!~item.staffName.indexOf(val) ||
			
 
				+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options = this.staffList
			
 
				+      }
			
 
				+    },
			
 
				+    selectstaff(e) {
			
 
				+      for (var i = 0; i < this.staffList.length; i++) {
			
 
				+        if (this.staffList[i].staffName == e) {
			
 
				+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    //提交按钮
			
 
				+    submit() {
			
 
				+      if (!this.deptBudgetList.goodsName) {
			
 
				+        this.$message({
			
 
				+          message: '货名不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.grossWeight) {
			
 
				+        this.$message({
			
 
				+          message: '毛重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.grossWeight < 0 ||
			
 
				+        this.deptBudgetList.grossWeight > 10000 ||
			
 
				+        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.grossWeight).length -
			
 
				+            (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '毛重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.tare) {
			
 
				+        this.$message({
			
 
				+          message: '皮重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.tare < 0 ||
			
 
				+        this.deptBudgetList.tare > 10000 ||
			
 
				+        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.tare).length -
			
 
				+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '皮重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.deductionWeight) {
			
 
				+        this.$message({
			
 
				+          message: '扣重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.deductionWeight < 0 ||
			
 
				+        this.deptBudgetList.deductionWeight > 10 ||
			
 
				+        (String(this.deptBudgetList.deductionWeight).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.deductionWeight).length -
			
 
				+            (String(this.deptBudgetList.deductionWeight).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.type == '潮粮' &&
			
 
				+        !this.deptBudgetList.buckleWeightRatio
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          this.deptBudgetList.buckleWeightRatio < 0) ||
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          this.deptBudgetList.buckleWeightRatio > 3) ||
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          String(this.deptBudgetList.buckleWeightRatio).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.buckleWeightRatio).length -
			
 
				+            (String(this.deptBudgetList.buckleWeightRatio).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.type == '潮粮' &&
			
 
				+        !this.deptBudgetList.tidalGrainWater
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          this.deptBudgetList.tidalGrainWater < 1) ||
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          this.deptBudgetList.tidalGrainWater > 40) ||
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          String(this.deptBudgetList.tidalGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.tidalGrainWater).length -
			
 
				+            (String(this.deptBudgetList.tidalGrainWater).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.type == '潮粮' &&
			
 
				+        !this.deptBudgetList.solidGrainWater
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          this.deptBudgetList.solidGrainWater < 1) ||
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          this.deptBudgetList.solidGrainWater > 40) ||
			
 
				+        (this.deptBudgetList.type == '潮粮' &&
			
 
				+          String(this.deptBudgetList.solidGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.solidGrainWater).length -
			
 
				+            (String(this.deptBudgetList.solidGrainWater).indexOf('.') + 1) >
			
 
				+            1)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!String(this.deptBudgetList.deductionAmount)) {
			
 
				+        this.$message({
			
 
				+          message: '扣款不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.deductionAmount < 0 ||
			
 
				+        this.deptBudgetList.deductionAmount > 10000 ||
			
 
				+        (String(this.deptBudgetList.deductionAmount).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.deductionAmount).length -
			
 
				+            (String(this.deptBudgetList.deductionAmount).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣款输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.cost) {
			
 
				+        this.$message({
			
 
				+          message: '未获取到成本，请编辑后提交',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.cost < 0 ||
			
 
				+        this.deptBudgetList.cost > 20000 ||
			
 
				+        (String(this.deptBudgetList.cost).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.cost).length -
			
 
				+            (String(this.deptBudgetList.cost).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '成本输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!String(this.deptBudgetList.freight)) {
			
 
				+        this.$message({
			
 
				+          message: '运费不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.freight < 0 ||
			
 
				+        this.deptBudgetList.freight > 100000 ||
			
 
				+        (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.freight).length -
			
 
				+            (String(this.deptBudgetList.freight).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '运费输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.agent) {
			
 
				+        this.$message({
			
 
				+          message: '经办人不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.agent.length < 2 ||
			
 
				+        this.deptBudgetList.agent.length > 10
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '经办人输入有误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.grade) {
			
 
				+        this.$message({
			
 
				+          message: '品级不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.inOutDate) {
			
 
				+        this.$message({
			
 
				+          message: '入库日期不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.inOutType) {
			
 
				+        this.$message({
			
 
				+          message: '入库类型不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.carNo) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.deptBudgetList.carNo.length > 7) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号输入错误,请输入7个字符之内',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.contractNo) {
			
 
				+        this.$message({
			
 
				+          message: '合同编号不能为空',
			
 
				+          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: '附件不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      //自检员
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
			
 
				+            2 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '质检员姓名长度错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.waterContent)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //杂质
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.impurity
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //霉变
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.mildewGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //热损伤
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.jiaorenli
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //不完善粒（%）
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //容重
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
			
 
				+          this.$message({
			
 
				+            message: '容重(克/升)非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        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: '容重输入错误',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      console.log(this.deptBudgetList, '入库对象')
			
 
				+      this.deptBudgetList.id = this.$route.query.id
			
 
				+      this.$confirm(`确定提交入库信息`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          this.$refs.deptBudgetList.validate((valid) => {
			
 
				+            if (valid) {
			
 
				+              this.deptBudgetList.compId =
			
 
				+                sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.deptBudgetList.inOutFlag = 2
			
 
				+              this.deptBudgetList.pcFlag = 1
			
 
				+              this.deptBudgetList.statusFlag = 3
			
 
				+              addstorageputList(this.deptBudgetList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('添加成功')
			
 
				+                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                })
			
 
				+            } else {
			
 
				+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              return false
			
 
				+            }
			
 
				+          })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    temporaryStorage() {
			
 
				+      if (!this.deptBudgetList.goodsName) {
			
 
				+        this.$message({
			
 
				+          message: '货名不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.information == '毛重检斤'&&!this.deptBudgetList.grossWeight) {
			
 
				+        this.$message({
			
 
				+          message: '毛重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.information == '毛重检斤'&&(
			
 
				+        this.deptBudgetList.grossWeight < 0 ||
			
 
				+        this.deptBudgetList.grossWeight > 2000000 ||
			
 
				+        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.grossWeight).length -
			
 
				+            (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
			
 
				+            3))
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '毛重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.information == '皮重检斤'&&!this.deptBudgetList.tare) {
			
 
				+        this.$message({
			
 
				+          message: '皮重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.information == '皮重检斤'&&(
			
 
				+        this.deptBudgetList.tare < 0 ||
			
 
				+        this.deptBudgetList.tare > 1000000 ||
			
 
				+        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.tare).length -
			
 
				+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
			
 
				+            3))
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '皮重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      // if (!this.deptBudgetList.deductionWeight) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '扣重不能为空',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.deductionWeight < 0 ||
			
 
				+      //   this.deptBudgetList.deductionWeight > 10 ||
			
 
				+      //   (String(this.deptBudgetList.deductionWeight).indexOf('.') != -1 &&
			
 
				+      //     String(this.deptBudgetList.deductionWeight).length -
			
 
				+      //       (String(this.deptBudgetList.deductionWeight).indexOf('.') + 1) >
			
 
				+      //       3)
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '扣重输入错误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.type == '潮粮' &&
			
 
				+      //   !this.deptBudgetList.buckleWeightRatio
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '扣重比不能为空',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     this.deptBudgetList.buckleWeightRatio < 0) ||
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     this.deptBudgetList.buckleWeightRatio > 3) ||
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     String(this.deptBudgetList.buckleWeightRatio).indexOf('.') != -1 &&
			
 
				+      //     String(this.deptBudgetList.buckleWeightRatio).length -
			
 
				+      //       (String(this.deptBudgetList.buckleWeightRatio).indexOf('.') + 1) >
			
 
				+      //       2)
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '扣重比输入错误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.type == '潮粮' &&
			
 
				+      //   !this.deptBudgetList.tidalGrainWater
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '潮粮水分不能为空',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     this.deptBudgetList.tidalGrainWater < 1) ||
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     this.deptBudgetList.tidalGrainWater > 40) ||
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     String(this.deptBudgetList.tidalGrainWater).indexOf('.') != -1 &&
			
 
				+      //     String(this.deptBudgetList.tidalGrainWater).length -
			
 
				+      //       (String(this.deptBudgetList.tidalGrainWater).indexOf('.') + 1) >
			
 
				+      //       2)
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '潮粮水分输入错误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.type == '潮粮' &&
			
 
				+      //   !this.deptBudgetList.solidGrainWater
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '干粮水分不能为空',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     this.deptBudgetList.solidGrainWater < 1) ||
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     this.deptBudgetList.solidGrainWater > 40) ||
			
 
				+      //   (this.deptBudgetList.type == '潮粮' &&
			
 
				+      //     String(this.deptBudgetList.solidGrainWater).indexOf('.') != -1 &&
			
 
				+      //     String(this.deptBudgetList.solidGrainWater).length -
			
 
				+      //       (String(this.deptBudgetList.solidGrainWater).indexOf('.') + 1) >
			
 
				+      //       1)
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '干粮水分输入错误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (!this.deptBudgetList.deductionAmount) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '扣款不能为空',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.deductionAmount < 0 ||
			
 
				+      //   this.deptBudgetList.deductionAmount > 10000 ||
			
 
				+      //   (String(this.deptBudgetList.deductionAmount).indexOf('.') != -1 &&
			
 
				+      //     String(this.deptBudgetList.deductionAmount).length -
			
 
				+      //       (String(this.deptBudgetList.deductionAmount).indexOf('.') + 1) >
			
 
				+      //       2)
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '扣款输入错误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (!this.deptBudgetList.cost) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '未获取到成本，请编辑后提交',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.cost < 0 ||
			
 
				+      //   this.deptBudgetList.cost > 20000 ||
			
 
				+      //   (String(this.deptBudgetList.cost).indexOf('.') != -1 &&
			
 
				+      //     String(this.deptBudgetList.cost).length -
			
 
				+      //       (String(this.deptBudgetList.cost).indexOf('.') + 1) >
			
 
				+      //       2)
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '成本输入错误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (!this.deptBudgetList.freight) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '运费不能为空',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.freight < 0 ||
			
 
				+      //   this.deptBudgetList.freight > 100000 ||
			
 
				+      //   (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
			
 
				+      //     String(this.deptBudgetList.freight).length -
			
 
				+      //       (String(this.deptBudgetList.freight).indexOf('.') + 1) >
			
 
				+      //       2)
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '运费输入错误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (!this.deptBudgetList.agent) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '经办人不能为空',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (
			
 
				+      //   this.deptBudgetList.agent.length < 2 ||
			
 
				+      //   this.deptBudgetList.agent.length > 10
			
 
				+      // ) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '经办人输入有误',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (!this.deptBudgetList.carNo) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '车牌号不能为空',
			
 
				+      //     type: 'warning'
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      // if (this.deptBudgetList.carNo.length > 7) {
			
 
				+      //   this.$message({
			
 
				+      //     message: '车牌号输入错误,请输入7个字符之内',
			
 
				+      //     type: 'warning'
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      if (!this.deptBudgetList.contractNo) {
			
 
				+        this.$message({
			
 
				+          message: '合同编号不能为空',
			
 
				+          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: '入库量大于该仓库容量！',
			
 
				+      //     type: 'warning',
			
 
				+      //   })
			
 
				+      //   return
			
 
				+      // }
			
 
				+      //自检员
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
			
 
				+            2 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '质检员姓名长度错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.waterContent)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //杂质
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.impurity
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //霉变
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.mildewGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //热损伤
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.jiaorenli
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //不完善粒（%）
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //容重
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
			
 
				+          this.$message({
			
 
				+            message: '容重(克/升)非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        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: '容重输入错误',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      this.$confirm(`是否保存毛重检斤`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          this.$refs.deptBudgetList.validate((valid) => {
			
 
				+            if (valid) {
			
 
				+              this.deptBudgetList.compId =
			
 
				+                sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.deptBudgetList.inOutFlag = 2
			
 
				+              this.deptBudgetList.statusFlag = 1
			
 
				+              let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
			
 
				+                this.deptBudgetList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
			
 
				+                this.deptBudgetList.grossWeight /= 1000
			
 
				+                this.deptBudgetList.tare /= 1000
			
 
				+                this.deptBudgetList.netWeight /= 1000
			
 
				+                this.deptBudgetList.pureWeight /= 1000
			
 
				+                this.deptBudgetList.deductionAmount *= 1000
			
 
				+                this.deptBudgetList.deductionWeight *= 1000
			
 
				+              addstorageputList(this.deptBudgetList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('保存成功')
			
 
				+                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                })
			
 
				+            } else {
			
 
				+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              return false
			
 
				+            }
			
 
				+          })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    tarechange(e) {
			
 
				+      if (
			
 
				+        this.deptBudgetList.grossWeight &&
			
 
				+        this.deptBudgetList.tare &&
			
 
				+        this.deptBudgetList.deductionWeight
			
 
				+      ) {
			
 
				+        this.deptBudgetList.netWeight = Number(
			
 
				+          this.deptBudgetList.grossWeight -
			
 
				+            this.deptBudgetList.tare -
			
 
				+            this.deptBudgetList.deductionWeight
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    grossWeightchange(e) {
			
 
				+      if (
			
 
				+        this.deptBudgetList.grossWeight &&
			
 
				+        this.deptBudgetList.tare &&
			
 
				+        this.deptBudgetList.deductionWeight
			
 
				+      ) {
			
 
				+        this.deptBudgetList.netWeight = Number(
			
 
				+          this.deptBudgetList.grossWeight -
			
 
				+            this.deptBudgetList.tare -
			
 
				+            this.deptBudgetList.deductionWeight
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    contractNoChange(e) {
			
 
				+      for (var i = 0; i < this.outContractNo.length; i++) {
			
 
				+        if (this.outContractNo[i].contractNo == e) {
			
 
				+          if (this.outContractNo[i].inOutType == '采购入库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 1
			
 
				+            } else if (this.outContractNo[i].inOutType == '移库入库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 3
			
 
				+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 4
			
 
				+            } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 5
			
 
				+            } else if (this.detailData.inOutType == '退库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 6
			
 
				+            }
			
 
				+          this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
			
 
				+          this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
			
 
				+          // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
			
 
				+          this.cost = this.outContractNo[i].contractPrice
			
 
				+          if(this.cost){
			
 
				+            this.isGetCost = true
			
 
				+              this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
			
 
				+          }else{
			
 
				+             this.isGetCost = false
			
 
				+             this.deptBudgetList.cost = this.deptBudgetList.cost
			
 
				+          }
			
 
				+          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
			
 
				+          if(this.outContractNo[i].inOutType=='移库入库'){
			
 
				+            this.isSelectType = false
			
 
				+          }else{
			
 
				+            this.isSelectType = true
			
 
				+          }
			
 
				+          if (this.outContractNo[i].tranCarInfoList) {
			
 
				+            this.options2 = this.outContractNo[i].tranCarInfoList
			
 
				+            this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
			
 
				+            this.carstatus = true
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    typeChange(e) {},
			
 
				+    pureweight(status) {
			
 
				+      console.log(this.deptBudgetList)
			
 
				+      if (
			
 
				+        this.deptBudgetList.netWeight &&
			
 
				+        this.deptBudgetList.tidalGrainWater &&
			
 
				+        this.deptBudgetList.solidGrainWater &&
			
 
				+        this.deptBudgetList.buckleWeightRatio
			
 
				+      ) {
			
 
				+        this.deptBudgetList.pureWeight =
			
 
				+          (this.deptBudgetList.netWeight *
			
 
				+            (100 -
			
 
				+              (this.deptBudgetList.tidalGrainWater -
			
 
				+                this.deptBudgetList.solidGrainWater) *
			
 
				+                this.deptBudgetList.buckleWeightRatio)) /
			
 
				+          100
			
 
				+      }
			
 
				+    },
			
 
				+    selectgoodsName(e) {
			
 
				+      for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				+        if (this.goodnameList[i].constValue == e) {
			
 
				+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectpackingMethod(e) {
			
 
				+      for (var i = 0; i < this.packtypeList.length; i++) {
			
 
				+        if (this.packtypeList[i].constValue == e) {
			
 
				+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectstorageType(e) {
			
 
				+      for (var i = 0; i < this.storageType.length; i++) {
			
 
				+        if (this.storageType[i].constValue == e) {
			
 
				+          this.deptBudgetList.inOutTypeKey = this.storageType[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    handleClose() {
			
 
				+      this.accessoryTFs = false
			
 
				+    },
			
 
				+    handleSizeChange(val) {
			
 
				+      console.log(`每页 ${val} 条`)
			
 
				+      this.pageSize = val
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    handleCurrentChange(val) {
			
 
				+      this.currentPage = val
			
 
				+      console.log(`当前页: ${val}`)
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    getList() {
			
 
				+      // 货名
			
 
				+      pullDown({ constId: 'CON2' })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.goodnameList = response
			
 
				+        })
			
 
				+      // 品级
			
 
				+      pullDown({ constId: 'CON3' })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.gradeList = response
			
 
				+        })
			
 
				+      // 类型
			
 
				+      if (this.deptBudgetList.warehouseType == '1') {
			
 
				+        this.storageType = []
			
 
				+        pullDown({ constId: 'CON5' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            // this.storageType = response
			
 
				+            for(let i = 0;i<response.length;i++){
			
 
				+                if(response[i].constValue=='移库入库'||response[i].constValue=='退库'){
			
 
				+                  this.storageType.push(response[i])
			
 
				+                }
			
 
				+            }
			
 
				+          })
			
 
				+      } else if (this.deptBudgetList.warehouseType == '2') {
			
 
				+        pullDown({ constId: 'WARE1' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.storageType = response
			
 
				+          })
			
 
				+
			
 
				+        pullDown({ constId: 'WARE2' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deliveryType = response
			
 
				+          })
			
 
				+      }
			
 
				+      //合同编号
			
 
				+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'), flag: 6 })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.options1 = response
			
 
				+          this.outContractNo = response
			
 
				+        })
			
 
				+      //合同编号2
			
 
				+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'), flag: 7 })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.outContractNo1 = response
			
 
				+        })
			
 
				+      //经办人
			
 
				+      getstaff({
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+        warehouseId: this.deptBudgetList.baseId,
			
 
				+      })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.options = response
			
 
				+          this.qualityInspectorList = response
			
 
				+          this.staffList = response
			
 
				+          //  this.agent = response
			
 
				+        })
			
 
				+    },
			
 
				+    selecttaskType(e) {
			
 
				+      for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				+        if (this.taskTypeList[i].value == e) {
			
 
				+          this.searchType = this.taskTypeList[i].type
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    fujian(row) {
			
 
				+      if (
			
 
				+        row.receiveAttachmentPath === null ||
			
 
				+        row.receiveAttachmentPath === ''
			
 
				+      ) {
			
 
				+        EventBus.$emit(
			
 
				+          'warning',
			
 
				+          this.$t('system.noticeCircular.NoInformation')
			
 
				+        )
			
 
				+      } else {
			
 
				+        this.accessoryTFs = true
			
 
				+      }
			
 
				+      this.appendixIdss = row.receiveAttachmentPath
			
 
				+    },
			
 
				+    handleExamine(row) {
			
 
				+      this.$router.push({
			
 
				+        name: 'salesContractExamine',
			
 
				+        query: { id: row.id },
			
 
				+      })
			
 
				+    },
			
 
				+  },
			
 
				+}
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+/deep/.basicInformation {
			
 
				+  .ws-info-table {
			
 
				+    border: none;
			
 
				+  }
			
 
				+  .el-form-item {
			
 
				+    width: 33.3333%;
			
 
				+    border: none;
			
 
				+    .el-form-item__label {
			
 
				+      background: transparent;
			
 
				+      border: none;
			
 
				+    }
			
 
				+    .el-form-item__content {
			
 
				+      border: none;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+.title {
			
 
				+  position: relative;
			
 
				+  padding-left: 10px;
			
 
				+}
			
 
				+.title::before {
			
 
				+  content: '';
			
 
				+  display: inline-block;
			
 
				+  width: 5px;
			
 
				+  height: 30px;
			
 
				+  background: #5473e8;
			
 
				+  position: absolute;
			
 
				+  left: 0;
			
 
				+}
			
 
				+.el-form {
			
 
				+  padding: 0 10%;
			
 
				+}
			
 
				+.el-button--primary {
			
 
				+  background-color: #5878e8;
			
 
				+  border-color: #5878e8;
			
 
				+}
			
 
				+.el-col {
			
 
				+  background: #f6f7fc;
			
 
				+}
			
 
				+.bg-right {
			
 
				+  text-align: right;
			
 
				+  padding: 16px 20px;
			
 
				+}
			
 
				+.center {
			
 
				+  position: relative;
			
 
				+  top: 50px;
			
 
				+  width: 40%;
			
 
				+  height: 2000px;
			
 
				+  margin: 0 auto;
			
 
				+}
			
 
				+
			
 
				+//选填
			
 
				+/deep/.el-form-item {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+.container {
			
 
				+  overflow: scroll;
			
 
				+  height: 120vh;
			
 
				+}
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: center;
			
 
				+}
			
 
				+.deliverydate {
			
 
				+  display: inline-block;
			
 
				+  width: 10%;
			
 
				+}
			
 
				+.center {
			
 
				+  margin-top: -60px;
			
 
				+  width: 80%;
			
 
				+}
			
 
				+//仓位
			
 
				+
			
 
				+.position {
			
 
				+  background: #afb5cb;
			
 
				+  border-radius: 2px;
			
 
				+  font-size: 12px;
			
 
				+  color: #ffffff;
			
 
				+  line-height: 20px;
			
 
				+  display: inline-grid;
			
 
				+  padding: 2px 4px;
			
 
				+}
			
 
				+//表格文字
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: left;
			
 
				+  font-size: 14px;
			
 
				+  font-family: PingFangSC-Regular, PingFang SC;
			
 
				+  font-weight: 400;
			
 
				+  color: #8890b1;
			
 
				+  line-height: 16px;
			
 
				+}
			
 
				+.inspector {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+//质检员
			
 
				+.inspector .el-form-item__content {
			
 
				+  text-align: left;
			
 
				+  margin-left: 0px;
			
 
				+}
			
 
				+.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;
			
 
				+  padding: 4px 2px;
			
 
				+}
			
 
				+//下面列表
			
 
				+.neifor {
			
 
				+  width: 80%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
			
 
				+  width: 35%;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
			
 
				+  width: 60%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+
			
 
				+/deep/.neifor .el-input--small .el-input__inner {
			
 
				+  width: 100%;
			
 
				+}
			
 
				+</style>
			
--- a/src/views/warehouse/warehouseManagementList.vue
+++ b/src/views/warehouse/warehouseManagementList.vue
@@ -26,9 +26,8 @@
 
				         <ws-button v-hasPermission="
			
 
				            `warehouseManagement.warehouse.warehouseInfo.delete`
			
 
				           " @click="handleDelete()">删除</ws-button>
			
 
				-        <ws-button v-hasPermission="
			
 
				-           `warehouseManagement.warehouse.warehouseInfo.view`
			
 
				-          " @click="handlTask()">任务</ws-button>
			
 
				+        <ws-button v-if='list.length>0'
			
 
				+           @click="handlTask()">任务</ws-button>
			
 
				       </template>
			
 
				       <template slot="left">
			
 
				         <div >
			
@@ -127,23 +126,42 @@
 
				             </div>
			
 
				           </template>
			
 
				         </el-table-column>
			
 
				-        <el-table-column prop="seller" label="出入库" width="300">
			
 
				+        <el-table-column prop="seller" label="入库" width="300">
			
 
				           <template slot-scope="scope">
			
 
				             <ws-button v-hasPermission="
			
 
				+           `warehouseManagement.warehouse.warehouseInfo.in`
			
 
				+          " class="putstorage" @click="warehousing1(scope.row)">
			
 
				+              毛检
			
 
				+            </ws-button>
			
 
				+             <ws-button v-hasPermission="
			
 
				+           `warehouseManagement.warehouse.warehouseInfo.in`
			
 
				+          " class="putstorage" @click="nocomplete1(scope.row)">
			
 
				+              皮检
			
 
				+            </ws-button>
			
 
				+            <!-- <ws-button v-hasPermission="
			
 
				            `warehouseManagement.warehouse.warehouseInfo.view`
			
 
				           " class="completed" @click="nocomplete(scope.row)">
			
 
				-              待完成（{{ scope.row.number }}）
			
 
				-            </ws-button>
			
 
				+              待皮检（{{ scope.row.number }}）
			
 
				+            </ws-button> -->
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column prop="seller" label="出库" width="300">
			
 
				+          <template slot-scope="scope">
			
 
				             <ws-button v-hasPermission="
			
 
				-           `warehouseManagement.warehouse.warehouseInfo.in`
			
 
				-          " class="putstorage" @click="warehousing(scope.row)">
			
 
				-              入库
			
 
				+           `warehouseManagement.warehouse.warehouseInfo.out`
			
 
				+          " class="deliverystorage" @click="delivery1(scope.row)">
			
 
				+              皮检
			
 
				             </ws-button>
			
 
				             <ws-button v-hasPermission="
			
 
				            `warehouseManagement.warehouse.warehouseInfo.out`
			
 
				-          " class="deliverystorage" @click="delivery(scope.row)">
			
 
				-              出库
			
 
				+          " class="deliverystorage" @click="nocomplete1(scope.row)">
			
 
				+              毛检
			
 
				             </ws-button>
			
 
				+            <!-- <ws-button v-hasPermission="
			
 
				+           `warehouseManagement.warehouse.warehouseInfo.view`
			
 
				+          " class="completed" @click="nocomplete(scope.row)">
			
 
				+              待毛检（{{ scope.row.number }}）
			
 
				+            </ws-button> -->
			
 
				           </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column prop="address" label="操作" width="200">
			
@@ -256,9 +274,11 @@
 
				 <script>
			
 
				 import {
			
 
				   getList,
			
 
				+  getwarehousetask,
			
 
				   export1,
			
 
				   editstatus,
			
 
				   billoperatehis,
			
 
				+  getsponsible,
			
 
				   clearancee,
			
 
				 } from '@/model/warehouse/index'
			
 
				 import { downloadFile } from '@/utils/batchDown'
			
@@ -288,7 +308,7 @@ export default {
 
				       monetaryKey: null,
			
 
				       // 表格显示数据
			
 
				       tableDate: [],
			
 
				-
			
 
				+      list:[],
			
 
				       // 是否显示
			
 
				       showType: true,
			
 
				       // 年
			
@@ -398,6 +418,45 @@ export default {
 
				         },
			
 
				       })
			
 
				     },
			
 
				+    //毛检
			
 
				+    warehousing1(item) {
			
 
				+      var free = 0
			
 
				+      for (var i = 0; i < item.warehouseNumViewList.length; i++) {
			
 
				+        free += Number(item.warehouseNumViewList[i].storage)
			
 
				+      }
			
 
				+      this.$router.push({
			
 
				+        path: 'warehouseManagementGross',
			
 
				+        query: {
			
 
				+          baseId: item.warehouseId,
			
 
				+          positionId: item.binNumberId,
			
 
				+          warehouseName: item.warehouseName,
			
 
				+          binNumber: item.binNumber,
			
 
				+          capacity: item.capacity - free,
			
 
				+          id: item.id,
			
 
				+          warehouseType: this.warehouseType,
			
 
				+          createType: item.createType,
			
 
				+          information:'毛重检斤',
			
 
				+          allowEdit:item.allowEdit
			
 
				+        },
			
 
				+      })
			
 
				+    },
			
 
				+    //皮检
			
 
				+    delivery1(item) {
			
 
				+      this.$router.push({
			
 
				+        path: 'warehouseManagementTare',
			
 
				+        query: {
			
 
				+          baseId: item.warehouseId,
			
 
				+          positionId: item.binNumberId,
			
 
				+          warehouseName: item.warehouseName,
			
 
				+          binNumber: item.binNumber,
			
 
				+          capacity: item.capacity,
			
 
				+          warehouseType: this.warehouseType,
			
 
				+          warehouseId: item.warehouseId,
			
 
				+          information:'皮重检斤',
			
 
				+          allowEdit:item.allowEdit
			
 
				+        },
			
 
				+      })
			
 
				+    },
			
 
				     getSpanArr(data) {
			
 
				       let that = this
			
 
				 
			
@@ -445,6 +504,20 @@ export default {
 
				         })
			
 
				       }
			
 
				     },
			
 
				+    //检斤待完成
			
 
				+    nocomplete1(row) {
			
 
				+      this.$router.push({
			
 
				+        path: 'warehouseManagementNoWeight',
			
 
				+        query: {
			
 
				+          baseId: row.warehouseId,
			
 
				+          positionId: row.binNumberId,
			
 
				+          warehouseName: row.warehouseName,
			
 
				+          binNumber: row.binNumber,
			
 
				+          warehouseType: this.warehouseType,
			
 
				+          createType: row.createType,
			
 
				+        },
			
 
				+      })
			
 
				+    },
			
 
				     //记录
			
 
				     record(item) {
			
 
				       this.$router.push({
			
@@ -492,7 +565,13 @@ export default {
 
				     },
			
 
				     //任务
			
 
				     handlTask(){
			
 
				-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
			
 
				+      var arr=[]
			
 
				+      console.log(this.list)
			
 
				+      for (let i = 0; i < this.list.length; i++) {
			
 
				+        arr.push(this.list[i].warehouseName)
			
 
				+      }
			
 
				+      this.$router.push({ path: 'tranManagementWarehouseInOutTask',query:{stringList:arr,warehouseBaseInfoList:JSON.stringify(this.list)} })
			
 
				+      // this.$router.push({ path: 'tranManagementWarehouseInOutTask',query:{warehouseBaseInfoList:JSON.stringify(this.list)} })
			
 
				     },
			
 
				     dateFormat(fmt, date) {
			
 
				       let ret
			
@@ -539,6 +618,13 @@ export default {
 
				         .then((response) => {
			
 
				           this.warehouseList = response
			
 
				         })
			
 
				+        getsponsible({
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId')
			
 
				+      }).toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.list=response
			
 
				+          // console.log(response)
			
 
				+        })
			
 
				     },
			
 
				     editClick(row) {
			
 
				       var status = ''
			
--- a/src/views/warehouse/warehouseManagementNoWeight.vue
+++ b/src/views/warehouse/warehouseManagementNoWeight.vue
@@ -0,0 +1,551 @@
 
				+<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>
			
 
				+    <ws-form ref="deptBudgetList" :v-model="deptBudgetList">
			
 
				+      <div class="center">
			
 
				+        <h2 style="padding-left: 20px">
			
 
				+          <img
			
 
				+            style="position: relative; top: 2px"
			
 
				+            width="19"
			
 
				+            height="19"
			
 
				+            src="../../../public/img/cangku.png"
			
 
				+            alt=""
			
 
				+          />
			
 
				+          {{ this.$route.query.warehouseName }}
			
 
				+          <span class="position" v-show="this.$route.query.warehouseType == 1">
			
 
				+            {{ this.$route.query.binNumber }}仓位
			
 
				+          </span>
			
 
				+          <span v-show="this.$route.query.warehouseType == 2">(临)</span>
			
 
				+        </h2>
			
 
				+        <el-table :data="improved.records">
			
 
				+          <el-table-column type="index" label="序号">
			
 
				+            <template scope="scope">
			
 
				+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
			
 
				+              <span v-else>{{ scope.$index + 1 }}</span>
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+          <el-table-column prop="goodsName" label="货名"> </el-table-column>
			
 
				+          <el-table-column
			
 
				+            prop="grossWeight"
			
 
				+            label="毛重（吨）"
			
 
				+          ></el-table-column>
			
 
				+          <el-table-column prop="tare" label="皮重（吨）"> </el-table-column>
			
 
				+          <el-table-column
			
 
				+            prop="netWeight"
			
 
				+            label="净重（吨）"
			
 
				+          ></el-table-column>
			
 
				+          <el-table-column prop="grade" label="品级">
			
 
				+            <template slot-scope="scope">
			
 
				+              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
			
 
				+                scope.row.grade
			
 
				+              }}</span>
			
 
				+              <span v-if="scope.row.grade == '二等品'" class="second-class">{{
			
 
				+                scope.row.grade
			
 
				+              }}</span>
			
 
				+              <span v-if="scope.row.grade == '三等品'" class="third-class">{{
			
 
				+                scope.row.grade
			
 
				+              }}</span>
			
 
				+              <span v-if="scope.row.grade == '等外'" class="substandard">{{
			
 
				+                scope.row.grade
			
 
				+              }}</span>
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+          <el-table-column prop="inOutDate" label="出入库日期">
			
 
				+          </el-table-column>
			
 
				+          <el-table-column prop="inOutType" label="类型"> </el-table-column>
			
 
				+          <el-table-column prop="contractNo" label="合同编号">
			
 
				+          </el-table-column>
			
 
				+          <el-table-column prop="carNo" label="车牌号"> </el-table-column>
			
 
				+          <el-table-column prop="agent" label="经办人"> </el-table-column>
			
 
				+          <el-table-column prop="backOffice" label="内勤"> </el-table-column>
			
 
				+          <el-table-column prop="updateDate" label="保存时间">
			
 
				+          </el-table-column>
			
 
				+          <el-table-column prop="address" label="操作" width="200">
			
 
				+            <template  slot-scope="scope">
			
 
				+              <ws-button v-if="scope.row.inOutFlag =='2' " v-hasPermission="
			
 
				+           `warehouseManagement.warehouse.warehouseInfo.in`
			
 
				+          " class="deliverystorage" @click="edits(scope.row)">
			
 
				+              皮检
			
 
				+            </ws-button>
			
 
				+            <ws-button v-else v-hasPermission="
			
 
				+           `warehouseManagement.warehouse.warehouseInfo.out`
			
 
				+          " class="putstorage" @click="edits(scope.row)">
			
 
				+              毛检
			
 
				+            </ws-button>
			
 
				+          <!-- <el-button @click="print(scope.row)"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button > -->
			
 
				+
			
 
				+              <!-- <div class="record" @click="edits(scope.row)">编辑</div>
			
 
				+              <div class="adjustment" @click="handleDelete(scope.row)">
			
 
				+                删除
			
 
				+              </div> -->
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+        </el-table>
			
 
				+<div style='text-align:center;'>
			
 
				+   <el-pagination
			
 
				+      @size-change="handleSizeChange"
			
 
				+      @current-change="handleCurrentChange"
			
 
				+      :current-page="currentPage"
			
 
				+      :page-size="pageSize"
			
 
				+      layout="total, sizes, prev, pager, next, jumper"
			
 
				+      :total="deptBudgetTotal"
			
 
				+    >
			
 
				+    </el-pagination>
			
 
				+</div>
			
 
				+       
			
 
				+      </div>
			
 
				+    </ws-form>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+import {
			
 
				+  complete,
			
 
				+  delInOut,
			
 
				+  completeList,
			
 
				+  getPrintInfo,
			
 
				+  // deletewarehouse,
			
 
				+  // warehouseName,
			
 
				+  // addstorageputList,
			
 
				+} from '@/model/warehouse/index'
			
 
				+// import { downloadFile } from '@/utils/batchDown'
			
 
				+import Pagination from '@/components/Pagination'
			
 
				+import WsUpload from '@/components/WsUpload'
			
 
				+import { dayjs } 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: '',
			
 
				+      deptBudgetTotal: 0,
			
 
				+      currentPage: 1,
			
 
				+      pageSize: 10,
			
 
				+      searchType: 1,
			
 
				+      searchKeyWord: '',
			
 
				+      contractType: 2,
			
 
				+      startDate: null,
			
 
				+      endDate: null,
			
 
				+      deletewarehouse: [],
			
 
				+      improved: [],
			
 
				+      row: [],
			
 
				+      deptBudgetList1: [],
			
 
				+      // 提交类型
			
 
				+      submitType: true,
			
 
				+      selectpackingMethod: {},
			
 
				+      size: 10,
			
 
				+      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+      deptCircularPage: {},
			
 
				+      packtypeList: {},
			
 
				+      date: {
			
 
				+        year: dayjs().format('YYYY'),
			
 
				+        month: dayjs().format('MM'),
			
 
				+      },
			
 
				+      contractList: [],
			
 
				+      deptBudgetList: {},
			
 
				+      historyList: [],
			
 
				+      // inOutDate:null,
			
 
				+      pickerBeginDateBefore: {
			
 
				+        disabledDate: (time) => {
			
 
				+          return time.getTime() > Date.now()
			
 
				+        },
			
 
				+      },
			
 
				+      accessoryTFs: false,
			
 
				+    }
			
 
				+  },
			
 
				+  activated() {
			
 
				+    //cg.viewBudget
			
 
				+    //cg.viewSpareMoney
			
 
				+    // this.getVesselData();
			
 
				+    this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
			
 
				+    this.binNumber = this.$route.params.binNumber
			
 
				+    this.deptBudgetList.warehouseType = this.$route.query.warehouseType
			
 
				+    this.createType=this.$route.query.createType,
			
 
				+    //接参
			
 
				+    this.getList(
			
 
				+      this.$route.query.baseId,
			
 
				+      this.$route.query.positionId,
			
 
				+      this.$route.query.warehouseType
			
 
				+    )
			
 
				+    this.showType = this.isShow
			
 
				+  },
			
 
				+  methods: {
			
 
				+    //返回按钮
			
 
				+    returnWarehouse() {
			
 
				+      this.$router.push({ path: 'warehouseManagementList' })
			
 
				+    },
			
 
				+    
			
 
				+    //编辑
			
 
				+    edits(row) {
			
 
				+            debugger
			
 
				+      if (row.inOutFlag == 2) {
			
 
				+        this.$store.dispatch('app/setdeptBudgetList', row)
			
 
				+        this.$router.push({
			
 
				+          path: 'warehouseManagementNoWeightIn',
			
 
				+          query: {
			
 
				+            id: row.id,
			
 
				+            agent: row.agent,
			
 
				+            baseId: row.baseId,
			
 
				+            binNumber: row.binNumber,
			
 
				+            carNo: row.carNo,
			
 
				+            compId: row.compId,
			
 
				+            contractNo: row.contractNo,
			
 
				+            goodsName: row.goodsName,
			
 
				+            goodsNameKey: row.goodsNameKey,
			
 
				+            grade: row.grade,
			
 
				+            grossWeight: row.grossWeight,
			
 
				+            inOutDate: row.inOutDate,
			
 
				+            inOutFlag: row.inOutFlag,
			
 
				+            inOutType: row.inOutType,
			
 
				+            inOutTypeKey: row.inOutTypeKey,
			
 
				+            netWeight: row.netWeight,
			
 
				+            positionId: row.positionId,
			
 
				+            statusFlag: row.statusFlag,
			
 
				+            tare: row.tare,
			
 
				+            warehouseName: row.warehouseName,
			
 
				+            warehouseInOutDetail: row.warehouseInOutDetail,
			
 
				+            warehouseType: this.deptBudgetList.warehouseType,
			
 
				+            createType: this.createType,
			
 
				+            temporaryOutType : row.temporaryOutType,
			
 
				+            cost:row.cost,
			
 
				+            freight:row.freight,
			
 
				+            type:row.type,
			
 
				+            buckleWeightRatio:row.buckleWeightRatio,
			
 
				+            tidalGrainWater:row.tidalGrainWater,
			
 
				+            solidGrainWater:row.solidGrainWater,
			
 
				+            pureWeight:row.pureWeight,
			
 
				+            deductionAmount:row.deductionAmount,
			
 
				+            deductionWeight:row.deductionWeight
			
 
				+          },
			
 
				+        })
			
 
				+      } else if (row.inOutFlag == 1) {
			
 
				+        this.$store.dispatch('app/setdeptBudgetList', row)
			
 
				+        // this.$store.commit('deptBudgetList',row)
			
 
				+        this.$router.push({
			
 
				+          path: 'warehouseManagementNoWeightOut',
			
 
				+          query: {
			
 
				+            id: row.id,
			
 
				+            agent: row.agent,
			
 
				+            baseId: row.baseId,
			
 
				+            binNumber: row.binNumber,
			
 
				+            carNo: row.carNo,
			
 
				+            compId: row.compId,
			
 
				+            contractNo: row.contractNo,
			
 
				+            goodsName: row.goodsName,
			
 
				+            goodsNameKey: row.goodsNameKey,
			
 
				+            grade: row.grade,
			
 
				+            grossWeight: row.grossWeight,
			
 
				+            inOutDate: row.inOutDate,
			
 
				+            inOutFlag: row.inOutFlag,
			
 
				+            inOutType: row.inOutType,
			
 
				+            inOutTypeKey: row.inOutTypeKey,
			
 
				+            netWeight: row.netWeight,
			
 
				+            positionId: row.positionId,
			
 
				+            statusFlag: row.statusFlag,
			
 
				+            tare: row.tare,
			
 
				+            warehouseName: row.warehouseName,
			
 
				+            warehouseInOutDetail: row.warehouseInOutDetail,
			
 
				+            warehouseType: this.deptBudgetList.warehouseType,
			
 
				+            temporaryOutType : this.temporaryOutType,
			
 
				+            cost:row.cost,
			
 
				+            freight:row.freight,
			
 
				+            type:row.type,
			
 
				+            buckleWeightRatio:row.buckleWeightRatio,
			
 
				+            tidalGrainWater:row.tidalGrainWater,
			
 
				+            solidGrainWater:row.solidGrainWater,
			
 
				+            pureWeight:row.pureWeight,
			
 
				+            deductionAmount:row.deductionAmount,
			
 
				+            deductionWeight:row.deductionWeight
			
 
				+          },
			
 
				+        })
			
 
				+      }
			
 
				+    },
			
 
				+    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
			
 
				+    },
			
 
				+    print(row) {
			
 
				+      
			
 
				+      
			
 
				+    },
			
 
				+    handleClose() {
			
 
				+      this.accessoryTFs = false
			
 
				+    },
			
 
				+    handleSizeChange(val) {
			
 
				+      console.log(`每页 ${val} 条`)
			
 
				+      this.pageSize = val
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    handleCurrentChange(val) {
			
 
				+      this.currentPage = val
			
 
				+      console.log(`当前页: ${val}`)
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    //收
			
 
				+    getList(id, id1, id2) {
			
 
				+      if (id2 == 1) {
			
 
				+        complete({
			
 
				+          // compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+          baseId: id,
			
 
				+          positionId: id1,
			
 
				+          pageSize: this.pageSize,
			
 
				+          currentPage: this.currentPage,
			
 
				+          // inOutDate:this.inOutDate
			
 
				+        })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deptBudgetTotal=response.total
			
 
				+            this.improved = response
			
 
				+          })
			
 
				+      } else if (id2 == 2) {
			
 
				+        completeList({
			
 
				+          baseId: id,
			
 
				+          positionId: id1,
			
 
				+          pageSize: this.pageSize,
			
 
				+          currentPage: this.currentPage,
			
 
				+        })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.improved = response
			
 
				+          })
			
 
				+      }
			
 
				+    },
			
 
				+    handleExamine(row) {
			
 
				+      this.$router.push({
			
 
				+        name: 'salesContractExamine',
			
 
				+        query: { id: row.id },
			
 
				+      })
			
 
				+    },
			
 
				+    //删除
			
 
				+    handleDelete(row) {
			
 
				+      this.$confirm(`删除后不可恢复，确认删除？`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          delInOut({ id: row.id })
			
 
				+            .toPromise()
			
 
				+            .then((response) => {
			
 
				+              this.$notify.success({
			
 
				+                title: '成功',
			
 
				+                message: '删除成功',
			
 
				+              })
			
 
				+              this.getList(
			
 
				+                row.baseId,
			
 
				+                row.positionId,
			
 
				+                this.$route.query.warehouseType
			
 
				+              )
			
 
				+            })
			
 
				+            .catch((response) => {})
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+  },
			
 
				+  find() {
			
 
				+    this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
			
 
				+    this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
			
 
				+    this.currentPage = 1
			
 
				+    this.getList()
			
 
				+  },
			
 
				+  // deletecontract(){},
			
 
				+  //删除
			
 
				+  approve() {},
			
 
				+  listQuery() {},
			
 
				+  total() {},
			
 
				+  clearfiltQuery() {},
			
 
				+  selectCrtDuty() {},
			
 
				+}
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+.center {
			
 
				+  position: relative;
			
 
				+  top: 50px;
			
 
				+  width: 90%;
			
 
				+  height: 500px;
			
 
				+  margin: 0 auto;
			
 
				+}
			
 
				+.container .bg-left {
			
 
				+  margin-left: 40px;
			
 
				+}
			
 
				+.container .bg-bottom {
			
 
				+  position: absolute;
			
 
				+  float: right;
			
 
				+  top: 15px;
			
 
				+  right: 20px;
			
 
				+}
			
 
				+.vertical-text-left {
			
 
				+  width: 62px;
			
 
				+  text-align: right;
			
 
				+}
			
 
				+/deep/.el-form-item {
			
 
				+  width: 33%;
			
 
				+}
			
 
				+.el-row {
			
 
				+  background: #f6f7fc;
			
 
				+  // box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
			
 
				+  border-radius: 4px 4px 1px 1px;
			
 
				+}
			
 
				+.container .bg-bottom {
			
 
				+  width: 74px;
			
 
				+  height: 32px;
			
 
				+  background: #5473e8;
			
 
				+  border-radius: 4px;
			
 
				+}
			
 
				+.bg-bottom {
			
 
				+  margin-top: 5px 0px;
			
 
				+}
			
 
				+.el-table .el-table__header tr {
			
 
				+  width: 1091px;
			
 
				+  height: 50px;
			
 
				+  background: #f6f7fc;
			
 
				+  border: 1px solid #e8ecf6;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+.el-table .cell {
			
 
				+  text-align: center;
			
 
				+  width: 29px;
			
 
				+  height: 20px;
			
 
				+  font-size: 14px;
			
 
				+  font-family: PingFangSC-Regular, PingFang SC;
			
 
				+  font-weight: 400;
			
 
				+  color: #5878e8;
			
 
				+  line-height: 20px;
			
 
				+}
			
 
				+.default .winseaview-main .el-table th > .cell {
			
 
				+  color: #8890b1;
			
 
				+}
			
 
				+.record,
			
 
				+.adjustment {
			
 
				+  display: inline-block;
			
 
				+  color: #5878e8;
			
 
				+  padding: 0 4px !important;
			
 
				+  position: relative;
			
 
				+}
			
 
				+/deep/.el-table td,
			
 
				+.el-table th {
			
 
				+  text-align: center;
			
 
				+}
			
 
				+/deep/.el-table .el-table__header th {
			
 
				+  border-bottom-width: 0px;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+.top-grade {
			
 
				+  background: linear-gradient(90deg, #5678e9, #7993f6);
			
 
				+  color: #fff;
			
 
				+  padding: 3px;
			
 
				+  border-radius: 2px;
			
 
				+}
			
 
				+.second-class {
			
 
				+  background: linear-gradient(90deg, #50cdd9, #82e2ea);
			
 
				+  color: #fff;
			
 
				+  padding: 3px;
			
 
				+  border-radius: 2px;
			
 
				+}
			
 
				+.third-class {
			
 
				+  background: linear-gradient(90deg, #ffa735, #ffbf70);
			
 
				+  color: #fff;
			
 
				+  padding: 3px;
			
 
				+  border-radius: 2px;
			
 
				+}
			
 
				+.substandard {
			
 
				+  background: linear-gradient(90deg, #b2b4bb, #ced0d5);
			
 
				+  color: #fff;
			
 
				+  padding: 3px;
			
 
				+  border-radius: 2px;
			
 
				+}
			
 
				+// .container .bg-left{
			
 
				+// width: 663px;
			
 
				+// height: 28px;
			
 
				+// font-size: 18px;
			
 
				+// font-family: PingFangSC-Medium, PingFang SC;
			
 
				+// font-weight: 500;
			
 
				+// color: #262626;
			
 
				+// line-height: 28px;
			
 
				+// text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
			
 
				+// }
			
 
				+.a {
			
 
				+  width: 19px;
			
 
				+  height: 19px;
			
 
				+  background: #afb5cb;
			
 
				+  margin-left: 10px;
			
 
				+}
			
 
				+.container .bg-left {
			
 
				+  width: 140px;
			
 
				+  height: 29px;
			
 
				+  font-size: 21px;
			
 
				+  font-family: PingFangSC-Semibold, PingFang SC;
			
 
				+  font-weight: 600;
			
 
				+  color: #323233;
			
 
				+  line-height: 29px;
			
 
				+}
			
 
				+.position {
			
 
				+  width: 52px;
			
 
				+  height: 20px;
			
 
				+  background: #afb5cb;
			
 
				+  border-radius: 2px;
			
 
				+  font-size: 12px;
			
 
				+  font-family: PingFangSC-Medium, PingFang SC;
			
 
				+  color: #ffffff;
			
 
				+  line-height: 20px;
			
 
				+}
			
 
				+</style>
			
--- a/src/views/warehouse/warehouseManagementNoWeightIn.vue
+++ b/src/views/warehouse/warehouseManagementNoWeightIn.vue
@@ -0,0 +1,1691 @@
 
				+// 完善入库信息
			
 
				+<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="revert()"
			
 
				+          ><img
			
 
				+            width="6"
			
 
				+            height="10"
			
 
				+            style="vertical-align: bottom; margin-right: 3px"
			
 
				+            src="../../../public/img/lujing.png"
			
 
				+            alt=""
			
 
				+          />返回</el-button
			
 
				+        >
			
 
				+      </el-col>
			
 
				+    </el-row>
			
 
				+
			
 
				+    <ws-form ref="dataList" :model="dataList" :rules="rules">
			
 
				+      <div class="basicInformation">
			
 
				+        <h2>
			
 
				+          {{ deptBudgetList1.warehouseName }}
			
 
				+          <span class="position" v-show="this.$route.query.warehouseType == 1">
			
 
				+            {{ deptBudgetList1.binNumber }}仓位
			
 
				+          </span>
			
 
				+          <span v-show="this.$route.query.warehouseType == 2">(临)</span>
			
 
				+        </h2>
			
 
				+        <div class="small-title">基本信息</div>
			
 
				+        <ws-info-table>
			
 
				+          <ws-form-item label="合同编号" span="1" prop="contractNo">
			
 
				+            <el-select
			
 
				+            filterable
			
 
				+            :filter-method="dataFilter1"
			
 
				+              v-model="dataList.contractNo"
			
 
				+              placeholder="请选择合同编号或移库任务编号"
			
 
				+              class="typeselect"
			
 
				+              @change='contractNoChange'
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options1"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.contractNo"
			
 
				+                :value="item.contractNo"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <!-- 货名 -->
			
 
				+          <ws-form-item label="货名" span="1">
			
 
				+            <ws-select
			
 
				+            disabled
			
 
				+              v-model="dataList.goodsName"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectgoodsName"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in goodnameList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="类型" span="1" prop="type">
			
 
				+              <ws-select v-model="dataList.type"  @change="typeChange">
			
 
				+                <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
			
 
				+              </ws-select>
			
 
				+            </ws-form-item>
			
 
				+          <!--毛重（公斤）-->
			
 
				+          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="grossWeightchange"
			
 
				+              v-model="dataList.grossWeight"
			
 
				+              placeholder="请输入毛重"
			
 
				+              maxlength="20"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--皮重（公斤）-->
			
 
				+          <ws-form-item label="皮重（公斤）" span="1" prop="tare" class="readonly">
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="tarechange"
			
 
				+              v-model="dataList.tare"
			
 
				+              placeholder="请输入皮重"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+              <el-button type="primary"  @click="openPort">重新获取</el-button>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="扣重（公斤）" span="1" prop="deductionWeight" class="readonly">
			
 
				+            <ws-input
			
 
				+            @input="tarechange"
			
 
				+              v-model="dataList.deductionWeight"
			
 
				+              placeholder="请输入扣重"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--净重（公斤）-->
			
 
				+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
			
 
				+            <ws-input
			
 
				+              disabled
			
 
				+              v-model="dataList.netWeight"
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
			
 
				+            <ws-input
			
 
				+              @input='pureweight'
			
 
				+              v-model="dataList.buckleWeightRatio"
			
 
				+              placeholder="请输入扣重比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
			
 
				+            <ws-input
			
 
				+            @input='pureweight'
			
 
				+              v-model="dataList.solidGrainWater"
			
 
				+              placeholder="请输入干粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
			
 
				+            <ws-input
			
 
				+            @input='pureweight'
			
 
				+              v-model="dataList.tidalGrainWater"
			
 
				+              placeholder="请输入潮粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
			
 
				+            <ws-input
			
 
				+              disabled
			
 
				+              v-model="dataList.pureWeight"
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--净重（公斤）-->
			
 
				+          <ws-form-item label="扣款（元/公斤）" span="1" prop="deductionAmount">
			
 
				+            <ws-input
			
 
				+            @input="kkInput(dataList.deductionAmount)"
			
 
				+              v-model="dataList.deductionAmount"
			
 
				+              placeholder="请输入扣款金额"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!-- 品级 -->
			
 
				+          <ws-form-item label="品级" span="1" class="readonly">
			
 
				+            <ws-select
			
 
				+              v-model="dataList.grade"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectpackingMethod"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in gradeList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--经办人-->
			
 
				+          <ws-form-item label="经办人" span="1" prop="agent">
			
 
				+            <el-select
			
 
				+              v-model="dataList.agent"
			
 
				+              placeholder="请选择经办人"
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter"
			
 
				+              @change="selectstaff"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <!--出库日期-->
			
 
				+          <ws-form-item label="入库日期" span="1" prop="inOutDate" class="deliverydate">
			
 
				+            <el-date-picker
			
 
				+              v-model="dataList.inOutDate"
			
 
				+              placeholder="请选择入库日期"
			
 
				+              type="date"
			
 
				+              value-format="yyyy-MM-dd"
			
 
				+            ></el-date-picker>
			
 
				+          </ws-form-item>
			
 
				+          <!-- 入库类型 -->
			
 
				+          <ws-form-item label="入库类型" span="1">
			
 
				+            <ws-select
			
 
				+              v-model="dataList.inOutType"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectstorageType"
			
 
				+               :disabled="isSelectType"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in storageType"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--车牌号  -->
			
 
				+          <ws-form-item label="车牌号" span="1" prop="carNo">
			
 
				+            <ws-input
			
 
				+            v-if='!carstatus'
			
 
				+              v-model="dataList.carNo"
			
 
				+              placeholder="请输入车牌号"
			
 
				+              maxlength="7"
			
 
				+              size="small"
			
 
				+            />
			
 
				+            <el-select
			
 
				+            v-if='carstatus'
			
 
				+            filterable
			
 
				+            :filter-method="dataFilter2"
			
 
				+              v-model="dataList.carNo"
			
 
				+              placeholder="请选择车牌号"
			
 
				+              class="typeselect"
			
 
				+              @change='carChange'
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options2"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.carNo+'('+item.tranCarNo+')'"
			
 
				+                :value="item.carNo"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="成本" span="1" prop="cost">
			
 
				+            <ws-input
			
 
				+            :disabled='disabled1'
			
 
				+              v-model="dataList.cost"
			
 
				+              placeholder="请输入成本"
			
 
				+              size="small"
			
 
				+            />
			
 
				+            <img
			
 
				+            width="17"
			
 
				+            height="18"
			
 
				+            style="vertical-align: text-top; position: relative; top: -1px"
			
 
				+            src="../../../public/img/edit.png"
			
 
				+            @click="editClick(1)"
			
 
				+            alt=""
			
 
				+          />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="运费" span="1" prop="freight">
			
 
				+            <ws-input
			
 
				+            :disabled='disabled2'
			
 
				+              v-model="dataList.freight"
			
 
				+              placeholder="请输入运费"
			
 
				+              size="small"
			
 
				+            />
			
 
				+            <img
			
 
				+            width="17"
			
 
				+            height="18"
			
 
				+            style="vertical-align: text-top; position: relative; top: -1px"
			
 
				+            src="../../../public/img/edit.png"
			
 
				+            @click="editClick(2)"
			
 
				+            alt=""
			
 
				+          />
			
 
				+          </ws-form-item>
			
 
				+        </ws-info-table>
			
 
				+        <div  v-show="this.$route.query.warehouseType == 2 && this.$route.query.createType == 2">
			
 
				+          <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
			
 
				+          <ws-info-table v-show="checked == true">
			
 
				+            <!-- 出库类型 -->
			
 
				+            <ws-form-item label="出库类型" span="1">
			
 
				+              <ws-select
			
 
				+                v-model="dataList.temporaryOutType"
			
 
				+                placeholder=""
			
 
				+                class="typeselect"
			
 
				+              >
			
 
				+                <ws-option
			
 
				+                  v-for="item in deliveryType"
			
 
				+                  :key="item.constKey"
			
 
				+                  :label="item.constValue"
			
 
				+                  :value="item.constValue"
			
 
				+                />
			
 
				+              </ws-select>
			
 
				+            </ws-form-item>
			
 
				+            <!-- 出库合同编号 -->
			
 
				+            <ws-form-item label="出库合同编号" span="1">
			
 
				+              <ws-select
			
 
				+                v-model="dataList.contractNo"
			
 
				+                placeholder="请选择合同编号或移库任务编号"
			
 
				+                class="typeselect"
			
 
				+              >
			
 
				+                <ws-option
			
 
				+                  v-for="item in outContractNo"
			
 
				+                  :key="item.constKey"
			
 
				+                  :label="item.contractNo"
			
 
				+                  :value="item.contractNo"
			
 
				+                />
			
 
				+              </ws-select>
			
 
				+            </ws-form-item>
			
 
				+          </ws-info-table>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <!-- <div class="small-title">上传磅单照片</div>
			
 
				+       <el-upload
			
 
				+            action="https://www.zthymaoyi.com/upload/admin"
			
 
				+            :show-file-list="false"
			
 
				+            :on-success="
			
 
				+              (res) => {
			
 
				+                uploadSuccessHandle1(res)
			
 
				+              }
			
 
				+            "
			
 
				+            class="avatar-uploader"
			
 
				+            accept=".jpg, .jpeg, .png, .gif"
			
 
				+            ><el-button size="small" type="primary">点击上传</el-button>
			
 
				+          </el-upload>
			
 
				+          <div>
			
 
				+            <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
			
 
				+          </div> -->
			
 
				+      <div class="small-title">化验数据（选填）</div>
			
 
				+      <div class="inspector">
			
 
				+        <!--质检员-->
			
 
				+        <!-- <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+          <ws-input
			
 
				+            v-model="dataList.warehouseInOutDetail.qualityInspector"
			
 
				+            placeholder="请输入质检员姓名"
			
 
				+            maxlength="120"
			
 
				+            size="small"
			
 
				+          />
			
 
				+        </ws-form-item> -->
			
 
				+           <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+            <el-select
			
 
				+              v-model="dataList.warehouseInOutDetail.qualityInspector"
			
 
				+              placeholder="请选择质检员"
			
 
				+              filterable
			
 
				+              clearable
			
 
				+               :filter-method="dataFilter"
			
 
				+              @change="qualityInspectorChange"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in qualityInspectorList"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+      </div>
			
 
				+      <div class="neifor">
			
 
				+        <ws-info-table>
			
 
				+          <!--水分（%）<=-->
			
 
				+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.waterContent"
			
 
				+              placeholder="请输入水分占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--杂质（%）<=-->
			
 
				+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.impurity"
			
 
				+              placeholder="请输入杂质占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--容重(克/升)>=-->
			
 
				+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.bulkDensity"
			
 
				+              placeholder="请输入容重"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--霉变粒（%）<=-->
			
 
				+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.mildewGrain"
			
 
				+              placeholder="请输入霉变粒占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--热损伤（%）<=-->
			
 
				+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.jiaorenli"
			
 
				+              placeholder="请输入热损伤占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--不完善粒（%）<=-->
			
 
				+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.imperfectGrain"
			
 
				+              placeholder="请输入不完善粒占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+        </ws-info-table>
			
 
				+      </div>
			
 
				+      <div style="text-align: right; padding: 10px">
			
 
				+        <!-- <el-button
			
 
				+          class="bg-bottom-up"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="temporaryStorage()"
			
 
				+          >暂存</el-button
			
 
				+        > -->
			
 
				+        <el-button
			
 
				+          class="bg-bottom-up"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="submit()"
			
 
				+          >提交</el-button
			
 
				+        >
			
 
				+      </div>
			
 
				+    </ws-form>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+import {
			
 
				+  pullDown,
			
 
				+  addstorageputList,
			
 
				+  xialaNo,
			
 
				+  getstaff,
			
 
				+  getPrintInfo
			
 
				+} from '@/model/warehouse/index'
			
 
				+import { downloadFile } from '@/utils/batchDown'
			
 
				+import Pagination from '@/components/Pagination'
			
 
				+import { mapActions, mapGetters, mapState } from 'vuex'
			
 
				+import WsUpload from '@/components/WsUpload'
			
 
				+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
			
 
				+import { dayjs, EventBus } from 'base-core-lib'
			
 
				+export default {
			
 
				+  name: 'viewSpareMoney',
			
 
				+  components: {
			
 
				+    WsUpload,
			
 
				+    Pagination,
			
 
				+  },
			
 
				+  watch: {
			
 
				+    // vesselId(val) {
			
 
				+    //   this.getList()
			
 
				+    // },
			
 
				+    isShow(val) {
			
 
				+      this.showType = val
			
 
				+    },
			
 
				+    dataList:{//深度监听，可监听到对象、数组的变化
			
 
				+         handler(val, oldVal){
			
 
				+           if(val.tare){
			
 
				+             this.dataList.netWeight = this.dataList.grossWeight - val.tare
			
 
				+           }
			
 
				+         },
			
 
				+         deep:true //true 深度监听
			
 
				+     }
			
 
				+  },
			
 
				+  computed: {
			
 
				+    ...mapGetters(['deptBudgetList']),
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      isSelectType:true,
			
 
				+      isGetCost:false,
			
 
				+      qualityInspectorList:[],
			
 
				+      //弹出框
			
 
				+      dialogViewSpareMoney: false,
			
 
				+      dialogApproveFormVisible: false,
			
 
				+      // 船舶类型
			
 
				+      monetaryKey: null,
			
 
				+      // 表格显示数据
			
 
				+      tableDate: [],
			
 
				+      // 是否显示
			
 
				+      showType: true,
			
 
				+      // 年
			
 
				+      year: '',
			
 
				+      deptBudgetTotal: 0,
			
 
				+      readonly: true,
			
 
				+      currentPage: 1,
			
 
				+      pageSize: 10,
			
 
				+      searchType: 1,
			
 
				+      searchKeyWord: '',
			
 
				+      contractType: 2,
			
 
				+      startDate: null,
			
 
				+      endDate: null,
			
 
				+      goodnameList: {},
			
 
				+      checked: true,
			
 
				+      disabled1:true,
			
 
				+      disabled2:true,
			
 
				+      staffList: [],
			
 
				+      options: [],
			
 
				+      storageType: [],
			
 
				+      deliveryType: [],
			
 
				+      outContractNo: [],
			
 
				+      outContractNo1: [],
			
 
				+      // 提交类型
			
 
				+      submitType: true,
			
 
				+      typeList:['干粮','潮粮'],
			
 
				+      appendixIdsAdd: '',
			
 
				+      uploadSuccess: {},
			
 
				+      warehouseInOutDetail: {},
			
 
				+      onChange: {},
			
 
				+      deptBudgetList1: [],
			
 
				+      gradeList: [],
			
 
				+      rules: {
			
 
				+        netWeight: [
			
 
				+          {
			
 
				+            required: true,
			
 
				+            type: 'number',
			
 
				+            message: '请输入活动名称',
			
 
				+            trigger: 'blur',
			
 
				+          },
			
 
				+        ],
			
 
				+      },
			
 
				+      size: 10,
			
 
				+      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+      deptCircularPage: {},
			
 
				+      packtypeList: {},
			
 
				+      date: {
			
 
				+        year: dayjs().format('YYYY'),
			
 
				+        month: dayjs().format('MM'),
			
 
				+      },
			
 
				+      options1: [],
			
 
				+      options2: [],
			
 
				+      carstatus:false,
			
 
				+      contractList: [],
			
 
				+      dataList: {
			
 
				+        id: '',
			
 
				+        grossWeight: '',
			
 
				+        contractNo: '',
			
 
				+        tare: '',
			
 
				+        netWeight: '',
			
 
				+        grade: '',
			
 
				+        agent: '',
			
 
				+        carNo: '',
			
 
				+        inOutDate: '',
			
 
				+        
			
 
				+        inOutType: '',
			
 
				+        goodsName: '',
			
 
				+        warehouseInOutDetail: {},
			
 
				+        cost:'',
			
 
				+        freight:0,
			
 
				+        type:'',
			
 
				+        buckleWeightRatio:'',
			
 
				+        tidalGrainWater:'',
			
 
				+        solidGrainWater:'',
			
 
				+        pureWeight:'',
			
 
				+        deductionAmount:'',
			
 
				+        deductionWeigh:'',
			
 
				+      },
			
 
				+      historyList: [],
			
 
				+      pickerBeginDateBefore: {
			
 
				+        disabledDate: (time) => {
			
 
				+          return time.getTime() > Date.now()
			
 
				+        },
			
 
				+      },
			
 
				+      accessoryTFs: false,
			
 
				+      allowEdit:true
			
 
				+    }
			
 
				+  },
			
 
				+  activated() {
			
 
				+    
			
 
				+    if(this.$route.query.allowEdit == 1){
			
 
				+      this.allowEdit = false
			
 
				+    }
			
 
				+    else{
			
 
				+      this.allowEdit = true
			
 
				+    }
			
 
				+    this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
			
 
				+    this.deptBudgetList1.binNumber = this.$route.query.binNumber
			
 
				+    this.getList()
			
 
				+    this.dataList.id = this.$route.query.id
			
 
				+    this.dataList.grossWeight = this.$route.query.grossWeight*1000
			
 
				+    this.dataList.contractNo = this.$route.query.contractNo
			
 
				+    this.dataList.baseId = this.$route.query.baseId
			
 
				+    this.dataList.positionId = this.$route.query.positionId
			
 
				+    this.dataList.warehouseName = this.$route.query.warehouseName
			
 
				+    this.dataList.binNumber = this.$route.query.binNumber
			
 
				+    this.dataList.tare = this.$route.query.tare*1000
			
 
				+    this.dataList.netWeight = this.$route.query.netWeight*1000
			
 
				+    this.dataList.grade = this.$route.query.grade
			
 
				+    this.dataList.agent = this.$route.query.agent
			
 
				+    this.dataList.carNo = this.$route.query.carNo
			
 
				+    this.dataList.inOutDate = this.$route.query.inOutDate
			
 
				+    this.dataList.contractNo = this.$route.query.contractNo
			
 
				+    this.dataList.inOutType = this.$route.query.inOutType
			
 
				+    this.dataList.compId = this.$route.query.compId
			
 
				+    this.dataList.goodsName = this.$route.query.goodsName
			
 
				+    this.dataList.goodsNameKey = Number(this.$route.query.goodsNameKey)
			
 
				+    this.dataList.inOutFlag = this.$route.inOutFlag
			
 
				+    this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
			
 
				+    this.dataList.statusFlag = this.$route.statusFlag
			
 
				+    this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
			
 
				+    this.dataList.warehouseType = this.$route.query.warehouseType
			
 
				+    this.dataList.createType = this.$route.query.createType
			
 
				+    this.dataList.temporaryOutType = this.$route.query.temporaryOutType
			
 
				+    this.dataList.cost=this.$route.query.cost
			
 
				+    this.dataList.freight=this.$route.query.freight
			
 
				+    this.dataList.type=this.$route.query.type
			
 
				+    this.dataList.buckleWeightRatio=this.$route.query.buckleWeightRatio
			
 
				+    this.dataList.tidalGrainWater=this.$route.query.tidalGrainWater
			
 
				+    this.dataList.solidGrainWater=this.$route.query.solidGrainWater
			
 
				+    this.dataList.pureWeight=this.$route.query.pureWeight*1000
			
 
				+    this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
			
 
				+    this.dataList.deductionWeight=this.$route.query.deductionWeight/1000
			
 
				+    this.dataList.inOutTypeFlag=1
			
 
				+    if(this.dataList.cost){
			
 
				+      this.isGetCost = true
			
 
				+      this.cost = this.dataList.cost 
			
 
				+    }
			
 
				+
			
 
				+  },
			
 
				+  methods: {
			
 
				+    async closePort() {
			
 
				+      console.log('closePort');
			
 
				+      this.reader.cancel()
			
 
				+    },
			
 
				+    async openPort() {
			
 
				+      console.log('openPort', navigator);
			
 
				+      if ('serial' in navigator) {
			
 
				+        // The Web Serial API is supported.
			
 
				+        console.log('the Web Serial API is supported.');
			
 
				+        console.log(this.param);
			
 
				+        const port = await navigator.serial.requestPort();
			
 
				+        await port.open({
			
 
				+          baudRate: this.param
			
 
				+        }); // set baud rate
			
 
				+        this.reader = port.readable.getReader();
			
 
				+        // 监听来自串行设备的数据
			
 
				+        while (true) {
			
 
				+          const {
			
 
				+            value,
			
 
				+            done
			
 
				+          } = await this.reader.read();
			
 
				+          // console.log("value",value);
			
 
				+          if (done) {
			
 
				+            // 允许稍后关闭串口。
			
 
				+            this.reader.releaseLock();
			
 
				+            break;
			
 
				+          }
			
 
				+          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 == '+') {
			
 
				+              flag = true
			
 
				+            }
			
 
				+            if (flag && result.length < 6 && tmp != '+') {
			
 
				+              result += tmp
			
 
				+            }
			
 
				+          }
			
 
				+          if(parseInt(result)){
			
 
				+              this.dataList.grossWeight = parseInt(result)
			
 
				+          }
			
 
				+          setTimeout(1000)
			
 
				+          // value 是一个 Uint8Array
			
 
				+        }
			
 
				+        await port.close();
			
 
				+      } else {
			
 
				+        console.log('the Web Serial API is not supported.', navigator);
			
 
				+      }
			
 
				+    },
			
 
				+    kkInput(val){
			
 
				+      console.log(val)
			
 
				+      if(this.isGetCost){
			
 
				+        if(this.dataList.cost>val){
			
 
				+           this.dataList.cost = this.cost - this.dataList.deductionAmount
			
 
				+          }
			
 
				+      }
			
 
				+    },
			
 
				+       qualityInspectorChange(e){
			
 
				+      console.log(e)
			
 
				+    },
			
 
				+    uploadSuccessHandle1(res){
			
 
				+      this.dataList.addressUrl=res.url
			
 
				+    },
			
 
				+    pureweight(status){
			
 
				+      console.log(this.dataList)
			
 
				+      if(this.dataList.netWeight&&this.dataList.tidalGrainWater&&this.dataList.solidGrainWater&&this.dataList.buckleWeightRatio){
			
 
				+        this.dataList.pureWeight=(this.dataList.netWeight*(100-(this.dataList.tidalGrainWater-this.dataList.solidGrainWater)*this.dataList.buckleWeightRatio))/100
			
 
				+      }
			
 
				+    },
			
 
				+    //返回按钮
			
 
				+    revert() {
			
 
				+      this.$router.go(-1)
			
 
				+    },
			
 
				+    carChange(e){
			
 
				+        for (let i = 0; i < this.tranCarInfoList.length; i++) {
			
 
				+          if(this.tranCarInfoList[i].carNo==this.dataList.carNo){
			
 
				+            this.dataList.tranCarNo=this.tranCarInfoList[i].tranCarNo
			
 
				+            this.dataList.freight=this.tranCarInfoList[i].tranPrice
			
 
				+          }
			
 
				+          
			
 
				+        }
			
 
				+    },
			
 
				+    typeChange(e){
			
 
				+
			
 
				+    },
			
 
				+    contractNoChange(e){
			
 
				+      for (var i = 0; i < this.outContractNo.length; i++) {
			
 
				+        if (this.outContractNo[i].contractNo == e) {
			
 
				+            if (this.outContractNo[i].inOutType == '采购入库') {
			
 
				+              this.dataList.inOutTypeKey = 1
			
 
				+            } else if (this.outContractNo[i].inOutType == '移库入库') {
			
 
				+              this.dataList.inOutTypeKey = 3
			
 
				+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
			
 
				+              this.dataList.inOutTypeKey = 4
			
 
				+            } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
			
 
				+              this.dataList.inOutTypeKey = 5
			
 
				+            } else if (this.detailData.inOutType == '退库') {
			
 
				+              this.dataList.inOutTypeKey = 6
			
 
				+            }
			
 
				+          this.dataList.goodsName = this.outContractNo[i].goodsName
			
 
				+          this.dataList.goodsNameKey = this.outContractNo[i].goodsNameKey
			
 
				+            this.cost = this.outContractNo[i].contractPrice
			
 
				+          if(this.cost){
			
 
				+            this.isGetCost = true
			
 
				+              this.dataList.cost = this.cost - this.dataList.deductionAmount
			
 
				+          }else{
			
 
				+             this.isGetCost = false
			
 
				+             this.dataList.cost = this.dataList.cost
			
 
				+          }
			
 
				+          this.dataList.inOutType = this.outContractNo[i].inOutType
			
 
				+          if(this.outContractNo[i].inOutType=='移库入库'){
			
 
				+            this.isSelectType = false
			
 
				+          }else{
			
 
				+            this.isSelectType = true
			
 
				+          }
			
 
				+          if(this.outContractNo[i].tranCarInfoList){
			
 
				+            this.options2=this.outContractNo[i].tranCarInfoList
			
 
				+            this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
			
 
				+            this.carstatus=true
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    dataFilter1(val) {
			
 
				+       console.log(val)
			
 
				+        this.dataList.contractNo = val;
			
 
				+        if (val) { //val存在
			
 
				+          this.options1 = this.outContractNo1.filter((item) => {
			
 
				+            if (!!~item.contractNo.indexOf(val) || !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())) {
			
 
				+              return true
			
 
				+            }
			
 
				+          })
			
 
				+        } else { //val为空时，还原数组
			
 
				+          this.options1 = this.outContractNo;
			
 
				+        }
			
 
				+      },
			
 
				+      dataFilter2(val) {
			
 
				+        this.dataList.carNo = val;
			
 
				+        if (val) { //val存在
			
 
				+          this.options1 = this.outContractNo1.filter((item) => {
			
 
				+            if (!!~item.carNo.indexOf(val) || !!~item.carNo.toUpperCase().indexOf(val.toUpperCase())) {
			
 
				+              return true
			
 
				+            }
			
 
				+          })
			
 
				+        } else { //val为空时，还原数组
			
 
				+          this.options2 = this.tranCarInfoList;
			
 
				+        }
			
 
				+      },
			
 
				+    dataFilter(val) {
			
 
				+      // console.log(val,"名")
			
 
				+      this.dataList.staffList = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options = this.staffList.filter((item) => {
			
 
				+          if (
			
 
				+            !!~item.staffName.indexOf(val) ||
			
 
				+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options = this.staffList
			
 
				+      }
			
 
				+    },
			
 
				+    editClick(status){
			
 
				+       this.isGetCost = false
			
 
				+      if(status==1){
			
 
				+        this.disabled1=!this.disabled1
			
 
				+      }else{
			
 
				+        this.disabled2=!this.disabled2
			
 
				+      }
			
 
				+    },
			
 
				+    selectstaff(e) {
			
 
				+      for (var i = 0; i < this.staffList.length; i++) {
			
 
				+        if (this.staffList[i].staffName == e) {
			
 
				+          this.dataList.personChargeKey = this.staffList[i].staffId
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    //暂存按钮
			
 
				+    temporaryStorage() {
			
 
				+      this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          this.$refs.dataList.validate((valid) => {
			
 
				+            if (valid) {
			
 
				+              this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.dataList.inOutFlag = 2
			
 
				+              this.dataList.statusFlag = 1
			
 
				+              let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
			
 
				+              this.dataList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
			
 
				+              addstorageputList(this.dataList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('暂存成功')
			
 
				+                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                })
			
 
				+            } else {
			
 
				+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              return false
			
 
				+            }
			
 
				+          })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    //提交按钮
			
 
				+    submit() {
			
 
				+      if (!this.dataList.goodsName) {
			
 
				+        this.$message({
			
 
				+          message: '货名不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.grossWeight) {
			
 
				+        this.$message({
			
 
				+          message: '毛重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.grossWeight <= 0 ||
			
 
				+        this.dataList.grossWeight > 300000 ||
			
 
				+        (String(this.dataList.grossWeight).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.grossWeight).length -
			
 
				+            (String(this.dataList.grossWeight).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '毛重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+
			
 
				+      if (
			
 
				+        this.dataList.tare < 0 ||
			
 
				+        this.dataList.tare > 200000 ||
			
 
				+        (String(this.dataList.tare).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.tare).length -
			
 
				+            (String(this.dataList.tare).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '皮重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      
			
 
				+      if (
			
 
				+        this.dataList.deductionWeight < 0 ||
			
 
				+        this.dataList.deductionWeight > 10000 ||
			
 
				+        (String(this.dataList.deductionWeight).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.deductionWeight).length -
			
 
				+            (String(this.dataList.deductionWeight).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣重输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.type=='潮粮'&&!this.dataList.buckleWeightRatio) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.buckleWeightRatio < 0 ||
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.buckleWeightRatio > 3 ||
			
 
				+        (this.dataList.type=='潮粮'&&String(this.dataList.buckleWeightRatio).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.buckleWeightRatio).length -
			
 
				+            (String(this.dataList.buckleWeightRatio).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.type=='潮粮'&&!this.dataList.tidalGrainWater) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.tidalGrainWater < 1 ||
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.tidalGrainWater > 40 ||
			
 
				+        (this.dataList.type=='潮粮'&&String(this.dataList.tidalGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.tidalGrainWater).length -
			
 
				+            (String(this.dataList.tidalGrainWater).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.type=='潮粮'&&!this.dataList.solidGrainWater) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.solidGrainWater < 1 ||
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.solidGrainWater > 40 ||
			
 
				+        (this.dataList.type=='潮粮'&&String(this.dataList.solidGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.solidGrainWater).length -
			
 
				+            (String(this.dataList.solidGrainWater).indexOf('.') + 1) >
			
 
				+            1)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.deductionAmount < 0 ||
			
 
				+        this.dataList.deductionAmount > 10000 ||
			
 
				+        (String(this.dataList.deductionAmount).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.deductionAmount).length -
			
 
				+            (String(this.dataList.deductionAmount).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣款输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.cost) {
			
 
				+        this.$message({
			
 
				+          message: '未获取到成本，请编辑后提交',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.cost < 0 ||
			
 
				+        this.dataList.cost > 20000 ||
			
 
				+        (String(this.dataList.cost).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.cost).length -
			
 
				+            (String(this.dataList.cost).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '成本输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.freight&&this.dataList.freight!=0) {
			
 
				+        this.$message({
			
 
				+          message: '运费不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.freight < 0 ||
			
 
				+        this.dataList.freight > 100000 ||
			
 
				+        (String(this.dataList.freight).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.freight).length -
			
 
				+            (String(this.dataList.freight).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '运费输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.agent) {
			
 
				+        this.$message({
			
 
				+          message: '经办人不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.agent.length < 2 || this.dataList.agent.length > 10) {
			
 
				+        this.$message({
			
 
				+          message: '经办人输入有误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.grade) {
			
 
				+        this.$message({
			
 
				+          message: '品级不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.inOutDate) {
			
 
				+        this.$message({
			
 
				+          message: '入库日期不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.inOutType) {
			
 
				+        this.$message({
			
 
				+          message: '入库类型不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.carNo) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.carNo.length > 7) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号输入错误,请输入7个字符之内',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.contractNo) {
			
 
				+        this.$message({
			
 
				+          message: '合同编号不能为空',
			
 
				+          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({
			
 
				+          message: '入库量大于该仓库容量！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      //自检员
			
 
				+      if (this.dataList.warehouseInOutDetail.qualityInspector) {
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.qualityInspector.length < 2 ||
			
 
				+          this.dataList.warehouseInOutDetail.qualityInspector.length > 10
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '质检员姓名长度错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      if (this.dataList.warehouseInOutDetail.waterContent) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.waterContent)) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.waterContent < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.waterContent > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.waterContent).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.waterContent).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.waterContent).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //杂质
			
 
				+      if (this.dataList.warehouseInOutDetail.impurity) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.impurity)) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.impurity < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.impurity > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.impurity).indexOf('.') !=
			
 
				+            -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.impurity).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.impurity).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //霉变
			
 
				+      if (this.dataList.warehouseInOutDetail.mildewGrain) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.mildewGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.mildewGrain < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.mildewGrain > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.mildewGrain).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //热损伤
			
 
				+      if (this.dataList.warehouseInOutDetail.jiaorenli) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.jiaorenli)) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.jiaorenli < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.jiaorenli > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.jiaorenli).indexOf('.') !=
			
 
				+            -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.jiaorenli).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.jiaorenli).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //不完善粒（%）
			
 
				+      if (this.dataList.warehouseInOutDetail.imperfectGrain) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.imperfectGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.imperfectGrain < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.imperfectGrain > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.imperfectGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.imperfectGrain).length -
			
 
				+              (String(
			
 
				+                this.dataList.warehouseInOutDetail.imperfectGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //容重
			
 
				+      if (this.dataList.warehouseInOutDetail.bulkDensity) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.bulkDensity)) {
			
 
				+          this.$message({
			
 
				+            message: '容重(克/升)非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.bulkDensity > 1000 ||
			
 
				+          this.dataList.warehouseInOutDetail.bulkDensity < 0||
			
 
				+          (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.bulkDensity).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              0)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      this.$confirm(`确定提交皮重检斤`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          this.$refs.dataList.validate((valid) => {
			
 
				+            if (valid) {
			
 
				+              this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.dataList.inOutFlag = 2
			
 
				+              this.dataList.statusFlag = 3
			
 
				+              this.dataList.grossWeight /= 1000
			
 
				+              this.dataList.tare /= 1000
			
 
				+              this.dataList.netWeight /= 1000
			
 
				+              this.dataList.pureWeight /= 1000
			
 
				+              if(!this.dataList.deductionWeight){
			
 
				+                this.dataList.deductionWeight = 0
			
 
				+              }
			
 
				+              if(!this.dataList.deductionAmount){
			
 
				+                this.dataList.deductionAmount = 0
			
 
				+              }
			
 
				+              this.dataList.deductionWeight *= 1000
			
 
				+              this.dataList.deductionAmount *= 1000
			
 
				+              addstorageputList(this.dataList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('提交成功')
			
 
				+                  this.$confirm(`是否打印磅单`, {
			
 
				+                    cancelButtonText: '取消',
			
 
				+                    confirmButtonText: '确定',
			
 
				+                    type: 'warning',
			
 
				+                  })
			
 
				+                    .then(() => {
			
 
				+                      getPrintInfo({
			
 
				+                        id: this.dataList.id
			
 
				+                      })
			
 
				+                        .toPromise()
			
 
				+                        .then((response) => {
			
 
				+                            window.open( '../../../../static/weightCheckInOut.html?type=2&tableData=' +JSON.stringify(response))
			
 
				+                        })
			
 
				+                      this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                    })
			
 
				+                    .catch(() => {
			
 
				+                      return false
			
 
				+                    })
			
 
				+                })
			
 
				+            } else {
			
 
				+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              return false
			
 
				+            }
			
 
				+          })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    //暂存按钮
			
 
				+    returnWarehouse() {
			
 
				+      this.$refs.dataList.validate((valid) => {
			
 
				+        if (valid) {
			
 
				+          this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+          this.dataList.statusFlag = 1
			
 
				+          addstorageputList(this.dataList)
			
 
				+            .toPromise()
			
 
				+            .then((response) => {
			
 
				+              this.$message.success('添加成功')
			
 
				+              this.$router.push({ path: 'warehouseManagementList' })
			
 
				+            })
			
 
				+        } else {
			
 
				+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+          return false
			
 
				+        }
			
 
				+      })
			
 
				+    },
			
 
				+    tarechange(e) {
			
 
				+      if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				+        this.dataList.netWeight = Number(
			
 
				+          this.dataList.grossWeight - this.dataList.tare
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    grossWeightchange(e) {
			
 
				+      if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				+        this.dataList.netWeight = Number(
			
 
				+          this.dataList.grossWeight - this.dataList.tare
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    selectgoodsName(e) {
			
 
				+      for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				+        if (this.goodnameList[i].constValue == e) {
			
 
				+          this.dataList.goodsNameKey = this.goodnameList[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectpackingMethod(e) {
			
 
				+      for (var i = 0; i < this.packtypeList.length; i++) {
			
 
				+        if (this.packtypeList[i].constValue == e) {
			
 
				+          this.dataList.packingMethodKey = this.packtypeList[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectstorageType(e) {
			
 
				+      for (var i = 0; i < this.storageType.length; i++) {
			
 
				+        if (this.storageType[i].constValue == e) {
			
 
				+          this.dataList.inOutTypeKey = this.storageType[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    handleClose() {
			
 
				+      this.accessoryTFs = false
			
 
				+    },
			
 
				+    handleSizeChange(val) {
			
 
				+      console.log(`每页 ${val} 条`)
			
 
				+      this.pageSize = val
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    handleCurrentChange(val) {
			
 
				+      this.currentPage = val
			
 
				+      console.log(`当前页: ${val}`)
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    getList() {
			
 
				+      // 货名
			
 
				+      pullDown({ constId: 'CON2' })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.goodnameList = response
			
 
				+        })
			
 
				+      // 品级
			
 
				+      pullDown({ constId: 'CON3' })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.gradeList = response
			
 
				+        })
			
 
				+      // 类型
			
 
				+      if (this.$route.query.warehouseType == '1') {
			
 
				+        this.storageType = []
			
 
				+        pullDown({ constId: 'CON5' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            // this.storageType = response
			
 
				+               for(let i = 0;i<response.length;i++){
			
 
				+                if(response[i].constValue=='移库入库'||response[i].constValue=='退库'){
			
 
				+                  this.storageType.push(response[i])
			
 
				+                }
			
 
				+            }
			
 
				+          })
			
 
				+      } else if (this.$route.query.warehouseType == '2') {
			
 
				+        //临时仓库入库类型
			
 
				+        pullDown({ constId: 'WARE1' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.storageType = response
			
 
				+          })
			
 
				+        //临时仓库出库类型
			
 
				+        pullDown({ constId: 'WARE2' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deliveryType = response
			
 
				+          })
			
 
				+      }
			
 
				+      //合同编号
			
 
				+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'), flag: 6 })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.options1 = response
			
 
				+          this.outContractNo = response
			
 
				+        })
			
 
				+      //合同编号2
			
 
				+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'), flag: 7 })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.outContractNo1 = response
			
 
				+        })
			
 
				+      //经办人
			
 
				+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.dataList.id })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.options = response
			
 
				+          this.qualityInspectorList = response
			
 
				+          this.staffList = response
			
 
				+          //  this.agent = response
			
 
				+        })
			
 
				+    },
			
 
				+    selecttaskType(e) {
			
 
				+      for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				+        if (this.taskTypeList[i].value == e) {
			
 
				+          this.searchType = this.taskTypeList[i].type
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    fujian(row) {
			
 
				+      if (
			
 
				+        row.receiveAttachmentPath === null ||
			
 
				+        row.receiveAttachmentPath === ''
			
 
				+      ) {
			
 
				+        EventBus.$emit(
			
 
				+          'warning',
			
 
				+          this.$t('system.noticeCircular.NoInformation')
			
 
				+        )
			
 
				+      } else {
			
 
				+        this.accessoryTFs = true
			
 
				+      }
			
 
				+      this.appendixIdss = row.receiveAttachmentPath
			
 
				+    },
			
 
				+    handleExamine(row) {
			
 
				+      this.$router.push({
			
 
				+        name: 'salesContractExamine',
			
 
				+        query: { id: row.id },
			
 
				+      })
			
 
				+    },
			
 
				+
			
 
				+    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+    handleCloe() {
			
 
				+      this.dialogViewSpareMoney = false
			
 
				+    },
			
 
				+    history(row) {
			
 
				+      console.log(row)
			
 
				+      billoperatehis({ id: row.id })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.historyList = response
			
 
				+        })
			
 
				+    },
			
 
				+
			
 
				+    async exportlist() {
			
 
				+      const { data } = await export1(
			
 
				+        {
			
 
				+          compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+          contractType: this.contractType,
			
 
				+          currentPage: this.currentPage,
			
 
				+          pageSize: this.pageSize,
			
 
				+          searchType: this.searchType,
			
 
				+          searchKeyWord: this.searchKeyWord,
			
 
				+          startDate: this.startDate,
			
 
				+          endDate: this.endDate,
			
 
				+        },
			
 
				+        {},
			
 
				+        { responseType: 'blob' }
			
 
				+      ).toPromise()
			
 
				+      downloadFile({
			
 
				+        res: data,
			
 
				+        fileName: `${
			
 
				+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
			
 
				+        }_采购合同`,
			
 
				+        type: 'xls',
			
 
				+      })
			
 
				+    },
			
 
				+
			
 
				+    // deletecontract(){},
			
 
				+    //删除
			
 
				+    approve() {},
			
 
				+    listQuery() {},
			
 
				+    total() {},
			
 
				+    clearfiltQuery() {},
			
 
				+    selectCrtDuty() {},
			
 
				+  },
			
 
				+}
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+/deep/.basicInformation {
			
 
				+  .ws-info-table {
			
 
				+    border: none;
			
 
				+  }
			
 
				+  .el-form-item {
			
 
				+    width: 33.3333%;
			
 
				+    border: none;
			
 
				+    .el-form-item__label {
			
 
				+      background: transparent;
			
 
				+      border: none;
			
 
				+    }
			
 
				+    .el-form-item__content {
			
 
				+      border: none;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+.title {
			
 
				+  position: relative;
			
 
				+  padding-left: 10px;
			
 
				+}
			
 
				+.title::before {
			
 
				+  content: '';
			
 
				+  display: inline-block;
			
 
				+  width: 5px;
			
 
				+  height: 30px;
			
 
				+  background: #5473e8;
			
 
				+  position: absolute;
			
 
				+  left: 0;
			
 
				+}
			
 
				+.el-form {
			
 
				+  padding: 0 10%;
			
 
				+}
			
 
				+.el-button--primary {
			
 
				+  background-color: #5878e8;
			
 
				+  border-color: #5878e8;
			
 
				+}
			
 
				+.el-col {
			
 
				+  background: #f6f7fc;
			
 
				+}
			
 
				+.bg-right {
			
 
				+  text-align: right;
			
 
				+  padding: 16px 20px;
			
 
				+}
			
 
				+.center {
			
 
				+  position: relative;
			
 
				+  top: 50px;
			
 
				+  width: 40%;
			
 
				+  height: 2000px;
			
 
				+  margin: 0 auto;
			
 
				+}
			
 
				+/deep/.el-form-item__label {
			
 
				+  width: 160px;
			
 
				+}
			
 
				+.inspector {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+//质检员
			
 
				+/deep/[data-v-58803672] .el-form-item__label {
			
 
				+  width: 60px;
			
 
				+}
			
 
				+[data-v-58803672] .el-form-item__label {
			
 
				+  width: 60px;
			
 
				+}
			
 
				+//选填
			
 
				+/deep/.el-form-item {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+.container {
			
 
				+  overflow: scroll;
			
 
				+  height: 120vh;
			
 
				+}
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: center;
			
 
				+}
			
 
				+.deliverydate {
			
 
				+  display: inline-block;
			
 
				+  width: 10%;
			
 
				+}
			
 
				+.center {
			
 
				+  margin-top: -60px;
			
 
				+  width: 80%;
			
 
				+}
			
 
				+//仓位
			
 
				+.position {
			
 
				+  width: 52px;
			
 
				+  height: 20px;
			
 
				+  background: #afb5cb;
			
 
				+  border-radius: 2px;
			
 
				+  font-size: 12px;
			
 
				+  font-family: PingFangSC-Medium, PingFang SC;
			
 
				+  color: #ffffff;
			
 
				+  line-height: 20px;
			
 
				+}
			
 
				+//表格文字
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: left;
			
 
				+  font-size: 14px;
			
 
				+  font-family: PingFangSC-Regular, PingFang SC;
			
 
				+  font-weight: 400;
			
 
				+  color: #8890b1;
			
 
				+  line-height: 16px;
			
 
				+}
			
 
				+//质检员
			
 
				+.inspector .el-form-item__content {
			
 
				+  text-align: left;
			
 
				+  margin-left: 0px;
			
 
				+}
			
 
				+.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;
			
 
				+}
			
 
				+//下面列表
			
 
				+.neifor {
			
 
				+  width: 80%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
			
 
				+  width: 35%;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
			
 
				+  width: 60%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+/deep/.neifor .el-input--small .el-input__inner {
			
 
				+  width: 100%;
			
 
				+}
			
 
				+.el-input__inner {
			
 
				+  width: 150px;
			
 
				+}
			
 
				+</style>
			
--- a/src/views/warehouse/warehouseManagementNoWeightOut.vue
+++ b/src/views/warehouse/warehouseManagementNoWeightOut.vue
@@ -0,0 +1,1363 @@
 
				+
			
 
				+// 完善出库信息
			
 
				+<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="revert()"
			
 
				+          ><img
			
 
				+            width="6"
			
 
				+            height="10"
			
 
				+            style="vertical-align: bottom; margin-right: 3px"
			
 
				+            src="../../../public/img/lujing.png"
			
 
				+            alt=""
			
 
				+          />返回</el-button
			
 
				+        >
			
 
				+      </el-col>
			
 
				+    </el-row>
			
 
				+
			
 
				+    <ws-form ref="dataList" :model="dataList" :rules="rules">
			
 
				+      <div class="basicInformation">
			
 
				+        <h2>
			
 
				+          {{ this.deptBudgetList1.warehouseName }}库
			
 
				+          <span class="position" v-show="this.$route.query.warehouseType == 1">
			
 
				+            {{ this.deptBudgetList1.binNumber }}仓位
			
 
				+          </span>
			
 
				+          <span v-show="this.$route.query.warehouseType == 2"> (临) </span>
			
 
				+        </h2>
			
 
				+        <div class="small-title">基本信息</div>
			
 
				+        <ws-info-table>
			
 
				+         <ws-form-item label="合同编号" span="1" prop="contractNo">
			
 
				+            <ws-select
			
 
				+              v-model="dataList.contractNo"
			
 
				+              placeholder="请选择合同编号或移库任务编号"
			
 
				+              class="typeselect"
			
 
				+              @change='contractNoChange'
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in outContractNo"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.contractNo"
			
 
				+                :value="item.contractNo"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <!-- 货名 -->
			
 
				+          <ws-form-item label="货名" span="1">
			
 
				+            <ws-select
			
 
				+            disabled
			
 
				+              v-model="dataList.goodsName"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectgoodsName"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in goodnameList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="类型" span="1" prop="type">
			
 
				+              <ws-select v-model="dataList.type"  @change="typeChange">
			
 
				+                <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
			
 
				+              </ws-select>
			
 
				+            </ws-form-item>
			
 
				+          <!--毛重（公斤）-->
			
 
				+          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="grossWeightchange"
			
 
				+              v-model="dataList.grossWeight"
			
 
				+              placeholder="请输入毛重"
			
 
				+              maxlength="20"
			
 
				+              size="small"
			
 
				+            />
			
 
				+              <el-button type="primary"  @click="openPort">重新获取</el-button>
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--皮重（公斤）-->
			
 
				+          <ws-form-item label="皮重（公斤）" span="1" prop="tare" class="readonly">
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="tarechange"
			
 
				+              v-model="dataList.tare"
			
 
				+              placeholder="请输入皮重"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--净重（公斤）-->
			
 
				+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
			
 
				+            <ws-input
			
 
				+              readonly="readonly"
			
 
				+              v-model="dataList.netWeight"
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
			
 
				+            <ws-input
			
 
				+              @input='pureweight'
			
 
				+              v-model="dataList.buckleWeightRatio"
			
 
				+              placeholder="请输入扣重比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
			
 
				+            <ws-input
			
 
				+            @input='pureweight'
			
 
				+              v-model="dataList.solidGrainWater"
			
 
				+              placeholder="请输入干粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
			
 
				+            <ws-input
			
 
				+            @input='pureweight'
			
 
				+              v-model="dataList.tidalGrainWater"
			
 
				+              placeholder="请输入潮粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='dataList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
			
 
				+            <ws-input
			
 
				+              disabled
			
 
				+              v-model="dataList.pureWeight"
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!-- 品级 -->
			
 
				+          <ws-form-item label="品级" span="1" class="readonly">
			
 
				+            <ws-select
			
 
				+              v-model="dataList.grade"
			
 
				+              placeholder=""
			
 
				+              class="typeselect"
			
 
				+              @change="selectpackingMethod"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in gradeList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <!--经办人-->
			
 
				+          <ws-form-item label="经办人" span="1" prop="agent">
			
 
				+            <el-select
			
 
				+              v-model="dataList.agent"
			
 
				+              placeholder="请选择经办人"
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter"
			
 
				+              @change="selectstaff"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <!--出库日期-->
			
 
				+          <ws-form-item
			
 
				+            label="出库日期"
			
 
				+            span="1"
			
 
				+            prop="inOutDate"
			
 
				+            class="deliverydate"
			
 
				+          >
			
 
				+            <ws-date-picker
			
 
				+              v-model="dataList.inOutDate"
			
 
				+              type="date"
			
 
				+              placeholder="请选择出库日期"
			
 
				+              value-format="yyyy-MM-dd"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!-- 出库类型 -->
			
 
				+          <ws-form-item label="出库类型" span="1">
			
 
				+            <ws-select
			
 
				+              v-model="dataList.inOutType"
			
 
				+              placeholder=""
			
 
				+              class="typeselect"
			
 
				+              @change="selectstorageType"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in deliveryType"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--车牌号-->
			
 
				+          <ws-form-item label="车牌号" span="1" prop="carNo">
			
 
				+            <ws-input
			
 
				+              v-if="!carstatus"
			
 
				+              v-model="dataList.carNo"
			
 
				+              placeholder="请输入车牌号"
			
 
				+              maxlength="20"
			
 
				+              size="small"
			
 
				+            />
			
 
				+             <el-select
			
 
				+              v-if="carstatus"
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter2"
			
 
				+              v-model="deptBudgetList.carNo"
			
 
				+              placeholder="请选择车牌号"
			
 
				+              class="typeselect"
			
 
				+              @change="carChange"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options2"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.carNo + '(' + item.tranCarNo + ')'"
			
 
				+                :value="item.carNo"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+        </ws-info-table>
			
 
				+      </div>
			
 
				+      <!-- <div class="small-title">上传磅单照片</div>
			
 
				+      <el-upload
			
 
				+            action="https://www.zthymaoyi.com/upload/admin"
			
 
				+            :show-file-list="false"
			
 
				+            :on-success="
			
 
				+              (res) => {
			
 
				+                uploadSuccessHandle1(res)
			
 
				+              }
			
 
				+            "
			
 
				+            class="avatar-uploader"
			
 
				+            accept=".jpg, .jpeg, .png, .gif"
			
 
				+            ><el-button size="small" type="primary">点击上传</el-button>
			
 
				+          </el-upload>
			
 
				+          <div v-if='dataList.addressUrl!=""'>
			
 
				+            <img style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
			
 
				+          </div> -->
			
 
				+      <div class="small-title">化验数据（选填）</div>
			
 
				+      <div class="inspector">
			
 
				+        <!--质检员-->
			
 
				+        <!-- <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+          <ws-input
			
 
				+            v-model="dataList.warehouseInOutDetail.qualityInspector"
			
 
				+            placeholder="请输入质检员姓名"
			
 
				+            maxlength="120"
			
 
				+            size="small"
			
 
				+          />
			
 
				+        </ws-form-item> -->
			
 
				+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+            <el-select
			
 
				+              v-model="dataList.warehouseInOutDetail.qualityInspector"
			
 
				+              placeholder="请选择质检员"
			
 
				+              filterable
			
 
				+              clearable
			
 
				+               :filter-method="dataFilter"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in qualityInspectorList"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+      </div>
			
 
				+      <div class="neifor">
			
 
				+        <ws-info-table>
			
 
				+          <!--水分（%）<=-->
			
 
				+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.waterContent"
			
 
				+              placeholder="请输入水分占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--杂质（%）<=-->
			
 
				+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.impurity"
			
 
				+              placeholder="请输入杂质占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--容重(克/升)>=-->
			
 
				+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.bulkDensity"
			
 
				+              placeholder="请输入容重"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--霉变粒（%）<=-->
			
 
				+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.mildewGrain"
			
 
				+              placeholder="请输入霉变粒占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--热损伤（%）<=-->
			
 
				+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.jiaorenli"
			
 
				+              placeholder="请输入热损伤占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--不完善粒（%）<=-->
			
 
				+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
			
 
				+            <ws-input
			
 
				+              v-model="dataList.warehouseInOutDetail.imperfectGrain"
			
 
				+              placeholder="请输入不完善粒占比"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+        </ws-info-table>
			
 
				+      </div>
			
 
				+      <div style="text-align: right; padding: 10px">
			
 
				+        <!-- <el-button
			
 
				+          class="bg-bottom-up"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="temporaryStorage()"
			
 
				+          >暂存</el-button
			
 
				+        > -->
			
 
				+        <el-button
			
 
				+          class="bg-bottom-up"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="submit()"
			
 
				+          >提交</el-button
			
 
				+        >
			
 
				+      </div>
			
 
				+    </ws-form>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+import {
			
 
				+  pullDown,
			
 
				+  addstorageputList,
			
 
				+  xialaNo,
			
 
				+  getstaff,
			
 
				+  getPrintInfo
			
 
				+} from '@/model/warehouse/index'
			
 
				+import { downloadFile } from '@/utils/batchDown'
			
 
				+import Pagination from '@/components/Pagination'
			
 
				+import WsUpload from '@/components/WsUpload'
			
 
				+import { mapActions, mapGetters, mapState } from 'vuex'
			
 
				+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
			
 
				+import { dayjs, EventBus } from 'base-core-lib'
			
 
				+export default {
			
 
				+  name: 'viewSpareMoney',
			
 
				+  components: {
			
 
				+    WsUpload,
			
 
				+    Pagination,
			
 
				+  },
			
 
				+  watch: {
			
 
				+    isShow(val) {
			
 
				+      this.showType = val
			
 
				+    },
			
 
				+    dataList:{//深度监听，可监听到对象、数组的变化
			
 
				+         handler(val, oldVal){
			
 
				+           if(val.grossWeight){
			
 
				+             this.dataList.netWeight = val.grossWeight - this.dataList.tare
			
 
				+           }
			
 
				+         },
			
 
				+         deep:true //true 深度监听
			
 
				+     }
			
 
				+  },
			
 
				+  computed: {
			
 
				+    ...mapGetters(['deptBudgetList']),
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      //弹出框
			
 
				+      dialogViewSpareMoney: false,
			
 
				+      dialogApproveFormVisible: false,
			
 
				+      // 船舶类型
			
 
				+      monetaryKey: null,
			
 
				+      // 表格显示数据
			
 
				+      tableDate: [],
			
 
				+      // 是否显示
			
 
				+      showType: true,
			
 
				+      // 年
			
 
				+      year: '',
			
 
				+      readonly: true,
			
 
				+      typeList:['干粮','潮粮'],
			
 
				+      qualityInspectorList:[],
			
 
				+      deptBudgetTotal: 0,
			
 
				+      currentPage: 1,
			
 
				+      pageSize: 10,
			
 
				+      searchType: 1,
			
 
				+      searchKeyWord: '',
			
 
				+      contractType: 2,
			
 
				+      startDate: null,
			
 
				+      endDate: null,
			
 
				+      goodnameList: {},
			
 
				+      tranCarInfoList:[],
			
 
				+      staffList: [],
			
 
				+      options: [],
			
 
				+      options1: [],
			
 
				+      options2: [],
			
 
				+      carstatus:false,
			
 
				+      storageType: [],
			
 
				+      deliveryType: [],
			
 
				+      outContractNo: [],
			
 
				+      // 提交类型
			
 
				+      submitType: true,
			
 
				+      storageType: [],
			
 
				+      appendixIdsAdd: '',
			
 
				+      uploadSuccess: {},
			
 
				+      onChange: {},
			
 
				+      deptBudgetList1: [],
			
 
				+      gradeList: [],
			
 
				+      rules: {
			
 
				+        netWeight: [
			
 
				+          {
			
 
				+            required: true,
			
 
				+            type: 'number',
			
 
				+            message: '请输入活动名称',
			
 
				+            trigger: 'blur',
			
 
				+          },
			
 
				+        ],
			
 
				+      },
			
 
				+      size: 10,
			
 
				+      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+      deptCircularPage: {},
			
 
				+      packtypeList: {},
			
 
				+      date: {
			
 
				+        year: dayjs().format('YYYY'),
			
 
				+        month: dayjs().format('MM'),
			
 
				+      },
			
 
				+      contractList: [],
			
 
				+      dataList: {
			
 
				+        id: '',
			
 
				+        grossWeight: '',
			
 
				+        contractNo: '',
			
 
				+        tare: '',
			
 
				+        netWeight: '',
			
 
				+        grade: '',
			
 
				+        agent: '',
			
 
				+        carNo: '',
			
 
				+        inOutDate: '',
			
 
				+        inOutType: '',
			
 
				+        goodsName: '',
			
 
				+        warehouseInOutDetail: {
			
 
				+          qualityInspector:''
			
 
				+        },
			
 
				+        cost:'',
			
 
				+        freight:0,
			
 
				+        type:'',
			
 
				+        addressUrl:'',
			
 
				+        buckleWeightRatio:'',
			
 
				+        tidalGrainWater:'',
			
 
				+        solidGrainWater:'',
			
 
				+        pureWeight:'',
			
 
				+        deductionAmount:'',
			
 
				+        deductionWeigh:'',
			
 
				+      },
			
 
				+      historyList: [],
			
 
				+
			
 
				+      pickerBeginDateBefore: {
			
 
				+        disabledDate: (time) => {
			
 
				+          return time.getTime() > Date.now()
			
 
				+        },
			
 
				+      },
			
 
				+      accessoryTFs: false,
			
 
				+      allowEdit:true
			
 
				+    }
			
 
				+  },
			
 
				+  activated() {
			
 
				+    if(this.$route.query.allowEdit == 1){
			
 
				+      this.allowEdit = false
			
 
				+    }
			
 
				+    else{
			
 
				+      this.allowEdit = true
			
 
				+    }
			
 
				+    this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
			
 
				+    this.deptBudgetList1.binNumber = this.$route.query.binNumber
			
 
				+    this.getList()
			
 
				+    this.dataList.id = this.$route.query.id
			
 
				+    this.dataList.grossWeight = this.$route.query.grossWeight*1000
			
 
				+    this.dataList.contractNo = this.$route.query.contractNo
			
 
				+    this.dataList.baseId = this.$route.query.baseId
			
 
				+    this.dataList.positionId = this.$route.query.positionId
			
 
				+    this.dataList.warehouseName = this.$route.query.warehouseName
			
 
				+    this.dataList.binNumber = this.$route.query.binNumber
			
 
				+    this.dataList.tare = this.$route.query.tare*1000
			
 
				+    this.dataList.netWeight = this.$route.query.netWeight*1000
			
 
				+    this.dataList.grade = this.$route.query.grade
			
 
				+    this.dataList.agent = this.$route.query.agent
			
 
				+    this.dataList.carNo = this.$route.query.carNo
			
 
				+    this.dataList.inOutDate = this.$route.query.inOutDate
			
 
				+    this.dataList.contractNo = this.$route.query.contractNo
			
 
				+    this.dataList.inOutType = this.$route.query.inOutType
			
 
				+    this.dataList.compId = this.$route.query.compId
			
 
				+    this.dataList.goodsName = this.$route.query.goodsName
			
 
				+    this.dataList.goodsNameKey = Number(this.$route.query.goodsNameKey)
			
 
				+    this.dataList.inOutFlag = this.$route.inOutFlag
			
 
				+    this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
			
 
				+    this.dataList.statusFlag = this.$route.statusFlag
			
 
				+    this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
			
 
				+    console.log(this.dataList)
			
 
				+  },
			
 
				+  methods: {
			
 
				+    async closePort() {
			
 
				+      console.log('closePort');
			
 
				+      this.reader.cancel()
			
 
				+    },
			
 
				+    async openPort() {
			
 
				+      console.log('openPort', navigator);
			
 
				+      if ('serial' in navigator) {
			
 
				+        // The Web Serial API is supported.
			
 
				+        console.log('the Web Serial API is supported.');
			
 
				+        console.log(this.param);
			
 
				+        const port = await navigator.serial.requestPort();
			
 
				+        await port.open({
			
 
				+          baudRate: this.param
			
 
				+        }); // set baud rate
			
 
				+        this.reader = port.readable.getReader();
			
 
				+        // 监听来自串行设备的数据
			
 
				+        while (true) {
			
 
				+          const {
			
 
				+            value,
			
 
				+            done
			
 
				+          } = await this.reader.read();
			
 
				+          // console.log("value",value);
			
 
				+          if (done) {
			
 
				+            // 允许稍后关闭串口。
			
 
				+            this.reader.releaseLock();
			
 
				+            break;
			
 
				+          }
			
 
				+          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 == '+') {
			
 
				+              flag = true
			
 
				+            }
			
 
				+            if (flag && result.length < 6 && tmp != '+') {
			
 
				+              result += tmp
			
 
				+            }
			
 
				+          }
			
 
				+          if(parseInt(result)){
			
 
				+              this.dataList.tare = parseInt(result)
			
 
				+          }
			
 
				+          setTimeout(1000)
			
 
				+          // value 是一个 Uint8Array
			
 
				+        }
			
 
				+        await port.close();
			
 
				+      } else {
			
 
				+        console.log('the Web Serial API is not supported.', navigator);
			
 
				+      }
			
 
				+    },
			
 
				+    pureweight(status){
			
 
				+      console.log(this.deptBudgetList)
			
 
				+      if(this.deptBudgetList.netWeight&&this.deptBudgetList.tidalGrainWater&&this.deptBudgetList.solidGrainWater&&this.deptBudgetList.buckleWeightRatio){
			
 
				+        this.deptBudgetList.pureWeight=(this.deptBudgetList.netWeight*(100-(this.deptBudgetList.tidalGrainWater-this.deptBudgetList.solidGrainWater)*this.deptBudgetList.buckleWeightRatio))/100
			
 
				+      }
			
 
				+    },
			
 
				+    uploadSuccessHandle1(res){
			
 
				+      this.dataList.addressUrl=res.url
			
 
				+    },
			
 
				+    //返回按钮
			
 
				+    revert() {
			
 
				+      this.$router.go(-1)
			
 
				+    },
			
 
				+    dataFilter(val) {
			
 
				+      // console.log(val,"名")
			
 
				+      this.deptBudgetList.staffList = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options = this.staffList.filter((item) => {
			
 
				+          if (
			
 
				+            !!~item.staffName.indexOf(val) ||
			
 
				+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options = this.staffList
			
 
				+      }
			
 
				+    },
			
 
				+
			
 
				+    selectstaff(e) {
			
 
				+      for (var i = 0; i < this.staffList.length; i++) {
			
 
				+        if (this.staffList[i].staffName == e) {
			
 
				+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    //暂存按钮
			
 
				+    temporaryStorage() {
			
 
				+      this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          this.$refs.dataList.validate((valid) => {
			
 
				+            if (valid) {
			
 
				+              this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.dataList.inOutFlag = 1
			
 
				+              this.dataList.statusFlag = 1
			
 
				+              addstorageputList(this.dataList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('暂存成功')
			
 
				+                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                })
			
 
				+            } else {
			
 
				+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              return false
			
 
				+            }
			
 
				+          })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    contractNoChange(e){
			
 
				+      for (var i = 0; i < this.outContractNo.length; i++) {
			
 
				+        if (this.outContractNo[i].contractNo == e) {
			
 
				+            if (this.outContractNo[i].inOutType == '销售出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 1
			
 
				+            } else if (this.outContractNo[i].inOutType == '移库出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 3
			
 
				+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 4
			
 
				+            } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 5
			
 
				+            } else if (this.detailData.inOutType == '采购出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 6
			
 
				+            }
			
 
				+          this.dataList.goodsName = this.outContractNo[i].goodsName
			
 
				+          this.dataList.goodsNameKey = this.outContractNo[i].goodsNameKey
			
 
				+          if(this.outContractNo[i].tranCarInfoList){
			
 
				+            this.options2=this.outContractNo[i].tranCarInfoList
			
 
				+            this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
			
 
				+            this.carstatus=true
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    typeChange(e){
			
 
				+
			
 
				+    },
			
 
				+    //提交按钮
			
 
				+    submit() {
			
 
				+      if (!this.dataList.goodsName) {
			
 
				+        this.$message({
			
 
				+          message: '货名不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.grossWeight) {
			
 
				+        this.$message({
			
 
				+          message: '毛重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.grossWeight <= 0 ||
			
 
				+        this.dataList.grossWeight > 200000 ||
			
 
				+        (String(this.dataList.grossWeight).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.grossWeight).length -
			
 
				+            (String(this.dataList.grossWeight).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '毛重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.tare < 0 ||
			
 
				+        this.dataList.tare > 200000 ||
			
 
				+        (String(this.dataList.tare).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.tare).length -
			
 
				+            (String(this.dataList.tare).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '皮重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.type=='潮粮'&&!this.dataList.buckleWeightRatio) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.buckleWeightRatio < 0 ||
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.buckleWeightRatio > 3 ||
			
 
				+        (this.dataList.type=='潮粮'&&String(this.dataList.buckleWeightRatio).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.buckleWeightRatio).length -
			
 
				+            (String(this.dataList.buckleWeightRatio).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.type=='潮粮'&&!this.dataList.tidalGrainWater) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.tidalGrainWater < 1 ||
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.tidalGrainWater > 40 ||
			
 
				+        (this.dataList.type=='潮粮'&&String(this.dataList.tidalGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.tidalGrainWater).length -
			
 
				+            (String(this.dataList.tidalGrainWater).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.type=='潮粮'&&!this.dataList.solidGrainWater) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.solidGrainWater < 1 ||
			
 
				+        this.dataList.type=='潮粮'&&this.dataList.solidGrainWater > 40 ||
			
 
				+        (this.dataList.type=='潮粮'&&String(this.dataList.solidGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.dataList.solidGrainWater).length -
			
 
				+            (String(this.dataList.solidGrainWater).indexOf('.') + 1) >
			
 
				+            1)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.agent) {
			
 
				+        this.$message({
			
 
				+          message: '经办人不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.agent.length < 2 || this.dataList.agent.length > 10) {
			
 
				+        this.$message({
			
 
				+          message: '经办人输入有误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.grade) {
			
 
				+        this.$message({
			
 
				+          message: '品级不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.inOutDate) {
			
 
				+        this.$message({
			
 
				+          message: '入库日期不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.inOutType) {
			
 
				+        this.$message({
			
 
				+          message: '出库类型不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.carNo) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.dataList.carNo.length > 7) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号输入错误,请输入7个字符之内',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.dataList.contractNo) {
			
 
				+        this.$message({
			
 
				+          message: '合同编号不能为空',
			
 
				+          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({
			
 
				+          message: '入库量大于该仓库容量！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      //自检员
			
 
				+      if (this.dataList.warehouseInOutDetail.qualityInspector) {
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.qualityInspector.length < 2 ||
			
 
				+          this.dataList.warehouseInOutDetail.qualityInspector.length > 10
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '质检员姓名长度错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      if (this.dataList.warehouseInOutDetail.waterContent) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.waterContent)) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.waterContent < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.waterContent > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.waterContent).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.waterContent).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.waterContent).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //杂质
			
 
				+      if (this.dataList.warehouseInOutDetail.impurity) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.impurity)) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.impurity < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.impurity > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.impurity).indexOf('.') !=
			
 
				+            -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.impurity).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.impurity).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //霉变
			
 
				+      if (this.dataList.warehouseInOutDetail.mildewGrain) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.mildewGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.mildewGrain < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.mildewGrain > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.mildewGrain).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //热损伤
			
 
				+      if (this.dataList.warehouseInOutDetail.jiaorenli) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.jiaorenli)) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.jiaorenli < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.jiaorenli > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.jiaorenli).indexOf('.') !=
			
 
				+            -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.jiaorenli).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.jiaorenli).indexOf(
			
 
				+                '.'
			
 
				+              ) +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //不完善粒（%）
			
 
				+      if (this.dataList.warehouseInOutDetail.imperfectGrain) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.imperfectGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.dataList.warehouseInOutDetail.imperfectGrain < 1 ||
			
 
				+          this.dataList.warehouseInOutDetail.imperfectGrain > 40 ||
			
 
				+          (String(this.dataList.warehouseInOutDetail.imperfectGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.imperfectGrain).length -
			
 
				+              (String(
			
 
				+                this.dataList.warehouseInOutDetail.imperfectGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //容重
			
 
				+      if (this.dataList.warehouseInOutDetail.bulkDensity) {
			
 
				+        if (isNaN(this.dataList.warehouseInOutDetail.bulkDensity)) {
			
 
				+          this.$message({
			
 
				+            message: '容重(克/升)非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          (this.dataList.warehouseInOutDetail.bulkDensity &&
			
 
				+            String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
			
 
				+            String(this.dataList.warehouseInOutDetail.bulkDensity).length -
			
 
				+              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
			
 
				+              2) || this.dataList.warehouseInOutDetail.bulkDensity > 1000 || this.dataList.warehouseInOutDetail.bulkDensity < 0
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '容重输入错误',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      this.$confirm(`确定提交毛重检斤`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          this.$refs.dataList.validate((valid) => {
			
 
				+            if (valid) {
			
 
				+              this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.dataList.inOutFlag = 1
			
 
				+              this.dataList.statusFlag = 3
			
 
				+              this.dataList.grossWeight /= 1000
			
 
				+              this.dataList.tare /= 1000
			
 
				+              this.dataList.netWeight /= 1000
			
 
				+              this.dataList.pureWeight /= 1000
			
 
				+              addstorageputList(this.dataList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('提交成功')
			
 
				+                  this.$confirm(`是否打印磅单`, {
			
 
				+                    cancelButtonText: '取消',
			
 
				+                    confirmButtonText: '确定',
			
 
				+                    type: 'warning',
			
 
				+                  })
			
 
				+                    .then(() => {
			
 
				+                      getPrintInfo({
			
 
				+                        id: this.dataList.id
			
 
				+                      })
			
 
				+                        .toPromise()
			
 
				+                        .then((response) => {
			
 
				+                            window.open( '../../../../static/weightCheckInOut.html?type=2&tableData=' +JSON.stringify(response))
			
 
				+                        })
			
 
				+                      this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                    })
			
 
				+                    .catch(() => {
			
 
				+                      return false
			
 
				+                    })
			
 
				+                })
			
 
				+            } else {
			
 
				+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              return false
			
 
				+            }
			
 
				+          })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+      
			
 
				+    },
			
 
				+    tarechange(e) {
			
 
				+      if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				+        this.dataList.netWeight = Number(
			
 
				+          this.dataList.grossWeight - this.dataList.tare
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    grossWeightchange(e) {
			
 
				+      if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				+        this.dataList.netWeight = Number(
			
 
				+          this.dataList.grossWeight - this.dataList.tare
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    selectgoodsName(e) {
			
 
				+      for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				+        if (this.goodnameList[i].constValue == e) {
			
 
				+          this.dataList.goodsNameKey = this.goodnameList[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectpackingMethod(e) {
			
 
				+      for (var i = 0; i < this.packtypeList.length; i++) {
			
 
				+        if (this.packtypeList[i].constValue == e) {
			
 
				+          this.dataList.packingMethodKey = this.packtypeList[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectstorageType(e) {
			
 
				+      for (var i = 0; i < this.deliveryType.length; i++) {
			
 
				+        if (this.deliveryType[i].constValue == e) {
			
 
				+          this.dataList.inOutTypeKey = this.deliveryType[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    handleClose() {
			
 
				+      this.accessoryTFs = false
			
 
				+    },
			
 
				+    handleSizeChange(val) {
			
 
				+      console.log(`每页 ${val} 条`)
			
 
				+      this.pageSize = val
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    handleCurrentChange(val) {
			
 
				+      this.currentPage = val
			
 
				+      console.log(`当前页: ${val}`)
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    getList() {
			
 
				+      // 货名
			
 
				+      pullDown({ constId: 'CON2' })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.goodnameList = response
			
 
				+        })
			
 
				+      // 品级
			
 
				+      pullDown({ constId: 'CON3' })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.gradeList = response
			
 
				+        })
			
 
				+      // 类型
			
 
				+      if (this.$route.query.warehouseType == '1') {
			
 
				+        pullDown({ constId: 'CON6' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deliveryType = response
			
 
				+          })
			
 
				+      } else if (this.$route.query.warehouseType == '2') {
			
 
				+        //临时仓库出库类型
			
 
				+        pullDown({ constId: 'WARE2' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deliveryType = response
			
 
				+          })
			
 
				+      }
			
 
				+      //合同编号
			
 
				+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'),flag:5 })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.outContractNo = response
			
 
				+        })
			
 
				+      //经办人
			
 
				+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.dataList.baseId })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.options = response
			
 
				+          this.qualityInspectorList = response
			
 
				+          this.staffList = response
			
 
				+          //  this.agent = response
			
 
				+        })
			
 
				+    },
			
 
				+    selecttaskType(e) {
			
 
				+      for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				+        if (this.taskTypeList[i].value == e) {
			
 
				+          this.searchType = this.taskTypeList[i].type
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    fujian(row) {
			
 
				+      if (
			
 
				+        row.receiveAttachmentPath === null ||
			
 
				+        row.receiveAttachmentPath === ''
			
 
				+      ) {
			
 
				+        EventBus.$emit(
			
 
				+          'warning',
			
 
				+          this.$t('system.noticeCircular.NoInformation')
			
 
				+        )
			
 
				+      } else {
			
 
				+        this.accessoryTFs = true
			
 
				+      }
			
 
				+      this.appendixIdss = row.receiveAttachmentPath
			
 
				+    },
			
 
				+    handleExamine(row) {
			
 
				+      this.$router.push({
			
 
				+        name: 'salesContractExamine',
			
 
				+        query: { id: row.id },
			
 
				+      })
			
 
				+    },
			
 
				+
			
 
				+    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+    handleCloe() {
			
 
				+      this.dialogViewSpareMoney = false
			
 
				+    },
			
 
				+    history(row) {
			
 
				+      console.log(row)
			
 
				+      billoperatehis({ id: row.id })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.historyList = response
			
 
				+        })
			
 
				+    },
			
 
				+    //删除
			
 
				+    approve() {},
			
 
				+    listQuery() {},
			
 
				+    total() {},
			
 
				+    clearfiltQuery() {},
			
 
				+    selectCrtDuty() {},
			
 
				+  },
			
 
				+}
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+/deep/.basicInformation {
			
 
				+  .ws-info-table {
			
 
				+    border: none;
			
 
				+  }
			
 
				+  .el-form-item {
			
 
				+    width: 33.3333%;
			
 
				+    border: none;
			
 
				+    .el-form-item__label {
			
 
				+      background: transparent;
			
 
				+      border: none;
			
 
				+    }
			
 
				+    .el-form-item__content {
			
 
				+      border: none;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+.title {
			
 
				+  position: relative;
			
 
				+  padding-left: 10px;
			
 
				+}
			
 
				+.title::before {
			
 
				+  content: '';
			
 
				+  display: inline-block;
			
 
				+  width: 5px;
			
 
				+  height: 30px;
			
 
				+  background: #5473e8;
			
 
				+  position: absolute;
			
 
				+  left: 0;
			
 
				+}
			
 
				+.el-form {
			
 
				+  padding: 0 10%;
			
 
				+}
			
 
				+.el-button--primary {
			
 
				+  background-color: #5878e8;
			
 
				+  border-color: #5878e8;
			
 
				+}
			
 
				+.el-col {
			
 
				+  background: #f6f7fc;
			
 
				+}
			
 
				+.bg-right {
			
 
				+  text-align: right;
			
 
				+  padding: 16px 20px;
			
 
				+}
			
 
				+.center {
			
 
				+  position: relative;
			
 
				+  top: 50px;
			
 
				+  width: 40%;
			
 
				+  height: 2000px;
			
 
				+  margin: 0 auto;
			
 
				+}
			
 
				+/deep/.el-form-item__label {
			
 
				+  width: 160px;
			
 
				+}
			
 
				+//选填
			
 
				+/deep/.el-form-item {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+.container {
			
 
				+  overflow: scroll;
			
 
				+  height: 120vh;
			
 
				+}
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: center;
			
 
				+}
			
 
				+.deliverydate {
			
 
				+  display: inline-block;
			
 
				+  width: 10%;
			
 
				+}
			
 
				+.center {
			
 
				+  margin-top: -60px;
			
 
				+  width: 80%;
			
 
				+}
			
 
				+//仓位
			
 
				+.position {
			
 
				+  width: 52px;
			
 
				+  height: 20px;
			
 
				+  background: #afb5cb;
			
 
				+  border-radius: 2px;
			
 
				+  font-size: 12px;
			
 
				+  font-family: PingFangSC-Medium, PingFang SC;
			
 
				+  color: #ffffff;
			
 
				+  line-height: 20px;
			
 
				+}
			
 
				+//表格文字
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: left;
			
 
				+  font-size: 14px;
			
 
				+  font-family: PingFangSC-Regular, PingFang SC;
			
 
				+  font-weight: 400;
			
 
				+  color: #8890b1;
			
 
				+  line-height: 16px;
			
 
				+}
			
 
				+.inspector {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+//质检员
			
 
				+.inspector .el-form-item__content {
			
 
				+  text-align: left;
			
 
				+  margin-left: 0px;
			
 
				+}
			
 
				+/deep/[data-v-d228e17e] .el-form-item__label {
			
 
				+  width: 60px;
			
 
				+}
			
 
				+.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;
			
 
				+}
			
 
				+//下面列表
			
 
				+.neifor {
			
 
				+  width: 80%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
			
 
				+  width: 35%;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
			
 
				+  width: 60%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+/deep/.neifor .el-input--small .el-input__inner {
			
 
				+  width: 100%;
			
 
				+}
			
 
				+.el-input__inner {
			
 
				+  width: 150px;
			
 
				+}
			
 
				+</style>
			
--- a/src/views/warehouse/warehouseManagementPerfectput.vue
+++ b/src/views/warehouse/warehouseManagementPerfectput.vue
@@ -1208,8 +1208,8 @@ export default {
 
				           return
			
 
				         }
			
 
				         if (
			
 
				-          this.dataList.warehouseInOutDetail.bulkDensity < 1 ||
			
 
				-          this.dataList.warehouseInOutDetail.bulkDensity > 40 ||
			
 
				+          this.dataList.warehouseInOutDetail.bulkDensity > 1000 ||
			
 
				+          this.dataList.warehouseInOutDetail.bulkDensity < 0||
			
 
				           (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
			
 
				             '.'
			
 
				           ) != -1 &&
			
--- a/src/views/warehouse/warehouseManagementPut.vue
+++ b/src/views/warehouse/warehouseManagementPut.vue
@@ -1762,7 +1762,7 @@ export default {
 
				               this.deptBudgetList.inOutFlag = 2
			
 
				               this.deptBudgetList.statusFlag = 1
			
 
				               let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
			
 
				-                this.dataList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
			
 
				+                this.deptBudgetList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
			
 
				               addstorageputList(this.deptBudgetList)
			
 
				                 .toPromise()
			
 
				                 .then((response) => {
			
--- a/src/views/warehouse/warehouseManagementPutOutLook.vue
+++ b/src/views/warehouse/warehouseManagementPutOutLook.vue
@@ -10,7 +10,7 @@
 
				           class="bg-bottom"
			
 
				           type="primary"
			
 
				           size="small"
			
 
				-          @click="returnsales()"
			
 
				+          @click="revert()"
			
 
				           ><img
			
 
				             width="6"
			
 
				             height="10"
			
@@ -224,7 +224,7 @@
 
				       
			
 
				     <!-- 关闭 -->
			
 
				     <div style="text-align: right; padding: 10px" class="center">
			
 
				-      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
			
 
				+      <el-button class="bg-bottom" type="primary" size="small" @click="revert()"
			
 
				         >关闭</el-button
			
 
				       >
			
 
				     </div>
			
@@ -349,9 +349,9 @@ export default {
 
				       this.$router.go(-1)
			
 
				       
			
 
				     },
			
 
				-    returnsales() {
			
 
				-      this.$router.push({ path: 'warehouseManagementPutOut' })
			
 
				-    },
			
 
				+    // returnsales() {
			
 
				+    //   this.$router.push({ path: 'warehouseManagementPutOut' })
			
 
				+    // },
			
 
				 
			
 
				     // 获取当前年月日
			
 
				     getdate() {
			
--- a/src/views/warehouse/warehouseManagementRecord.vue
+++ b/src/views/warehouse/warehouseManagementRecord.vue
@@ -129,14 +129,12 @@
 
				 					</el-table-column>
			
 
				 					<el-table-column prop="backOffice" label="操作人" width="120px">
			
 
				 					</el-table-column>
			
 
				-					<el-table-column prop="addressUrl" label="附件" width="50px">
			
 
				+					<el-table-column prop="addressUrl" label="操作" width="100px">
			
 
				 						<template slot-scope="scope">
			
 
				-							<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
			
 
				-								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
			
 
				-							<!-- <span v-if="scope.row.addressUrlArray.length > 0">{{
			
 
				-                scope.row.addressUrlArray.length
			
 
				-              }}</span> -->
			
 
				-							<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
			
 
				+							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
			
 
				+								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
			
 
				+          					<el-button @click="print(scope.row)"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
			
 
				+
			
 
				 						</template>
			
 
				 					</el-table-column>
			
 
				 					<el-table-column prop="createDate" label="录入时间">
			
@@ -262,7 +260,8 @@
 
				 <script>
			
 
				 	import {
			
 
				 		addselectinfoList,
			
 
				-		recordss
			
 
				+		recordss,
			
 
				+		getPrintInfo
			
 
				 	} from '@/model/warehouse/index'
			
 
				 	import {
			
 
				 		downloadFile
			
@@ -355,7 +354,15 @@
 
				 			this.showType = this.isShow
			
 
				 		},
			
 
				 		methods: {
			
 
				-
			
 
				+			print(row){
			
 
				+				getPrintInfo({
			
 
				+                        id: row.id
			
 
				+                      })
			
 
				+                        .toPromise()
			
 
				+                        .then((response) => {
			
 
				+                            window.open( '../../../../static/weightCheckInOut.html?type=2&tableData=' +JSON.stringify(response))
			
 
				+                        })
			
 
				+			},
			
 
				 			//返回按钮
			
 
				 			returnWarehouse() {
			
 
				 				this.$router.push({
			
--- a/src/views/warehouse/warehouseManagementTare.vue
+++ b/src/views/warehouse/warehouseManagementTare.vue
@@ -0,0 +1,1634 @@
 
				+// 出库登记
			
 
				+<template>
			
 
				+  <div class="container">
			
 
				+    <el-row>
			
 
				+      <el-col :span="20">
			
 
				+        <h2 class="bg-left title">{{information}}</h2>
			
 
				+      </el-col>
			
 
				+      <el-col :span="4" class="bg-right">
			
 
				+        <el-button
			
 
				+          class="bg-bottom"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="revert()"
			
 
				+          ><img
			
 
				+            width="6"
			
 
				+            height="10"
			
 
				+            style="vertical-align: bottom; margin-right: 3px"
			
 
				+            src="../../../public/img/lujing.png"
			
 
				+            alt=""
			
 
				+          />返回</el-button
			
 
				+        >
			
 
				+      </el-col>
			
 
				+    </el-row>
			
 
				+    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
			
 
				+      <div class="basicInformation">
			
 
				+        <h2>
			
 
				+          {{ deptBudgetList.warehouseName }}
			
 
				+          <span
			
 
				+            class="position"
			
 
				+            v-show="this.deptBudgetList.warehouseType == 1"
			
 
				+          >
			
 
				+            {{ deptBudgetList.binNumber }}仓位
			
 
				+          </span>
			
 
				+          <span v-show="this.deptBudgetList.warehouseType == 2">(临)</span>
			
 
				+        </h2>
			
 
				+        <div class="small-title">基本信息</div>
			
 
				+        <ws-info-table>
			
 
				+          <ws-form-item label="合同编号" span="1" prop="contractNo">
			
 
				+            <ws-select
			
 
				+              v-model="deptBudgetList.contractNo"
			
 
				+              placeholder="请选择合同编号或移库任务编号"
			
 
				+              class="typeselect"
			
 
				+              @change='contractNoChange'
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in outContractNo"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.contractNo"
			
 
				+                :value="item.contractNo"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <!-- 货名 -->
			
 
				+          <ws-form-item label="货名" span="1">
			
 
				+            <ws-select
			
 
				+            disabled
			
 
				+              v-model="deptBudgetList.goodsName"
			
 
				+              placeholder
			
 
				+              class="typeselect"
			
 
				+              @change="selectgoodsName"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in goodnameList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="类型" span="1" prop="type">
			
 
				+              <ws-select v-model="deptBudgetList.type"  @change="typeChange">
			
 
				+                <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
			
 
				+              </ws-select>
			
 
				+            </ws-form-item>
			
 
				+          <!--毛重（公斤）-->
			
 
				+          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="grossWeightchange"
			
 
				+              v-model="deptBudgetList.grossWeight"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              placeholder="请输入毛重"
			
 
				+              maxlength="20"
			
 
				+              size="small"
			
 
				+            />
			
 
				+              <el-button type="primary" v-if="information == '毛重检斤'" @click="openPort">重新获取</el-button>
			
 
				+          </ws-form-item>
			
 
				+
			
 
				+          <!--皮重（公斤）-->
			
 
				+          <ws-form-item label="皮重（公斤）" span="1" prop="tare" class="readonly">
			
 
				+            <ws-input
			
 
				+              :disabled="allowEdit"
			
 
				+              @input="tarechange"
			
 
				+              v-model="deptBudgetList.tare"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              placeholder="请输入皮重"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+              <el-button type="primary" v-if="information == '皮重检斤'" @click="openPort">重新获取</el-button>
			
 
				+          </ws-form-item>
			
 
				+          <!--净重（公斤）-->
			
 
				+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
			
 
				+            <ws-input
			
 
				+              disabled
			
 
				+              v-model="deptBudgetList.netWeight"
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
			
 
				+            <ws-input
			
 
				+              @input='pureweight'
			
 
				+              v-model="deptBudgetList.buckleWeightRatio"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              placeholder="请输入扣重比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
			
 
				+            <ws-input
			
 
				+            @input='pureweight'
			
 
				+              v-model="deptBudgetList.solidGrainWater"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              placeholder="请输入干粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
			
 
				+            <ws-input
			
 
				+            @input='pureweight'
			
 
				+              v-model="deptBudgetList.tidalGrainWater"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              placeholder="请输入潮粮水分占比"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
			
 
				+            <ws-input
			
 
				+              disabled
			
 
				+              v-model="deptBudgetList.pureWeight"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              placeholder="不可编辑，自动计算"
			
 
				+              maxlength="100"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!-- 品级 -->
			
 
				+          <ws-form-item label="品级" span="1" class="readonly">
			
 
				+            <ws-select
			
 
				+              v-model="deptBudgetList.grade"
			
 
				+              placeholder=""
			
 
				+              class="typeselect"
			
 
				+              @change="selectpackingMethod"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in gradeList"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select>
			
 
				+          </ws-form-item>
			
 
				+          <!--经办人-->
			
 
				+          <ws-form-item label="经办人" span="1" prop="agent">
			
 
				+           <el-select
			
 
				+              v-model="deptBudgetList.agent"
			
 
				+              placeholder="请选择经办人"
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter"
			
 
				+              @change="selectstaff"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+          <!--出库日期-->
			
 
				+          <ws-form-item
			
 
				+            label="出库日期"
			
 
				+            span="1"
			
 
				+            prop="inOutDate"
			
 
				+            class="deliverydate"
			
 
				+          >
			
 
				+            <ws-date-picker
			
 
				+              v-model="deptBudgetList.inOutDate"
			
 
				+              type="date"
			
 
				+              placeholder="请选择出库日期"
			
 
				+              value-format="yyyy-MM-dd"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!-- 出库类型 -->
			
 
				+          <ws-form-item label="出库类型" span="1">
			
 
				+            <ws-input v-model='deptBudgetList.inOutType' class="right-bottom" :disabled="isSelectType" placeholder='暂无' />
			
 
				+            <!-- <ws-select
			
 
				+              v-model="deptBudgetList.deliveryType"
			
 
				+              placeholder=""
			
 
				+              class="typeselect"
			
 
				+              @change="selectstorageType"
			
 
				+            >
			
 
				+              <ws-option
			
 
				+                v-for="item in deliveryType"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.constValue"
			
 
				+                :value="item.constValue"
			
 
				+              />
			
 
				+            </ws-select> -->
			
 
				+          </ws-form-item>
			
 
				+          <!--车牌号-->
			
 
				+         <ws-form-item label="车牌号" span="1" prop="carNo">
			
 
				+            <ws-input
			
 
				+              v-if="!carstatus"
			
 
				+              v-model="deptBudgetList.carNo"
			
 
				+              placeholder="请输入车牌号"
			
 
				+              maxlength="7"
			
 
				+              size="small"
			
 
				+            />
			
 
				+            <el-select
			
 
				+              v-if="carstatus"
			
 
				+              filterable
			
 
				+              :filter-method="dataFilter2"
			
 
				+              v-model="deptBudgetList.carNo"
			
 
				+              placeholder="请选择车牌号"
			
 
				+              class="typeselect"
			
 
				+              @change="carChange"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in options2"
			
 
				+                :key="item.constKey"
			
 
				+                :label="item.carNo + '(' + item.tranCarNo + ')'"
			
 
				+                :value="item.carNo"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+        </ws-info-table>
			
 
				+      </div>
			
 
				+      <div class="small-title">上传磅单照片</div>
			
 
				+      <el-upload
			
 
				+            action="https://www.zthymaoyi.com/upload/admin"
			
 
				+            :show-file-list="false"
			
 
				+            :on-success="
			
 
				+              (res) => {
			
 
				+                uploadSuccessHandle1(res)
			
 
				+              }
			
 
				+            "
			
 
				+            class="avatar-uploader"
			
 
				+            accept=".jpg, .jpeg, .png, .gif"
			
 
				+            ><el-button size="small" type="primary">点击上传</el-button>
			
 
				+          </el-upload>
			
 
				+          <div v-if='deptBudgetList.addressUrl!=""'>
			
 
				+            <img style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
			
 
				+          </div>
			
 
				+      <div class="small-title">化验数据（选填）</div>
			
 
				+      <div class="inspector">
			
 
				+        <!--自检员-->
			
 
				+        <!-- <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+          <ws-input
			
 
				+            v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
			
 
				+            placeholder="请输入质检员姓名"
			
 
				+            maxlength="120"
			
 
				+            size="small"
			
 
				+          />
			
 
				+        </ws-form-item> -->
			
 
				+             <ws-form-item label="质检员" span="1" prop="qualityInspector">
			
 
				+            <el-select
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
			
 
				+              placeholder="请选择质检员"
			
 
				+              filterable
			
 
				+              clearable
			
 
				+              @change="qualityInspectorChange"
			
 
				+            >
			
 
				+              <el-option
			
 
				+                v-for="item in qualityInspectorList"
			
 
				+                :key="item.value"
			
 
				+                :label="item.staffName"
			
 
				+                :value="item.staffName"
			
 
				+              />
			
 
				+            </el-select>
			
 
				+          </ws-form-item>
			
 
				+      </div>
			
 
				+      <div class="neifor">
			
 
				+        <ws-info-table>
			
 
				+          <!--水分（%）<=-->
			
 
				+          <ws-form-item label="水分（%）" span="1" prop="waterContent">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.waterContent"
			
 
				+              placeholder="请输入水分占比"
			
 
				+              maxlength="120"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--杂质（%）<=-->
			
 
				+          <ws-form-item label="杂质（%）" span="1" prop="impurity">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.impurity"
			
 
				+              placeholder="请输入杂质占比"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--容重(克/升)>=-->
			
 
				+          <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
			
 
				+              placeholder="请输入容重"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--霉变粒（%）<=-->
			
 
				+          <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
			
 
				+              placeholder="请输入霉变粒占比"
			
 
				+              maxlength="120"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--热损伤（%）<=-->
			
 
				+          <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
			
 
				+              placeholder="请输入热损伤占比"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+          <!--不完善粒（%）<=-->
			
 
				+          <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
			
 
				+            <ws-input
			
 
				+              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
			
 
				+              placeholder="请输入不完善粒占比"
			
 
				+              type="number" @mousewheel.native.prevent
			
 
				+              maxlength="120"
			
 
				+              size="small"
			
 
				+            />
			
 
				+          </ws-form-item>
			
 
				+        </ws-info-table>
			
 
				+      </div>
			
 
				+      <div style="text-align: right; padding: 10px">
			
 
				+        <el-button v-if="information == '皮重检斤'" class="bg-bottom-up" size="small" @click="temporaryStorage()"
			
 
				+          >保存</el-button
			
 
				+        >
			
 
				+        <el-button
			
 
				+        v-else
			
 
				+          class="bg-bottom-up"
			
 
				+          type="primary"
			
 
				+          size="small"
			
 
				+          @click="submit()"
			
 
				+          >提交</el-button
			
 
				+        >
			
 
				+      </div>
			
 
				+    </ws-form>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+import {
			
 
				+  pullDown,
			
 
				+  addstorageputList,
			
 
				+  goodsname,
			
 
				+  xialaNo,
			
 
				+  getstaff,
			
 
				+  goodsnameXiala,
			
 
				+} from '@/model/warehouse/index'
			
 
				+import Pagination from '@/components/Pagination'
			
 
				+import WsUpload from '@/components/WsUpload'
			
 
				+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
			
 
				+import { dayjs, EventBus } from 'base-core-lib'
			
 
				+export default {
			
 
				+  name: 'viewSpareMoney',
			
 
				+  components: {
			
 
				+    WsUpload,
			
 
				+    Pagination,
			
 
				+  },
			
 
				+  watch: {
			
 
				+    isShow(val) {
			
 
				+      this.showType = val
			
 
				+    },
			
 
				+  },
			
 
				+  data() {
			
 
				+    return {
			
 
				+      isSelectType:true,
			
 
				+       carstatus: false,
			
 
				+       qualityInspectorList:[],
			
 
				+      //弹出框
			
 
				+      dialogViewSpareMoney: false,
			
 
				+      dialogApproveFormVisible: false,
			
 
				+      // 船舶类型
			
 
				+      monetaryKey: null,
			
 
				+      // 表格显示数据
			
 
				+      tableDate: [],
			
 
				+      // 是否显示
			
 
				+      showType: true,
			
 
				+      readonly: true,
			
 
				+      // 年
			
 
				+      year: '',
			
 
				+      deptBudgetTotal: 0,
			
 
				+      currentPage: 1,
			
 
				+      pageSize: 10,
			
 
				+      searchType: 1,
			
 
				+      searchKeyWord: '',
			
 
				+      contractType: 2,
			
 
				+      startDate: null,
			
 
				+      endDate: null,
			
 
				+      goodnameList: {},
			
 
				+      // 提交类型
			
 
				+      submitType: true,
			
 
				+      deliveryType: [],
			
 
				+      typeList:['干粮','潮粮'],
			
 
				+      outContractNo: [],
			
 
				+      appendixIdsAdd: '',
			
 
				+      uploadSuccess: {},
			
 
				+      gradeList: [],
			
 
				+      agent: [],
			
 
				+       staffList: [],
			
 
				+      options: [],
			
 
				+      value:'',
			
 
				+      rules: {
			
 
				+        netWeight: [
			
 
				+          {
			
 
				+            required: true,
			
 
				+            type: 'number',
			
 
				+            message: '请输入活动名称',
			
 
				+            trigger: 'blur',
			
 
				+          },
			
 
				+        ],
			
 
				+      },
			
 
				+      size: 10,
			
 
				+      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+      deptCircularPage: {},
			
 
				+      packtypeList: {},
			
 
				+      date: {
			
 
				+        year: dayjs().format('YYYY'),
			
 
				+        month: dayjs().format('MM'),
			
 
				+      },
			
 
				+      contractList: [],
			
 
				+      deptBudgetList: {
			
 
				+        type:'干粮',
			
 
				+        addressUrl:'',
			
 
				+        warehouseInOutDetail: {},
			
 
				+      },
			
 
				+      historyList: [],
			
 
				+
			
 
				+      pickerBeginDateBefore: {
			
 
				+        disabledDate: (time) => {
			
 
				+          return time.getTime() > Date.now()
			
 
				+        },
			
 
				+      },
			
 
				+      accessoryTFs: false,
			
 
				+      allowEdit: true,
			
 
				+      information:''
			
 
				+    }
			
 
				+  },
			
 
				+  mounted() {
			
 
				+    this.information = this.$route.query.information
			
 
				+    if(this.$route.query.allowEdit == 1){
			
 
				+      this.allowEdit = false
			
 
				+    }
			
 
				+    else{
			
 
				+      this.allowEdit = true
			
 
				+    }
			
 
				+    this.deptBudgetList.baseId = this.$route.query.baseId
			
 
				+    this.deptBudgetList.positionId = this.$route.query.positionId
			
 
				+    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
			
 
				+    this.deptBudgetList.binNumber = this.$route.query.binNumber
			
 
				+    this.deptBudgetList.warehouseType = this.$route.query.warehouseType
			
 
				+    this.deptBudgetList.warehouseId = this.$route.query.warehouseId
			
 
				+    this.getList()
			
 
				+  
			
 
				+  },
			
 
				+  methods: {
			
 
				+    async closePort() {
			
 
				+      console.log('closePort');
			
 
				+      this.reader.cancel()
			
 
				+    },
			
 
				+    async openPort() {
			
 
				+      console.log('openPort', navigator);
			
 
				+      if ('serial' in navigator) {
			
 
				+        // The Web Serial API is supported.
			
 
				+        console.log('the Web Serial API is supported.');
			
 
				+        console.log(this.param);
			
 
				+        const port = await navigator.serial.requestPort();
			
 
				+        await port.open({
			
 
				+          baudRate: this.param
			
 
				+        }); // set baud rate
			
 
				+        this.reader = port.readable.getReader();
			
 
				+        // 监听来自串行设备的数据
			
 
				+        while (true) {
			
 
				+          const {
			
 
				+            value,
			
 
				+            done
			
 
				+          } = await this.reader.read();
			
 
				+          // console.log("value",value);
			
 
				+          if (done) {
			
 
				+            // 允许稍后关闭串口。
			
 
				+            this.reader.releaseLock();
			
 
				+            break;
			
 
				+          }
			
 
				+          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 == '+') {
			
 
				+              flag = true
			
 
				+            }
			
 
				+            if (flag && result.length < 6 && tmp != '+') {
			
 
				+              result += tmp
			
 
				+            }
			
 
				+          }
			
 
				+          if (this.information != '毛重检斤') {
			
 
				+            if(parseInt(result)){
			
 
				+              this.deptBudgetList.grossWeight = parseInt(result)
			
 
				+            }
			
 
				+          } else {
			
 
				+            if(parseInt(result)){
			
 
				+              this.deptBudgetList.tare = parseInt(result)
			
 
				+            }
			
 
				+          }
			
 
				+          setTimeout(1000)
			
 
				+          // value 是一个 Uint8Array
			
 
				+        }
			
 
				+        await port.close();
			
 
				+      } else {
			
 
				+        console.log('the Web Serial API is not supported.', navigator);
			
 
				+      }
			
 
				+    },
			
 
				+    qualityInspectorChange(e){
			
 
				+      console.log(e)
			
 
				+    },
			
 
				+    uploadSuccessHandle1(res){
			
 
				+      this.deptBudgetList.addressUrl=res.url
			
 
				+    },
			
 
				+    //返回按钮
			
 
				+    revert() {
			
 
				+      this.$router.push({ path: 'warehouseManagementList' })
			
 
				+    },
			
 
				+        carChange(e) {
			
 
				+      for (let i = 0; i < this.tranCarInfoList.length; i++) {
			
 
				+        if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
			
 
				+          this.deptBudgetList.tranCarNo=this.tranCarInfoList[i].tranCarNo
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    typeChange(e){
			
 
				+
			
 
				+    },
			
 
				+    contractNoChange(e){
			
 
				+      for (var i = 0; i < this.outContractNo.length; i++) {
			
 
				+        if (this.outContractNo[i].contractNo == e) {
			
 
				+             if (this.outContractNo[i].inOutType == '销售出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 1
			
 
				+            } else if (this.outContractNo[i].inOutType == '移库出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 3
			
 
				+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 4
			
 
				+            } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 5
			
 
				+            } else if (this.detailData.inOutType == '采购出库') {
			
 
				+              this.deptBudgetList.inOutTypeKey = 6
			
 
				+            }
			
 
				+          this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
			
 
				+          this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
			
 
				+          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
			
 
				+          if(this.outContractNo[i].tranCarInfoList){
			
 
				+            this.options2=this.outContractNo[i].tranCarInfoList
			
 
				+            this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
			
 
				+            this.carstatus=true
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    dataFilter2(val) {
			
 
				+      this.deptBudgetList.carNo = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options1 = this.outContractNo1.filter((item) => {
			
 
				+          if (
			
 
				+            !!~item.carNo.indexOf(val) ||
			
 
				+            !!~item.carNo.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options2 = this.tranCarInfoList
			
 
				+      }
			
 
				+    },
			
 
				+    dataFilter(val) {
			
 
				+      // console.log(val,"名")
			
 
				+      this.deptBudgetList.staffList = val
			
 
				+      if (val) {
			
 
				+        //val存在
			
 
				+        this.options = this.staffList.filter((item) => {
			
 
				+          if (
			
 
				+            !!~item.staffName.indexOf(val) ||
			
 
				+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
			
 
				+          ) {
			
 
				+            return true
			
 
				+          }
			
 
				+        })
			
 
				+      } else {
			
 
				+        //val为空时，还原数组
			
 
				+        this.options = this.staffList
			
 
				+      }
			
 
				+    },
			
 
				+    selectstaff(e) {
			
 
				+      for (var i = 0; i < this.staffList.length; i++) {
			
 
				+        if (this.staffList[i].staffName == e) {
			
 
				+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    pureweight(e){
			
 
				+      console.log(this.deptBudgetList)
			
 
				+      if(this.deptBudgetList.netWeight&&this.deptBudgetList.tidalGrainWater&&this.deptBudgetList.solidGrainWater&&this.deptBudgetList.buckleWeightRatio){
			
 
				+        this.deptBudgetList.pureWeight=(this.deptBudgetList.netWeight*(100-(this.deptBudgetList.tidalGrainWater-this.deptBudgetList.solidGrainWater)*this.deptBudgetList.buckleWeightRatio))/100
			
 
				+      }
			
 
				+    },
			
 
				+    temporaryStorage() {
			
 
				+      if (!this.deptBudgetList.goodsName) {
			
 
				+        this.$message({
			
 
				+          message: '货名不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.information == '毛重检斤'&&!this.deptBudgetList.grossWeight) {
			
 
				+        this.$message({
			
 
				+          message: '毛重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.information == '毛重检斤'&&(
			
 
				+        this.deptBudgetList.grossWeight <= 0 ||
			
 
				+        this.deptBudgetList.grossWeight > 200000 ||
			
 
				+        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.grossWeight).length -
			
 
				+            (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
			
 
				+            3))
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '毛重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.information == '皮重检斤'&&!this.deptBudgetList.tare) {
			
 
				+        this.$message({
			
 
				+          message: '皮重不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.information == '皮重检斤'&&(
			
 
				+        this.deptBudgetList.tare < 0 ||
			
 
				+        this.deptBudgetList.tare > 10000 ||
			
 
				+        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.tare).length -
			
 
				+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
			
 
				+            3))
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '皮重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      
			
 
				+      if (!this.deptBudgetList.carNo) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号不能为空',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.deptBudgetList.carNo.length > 7) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号输入错误,请输入7个字符之内',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.contractNo) {
			
 
				+        this.$message({
			
 
				+          message: '合同编号不能为空',
			
 
				+          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 (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
			
 
				+            2 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '质检员姓名长度错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.waterContent)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //杂质
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.impurity
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //霉变
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.mildewGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //热损伤
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.jiaorenli
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //不完善粒（%）
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //容重
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
			
 
				+          this.$message({
			
 
				+            message: '容重(克/升)非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        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: '容重输入错误',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      console.log(this.deptBudgetList,'出库！！！！！')
			
 
				+      this.$confirm(`是否保存皮重检斤`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      })
			
 
				+        .then(() => {
			
 
				+          this.$refs.deptBudgetList.validate((valid) => {
			
 
				+            if (valid) {
			
 
				+              this.deptBudgetList.compId =
			
 
				+                sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.deptBudgetList.inOutFlag = 1
			
 
				+              this.deptBudgetList.pcFlag = 1
			
 
				+              this.deptBudgetList.statusFlag = 1
			
 
				+              this.deptBudgetList.grossWeight /= 1000
			
 
				+              this.deptBudgetList.tare /= 1000
			
 
				+              this.deptBudgetList.netWeight /= 1000
			
 
				+              this.deptBudgetList.pureWeight /= 1000
			
 
				+              addstorageputList(this.deptBudgetList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('保存成功')
			
 
				+                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                })
			
 
				+            } else {
			
 
				+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              return false
			
 
				+            }
			
 
				+          })
			
 
				+        })
			
 
				+        .catch(() => {
			
 
				+          return false
			
 
				+        })
			
 
				+    },
			
 
				+    //提交按钮
			
 
				+    submit() {
			
 
				+      if (!this.deptBudgetList.goodsName) {
			
 
				+        this.$message({
			
 
				+          message: '货名不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.grossWeight) {
			
 
				+        this.$message({
			
 
				+          message: '毛重不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.grossWeight <= 0 ||
			
 
				+        this.deptBudgetList.grossWeight > 10000 ||
			
 
				+        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.grossWeight).length -
			
 
				+            (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '毛重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.tare) {
			
 
				+        this.$message({
			
 
				+          message: '皮重不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.tare < 0 ||
			
 
				+        this.deptBudgetList.tare > 10000 ||
			
 
				+        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.tare).length -
			
 
				+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
			
 
				+            3)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '皮重输入错误',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.netWeight) {
			
 
				+        this.$message({
			
 
				+          message: '净重不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.netWeight <= 0 ||
			
 
				+        this.deptBudgetList.netWeight >= 10000
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '净重输入错误！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.grade) {
			
 
				+        this.$message({
			
 
				+          message: '品级不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.deptBudgetList.type=='潮粮'&&!this.deptBudgetList.buckleWeightRatio) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.buckleWeightRatio < 0 ||
			
 
				+        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.buckleWeightRatio > 3 ||
			
 
				+        (this.deptBudgetList.type=='潮粮'&&String(this.deptBudgetList.buckleWeightRatio).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.buckleWeightRatio).length -
			
 
				+            (String(this.deptBudgetList.buckleWeightRatio).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '扣重比输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.deptBudgetList.type=='潮粮'&&!this.deptBudgetList.tidalGrainWater) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.tidalGrainWater < 1 ||
			
 
				+        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.tidalGrainWater > 40 ||
			
 
				+        (this.deptBudgetList.type=='潮粮'&&String(this.deptBudgetList.tidalGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.tidalGrainWater).length -
			
 
				+            (String(this.deptBudgetList.tidalGrainWater).indexOf('.') + 1) >
			
 
				+            2)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '潮粮水分输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (this.deptBudgetList.type=='潮粮'&&!this.deptBudgetList.solidGrainWater) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分不能为空',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.solidGrainWater < 1 ||
			
 
				+        this.deptBudgetList.type=='潮粮'&&this.deptBudgetList.solidGrainWater > 40 ||
			
 
				+        (this.deptBudgetList.type=='潮粮'&&String(this.deptBudgetList.solidGrainWater).indexOf('.') != -1 &&
			
 
				+          String(this.deptBudgetList.solidGrainWater).length -
			
 
				+            (String(this.deptBudgetList.solidGrainWater).indexOf('.') + 1) >
			
 
				+            1)
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '干粮水分输入错误',
			
 
				+          type: 'warning'
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+
			
 
				+      if (!this.deptBudgetList.agent) {
			
 
				+        this.$message({
			
 
				+          message: '经办人不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.agent.length < 2 ||
			
 
				+        this.deptBudgetList.agent.length > 10
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '经办人姓名输入有误！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.inOutDate) {
			
 
				+        this.$message({
			
 
				+          message: '出库日期不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.inOutType) {
			
 
				+        this.$message({
			
 
				+          message: '出库类型不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.carNo) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.carNo.length < 6 &&
			
 
				+        this.deptBudgetList.carNo.length <= 8
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '车牌号输入有误！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (!this.deptBudgetList.contractNo) {
			
 
				+        this.$message({
			
 
				+          message: '合同编号不能为空！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      if (
			
 
				+        this.deptBudgetList.contractNo.length < 6 ||
			
 
				+        this.deptBudgetList.contractNo.length > 20
			
 
				+      ) {
			
 
				+        this.$message({
			
 
				+          message: '合同编号输入有误！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				+        return
			
 
				+      }
			
 
				+      //自检员
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
			
 
				+            2 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '质检员姓名长度错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.waterContent)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //杂质
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.impurity).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.impurity
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //霉变
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.mildewGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.mildewGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //热损伤
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
			
 
				+          (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
			
 
				+            '.'
			
 
				+          ) != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.jiaorenli
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+
			
 
				+      //不完善粒（%）
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
			
 
				+          this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
			
 
				+          (String(
			
 
				+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+          ).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
			
 
				+              .length -
			
 
				+              (String(
			
 
				+                this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				+              ).indexOf('.') +
			
 
				+                1) >
			
 
				+              2)
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      //容重
			
 
				+      if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
			
 
				+        if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
			
 
				+          this.$message({
			
 
				+            message: '容重(克/升)非数字!',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+          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: '容重输入错误',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				+      }
			
 
				+      this.$confirm(`确定提交出库信息`, {
			
 
				+        cancelButtonText: '取消',
			
 
				+        confirmButtonText: '确定',
			
 
				+        type: 'warning',
			
 
				+      }).then(() => {
			
 
				+        this.$refs.deptBudgetList.validate((valid) => {
			
 
				+          if (valid) {
			
 
				+            this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+            this.deptBudgetList.inOutFlag = 1
			
 
				+            this.deptBudgetList.statusFlag = 3
			
 
				+            addstorageputList(this.deptBudgetList)
			
 
				+              .toPromise()
			
 
				+              .then((response) => {
			
 
				+                this.$message.success('添加成功')
			
 
				+                this.$router.push({ path: 'warehouseManagementList' })
			
 
				+              })
			
 
				+          } else {
			
 
				+            EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+            return false
			
 
				+          }
			
 
				+        })
			
 
				+      })
			
 
				+    },
			
 
				+    tarechange(e) {
			
 
				+      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
			
 
				+        this.deptBudgetList.netWeight = Number(
			
 
				+          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    grossWeightchange(e) {
			
 
				+      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
			
 
				+        this.deptBudgetList.netWeight = Number(
			
 
				+          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
			
 
				+        )
			
 
				+      }
			
 
				+    },
			
 
				+    selectgoodsName(e) {
			
 
				+      for (var i = 0; i < this.goodnameList.length; i++) {
			
 
				+        if (this.goodnameList[i].goodsName == e) {
			
 
				+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectpackingMethod(e) {
			
 
				+      for (var i = 0; i < this.packtypeList.length; i++) {
			
 
				+        if (this.packtypeList[i].constValue == e) {
			
 
				+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    selectstorageType(e) {
			
 
				+      for (var i = 0; i < this.deliveryType.length; i++) {
			
 
				+        if (this.deliveryType[i].constValue == e) {
			
 
				+          this.deptBudgetList.inOutTypeKey = this.deliveryType[i].constKey
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    handleClose() {
			
 
				+      this.accessoryTFs = false
			
 
				+    },
			
 
				+    handleSizeChange(val) {
			
 
				+      console.log(`每页 ${val} 条`)
			
 
				+      this.pageSize = val
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    handleCurrentChange(val) {
			
 
				+      this.currentPage = val
			
 
				+      console.log(`当前页: ${val}`)
			
 
				+      this.getList()
			
 
				+    },
			
 
				+    getList() {
			
 
				+      // 品级
			
 
				+      pullDown({ constId: 'CON3' })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.gradeList = response
			
 
				+        })
			
 
				+
			
 
				+      // 类型
			
 
				+      if (this.deptBudgetList.warehouseType == 1) {
			
 
				+        // 货名
			
 
				+        goodsname({ positionId: this.$route.query.positionId })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.goodnameList = response
			
 
				+          })
			
 
				+        //类型
			
 
				+        pullDown({ constId: 'CON6' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deliveryType = response
			
 
				+          })
			
 
				+      } else if (this.deptBudgetList.warehouseType == 2) {
			
 
				+        goodsnameXiala({ baseId: this.deptBudgetList.warehouseId })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.goodnameList = response
			
 
				+          })
			
 
				+        pullDown({ constId: 'WARE2' })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deliveryType = response
			
 
				+          })
			
 
				+      }
			
 
				+      //合同编号
			
 
				+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'),flag:5  })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          this.outContractNo = response
			
 
				+        })
			
 
				+      //经办人
			
 
				+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.deptBudgetList.baseId })
			
 
				+        .toPromise()
			
 
				+        .then((response) => {
			
 
				+          // this.agent = response
			
 
				+          this.qualityInspectorList = response
			
 
				+          this.options = response
			
 
				+           this.staffList = response
			
 
				+        })
			
 
				+    },
			
 
				+    selecttaskType(e) {
			
 
				+      for (var i = 0; i < this.taskTypeList.length; i++) {
			
 
				+        if (this.taskTypeList[i].value == e) {
			
 
				+          this.searchType = this.taskTypeList[i].type
			
 
				+        }
			
 
				+      }
			
 
				+    },
			
 
				+    fujian(row) {
			
 
				+      if (
			
 
				+        row.receiveAttachmentPath === null ||
			
 
				+        row.receiveAttachmentPath === ''
			
 
				+      ) {
			
 
				+        EventBus.$emit(
			
 
				+          'warning',
			
 
				+          this.$t('system.noticeCircular.NoInformation')
			
 
				+        )
			
 
				+      } else {
			
 
				+        this.accessoryTFs = true
			
 
				+      }
			
 
				+      this.appendixIdss = row.receiveAttachmentPath
			
 
				+    },
			
 
				+    handleExamine(row) {
			
 
				+      this.$router.push({
			
 
				+        name: 'salesContractExamine',
			
 
				+        query: { id: row.id },
			
 
				+      })
			
 
				+    },
			
 
				+    //删除
			
 
				+    approve() {},
			
 
				+    listQuery() {},
			
 
				+    total() {},
			
 
				+    clearfiltQuery() {},
			
 
				+    selectCrtDuty() {},
			
 
				+  },
			
 
				+}
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+/deep/.basicInformation {
			
 
				+  .ws-info-table {
			
 
				+    border: none;
			
 
				+  }
			
 
				+  .el-form-item {
			
 
				+    width: 33.3333%;
			
 
				+    border: none;
			
 
				+    .el-form-item__label {
			
 
				+      background: transparent;
			
 
				+      border: none;
			
 
				+    }
			
 
				+    .el-form-item__content {
			
 
				+      border: none;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+.el-button--default {
			
 
				+  color: #5473e8;
			
 
				+  border-color: #5473e8;
			
 
				+}
			
 
				+.title {
			
 
				+  position: relative;
			
 
				+  padding-left: 10px;
			
 
				+}
			
 
				+.title::before {
			
 
				+  content: '';
			
 
				+  display: inline-block;
			
 
				+  width: 5px;
			
 
				+  height: 30px;
			
 
				+  background: #5473e8;
			
 
				+  position: absolute;
			
 
				+  left: 0;
			
 
				+}
			
 
				+.el-form {
			
 
				+  padding: 0 10%;
			
 
				+}
			
 
				+.el-button--primary {
			
 
				+  background-color: #5878e8;
			
 
				+  border-color: #5878e8;
			
 
				+}
			
 
				+.el-col {
			
 
				+  background: #f6f7fc;
			
 
				+}
			
 
				+.bg-right {
			
 
				+  text-align: right;
			
 
				+  padding: 16px 20px;
			
 
				+}
			
 
				+.center {
			
 
				+  position: relative;
			
 
				+  top: 50px;
			
 
				+  width: 40%;
			
 
				+  height: 2000px;
			
 
				+  margin: 0 auto;
			
 
				+}
			
 
				+//选填
			
 
				+/deep/.el-form-item {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+.container {
			
 
				+  overflow: scroll;
			
 
				+  height: 120vh;
			
 
				+}
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: center;
			
 
				+}
			
 
				+.deliverydate {
			
 
				+  display: inline-block;
			
 
				+  width: 10%;
			
 
				+}
			
 
				+.center {
			
 
				+  margin-top: -60px;
			
 
				+  width: 80%;
			
 
				+}
			
 
				+//仓位
			
 
				+.position {
			
 
				+  background: #afb5cb;
			
 
				+  border-radius: 2px;
			
 
				+  font-size: 12px;
			
 
				+  color: #ffffff;
			
 
				+  line-height: 20px;
			
 
				+  padding: 2px 4px;
			
 
				+  position: relative;
			
 
				+  top: -2px;
			
 
				+}
			
 
				+.neifor /deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  background: #f6f7fc;
			
 
				+}
			
 
				+.neifor .ws-info-table {
			
 
				+  border-left: 1px solid #cdd2dc;
			
 
				+  border-top: 1px solid #cdd2dc;
			
 
				+}
			
 
				+.neifor .ws-info-table .el-form-item {
			
 
				+  border-right: 1px solid #cdd2dc;
			
 
				+  border-bottom: 1px solid #cdd2dc;
			
 
				+}
			
 
				+.inspector /deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  width: 59px;
			
 
				+}
			
 
				+//表格文字
			
 
				+/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+  text-align: center;
			
 
				+  font-size: 14px;
			
 
				+  font-family: PingFangSC-Regular, PingFang SC;
			
 
				+  font-weight: 400;
			
 
				+  color: #8890b1;
			
 
				+  line-height: 16px;
			
 
				+}
			
 
				+.inspector {
			
 
				+  width: 50%;
			
 
				+}
			
 
				+//质检员
			
 
				+.inspector .el-form-item__content {
			
 
				+  text-align: left;
			
 
				+  margin-left: 0px;
			
 
				+}
			
 
				+
			
 
				+.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;
			
 
				+}
			
 
				+//下面列表
			
 
				+.neifor {
			
 
				+  width: 80%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
			
 
				+  width: 35%;
			
 
				+  text-align: center;
			
 
				+}
			
 
				+/deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
			
 
				+  width: 60%;
			
 
				+  background-color: #f6f7fc;
			
 
				+}
			
 
				+/deep/.neifor .el-input--small .el-input__inner {
			
 
				+  width: 100%;
			
 
				+}
			
 
				+</style>
			
--- a/src/views/warehouse/weightedsubsidiary.vue
+++ b/src/views/warehouse/weightedsubsidiary.vue
@@ -388,7 +388,7 @@ export default {
 
				         .toPromise()
			
 
				         .then((response) => {
			
 
				           for (let i = 0; i < response.records.length; i++) {
			
 
				-            response.records[i].toFixed(2)
			
 
				+            response.records[i].costAfter=response.records[i].costAfter.toFixed(2)
			
 
				           }
			
 
				           this.warehouseList = response
			
 
				           this.deptBudgetTotal=response.total
			
--- a/vue.config.js
+++ b/vue.config.js
@@ -142,6 +142,7 @@ module.exports = {
 
				         // 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.119:8090/',
			
 
				         // target: 'http://192.168.24.5:8098',//目标地址
			
 
				         // target: 'http://product-server.winsea.com/',