3 年之前 · 1c31c17867
--- a/public/static/inspection.html
+++ b/public/static/inspection.html
@@ -4,6 +4,7 @@
 
				     <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,
			
--- a/public/static/weightCheck.html
+++ b/public/static/weightCheck.html
@@ -22,11 +22,12 @@
 
				         width: 1000px;
			
 
				         padding: 30px 20px 20px 20px;
			
 
				         font-size: 18px;
			
 
				-        position: absolute;
			
 
				-        top: 0;
			
 
				+        height: 130vh;
			
 
				+        /* position: absolute; */
			
 
				+        /*        top: 0;
			
 
				         bottom: 0;
			
 
				         left: 0;
			
 
				-        right: 0;
			
 
				+        right: 0; */
			
 
				       }
			
 
				 
			
 
				       table {
			
@@ -60,9 +61,11 @@
 
				         margin-top: 10px;
			
 
				         margin-right: 240px;
			
 
				       }
			
 
				-      .autograph{
			
 
				-    margin-top: 10px;
			
 
				-     }
			
 
				+
			
 
				+      .autograph {
			
 
				+        margin-top: 10px;
			
 
				+      }
			
 
				+
			
 
				       .bottom-row3 {
			
 
				         margin: 10px 0;
			
 
				       }
			
@@ -114,98 +117,191 @@
 
				       .small-img {
			
 
				         margin-right: 0;
			
 
				       }
			
 
				-      .sign{
			
 
				+
			
 
				+      .sign {
			
 
				         margin-right: 100px;
			
 
				       }
			
 
				     </style>
			
 
				   </head>
			
 
				   <body>
			
 
				     <div id="app">
			
 
				-      <div class="content" v-if="bigContent">
			
 
				-        <div class="title">{{tableData.compName}}</div>
			
 
				-        <div class="title">入库检斤单</div>
			
 
				-        <div class="number">{{tableData.number}}</div>
			
 
				-        <table class="table">
			
 
				-          <tr class="row">
			
 
				-            <td class="col col-bgc">客户姓名</td>
			
 
				-            <td class="col" colspan="2">{{tableData.customer}}</td>
			
 
				-            <td class="col col-bgc">客户电话</td>
			
 
				-            <td class="col" >{{tableData.customerPhone}}</td>
			
 
				-            <td class="col col-bgc">车牌号</td>
			
 
				-            <td class="col" colspan="2">{{tableData.carNumber}}</td>
			
 
				-          </tr>
			
 
				-          <tr class="row">
			
 
				-            <td class="col col-bgc">收货单位</td>
			
 
				-            <td class="col" colspan="2">{{tableData.compName}}</td>
			
 
				-            <td class="col col-bgc">联系人</td>
			
 
				-            <td class="col" >{{tableData.person}}</td>
			
 
				-            <td class="col col-bgc">联系电话</td>
			
 
				-            <td class="col" colspan="2">{{tableData.personPhone}}</td>
			
 
				-          </tr>
			
 
				-          <tr class="row">
			
 
				-            <td class="col col-bgc">货名</td>
			
 
				-            <td class="col">{{tableData.goodsName}}</td>
			
 
				-            <td class="col col-bgc">类型</td>
			
 
				-            <td class="col">{{tableData.type}}</td>
			
 
				-            <td class="col col-bgc">容量（克/升）</td>
			
 
				-            <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
			
 
				-            <td class="col col-bgc">不完善粒（%）</td>
			
 
				-            <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
			
 
				-          </tr>
			
 
				-          <tr class="row">
			
 
				-            <td class="col col-bgc">等级</td>
			
 
				-            <td class="col">{{tableData.qualityInspectionManagement.grade}}</td>
			
 
				-            <td class="col col-bgc">水分（%）</td>
			
 
				-            <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">质检时间</td>
			
 
				-            <td class="col" >{{tableData.qualityInspectionManagement.qualityDate}}</td>
			
 
				-          </tr>
			
 
				-          <tr class="row">
			
 
				-            <td class="col col-bgc">杂质（%）</td>
			
 
				-            <td class="col">{{tableData.qualityInspectionManagement.impurity}}</td>
			
 
				-            <td class="col col-bgc">霉变粒（%）</td>
			
 
				-            <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
			
 
				-            <td class="col col-bgc">扣杂</td>
			
 
				-            <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
			
 
				-            <td class="col " colspan="2"></td>
			
 
				-          </tr>
			
 
				-          <tr class="row">
			
 
				-            <td class="col col-bgc">毛重（公斤）</td>
			
 
				-            <td class="col">{{tableData.grossWeight}}</td>
			
 
				-            <td class="col col-bgc">皮重（公斤）</td>
			
 
				-            <td class="col">{{tableData.tare}}</td>
			
 
				-            <td class="col col-bgc">扣重（公斤）</td>
			
 
				-            <td class="col">{{tableData.buckleMiscellaneous}}</td>
			
 
				-            <td class="col col-bgc">净重（公斤）</td>
			
 
				-            <td class="col">{{tableData.netWeight}}</td>
			
 
				-            <td class="col " colspan="2"></td>
			
 
				-           
			
 
				-          </tr>
			
 
				-          <tr class="row">
			
 
				-            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
			
 
				-            <td class="col" colspan="2">{{tableData.grossDate}}</td>
			
 
				-            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
			
 
				-            <td class="col" colspan="2">{{tableData.tareDate}}</td>
			
 
				-          </tr>
			
 
				-        </table>
			
 
				-        <div class="bottom">
			
 
				-          <div class="bottom-row1">
			
 
				-            <div>毛检：{{tableData.secretaryWeigher}}</div>
			
 
				-            <div style="margin-left:60px">皮检：{{tableData.skinInspector}}</div>
			
 
				-            <!-- <div>{{tableData.qualityDate}}</div> -->
			
 
				+      <div v-if="selectPrint">
			
 
				+        <div v-for="(item,index) in tableData1" :key="index">
			
 
				+          <div class="content">
			
 
				+            <div class="title">{{item.compName}}</div>
			
 
				+            <div class="title">入库检斤单</div>
			
 
				+            <div class="number">{{item.number}}</div>
			
 
				+            <table class="table">
			
 
				+              <tr class="row">
			
 
				+                <td class="col col-bgc">客户姓名</td>
			
 
				+                <td class="col" colspan="2">{{item.customer}}</td>
			
 
				+                <td class="col col-bgc">客户电话</td>
			
 
				+                <td class="col">{{item.customerPhone}}</td>
			
 
				+                <td class="col col-bgc">车牌号</td>
			
 
				+                <td class="col" colspan="2">{{item.carNumber}}</td>
			
 
				+              </tr>
			
 
				+              <tr class="row">
			
 
				+                <td class="col col-bgc">收货单位</td>
			
 
				+                <td class="col" colspan="2">{{item.compName}}</td>
			
 
				+                <td class="col col-bgc">联系人</td>
			
 
				+                <td class="col">{{item.person}}</td>
			
 
				+                <td class="col col-bgc">联系电话</td>
			
 
				+                <td class="col" colspan="2">{{item.personPhone}}</td>
			
 
				+              </tr>
			
 
				+              <tr class="row">
			
 
				+                <td class="col col-bgc">货名</td>
			
 
				+                <td class="col">{{item.goodsName}}</td>
			
 
				+                <td class="col col-bgc">类型</td>
			
 
				+                <td class="col">{{item.type}}</td>
			
 
				+                <td class="col col-bgc">容量（克/升）</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.bulkDensity}}</td>
			
 
				+                <td class="col col-bgc">不完善粒（%）</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.imperfectGrain}}</td>
			
 
				+              </tr>
			
 
				+              <tr class="row">
			
 
				+                <td class="col col-bgc">等级</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.grade}}</td>
			
 
				+                <td class="col col-bgc">水分（%）</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.waterContent}}</td>
			
 
				+                <td class="col col-bgc">热损伤（%）</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.jiaorenli}}</td>
			
 
				+                <td class="col col-bgc">质检时间</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.qualityDate}}</td>
			
 
				+              </tr>
			
 
				+              <tr class="row">
			
 
				+                <td class="col col-bgc">杂质（%）</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.impurity}}</td>
			
 
				+                <td class="col col-bgc">霉变粒（%）</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.mildewGrain}}</td>
			
 
				+                <td class="col col-bgc">扣杂</td>
			
 
				+                <td class="col">{{item.qualityInspectionManagement.buckleMiscellaneous}}</td>
			
 
				+                <td class="col " colspan="2"></td>
			
 
				+              </tr>
			
 
				+              <tr class="row">
			
 
				+                <td class="col col-bgc">毛重（公斤）</td>
			
 
				+                <td class="col">{{item.grossWeight}}</td>
			
 
				+                <td class="col col-bgc">皮重（公斤）</td>
			
 
				+                <td class="col">{{item.tare}}</td>
			
 
				+                <td class="col col-bgc">扣重（公斤）</td>
			
 
				+                <td class="col">{{item.buckleMiscellaneous}}</td>
			
 
				+                <td class="col col-bgc">净重（公斤）</td>
			
 
				+                <td class="col">{{item.netWeight}}</td>
			
 
				+                <!-- <td class="col " colspan="2"></td> -->
			
 
				+
			
 
				+              </tr>
			
 
				+              <tr class="row">
			
 
				+                <td class="col col-bgc" colspan="2">毛重检斤时间</td>
			
 
				+                <td class="col" colspan="2">{{item.grossDate}}</td>
			
 
				+                <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
			
 
				+                <td class="col" colspan="2">{{item.tareDate}}</td>
			
 
				+              </tr>
			
 
				+            </table>
			
 
				+            <div class="bottom">
			
 
				+              <div class="bottom-row1">
			
 
				+                <div>毛检：{{item.secretaryWeigher}}</div>
			
 
				+                <div style="margin-left:60px">皮检：{{item.skinInspector}}</div>
			
 
				+                <!-- <div>{{tableData.qualityDate}}</div> -->
			
 
				+              </div>
			
 
				+              <div class="bottom-row2">
			
 
				+                <!-- <div class="left">
			
 
				+                <img src="../img/add.png" alt="">
			
 
				+              </div> -->
			
 
				+                <div class="config">收货单位签名或盖章：</div>
			
 
				+                <div class="autograph">客户签名：</div>
			
 
				+              </div>
			
 
				+              <!-- <div class="bottom-row3">扫一扫</div> -->
			
 
				+            </div>
			
 
				           </div>
			
 
				-          <div class="bottom-row2">
			
 
				-            <!-- <div class="left">
			
 
				-              <img src="../img/add.png" alt="">
			
 
				-            </div> -->
			
 
				-            <div class="config">收货单位签名或盖章：</div>
			
 
				-            <div class="autograph">客户签名：</div>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <div v-else>
			
 
				+        <div class="content" v-if="bigContent">
			
 
				+          <div class="title">{{tableData.compName}}</div>
			
 
				+          <div class="title">入库检斤单</div>
			
 
				+          <div class="number">{{tableData.number}}</div>
			
 
				+          <table class="table">
			
 
				+            <tr class="row">
			
 
				+              <td class="col col-bgc">客户姓名</td>
			
 
				+              <td class="col" colspan="2">{{tableData.customer}}</td>
			
 
				+              <td class="col col-bgc">客户电话</td>
			
 
				+              <td class="col">{{tableData.customerPhone}}</td>
			
 
				+              <td class="col col-bgc">车牌号</td>
			
 
				+              <td class="col" colspan="2">{{tableData.carNumber}}</td>
			
 
				+            </tr>
			
 
				+            <tr class="row">
			
 
				+              <td class="col col-bgc">收货单位</td>
			
 
				+              <td class="col" colspan="2">{{tableData.compName}}</td>
			
 
				+              <td class="col col-bgc">联系人</td>
			
 
				+              <td class="col">{{tableData.person}}</td>
			
 
				+              <td class="col col-bgc">联系电话</td>
			
 
				+              <td class="col" colspan="2">{{tableData.personPhone}}</td>
			
 
				+            </tr>
			
 
				+            <tr class="row">
			
 
				+              <td class="col col-bgc">货名</td>
			
 
				+              <td class="col">{{tableData.goodsName}}</td>
			
 
				+              <td class="col col-bgc">类型</td>
			
 
				+              <td class="col">{{tableData.type}}</td>
			
 
				+              <td class="col col-bgc">容量（克/升）</td>
			
 
				+              <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
			
 
				+              <td class="col col-bgc">不完善粒（%）</td>
			
 
				+              <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
			
 
				+            </tr>
			
 
				+            <tr class="row">
			
 
				+              <td class="col col-bgc">等级</td>
			
 
				+              <td class="col">{{tableData.qualityInspectionManagement.grade}}</td>
			
 
				+              <td class="col col-bgc">水分（%）</td>
			
 
				+              <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">质检时间</td>
			
 
				+              <td class="col">{{tableData.qualityInspectionManagement.qualityDate}}</td>
			
 
				+            </tr>
			
 
				+            <tr class="row">
			
 
				+              <td class="col col-bgc">杂质（%）</td>
			
 
				+              <td class="col">{{tableData.qualityInspectionManagement.impurity}}</td>
			
 
				+              <td class="col col-bgc">霉变粒（%）</td>
			
 
				+              <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
			
 
				+              <td class="col col-bgc">扣杂</td>
			
 
				+              <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
			
 
				+              <td class="col " colspan="2"></td>
			
 
				+            </tr>
			
 
				+            <tr class="row">
			
 
				+              <td class="col col-bgc">毛重（公斤）</td>
			
 
				+              <td class="col">{{tableData.grossWeight}}</td>
			
 
				+              <td class="col col-bgc">皮重（公斤）</td>
			
 
				+              <td class="col">{{tableData.tare}}</td>
			
 
				+              <td class="col col-bgc">扣重（公斤）</td>
			
 
				+              <td class="col">{{tableData.buckleMiscellaneous}}</td>
			
 
				+              <td class="col col-bgc">净重（公斤）</td>
			
 
				+              <td class="col">{{tableData.netWeight}}</td>
			
 
				+              <td class="col " colspan="2"></td>
			
 
				+
			
 
				+            </tr>
			
 
				+            <tr class="row">
			
 
				+              <td class="col col-bgc" colspan="2">毛重检斤时间</td>
			
 
				+              <td class="col" colspan="2">{{tableData.grossDate}}</td>
			
 
				+              <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
			
 
				+              <td class="col" colspan="2">{{tableData.tareDate}}</td>
			
 
				+            </tr>
			
 
				+          </table>
			
 
				+          <div class="bottom">
			
 
				+            <div class="bottom-row1">
			
 
				+              <div>毛检：{{tableData.secretaryWeigher}}</div>
			
 
				+              <div style="margin-left:60px">皮检：{{tableData.skinInspector}}</div>
			
 
				+              <!-- <div>{{tableData.qualityDate}}</div> -->
			
 
				+            </div>
			
 
				+            <div class="bottom-row2">
			
 
				+              <!-- <div class="left">
			
 
				+                <img src="../img/add.png" alt="">
			
 
				+              </div> -->
			
 
				+              <div class="config">收货单位签名或盖章：</div>
			
 
				+              <div class="autograph">客户签名：</div>
			
 
				+            </div>
			
 
				+            <!-- <div class="bottom-row3">扫一扫</div> -->
			
 
				           </div>
			
 
				-          <!-- <div class="bottom-row3">扫一扫</div> -->
			
 
				         </div>
			
 
				       </div>
			
 
				+
			
 
				       <div class="small-content" v-if="smallContent">
			
 
				         <div class="small-title">
			
 
				           <div>粮食检斤单</div>
			
@@ -247,22 +343,22 @@
 
				           <div>{{tableData.type}}</div>
			
 
				         </div>
			
 
				         <div class="small-row">
			
 
				-            <div>皮重（公斤）</div>
			
 
				-            <div>{{tableData.tare}}</div>
			
 
				-          </div>
			
 
				-          <div class="small-row">
			
 
				-            <div>皮检时间</div>
			
 
				-            <div>{{tableData.tareDate}}</div>
			
 
				-          </div>
			
 
				-          <div class="small-row">
			
 
				-            <div>毛重（公斤）</div>
			
 
				-            <div>{{tableData.grossWeight}}</div>
			
 
				-          </div>
			
 
				-          <div class="small-row">
			
 
				-            <div>毛检时间</div>
			
 
				-            <div>{{tableData.grossDate}}</div>
			
 
				-          </div>
			
 
				-        
			
 
				+          <div>皮重（公斤）</div>
			
 
				+          <div>{{tableData.tare}}</div>
			
 
				+        </div>
			
 
				+        <div class="small-row">
			
 
				+          <div>皮检时间</div>
			
 
				+          <div>{{tableData.tareDate}}</div>
			
 
				+        </div>
			
 
				+        <div class="small-row">
			
 
				+          <div>毛重（公斤）</div>
			
 
				+          <div>{{tableData.grossWeight}}</div>
			
 
				+        </div>
			
 
				+        <div class="small-row">
			
 
				+          <div>毛检时间</div>
			
 
				+          <div>{{tableData.grossDate}}</div>
			
 
				+        </div>
			
 
				+
			
 
				         <!-- <div class="small-row">
			
 
				           <div>扣杂（公斤）</div>
			
 
				           <div>{{tableData.buckleMiscellaneous}}</div>
			
@@ -287,6 +383,8 @@
 
				         tableData: {
			
 
				           // qualityInspectionManagement:{}
			
 
				         },
			
 
				+        tableData1: [],
			
 
				+        selectPrint: false,
			
 
				         name: "",
			
 
				         bigContent: false,
			
 
				         smallContent: false
			
@@ -328,9 +426,15 @@
 
				           this.smallContent = true
			
 
				           this.bigContent = false
			
 
				         }
			
 
				-        console.log(_data,"sddsd")
			
 
				-        this.tableData = JSON.parse(_data)
			
 
				-        console.log(this.tableData)
			
 
				+        if (_data == 'false') {
			
 
				+          this.selectPrint = true;
			
 
				+          this.tableData1 = JSON.parse(sessionStorage.getItem('selectPrint_jjSelectPrintList'))
			
 
				+        } else {
			
 
				+          this.tableData = JSON.parse(_data)
			
 
				+          console.log(this.tableData)
			
 
				+
			
 
				+        }
			
 
				+
			
 
				         document.title = "粮食检斤单"
			
 
				         window.print()
			
 
				         window.onafterprint = function(event) {
			
--- a/src/api/V2/contract/index.js
+++ b/src/api/V2/contract/index.js
@@ -45,4 +45,6 @@ export const API_POST_CONFIRMATIONSHEET_ADD = '/priceConfirmationSheet/api/addPr
 
				 export const API_POST_CONFIRMATIONSHEET_DELETE = '/priceConfirmationSheet/api/deletePriceConfirmationSheet'
			
 
				 
			
 
				 //编辑时查看点价确认单
			
 
				-export const API_GET_GETINFO = '/priceConfirmationSheet/getInfo'
			
 
				+export const API_GET_GETINFO = '/priceConfirmationSheet/getInfo'
			
 
				+//客户
			
 
				+export const API_GET_CUSTOMERINFO = '/customerInfo/customerList'
			
--- a/src/components/Tinymce/components/editorImage.vue
+++ b/src/components/Tinymce/components/editorImage.vue
@@ -419,7 +419,6 @@ export default {
 
				     },
			
 
				 
			
 
				     getFilePath (path) {
			
 
				-      // debugger
			
 
				       // if (this.vesselBankFlag === "V") {
			
 
				       // const sysUrl = "http://" + window.location.host + "/";
			
 
				       const sysUrl = this.$store.getters.baseInfo.fileUrl
			
--- a/src/components/WsUpload/index.vue
+++ b/src/components/WsUpload/index.vue
@@ -603,7 +603,6 @@ export default {
 
				     },
			
 
				 
			
 
				     clearFiles() {
			
 
				-      // debugger
			
 
				       this.fileList = []
			
 
				     },
			
 
				     // 反斜杠转斜杠
			
--- a/src/components/mapdrag/warehouseReceiptMap.vue
+++ b/src/components/mapdrag/warehouseReceiptMap.vue
@@ -57,7 +57,10 @@
 
				     computed: {},
			
 
				     watch: {
			
 
				       listData: function(val1, val2) {
			
 
				+<<<<<<< HEAD
			
 
				         // debugger
			
 
				+=======
			
 
				+>>>>>>> 36b170beaf45cff59eafd7ca276e80ebc55f48f2
			
 
				         this.listData = val1
			
 
				         var that = this
			
 
				         this.map = new AMap.Map('mapContainer', {
			
@@ -121,7 +124,10 @@
 
				             }
			
 
				 
			
 
				             function toGetList(e) {
			
 
				+<<<<<<< HEAD
			
 
				               // debugger
			
 
				+=======
			
 
				+>>>>>>> 36b170beaf45cff59eafd7ca276e80ebc55f48f2
			
 
				               // console.log(e.target.getExtData())
			
 
				               
			
 
				               that.$parent.getList(e.target.getExtData().id, 1)
			
--- a/src/model/contarct/index.js
+++ b/src/model/contarct/index.js
@@ -23,7 +23,8 @@ import {
 
				     API_GET_GETINFO,
			
 
				     API_POST_CONFIRMATIONSHEET_DELETE,
			
 
				     API_GET_STAFF,
			
 
				-    API_GET_STAFF_FIND
			
 
				+    API_GET_STAFF_FIND,
			
 
				+    API_GET_CUSTOMERINFO
			
 
				 } from '@/api/V2/contract'
			
 
				 // 列表
			
 
				 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
			
@@ -70,4 +71,6 @@ export const addPriceConfirmationSheet = appRx.post(API_POST_CONFIRMATIONSHEET_A
 
				 export const deletePriceConfirmationSheet = appRx.post(API_POST_CONFIRMATIONSHEET_DELETE, errorCatcher, errorHandle, filter)
			
 
				 
			
 
				 //编辑时查看点价确认单
			
 
				-export const getInfo = appRx.get(API_GET_GETINFO, errorCatcher, errorHandle, filter)
			
 
				+export const getInfo = appRx.get(API_GET_GETINFO, errorCatcher, errorHandle, filter)
			
 
				+// 客户
			
 
				+export const getcustomerinfo = appRx.get(API_GET_CUSTOMERINFO, errorCatcher, errorHandle, filter)
			
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -213,7 +213,6 @@ const actions = {
 
				   },
			
 
				 
			
 
				   async getBaseInfo({ commit }, params) {
			
 
				-    // debugger
			
 
				     if (process.env.VUE_APP_PACKAGE_ENV === 'ship') {
			
 
				       findVesselSysVersion().toPromise().then(res => {
			
 
				         let loginAddress = 'http://' + res.localHostAddress + ':81/'
			
--- a/src/views/contractManagement/futuresPurchaseContract.vue
+++ b/src/views/contractManagement/futuresPurchaseContract.vue
@@ -4,13 +4,8 @@
 
				 		<BaseHeaderLayout :leftSpan="8">
			
 
				 			<template slot="left">
			
 
				 				<ws-button type="primary" @click="handleAdd()"
			
 
				-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.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>
			
 
				+
			
 
				+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
			
 
				 				<ws-button @click="exportlist()" v-hasPermission="
			
 
				             `contractManagement.buyContract.buyContractInfo.view`
			
 
				           ">导出</ws-button>
			
@@ -127,7 +122,9 @@
 
				 		</el-pagination>
			
 
				 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
			
 
				 			@on-cancel="handleClose">
			
 
				-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
			
 
				+			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss"
			
 
				+			:size-limit="size"
			
 
				+        @onChange="onChange"
			
 
				 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				 
			
 
				 		</WinseaContentModal>
			
@@ -140,6 +137,7 @@
 
				 		editstatus,
			
 
				 		billoperatehis,
			
 
				 		deletecontract,
			
 
				+		editInfo
			
 
				 	} from '@/model/contarct/index'
			
 
				 	import {
			
 
				 		downloadFile
			
@@ -166,13 +164,7 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				-				//弹出框
			
 
				-				dialogViewSpareMoney: false,
			
 
				-				dialogApproveFormVisible: false,
			
 
				-				// 船舶类型
			
 
				-				monetaryKey: null,
			
 
				-				// 表格显示数据
			
 
				-				tableDate: [],
			
 
				+				id:'',
			
 
				 				size: 10,
			
 
				 				// 是否显示
			
 
				 				showType: true,
			
@@ -206,11 +198,6 @@
 
				 				appendixIdss: [],
			
 
				 				fileList: [],
			
 
				 				compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-				pickerBeginDateBefore: {
			
 
				-					disabledDate: (time) => {
			
 
				-						return time.getTime() > Date.now()
			
 
				-					},
			
 
				-				},
			
 
				 				accessoryTFs: false,
			
 
				 				taskTypeList: [{
			
 
				 						value: '未完成',
			
@@ -280,6 +267,26 @@
 
				 			this.showType = this.isShow
			
 
				 		},
			
 
				 		methods: {
			
 
				+			onChange () {
			
 
				+			this.$refs.upload
			
 
				+				.handleSaveBill()
			
 
				+				.then(async response => {
			
 
				+				this.deptBudgetList.addressUrl = response
			
 
				+				this.deptBudgetList.id=this.id
			
 
				+				this.deptBudgetList.flag=1
			
 
				+				 editInfo(this.deptBudgetList)
			
 
				+				.toPromise()
			
 
				+				.then((response) => {
			
 
				+				this.accessoryTFs = false
			
 
				+					this.$message.success('上传成功')
			
 
				+					this.getList()
			
 
				+				})
			
 
				+				})
			
 
				+				.catch(res => {
			
 
				+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
			
 
				+				this.$refs.upload.clearFiles()
			
 
				+				})
			
 
				+			},
			
 
				 			dateFormat(fmt, date) {
			
 
				 				let ret
			
 
				 				const opt = {
			
@@ -335,7 +342,7 @@
 
				 					.toPromise()
			
 
				 					.then((response) => {
			
 
				 						for (var i = 0; i < response.records.length; i++) {
			
 
				-							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
			
 
				+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
			
 
				 								response.records[i].addressUrlArray =
			
 
				 									response.records[i].addressUrl.split(',')
			
 
				 							} else {
			
@@ -407,12 +414,7 @@
 
				 				}
			
 
				 			},
			
 
				 			fujian(row) {
			
 
				-				if (row.addressUrl === null || row.addressUrl === '') {
			
 
				-					EventBus.$emit(
			
 
				-						'warning',
			
 
				-						this.$t('system.noticeCircular.NoInformation')
			
 
				-					)
			
 
				-				}
			
 
				+				this.id=row.id
			
 
				 				this.appendixIdss = row.addressUrl
			
 
				 				console.log(this.appendixIdss)
			
 
				 				this.accessoryTFs = true
			
--- a/src/views/contractManagement/futuresPurchaseContractAdd.vue
+++ b/src/views/contractManagement/futuresPurchaseContractAdd.vue
@@ -15,7 +15,7 @@
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				         <p style="color: #8890b1">
			
 
				-          注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。
			
 
				+          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
			
 
				         </p>
			
 
				       </div>
			
 
				       <ws-info-table>
			
@@ -185,7 +185,7 @@
 
				         <!--临时仓库负责人-->
			
 
				         <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
			
 
				           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable
			
 
				-             @change="selectstaff">
			
 
				+            @change="selectstaff">
			
 
				             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
			
 
				           </el-select>
			
 
				         </ws-form-item>
			
@@ -1510,6 +1510,8 @@
 
				         for (var i = 0; i < this.gradeList.length; i++) {
			
 
				           if (this.gradeList[i].constValue == e) {
			
 
				             this.deptBudgetList.gradeKey = this.gradeList[i].constKey
			
 
				+            this.deptBudgetList.contractGoodsInfo.gradeKey =
			
 
				+              this.gradeList[i].constKey
			
 
				           }
			
 
				         }
			
 
				       },
			
@@ -1884,7 +1886,11 @@
 
				     width: 100%;
			
 
				     text-align: left;
			
 
				   }
			
 
				-   .inline-input {
			
 
				-      width: 100%;
			
 
				-    }
			
 
				+
			
 
				+  .inline-input {
			
 
				+    width: 100%;
			
 
				+  }
			
 
				+  .typeselect{
			
 
				+    width: 100%;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/contractManagement/futuresPurchaseContractEdit.vue
+++ b/src/views/contractManagement/futuresPurchaseContractEdit.vue
@@ -30,7 +30,7 @@
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				         <p style="color: #8890b1">
			
 
				-          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
			
 
				+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
			
 
				           标记的条目提交后不可修改。
			
 
				         </p>
			
 
				         <div class="queren">
			
@@ -580,10 +580,9 @@
 
				       />
			
 
				       <ws-upload
			
 
				         ref="upload"
			
 
				+        :editable="false"
			
 
				         :comp-id="compId"
			
 
				         :appendix-ids="deptBudgetList.addressUrl"
			
 
				-        :size-limit="size"
			
 
				-        @onChange="onChange"
			
 
				         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				       />
			
 
				     </ws-form>
			
@@ -1562,7 +1561,8 @@ export default {
 
				         })
			
 
				         return
			
 
				       }
			
 
				-      if (
			
 
				+      if(this.deptBudgetList.contractProcessInfo.goodsNameKey){
			
 
				+     if (
			
 
				         this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000 ||
			
 
				         this.deptBudgetList.contractProcessInfo.goodsNameKey < 0 ||
			
 
				         (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
			
@@ -1582,6 +1582,8 @@ export default {
 
				         })
			
 
				         return
			
 
				       }
			
 
				+      }
			
 
				+ 
			
 
				       if (
			
 
				         this.deptBudgetList.contractProcessInfo.waterContent > 10000000 ||
			
 
				         this.deptBudgetList.contractProcessInfo.waterContent < 0 ||
			
@@ -1968,4 +1970,7 @@ export default {
 
				   width: 100%;
			
 
				   text-align: left;
			
 
				 }
			
 
				+  .typeselect{
			
 
				+    width: 100%;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/contractManagement/futuresPurchaseContractExamine.vue
+++ b/src/views/contractManagement/futuresPurchaseContractExamine.vue
@@ -6,70 +6,46 @@
 
				         <h2 class="bg-left title">查看合同详情</h2>
			
 
				       </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=""
			
 
				-          />返回</el-button
			
 
				-        >
			
 
				+        <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="" />返回
			
 
				+        </el-button>
			
 
				       </el-col>
			
 
				     </el-row>
			
 
				 
			
 
				-    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList"
			
 
				-      ><div style="margin-top: 20px; font-size: 24px">
			
 
				-        采购合同<span style="font-size: 16px"
			
 
				-          >【编号:{{ deptBudgetList.contractNo }}】</span
			
 
				-        >
			
 
				+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
			
 
				+      <div class="title-top">
			
 
				+        采购合同<span class="title-number">【编号:{{ deptBudgetList.contractNo }}】</span>
			
 
				         <div class="icon">
			
 
				-        <template>
			
 
				-          <el-popover
			
 
				-            placement="right"
			
 
				-            :width="285"
			
 
				-            trigger="click"
			
 
				-            visible-arrow="false"
			
 
				-            @show="history(deptBudgetList.id)"
			
 
				-          >
			
 
				           <template>
			
 
				-            <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				-          </template>
			
 
				-            <div>
			
 
				-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				-              <div v-for="(item, index) in historyList" class="flex">
			
 
				-                <div class="vertical-text vertical-text-left">
			
 
				-                  {{ item.updateDate }}
			
 
				-                </div>
			
 
				-                <div>
			
 
				-                  <div class="vertical-circle"></div>
			
 
				-                  <div
			
 
				-                    v-if="index != historyList.length - 1"
			
 
				-                    class="vertical-line"
			
 
				-                  ></div>
			
 
				-                </div>
			
 
				-                <div class="vertical-text">
			
 
				-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+            <el-popover placement="right" :width="285" trigger="click" visible-arrow="false"
			
 
				+              @show="history(deptBudgetList.id)">
			
 
				+              <template>
			
 
				+                <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				+              </template>
			
 
				+              <div>
			
 
				+                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				+                <div v-for="(item, index) in historyList" class="flex">
			
 
				+                  <div class="vertical-text vertical-text-left">
			
 
				+                    {{ item.updateDate }}
			
 
				+                  </div>
			
 
				+                  <div>
			
 
				+                    <div class="vertical-circle"></div>
			
 
				+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
			
 
				+                  </div>
			
 
				+                  <div class="vertical-text">
			
 
				+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+                  </div>
			
 
				                 </div>
			
 
				               </div>
			
 
				-            </div>
			
 
				-          </el-popover>
			
 
				-        </template>
			
 
				-      </div>
			
 
				+            </el-popover>
			
 
				+          </template>
			
 
				+        </div>
			
 
				       </div>
			
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				-        <div class="queren"><el-button
			
 
				-          class="bg-bottom"
			
 
				-          type="primary"
			
 
				-          size="small"
			
 
				-          @click="confirmationsheet()"
			
 
				-          >确认单</el-button
			
 
				-        ></div>
			
 
				+        <div class="queren">
			
 
				+          <el-button class="bg-bottom" type="primary" size="small" @click="confirmationsheet()">确认单</el-button>
			
 
				+        </div>
			
 
				       </div>
			
 
				       <ws-info-table>
			
 
				         <ws-form-item label="合同编号" span="1" prop="contractNo">
			
@@ -81,17 +57,13 @@
 
				         <ws-form-item label="买方" span="1" prop="buyer">
			
 
				           {{ deptBudgetList.buyer }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="结算方式" span="1" prop="settlementMethod"
			
 
				-          >{{ deptBudgetList.settlementMethod }}
			
 
				+        <ws-form-item label="结算方式" span="1" prop="settlementMethod">{{ deptBudgetList.settlementMethod }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="买方电话" span="1" prop="buyerPhone"
			
 
				-          >{{ deptBudgetList.buyerPhone }}
			
 
				+        <ws-form-item label="买方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="交货方式" span="1" prop="deliverType1"
			
 
				-          >{{ deptBudgetList.deliverType1 }}
			
 
				+        <ws-form-item label="交货方式" span="1" prop="deliverType1">{{ deptBudgetList.deliverType1 }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="卖方" span="1" prop="seller"
			
 
				-          >{{ deptBudgetList.seller }}
			
 
				+        <ws-form-item label="卖方" span="1" prop="seller">{{ deptBudgetList.seller }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="包装方式" span="1" prop="packingMethod">
			
 
				           {{ deptBudgetList.packingMethod }}
			
@@ -170,37 +142,22 @@
 
				         <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
			
 
				           {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="霉变粒（%）<="
			
 
				-          span="1"
			
 
				-          prop="mildewGrain"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
			
 
				           {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="不完善粒（%）<="
			
 
				-          span="1"
			
 
				-          prop="imperfectGrain"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="蛋白（%）>="
			
 
				-          span="1"
			
 
				-          prop="protein"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="蛋白（%）>=" span="1" prop="protein" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.protein }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="转基因" span="1" prop="transgene">
			
 
				           {{ deptBudgetList.contractGoodsInfo.transgene }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="产地" span="1" >
			
 
				+        <ws-form-item label="产地" span="1">
			
 
				           {{ deptBudgetList.contractGoodsInfo.outputPrivate }}
			
 
				           {{ deptBudgetList.contractGoodsInfo.outputCity }}
			
 
				         </ws-form-item>
			
@@ -209,471 +166,544 @@
 
				         <h3>流程信息</h3>
			
 
				       </div>
			
 
				       <ws-info-table>
			
 
				-         <!--已付款（元）-->
			
 
				+        <!--已付款（元）-->
			
 
				         <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
			
 
				           {{deptBudgetList.contractProcessInfo.goodsNameKey}}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
			
 
				           {{ deptBudgetList.contractProcessInfo.goodsName }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="费用支出（元）" span="1" prop="waterContent"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.waterContent }}
			
 
				+        <ws-form-item label="费用支出（元）" span="1" prop="waterContent">{{ deptBudgetList.contractProcessInfo.waterContent }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="未开发票（元）" span="1" prop="impurity"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.impurity }}
			
 
				+        <ws-form-item label="未开发票（元）" span="1" prop="impurity">{{ deptBudgetList.contractProcessInfo.impurity }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="双章原件回收情况" span="1" prop="grade"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.grade }}
			
 
				+        <ws-form-item label="双章原件回收情况" span="1" prop="grade">{{ deptBudgetList.contractProcessInfo.grade }}
			
 
				         </ws-form-item>
			
 
				       </ws-info-table>
			
 
				       <div class="remark">
			
 
				         <h3>备注信息</h3>
			
 
				       </div>
			
 
				       <div style=" color: #afb5cb;margin-left: 20px;">
			
 
				-      {{ deptBudgetList.remarks }}
			
 
				+        {{ deptBudgetList.remarks }}
			
 
				       </div>
			
 
				-      <ws-upload
			
 
				-        ref="upload"
			
 
				-        :comp-id="compId"
			
 
				-        :appendix-ids="deptBudgetList.addressUrl"
			
 
				-        :editable="false"
			
 
				-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				-      />
			
 
				+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false"
			
 
				+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				     </ws-form>
			
 
				     <div style="text-align: right; padding: 10px">
			
 
				-      <el-button
			
 
				-        class="bg-bottom"
			
 
				-        type="primary"
			
 
				-        size="small"
			
 
				-        @click="returnsales()"
			
 
				-        >关闭</el-button
			
 
				-      >
			
 
				+      <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">关闭</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				-import {
			
 
				-  packList,
			
 
				-  xiala,
			
 
				-  examineList,
			
 
				-  billoperatehis,
			
 
				-} from '@/model/contarct/index'
			
 
				-
			
 
				-import WsUpload from '@/components/WsUpload'
			
 
				-export default {
			
 
				-  name: 'viewSpareMoney',
			
 
				-  watch: {
			
 
				-    vesselId(val) {
			
 
				-      this.getVesselData()
			
 
				+  import {
			
 
				+    packList,
			
 
				+    xiala,
			
 
				+    examineList,
			
 
				+    billoperatehis,
			
 
				+  } from '@/model/contarct/index'
			
 
				+
			
 
				+  import WsUpload from '@/components/WsUpload'
			
 
				+  export default {
			
 
				+    name: 'viewSpareMoney',
			
 
				+    watch: {
			
 
				+      vesselId(val) {
			
 
				+        this.getVesselData()
			
 
				+      },
			
 
				+      isShow(val) {
			
 
				+        this.showType = val
			
 
				+      },
			
 
				     },
			
 
				-    isShow(val) {
			
 
				-      this.showType = val
			
 
				+    components: {
			
 
				+      WsUpload,
			
 
				     },
			
 
				-  },
			
 
				-  components: {
			
 
				-    WsUpload,
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      //弹出框
			
 
				-      dialogViewSpareMoney: false,
			
 
				-      dialogApproveFormVisible: false,
			
 
				-      // 船舶类型
			
 
				-      monetaryKey: null,
			
 
				-      // 表格显示数据
			
 
				-      tableDate: [],
			
 
				-      // 是否显示
			
 
				-      showType: true,
			
 
				-      // 年
			
 
				-      year: '',
			
 
				-      status: '',
			
 
				-      // 提交类型
			
 
				-      submitType: true,
			
 
				-      historyList:[],
			
 
				-      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
			
 
				-      ruleDeptBudget: [],
			
 
				-      deptBudgetList: {
			
 
				-        contractProcessInfo: {},
			
 
				-        contractGoodsInfo: {},
			
 
				-      },
			
 
				-      mainReportAdd: {},
			
 
				-      list: {},
			
 
				-      id : '',
			
 
				-      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+    data() {
			
 
				+      return {
			
 
				+        //弹出框
			
 
				+        dialogViewSpareMoney: false,
			
 
				+        dialogApproveFormVisible: false,
			
 
				+        // 船舶类型
			
 
				+        monetaryKey: null,
			
 
				+        // 表格显示数据
			
 
				+        tableDate: [],
			
 
				+        // 是否显示
			
 
				+        showType: true,
			
 
				+        // 年
			
 
				+        year: '',
			
 
				+        status: '',
			
 
				+        // 提交类型
			
 
				+        submitType: true,
			
 
				+        historyList: [],
			
 
				+        tableData: [{
			
 
				+          date: 1111,
			
 
				+          name: 'qqqq',
			
 
				+          address: 'errrtt'
			
 
				+        }],
			
 
				+        ruleDeptBudget: [],
			
 
				+        deptBudgetList: {
			
 
				+          contractProcessInfo: {},
			
 
				+          contractGoodsInfo: {},
			
 
				+        },
			
 
				+        mainReportAdd: {},
			
 
				+        list: {},
			
 
				+        id: '',
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				 
			
 
				-    }
			
 
				-  },
			
 
				-
			
 
				-  activated() {
			
 
				-    this.status = this.$route.query.status
			
 
				-    this.loaddata()
			
 
				-    this.showType = this.isShow
			
 
				-  },
			
 
				-  methods: {
			
 
				-    loaddata() {
			
 
				-      // 数据
			
 
				-      this.id = this.$route.query.id
			
 
				-      examineList({ id: this.$route.query.id })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.deptBudgetList = response
			
 
				-          if (this.deptBudgetList.deliverType == 1) {
			
 
				-            this.deptBudgetList.deliverType1 = '我方自提'
			
 
				-          } else if (this.deptBudgetList.deliverType == 2) {
			
 
				-            this.deptBudgetList.deliverType1 = '对方送货'
			
 
				-          }
			
 
				-        })
			
 
				-      // 包装方式
			
 
				-      packList({ constId: 'CON1' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.packtypeList = response
			
 
				-        })
			
 
				-      // 验收方式
			
 
				-      this.getUnitList()
			
 
				-      // 货名
			
 
				-      packList({ constId: 'CON2' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.goodnameList = response
			
 
				-        })
			
 
				-      // 品级
			
 
				-      packList({ constId: 'CON3' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.gradeList = response
			
 
				-        })
			
 
				-      //转基因
			
 
				-      packList({ constId: 'CON7' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.transgeneList = response
			
 
				-        })  
			
 
				-      // 双章
			
 
				-      packList({ constId: 'CON4' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.ChapterTwoList = response
			
 
				-        })
			
 
				+      }
			
 
				     },
			
 
				-    getUnitList() {
			
 
				-      xiala({
			
 
				-        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-        constCode: 'TYPEYAN',
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.unitList = response
			
 
				-          let currItem
			
 
				-          this.unitList.forEach((item, index, arr) => {
			
 
				-            item.flag = 'delete'
			
 
				-            if (this.vModel == item.constKey) {
			
 
				-              currItem = item
			
 
				+
			
 
				+    activated() {
			
 
				+      this.status = this.$route.query.status
			
 
				+      this.loaddata()
			
 
				+      this.showType = this.isShow
			
 
				+    },
			
 
				+    methods: {
			
 
				+      loaddata() {
			
 
				+        // 数据
			
 
				+        this.id = this.$route.query.id
			
 
				+        examineList({
			
 
				+            id: this.$route.query.id
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deptBudgetList = response
			
 
				+            if (this.deptBudgetList.deliverType == 1) {
			
 
				+              this.deptBudgetList.deliverType1 = '我方自提'
			
 
				+            } else if (this.deptBudgetList.deliverType == 2) {
			
 
				+              this.deptBudgetList.deliverType1 = '对方送货'
			
 
				             }
			
 
				           })
			
 
				-          //
			
 
				-          if (currItem) {
			
 
				-            this.selectContract(currItem.constValue)
			
 
				-          }
			
 
				-        })
			
 
				-    },
			
 
				+        // 包装方式
			
 
				+        packList({
			
 
				+            constId: 'CON1'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.packtypeList = response
			
 
				+          })
			
 
				+        // 验收方式
			
 
				+        this.getUnitList()
			
 
				+        // 货名
			
 
				+        packList({
			
 
				+            constId: 'CON2'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.goodnameList = response
			
 
				+          })
			
 
				+        // 品级
			
 
				+        packList({
			
 
				+            constId: 'CON3'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.gradeList = response
			
 
				+          })
			
 
				+        //转基因
			
 
				+        packList({
			
 
				+            constId: 'CON7'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.transgeneList = response
			
 
				+          })
			
 
				+        // 双章
			
 
				+        packList({
			
 
				+            constId: 'CON4'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.ChapterTwoList = response
			
 
				+          })
			
 
				+      },
			
 
				+      getUnitList() {
			
 
				+        xiala({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            constCode: 'TYPEYAN',
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.unitList = response
			
 
				+            let currItem
			
 
				+            this.unitList.forEach((item, index, arr) => {
			
 
				+              item.flag = 'delete'
			
 
				+              if (this.vModel == item.constKey) {
			
 
				+                currItem = item
			
 
				+              }
			
 
				+            })
			
 
				+            //
			
 
				+            if (currItem) {
			
 
				+              this.selectContract(currItem.constValue)
			
 
				+            }
			
 
				+          })
			
 
				+      },
			
 
				       history(id1) {
			
 
				-      billoperatehis({ id: id1 })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.historyList = response
			
 
				+        billoperatehis({
			
 
				+            id: id1
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.historyList = response
			
 
				+          })
			
 
				+      },
			
 
				+      // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+      handleClose() {
			
 
				+        this.dialogViewSpareMoney = false
			
 
				+      },
			
 
				+      returnsales() {
			
 
				+        this.$router.go(-1)
			
 
				+      },
			
 
				+      confirmationsheet() {
			
 
				+        this.$router.push({
			
 
				+          path: 'priceConfirmationSheet',
			
 
				+          query: {
			
 
				+            contractNo: this.deptBudgetList.contractNo,
			
 
				+            contractType: this.deptBudgetList.contractType,
			
 
				+            id: this.deptBudgetList.id
			
 
				+          }
			
 
				         })
			
 
				+      },
			
 
				     },
			
 
				-    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				-    handleClose() {
			
 
				-      this.dialogViewSpareMoney = false
			
 
				-    },
			
 
				-    returnsales() {
			
 
				-      this.$router.go(-1)
			
 
				-    },
			
 
				-    confirmationsheet() {
			
 
				-      this.$router.push({ path: 'priceConfirmationSheet',
			
 
				-      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType,id:this.deptBudgetList.id } })
			
 
				-    },
			
 
				-  },
			
 
				-}
			
 
				+  }
			
 
				 </script>
			
 
				 <style lang="scss" scoped>
			
 
				-.status-orange,
			
 
				-.status-bule,
			
 
				-.status-green {
			
 
				-  border: 1px solid;
			
 
				-  border-radius: 30px;
			
 
				-  padding: 3px 10px;
			
 
				-  font-size: 16px;
			
 
				-}
			
 
				-.status-orange {
			
 
				-  border-color: #ff9f24;
			
 
				-  color: #ff9f24;
			
 
				-  background: #ffedd5;
			
 
				-}
			
 
				-.status-bule {
			
 
				-  border-color: #5473e8;
			
 
				-  color: #5473e8;
			
 
				-  background: #f0f3fe;
			
 
				-}
			
 
				-.status-green {
			
 
				-  border-color: #50cad4;
			
 
				-  color: #50cad4;
			
 
				-  background: #ecfeff;
			
 
				-}
			
 
				-.el-form {
			
 
				-  padding: 0 15%;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item {
			
 
				-  border-right: 1px solid #cdd2dc;
			
 
				-  border-bottom: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.readonly {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.readonly:after {
			
 
				-  content: '*';
			
 
				-  color: #ff2727;
			
 
				-  position: absolute;
			
 
				-  right: 8px;
			
 
				-  z-index: 10;
			
 
				-  top: 21%;
			
 
				-  font-size: 20px;
			
 
				-}
			
 
				-.title {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.title::before {
			
 
				-  content: '';
			
 
				-  display: inline-block;
			
 
				-  width: 5px;
			
 
				-  height: 30px;
			
 
				-  background: #5473e8;
			
 
				-  position: absolute;
			
 
				-  left: 0;
			
 
				-}
			
 
				-.el-button--primary {
			
 
				-  background-color: #5878e8;
			
 
				-  border-color: #5878e8;
			
 
				-}
			
 
				-.el-col {
			
 
				-  background: #f6f7fc;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				-  padding: 0 25px;
			
 
				-  border-left: 1px solid #cdd2dc;
			
 
				-  background: #fafbfc;
			
 
				-  color: #afb5cb;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				-  width: 140px;
			
 
				-  text-align: center;
			
 
				-  background: #f0f2f6;
			
 
				-  // border: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.button-container {
			
 
				-  display: flex;
			
 
				-  flex-wrap: nowrap;
			
 
				-  justify-content: space-between;
			
 
				-  align-items: center;
			
 
				-  background-color: #fff;
			
 
				-  width: 100%;
			
 
				-  height: 50px;
			
 
				-  padding: 0 10px;
			
 
				-  & > div {
			
 
				-    margin-left: 10px;
			
 
				+  .status-orange,
			
 
				+  .status-bule,
			
 
				+  .status-green {
			
 
				+    border: 1px solid;
			
 
				+    border-radius: 30px;
			
 
				+    padding: 3px 10px;
			
 
				+    font-size: 16px;
			
 
				+  }
			
 
				+
			
 
				+  .status-orange {
			
 
				+    border-color: #ff9f24;
			
 
				+    color: #ff9f24;
			
 
				+    background: #ffedd5;
			
 
				+  }
			
 
				+
			
 
				+  .status-bule {
			
 
				+    border-color: #5473e8;
			
 
				+    color: #5473e8;
			
 
				+    background: #f0f3fe;
			
 
				+  }
			
 
				+
			
 
				+  .status-green {
			
 
				+    border-color: #50cad4;
			
 
				+    color: #50cad4;
			
 
				+    background: #ecfeff;
			
 
				+  }
			
 
				+
			
 
				+  .el-form {
			
 
				+    padding: 0 15%;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item {
			
 
				+    border-right: 1px solid #cdd2dc;
			
 
				+    border-bottom: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .readonly {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .readonly:after {
			
 
				+    content: '*';
			
 
				+    color: #ff2727;
			
 
				+    position: absolute;
			
 
				+    right: 8px;
			
 
				+    z-index: 10;
			
 
				+    top: 21%;
			
 
				+    font-size: 20px;
			
 
				+  }
			
 
				+
			
 
				+  .title {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .title::before {
			
 
				+    content: '';
			
 
				+    display: inline-block;
			
 
				+    width: 5px;
			
 
				+    height: 30px;
			
 
				+    background: #5473e8;
			
 
				+    position: absolute;
			
 
				+    left: 0;
			
 
				+  }
			
 
				+
			
 
				+  .el-button--primary {
			
 
				+    background-color: #5878e8;
			
 
				+    border-color: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .el-col {
			
 
				+    background: #f6f7fc;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				+    padding: 0 25px;
			
 
				+    border-left: 1px solid #cdd2dc;
			
 
				+    background: #fafbfc;
			
 
				+    color: #afb5cb;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+    width: 140px;
			
 
				+    text-align: center;
			
 
				+    background: #f0f2f6;
			
 
				+    // border: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .button-container {
			
 
				     display: flex;
			
 
				     flex-wrap: nowrap;
			
 
				-    flex-direction: row;
			
 
				-    & > span {
			
 
				-      line-height: 50px;
			
 
				-    }
			
 
				-  }
			
 
				+    justify-content: space-between;
			
 
				+    align-items: center;
			
 
				+    background-color: #fff;
			
 
				+    width: 100%;
			
 
				+    height: 50px;
			
 
				+    padding: 0 10px;
			
 
				+
			
 
				+    &>div {
			
 
				+      margin-left: 10px;
			
 
				+      display: flex;
			
 
				+      flex-wrap: nowrap;
			
 
				+      flex-direction: row;
			
 
				 
			
 
				-  /deep/.auditFlow-box {
			
 
				-    position: unset;
			
 
				-    margin-left: 10px;
			
 
				-    &/deep/.auditFlow-icon {
			
 
				-      width: auto;
			
 
				-      padding-right: 30px;
			
 
				+      &>span {
			
 
				+        line-height: 50px;
			
 
				+      }
			
 
				     }
			
 
				-    &/deep/.auditFlow-main {
			
 
				-      position: absolute;
			
 
				+
			
 
				+    /deep/.auditFlow-box {
			
 
				+      position: unset;
			
 
				+      margin-left: 10px;
			
 
				+
			
 
				+      &/deep/.auditFlow-icon {
			
 
				+        width: auto;
			
 
				+        padding-right: 30px;
			
 
				+      }
			
 
				+
			
 
				+      &/deep/.auditFlow-main {
			
 
				+        position: absolute;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.box-app {
			
 
				-  display: inline-block;
			
 
				-  float: left;
			
 
				-  margin-left: 30px;
			
 
				-  line-height: 50px;
			
 
				-}
			
 
				-/deep/.el-dialog {
			
 
				-  .el-form-item {
			
 
				-    margin-bottom: 0 !important;
			
 
				-    .el-input--medium {
			
 
				-      textarea {
			
 
				-        min-height: 100px !important;
			
 
				+
			
 
				+  .box-app {
			
 
				+    display: inline-block;
			
 
				+    float: left;
			
 
				+    margin-left: 30px;
			
 
				+    line-height: 50px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-dialog {
			
 
				+    .el-form-item {
			
 
				+      margin-bottom: 0 !important;
			
 
				+
			
 
				+      .el-input--medium {
			
 
				+        textarea {
			
 
				+          min-height: 100px !important;
			
 
				+        }
			
 
				       }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.collapse-bottom {
			
 
				-  margin-bottom: 20px;
			
 
				-}
			
 
				-.input-main .textarea .el-textarea__inner {
			
 
				-  width: 100%;
			
 
				-  z-index: 1;
			
 
				-}
			
 
				-.bg-left {
			
 
				-  padding-left: 30px;
			
 
				-}
			
 
				-.bg-right {
			
 
				-  padding-right: 10px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.bg-bottom {
			
 
				-  margin: 15px 0px;
			
 
				-}
			
 
				-.wenzi {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.wenzi h3 {
			
 
				-  display: inline-block;
			
 
				-  left: 10px;
			
 
				-}
			
 
				-.wenzi p {
			
 
				-  display: inline-block;
			
 
				-}
			
 
				-.center {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.el-form-item {
			
 
				-  width: 50%;
			
 
				-}
			
 
				-.el-form-item__label {
			
 
				-  text-align: center;
			
 
				-}
			
 
				-.ce {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-/*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				-/*  height: 82px;*/
			
 
				-/*}*/
			
 
				-// 控制select为只读的时候显示样式
			
 
				-
			
 
				-.hide-sel {
			
 
				-  .el-input__inner {
			
 
				-    border: 0px;
			
 
				-  }
			
 
				-  .el-icon-arrow-up {
			
 
				-    display: none;
			
 
				-  }
			
 
				-  .el-textarea__inner {
			
 
				-    background-color: #fff !important;
			
 
				-    border: 0;
			
 
				-  }
			
 
				-  .el-date-editor {
			
 
				-    i {
			
 
				-      display: none;
			
 
				-    }
			
 
				+
			
 
				+  .collapse-bottom {
			
 
				+    margin-bottom: 20px;
			
 
				   }
			
 
				-  .is-disabled {
			
 
				-    .el-input__inner:hover {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-    }
			
 
				-    color: #606266;
			
 
				+
			
 
				+  .input-main .textarea .el-textarea__inner {
			
 
				+    width: 100%;
			
 
				+    z-index: 1;
			
 
				+  }
			
 
				+
			
 
				+  .bg-left {
			
 
				+    padding-left: 30px;
			
 
				+  }
			
 
				+
			
 
				+  .bg-right {
			
 
				+    padding-right: 10px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .bg-bottom {
			
 
				+    margin: 15px 0px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi h3 {
			
 
				+    display: inline-block;
			
 
				+    left: 10px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi p {
			
 
				+    display: inline-block;
			
 
				+  }
			
 
				+
			
 
				+  .center {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item {
			
 
				+    width: 50%;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item__label {
			
 
				+    text-align: center;
			
 
				+  }
			
 
				+
			
 
				+  .ce {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				+  /*  height: 82px;*/
			
 
				+  /*}*/
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+
			
 
				+  .hide-sel {
			
 
				     .el-input__inner {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-      color: #606266;
			
 
				+      border: 0px;
			
 
				     }
			
 
				+
			
 
				+    .el-icon-arrow-up {
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				     .el-textarea__inner {
			
 
				       background-color: #fff !important;
			
 
				       border: 0;
			
 
				+    }
			
 
				+
			
 
				+    .el-date-editor {
			
 
				+      i {
			
 
				+        display: none;
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+    .is-disabled {
			
 
				+      .el-input__inner:hover {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+      }
			
 
				+
			
 
				       color: #606266;
			
 
				+
			
 
				+      .el-input__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				+
			
 
				+      .el-textarea__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				 
			
 
				-// 控制select为只读的时候显示样式
			
 
				-/deep/.ws-class-table-col {
			
 
				-  height: auto;
			
 
				-  padding: 0px 2px;
			
 
				-  /deep/.el-input__inner {
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+  /deep/.ws-class-table-col {
			
 
				+    height: auto;
			
 
				     padding: 0px 2px;
			
 
				+
			
 
				+    /deep/.el-input__inner {
			
 
				+      padding: 0px 2px;
			
 
				+    }
			
 
				   }
			
 
				-}
			
 
				-/deep/.is-disabled {
			
 
				-  .el-input__prefix,
			
 
				-  .el-input__suffix {
			
 
				-    display: none;
			
 
				+
			
 
				+  /deep/.is-disabled {
			
 
				+    .el-input__prefix,
			
 
				+    .el-input__suffix {
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				+    .el-input__inner {
			
 
				+      background-color: #fff;
			
 
				+      border-color: #fff !important;
			
 
				+      color: #000 !important;
			
 
				+      font-size: 14px;
			
 
				+      cursor: text;
			
 
				+      padding: 0 !important;
			
 
				+    }
			
 
				   }
			
 
				-  .el-input__inner {
			
 
				-    background-color: #fff;
			
 
				-    border-color: #fff !important;
			
 
				-    color: #000 !important;
			
 
				+
			
 
				+  .winseaview-view {
			
 
				+    padding: 0 0 20px;
			
 
				+  }
			
 
				+
			
 
				+  .container {
			
 
				+    overflow: scroll;
			
 
				+    height: 93vh;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				+    width: 130px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text-left {
			
 
				+    width: 62px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text {
			
 
				+    margin: 0 10px;
			
 
				+    color: #8890b1;
			
 
				+    font-size: 12px;
			
 
				+    margin-top: -4px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-line {
			
 
				+    height: 100px;
			
 
				+    border-left: 2px solid #e9ecf7;
			
 
				+    margin-left: 4px;
			
 
				+    padding: 0 3px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle {
			
 
				+    width: 10px;
			
 
				+    height: 10px;
			
 
				+    border: 2px solid #5878e8;
			
 
				+    background-color: #ffffff;
			
 
				+    -webkit-border-radius: 100px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle:first-child {
			
 
				+    color: red;
			
 
				+  }
			
 
				+
			
 
				+  .icon {
			
 
				+    display: inline-block;
			
 
				+    width: 60px;
			
 
				+    background: #ecfeff;
			
 
				+    border-radius: 12px;
			
 
				+    border: 1px solid #50cad4;
			
 
				+    position: relative;
			
 
				     font-size: 14px;
			
 
				-    cursor: text;
			
 
				-    padding: 0 !important;
			
 
				-  }
			
 
				-}
			
 
				-.winseaview-view {
			
 
				-  padding: 0 0 20px;
			
 
				-}
			
 
				-.container {
			
 
				-  overflow: scroll;
			
 
				-  height: 93vh;
			
 
				-}
			
 
				-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				-  width: 130px;
			
 
				-}
			
 
				-.vertical-text-left {
			
 
				-  width: 62px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.vertical-text {
			
 
				-  margin: 0 10px;
			
 
				-  color: #8890b1;
			
 
				-  font-size: 12px;
			
 
				-  margin-top: -4px;
			
 
				-}
			
 
				-.vertical-line {
			
 
				-  height: 100px;
			
 
				-  border-left: 2px solid #e9ecf7;
			
 
				-  margin-left: 4px;
			
 
				-  padding: 0 3px;
			
 
				-}
			
 
				-.vertical-circle {
			
 
				-  width: 10px;
			
 
				-  height: 10px;
			
 
				-  border: 2px solid #5878e8;
			
 
				-  background-color: #ffffff;
			
 
				-  -webkit-border-radius: 100px;
			
 
				-}
			
 
				-.vertical-circle:first-child {
			
 
				-  color: red;
			
 
				-}
			
 
				-.icon {
			
 
				-  display: inline-block;
			
 
				-  width: 60px;
			
 
				-  height: 24px;
			
 
				-  background: #ecfeff;
			
 
				-  border-radius: 12px;
			
 
				-  border: 1px solid #50cad4;
			
 
				-  position: relative;
			
 
				-  font-size: 14px;
			
 
				-  color: #50cad4;
			
 
				-  line-height: 24px;
			
 
				-  padding: 1px 7px;
			
 
				-}
			
 
				-.queren{
			
 
				-  margin-left: 100%;
			
 
				-  margin-top: -60px;
			
 
				-}
			
 
				+    color: #50cad4;
			
 
				+    padding: 1px 7px;
			
 
				+  }
			
 
				+
			
 
				+  .title-top {
			
 
				+    margin-top: 20px;
			
 
				+    font-size: 21px;
			
 
				+    font-weight: 600;
			
 
				+  }
			
 
				+
			
 
				+  .title-number {
			
 
				+    font-size: 14px;
			
 
				+    font-weight: 400;
			
 
				+  }
			
 
				+
			
 
				+  .queren {
			
 
				+    margin-left: 100%;
			
 
				+    margin-top: -60px;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/contractManagement/futuresSalesContract.vue
+++ b/src/views/contractManagement/futuresSalesContract.vue
@@ -4,13 +4,7 @@
 
				 		<BaseHeaderLayout :leftSpan="8">
			
 
				 			<template slot="left">
			
 
				 				<ws-button type="primary" @click="handleAdd()"
			
 
				-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.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>
			
 
				+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
			
 
				 				<ws-button @click="exportlist()" v-hasPermission="
			
 
				             `contractManagement.buyContract.buyContractInfo.view`
			
 
				           ">导出</ws-button>
			
@@ -128,7 +122,9 @@
 
				 		</el-pagination>
			
 
				 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
			
 
				 			@on-cancel="handleClose">
			
 
				-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
			
 
				+			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" 
			
 
				+			:size-limit="size"
			
 
				+        	@onChange="onChange"
			
 
				 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				 		</WinseaContentModal>
			
 
				 	</div>
			
@@ -140,6 +136,7 @@
 
				 		editstatus,
			
 
				 		billoperatehis,
			
 
				 		deletecontract,
			
 
				+		editInfo
			
 
				 	} from '@/model/contarct/index'
			
 
				 	import {
			
 
				 		downloadFile
			
@@ -174,6 +171,7 @@
 
				 				// 表格显示数据
			
 
				 				tableDate: [],
			
 
				 				size: 10,
			
 
				+				id:'',
			
 
				 				// 是否显示
			
 
				 				showType: true,
			
 
				 				// 年
			
@@ -280,6 +278,26 @@
 
				 			this.showType = this.isShow
			
 
				 		},
			
 
				 		methods: {
			
 
				+		onChange () {
			
 
				+			this.$refs.upload
			
 
				+				.handleSaveBill()
			
 
				+				.then(async response => {
			
 
				+				this.deptBudgetList.addressUrl = response
			
 
				+				this.deptBudgetList.id=this.id
			
 
				+				this.deptBudgetList.flag=1
			
 
				+				 editInfo(this.deptBudgetList)
			
 
				+				.toPromise()
			
 
				+				.then((response) => {
			
 
				+					this.accessoryTFs = false
			
 
				+					this.$message.success('上传成功')
			
 
				+					this.getList()
			
 
				+				})
			
 
				+				})
			
 
				+				.catch(res => {
			
 
				+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
			
 
				+				this.$refs.upload.clearFiles()
			
 
				+				})
			
 
				+			},
			
 
				 			dateFormat(fmt, date) {
			
 
				 				let ret
			
 
				 				const opt = {
			
@@ -335,7 +353,7 @@
 
				 					.toPromise()
			
 
				 					.then((response) => {
			
 
				 						for (var i = 0; i < response.records.length; i++) {
			
 
				-							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
			
 
				+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
			
 
				 								response.records[i].addressUrlArray =
			
 
				 									response.records[i].addressUrl.split(',')
			
 
				 							} else {
			
@@ -408,14 +426,8 @@
 
				 				}
			
 
				 			},
			
 
				 			fujian(row) {
			
 
				-				if (row.addressUrl === null || row.addressUrl === '') {
			
 
				-					EventBus.$emit(
			
 
				-						'warning',
			
 
				-						this.$t('system.noticeCircular.NoInformation')
			
 
				-					)
			
 
				-				} else {
			
 
				-					this.accessoryTFs = true
			
 
				-				}
			
 
				+				this.id=row.id
			
 
				+				this.accessoryTFs = true
			
 
				 				this.appendixIdss = row.addressUrl
			
 
				 			},
			
 
				 			handleExamine(row) {
			
--- a/src/views/contractManagement/futuresSalesContractAdd.vue
+++ b/src/views/contractManagement/futuresSalesContractAdd.vue
@@ -15,7 +15,7 @@
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				         <p style="color: #8890b1">
			
 
				-          注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。
			
 
				+          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
			
 
				         </p>
			
 
				       </div>
			
 
				       <ws-info-table>
			
@@ -1466,6 +1466,8 @@
 
				         for (var i = 0; i < this.gradeList.length; i++) {
			
 
				           if (this.gradeList[i].constValue == e) {
			
 
				             this.deptBudgetList.gradeKey = this.gradeList[i].constKey
			
 
				+            this.deptBudgetList.contractGoodsInfo.gradeKey =
			
 
				+              this.gradeList[i].constKey
			
 
				           }
			
 
				         }
			
 
				       },
			
@@ -1843,4 +1845,7 @@
 
				    .inline-input {
			
 
				       width: 100%;
			
 
				     }
			
 
				+    .typeselect{
			
 
				+      width: 100%;
			
 
				+    }
			
 
				 </style>
			
--- a/src/views/contractManagement/futuresSalesContractEdit.vue
+++ b/src/views/contractManagement/futuresSalesContractEdit.vue
@@ -16,7 +16,7 @@
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				         <p style="color: #8890b1">
			
 
				-          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
			
 
				+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
			
 
				           标记的条目提交后不可修改。
			
 
				         </p>
			
 
				         <div class="queren">
			
--- a/src/views/contractManagement/futuresSalesContractExamine.vue
+++ b/src/views/contractManagement/futuresSalesContractExamine.vue
@@ -6,70 +6,46 @@
 
				         <h2 class="bg-left title">查看合同详情</h2>
			
 
				       </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=""
			
 
				-          />返回</el-button
			
 
				-        >
			
 
				+        <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="" />返回
			
 
				+        </el-button>
			
 
				       </el-col>
			
 
				     </el-row>
			
 
				 
			
 
				-    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList"
			
 
				-      ><div style="margin-top: 20px; font-size: 24px">
			
 
				-        销售合同<span style="font-size: 16px"
			
 
				-          >【编号:{{ deptBudgetList.contractNo }}】</span
			
 
				-        >
			
 
				+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
			
 
				+      <div class="title-top">
			
 
				+        采购合同<span class="title-number">【编号:{{ deptBudgetList.contractNo }}】</span>
			
 
				         <div class="icon">
			
 
				-        <template>
			
 
				-          <el-popover
			
 
				-            placement="right"
			
 
				-            :width="285"
			
 
				-            trigger="click"
			
 
				-            visible-arrow="false"
			
 
				-            @show="history(deptBudgetList.id)"
			
 
				-          >
			
 
				           <template>
			
 
				-            <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				-          </template>
			
 
				-            <div>
			
 
				-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				-              <div v-for="(item, index) in historyList" class="flex">
			
 
				-                <div class="vertical-text vertical-text-left">
			
 
				-                  {{ item.updateDate }}
			
 
				-                </div>
			
 
				-                <div>
			
 
				-                  <div class="vertical-circle"></div>
			
 
				-                  <div
			
 
				-                    v-if="index != historyList.length - 1"
			
 
				-                    class="vertical-line"
			
 
				-                  ></div>
			
 
				-                </div>
			
 
				-                <div class="vertical-text">
			
 
				-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+            <el-popover placement="right" :width="285" trigger="click" visible-arrow="false"
			
 
				+              @show="history(deptBudgetList.id)">
			
 
				+              <template>
			
 
				+                <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				+              </template>
			
 
				+              <div>
			
 
				+                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				+                <div v-for="(item, index) in historyList" class="flex">
			
 
				+                  <div class="vertical-text vertical-text-left">
			
 
				+                    {{ item.updateDate }}
			
 
				+                  </div>
			
 
				+                  <div>
			
 
				+                    <div class="vertical-circle"></div>
			
 
				+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
			
 
				+                  </div>
			
 
				+                  <div class="vertical-text">
			
 
				+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+                  </div>
			
 
				                 </div>
			
 
				               </div>
			
 
				-            </div>
			
 
				-          </el-popover>
			
 
				-        </template>
			
 
				-      </div>
			
 
				+            </el-popover>
			
 
				+          </template>
			
 
				+        </div>
			
 
				       </div>
			
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				-        <div class="queren"><el-button
			
 
				-          class="bg-bottom"
			
 
				-          type="primary"
			
 
				-          size="small"
			
 
				-          @click="confirmationsheet()"
			
 
				-          >确认单</el-button
			
 
				-        ></div>
			
 
				+        <div class="queren">
			
 
				+          <el-button class="bg-bottom" type="primary" size="small" @click="confirmationsheet()">确认单</el-button>
			
 
				+        </div>
			
 
				       </div>
			
 
				       <ws-info-table>
			
 
				         <ws-form-item label="合同编号" span="1" prop="contractNo">
			
@@ -81,17 +57,13 @@
 
				         <ws-form-item label="买方" span="1" prop="buyer">
			
 
				           {{ deptBudgetList.buyer }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="结算方式" span="1" prop="settlementMethod"
			
 
				-          >{{ deptBudgetList.settlementMethod }}
			
 
				+        <ws-form-item label="结算方式" span="1" prop="settlementMethod">{{ deptBudgetList.settlementMethod }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="买方电话" span="1" prop="buyerPhone"
			
 
				-          >{{ deptBudgetList.buyerPhone }}
			
 
				+        <ws-form-item label="买方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="交货方式" span="1" prop="deliverType1"
			
 
				-          >{{ deptBudgetList.deliverType1 }}
			
 
				+        <ws-form-item label="交货方式" span="1" prop="deliverType1">{{ deptBudgetList.deliverType1 }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="卖方" span="1" prop="seller"
			
 
				-          >{{ deptBudgetList.seller }}
			
 
				+        <ws-form-item label="卖方" span="1" prop="seller">{{ deptBudgetList.seller }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="包装方式" span="1" prop="packingMethod">
			
 
				           {{ deptBudgetList.packingMethod }}
			
@@ -105,7 +77,7 @@
 
				         <ws-form-item label="交易数量（吨）" span="1" prop="weight">
			
 
				           {{ deptBudgetList.weight }}
			
 
				         </ws-form-item>
			
 
				-         <ws-form-item label="计量标准" span="1" prop="measurementStandard">
			
 
				+        <ws-form-item label="计量标准" span="1" prop="measurementStandard">
			
 
				           {{ deptBudgetList.measurementStandard }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="基差（元/吨）" span="1" prop="basisPrice">
			
@@ -167,37 +139,22 @@
 
				         <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
			
 
				           {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="霉变粒（%）<="
			
 
				-          span="1"
			
 
				-          prop="mildewGrain"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
			
 
				           {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="不完善粒（%）<="
			
 
				-          span="1"
			
 
				-          prop="imperfectGrain"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="蛋白（%）>="
			
 
				-          span="1"
			
 
				-          prop="protein"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="蛋白（%）>=" span="1" prop="protein" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.protein }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="转基因" span="1" prop="transgene">
			
 
				           {{ deptBudgetList.contractGoodsInfo.transgene }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="产地" span="1" >
			
 
				+        <ws-form-item label="产地" span="1">
			
 
				           {{ deptBudgetList.contractGoodsInfo.outputPrivate }}
			
 
				           {{ deptBudgetList.contractGoodsInfo.outputCity }}
			
 
				         </ws-form-item>
			
@@ -206,468 +163,541 @@
 
				         <h3>流程信息</h3>
			
 
				       </div>
			
 
				       <ws-info-table>
			
 
				-         <!--已付款（元）-->
			
 
				+        <!--已付款（元）-->
			
 
				         <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
			
 
				           {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
			
 
				           {{ deptBudgetList.contractProcessInfo.goodsName }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="费用支出（元）" span="1" prop="waterContent"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.waterContent }}
			
 
				+        <ws-form-item label="费用支出（元）" span="1" prop="waterContent">{{ deptBudgetList.contractProcessInfo.waterContent }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="未开发票（元）" span="1" prop="impurity"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.impurity }}
			
 
				+        <ws-form-item label="未开发票（元）" span="1" prop="impurity">{{ deptBudgetList.contractProcessInfo.impurity }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="未回款（元）" span="1" prop="mildewGrain">
			
 
				           {{deptBudgetList.contractProcessInfo.mildewGrain}}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="双章原件回收情况" span="1" prop="grade"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.grade }}
			
 
				+        <ws-form-item label="双章原件回收情况" span="1" prop="grade">{{ deptBudgetList.contractProcessInfo.grade }}
			
 
				         </ws-form-item>
			
 
				       </ws-info-table>
			
 
				       <div class="remark">
			
 
				         <h3>备注信息</h3>
			
 
				       </div>
			
 
				       <div style=" color: #afb5cb;margin-left: 20px;">
			
 
				-      {{ deptBudgetList.remarks }}
			
 
				+        {{ deptBudgetList.remarks }}
			
 
				       </div>
			
 
				-     <ws-upload
			
 
				-        ref="upload"
			
 
				-        :comp-id="compId"
			
 
				-        :appendix-ids="deptBudgetList.addressUrl"
			
 
				-        :editable="false"
			
 
				-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				-      />
			
 
				+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false"
			
 
				+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				     </ws-form>
			
 
				     <div style="text-align: right; padding: 10px">
			
 
				-      <el-button
			
 
				-        class="bg-bottom"
			
 
				-        type="primary"
			
 
				-        size="small"
			
 
				-        @click="returnsales()"
			
 
				-        >关闭</el-button
			
 
				-      >
			
 
				+      <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">关闭</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				-import {
			
 
				-  packList,
			
 
				-  xiala,
			
 
				-  examineList,
			
 
				-  billoperatehis,
			
 
				-} from '@/model/contarct/index'
			
 
				-export default {
			
 
				-  name: 'viewSpareMoney',
			
 
				-  watch: {
			
 
				-    vesselId(val) {
			
 
				-      this.getVesselData()
			
 
				-    },
			
 
				-    isShow(val) {
			
 
				-      this.showType = val
			
 
				-    },
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      //弹出框
			
 
				-      dialogViewSpareMoney: false,
			
 
				-      dialogApproveFormVisible: false,
			
 
				-      // 船舶类型
			
 
				-      monetaryKey: null,
			
 
				-      // 表格显示数据
			
 
				-      tableDate: [],
			
 
				-      // 是否显示
			
 
				-      showType: true,
			
 
				-      // 年
			
 
				-      year: '',
			
 
				-      status: '',
			
 
				-      // 提交类型
			
 
				-      submitType: true,
			
 
				-      historyList:[],
			
 
				-      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
			
 
				-      ruleDeptBudget: [],
			
 
				-      deptBudgetList: {
			
 
				-        contractProcessInfo: {},
			
 
				-        contractGoodsInfo: {},
			
 
				+  import {
			
 
				+    packList,
			
 
				+    xiala,
			
 
				+    examineList,
			
 
				+    billoperatehis,
			
 
				+  } from '@/model/contarct/index'
			
 
				+  export default {
			
 
				+    name: 'viewSpareMoney',
			
 
				+    watch: {
			
 
				+      vesselId(val) {
			
 
				+        this.getVesselData()
			
 
				+      },
			
 
				+      isShow(val) {
			
 
				+        this.showType = val
			
 
				       },
			
 
				-      mainReportAdd: {},
			
 
				-      list: {},
			
 
				-      id : '',
			
 
				-      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-    }
			
 
				-  },
			
 
				-
			
 
				-  activated() {
			
 
				-    this.status = this.$route.query.status
			
 
				-    this.loaddata()
			
 
				-    this.showType = this.isShow
			
 
				-  },
			
 
				-  methods: {
			
 
				-    loaddata() {
			
 
				-      // 数据
			
 
				-      this.id = this.$route.query.id
			
 
				-      examineList({ id: this.$route.query.id })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.deptBudgetList = response
			
 
				-          if (this.deptBudgetList.deliverType == 1) {
			
 
				-            this.deptBudgetList.deliverType1 = '我方自提'
			
 
				-          } else if (this.deptBudgetList.deliverType == 2) {
			
 
				-            this.deptBudgetList.deliverType1 = '对方送货'
			
 
				-          }
			
 
				-        })
			
 
				-      // 包装方式
			
 
				-      packList({ constId: 'CON1' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.packtypeList = response
			
 
				-        })
			
 
				-      // 验收方式
			
 
				-      this.getUnitList()
			
 
				-      // 货名
			
 
				-      packList({ constId: 'CON2' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.goodnameList = response
			
 
				-        })
			
 
				-      // 品级
			
 
				-      packList({ constId: 'CON3' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.gradeList = response
			
 
				-        })
			
 
				-      //转基因
			
 
				-      packList({ constId: 'CON7' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.transgeneList = response
			
 
				-        })  
			
 
				-      // 双章
			
 
				-      packList({ constId: 'CON4' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.ChapterTwoList = response
			
 
				-        })
			
 
				     },
			
 
				-    getUnitList() {
			
 
				-      xiala({
			
 
				+    data() {
			
 
				+      return {
			
 
				+        //弹出框
			
 
				+        dialogViewSpareMoney: false,
			
 
				+        dialogApproveFormVisible: false,
			
 
				+        // 船舶类型
			
 
				+        monetaryKey: null,
			
 
				+        // 表格显示数据
			
 
				+        tableDate: [],
			
 
				+        // 是否显示
			
 
				+        showType: true,
			
 
				+        // 年
			
 
				+        year: '',
			
 
				+        status: '',
			
 
				+        // 提交类型
			
 
				+        submitType: true,
			
 
				+        historyList: [],
			
 
				+        tableData: [{
			
 
				+          date: 1111,
			
 
				+          name: 'qqqq',
			
 
				+          address: 'errrtt'
			
 
				+        }],
			
 
				+        ruleDeptBudget: [],
			
 
				+        deptBudgetList: {
			
 
				+          contractProcessInfo: {},
			
 
				+          contractGoodsInfo: {},
			
 
				+        },
			
 
				+        mainReportAdd: {},
			
 
				+        list: {},
			
 
				+        id: '',
			
 
				         compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-        constCode: 'TYPEYAN',
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.unitList = response
			
 
				-          let currItem
			
 
				-          this.unitList.forEach((item, index, arr) => {
			
 
				-            item.flag = 'delete'
			
 
				-            if (this.vModel == item.constKey) {
			
 
				-              currItem = item
			
 
				+      }
			
 
				+    },
			
 
				+
			
 
				+    activated() {
			
 
				+      this.status = this.$route.query.status
			
 
				+      this.loaddata()
			
 
				+      this.showType = this.isShow
			
 
				+    },
			
 
				+    methods: {
			
 
				+      loaddata() {
			
 
				+        // 数据
			
 
				+        this.id = this.$route.query.id
			
 
				+        examineList({
			
 
				+            id: this.$route.query.id
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deptBudgetList = response
			
 
				+            if (this.deptBudgetList.deliverType == 1) {
			
 
				+              this.deptBudgetList.deliverType1 = '我方自提'
			
 
				+            } else if (this.deptBudgetList.deliverType == 2) {
			
 
				+              this.deptBudgetList.deliverType1 = '对方送货'
			
 
				             }
			
 
				           })
			
 
				-          //
			
 
				-          if (currItem) {
			
 
				-            this.selectContract(currItem.constValue)
			
 
				-          }
			
 
				-        })
			
 
				-    },
			
 
				+        // 包装方式
			
 
				+        packList({
			
 
				+            constId: 'CON1'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.packtypeList = response
			
 
				+          })
			
 
				+        // 验收方式
			
 
				+        this.getUnitList()
			
 
				+        // 货名
			
 
				+        packList({
			
 
				+            constId: 'CON2'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.goodnameList = response
			
 
				+          })
			
 
				+        // 品级
			
 
				+        packList({
			
 
				+            constId: 'CON3'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.gradeList = response
			
 
				+          })
			
 
				+        //转基因
			
 
				+        packList({
			
 
				+            constId: 'CON7'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.transgeneList = response
			
 
				+          })
			
 
				+        // 双章
			
 
				+        packList({
			
 
				+            constId: 'CON4'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.ChapterTwoList = response
			
 
				+          })
			
 
				+      },
			
 
				+      getUnitList() {
			
 
				+        xiala({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            constCode: 'TYPEYAN',
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.unitList = response
			
 
				+            let currItem
			
 
				+            this.unitList.forEach((item, index, arr) => {
			
 
				+              item.flag = 'delete'
			
 
				+              if (this.vModel == item.constKey) {
			
 
				+                currItem = item
			
 
				+              }
			
 
				+            })
			
 
				+            //
			
 
				+            if (currItem) {
			
 
				+              this.selectContract(currItem.constValue)
			
 
				+            }
			
 
				+          })
			
 
				+      },
			
 
				       history(id1) {
			
 
				-      billoperatehis({ id: id1 })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.historyList = response
			
 
				+        billoperatehis({
			
 
				+            id: id1
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.historyList = response
			
 
				+          })
			
 
				+      },
			
 
				+      // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+      handleClose() {
			
 
				+        this.dialogViewSpareMoney = false
			
 
				+      },
			
 
				+      returnsales() {
			
 
				+        this.$router.go(-1)
			
 
				+      },
			
 
				+      confirmationsheet() {
			
 
				+        this.$router.push({
			
 
				+          path: 'priceConfirmationSheet',
			
 
				+          query: {
			
 
				+            contractNo: this.deptBudgetList.contractNo,
			
 
				+            contractType: this.deptBudgetList.contractType,
			
 
				+            id: this.deptBudgetList.id
			
 
				+          }
			
 
				         })
			
 
				+      },
			
 
				     },
			
 
				-    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				-    handleClose() {
			
 
				-      this.dialogViewSpareMoney = false
			
 
				-    },
			
 
				-    returnsales() {
			
 
				-      this.$router.go(-1)
			
 
				-    },
			
 
				-    confirmationsheet() {
			
 
				-      this.$router.push({ path: 'priceConfirmationSheet',
			
 
				-      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType , id : this.deptBudgetList.id} })
			
 
				-    },
			
 
				-  },
			
 
				-}
			
 
				+  }
			
 
				 </script>
			
 
				 <style lang="scss" scoped>
			
 
				-.status-orange,
			
 
				-.status-bule,
			
 
				-.status-green {
			
 
				-  border: 1px solid;
			
 
				-  border-radius: 30px;
			
 
				-  padding: 3px 10px;
			
 
				-  font-size: 16px;
			
 
				-}
			
 
				-.status-orange {
			
 
				-  border-color: #ff9f24;
			
 
				-  color: #ff9f24;
			
 
				-  background: #ffedd5;
			
 
				-}
			
 
				-.status-bule {
			
 
				-  border-color: #5473e8;
			
 
				-  color: #5473e8;
			
 
				-  background: #f0f3fe;
			
 
				-}
			
 
				-.status-green {
			
 
				-  border-color: #50cad4;
			
 
				-  color: #50cad4;
			
 
				-  background: #ecfeff;
			
 
				-}
			
 
				-.el-form {
			
 
				-  padding: 0 15%;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item {
			
 
				-  border-right: 1px solid #cdd2dc;
			
 
				-  border-bottom: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.readonly {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.readonly:after {
			
 
				-  content: '*';
			
 
				-  color: #ff2727;
			
 
				-  position: absolute;
			
 
				-  right: 8px;
			
 
				-  z-index: 10;
			
 
				-  top: 21%;
			
 
				-  font-size: 20px;
			
 
				-}
			
 
				-.title {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.title::before {
			
 
				-  content: '';
			
 
				-  display: inline-block;
			
 
				-  width: 5px;
			
 
				-  height: 30px;
			
 
				-  background: #5473e8;
			
 
				-  position: absolute;
			
 
				-  left: 0;
			
 
				-}
			
 
				-.el-button--primary {
			
 
				-  background-color: #5878e8;
			
 
				-  border-color: #5878e8;
			
 
				-}
			
 
				-.el-col {
			
 
				-  background: #f6f7fc;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				-  padding: 0 25px;
			
 
				-  border-left: 1px solid #cdd2dc;
			
 
				-  background: #fafbfc;
			
 
				-  color: #afb5cb;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				-  width: 140px;
			
 
				-  text-align: center;
			
 
				-  background: #f0f2f6;
			
 
				-  // border: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.button-container {
			
 
				-  display: flex;
			
 
				-  flex-wrap: nowrap;
			
 
				-  justify-content: space-between;
			
 
				-  align-items: center;
			
 
				-  background-color: #fff;
			
 
				-  width: 100%;
			
 
				-  height: 50px;
			
 
				-  padding: 0 10px;
			
 
				-  & > div {
			
 
				-    margin-left: 10px;
			
 
				+  .status-orange,
			
 
				+  .status-bule,
			
 
				+  .status-green {
			
 
				+    border: 1px solid;
			
 
				+    border-radius: 30px;
			
 
				+    padding: 3px 10px;
			
 
				+    font-size: 16px;
			
 
				+  }
			
 
				+
			
 
				+  .status-orange {
			
 
				+    border-color: #ff9f24;
			
 
				+    color: #ff9f24;
			
 
				+    background: #ffedd5;
			
 
				+  }
			
 
				+
			
 
				+  .status-bule {
			
 
				+    border-color: #5473e8;
			
 
				+    color: #5473e8;
			
 
				+    background: #f0f3fe;
			
 
				+  }
			
 
				+
			
 
				+  .status-green {
			
 
				+    border-color: #50cad4;
			
 
				+    color: #50cad4;
			
 
				+    background: #ecfeff;
			
 
				+  }
			
 
				+
			
 
				+  .el-form {
			
 
				+    padding: 0 15%;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item {
			
 
				+    border-right: 1px solid #cdd2dc;
			
 
				+    border-bottom: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .readonly {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .readonly:after {
			
 
				+    content: '*';
			
 
				+    color: #ff2727;
			
 
				+    position: absolute;
			
 
				+    right: 8px;
			
 
				+    z-index: 10;
			
 
				+    top: 21%;
			
 
				+    font-size: 20px;
			
 
				+  }
			
 
				+
			
 
				+  .title {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .title::before {
			
 
				+    content: '';
			
 
				+    display: inline-block;
			
 
				+    width: 5px;
			
 
				+    height: 30px;
			
 
				+    background: #5473e8;
			
 
				+    position: absolute;
			
 
				+    left: 0;
			
 
				+  }
			
 
				+
			
 
				+  .el-button--primary {
			
 
				+    background-color: #5878e8;
			
 
				+    border-color: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .el-col {
			
 
				+    background: #f6f7fc;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				+    padding: 0 25px;
			
 
				+    border-left: 1px solid #cdd2dc;
			
 
				+    background: #fafbfc;
			
 
				+    color: #afb5cb;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+    width: 140px;
			
 
				+    text-align: center;
			
 
				+    background: #f0f2f6;
			
 
				+    // border: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .button-container {
			
 
				     display: flex;
			
 
				     flex-wrap: nowrap;
			
 
				-    flex-direction: row;
			
 
				-    & > span {
			
 
				-      line-height: 50px;
			
 
				-    }
			
 
				-  }
			
 
				+    justify-content: space-between;
			
 
				+    align-items: center;
			
 
				+    background-color: #fff;
			
 
				+    width: 100%;
			
 
				+    height: 50px;
			
 
				+    padding: 0 10px;
			
 
				 
			
 
				-  /deep/.auditFlow-box {
			
 
				-    position: unset;
			
 
				-    margin-left: 10px;
			
 
				-    &/deep/.auditFlow-icon {
			
 
				-      width: auto;
			
 
				-      padding-right: 30px;
			
 
				+    &>div {
			
 
				+      margin-left: 10px;
			
 
				+      display: flex;
			
 
				+      flex-wrap: nowrap;
			
 
				+      flex-direction: row;
			
 
				+
			
 
				+      &>span {
			
 
				+        line-height: 50px;
			
 
				+      }
			
 
				     }
			
 
				-    &/deep/.auditFlow-main {
			
 
				-      position: absolute;
			
 
				+
			
 
				+    /deep/.auditFlow-box {
			
 
				+      position: unset;
			
 
				+      margin-left: 10px;
			
 
				+
			
 
				+      &/deep/.auditFlow-icon {
			
 
				+        width: auto;
			
 
				+        padding-right: 30px;
			
 
				+      }
			
 
				+
			
 
				+      &/deep/.auditFlow-main {
			
 
				+        position: absolute;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.box-app {
			
 
				-  display: inline-block;
			
 
				-  float: left;
			
 
				-  margin-left: 30px;
			
 
				-  line-height: 50px;
			
 
				-}
			
 
				-/deep/.el-dialog {
			
 
				-  .el-form-item {
			
 
				-    margin-bottom: 0 !important;
			
 
				-    .el-input--medium {
			
 
				-      textarea {
			
 
				-        min-height: 100px !important;
			
 
				+
			
 
				+  .box-app {
			
 
				+    display: inline-block;
			
 
				+    float: left;
			
 
				+    margin-left: 30px;
			
 
				+    line-height: 50px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-dialog {
			
 
				+    .el-form-item {
			
 
				+      margin-bottom: 0 !important;
			
 
				+
			
 
				+      .el-input--medium {
			
 
				+        textarea {
			
 
				+          min-height: 100px !important;
			
 
				+        }
			
 
				       }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.collapse-bottom {
			
 
				-  margin-bottom: 20px;
			
 
				-}
			
 
				-.input-main .textarea .el-textarea__inner {
			
 
				-  width: 100%;
			
 
				-  z-index: 1;
			
 
				-}
			
 
				-.bg-left {
			
 
				-  padding-left: 30px;
			
 
				-}
			
 
				-.bg-right {
			
 
				-  padding-right: 10px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.bg-bottom {
			
 
				-  margin: 15px 0px;
			
 
				-}
			
 
				-.wenzi {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.wenzi h3 {
			
 
				-  display: inline-block;
			
 
				-  left: 10px;
			
 
				-}
			
 
				-.wenzi p {
			
 
				-  display: inline-block;
			
 
				-}
			
 
				-.center {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.el-form-item {
			
 
				-  width: 50%;
			
 
				-}
			
 
				-.el-form-item__label {
			
 
				-  text-align: center;
			
 
				-}
			
 
				-.ce {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-/*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				-/*  height: 82px;*/
			
 
				-/*}*/
			
 
				-// 控制select为只读的时候显示样式
			
 
				-
			
 
				-.hide-sel {
			
 
				-  .el-input__inner {
			
 
				-    border: 0px;
			
 
				-  }
			
 
				-  .el-icon-arrow-up {
			
 
				-    display: none;
			
 
				-  }
			
 
				-  .el-textarea__inner {
			
 
				-    background-color: #fff !important;
			
 
				-    border: 0;
			
 
				-  }
			
 
				-  .el-date-editor {
			
 
				-    i {
			
 
				-      display: none;
			
 
				-    }
			
 
				+
			
 
				+  .collapse-bottom {
			
 
				+    margin-bottom: 20px;
			
 
				   }
			
 
				-  .is-disabled {
			
 
				-    .el-input__inner:hover {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-    }
			
 
				-    color: #606266;
			
 
				+
			
 
				+  .input-main .textarea .el-textarea__inner {
			
 
				+    width: 100%;
			
 
				+    z-index: 1;
			
 
				+  }
			
 
				+
			
 
				+  .bg-left {
			
 
				+    padding-left: 30px;
			
 
				+  }
			
 
				+
			
 
				+  .bg-right {
			
 
				+    padding-right: 10px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .bg-bottom {
			
 
				+    margin: 15px 0px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi h3 {
			
 
				+    display: inline-block;
			
 
				+    left: 10px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi p {
			
 
				+    display: inline-block;
			
 
				+  }
			
 
				+
			
 
				+  .center {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item {
			
 
				+    width: 50%;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item__label {
			
 
				+    text-align: center;
			
 
				+  }
			
 
				+
			
 
				+  .ce {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				+  /*  height: 82px;*/
			
 
				+  /*}*/
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+
			
 
				+  .hide-sel {
			
 
				     .el-input__inner {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-      color: #606266;
			
 
				+      border: 0px;
			
 
				     }
			
 
				+
			
 
				+    .el-icon-arrow-up {
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				     .el-textarea__inner {
			
 
				       background-color: #fff !important;
			
 
				       border: 0;
			
 
				+    }
			
 
				+
			
 
				+    .el-date-editor {
			
 
				+      i {
			
 
				+        display: none;
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+    .is-disabled {
			
 
				+      .el-input__inner:hover {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+      }
			
 
				+
			
 
				       color: #606266;
			
 
				+
			
 
				+      .el-input__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				+
			
 
				+      .el-textarea__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				 
			
 
				-// 控制select为只读的时候显示样式
			
 
				-/deep/.ws-class-table-col {
			
 
				-  height: auto;
			
 
				-  padding: 0px 2px;
			
 
				-  /deep/.el-input__inner {
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+  /deep/.ws-class-table-col {
			
 
				+    height: auto;
			
 
				     padding: 0px 2px;
			
 
				+
			
 
				+    /deep/.el-input__inner {
			
 
				+      padding: 0px 2px;
			
 
				+    }
			
 
				   }
			
 
				-}
			
 
				-/deep/.is-disabled {
			
 
				-  .el-input__prefix,
			
 
				-  .el-input__suffix {
			
 
				-    display: none;
			
 
				+
			
 
				+  /deep/.is-disabled {
			
 
				+    .el-input__prefix,
			
 
				+    .el-input__suffix {
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				+    .el-input__inner {
			
 
				+      background-color: #fff;
			
 
				+      border-color: #fff !important;
			
 
				+      color: #000 !important;
			
 
				+      font-size: 14px;
			
 
				+      cursor: text;
			
 
				+      padding: 0 !important;
			
 
				+    }
			
 
				   }
			
 
				-  .el-input__inner {
			
 
				-    background-color: #fff;
			
 
				-    border-color: #fff !important;
			
 
				-    color: #000 !important;
			
 
				+
			
 
				+  .winseaview-view {
			
 
				+    padding: 0 0 20px;
			
 
				+  }
			
 
				+
			
 
				+  .container {
			
 
				+    overflow: scroll;
			
 
				+    height: 93vh;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				+    width: 130px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text-left {
			
 
				+    width: 62px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text {
			
 
				+    margin: 0 10px;
			
 
				+    color: #8890b1;
			
 
				+    font-size: 12px;
			
 
				+    margin-top: -4px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-line {
			
 
				+    height: 100px;
			
 
				+    border-left: 2px solid #e9ecf7;
			
 
				+    margin-left: 4px;
			
 
				+    padding: 0 3px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle {
			
 
				+    width: 10px;
			
 
				+    height: 10px;
			
 
				+    border: 2px solid #5878e8;
			
 
				+    background-color: #ffffff;
			
 
				+    -webkit-border-radius: 100px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle:first-child {
			
 
				+    color: red;
			
 
				+  }
			
 
				+
			
 
				+  .icon {
			
 
				+    display: inline-block;
			
 
				+    width: 60px;
			
 
				+    background: #ecfeff;
			
 
				+    border-radius: 12px;
			
 
				+    border: 1px solid #50cad4;
			
 
				+    position: relative;
			
 
				+    font-size: 14px;
			
 
				+    color: #50cad4;
			
 
				+    padding: 1px 7px;
			
 
				+  }
			
 
				+
			
 
				+  .title-top {
			
 
				+    margin-top: 20px;
			
 
				+    font-size: 21px;
			
 
				+    font-weight: 600;
			
 
				+  }
			
 
				+
			
 
				+  .title-number {
			
 
				     font-size: 14px;
			
 
				-    cursor: text;
			
 
				-    padding: 0 !important;
			
 
				-  }
			
 
				-}
			
 
				-.winseaview-view {
			
 
				-  padding: 0 0 20px;
			
 
				-}
			
 
				-.container {
			
 
				-  overflow: scroll;
			
 
				-  height: 93vh;
			
 
				-}
			
 
				-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				-  width: 130px;
			
 
				-}
			
 
				-.vertical-text-left {
			
 
				-  width: 62px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.vertical-text {
			
 
				-  margin: 0 10px;
			
 
				-  color: #8890b1;
			
 
				-  font-size: 12px;
			
 
				-  margin-top: -4px;
			
 
				-}
			
 
				-.vertical-line {
			
 
				-  height: 100px;
			
 
				-  border-left: 2px solid #e9ecf7;
			
 
				-  margin-left: 4px;
			
 
				-  padding: 0 3px;
			
 
				-}
			
 
				-.vertical-circle {
			
 
				-  width: 10px;
			
 
				-  height: 10px;
			
 
				-  border: 2px solid #5878e8;
			
 
				-  background-color: #ffffff;
			
 
				-  -webkit-border-radius: 100px;
			
 
				-}
			
 
				-.vertical-circle:first-child {
			
 
				-  color: red;
			
 
				-}
			
 
				-.icon {
			
 
				-  display: inline-block;
			
 
				-  width: 60px;
			
 
				-  height: 24px;
			
 
				-  background: #ecfeff;
			
 
				-  border-radius: 12px;
			
 
				-  border: 1px solid #50cad4;
			
 
				-  position: relative;
			
 
				-  font-size: 14px;
			
 
				-  color: #50cad4;
			
 
				-  line-height: 24px;
			
 
				-  padding: 1px 7px;
			
 
				-}
			
 
				-.queren{
			
 
				-  margin-left: 100%;
			
 
				-  margin-top: -60px;
			
 
				-}
			
 
				+    font-weight: 400;
			
 
				+  }
			
 
				+
			
 
				+  .queren {
			
 
				+    margin-left: 100%;
			
 
				+    margin-top: -60px;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/contractManagement/purchaseContract.vue
+++ b/src/views/contractManagement/purchaseContract.vue
@@ -5,13 +5,7 @@
 
				 		<BaseHeaderLayout :leftSpan="8">
			
 
				 			<template slot="left">
			
 
				 				<ws-button type="primary" @click="handleAdd()"
			
 
				-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.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>
			
 
				+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
			
 
				 				<ws-button @click="exportlist()" v-hasPermission="
			
 
				             `contractManagement.buyContract.buyContractInfo.view`
			
 
				           ">导出</ws-button>
			
@@ -201,7 +195,8 @@
 
				 
			
 
				 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
			
 
				 			@on-cancel="handleClose">
			
 
				-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
			
 
				+			<ws-upload ref="upload" :size-limit="size"
			
 
				+          @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
			
 
				 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				 		</WinseaContentModal>
			
 
				 	</div>
			
@@ -213,6 +208,7 @@
 
				 		editstatus,
			
 
				 		billoperatehis,
			
 
				 		deletecontract,
			
 
				+		editInfo
			
 
				 	} from '@/model/contarct/index'
			
 
				 	import {
			
 
				 		downloadFile
			
@@ -239,6 +235,7 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				+				id:'',
			
 
				 				//弹出框
			
 
				 				dialogViewSpareMoney: false,
			
 
				 				dialogApproveFormVisible: false,
			
@@ -352,6 +349,26 @@
 
				 			this.showType = this.isShow
			
 
				 		},
			
 
				 		methods: {
			
 
				+			onChange () {
			
 
				+			this.$refs.upload
			
 
				+				.handleSaveBill()
			
 
				+				.then(async response => {
			
 
				+				this.deptBudgetList.addressUrl = response
			
 
				+				this.deptBudgetList.id=this.id
			
 
				+				this.deptBudgetList.flag=1
			
 
				+				 editInfo(this.deptBudgetList)
			
 
				+				.toPromise()
			
 
				+				.then((response) => {
			
 
				+					this.accessoryTFs = false
			
 
				+					this.$message.success('上传成功')
			
 
				+					this.getList()
			
 
				+				})
			
 
				+				})
			
 
				+				.catch(res => {
			
 
				+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
			
 
				+				this.$refs.upload.clearFiles()
			
 
				+				})
			
 
				+			},
			
 
				 			dateFormat(fmt, date) {
			
 
				 				let ret
			
 
				 				const opt = {
			
@@ -478,14 +495,8 @@
 
				 				}
			
 
				 			},
			
 
				 			fujian(row) {
			
 
				-				if (row.addressUrl === null || row.addressUrl === '') {
			
 
				-					EventBus.$emit(
			
 
				-						'warning',
			
 
				-						this.$t('system.noticeCircular.NoInformation')
			
 
				-					)
			
 
				-				} else {
			
 
				-					this.accessoryTFs = true
			
 
				-				}
			
 
				+				this.id=row.id
			
 
				+				this.accessoryTFs = true
			
 
				 				this.appendixIdss = row.addressUrl
			
 
				 				console.log(this.appendixIdss)
			
 
				 			},
			
--- a/src/views/contractManagement/purchaseContractAdd.vue
+++ b/src/views/contractManagement/purchaseContractAdd.vue
@@ -14,7 +14,7 @@
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				         <p style="color: #8890b1">
			
 
				-          注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。
			
 
				+          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
			
 
				         </p>
			
 
				       </div>
			
 
				       <ws-info-table>
			
@@ -42,11 +42,7 @@
 
				           <el-radio v-model="deptBudgetList.agreementType" label="采购合同">采购合同</el-radio>
			
 
				           <el-radio v-model="deptBudgetList.agreementType" label="补充协议">补充协议</el-radio>
			
 
				         </ws-form-item>
			
 
				-        <!--合同编号-->
			
 
				-        <ws-form-item label="合同编号" span="1" v-show="deptBudgetList.agreementType == '采购合同'" prop="contractNo"
			
 
				-          class="readonly" required>
			
 
				-          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
			
 
				-        </ws-form-item>
			
 
				+
			
 
				         <!--关联合同-->
			
 
				         <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
			
 
				           <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
			
@@ -54,7 +50,7 @@
 
				               :value="item.contractNo"></ws-option>
			
 
				           </ws-select>
			
 
				         </ws-form-item>
			
 
				-        <!--补充协议编号-->
			
 
				+        <!-- 补充协议编号 -->
			
 
				         <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="contractNo">
			
 
				           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
			
 
				         </ws-form-item>
			
@@ -62,33 +58,37 @@
 
				         <ws-form-item label="运输方式" span="1" prop="shippingType">
			
 
				           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
			
 
				         </ws-form-item>
			
 
				-        <!--买方-->
			
 
				-        <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
			
 
				-          <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
			
 
				-          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
			
 
				-            placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete>
			
 
				+
			
 
				+        <!--合同编号-->
			
 
				+        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required v-show="deptBudgetList.agreementType =='采购合同'">
			
 
				+          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
			
 
				         </ws-form-item>
			
 
				 
			
 
				         <!--结算方式-->
			
 
				         <ws-form-item label="结算方式" span="1" prop="settlementMethod">
			
 
				           <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="100" size="small" />
			
 
				         </ws-form-item>
			
 
				-
			
 
				-        <!--卖方-->
			
 
				-        <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
			
 
				-          <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
			
 
				-          <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
			
 
				-            placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
			
 
				+        <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
			
 
				+          <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
			
 
				+          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
			
 
				+            placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete>
			
 
				         </ws-form-item>
			
 
				+        <!--卖方-->
			
 
				+
			
 
				         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
			
 
				           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
			
 
				           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
			
 
				         </ws-form-item>
			
 
				-        <!--买方电话-->
			
 
				-        <ws-form-item label="买方电话" span="1" prop="contractNo">
			
 
				-          <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
			
 
				-          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
			
 
				-            placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
			
 
				+        <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
			
 
				+          <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
			
 
				+          <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
			
 
				+             @select="handleSelect"></el-autocomplete>
			
 
				+             -->
			
 
				+            <ws-select  v-model="deptBudgetList.seller" placeholder="请选择卖方名称" class="typeselect" 
			
 
				+            @change="sellerSelect">
			
 
				+            <ws-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
			
 
				+              :value="item.customerName" />
			
 
				+          </ws-select>
			
 
				         </ws-form-item>
			
 
				         <!--包装方式-->
			
 
				         <ws-form-item label="包装方式" span="1" prop="packingMethod">
			
@@ -98,12 +98,14 @@
 
				               :value="item.constValue" />
			
 
				           </ws-select>
			
 
				         </ws-form-item>
			
 
				-        <!--卖方电话-->
			
 
				-        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
			
 
				-          <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
			
 
				-          <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
			
 
				-            placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
			
 
				+
			
 
				+        <!--买方电话-->
			
 
				+        <ws-form-item label="买方电话" span="1" prop="contractNo">
			
 
				+          <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
			
 
				+          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
			
 
				+            placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
			
 
				         </ws-form-item>
			
 
				+
			
 
				         <!--验收方式-->
			
 
				         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
			
 
				           <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable
			
@@ -142,6 +144,12 @@
 
				             </el-option>
			
 
				           </el-select>
			
 
				         </ws-form-item>
			
 
				+        <!--卖方电话-->
			
 
				+        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
			
 
				+          <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
			
 
				+          <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
			
 
				+            placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
			
 
				+        </ws-form-item>
			
 
				         <!--重量（吨）-->
			
 
				         <ws-form-item label="重量（吨）" span="1" prop="weight">
			
 
				           <ws-input @input="weightchange" v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100"
			
@@ -171,6 +179,12 @@
 
				         <ws-form-item label="合同总价" span="1" prop="totalContractPrice">
			
 
				           <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
			
 
				         </ws-form-item>
			
 
				+
			
 
				+        <!--签订日期-->
			
 
				+        <ws-form-item label="签订日期" span="1" prop="signingDate" v-show="deptBudgetList.agreementType =='采购合同'">
			
 
				+          <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
			
 
				+            value-format="yyyy-MM-dd" />
			
 
				+        </ws-form-item>
			
 
				         <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
			
 
				           <!-- <el-cascader
			
 
				             :options="options_"
			
@@ -205,24 +219,25 @@
 
				         <ws-form-item label="交货详细地址" span="1" prop="placeDelivery">
			
 
				           <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
			
 
				         </ws-form-item>
			
 
				-        <!--签订日期-->
			
 
				-        <ws-form-item label="签订日期" span="1" prop="signingDate">
			
 
				+          <!--签订日期-->
			
 
				+        <ws-form-item label="签订日期" span="1" prop="signingDate" v-show="deptBudgetList.agreementType =='补充协议'">
			
 
				           <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
			
 
				             value-format="yyyy-MM-dd" />
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
			
 
				           <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100" size="small" />
			
 
				         </ws-form-item>
			
 
				+        <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly"
			
 
				+          v-if="deptBudgetList.deliverType==1">
			
 
				+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
			
 
				+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按入库重量结算</el-radio>
			
 
				+        </ws-form-item>
			
 
				         <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
			
 
				           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable
			
 
				-             @change="selectstaff">
			
 
				+            @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="settlementWeightMethod" class="readonly" v-if="deptBudgetList.deliverType==1">
			
 
				-          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
			
 
				-          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按入库重量结算</el-radio>
			
 
				-        </ws-form-item>
			
 
				       </ws-info-table>
			
 
				       <div class="wenzi">
			
 
				         <h3>货物信息</h3>
			
@@ -335,7 +350,8 @@
 
				       <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过3000字"
			
 
				         maxlength="3000" />
			
 
				       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
			
 
				-        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"/>
			
 
				+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				+        v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
			
 
				     </ws-form>
			
 
				     <div v-if="dialogVisible" class="map">
			
 
				       <map-drag @marker="marker" :isShowaddress='true' v-on:addressListen='getAddress' :type="type"></map-drag>
			
@@ -354,7 +370,8 @@
 
				     editxiala,
			
 
				     delxiala,
			
 
				     getstafffind,
			
 
				-    getRelationContractNo
			
 
				+    getRelationContractNo,
			
 
				+    getcustomerinfo
			
 
				   } from '@/model/contarct/index'
			
 
				   import {
			
 
				     regionData,
			
@@ -389,7 +406,8 @@
 
				         restaurants2: [],
			
 
				         restaurants3: [],
			
 
				         restaurants4: [],
			
 
				-        type: "",
			
 
				+        customerinfo:[],
			
 
				+        type: '',
			
 
				         dialogVisible: false,
			
 
				         //弹出框
			
 
				         dialogViewSpareMoney: false,
			
@@ -448,6 +466,7 @@
 
				           deliverType: '1',
			
 
				           agreementType: '采购合同',
			
 
				           addressUrl: '',
			
 
				+          sellerPhone:'',
			
 
				           finalTradingVolume: 0,
			
 
				           totalContractPrice: 0,
			
 
				           contractGoodsInfo: {
			
@@ -456,7 +475,7 @@
 
				           contractProcessInfo: {},
			
 
				           sourceGoods: '',
			
 
				           placeDelivery: '',
			
 
				-          settlementWeightMethod:'1',
			
 
				+          settlementWeightMethod: '1',
			
 
				         },
			
 
				         acceptanceCheck: {},
			
 
				         pickerBeginDateBefore: {
			
@@ -549,8 +568,18 @@
 
				       handleSelect(item) {
			
 
				         console.log(item);
			
 
				       },
			
 
				+      sellerSelect(item) {
			
 
				+        console.log(item)
			
 
				+        for (let i = 0; i < this.customerinfo.length; i++) {
			
 
				+          console.log(this.customerinfo[i].customerName,item)
			
 
				+          if(this.customerinfo[i].customerName==item){
			
 
				+            this.deptBudgetList.sellerPhone=this.customerinfo[i].customerPhone
			
 
				+          }
			
 
				+        }
			
 
				+        
			
 
				+      },
			
 
				       getAddress(data) {
			
 
				-        console.log("getAddress", data)
			
 
				+        console.log('getAddress', data)
			
 
				         if (data[4] == 'source') {
			
 
				           this.newSelectedOptions = data[0] + '/' + data[1] + '/' + data[2]
			
 
				           this.deptBudgetList.sourceProvince = data[0]
			
@@ -676,6 +705,18 @@
 
				           .then((response) => {
			
 
				             this.contractNoList = response
			
 
				           })
			
 
				+          getcustomerinfo({compId: sessionStorage.getItem('ws-pf_compId'),}).toPromise()
			
 
				+          .then((response) => {
			
 
				+            var arr=[]
			
 
				+            for (let i = 0; i < response.length; i++) {
			
 
				+              if(response[i].customerType=='个人客户'){
			
 
				+                arr.push({customerName:response[i].customerName,customerPhone:response[i].customerPhone})
			
 
				+              }else{
			
 
				+                arr.push({customerName:response[i].compName,customerPhone:response[i].customerPhone})
			
 
				+              }
			
 
				+            }
			
 
				+            this.customerinfo = arr
			
 
				+          })
			
 
				       },
			
 
				       selectRelation(e) {
			
 
				         for (var i = 0; i < this.contractNoList.length; i++) {
			
@@ -684,6 +725,12 @@
 
				             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
			
 
				             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
			
 
				             this.deptBudgetList.agreementType = '补充协议'
			
 
				+            this.newSelectedOptions = this.contractNoList[i].sourceProvince + this.contractNoList[i].sourceCity + this
			
 
				+              .contractNoList[i].sourceArea
			
 
				+            this.deptBudgetList.sourceGoods = this.contractNoList[i].sourceGoods
			
 
				+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince + this.contractNoList[i].deliveryCity +
			
 
				+              this.contractNoList[i].deliveryArea
			
 
				+            this.deptBudgetList.placeDelivery = this.contractNoList[i].placeDelivery
			
 
				           }
			
 
				         }
			
 
				       },
			
@@ -1450,6 +1497,8 @@
 
				         for (var i = 0; i < this.gradeList.length; i++) {
			
 
				           if (this.gradeList[i].constValue == e) {
			
 
				             this.deptBudgetList.gradeKey = this.gradeList[i].constKey
			
 
				+            this.deptBudgetList.contractGoodsInfo.gradeKey =
			
 
				+              this.gradeList[i].constKey
			
 
				           }
			
 
				         }
			
 
				       },
			
--- a/src/views/contractManagement/purchaseContractEdit.vue
+++ b/src/views/contractManagement/purchaseContractEdit.vue
@@ -16,7 +16,7 @@
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
 
				         <p style="color: #8890b1">
			
 
				-          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
			
 
				+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
			
 
				           标记的条目提交后不可修改。
			
 
				         </p>
			
 
				       </div>
			
@@ -269,13 +269,12 @@
 
				         </div>
			
 
				         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
			
 
				           maxlength="200" />
			
 
				-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
			
 
				-          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				           v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
			
 
				       </base-card>
			
 
				     </ws-form>
			
 
				     <div v-if="dialogVisible" class="map">
			
 
				-      <map-drag @marker="marker" :isShowaddress='true' v-on:addressListen='getAddress' :type="type"></map-drag>
			
 
				+      <map-drag @marker="marker"  :editable="false" :isShowaddress='true' v-on:addressListen='getAddress' :type="type"></map-drag>
			
 
				     </div>
			
 
				     <div style="text-align: right; padding: 10px">
			
 
				       <el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交</el-button>
			
@@ -462,35 +461,39 @@
 
				             if (response.unitContractPrice) {
			
 
				               response.unitContractPrice = String(response.unitContractPrice)
			
 
				             }
			
 
				-            var tmp = []
			
 
				-            tmp[0] = TextToCode[response.sourceProvince].code
			
 
				-
			
 
				-            tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
			
 
				-
			
 
				-            if (tmp[0] == 810000 || tmp[0] == 820000) {
			
 
				-              tmp[2] = null
			
 
				-            } else {
			
 
				-              tmp[2] =
			
 
				-                TextToCode[response.sourceProvince][response.sourceCity][
			
 
				-                  response.sourceArea
			
 
				-                ].code
			
 
				-            }
			
 
				-            this.selectedOptions = tmp
			
 
				-            var tmp1 = []
			
 
				-            tmp1[0] = TextToCode[response.deliveryProvince].code
			
 
				-            tmp1[1] =
			
 
				-              TextToCode[response.deliveryProvince][response.deliveryCity].code
			
 
				-
			
 
				-            if (tmp1[0] == 810000 || tmp1[0] == 820000) {
			
 
				-              tmp1[2] = null
			
 
				-            } else {
			
 
				-              tmp1[2] =
			
 
				-                TextToCode[response.deliveryProvince][response.deliveryCity][
			
 
				-                  response.deliveryArea
			
 
				-                ].code
			
 
				-            }
			
 
				-            this.selectedOptions1 = tmp1
			
 
				+            // var tmp = []
			
 
				+            // tmp[0] = TextToCode[response.sourceProvince].code
			
 
				+
			
 
				+            // tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
			
 
				+
			
 
				+            // if (tmp[0] == 810000 || tmp[0] == 820000) {
			
 
				+            //   tmp[2] = null
			
 
				+            // } else {
			
 
				+            //   tmp[2] =
			
 
				+            //     TextToCode[response.sourceProvince][response.sourceCity][
			
 
				+            //       response.sourceArea
			
 
				+            //     ].code
			
 
				+            // }
			
 
				+            // this.selectedOptions = tmp
			
 
				+            // var tmp1 = []
			
 
				+            // tmp1[0] = TextToCode[response.deliveryProvince].code
			
 
				+            // tmp1[1] =
			
 
				+            //   TextToCode[response.deliveryProvince][response.deliveryCity].code
			
 
				+
			
 
				+            // if (tmp1[0] == 810000 || tmp1[0] == 820000) {
			
 
				+            //   tmp1[2] = null
			
 
				+            // } else {
			
 
				+            //   tmp1[2] =
			
 
				+            //     TextToCode[response.deliveryProvince][response.deliveryCity][
			
 
				+            //       response.deliveryArea
			
 
				+            //     ].code
			
 
				+            // }
			
 
				+            // this.selectedOptions1 = tmp1
			
 
				             this.deptBudgetList = response
			
 
				+           this.newSelectedOptions = response.sourceProvince+response.sourceCity+response.sourceArea
			
 
				+           this.deptBudgetList.sourceGoods =  response.sourceGoods
			
 
				+           this.newSelectedOptions1 = response.deliveryProvince+response.deliveryCity+response.deliveryArea
			
 
				+           this.deptBudgetList.placeDelivery =  response.placeDelivery
			
 
				             if (this.deptBudgetList.deliverType == 1) {
			
 
				               this.deptBudgetList.deliverType1 = '我方自提'
			
 
				             } else if (this.deptBudgetList.deliverType == 2) {
			
@@ -540,18 +543,6 @@
 
				           constKey: '',
			
 
				         })
			
 
				       },
			
 
				-      // 上传附件
			
 
				-      onChange() {
			
 
				-        this.$refs.upload
			
 
				-          .handleSaveBill()
			
 
				-          .then(async response => {
			
 
				-            this.deptBudgetList.addressUrl = response
			
 
				-          })
			
 
				-          .catch(res => {
			
 
				-            EventBus.$emit('error', (JSON.parse(res) || {}).message)
			
 
				-            this.$refs.upload.clearFiles()
			
 
				-          })
			
 
				-      },
			
 
				       getUnitList() {
			
 
				         xiala({
			
 
				             compId: sessionStorage.getItem('ws-pf_compId'),
			
--- a/src/views/contractManagement/purchaseContractExamine.vue
+++ b/src/views/contractManagement/purchaseContractExamine.vue
@@ -7,60 +7,40 @@
 
				         <h2 class="bg-left title">查看合同详情</h2>
			
 
				       </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=""
			
 
				-          />返回</el-button
			
 
				-        >
			
 
				+        <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="" />返回
			
 
				+        </el-button>
			
 
				       </el-col>
			
 
				     </el-row>
			
 
				 
			
 
				-    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList"
			
 
				-      ><div style="margin-top: 20px; font-size: 24px">
			
 
				-        采购合同<span style="font-size: 16px"
			
 
				-          >【编号:{{ deptBudgetList.contractNo }}】</span
			
 
				-        >
			
 
				-         <div class="icon">
			
 
				-        <template>
			
 
				-          <el-popover
			
 
				-            placement="right"
			
 
				-            :width="285"
			
 
				-            trigger="click"
			
 
				-            visible-arrow="false"
			
 
				-            @show="history(deptBudgetList.id)"
			
 
				-          >
			
 
				+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
			
 
				+      <div class="title-top">
			
 
				+        采购合同<span class="title-number">【编号:{{ deptBudgetList.contractNo }}】</span>
			
 
				+        <div class="icon" v-if="deptBudgetList.status">
			
 
				           <template>
			
 
				-            <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				-          </template>
			
 
				-            <div>
			
 
				-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				-              <div v-for="(item, index) in historyList" class="flex">
			
 
				-                <div class="vertical-text vertical-text-left">
			
 
				-                  {{ item.updateDate }}
			
 
				-                </div>
			
 
				-                <div>
			
 
				-                  <div class="vertical-circle"></div>
			
 
				-                  <div
			
 
				-                    v-if="index != historyList.length - 1"
			
 
				-                    class="vertical-line"
			
 
				-                  ></div>
			
 
				-                </div>
			
 
				-                <div class="vertical-text">
			
 
				-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+            <el-popover placement="right" :width="285" trigger="click" visible-arrow="false"
			
 
				+              @show="history(deptBudgetList.id)">
			
 
				+              <template>
			
 
				+                <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				+              </template>
			
 
				+              <div>
			
 
				+                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				+                <div v-for="(item, index) in historyList" class="flex">
			
 
				+                  <div class="vertical-text vertical-text-left">
			
 
				+                    {{ item.updateDate }}
			
 
				+                  </div>
			
 
				+                  <div>
			
 
				+                    <div class="vertical-circle"></div>
			
 
				+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
			
 
				+                  </div>
			
 
				+                  <div class="vertical-text">
			
 
				+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+                  </div>
			
 
				                 </div>
			
 
				               </div>
			
 
				-            </div>
			
 
				-          </el-popover>
			
 
				-        </template>
			
 
				-      </div>
			
 
				+            </el-popover>
			
 
				+          </template>
			
 
				+        </div>
			
 
				       </div>
			
 
				       <div class="remark">
			
 
				         <h3>基本信息</h3>
			
@@ -84,17 +64,13 @@
 
				         <ws-form-item label="买方" span="1" prop="buyer">
			
 
				           {{ deptBudgetList.buyer }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="结算方式" span="1" prop="settlementMethod"
			
 
				-          >{{ deptBudgetList.settlementMethod }}
			
 
				+        <ws-form-item label="结算方式" span="1" prop="settlementMethod">{{ deptBudgetList.settlementMethod }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="卖方" span="1" prop="seller"
			
 
				-          >{{ deptBudgetList.seller }}
			
 
				+        <ws-form-item label="卖方" span="1" prop="seller">{{ deptBudgetList.seller }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="交货方式" span="1" prop="deliverType1"
			
 
				-          >{{ deptBudgetList.deliverType1 }}
			
 
				+        <ws-form-item label="交货方式" span="1" prop="deliverType1">{{ deptBudgetList.deliverType1 }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="买方电话" span="1" prop="buyerPhone"
			
 
				-          >{{ deptBudgetList.buyerPhone }}
			
 
				+        <ws-form-item label="买方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="包装方式" span="1" prop="packingMethod">
			
 
				           {{ deptBudgetList.packingMethod }}
			
@@ -117,11 +93,7 @@
 
				         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
			
 
				           {{ deptBudgetList.deliveryDateEnd }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="合同单价（元/吨）"
			
 
				-          span="1"
			
 
				-          prop="unitContractPrice"
			
 
				-        >
			
 
				+        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice">
			
 
				           {{ deptBudgetList.unitContractPrice }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
			
@@ -173,23 +145,13 @@
 
				         <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
			
 
				           {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="霉变粒（%）<="
			
 
				-          span="1"
			
 
				-          prop="mildewGrain"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
			
 
				           {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="不完善粒（%）<="
			
 
				-          span="1"
			
 
				-          prop="imperfectGrain"
			
 
				-          class="result"
			
 
				-        >
			
 
				+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain" class="result">
			
 
				           {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
			
 
				         </ws-form-item>
			
 
				       </ws-info-table>
			
@@ -197,52 +159,36 @@
 
				         <h3>流程信息</h3>
			
 
				       </div>
			
 
				       <ws-info-table>
			
 
				-         <!--已付款（元）-->
			
 
				+        <!--已付款（元）-->
			
 
				         <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
			
 
				           {{deptBudgetList.contractProcessInfo.mildewGrain}}
			
 
				         </ws-form-item>
			
 
				         <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
			
 
				           {{ deptBudgetList.contractProcessInfo.goodsName }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="费用支出（元）" span="1" prop="waterContent"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.waterContent }}
			
 
				+        <ws-form-item label="费用支出（元）" span="1" prop="waterContent">{{ deptBudgetList.contractProcessInfo.waterContent }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="未开发票（元）" span="1" prop="impurity"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.impurity }}
			
 
				+        <ws-form-item label="未开发票（元）" span="1" prop="impurity">{{ deptBudgetList.contractProcessInfo.impurity }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item
			
 
				-          label="已完成发运量（吨）"
			
 
				-          span="1"
			
 
				-          prop="imperfectGrain"
			
 
				-          class="result"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
			
 
				+        <ws-form-item label="已完成发运量（吨）" span="1" prop="imperfectGrain" class="result">
			
 
				+          {{ deptBudgetList.contractProcessInfo.imperfectGrain }}
			
 
				         </ws-form-item>
			
 
				-        <ws-form-item label="双章原件回收情况" span="1" prop="grade"
			
 
				-          >{{ deptBudgetList.contractProcessInfo.grade }}
			
 
				+        <ws-form-item label="双章原件回收情况" span="1" prop="grade">{{ deptBudgetList.contractProcessInfo.grade }}
			
 
				         </ws-form-item>
			
 
				       </ws-info-table>
			
 
				       <div class="remark">
			
 
				         <h3>备注信息</h3>
			
 
				       </div>
			
 
				       <div style=" color: #afb5cb;margin-left: 20px;">
			
 
				-      {{ deptBudgetList.remarks }}
			
 
				+        {{ deptBudgetList.remarks }}
			
 
				       </div>
			
 
				-      <ws-upload
			
 
				-        ref="upload"
			
 
				-        :comp-id="compId"
			
 
				-        :appendix-ids="deptBudgetList.addressUrl"
			
 
				-        :editable="false"
			
 
				-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				-      />
			
 
				-      <el-table
			
 
				-        class="wenzi"
			
 
				-        :data="taskhistories"
			
 
				-        style="width: 100%"
			
 
				-      >
			
 
				+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false"
			
 
				+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				+      <el-table class="wenzi" :data="taskhistories" style="width: 100%">
			
 
				         <el-table-column prop="operatorMajorRoleName" label="审核人">
			
 
				           <template scope="scope">
			
 
				             {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
			
 
				-            </template>
			
 
				+          </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column prop="inOutTaskNo" label="审核结果">
			
 
				           <template scope="scope">
			
@@ -252,429 +198,504 @@
 
				         </el-table-column>
			
 
				         <el-table-column prop="endTime" label="审核时间"></el-table-column>
			
 
				         <el-table-column prop="auditMind" label="审核意见"></el-table-column>
			
 
				-     </el-table>
			
 
				+      </el-table>
			
 
				     </ws-form>
			
 
				-    
			
 
				+
			
 
				     <div style="text-align: right; padding: 10px">
			
 
				-      <el-button
			
 
				-        class="bg-bottom"
			
 
				-        type="primary"
			
 
				-        size="small"
			
 
				-        @click="returnsales()"
			
 
				-        >关闭</el-button
			
 
				-      >
			
 
				+      <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">关闭</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				-import {
			
 
				-  packList,
			
 
				-  xiala,
			
 
				-  examineList,
			
 
				-  billoperatehis,
			
 
				-} from '@/model/contarct/index'
			
 
				-import {
			
 
				-  gettaskhistories
			
 
				-} from '@/model/tasksport/index'
			
 
				-export default {
			
 
				-  name: 'viewSpareMoney',
			
 
				-  watch: {
			
 
				-    vesselId(val) {
			
 
				-      this.getVesselData()
			
 
				+  import {
			
 
				+    packList,
			
 
				+    xiala,
			
 
				+    examineList,
			
 
				+    billoperatehis,
			
 
				+  } from '@/model/contarct/index'
			
 
				+  import {
			
 
				+    gettaskhistories
			
 
				+  } from '@/model/tasksport/index'
			
 
				+  export default {
			
 
				+    name: 'viewSpareMoney',
			
 
				+    watch: {
			
 
				+      vesselId(val) {
			
 
				+        this.getVesselData()
			
 
				+      },
			
 
				+      isShow(val) {
			
 
				+        this.showType = val
			
 
				+      },
			
 
				+    },
			
 
				+    data() {
			
 
				+      return {
			
 
				+        //弹出框
			
 
				+        dialogViewSpareMoney: false,
			
 
				+        dialogApproveFormVisible: false,
			
 
				+        // 船舶类型
			
 
				+        monetaryKey: null,
			
 
				+        // 表格显示数据
			
 
				+        tableDate: [],
			
 
				+        // 是否显示
			
 
				+        showType: true,
			
 
				+        // 年
			
 
				+        year: '',
			
 
				+        status: '',
			
 
				+        // 提交类型
			
 
				+        submitType: true,
			
 
				+        historyList: [],
			
 
				+        tableData: [{
			
 
				+          date: 1111,
			
 
				+          name: 'qqqq',
			
 
				+          address: 'errrtt'
			
 
				+        }],
			
 
				+        ruleDeptBudget: [],
			
 
				+        taskhistories: [],
			
 
				+        deptBudgetList: {
			
 
				+          contractProcessInfo: {},
			
 
				+          contractGoodsInfo: {},
			
 
				+        },
			
 
				+        mainReportAdd: {},
			
 
				+        list: {},
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+      }
			
 
				     },
			
 
				-    isShow(val) {
			
 
				-      this.showType = val
			
 
				+
			
 
				+    activated() {
			
 
				+      this.status = this.$route.query.status
			
 
				+      this.loaddata()
			
 
				+      this.showType = this.isShow
			
 
				     },
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      //弹出框
			
 
				-      dialogViewSpareMoney: false,
			
 
				-      dialogApproveFormVisible: false,
			
 
				-      // 船舶类型
			
 
				-      monetaryKey: null,
			
 
				-      // 表格显示数据
			
 
				-      tableDate: [],
			
 
				-      // 是否显示
			
 
				-      showType: true,
			
 
				-      // 年
			
 
				-      year: '',
			
 
				-      status: '',
			
 
				-      // 提交类型
			
 
				-      submitType: true,
			
 
				-      historyList:[],
			
 
				-      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
			
 
				-      ruleDeptBudget: [],
			
 
				-      taskhistories:[],
			
 
				-      deptBudgetList: {
			
 
				-        contractProcessInfo: {},
			
 
				-        contractGoodsInfo: {},
			
 
				-      },
			
 
				-      mainReportAdd: {},
			
 
				-      list: {},
			
 
				-      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-    }
			
 
				-  },
			
 
				-
			
 
				-  activated() {
			
 
				-    this.status = this.$route.query.status
			
 
				-    this.loaddata()
			
 
				-    this.showType = this.isShow
			
 
				-  },
			
 
				-  methods: {
			
 
				-    loaddata() {
			
 
				-      gettaskhistories({businessKey: this.$route.query.id,workflowId: this.$route.query.workflowId}).toPromise()
			
 
				+    methods: {
			
 
				+      loaddata() {
			
 
				+        gettaskhistories({
			
 
				+            businessKey: this.$route.query.id,
			
 
				+            workflowId: this.$route.query.workflowId
			
 
				+          }).toPromise()
			
 
				           .then((response) => {
			
 
				-            this.taskhistories=response
			
 
				+            this.taskhistories = response
			
 
				           })
			
 
				-      // 数据
			
 
				-      examineList({ id: this.$route.query.id })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.deptBudgetList = response
			
 
				-          if (this.deptBudgetList.deliverType == 1) {
			
 
				-            this.deptBudgetList.deliverType1 = '我方自提'
			
 
				-          } else if (this.deptBudgetList.deliverType == 2) {
			
 
				-            this.deptBudgetList.deliverType1 = '对方送货'
			
 
				-          }
			
 
				-        })
			
 
				-      // 包装方式
			
 
				-      packList({ constId: 'CON1' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.packtypeList = response
			
 
				-        })
			
 
				-      // 验收方式
			
 
				-      this.getUnitList()
			
 
				-      // 货名
			
 
				-      packList({ constId: 'CON2' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.goodnameList = response
			
 
				-        })
			
 
				-      // 品级
			
 
				-      packList({ constId: 'CON3' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.gradeList = response
			
 
				-        })
			
 
				-      // 双章
			
 
				-      packList({ constId: 'CON4' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.ChapterTwoList = response
			
 
				-        })
			
 
				-    },
			
 
				-    getUnitList() {
			
 
				-      xiala({
			
 
				-        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-        constCode: 'TYPEYAN',
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.unitList = response
			
 
				-          let currItem
			
 
				-          this.unitList.forEach((item, index, arr) => {
			
 
				-            item.flag = 'delete'
			
 
				-            if (this.vModel == item.constKey) {
			
 
				-              currItem = item
			
 
				+        // 数据
			
 
				+        examineList({
			
 
				+            id: this.$route.query.id
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deptBudgetList = response
			
 
				+            if (this.deptBudgetList.deliverType == 1) {
			
 
				+              this.deptBudgetList.deliverType1 = '我方自提'
			
 
				+            } else if (this.deptBudgetList.deliverType == 2) {
			
 
				+              this.deptBudgetList.deliverType1 = '对方送货'
			
 
				             }
			
 
				           })
			
 
				-          //
			
 
				-          if (currItem) {
			
 
				-            this.selectContract(currItem.constValue)
			
 
				-          }
			
 
				-        })
			
 
				-    },
			
 
				+        // 包装方式
			
 
				+        packList({
			
 
				+            constId: 'CON1'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.packtypeList = response
			
 
				+          })
			
 
				+        // 验收方式
			
 
				+        this.getUnitList()
			
 
				+        // 货名
			
 
				+        packList({
			
 
				+            constId: 'CON2'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.goodnameList = response
			
 
				+          })
			
 
				+        // 品级
			
 
				+        packList({
			
 
				+            constId: 'CON3'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.gradeList = response
			
 
				+          })
			
 
				+        // 双章
			
 
				+        packList({
			
 
				+            constId: 'CON4'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.ChapterTwoList = response
			
 
				+          })
			
 
				+      },
			
 
				+      getUnitList() {
			
 
				+        xiala({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            constCode: 'TYPEYAN',
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.unitList = response
			
 
				+            let currItem
			
 
				+            this.unitList.forEach((item, index, arr) => {
			
 
				+              item.flag = 'delete'
			
 
				+              if (this.vModel == item.constKey) {
			
 
				+                currItem = item
			
 
				+              }
			
 
				+            })
			
 
				+            //
			
 
				+            if (currItem) {
			
 
				+              this.selectContract(currItem.constValue)
			
 
				+            }
			
 
				+          })
			
 
				+      },
			
 
				       history(id1) {
			
 
				-      billoperatehis({ id: id1 })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.historyList = response
			
 
				-        })
			
 
				-    },
			
 
				-    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				-    handleClose() {
			
 
				-      this.dialogViewSpareMoney = false
			
 
				-    },
			
 
				-    returnsales() {
			
 
				-      this.$router.go(-1)
			
 
				+        billoperatehis({
			
 
				+            id: id1
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.historyList = response
			
 
				+          })
			
 
				+      },
			
 
				+      // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+      handleClose() {
			
 
				+        this.dialogViewSpareMoney = false
			
 
				+      },
			
 
				+      returnsales() {
			
 
				+        this.$router.go(-1)
			
 
				+      },
			
 
				     },
			
 
				-  },
			
 
				-}
			
 
				+  }
			
 
				 </script>
			
 
				 <style lang="scss" scoped>
			
 
				-.status-orange,
			
 
				-.status-bule,
			
 
				-.status-green {
			
 
				-  border: 1px solid;
			
 
				-  border-radius: 30px;
			
 
				-  padding: 3px 10px;
			
 
				-  font-size: 16px;
			
 
				-}
			
 
				-.status-orange {
			
 
				-  border-color: #ff9f24;
			
 
				-  color: #ff9f24;
			
 
				-  background: #ffedd5;
			
 
				-}
			
 
				-.status-bule {
			
 
				-  border-color: #5473e8;
			
 
				-  color: #5473e8;
			
 
				-  background: #f0f3fe;
			
 
				-}
			
 
				-.status-green {
			
 
				-  border-color: #50cad4;
			
 
				-  color: #50cad4;
			
 
				-  background: #ecfeff;
			
 
				-}
			
 
				-.el-form {
			
 
				-  padding: 0 15%;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item {
			
 
				-  border-right: 1px solid #cdd2dc;
			
 
				-  border-bottom: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.readonly {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.readonly:after {
			
 
				-  content: '*';
			
 
				-  color: #ff2727;
			
 
				-  position: absolute;
			
 
				-  right: 8px;
			
 
				-  z-index: 10;
			
 
				-  top: 21%;
			
 
				-  font-size: 20px;
			
 
				-}
			
 
				-.title {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.title::before {
			
 
				-  content: '';
			
 
				-  display: inline-block;
			
 
				-  width: 5px;
			
 
				-  height: 30px;
			
 
				-  background: #5473e8;
			
 
				-  position: absolute;
			
 
				-  left: 0;
			
 
				-}
			
 
				-.el-button--primary {
			
 
				-  background-color: #5878e8;
			
 
				-  border-color: #5878e8;
			
 
				-}
			
 
				-.el-col {
			
 
				-  background: #f6f7fc;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				-  padding: 0 25px;
			
 
				-  border-left: 1px solid #cdd2dc;
			
 
				-  background: #fafbfc;
			
 
				-  color: #afb5cb;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				-  width: 140px;
			
 
				-  text-align: center;
			
 
				-  background: #f0f2f6;
			
 
				-  // border: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.button-container {
			
 
				-  display: flex;
			
 
				-  flex-wrap: nowrap;
			
 
				-  justify-content: space-between;
			
 
				-  align-items: center;
			
 
				-  background-color: #fff;
			
 
				-  width: 100%;
			
 
				-  height: 50px;
			
 
				-  padding: 0 10px;
			
 
				-  & > div {
			
 
				-    margin-left: 10px;
			
 
				+  .status-orange,
			
 
				+  .status-bule,
			
 
				+  .status-green {
			
 
				+    border: 1px solid;
			
 
				+    border-radius: 30px;
			
 
				+    padding: 3px 10px;
			
 
				+    font-size: 16px;
			
 
				+  }
			
 
				+
			
 
				+  .status-orange {
			
 
				+    border-color: #ff9f24;
			
 
				+    color: #ff9f24;
			
 
				+    background: #ffedd5;
			
 
				+  }
			
 
				+
			
 
				+  .status-bule {
			
 
				+    border-color: #5473e8;
			
 
				+    color: #5473e8;
			
 
				+    background: #f0f3fe;
			
 
				+  }
			
 
				+
			
 
				+  .status-green {
			
 
				+    border-color: #50cad4;
			
 
				+    color: #50cad4;
			
 
				+    background: #ecfeff;
			
 
				+  }
			
 
				+
			
 
				+  .el-form {
			
 
				+    padding: 0 15%;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item {
			
 
				+    border-right: 1px solid #cdd2dc;
			
 
				+    border-bottom: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .readonly {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .readonly:after {
			
 
				+    content: '*';
			
 
				+    color: #ff2727;
			
 
				+    position: absolute;
			
 
				+    right: 8px;
			
 
				+    z-index: 10;
			
 
				+    top: 21%;
			
 
				+    font-size: 20px;
			
 
				+  }
			
 
				+
			
 
				+  .title {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .title::before {
			
 
				+    content: '';
			
 
				+    display: inline-block;
			
 
				+    width: 5px;
			
 
				+    height: 30px;
			
 
				+    background: #5473e8;
			
 
				+    position: absolute;
			
 
				+    left: 0;
			
 
				+  }
			
 
				+
			
 
				+  .el-button--primary {
			
 
				+    background-color: #5878e8;
			
 
				+    border-color: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .el-col {
			
 
				+    background: #f6f7fc;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				+    padding: 0 25px;
			
 
				+    border-left: 1px solid #cdd2dc;
			
 
				+    background: #fafbfc;
			
 
				+    color: #afb5cb;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+    width: 140px;
			
 
				+    text-align: center;
			
 
				+    background: #f0f2f6;
			
 
				+    // border: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .button-container {
			
 
				     display: flex;
			
 
				     flex-wrap: nowrap;
			
 
				-    flex-direction: row;
			
 
				-    & > span {
			
 
				-      line-height: 50px;
			
 
				-    }
			
 
				-  }
			
 
				+    justify-content: space-between;
			
 
				+    align-items: center;
			
 
				+    background-color: #fff;
			
 
				+    width: 100%;
			
 
				+    height: 50px;
			
 
				+    padding: 0 10px;
			
 
				+
			
 
				+    &>div {
			
 
				+      margin-left: 10px;
			
 
				+      display: flex;
			
 
				+      flex-wrap: nowrap;
			
 
				+      flex-direction: row;
			
 
				 
			
 
				-  /deep/.auditFlow-box {
			
 
				-    position: unset;
			
 
				-    margin-left: 10px;
			
 
				-    &/deep/.auditFlow-icon {
			
 
				-      width: auto;
			
 
				-      padding-right: 30px;
			
 
				+      &>span {
			
 
				+        line-height: 50px;
			
 
				+      }
			
 
				     }
			
 
				-    &/deep/.auditFlow-main {
			
 
				-      position: absolute;
			
 
				+
			
 
				+    /deep/.auditFlow-box {
			
 
				+      position: unset;
			
 
				+      margin-left: 10px;
			
 
				+
			
 
				+      &/deep/.auditFlow-icon {
			
 
				+        width: auto;
			
 
				+        padding-right: 30px;
			
 
				+      }
			
 
				+
			
 
				+      &/deep/.auditFlow-main {
			
 
				+        position: absolute;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.box-app {
			
 
				-  display: inline-block;
			
 
				-  float: left;
			
 
				-  margin-left: 30px;
			
 
				-  line-height: 50px;
			
 
				-}
			
 
				-/deep/.el-dialog {
			
 
				-  .el-form-item {
			
 
				-    margin-bottom: 0 !important;
			
 
				-    .el-input--medium {
			
 
				-      textarea {
			
 
				-        min-height: 100px !important;
			
 
				+
			
 
				+  .box-app {
			
 
				+    display: inline-block;
			
 
				+    float: left;
			
 
				+    margin-left: 30px;
			
 
				+    line-height: 50px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-dialog {
			
 
				+    .el-form-item {
			
 
				+      margin-bottom: 0 !important;
			
 
				+
			
 
				+      .el-input--medium {
			
 
				+        textarea {
			
 
				+          min-height: 100px !important;
			
 
				+        }
			
 
				       }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.collapse-bottom {
			
 
				-  margin-bottom: 20px;
			
 
				-}
			
 
				-.input-main .textarea .el-textarea__inner {
			
 
				-  width: 100%;
			
 
				-  z-index: 1;
			
 
				-}
			
 
				-.bg-left {
			
 
				-  padding-left: 30px;
			
 
				-}
			
 
				-.bg-right {
			
 
				-  padding-right: 10px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.bg-bottom {
			
 
				-  margin: 15px 0px;
			
 
				-}
			
 
				-.wenzi {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.wenzi h3 {
			
 
				-  display: inline-block;
			
 
				-  left: 10px;
			
 
				-}
			
 
				-.wenzi p {
			
 
				-  display: inline-block;
			
 
				-}
			
 
				-.center {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.el-form-item {
			
 
				-  width: 50%;
			
 
				-}
			
 
				-.el-form-item__label {
			
 
				-  text-align: center;
			
 
				-}
			
 
				-.ce {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-/*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				-/*  height: 82px;*/
			
 
				-/*}*/
			
 
				-// 控制select为只读的时候显示样式
			
 
				-
			
 
				-.hide-sel {
			
 
				-  .el-input__inner {
			
 
				-    border: 0px;
			
 
				-  }
			
 
				-  .el-icon-arrow-up {
			
 
				-    display: none;
			
 
				-  }
			
 
				-  .el-textarea__inner {
			
 
				-    background-color: #fff !important;
			
 
				-    border: 0;
			
 
				-  }
			
 
				-  .el-date-editor {
			
 
				-    i {
			
 
				-      display: none;
			
 
				-    }
			
 
				+
			
 
				+  .collapse-bottom {
			
 
				+    margin-bottom: 20px;
			
 
				   }
			
 
				-  .is-disabled {
			
 
				-    .el-input__inner:hover {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-    }
			
 
				-    color: #606266;
			
 
				+
			
 
				+  .input-main .textarea .el-textarea__inner {
			
 
				+    width: 100%;
			
 
				+    z-index: 1;
			
 
				+  }
			
 
				+
			
 
				+  .bg-left {
			
 
				+    padding-left: 30px;
			
 
				+  }
			
 
				+
			
 
				+  .bg-right {
			
 
				+    padding-right: 10px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .bg-bottom {
			
 
				+    margin: 15px 0px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi h3 {
			
 
				+    display: inline-block;
			
 
				+    left: 10px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi p {
			
 
				+    display: inline-block;
			
 
				+  }
			
 
				+
			
 
				+  .center {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item {
			
 
				+    width: 50%;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item__label {
			
 
				+    text-align: center;
			
 
				+  }
			
 
				+
			
 
				+  .ce {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				+  /*  height: 82px;*/
			
 
				+  /*}*/
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+
			
 
				+  .hide-sel {
			
 
				     .el-input__inner {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-      color: #606266;
			
 
				+      border: 0px;
			
 
				     }
			
 
				+
			
 
				+    .el-icon-arrow-up {
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				     .el-textarea__inner {
			
 
				       background-color: #fff !important;
			
 
				       border: 0;
			
 
				+    }
			
 
				+
			
 
				+    .el-date-editor {
			
 
				+      i {
			
 
				+        display: none;
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+    .is-disabled {
			
 
				+      .el-input__inner:hover {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+      }
			
 
				+
			
 
				       color: #606266;
			
 
				+
			
 
				+      .el-input__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				+
			
 
				+      .el-textarea__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				 
			
 
				-// 控制select为只读的时候显示样式
			
 
				-/deep/.ws-class-table-col {
			
 
				-  height: auto;
			
 
				-  padding: 0px 2px;
			
 
				-  /deep/.el-input__inner {
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+  /deep/.ws-class-table-col {
			
 
				+    height: auto;
			
 
				     padding: 0px 2px;
			
 
				+
			
 
				+    /deep/.el-input__inner {
			
 
				+      padding: 0px 2px;
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  /deep/.is-disabled {
			
 
				+    .el-input__prefix,
			
 
				+    .el-input__suffix {
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				+    .el-input__inner {
			
 
				+      background-color: #fff;
			
 
				+      border-color: #fff !important;
			
 
				+      color: #000 !important;
			
 
				+      font-size: 14px;
			
 
				+      cursor: text;
			
 
				+      padding: 0 !important;
			
 
				+    }
			
 
				   }
			
 
				-}
			
 
				-/deep/.is-disabled {
			
 
				-  .el-input__prefix,
			
 
				-  .el-input__suffix {
			
 
				-    display: none;
			
 
				+
			
 
				+  .winseaview-view {
			
 
				+    padding: 0 0 20px;
			
 
				   }
			
 
				-  .el-input__inner {
			
 
				-    background-color: #fff;
			
 
				-    border-color: #fff !important;
			
 
				-    color: #000 !important;
			
 
				+
			
 
				+  .container {
			
 
				+    overflow: scroll;
			
 
				+    height: 93vh;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				+    width: 130px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text-left {
			
 
				+    width: 62px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text {
			
 
				+    margin: 0 10px;
			
 
				+    color: #8890b1;
			
 
				+    font-size: 12px;
			
 
				+    margin-top: -4px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-line {
			
 
				+    height: 100px;
			
 
				+    border-left: 2px solid #e9ecf7;
			
 
				+    margin-left: 4px;
			
 
				+    padding: 0 3px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle {
			
 
				+    width: 10px;
			
 
				+    height: 10px;
			
 
				+    border: 2px solid #5878e8;
			
 
				+    background-color: #ffffff;
			
 
				+    -webkit-border-radius: 100px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle:first-child {
			
 
				+    color: red;
			
 
				+  }
			
 
				+
			
 
				+  .icon {
			
 
				+    display: inline-block;
			
 
				+    width: 60px;
			
 
				+    background: #ecfeff;
			
 
				+    border-radius: 12px;
			
 
				+    border: 1px solid #50cad4;
			
 
				+    position: relative;
			
 
				+    font-size: 14px;
			
 
				+    color: #50cad4;
			
 
				+    padding: 1px 7px;
			
 
				+  }
			
 
				+
			
 
				+  .title-top {
			
 
				+    margin-top: 20px;
			
 
				+    font-size: 21px;
			
 
				+    font-weight: 600;
			
 
				+  }
			
 
				+
			
 
				+  .title-number {
			
 
				     font-size: 14px;
			
 
				-    cursor: text;
			
 
				-    padding: 0 !important;
			
 
				-  }
			
 
				-}
			
 
				-.winseaview-view {
			
 
				-  padding: 0 0 20px;
			
 
				-}
			
 
				-.container {
			
 
				-  overflow: scroll;
			
 
				-  height: 93vh;
			
 
				-}
			
 
				-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				-  width: 130px;
			
 
				-}
			
 
				-.vertical-text-left {
			
 
				-  width: 62px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.vertical-text {
			
 
				-  margin: 0 10px;
			
 
				-  color: #8890b1;
			
 
				-  font-size: 12px;
			
 
				-  margin-top: -4px;
			
 
				-}
			
 
				-.vertical-line {
			
 
				-  height: 100px;
			
 
				-  border-left: 2px solid #e9ecf7;
			
 
				-  margin-left: 4px;
			
 
				-  padding: 0 3px;
			
 
				-}
			
 
				-.vertical-circle {
			
 
				-  width: 10px;
			
 
				-  height: 10px;
			
 
				-  border: 2px solid #5878e8;
			
 
				-  background-color: #ffffff;
			
 
				-  -webkit-border-radius: 100px;
			
 
				-}
			
 
				-.vertical-circle:first-child {
			
 
				-  color: red;
			
 
				-}
			
 
				-.icon {
			
 
				-  display: inline-block;
			
 
				-  width: 60px;
			
 
				-  height: 24px;
			
 
				-  background: #ecfeff;
			
 
				-  border-radius: 12px;
			
 
				-  border: 1px solid #50cad4;
			
 
				-  position: relative;
			
 
				-  font-size: 14px;
			
 
				-  color: #50cad4;
			
 
				-  line-height: 24px;
			
 
				-  padding: 1px 7px;
			
 
				-}
			
 
				+    font-weight: 400;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/contractManagement/salesContract.vue
+++ b/src/views/contractManagement/salesContract.vue
@@ -6,12 +6,7 @@
 
				 			<template slot="left">
			
 
				 				<ws-button type="primary" @click="handleAdd()" v-hasPermission="
			
 
				             `contractManagement.salesContract.salesContractInfo.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>
			
 
				+          ">添加</ws-button>
			
 
				 				<ws-button @click="exportlist()" v-hasPermission="
			
 
				             `contractManagement.salesContract.salesContractInfo.view`"
			
 
				           >导出</ws-button
			
@@ -228,7 +223,8 @@
 
				 		</el-pagination>
			
 
				 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
			
 
				 			@on-cancel="handleClose">
			
 
				-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
			
 
				+				<ws-upload ref="upload" :size-limit="size"
			
 
				+          @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
			
 
				 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				 		</WinseaContentModal>
			
 
				 	</div>
			
@@ -240,6 +236,7 @@
 
				 		editstatus,
			
 
				 		billoperatehis,
			
 
				 		deletecontract,
			
 
				+		editInfo
			
 
				 	} from '@/model/contarct/index'
			
 
				 	import {
			
 
				 		downloadFile
			
@@ -267,6 +264,7 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				+				id:'',
			
 
				 				//弹出框
			
 
				 				dialogViewSpareMoney: false,
			
 
				 				dialogApproveFormVisible: false,
			
@@ -388,6 +386,26 @@
 
				 			this.showType = this.isShow
			
 
				 		},
			
 
				 		methods: {
			
 
				+			onChange () {
			
 
				+			this.$refs.upload
			
 
				+				.handleSaveBill()
			
 
				+				.then(async response => {
			
 
				+				this.deptBudgetList.addressUrl = response
			
 
				+				this.deptBudgetList.id=this.id
			
 
				+				this.deptBudgetList.flag=1
			
 
				+				 editInfo(this.deptBudgetList)
			
 
				+				.toPromise()
			
 
				+				.then((response) => {
			
 
				+					this.accessoryTFs = false
			
 
				+					this.$message.success('上传成功')
			
 
				+					this.getList()
			
 
				+				})
			
 
				+				})
			
 
				+				.catch(res => {
			
 
				+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
			
 
				+				this.$refs.upload.clearFiles()
			
 
				+				})
			
 
				+			},
			
 
				 			dateFormat(fmt, date) {
			
 
				 				let ret
			
 
				 				const opt = {
			
@@ -444,7 +462,7 @@
 
				 					.then((response) => {
			
 
				 						for (var i = 0; i < response.records.length; i++) {
			
 
				 							if (response.records[i].addressUrl != null) {
			
 
				-								if (response.records[i].addressUrl != "") {
			
 
				+								if (response.records[i].addressUrl != '') {
			
 
				 									response.records[i].addressUrlArray =
			
 
				 										response.records[i].addressUrl.split(',')
			
 
				 								}
			
@@ -530,14 +548,8 @@
 
				 			},
			
 
				 			// receiveAttachmentPath
			
 
				 			fujian(row) {
			
 
				-				if (row.addressUrl === null || row.addressUrl === '') {
			
 
				-					EventBus.$emit(
			
 
				-						'warning',
			
 
				-						this.$t('system.noticeCircular.NoInformation')
			
 
				-					)
			
 
				-				} else {
			
 
				-					this.accessoryTFs = true
			
 
				-				}
			
 
				+				this.id=row.id
			
 
				+				this.accessoryTFs = true
			
 
				 				this.appendixIdss = row.addressUrl
			
 
				 				console.log(this.appendixIdss)
			
 
				 			},
			
--- a/src/views/contractManagement/salesContractAdd.vue
+++ b/src/views/contractManagement/salesContractAdd.vue
@@ -10,16 +10,15 @@
 
				         </el-button>
			
 
				       </el-col>
			
 
				     </el-row>
			
 
				-
			
 
				-    <div class="wenzi">
			
 
				-      <h3>基本信息</h3>
			
 
				-      <p>
			
 
				-        &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
			
 
				-        标记的条目提交后不可修改。
			
 
				-      </p>
			
 
				-    </div>
			
 
				     <div class="center">
			
 
				       <ws-form ref="deptBudgetList" :model="deptBudgetList">
			
 
				+        <div class="remark">
			
 
				+          <h3>基本信息</h3>
			
 
				+          <p style="color: #8890b1">
			
 
				+            &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
			
 
				+            标记的条目提交后不可修改。
			
 
				+          </p>
			
 
				+        </div>
			
 
				         <!--基本信息-->
			
 
				         <ws-info-table>
			
 
				           <!--合同类型-->
			
@@ -28,8 +27,8 @@
 
				             <el-radio v-model="deptBudgetList.agreementType" label="补充协议">补充协议</el-radio>
			
 
				           </ws-form-item>
			
 
				           <!--合同编号-->
			
 
				-          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly"
			
 
				-            v-if="deptBudgetList.agreementType == '销售合同'">
			
 
				+          <!-- v-if="deptBudgetList.agreementType == '销售合同'" -->
			
 
				+          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" v-if="deptBudgetList.agreementType == '销售合同'">
			
 
				             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
			
 
				               :rules="ruleDeptBudget" />
			
 
				           </ws-form-item>
			
@@ -46,19 +45,20 @@
 
				             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="50" size="small"
			
 
				               :rules="ruleDeptBudget" />
			
 
				           </ws-form-item>
			
 
				-          <!--运输方式-->
			
 
				-          <ws-form-item label="运输方式" span="1" prop="shippingType">
			
 
				-            <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="20" size="small" />
			
 
				-          </ws-form-item>
			
 
				           <!--买方-->
			
 
				           <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
			
 
				             <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
			
 
				-            <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
			
 
				-              placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete>
			
 
				+            <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
			
 
				+              placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete> -->
			
 
				+              <ws-select  v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" 
			
 
				+            @change="buyerSelect">
			
 
				+            <ws-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
			
 
				+              :value="item.customerName" />
			
 
				+              </ws-select>
			
 
				           </ws-form-item>
			
 
				-          <!--结算方式-->
			
 
				-          <ws-form-item label="结算方式" span="1" prop="settlementMethod">
			
 
				-            <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="120" size="small" />
			
 
				+          <!--运输方式-->
			
 
				+          <ws-form-item label="运输方式" span="1" prop="shippingType">
			
 
				+            <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="20" size="small" />
			
 
				           </ws-form-item>
			
 
				           <!--卖方-->
			
 
				           <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
			
@@ -66,18 +66,31 @@
 
				             <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
			
 
				               placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
			
 
				-            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">我方送货</el-radio>
			
 
				-            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio>
			
 
				-            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">对方自提</el-radio>
			
 
				-            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio>
			
 
				+          <!--结算方式-->
			
 
				+          <ws-form-item label="结算方式" span="1" prop="settlementMethod">
			
 
				+            <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="120" size="small" />
			
 
				           </ws-form-item>
			
 
				+
			
 
				           <!--买方电话-->
			
 
				           <ws-form-item label="买方电话" span="1" prop="contractNo">
			
 
				             <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
			
 
				             <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
			
 
				               placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
			
 
				           </ws-form-item>
			
 
				+          <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
			
 
				+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
			
 
				+              我方送货</el-radio>
			
 
				+            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio>
			
 
				+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">
			
 
				+              对方自提</el-radio>
			
 
				+            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio>
			
 
				+          </ws-form-item>
			
 
				+          <!--卖方电话-->
			
 
				+          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
			
 
				+            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
			
 
				+            <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
			
 
				+              placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
			
 
				+          </ws-form-item>
			
 
				           <!--包装方式-->
			
 
				           <ws-form-item label="包装方式" span="1" prop="packingMethod">
			
 
				             <ws-select v-model="deptBudgetList.packingMethod" placeholder="" class="typeselect"
			
@@ -86,16 +99,15 @@
 
				                 :value="item.constValue" />
			
 
				             </ws-select>
			
 
				           </ws-form-item>
			
 
				-          <!--卖方电话-->
			
 
				-          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
			
 
				-            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
			
 
				-            <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
			
 
				-              placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
			
 
				+          <!--重量（吨）-->
			
 
				+          <ws-form-item label="重量（吨）" span="1" prop="weight">
			
 
				+            <ws-input @input="weightchange" v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100"
			
 
				+              size="small" />
			
 
				           </ws-form-item>
			
 
				           <!--验收方式-->
			
 
				           <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
			
 
				-            <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" clearable filterable
			
 
				-              @change="selectunitList">
			
 
				+            <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" clearable
			
 
				+              filterable @change="selectunitList">
			
 
				               <el-option v-for="(item, index) in unitList" :key="item.constValue" :label="item.constValue"
			
 
				                 :value="item.constValue">
			
 
				                 <span class="unit-left" style="float: left">
			
@@ -131,11 +143,6 @@
 
				               </el-option>
			
 
				             </el-select>
			
 
				           </ws-form-item>
			
 
				-          <!--重量（吨）-->
			
 
				-          <ws-form-item label="重量（吨）" span="1" prop="weight">
			
 
				-            <ws-input @input="weightchange" v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100"
			
 
				-              size="small" />
			
 
				-          </ws-form-item>
			
 
				           <!--交货日期（起）-->
			
 
				           <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
			
 
				             <ws-date-picker v-model="deptBudgetList.deliveryDateStart" type="date" placeholder="请选择交货日期（起）"
			
@@ -167,6 +174,11 @@
 
				           <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
			
 
				             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
			
 
				           </ws-form-item>
			
 
				+          <!--签订日期-->
			
 
				+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType == '补充协议'">
			
 
				+            <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
			
 
				+              value-format="yyyy-MM-dd" />
			
 
				+          </ws-form-item>
			
 
				           <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
			
 
				             <!-- <el-cascader
			
 
				               :options="options_"
			
@@ -202,7 +214,7 @@
 
				             <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
			
 
				           </ws-form-item>
			
 
				           <!--签订日期-->
			
 
				-          <ws-form-item label="签订日期" span="1" prop="signingDate">
			
 
				+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType == '销售合同'">
			
 
				             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
			
 
				               value-format="yyyy-MM-dd" />
			
 
				           </ws-form-item>
			
@@ -334,13 +346,9 @@
 
				         <!--备注信息-->
			
 
				         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
			
 
				           maxlength="3000" />
			
 
				-        <ws-upload ref="upload" 
			
 
				-        :comp-id="compId" 
			
 
				-        :appendix-ids="deptBudgetList.addressUrl" 
			
 
				-        :size-limit="size"
			
 
				-        @onChange="onChange" 
			
 
				-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
			
 
				-        v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`"/>
			
 
				+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
			
 
				+          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				+          v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`" />
			
 
				       </ws-form>
			
 
				       <div v-if="dialogVisible" class="map">
			
 
				         <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">
			
@@ -361,6 +369,7 @@
 
				     editxiala,
			
 
				     delxiala,
			
 
				     getRelationContractNo,
			
 
				+     getcustomerinfo
			
 
				   } from '@/model/contarct/index'
			
 
				   import WsUpload from '@/components/WsUpload'
			
 
				   import {
			
@@ -390,6 +399,7 @@
 
				         restaurants2: [],
			
 
				         restaurants3: [],
			
 
				         restaurants4: [],
			
 
				+        customerinfo:[],
			
 
				         //弹出框
			
 
				         dialogViewSpareMoney: false,
			
 
				         dialogApproveFormVisible: false,
			
@@ -433,6 +443,7 @@
 
				           contractGoodsInfo: {
			
 
				             goodsName: '',
			
 
				           },
			
 
				+          buyerPhone:'',
			
 
				           contractProcessInfo: {},
			
 
				           addressUrl: '',
			
 
				           sourceGoods: '',
			
@@ -492,6 +503,15 @@
 
				       if (!this.restaurants4) this.restaurants4 = [];
			
 
				     },
			
 
				     methods: {
			
 
				+      buyerSelect(item) {
			
 
				+        console.log(item)
			
 
				+        for (let i = 0; i < this.customerinfo.length; i++) {
			
 
				+          console.log(this.customerinfo[i].customerName,item)
			
 
				+          if(this.customerinfo[i].customerName==item){
			
 
				+            this.deptBudgetList.buyerPhone=this.customerinfo[i].customerPhone
			
 
				+          }
			
 
				+        }
			
 
				+      },
			
 
				       querySearch1(queryString, cb) {
			
 
				         var restaurants1 = this.restaurants1;
			
 
				         var results = queryString ? restaurants1.filter(this.createFilter(queryString)) : restaurants1;
			
@@ -613,6 +633,18 @@
 
				           .then((response) => {
			
 
				             this.contractNoList = response
			
 
				           })
			
 
				+          getcustomerinfo({compId: sessionStorage.getItem('ws-pf_compId'),}).toPromise()
			
 
				+          .then((response) => {
			
 
				+            var arr=[]
			
 
				+            for (let i = 0; i < response.length; i++) {
			
 
				+              if(response[i].customerType=='个人客户'){
			
 
				+                arr.push({customerName:response[i].customerName,customerPhone:response[i].customerPhone})
			
 
				+              }else{
			
 
				+                arr.push({customerName:response[i].compName,customerPhone:response[i].customerPhone})
			
 
				+              }
			
 
				+            }
			
 
				+            this.customerinfo = arr
			
 
				+          })
			
 
				       },
			
 
				       selectRelation(e) {
			
 
				         for (var i = 0; i < this.contractNoList.length; i++) {
			
@@ -621,6 +653,12 @@
 
				             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
			
 
				             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
			
 
				             this.deptBudgetList.agreementType = '补充协议'
			
 
				+            this.newSelectedOptions = this.contractNoList[i].sourceProvince + this.contractNoList[i].sourceCity + this
			
 
				+              .contractNoList[i].sourceArea
			
 
				+            this.deptBudgetList.sourceGoods = this.contractNoList[i].sourceGoods
			
 
				+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince + this.contractNoList[i].deliveryCity +
			
 
				+              this.contractNoList[i].deliveryArea
			
 
				+            this.deptBudgetList.placeDelivery = this.contractNoList[i].placeDelivery
			
 
				           }
			
 
				         }
			
 
				       },
			
@@ -1140,6 +1178,8 @@
 
				           })
			
 
				           return
			
 
				         }
			
 
				+        if(this.deptBudgetList.contractProcessInfo.goodsNameKey ){
			
 
				+
			
 
				         if (
			
 
				           !this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000 ||
			
 
				           this.deptBudgetList.contractProcessInfo.goodsNameKey < 100 ||
			
@@ -1159,6 +1199,7 @@
 
				           })
			
 
				           return
			
 
				         }
			
 
				+        }
			
 
				         if (
			
 
				           this.deptBudgetList.contractProcessInfo.waterContent > 10000000 ||
			
 
				           this.deptBudgetList.contractProcessInfo.waterContent < 0 ||
			
@@ -1415,6 +1456,8 @@
 
				         for (var i = 0; i < this.gradeList.length; i++) {
			
 
				           if (this.gradeList[i].constValue == e) {
			
 
				             this.deptBudgetList.gradeKey = this.gradeList[i].constKey
			
 
				+            this.deptBudgetList.contractGoodsInfo.gradeKey =
			
 
				+              this.gradeList[i].constKey
			
 
				           }
			
 
				         }
			
 
				       },
			
@@ -1436,7 +1479,7 @@
 
				         }
			
 
				       },
			
 
				       selectpriceType(e) {
			
 
				-        if(e=='随行就市'){
			
 
				+        if (e == '随行就市') {
			
 
				           this.deptBudgetList.deliverType = '1'
			
 
				         }
			
 
				       },
			
--- a/src/views/contractManagement/salesContractEdit.vue
+++ b/src/views/contractManagement/salesContractEdit.vue
@@ -10,16 +10,15 @@
 
				         </el-button>
			
 
				       </el-col>
			
 
				     </el-row>
			
 
				-
			
 
				-    <div class="wenzi">
			
 
				-      <h3>基本信息</h3>
			
 
				-      <p>
			
 
				-        &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
			
 
				-        标记的条目提交后不可修改。
			
 
				-      </p>
			
 
				-    </div>
			
 
				     <div class="center">
			
 
				       <ws-form ref="deptBudgetList" :rules="ruleDeptBudget" :model="deptBudgetList">
			
 
				+         <div class="remark">
			
 
				+      <h3>基本信息</h3>
			
 
				+      <p style="color: #8890b1">
			
 
				+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
			
 
				+          标记的条目提交后不可修改。
			
 
				+        </p>
			
 
				+    </div>
			
 
				         <!--基本信息-->
			
 
				         <ws-info-table>
			
 
				           <!--合同类型-->
			
@@ -172,6 +171,11 @@
 
				           <ws-form-item label="合同总价" span="1" prop="contractNo">
			
 
				             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
			
 
				           </ws-form-item>
			
 
				+          <!--签订日期-->
			
 
				+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='销售合同'">
			
 
				+            <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
			
 
				+              value-format="yyyy-MM-dd" />
			
 
				+          </ws-form-item>
			
 
				           <!-- 货源所在地区 -->
			
 
				           <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
			
 
				             <!-- <el-cascader
			
@@ -211,7 +215,7 @@
 
				             <ws-input v-model="deptBudgetList.placeDelivery" maxlength="100" placeholder="请输入交货地详细地址" size="small" />
			
 
				           </ws-form-item>
			
 
				           <!--签订日期-->
			
 
				-          <ws-form-item label="签订日期" span="1" prop="signingDate">
			
 
				+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='补充协议'">
			
 
				             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
			
 
				               value-format="yyyy-MM-dd" />
			
 
				           </ws-form-item>
			
@@ -340,8 +344,7 @@
 
				         <!--备注信息-->
			
 
				         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
			
 
				           maxlength="200" />
			
 
				-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
			
 
				-          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
			
 
				+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
			
 
				             `contractManagement.salesContract.salesContractInfo.appl`"/>
			
 
				       </ws-form>
			
 
				     </div>
			
@@ -1155,6 +1158,8 @@
 
				           })
			
 
				           return
			
 
				         }
			
 
				+        if(this.deptBudgetList.contractProcessInfo.goodsNameKey){
			
 
				+
			
 
				         if (
			
 
				           (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
			
 
				           (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||
			
@@ -1174,6 +1179,7 @@
 
				           })
			
 
				           return
			
 
				         }
			
 
				+        }
			
 
				         if (
			
 
				           (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
			
 
				           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
			
--- a/src/views/contractManagement/salesContractExamine.vue
+++ b/src/views/contractManagement/salesContractExamine.vue
@@ -1,4 +1,3 @@
 
				-
			
 
				 <!--销售合同-->
			
 
				 <!--2019年5月30日 20:25:16 by jlx-->
			
 
				 <template>
			
@@ -8,88 +7,66 @@
 
				         <h2 class="bg-left title">查看合同详情</h2>
			
 
				       </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="vertion-align: bottom; margin-right: 3px"
			
 
				-            src="../../../public/img/lujing.png"
			
 
				-            alt=""
			
 
				-          />返回</el-button
			
 
				-        >
			
 
				+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
			
 
				+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
			
 
				+        </el-button>
			
 
				       </el-col>
			
 
				     </el-row>
			
 
				-    <div class="state">
			
 
				-      <h2>销售合同</h2>
			
 
				-      <p>【编号：{{ deptBudgetList.contractNo }}】</p>
			
 
				-      <div class="icon">
			
 
				-        <template>
			
 
				-          <el-popover
			
 
				-            placement="right"
			
 
				-            :width="285"
			
 
				-            trigger="click"
			
 
				-            visible-arrow="false"
			
 
				-            @show="history(deptBudgetList.id)"
			
 
				-          >
			
 
				-          <template>
			
 
				-            <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				-          </template>
			
 
				-            <div>
			
 
				-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				-              <div v-for="(item, index) in historyList" class="flex">
			
 
				-                <div class="vertical-text vertical-text-left">
			
 
				-                  {{ item.updateDate }}
			
 
				-                </div>
			
 
				+    <div class="center">
			
 
				+      <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
			
 
				+        <div class="title-top">
			
 
				+          销售合同
			
 
				+          <span class="title-number">【编号：{{ deptBudgetList.contractNo }}】</span>
			
 
				+          <div class="icon" v-if="deptBudgetList.status">
			
 
				+            <template>
			
 
				+              <el-popover placement="right" :width="285" trigger="click" visible-arrow="false"
			
 
				+                @show="history(deptBudgetList.id)">
			
 
				+                <template>
			
 
				+                  <div slot="reference"> {{deptBudgetList.status }}</div>
			
 
				+                </template>
			
 
				                 <div>
			
 
				-                  <div class="vertical-circle"></div>
			
 
				-                  <div
			
 
				-                    v-if="index != historyList.length - 1"
			
 
				-                    class="vertical-line"
			
 
				-                  ></div>
			
 
				-                </div>
			
 
				-                <div class="vertical-text">
			
 
				-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+                  <p style="margin-top: 0; padding-left: 10px">操作历史</p>
			
 
				+                  <div v-for="(item, index) in historyList" class="flex">
			
 
				+                    <div class="vertical-text vertical-text-left">
			
 
				+                      {{ item.updateDate }}
			
 
				+                    </div>
			
 
				+                    <div>
			
 
				+                      <div class="vertical-circle"></div>
			
 
				+                      <div v-if="index != historyList.length - 1" class="vertical-line"></div>
			
 
				+                    </div>
			
 
				+                    <div class="vertical-text">
			
 
				+                      {{ item.operateUser }}<br />{{ item.dealMsg }}
			
 
				+                    </div>
			
 
				+                  </div>
			
 
				                 </div>
			
 
				-              </div>
			
 
				-            </div>
			
 
				-          </el-popover>
			
 
				-        </template>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-    <div class="center">
			
 
				-      <ws-form
			
 
				-        ref="deptBudgetList"
			
 
				-        :rules="mainReportAdd"
			
 
				-        :model="deptBudgetList"
			
 
				-      >
			
 
				+              </el-popover>
			
 
				+            </template>
			
 
				+          </div>
			
 
				+        </div>
			
 
				         <div class="remark">
			
 
				           <h3>基本信息</h3>
			
 
				         </div>
			
 
				         <ws-info-table>
			
 
				-        <ws-form-item label="合同类型" span="1" prop="agreementType">
			
 
				-           <div class="unchanged">
			
 
				-          {{ deptBudgetList.agreementType }}
			
 
				-           </div>
			
 
				-        </ws-form-item>
			
 
				-        <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='销售合同'" span="1" prop="contractNo">
			
 
				-           <div class="unchanged">
			
 
				-          {{ deptBudgetList.contractNo }}
			
 
				-           </div>
			
 
				-        </ws-form-item>
			
 
				-        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
			
 
				-           <div class="unchanged">
			
 
				-          {{ deptBudgetList.agreementNo }}
			
 
				-           </div>
			
 
				-        </ws-form-item>
			
 
				-        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
			
 
				-           <div class="unchanged">
			
 
				-          {{ deptBudgetList.contractNo }}
			
 
				-           </div>
			
 
				-        </ws-form-item>
			
 
				+          <ws-form-item label="合同类型" span="1" prop="agreementType">
			
 
				+            <div class="unchanged">
			
 
				+              {{ deptBudgetList.agreementType }}
			
 
				+            </div>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='销售合同'" span="1" prop="contractNo">
			
 
				+            <div class="unchanged">
			
 
				+              {{ deptBudgetList.contractNo }}
			
 
				+            </div>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
			
 
				+            <div class="unchanged">
			
 
				+              {{ deptBudgetList.agreementNo }}
			
 
				+            </div>
			
 
				+          </ws-form-item>
			
 
				+          <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
			
 
				+            <div class="unchanged">
			
 
				+              {{ deptBudgetList.contractNo }}
			
 
				+            </div>
			
 
				+          </ws-form-item>
			
 
				           <ws-form-item label="运输方式" span="1" prop="shippingType">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.shippingType }}
			
@@ -140,11 +117,7 @@
 
				               {{ deptBudgetList.weight }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item
			
 
				-            label="交货日期（起）"
			
 
				-            span="1"
			
 
				-            prop="deliveryDateStart"
			
 
				-          >
			
 
				+          <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.deliveryDateStart }}
			
 
				             </div>
			
@@ -159,26 +132,22 @@
 
				               {{ deptBudgetList.deliveryDateEnd }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item
			
 
				-            label="合同单价（元/吨）"
			
 
				-            span="1"
			
 
				-            prop="unitContractPrice"
			
 
				-          >
			
 
				+          <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.unitContractPrice }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				 
			
 
				-          <ws-form-item
			
 
				-            label="合同总价（元）"
			
 
				-            span="1"
			
 
				-            prop="totalContractPrice"
			
 
				-          >
			
 
				+          <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.totalContractPrice }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				-
			
 
				+          <ws-form-item label="签订日期" span="1" prop="signingDate"  v-if="deptBudgetList.agreementType=='销售合同'">
			
 
				+            <div class="unchanged">
			
 
				+              {{ deptBudgetList.signingDate }}
			
 
				+            </div>
			
 
				+          </ws-form-item>
			
 
				           <ws-form-item label="货源所在地区" span="1">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.sourceProvince }}
			
@@ -206,17 +175,13 @@
 
				               {{ deptBudgetList.placeDelivery }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="签订日期" span="1" prop="signingDate">
			
 
				+          <ws-form-item label="签订日期" span="1" prop="signingDate"  v-if="deptBudgetList.agreementType=='补充协议'">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.signingDate }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				 
			
 
				-          <ws-form-item
			
 
				-            label="最终实际交易量 (吨)"
			
 
				-            span="1"
			
 
				-            prop="finalTradingVolume"
			
 
				-          >
			
 
				+          <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.finalTradingVolume }}
			
 
				             </div>
			
@@ -253,12 +218,7 @@
 
				               {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item
			
 
				-            label="霉变粒（%）<="
			
 
				-            span="1"
			
 
				-            prop="mildewGrain"
			
 
				-            class="result"
			
 
				-          >
			
 
				+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain" class="result">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
			
 
				             </div>
			
@@ -268,12 +228,7 @@
 
				               {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
			
 
				             </div>
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item
			
 
				-            label="不完善粒（%）<="
			
 
				-            span="1"
			
 
				-            prop="imperfectGrain"
			
 
				-            class="result"
			
 
				-          >
			
 
				+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain" class="result">
			
 
				             <div class="unchanged">
			
 
				               {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
			
 
				             </div>
			
@@ -331,23 +286,14 @@
 
				           </div>
			
 
				         </div>
			
 
				 
			
 
				-        <ws-upload
			
 
				-        ref="upload"
			
 
				-        :comp-id="compId"
			
 
				-        :appendix-ids="deptBudgetList.addressUrl"
			
 
				-        :editable="false"
			
 
				-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
			
 
				-      />
			
 
				+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false"
			
 
				+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
			
 
				       </ws-form>
			
 
				-      <el-table
			
 
				-        class="wenzi"
			
 
				-        :data="taskhistories"
			
 
				-        style="width: 100%"
			
 
				-      >
			
 
				+      <el-table class="wenzi" :data="taskhistories" style="width: 100%">
			
 
				         <el-table-column prop="operatorMajorRoleName" label="审核人">
			
 
				           <template scope="scope">
			
 
				             {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
			
 
				-            </template>
			
 
				+          </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column prop="inOutTaskNo" label="审核结果">
			
 
				           <template scope="scope">
			
@@ -357,475 +303,551 @@
 
				         </el-table-column>
			
 
				         <el-table-column prop="endTime" label="审核时间"></el-table-column>
			
 
				         <el-table-column prop="auditMind" label="审核意见"></el-table-column>
			
 
				-     </el-table>
			
 
				+      </el-table>
			
 
				       <div style="text-align: right; padding: 10px">
			
 
				-        <el-button
			
 
				-          class="bg-bottom"
			
 
				-          type="primary"
			
 
				-          size="small"
			
 
				-          @click="returnsales()"
			
 
				-          >关闭</el-button
			
 
				-        >
			
 
				+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">关闭</el-button>
			
 
				       </div>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				-import {
			
 
				-  packList,
			
 
				-  xiala,
			
 
				-  examineList,
			
 
				-  billoperatehis,
			
 
				-} from '@/model/contarct/index'
			
 
				-import {
			
 
				-  gettaskhistories
			
 
				-} from '@/model/tasksport/index'
			
 
				-import { dayjs } from 'base-core-lib'
			
 
				-import WsUpload from '@/components/WsUpload'
			
 
				-export default {
			
 
				-  name: 'viewSpareMoney',
			
 
				-  components: {
			
 
				-    WsUpload,
			
 
				-  },
			
 
				-  watch: {
			
 
				-    vesselId(val) {
			
 
				-      this.getVesselData()
			
 
				+  import {
			
 
				+    packList,
			
 
				+    xiala,
			
 
				+    examineList,
			
 
				+    billoperatehis,
			
 
				+  } from '@/model/contarct/index'
			
 
				+  import {
			
 
				+    gettaskhistories
			
 
				+  } from '@/model/tasksport/index'
			
 
				+  import {
			
 
				+    dayjs
			
 
				+  } from 'base-core-lib'
			
 
				+  import WsUpload from '@/components/WsUpload'
			
 
				+  export default {
			
 
				+    name: 'viewSpareMoney',
			
 
				+    components: {
			
 
				+      WsUpload,
			
 
				     },
			
 
				-    isShow(val) {
			
 
				-      this.showType = val
			
 
				-    },
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      //弹出框
			
 
				-      dialogViewSpareMoney: false,
			
 
				-      dialogApproveFormVisible: false,
			
 
				-      taskhistories:[],
			
 
				-      // 船舶类型
			
 
				-      monetaryKey: null,
			
 
				-      // 表格显示数据
			
 
				-      tableDate: [],
			
 
				-      // 是否显示
			
 
				-      showType: true,
			
 
				-      // 年
			
 
				-      year: '',
			
 
				-      // 提交类型
			
 
				-      submitType: true,
			
 
				-      tableData: [],
			
 
				-      ruleDeptBudget: [],
			
 
				-      deptBudgetList: {
			
 
				-        contractProcessInfo: {},
			
 
				-        contractGoodsInfo: {},
			
 
				+    watch: {
			
 
				+      vesselId(val) {
			
 
				+        this.getVesselData()
			
 
				+      },
			
 
				+      isShow(val) {
			
 
				+        this.showType = val
			
 
				       },
			
 
				-      mainReportAdd: {},
			
 
				-      list: {},
			
 
				-      historyList: [],
			
 
				-      compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-    }
			
 
				-  },
			
 
				-
			
 
				-  activated() {
			
 
				-    this.status = this.$route.query.status
			
 
				-    this.loaddata()
			
 
				-    this.showType = this.isShow
			
 
				-    // this.examineList()
			
 
				-  },
			
 
				-  methods: {
			
 
				-    loaddata() {
			
 
				-      gettaskhistories({businessKey: this.$route.query.id,workflowId: this.$route.query.workflowId}).toPromise()
			
 
				-          .then((response) => {
			
 
				-            this.taskhistories=response
			
 
				-          })
			
 
				-      // 数据
			
 
				-      examineList({ id: this.$route.query.id })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.deptBudgetList = response
			
 
				-          if (this.deptBudgetList.deliverType == 1) {
			
 
				-            this.deptBudgetList.deliverType1 = '我方送货'
			
 
				-          } else if (this.deptBudgetList.deliverType == 2) {
			
 
				-            this.deptBudgetList.deliverType1 = '对方自提'
			
 
				-          }
			
 
				-        })
			
 
				-      // 包装方式
			
 
				-      packList({ constId: 'CON1' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.packtypeList = response
			
 
				-        })
			
 
				-      // 验收方式
			
 
				-      this.getUnitList()
			
 
				-      // 货名
			
 
				-      packList({ constId: 'CON2' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.goodnameList = response
			
 
				-        })
			
 
				-      // 品级
			
 
				-      packList({ constId: 'CON3' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.gradeList = response
			
 
				-        })
			
 
				-      // 双章
			
 
				-      packList({ constId: 'CON4' })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.ChapterTwoList = response
			
 
				-        })
			
 
				     },
			
 
				-    getUnitList() {
			
 
				-      xiala({
			
 
				+    data() {
			
 
				+      return {
			
 
				+        //弹出框
			
 
				+        dialogViewSpareMoney: false,
			
 
				+        dialogApproveFormVisible: false,
			
 
				+        taskhistories: [],
			
 
				+        // 船舶类型
			
 
				+        monetaryKey: null,
			
 
				+        // 表格显示数据
			
 
				+        tableDate: [],
			
 
				+        // 是否显示
			
 
				+        showType: true,
			
 
				+        // 年
			
 
				+        year: '',
			
 
				+        // 提交类型
			
 
				+        submitType: true,
			
 
				+        tableData: [],
			
 
				+        ruleDeptBudget: [],
			
 
				+        deptBudgetList: {
			
 
				+          contractProcessInfo: {},
			
 
				+          contractGoodsInfo: {},
			
 
				+        },
			
 
				+        mainReportAdd: {},
			
 
				+        list: {},
			
 
				+        historyList: [],
			
 
				         compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-        constCode: 'TYPEYAN',
			
 
				-      })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.unitList = response
			
 
				-          let currItem
			
 
				-          this.unitList.forEach((item, index, arr) => {
			
 
				-            item.flag = 'delete'
			
 
				-            if (this.vModel == item.constKey) {
			
 
				-              currItem = item
			
 
				-            }
			
 
				-          })
			
 
				-          //
			
 
				-          if (currItem) {
			
 
				-            this.selectContract(currItem.constValue)
			
 
				-          }
			
 
				-        })
			
 
				-    },
			
 
				-    // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				-    handleClose() {
			
 
				-      this.dialogViewSpareMoney = false
			
 
				+      }
			
 
				     },
			
 
				-    history(id1) {
			
 
				-      billoperatehis({ id: id1 })
			
 
				-        .toPromise()
			
 
				-        .then((response) => {
			
 
				-          this.historyList = response
			
 
				-        })
			
 
				+
			
 
				+    activated() {
			
 
				+      this.status = this.$route.query.status
			
 
				+      this.loaddata()
			
 
				+      this.showType = this.isShow
			
 
				+      // this.examineList()
			
 
				     },
			
 
				+    methods: {
			
 
				+      loaddata() {
			
 
				+        gettaskhistories({
			
 
				+            businessKey: this.$route.query.id,
			
 
				+            workflowId: this.$route.query.workflowId
			
 
				+          }).toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.taskhistories = response
			
 
				+          })
			
 
				+        // 数据
			
 
				+        examineList({
			
 
				+            id: this.$route.query.id
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.deptBudgetList = response
			
 
				+            if (this.deptBudgetList.deliverType == 1) {
			
 
				+              this.deptBudgetList.deliverType1 = '我方送货'
			
 
				+            } else if (this.deptBudgetList.deliverType == 2) {
			
 
				+              this.deptBudgetList.deliverType1 = '对方自提'
			
 
				+            }
			
 
				+          })
			
 
				+        // 包装方式
			
 
				+        packList({
			
 
				+            constId: 'CON1'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.packtypeList = response
			
 
				+          })
			
 
				+        // 验收方式
			
 
				+        this.getUnitList()
			
 
				+        // 货名
			
 
				+        packList({
			
 
				+            constId: 'CON2'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.goodnameList = response
			
 
				+          })
			
 
				+        // 品级
			
 
				+        packList({
			
 
				+            constId: 'CON3'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.gradeList = response
			
 
				+          })
			
 
				+        // 双章
			
 
				+        packList({
			
 
				+            constId: 'CON4'
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.ChapterTwoList = response
			
 
				+          })
			
 
				+      },
			
 
				+      getUnitList() {
			
 
				+        xiala({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            constCode: 'TYPEYAN',
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.unitList = response
			
 
				+            let currItem
			
 
				+            this.unitList.forEach((item, index, arr) => {
			
 
				+              item.flag = 'delete'
			
 
				+              if (this.vModel == item.constKey) {
			
 
				+                currItem = item
			
 
				+              }
			
 
				+            })
			
 
				+            //
			
 
				+            if (currItem) {
			
 
				+              this.selectContract(currItem.constValue)
			
 
				+            }
			
 
				+          })
			
 
				+      },
			
 
				+      // 关闭 dialog时 处理文件url 初始化upload组件
			
 
				+      handleClose() {
			
 
				+        this.dialogViewSpareMoney = false
			
 
				+      },
			
 
				+      history(id1) {
			
 
				+        billoperatehis({
			
 
				+            id: id1
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.historyList = response
			
 
				+          })
			
 
				+      },
			
 
				 
			
 
				-    returnsales() {
			
 
				-      this.$router.go(-1)
			
 
				+      returnsales() {
			
 
				+        this.$router.go(-1)
			
 
				+      },
			
 
				     },
			
 
				-  },
			
 
				-}
			
 
				+  }
			
 
				 </script>
			
 
				 <style lang="scss" scoped>
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				-  padding: 0 25px;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item {
			
 
				-  border-right: 1px solid #cdd2dc;
			
 
				-  border-bottom: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.title {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.title::before {
			
 
				-  content: '';
			
 
				-  display: inline-block;
			
 
				-  width: 5px;
			
 
				-  height: 30px;
			
 
				-  background: #5473e8;
			
 
				-  position: absolute;
			
 
				-  left: 0;
			
 
				-}
			
 
				-.el-button--primary {
			
 
				-  background-color: #5878e8;
			
 
				-  border-color: #5878e8;
			
 
				-}
			
 
				-.el-col {
			
 
				-  background: #f6f7fc;
			
 
				-}
			
 
				-.readonly {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.readonly:after {
			
 
				-  content: '*';
			
 
				-  color: #ff2727;
			
 
				-  position: absolute;
			
 
				-  right: 8px;
			
 
				-  z-index: 10;
			
 
				-  top: 21%;
			
 
				-  font-size: 20px;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				-  padding: 0 25px;
			
 
				-  border-left: 1px solid #cdd2dc;
			
 
				-  background: #fafbfc;
			
 
				-}
			
 
				-/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				-  width: 140px;
			
 
				-  text-align: center;
			
 
				-  background: #f0f2f6;
			
 
				-  // border: 1px solid #cdd2dc;
			
 
				-}
			
 
				-.button-container {
			
 
				-  display: flex;
			
 
				-  flex-wrap: nowrap;
			
 
				-  justify-content: space-between;
			
 
				-  align-items: center;
			
 
				-  background-color: #fff;
			
 
				-  width: 100%;
			
 
				-  height: 50px;
			
 
				-  padding: 0 10px;
			
 
				-  & > div {
			
 
				-    margin-left: 10px;
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				+    padding: 0 25px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item {
			
 
				+    border-right: 1px solid #cdd2dc;
			
 
				+    border-bottom: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .title {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .title::before {
			
 
				+    content: '';
			
 
				+    display: inline-block;
			
 
				+    width: 5px;
			
 
				+    height: 30px;
			
 
				+    background: #5473e8;
			
 
				+    position: absolute;
			
 
				+    left: 0;
			
 
				+  }
			
 
				+
			
 
				+  .el-button--primary {
			
 
				+    background-color: #5878e8;
			
 
				+    border-color: #5878e8;
			
 
				+  }
			
 
				+
			
 
				+  .el-col {
			
 
				+    background: #f6f7fc;
			
 
				+  }
			
 
				+
			
 
				+  .readonly {
			
 
				+    position: relative;
			
 
				+  }
			
 
				+
			
 
				+  .readonly:after {
			
 
				+    content: '*';
			
 
				+    color: #ff2727;
			
 
				+    position: absolute;
			
 
				+    right: 8px;
			
 
				+    z-index: 10;
			
 
				+    top: 21%;
			
 
				+    font-size: 20px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				+    padding: 0 25px;
			
 
				+    border-left: 1px solid #cdd2dc;
			
 
				+    background: #fafbfc;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+    width: 140px;
			
 
				+    text-align: center;
			
 
				+    background: #f0f2f6;
			
 
				+    // border: 1px solid #cdd2dc;
			
 
				+  }
			
 
				+
			
 
				+  .button-container {
			
 
				     display: flex;
			
 
				     flex-wrap: nowrap;
			
 
				-    flex-direction: row;
			
 
				-    & > span {
			
 
				-      line-height: 50px;
			
 
				-    }
			
 
				-  }
			
 
				+    justify-content: space-between;
			
 
				+    align-items: center;
			
 
				+    background-color: #fff;
			
 
				+    width: 100%;
			
 
				+    height: 50px;
			
 
				+    padding: 0 10px;
			
 
				 
			
 
				-  /deep/.auditFlow-box {
			
 
				-    position: unset;
			
 
				-    margin-left: 10px;
			
 
				-    &/deep/.auditFlow-icon {
			
 
				-      width: auto;
			
 
				-      padding-right: 30px;
			
 
				+    &>div {
			
 
				+      margin-left: 10px;
			
 
				+      display: flex;
			
 
				+      flex-wrap: nowrap;
			
 
				+      flex-direction: row;
			
 
				+
			
 
				+      &>span {
			
 
				+        line-height: 50px;
			
 
				+      }
			
 
				     }
			
 
				-    &/deep/.auditFlow-main {
			
 
				-      position: absolute;
			
 
				+
			
 
				+    /deep/.auditFlow-box {
			
 
				+      position: unset;
			
 
				+      margin-left: 10px;
			
 
				+
			
 
				+      &/deep/.auditFlow-icon {
			
 
				+        width: auto;
			
 
				+        padding-right: 30px;
			
 
				+      }
			
 
				+
			
 
				+      &/deep/.auditFlow-main {
			
 
				+        position: absolute;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.box-app {
			
 
				-  display: inline-block;
			
 
				 
			
 
				-  margin-left: 30px;
			
 
				-  line-height: 50px;
			
 
				-}
			
 
				-/deep/.el-dialog {
			
 
				-  .el-form-item {
			
 
				-    margin-bottom: 0 !important;
			
 
				-    .el-input--medium {
			
 
				-      textarea {
			
 
				-        min-height: 100px !important;
			
 
				+  .box-app {
			
 
				+    display: inline-block;
			
 
				+
			
 
				+    margin-left: 30px;
			
 
				+    line-height: 50px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-dialog {
			
 
				+    .el-form-item {
			
 
				+      margin-bottom: 0 !important;
			
 
				+
			
 
				+      .el-input--medium {
			
 
				+        textarea {
			
 
				+          min-height: 100px !important;
			
 
				+        }
			
 
				       }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				-.collapse-bottom {
			
 
				-  margin-bottom: 20px;
			
 
				-}
			
 
				-.input-main .textarea .el-textarea__inner {
			
 
				-  width: 100%;
			
 
				-  z-index: 1;
			
 
				-}
			
 
				-.bg-left {
			
 
				-  padding-left: 30px;
			
 
				-}
			
 
				-.bg-right {
			
 
				-  padding: 10px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.bg-bottom {
			
 
				-  margin: 6px 0px;
			
 
				-}
			
 
				-.wenzi {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.wenzi h3 {
			
 
				-  display: inline-block;
			
 
				-  left: 30px;
			
 
				-}
			
 
				-.wenzi p {
			
 
				-  display: inline-block;
			
 
				-}
			
 
				-.center {
			
 
				-  width: 70%;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.el-form-item {
			
 
				-  width: 50%;
			
 
				-}
			
 
				-.el-form-item__label {
			
 
				-  text-align: center;
			
 
				-}
			
 
				-/*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				-/*  height: 82px;*/
			
 
				-/*}*/
			
 
				-// 控制select为只读的时候显示样式
			
 
				-
			
 
				-.hide-sel {
			
 
				-  .el-input__inner {
			
 
				-    border: 0px;
			
 
				-  }
			
 
				-  .el-icon-arrow-up {
			
 
				-    display: none;
			
 
				-  }
			
 
				-  .el-textarea__inner {
			
 
				-    background-color: #fff !important;
			
 
				-    border: 0;
			
 
				-  }
			
 
				-  .el-date-editor {
			
 
				-    i {
			
 
				-      display: none;
			
 
				-    }
			
 
				+
			
 
				+  .collapse-bottom {
			
 
				+    margin-bottom: 20px;
			
 
				   }
			
 
				-  .is-disabled {
			
 
				-    .el-input__inner:hover {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-    }
			
 
				-    color: #606266;
			
 
				+
			
 
				+  .input-main .textarea .el-textarea__inner {
			
 
				+    width: 100%;
			
 
				+    z-index: 1;
			
 
				+  }
			
 
				+
			
 
				+  .bg-left {
			
 
				+    padding-left: 30px;
			
 
				+  }
			
 
				+
			
 
				+  .bg-right {
			
 
				+    padding: 10px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .bg-bottom {
			
 
				+    margin: 6px 0px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi h3 {
			
 
				+    display: inline-block;
			
 
				+    left: 30px;
			
 
				+  }
			
 
				+
			
 
				+  .wenzi p {
			
 
				+    display: inline-block;
			
 
				+  }
			
 
				+
			
 
				+  .center {
			
 
				+    width: 70%;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item {
			
 
				+    width: 50%;
			
 
				+  }
			
 
				+
			
 
				+  .el-form-item__label {
			
 
				+    text-align: center;
			
 
				+  }
			
 
				+
			
 
				+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
			
 
				+  /*  height: 82px;*/
			
 
				+  /*}*/
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+
			
 
				+  .hide-sel {
			
 
				     .el-input__inner {
			
 
				-      background-color: #fff !important;
			
 
				-      border: 0;
			
 
				-      color: #606266;
			
 
				+      border: 0px;
			
 
				+    }
			
 
				+
			
 
				+    .el-icon-arrow-up {
			
 
				+      display: none;
			
 
				     }
			
 
				+
			
 
				     .el-textarea__inner {
			
 
				       background-color: #fff !important;
			
 
				       border: 0;
			
 
				+    }
			
 
				+
			
 
				+    .el-date-editor {
			
 
				+      i {
			
 
				+        display: none;
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+    .is-disabled {
			
 
				+      .el-input__inner:hover {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+      }
			
 
				+
			
 
				       color: #606266;
			
 
				+
			
 
				+      .el-input__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				+
			
 
				+      .el-textarea__inner {
			
 
				+        background-color: #fff !important;
			
 
				+        border: 0;
			
 
				+        color: #606266;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				 
			
 
				-// 控制select为只读的时候显示样式
			
 
				-/deep/.ws-class-table-col {
			
 
				-  height: auto;
			
 
				-  padding: 0px 2px;
			
 
				-  /deep/.el-input__inner {
			
 
				+  // 控制select为只读的时候显示样式
			
 
				+  /deep/.ws-class-table-col {
			
 
				+    height: auto;
			
 
				     padding: 0px 2px;
			
 
				+
			
 
				+    /deep/.el-input__inner {
			
 
				+      padding: 0px 2px;
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				+  /deep/.is-disabled {
			
 
				+    .el-input__prefix,
			
 
				+    .el-input__suffix {
			
 
				+      display: none;
			
 
				+    }
			
 
				+
			
 
				+    .el-input__inner {
			
 
				+      background-color: #fff;
			
 
				+      border-color: #fff !important;
			
 
				+      color: #000 !important;
			
 
				+      font-size: 14px;
			
 
				+      cursor: text;
			
 
				+      padding: 0 !important;
			
 
				+    }
			
 
				   }
			
 
				-}
			
 
				-/deep/.is-disabled {
			
 
				-  .el-input__prefix,
			
 
				-  .el-input__suffix {
			
 
				-    display: none;
			
 
				+
			
 
				+  .winseaview-view {
			
 
				+    padding: 10px 0 20px;
			
 
				   }
			
 
				-  .el-input__inner {
			
 
				-    background-color: #fff;
			
 
				-    border-color: #fff !important;
			
 
				-    color: #000 !important;
			
 
				+
			
 
				+  .container {
			
 
				+    overflow: scroll;
			
 
				+    height: 93vh;
			
 
				+  }
			
 
				+
			
 
				+  .state {
			
 
				+    width: 900px;
			
 
				+    margin: 0 auto;
			
 
				+  }
			
 
				+
			
 
				+  .state h2,
			
 
				+  .state p {
			
 
				+    display: inline-block;
			
 
				+  }
			
 
				+
			
 
				+  .state p {
			
 
				+    display: inline-block;
			
 
				+    margin-left: 10px;
			
 
				+    width: 170px;
			
 
				+    height: 20px;
			
 
				+    font-size: 14px;
			
 
				+    font-family: PingFangSC-Regular, PingFang SC;
			
 
				+    font-weight: 400;
			
 
				+    color: #000000;
			
 
				+    line-height: 20px;
			
 
				+  }
			
 
				+
			
 
				+  .icon {
			
 
				+    display: inline-block;
			
 
				+    width: 60px;
			
 
				+    background: #ecfeff;
			
 
				+    border-radius: 12px;
			
 
				+    border: 1px solid #50cad4;
			
 
				+    position: relative;
			
 
				+    font-size: 14px;
			
 
				+    color: #50cad4;
			
 
				+    padding: 1px 7px;
			
 
				+  }
			
 
				+
			
 
				+  .title-top {
			
 
				+    margin-top: 20px;
			
 
				+    font-size: 21px;
			
 
				+    font-weight: 600;
			
 
				+  }
			
 
				+
			
 
				+  .title-number {
			
 
				+    font-size: 14px;
			
 
				+    font-weight: 400;
			
 
				+  }
			
 
				+
			
 
				+  //*号
			
 
				+  // .unchangeable {
			
 
				+  //   position: absolute;
			
 
				+  //   width: 9px;
			
 
				+  //   height: 22px;
			
 
				+  //   font-size: 16px;
			
 
				+  //   font-family: PingFangSC-Medium, PingFang SC;
			
 
				+  //   font-weight: 500;
			
 
				+  //   color: #ff2727;
			
 
				+  //   line-height: 22px;
			
 
				+  //   display: inline-block;
			
 
				+  //   right: 14px;
			
 
				+  // }
			
 
				+  /deep/.el-input,
			
 
				+  /deep/.el-date-editor {
			
 
				+    font-size: 13px;
			
 
				+    width: 232px;
			
 
				+    left: 21px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-textarea {
			
 
				+    width: 900px;
			
 
				+    margin: 0px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/el-date-editor--date {
			
 
				+    width: 200px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.beizhu {
			
 
				+    margin: 0 auto;
			
 
				     font-size: 14px;
			
 
				-    cursor: text;
			
 
				-    padding: 0 !important;
			
 
				-  }
			
 
				-}
			
 
				-.winseaview-view {
			
 
				-  padding: 10px 0 20px;
			
 
				-}
			
 
				-.container {
			
 
				-  overflow: scroll;
			
 
				-  height: 93vh;
			
 
				-}
			
 
				-.state {
			
 
				-  width: 900px;
			
 
				-  margin: 0 auto;
			
 
				-}
			
 
				-.state h2,
			
 
				-.state p {
			
 
				-  display: inline-block;
			
 
				-}
			
 
				-.state p {
			
 
				-  display: inline-block;
			
 
				-  margin-left: 10px;
			
 
				-  width: 170px;
			
 
				-  height: 20px;
			
 
				-  font-size: 14px;
			
 
				-  font-family: PingFangSC-Regular, PingFang SC;
			
 
				-  font-weight: 400;
			
 
				-  color: #000000;
			
 
				-  line-height: 20px;
			
 
				-}
			
 
				-.icon {
			
 
				-  display: inline-block;
			
 
				-  width: 60px;
			
 
				-  height: 24px;
			
 
				-  background: #ecfeff;
			
 
				-  border-radius: 12px;
			
 
				-  border: 1px solid #50cad4;
			
 
				-  position: relative;
			
 
				-  font-size: 14px;
			
 
				-  color: #50cad4;
			
 
				-  line-height: 24px;
			
 
				-  padding: 1px 7px;
			
 
				-}
			
 
				-
			
 
				-//*号
			
 
				-// .unchangeable {
			
 
				-//   position: absolute;
			
 
				-//   width: 9px;
			
 
				-//   height: 22px;
			
 
				-//   font-size: 16px;
			
 
				-//   font-family: PingFangSC-Medium, PingFang SC;
			
 
				-//   font-weight: 500;
			
 
				-//   color: #ff2727;
			
 
				-//   line-height: 22px;
			
 
				-//   display: inline-block;
			
 
				-//   right: 14px;
			
 
				-// }
			
 
				-/deep/.el-input,
			
 
				-/deep/.el-date-editor {
			
 
				-  font-size: 13px;
			
 
				-  width: 232px;
			
 
				-  left: 21px;
			
 
				-}
			
 
				-/deep/.el-textarea {
			
 
				-  width: 900px;
			
 
				-  margin: 0px;
			
 
				-}
			
 
				-/deep/el-date-editor--date {
			
 
				-  width: 200px;
			
 
				-}
			
 
				-/deep/.beizhu {
			
 
				-  margin: 0 auto;
			
 
				-  font-size: 14px;
			
 
				-  color: #afb5cb;
			
 
				-  margin-left: 20px;
			
 
				-}
			
 
				-.unchanged {
			
 
				-  position: absolute;
			
 
				-  left: 37px;
			
 
				-  width: 900px;
			
 
				-  height: 14px;
			
 
				-  font-size: 14px;
			
 
				-  font-family: PingFangSC-Regular, PingFang SC;
			
 
				-  font-weight: 400;
			
 
				-  color: #afb5cb;
			
 
				-  line-height: 14px;
			
 
				-}
			
 
				-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				-  width: 130px;
			
 
				-}
			
 
				-/deep/.el-input--small .el-input__inner {
			
 
				-  height: 32px;
			
 
				-  line-height: 32px;
			
 
				-  width: 232px;
			
 
				-}
			
 
				-.vertical-text-left {
			
 
				-  width: 62px;
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.vertical-text {
			
 
				-  margin: 0 10px;
			
 
				-  color: #8890b1;
			
 
				-  font-size: 12px;
			
 
				-  margin-top: -4px;
			
 
				-}
			
 
				-.vertical-line {
			
 
				-  height: 100px;
			
 
				-  border-left: 2px solid #e9ecf7;
			
 
				-  margin-left: 4px;
			
 
				-  padding: 0 3px;
			
 
				-}
			
 
				-.vertical-circle {
			
 
				-  width: 10px;
			
 
				-  height: 10px;
			
 
				-  border: 2px solid #5878e8;
			
 
				-  background-color: #ffffff;
			
 
				-  -webkit-border-radius: 100px;
			
 
				-}
			
 
				-.vertical-circle:first-child {
			
 
				-  color: red;
			
 
				-}
			
 
				-</style>
			
 
				+    color: #afb5cb;
			
 
				+    margin-left: 20px;
			
 
				+  }
			
 
				+
			
 
				+  .unchanged {
			
 
				+    position: absolute;
			
 
				+    left: 37px;
			
 
				+    width: 900px;
			
 
				+    height: 14px;
			
 
				+    font-size: 14px;
			
 
				+    font-family: PingFangSC-Regular, PingFang SC;
			
 
				+    font-weight: 400;
			
 
				+    color: #afb5cb;
			
 
				+    line-height: 14px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
			
 
				+    width: 130px;
			
 
				+  }
			
 
				+
			
 
				+  /deep/.el-input--small .el-input__inner {
			
 
				+    height: 32px;
			
 
				+    line-height: 32px;
			
 
				+    width: 232px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text-left {
			
 
				+    width: 62px;
			
 
				+    text-align: right;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-text {
			
 
				+    margin: 0 10px;
			
 
				+    color: #8890b1;
			
 
				+    font-size: 12px;
			
 
				+    margin-top: -4px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-line {
			
 
				+    height: 100px;
			
 
				+    border-left: 2px solid #e9ecf7;
			
 
				+    margin-left: 4px;
			
 
				+    padding: 0 3px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle {
			
 
				+    width: 10px;
			
 
				+    height: 10px;
			
 
				+    border: 2px solid #5878e8;
			
 
				+    background-color: #ffffff;
			
 
				+    -webkit-border-radius: 100px;
			
 
				+  }
			
 
				+
			
 
				+  .vertical-circle:first-child {
			
 
				+    color: red;
			
 
				+  }
			
 
				+</style>
			
--- a/src/views/customerFundManagement/customerFundAdd.vue
+++ b/src/views/customerFundManagement/customerFundAdd.vue
@@ -70,7 +70,7 @@
 
				               :disabled="disabled"
			
 
				             />
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="定金" span="1" prop="totalDeposit">
			
 
				+          <ws-form-item label="定金（元）" span="1" prop="totalDeposit">
			
 
				             <ws-input
			
 
				               type="number"
			
 
				               @mousewheel.native.prevent
			
@@ -81,7 +81,7 @@
 
				               :disabled="disabled"
			
 
				             />
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="预付金" span="1" prop="advancePayment">
			
 
				+          <ws-form-item label="预付金（元）" span="1" prop="advancePayment">
			
 
				             <ws-input
			
 
				               type="number"
			
 
				               @mousewheel.native.prevent
			
@@ -92,7 +92,7 @@
 
				               :disabled="disabled"
			
 
				             />
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="保证金" span="1" prop="securityDeposit">
			
 
				+          <ws-form-item label="保证金（元）" span="1" prop="securityDeposit">
			
 
				             <ws-input
			
 
				               type="number"
			
 
				               @mousewheel.native.prevent
			
@@ -103,8 +103,8 @@
 
				               :disabled="disabled"
			
 
				             />
			
 
				           </ws-form-item>
			
 
				-          <div style="display: flex; width: 100%; text-align: center">
			
 
				-            <div style="width: 330px; margin: 0 auto">
			
 
				+          <div style="display: flex; width: 100%;justify-content: space-between;">
			
 
				+            <div style="width: 330px;margin: 0px 0 22px 218px;">
			
 
				               <div class="unload-img">上传银行卡正面</div>
			
 
				               <el-upload
			
 
				                 class="avatar-uploader avatar-uploader3"
			
@@ -117,7 +117,7 @@
 
				                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
			
 
				               </el-upload>
			
 
				             </div>
			
 
				-            <div style="width: 330px; margin: 0 auto">
			
 
				+            <div style="width: 330px; margin: 0px 126px 22px 0px;">
			
 
				               <div class="unload-img">上传银行卡反面</div>
			
 
				               <el-upload
			
 
				                 class="avatar-uploader avatar-uploader4"
			
@@ -153,6 +153,7 @@
 
				           </ws-form-item>
			
 
				           <ws-form-item label="开户支行" span="1" prop="bankDepositBranch">
			
 
				             <ws-input
			
 
				+            style='margin-right:10px;'
			
 
				               v-if="bankInput"
			
 
				               v-model="customerList.bankDepositBranch"
			
 
				               placeholder="请输入开户支行"
			
@@ -162,6 +163,7 @@
 
				             />
			
 
				             <ws-select
			
 
				               v-else
			
 
				+              style='margin-right:10px;'
			
 
				               v-model="customerList.bankDepositBranch"
			
 
				               placeholder="请输入开户支行"
			
 
				               :disabled="disabled"
			
@@ -190,7 +192,7 @@
 
				             />
			
 
				           </ws-form-item>
			
 
				         </ws-info-table>
			
 
				-        <div class="but">
			
 
				+        <div class="but" style='text-align:right;padding-right:20px;'>
			
 
				           <el-button type="primary" @click="commit">提交</el-button>
			
 
				         </div>
			
 
				       </ws-form>
			
--- a/src/views/customerFundManagement/customerFundEdit.vue
+++ b/src/views/customerFundManagement/customerFundEdit.vue
@@ -70,7 +70,7 @@
 
				               :disabled="disabled"
			
 
				             />
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="定金" span="1" prop="totalDeposit">
			
 
				+          <ws-form-item label="定金（元）" span="1" prop="totalDeposit">
			
 
				             <ws-input
			
 
				               type="number"
			
 
				               @mousewheel.native.prevent
			
@@ -81,7 +81,7 @@
 
				               :disabled="disabled"
			
 
				             />
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="预付金" span="1" prop="advancePayment">
			
 
				+          <ws-form-item label="预付金（元）" span="1" prop="advancePayment">
			
 
				             <ws-input
			
 
				               type="number"
			
 
				               @mousewheel.native.prevent
			
@@ -92,7 +92,7 @@
 
				               :disabled="disabled"
			
 
				             />
			
 
				           </ws-form-item>
			
 
				-          <ws-form-item label="保证金" span="1" prop="securityDeposit">
			
 
				+          <ws-form-item label="保证金（元）" span="1" prop="securityDeposit">
			
 
				             <ws-input
			
 
				               type="number"
			
 
				               @mousewheel.native.prevent
			
--- a/src/views/customerFundManagement/customerFundList.vue
+++ b/src/views/customerFundManagement/customerFundList.vue
@@ -34,7 +34,7 @@
 
				             style="
			
 
				               vertical-align: text-top;
			
 
				               position: relative;
			
 
				-              top: 2px;
			
 
				+              top: 0px;
			
 
				               left: -4px;
			
 
				             "
			
 
				             src="../../../public/img/header-add.png"
			
@@ -61,9 +61,9 @@
 
				         <el-table-column prop="compName" label="企业名称" width="200"></el-table-column>
			
 
				         <el-table-column prop="customerName" label="客户姓名" width="120"></el-table-column>
			
 
				         <el-table-column prop="customerPhone" label="电话" width="100"> </el-table-column>
			
 
				-        <el-table-column prop="totalDeposit" label="定金(元)" width="110"></el-table-column>
			
 
				-        <el-table-column prop="advancePayment" label="预付金(元)" width="110"></el-table-column>
			
 
				-        <el-table-column prop="securityDeposit" label="保证金(元)" width="110"></el-table-column>
			
 
				+        <el-table-column prop="totalDeposit" label="定金（元）" width="110"></el-table-column>
			
 
				+        <el-table-column prop="advancePayment" label="预付金（元）" width="110"></el-table-column>
			
 
				+        <el-table-column prop="securityDeposit" label="保证金（元）" width="110"></el-table-column>
			
 
				         <el-table-column prop="bankCard" label="账号" width="200"> </el-table-column>
			
 
				         <el-table-column prop="bankDeposit" label="开户行" width="280">
			
 
				           <template slot-scope="scope">
			
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -418,7 +418,6 @@ export default {
 
				     //         : sessionStorage.getItem('ws-pf_deptId'),
			
 
				     //     compId: sessionStorage.getItem('ws-pf_compId')
			
 
				     //   }
			
 
				-    //   // debugger
			
 
				     //   // TODO: 【此处有问题】接口变更的不对
			
 
				     //   queryCircularManagementReceiveList(data)
			
 
				     //     .toPromise()
			
--- a/src/views/houseSelfCollect/acquisitionManagementAdd.vue
+++ b/src/views/houseSelfCollect/acquisitionManagementAdd.vue
@@ -853,7 +853,6 @@
 
				           isValidate = this.validate()
			
 
				          
			
 
				         if (isValidate) {
			
 
				-          debugger
			
 
				           this.makeTableList()
			
 
				           this.baseInfoForm.details = []
			
 
				           this.makePriceDataList()
			
--- a/src/views/houseSelfCollect/customerManagementAdd.vue
+++ b/src/views/houseSelfCollect/customerManagementAdd.vue
@@ -123,17 +123,17 @@
 
				     watch: {},
			
 
				     data() {
			
 
				       return {
			
 
				-        imageUrl1: "",
			
 
				-        imageUrl2: "",
			
 
				-        imageUrl3: "",
			
 
				-        imageUrl4: "",
			
 
				+        imageUrl1: '',
			
 
				+        imageUrl2: '',
			
 
				+        imageUrl3: '',
			
 
				+        imageUrl4: '',
			
 
				         dialogImageUrl: '',
			
 
				         dialogVisible: false,
			
 
				         customerList: {
			
 
				-          customerName: "",
			
 
				-          customerNumberCard: "",
			
 
				-          bankCard: "",
			
 
				-          bankDeposit: "",
			
 
				+          customerName: '',
			
 
				+          customerNumberCard: '',
			
 
				+          bankCard: '',
			
 
				+          bankDeposit: '',
			
 
				         },
			
 
				         disabledFlag: true,
			
 
				         disabled: false,
			
@@ -159,20 +159,20 @@
 
				         bankLows: 'bankLow',
			
 
				         sendText: '60S后重发',
			
 
				         sendDisabled: false,
			
 
				-        verifyCode: "",
			
 
				+        verifyCode: '',
			
 
				         bankList:[],
			
 
				         bankInput:false,
			
 
				-        bankText:"手动填写"
			
 
				+        bankText:'手动填写'
			
 
				       }
			
 
				     },
			
 
				     activated() {
			
 
				       this.switchType = this.$route.query.types
			
 
				       if (this.$route.query.types == null) {
			
 
				         this.switchType = 1
			
 
				-        this.imageUrl1 = ""
			
 
				-        this.imageUrl2 = ""
			
 
				-        this.imageUrl3 = ""
			
 
				-        this.imageUrl4 = ""
			
 
				+        this.imageUrl1 = ''
			
 
				+        this.imageUrl2 = ''
			
 
				+        this.imageUrl3 = ''
			
 
				+        this.imageUrl4 = ''
			
 
				         this.customerList = {}
			
 
				       }
			
 
				       let id = this.$route.query.id
			
@@ -190,10 +190,10 @@
 
				       bankInputChange(){
			
 
				         this.bankInput = !this.bankInput
			
 
				         if(this.bankInput){
			
 
				-          this.bankText = "自动识别"
			
 
				+          this.bankText = '自动识别'
			
 
				         }
			
 
				         else{
			
 
				-          this.bankText = "手动填写"
			
 
				+          this.bankText = '手动填写'
			
 
				         }
			
 
				       },
			
 
				       handleRemove(file, index) {
			
@@ -257,7 +257,7 @@
 
				                   that.sendText = sec + 'S后重发'
			
 
				                   if (sec <= 0) {
			
 
				                     that.sendDisabled = false
			
 
				-                    that.sendText = "获取验证码"
			
 
				+                    that.sendText = '获取验证码'
			
 
				                     clearInterval(interval)
			
 
				                   }
			
 
				                 }, 1000)
			
@@ -269,7 +269,7 @@
 
				       },
			
 
				       cancel() {
			
 
				         this.customerList = {}
			
 
				-        this.verifyCode = ""
			
 
				+        this.verifyCode = ''
			
 
				         this.$router.push({
			
 
				           path: 'customerManagement'
			
 
				         })
			
@@ -291,6 +291,9 @@
 
				               this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
			
 
				                this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
			
 
				             }
			
 
				+            if (response.recPersonAddr ) {
			
 
				+              this.$set( this.customerList,'compAddress',response.recPersonAddr)
			
 
				+            }
			
 
				           })
			
 
				       },
			
 
				       upLoadSuccess2(e) {
			
@@ -312,6 +315,9 @@
 
				                this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
			
 
				             }
			
 
				             
			
 
				+            if (response.recPersonAddr ) {
			
 
				+              this.$set( this.customerList,'compAddress',response.recPersonAddr)
			
 
				+            }
			
 
				           })
			
 
				       },
			
 
				       bankSuccess1(e) {
			
@@ -442,7 +448,7 @@
 
				                     .then((response) => {
			
 
				                       this.$message.success('添加成功')
			
 
				                       this.customerList = {}
			
 
				-                      this.verifyCode = ""
			
 
				+                      this.verifyCode = ''
			
 
				                       this.$router.go(-1)
			
 
				                     })
			
 
				                 })
			
@@ -461,7 +467,7 @@
 
				                     .then((response) => {
			
 
				                       this.$message.success('修改成功')
			
 
				                          this.customerList = {}
			
 
				-                         this.verifyCode = ""
			
 
				+                         this.verifyCode = ''
			
 
				                       this.$router.push({
			
 
				                         path: 'customerManagement'
			
 
				                       })
			
--- a/src/views/houseSelfCollect/paymentManagement.vue
+++ b/src/views/houseSelfCollect/paymentManagement.vue
@@ -19,23 +19,49 @@
 
				         <el-button @click="typePrintCannelClick">取消</el-button>
			
 
				       </div>
			
 
				     </div>
			
 
				-    <BaseHeaderLayout :leftSpan="16">
			
 
				+    <BaseHeaderLayout :leftSpan="10">
			
 
				       <template slot="left">
			
 
				         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
			
 
				         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
			
 
				         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
			
 
				-        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(1)" >待审核
			
 
				+        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)" >待审核
			
 
				         </ws-button>
			
 
				-        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(7)"
			
 
				-          v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">待付款</ws-button>
			
 
				+        <div v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">
			
 
				+          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)"
			
 
				+          >待付款</ws-button>
			
 
				+          </div>
			
 
				         <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)"
			
 
				           v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
			
 
				         <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
			
 
				+      </template>
			
 
				+      <template slot="right">
			
 
				+        <el-select class='warehouse_select' v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" style="margin: 0 10px">
			
 
				+          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
			
 
				+          </el-option>
			
 
				+        </el-select>
			
 
				+        <el-date-picker  style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange' type="daterange" align="right" unlink-panels range-separator="至"
			
 
				+					start-placeholder="结算时间起" end-placeholder="结算时间止" >
			
 
				+				</el-date-picker>
			
 
				+        <div></div>
			
 
				+        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
			
 
				+        </ws-input>
			
 
				+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
			
 
				+        <ws-button class="find" type="primary" @click="find()">
			
 
				+          <img width="16" height="16" style="vertical-align: text-top; position: relative; top: 0px"
			
 
				+            src="../../../public/img/sousuo.png" alt />
			
 
				+        </ws-button>
			
 
				+      </template>
			
 
				+    </BaseHeaderLayout>
			
 
				+      <BaseHeaderLayout :leftSpan="10">
			
 
				+      <template slot="left">
			
 
				+        <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
			
 
				+        <ws-button type="primary" @click="screen(0)">待审核</ws-button>
			
 
				+        <ws-button type="primary"  @click="screen()">全部</ws-button>-->
			
 
				 
			
 
				         <ws-button type="primary" @click="reject">驳回</ws-button>
			
 
				         <ws-button type="primary" @click="adopt">通过</ws-button>
			
 
				         <ws-button type="primary" @click="invoicingClick"
			
 
				-          v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
			
 
				+          v-hasPermission="`acquisitionManagement.acquisitionPay.finace`" >开票</ws-button>
			
 
				         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
			
 
				         </ws-button>
			
 
				         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
			
@@ -47,18 +73,6 @@
 
				         </ws-button>
			
 
				       </template>
			
 
				       <template slot="right">
			
 
				-        <el-select v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" style="margin: 0 10px">
			
 
				-          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
			
 
				-          </el-option>
			
 
				-        </el-select>
			
 
				-        <div></div>
			
 
				-        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
			
 
				-        </ws-input>
			
 
				-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
			
 
				-        <ws-button class="find" type="primary" @click="find()">
			
 
				-          <img width="16" height="16" style="vertical-align: text-top; position: relative; top: 0px"
			
 
				-            src="../../../public/img/sousuo.png" alt />
			
 
				-        </ws-button>
			
 
				       </template>
			
 
				     </BaseHeaderLayout>
			
 
				     <el-table :data="paymentList" style="width: 100%; margin-top: 20px" ref="paymentList" border height="600" 
			
@@ -85,7 +99,7 @@
 
				       <el-table-column class="table_td" prop="netWeight" width="120" label="净重（公斤）"></el-table-column>
			
 
				       <el-table-column class="table_td" prop="pureWeight" width="120" label="纯重（公斤）"></el-table-column>
			
 
				       <el-table-column class="table_td" prop="amountIngPayable" label="应付款(元)"></el-table-column>
			
 
				-      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)">
			
 
				+      <el-table-column class="table_td" prop="amountEdPayable" width='130' label="已付款(元)">
			
 
				         <template slot-scope="scope">
			
 
				           <div @click="showPayImg(scope.row)">{{ scope.row.amountEdPayable }}</div>
			
 
				         </template>
			
@@ -337,6 +351,7 @@ import download from '../../components/WsDownload/download'
 
				         imageUrl: '',
			
 
				         payImg: [],
			
 
				         rowData: {},
			
 
				+        value2:[],
			
 
				         date: {
			
 
				           year: dayjs().format('YYYY'),
			
 
				           month: dayjs().format('MM'),
			
@@ -345,10 +360,48 @@ import download from '../../components/WsDownload/download'
 
				     },
			
 
				     activated() {
			
 
				       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
			
 
				+      this.getPassYearFormatDate()
			
 
				       this.getWarehouse()
			
 
				+      
			
 
				       // this.getList()
			
 
				     },
			
 
				     methods: {
			
 
				+      datechange(){
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      getPassYearFormatDate () {
			
 
				+          var nowDate = new Date()
			
 
				+          nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
			
 
				+          var seperator1 = '-'
			
 
				+          var year = nowDate.getFullYear()
			
 
				+          var month = nowDate.getMonth() + 1
			
 
				+          var strDate = nowDate.getDate()
			
 
				+          if (month >= 1 && month <= 9) {
			
 
				+            month = '0' + month
			
 
				+          }
			
 
				+          if (strDate >= 0 && strDate <= 9) {
			
 
				+            strDate = '0' + strDate
			
 
				+          }
			
 
				+          var formatDate = year + seperator1 + month + seperator1 + strDate
			
 
				+          this.getNowFormatDate(formatDate)
			
 
				+        },
			
 
				+        /* 获取现在时间，并接受过去时间的值 */
			
 
				+        getNowFormatDate (formatDate) {
			
 
				+          var date = new Date()
			
 
				+          date.setTime(date.getTime()+24*60*60*1000)
			
 
				+          var seperator1 = '-'
			
 
				+          var year = date.getFullYear()
			
 
				+          var month = date.getMonth() + 1
			
 
				+          var strDate = date.getDate()
			
 
				+          if (month >= 1 && month <= 9) {
			
 
				+            month = '0' + month
			
 
				+          }
			
 
				+          if (strDate >= 0 && strDate <= 9) {
			
 
				+            strDate = '0' + strDate
			
 
				+          }
			
 
				+          var nowData = year + seperator1 + month + seperator1 + strDate
			
 
				+          this.value2= [formatDate, nowData]  // 默认赋值一年时间
			
 
				+    },
			
 
				       selectPrint() {
			
 
				         console.log('批量打印数据', this.modification)
			
 
				         this.printType = 1
			
@@ -430,10 +483,17 @@ import download from '../../components/WsDownload/download'
 
				         //   .then(response => {
			
 
				         //     console.log(response)
			
 
				         //   })
			
 
				+        
			
 
				         let data = {
			
 
				           paymentManagementList: this.modification
			
 
				         }
			
 
				         console.log('开票', data)
			
 
				+        for(let i=0;i<this.modification.length;i++){
			
 
				+          if(this.modification[i].status!='全部付款'&&this.modification[i].status!='部分付款') {
			
 
				+            this.$message.error('开票只能选择全部付款或部分付款！');
			
 
				+              return
			
 
				+          }
			
 
				+        }
			
 
				         //开票
			
 
				         invoicing(data)
			
 
				           .toPromise()
			
@@ -443,54 +503,11 @@ import download from '../../components/WsDownload/download'
 
				               
			
 
				               var arr=[]
			
 
				               for (let i = 0; i < response.length; i++) {
			
 
				+                debugger
			
 
				                 arr.push({fileUrl:response[i],renameFileName:'发票'+i+'.xml'})
			
 
				-                //创建标签下载文件
			
 
				-                // window.open(response[i],)
			
 
				-                // let a = document.createElement('a');
			
 
				-                // // a.href = response[i];
			
 
				-                // a.setAttribute('target', 'blank');
			
 
				-                // a.setAttribute('download', response[i]);
			
 
				-                // a.setAttribute('href', response[i]);
			
 
				-                // a.click();
			
 
				-                // a.remove();
			
 
				-                // let b = document.createElement('a');
			
 
				-                // // b.href = response[i];
			
 
				-                // b.setAttribute('target', 'blank');
			
 
				-                // b.setAttribute('download', response[i]);
			
 
				-                // b.setAttribute('href', response[i]);
			
 
				-                // b.click();
			
 
				-                // b.remove();
			
 
				               }
			
 
				               this.filesToRar(arr, '开票XML文件')
			
 
				             }
			
 
				-            //未完成，接口调通后替换假数据
			
 
				-            // response = {
			
 
				-
			
 
				-            // }
			
 
				-            // response.data.imgList = [{
			
 
				-            //     name: 'xml1',
			
 
				-            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
			
 
				-            //   },
			
 
				-            //   {
			
 
				-            //     name: 'xml2',
			
 
				-            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
			
 
				-            //   }, {
			
 
				-            //     name: 'xml3',
			
 
				-            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
			
 
				-            //   }
			
 
				-            // ]
			
 
				-            // this.invoicingImgList = response.data.imgList
			
 
				-            // if (response.data.imgList.length > 0) {
			
 
				-            //   for (let i = 0; i < response.data.imgList.length; i++) {
			
 
				-            //     //创建标签下载文件
			
 
				-            //     let a = document.createElement('a');
			
 
				-            //     a.href = response.data.imgList[i].src;
			
 
				-            //     let urlArr = a.href.split('.');
			
 
				-            //     a.setAttribute('download', response.data.imgList[i].name + '.xml');
			
 
				-            //     a.click();
			
 
				-            //     a.remove();
			
 
				-            //   }
			
 
				-            // }
			
 
				           })
			
 
				           .catch(() => {})
			
 
				       },
			
@@ -753,10 +770,19 @@ import download from '../../components/WsDownload/download'
 
				         if (this.searchType != -1) {
			
 
				           searchParam = this.searchType
			
 
				         }
			
 
				-
			
 
				+        console.log(this.value2)
			
 
				+        var startDate=''
			
 
				+        var endDate=''
			
 
				+        if(this.value2){
			
 
				+          startDate=this.value2[0]?this.value2[0]:''
			
 
				+          endDate=this.value2[1]?this.value2[1]:''
			
 
				+        }
			
 
				+      
			
 
				       getpayment({
			
 
				         currentPage: this.currentPage,
			
 
				         pageSize: this.pageSize,
			
 
				+        startDate:startDate,
			
 
				+        endDate:endDate,
			
 
				         searchKeyWord: this.searchKeyWord,
			
 
				         searchType: searchParam,
			
 
				         warehouseName: this.warehouseName,
			
@@ -1127,6 +1153,7 @@ import download from '../../components/WsDownload/download'
 
				   /deep/.el-table .el-table__header .cell,
			
 
				   /deep/.el-table .cell {
			
 
				     text-align: center;
			
 
				+    line-height: 15px;
			
 
				   }
			
 
				 
			
 
				   /deep/.el-table--enable-row-transition .el-table__body td {
			
@@ -1254,4 +1281,10 @@ import download from '../../components/WsDownload/download'
 
				   .text_css {
			
 
				     color: #5878e8;
			
 
				   }
			
 
				+  /deep/.base_header_layout{
			
 
				+    height:48px;
			
 
				+  }
			
 
				+  .warehouse_select{
			
 
				+    width:100%;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/houseSelfCollect/settlement.vue
+++ b/src/views/houseSelfCollect/settlement.vue
@@ -504,14 +504,14 @@ export default {
 
				             this.paymentList.base = this.paymentList.base.toFixed(3)
			
 
				             if(this.paymentList.type=='潮粮'){
			
 
				               this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
			
 
				-              this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
			
 
				+              this.paymentList.pureWeight =  Math.round(this.paymentList.pureWeight)
			
 
				             }
			
 
				             
			
 
				           }
			
 
				           else{
			
 
				             if(this.paymentList.type=='潮粮'){
			
 
				               this.paymentList.pureWeight=this.paymentList.weighingManagement.netWeight * (100 - this.paymentList.param)/100
			
 
				-              this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
			
 
				+              this.paymentList.pureWeight =   Math.round(this.paymentList.pureWeight)
			
 
				             }
			
 
				           }
			
 
				           if(!this.paymentList.dryGrainPrice){
			
--- a/src/views/houseSelfCollect/weighingManagement.vue
+++ b/src/views/houseSelfCollect/weighingManagement.vue
@@ -1,408 +1,447 @@
 
				 <!--检斤管理-->
			
 
				 <template>
			
 
				-	<div>
			
 
				-		<BaseHeaderLayout :leftSpan="16">
			
 
				-			<template slot="left"> </template>
			
 
				-			<template slot="right">
			
 
				-				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
			
 
				-					style="margin: 0 10px">
			
 
				-					<ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
			
 
				-						style="color: #8890b1" />
			
 
				-				</ws-select>
			
 
				-				<div></div>
			
 
				-				<ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
			
 
				-				</ws-input>
			
 
				-				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
			
 
				+  <div>
			
 
				+    <BaseHeaderLayout :leftSpan="16">
			
 
				+      <template slot="left">
			
 
				+        <ws-button type="primary" @click="print('',1)"
			
 
				+          v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">批量打印
			
 
				+        </ws-button>
			
 
				+      </template>
			
 
				+      <template slot="right">
			
 
				+        <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
			
 
				+          style="margin: 0 10px">
			
 
				+          <ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
			
 
				+            style="color: #8890b1" />
			
 
				+        </ws-select>
			
 
				+        <div></div>
			
 
				+        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
			
 
				+        </ws-input>
			
 
				+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
			
 
				               vertical-align: text-top;
			
 
				               position: relative;
			
 
				               top: 0px;
			
 
				             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
			
 
				-			</template>
			
 
				-		</BaseHeaderLayout>
			
 
				-		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600">
			
 
				-			<el-table-column type="index" label="序号" width="50">
			
 
				-				<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="number" width="150" label="编号"></el-table-column>
			
 
				-			<el-table-column prop="customer" label="客户"></el-table-column>
			
 
				-			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
			
 
				-			<el-table-column prop="goodsName" label="货名"></el-table-column>
			
 
				-			<el-table-column prop="type" 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="buckleMiscellaneous" label="扣杂"></el-table-column>
			
 
				-			<el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
			
 
				-			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
			
 
				-			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>
			
 
				-			<el-table-column prop="secretaryWeigher" label="司称员">
			
 
				-				<template slot-scope="scope">
			
 
				-					<div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
			
 
				-					<div v-else>{{scope.row.secretaryWeigher}}<span
			
 
				-							v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
			
 
				-				</template>
			
 
				-			</el-table-column>
			
 
				-			<el-table-column prop="suqualityTestingDate" label="称重时间" width="90">
			
 
				-				<template slot-scope="scope">
			
 
				-					<div v-if="
			
 
				+      </template>
			
 
				+    </BaseHeaderLayout>
			
 
				+    <el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600"
			
 
				+      @row-click="handleRowClick" @selection-change="handleSelectionChange">
			
 
				+      <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
			
 
				+      <el-table-column type="index" label="序号" width="50">
			
 
				+        <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="number" width="150" label="编号"></el-table-column>
			
 
				+      <el-table-column prop="customer" label="客户"></el-table-column>
			
 
				+      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
			
 
				+      <el-table-column prop="goodsName" label="货名"></el-table-column>
			
 
				+      <el-table-column prop="type" 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="buckleMiscellaneous" label="扣杂"></el-table-column>
			
 
				+      <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
			
 
				+      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
			
 
				+      <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
			
 
				+      <el-table-column prop="secretaryWeigher" label="司称员">
			
 
				+        <template slot-scope="scope">
			
 
				+          <div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
			
 
				+          <div v-else>{{scope.row.secretaryWeigher}}<span
			
 
				+              v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
			
 
				+        </template>
			
 
				+      </el-table-column>
			
 
				+      <el-table-column prop="suqualityTestingDate" label="称重时间" width="90">
			
 
				+        <template slot-scope="scope">
			
 
				+          <div v-if="
			
 
				               scope.row.status == '已称毛重'
			
 
				             "> {{scope.row.grossDate}}</div>
			
 
				-					<div v-if="
			
 
				+          <div v-if="
			
 
				               scope.row.status == '已称皮重'
			
 
				             "> {{scope.row.tareDate}}</div>
			
 
				-				</template>
			
 
				-			</el-table-column>
			
 
				-			<el-table-column prop="status" label="状态"></el-table-column>
			
 
				-			<el-table-column width="300" prop="contractNo1" label="操作">
			
 
				-				<template slot-scope="scope">
			
 
				-					<el-button @click="weightCheck(scope.row, 1)"
			
 
				-						v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' "
			
 
				-						v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`">毛重</el-button>
			
 
				-					<!-- scope.row.paymentManagement.status == '待结算' && -->
			
 
				-					<el-button :disabled="scope.row.allow == 2" @click="weightCheck(scope.row, 2)"
			
 
				-						v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
			
 
				-						v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
			
 
				-					<el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"
			
 
				-						v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
			
 
				-				</template>
			
 
				-			</el-table-column>
			
 
				-		</el-table>
			
 
				-		<div style="text-align: center;margin-top:20px">
			
 
				-			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
			
 
				-				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
			
 
				-				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
			
 
				-			</el-pagination>
			
 
				-		</div>
			
 
				-		<el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
			
 
				-			<weightCheckPrint :tableData="dialogData"></weightCheckPrint>
			
 
				-			<div style="text-align:center">
			
 
				-				<el-button type="primary" @click="isShowPrint = false">关闭</el-button>
			
 
				-				<el-button type="primary" @click="printSmall">打印小票</el-button>
			
 
				-				<el-button type="primary" @click="printBig">打印单据</el-button>
			
 
				-			</div>
			
 
				-		</el-dialog>
			
 
				-	</div>
			
 
				+        </template>
			
 
				+      </el-table-column>
			
 
				+      <el-table-column prop="status" label="状态"></el-table-column>
			
 
				+      <el-table-column width="300" prop="contractNo1" label="操作">
			
 
				+        <template slot-scope="scope">
			
 
				+          <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' "
			
 
				+            v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`">毛重</el-button>
			
 
				+          <!-- scope.row.paymentManagement.status == '待结算' && -->
			
 
				+          <el-button :disabled="scope.row.allow == 2" @click="weightCheck(scope.row, 2)"
			
 
				+            v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
			
 
				+            v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
			
 
				+          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"
			
 
				+            v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
			
 
				+        </template>
			
 
				+      </el-table-column>
			
 
				+    </el-table>
			
 
				+    <div style="text-align: center;margin-top:20px">
			
 
				+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
			
 
				+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
			
 
				+        :total="deptBudgetTotal">
			
 
				+      </el-pagination>
			
 
				+    </div>
			
 
				+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
			
 
				+      <weightCheckPrint :tableData="dialogData"></weightCheckPrint>
			
 
				+      <div style="text-align:center">
			
 
				+        <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
			
 
				+        <el-button type="primary" @click="printSmall">打印小票</el-button>
			
 
				+        <el-button type="primary" @click="printBig">打印单据</el-button>
			
 
				+      </div>
			
 
				+    </el-dialog>
			
 
				+  </div>
			
 
				 </template>
			
 
				 <script>
			
 
				-	import {
			
 
				-		getweighingList,
			
 
				-		selectWarehouseSelf,
			
 
				-		getPrint
			
 
				-	} from '@/model/houseSelfCollect/index'
			
 
				-	import weightCheckPrint from './component/weightCheckPrint.vue'
			
 
				+  import {
			
 
				+    getweighingList,
			
 
				+    selectWarehouseSelf,
			
 
				+    getPrint
			
 
				+  } from '@/model/houseSelfCollect/index'
			
 
				+  import weightCheckPrint from './component/weightCheckPrint.vue'
			
 
				 
			
 
				-	export default {
			
 
				-		components: {
			
 
				-			weightCheckPrint
			
 
				-		},
			
 
				-		watch: {},
			
 
				-		data() {
			
 
				-			return {
			
 
				-				//分页
			
 
				-				currentPage: 1,
			
 
				-				pageSize: 10,
			
 
				-				deptCircularPage: {},
			
 
				-				deptBudgetTotal: 0,
			
 
				-				paymentForm: false,
			
 
				-				paymentForm1: false,
			
 
				-				weighingList: [],
			
 
				-				searchKeyWord: '',
			
 
				-				searchType: [],
			
 
				-				warehouseName: '',
			
 
				-				value1: '', //选择时间
			
 
				-				warehouseList: [],
			
 
				-				warehouseId: '',
			
 
				-				cangid: '',
			
 
				-				monitorUrl1: '',
			
 
				-				monitorUrl2: '',
			
 
				-				isShowPrint: false, //打印弹出
			
 
				-				dialogData: {
			
 
				-					qualityInspectionManagement: {},
			
 
				-				},
			
 
				-				purchasePriceList: [],
			
 
				-				allowEdit: '0',
			
 
				-				disabled: false
			
 
				-			}
			
 
				-		},
			
 
				-		activated() {
			
 
				-			this.selectWarehouse()
			
 
				+  export default {
			
 
				+    components: {
			
 
				+      weightCheckPrint
			
 
				+    },
			
 
				+    watch: {},
			
 
				+    data() {
			
 
				+      return {
			
 
				+        //分页
			
 
				+        currentPage: 1,
			
 
				+        pageSize: 10,
			
 
				+        deptCircularPage: {},
			
 
				+        deptBudgetTotal: 0,
			
 
				+        paymentForm: false,
			
 
				+        paymentForm1: false,
			
 
				+        weighingList: [],
			
 
				+        searchKeyWord: '',
			
 
				+        searchType: [],
			
 
				+        warehouseName: '',
			
 
				+        value1: '', //选择时间
			
 
				+        warehouseList: [],
			
 
				+        warehouseId: '',
			
 
				+        cangid: '',
			
 
				+        monitorUrl1: '',
			
 
				+        monitorUrl2: '',
			
 
				+        isShowPrint: false, //打印弹出
			
 
				+        dialogData: {
			
 
				+          qualityInspectionManagement: {},
			
 
				+        },
			
 
				+        purchasePriceList: [],
			
 
				+        allowEdit: '0',
			
 
				+        disabled: false,
			
 
				+        isShowPrintType: false,
			
 
				+        modification: [],
			
 
				+        jjSelectPrintList: [],
			
 
				+      }
			
 
				+    },
			
 
				+    activated() {
			
 
				+      this.selectWarehouse()
			
 
				 
			
 
				-		},
			
 
				-		methods: {
			
 
				-			printSmall() {
			
 
				-				window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData))
			
 
				-			},
			
 
				-			printBig() {
			
 
				-				window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
			
 
				-			},
			
 
				-			print(row) {
			
 
				-				getPrint({
			
 
				-						id: row.id
			
 
				-					})
			
 
				-					.toPromise()
			
 
				-					.then((response) => {
			
 
				-						this.dialogData = response
			
 
				-						this.isShowPrint = true
			
 
				-					})
			
 
				-					.catch((response) => {
			
 
				-						// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				-					})
			
 
				-			},
			
 
				-			warehouseNameChange(e) {
			
 
				-				// this.warehouseName = e
			
 
				-				for (let i = 0; i < this.warehouseList.length; i++) {
			
 
				-					if (this.warehouseList[i].value == e) {
			
 
				-						this.warehouseId = this.warehouseList[i].warehouseId
			
 
				-						this.cangid = this.warehouseList[i].warehouseId
			
 
				-						this.allowEdit = this.warehouseList[i].allowEdit
			
 
				-						this.WAREHOUSE[2].payname = this.warehouseList[i].value
			
 
				-						this.common.name = this.warehouseList[i].value
			
 
				-						this.monitorUrl1 = this.warehouseList[i].monitorUrl1
			
 
				-						this.monitorUrl2 = this.warehouseList[i].monitorUrl2
			
 
				-						sessionStorage.setItem('ck', e)
			
 
				-						sessionStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
			
 
				-					}
			
 
				-				}
			
 
				-				this.getList()
			
 
				-			},
			
 
				-			weightCheck(row, num) {
			
 
				-				this.$router.push({
			
 
				-					path: 'weightCheck',
			
 
				-					query: {
			
 
				-						tpyeNo: num,
			
 
				-						id: row.id,
			
 
				-						number: row.number,
			
 
				-						binNumber: row.binNumber,
			
 
				-						customer: row.customer,
			
 
				-						storageNumber: row.storageNumber,
			
 
				-						carNumber: row.carNumber,
			
 
				-						goodsName: row.goodsName,
			
 
				-						grossWeight: row.grossWeight,
			
 
				-						tare: row.tare,
			
 
				-						netWeight: row.netWeight,
			
 
				-						relationId: row.relationId,
			
 
				-						warehouseId: this.warehouseId,
			
 
				-						monitorUrl1: this.monitorUrl1,
			
 
				-						monitorUrl2: this.monitorUrl2,
			
 
				-						allowEdit: this.allowEdit,
			
 
				-						cangid: this.cangid,
			
 
				-						warehouseName:this.warehouseName,
			
 
				-						paramType: row.qualityInspectionManagement.paramType
			
 
				-					},
			
 
				-				})
			
 
				-			},
			
 
				-			find() {
			
 
				-				this.getList()
			
 
				-			},
			
 
				-			handleSizeChange(val) {
			
 
				-				console.log(`每页 ${val} 条`)
			
 
				-				this.pageSize = val
			
 
				-				this.getList()
			
 
				-			},
			
 
				-			handleCurrentChange(val) {
			
 
				-				this.currentPage = val
			
 
				-				console.log(`当前页: ${val}`)
			
 
				-				this.getList()
			
 
				-			},
			
 
				-			selectWarehouse() {
			
 
				-				let _wareHouse = sessionStorage.getItem('houseSelfCollect_house1')
			
 
				-				_wareHouse = JSON.parse(_wareHouse)
			
 
				-				selectWarehouseSelf({
			
 
				-						compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-					})
			
 
				-					.toPromise()
			
 
				-					.then((response) => {
			
 
				-						this.warehouseList = []
			
 
				+    },
			
 
				+    methods: {
			
 
				+      handleRowClick(row) {},
			
 
				+      handleSelectionChange(val) {
			
 
				+        this.modification = val
			
 
				+      },
			
 
				+      printSmall() {
			
 
				+        window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData))
			
 
				+      },
			
 
				+      printBig(type) {
			
 
				+        if (type == 1) {
			
 
				+          sessionStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
			
 
				+          window.open('../../../../static/weightCheck.html?type=2')
			
 
				+        } else {
			
 
				 
			
 
				-						for (let i = 0; i < response.length; i++) {
			
 
				-							this.warehouseList.push({
			
 
				-								value: response[i].warehouseName,
			
 
				-								warehouseId: response[i].id,
			
 
				-								allowEdit: response[i].allowEdit,
			
 
				-								monitorUrl1: response[i].monitorUrl1,
			
 
				-								monitorUrl2: response[i].monitorUrl2,
			
 
				-								id: response[i].id,
			
 
				-								warehouseNo:response[i].commonWarehouseNo
			
 
				-							})
			
 
				-							if (_wareHouse) {
			
 
				-								this.cangid = _wareHouse.id
			
 
				-								this.warehouseName = _wareHouse.value
			
 
				-								this.common.name = _wareHouse.value
			
 
				-								this.warehouseId = _wareHouse.id
			
 
				-								this.warehouseNo = _wareHouse.warehouseNo
			
 
				-								this.monitorUrl1 = _wareHouse.monitorUrl1
			
 
				-								this.allowEdit = _wareHouse.allowEdit
			
 
				-								this.monitorUrl2 = _wareHouse.monitorUrl2
			
 
				-							} else {
			
 
				-								if (this.cangid && this.cangid == response[i].id) {
			
 
				-									this.warehouseName = response[i].warehouseName
			
 
				-									this.allowEdit = response[i].allowEdit
			
 
				-									this.common.name = response[i].warehouseName
			
 
				-									this.warehouseId = response[i].id
			
 
				-									this.warehouseNo = response[i].commonWarehouseNo
			
 
				-									this.monitorUrl1 = response[i].monitorUrl1
			
 
				-									this.monitorUrl2 = response[i].monitorUrl2
			
 
				-								}
			
 
				+          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
			
 
				+        }
			
 
				+      },
			
 
				+      print(row, type) {
			
 
				+        if (type == 1) {
			
 
				+          let index1 = 0;
			
 
				+          for (let i = 0; i < this.modification.length; i++) {
			
 
				+            getPrint({
			
 
				+                id: this.modification[i].id
			
 
				+              })
			
 
				+              .toPromise()
			
 
				+              .then((response) => {
			
 
				+                index1++;
			
 
				+                  this.jjSelectPrintList.push(response)
			
 
				+                if (index1 == this.modification.length) {
			
 
				+                  this.printBig(1)
			
 
				+                }
			
 
				+              })
			
 
				+              .catch((response) => {
			
 
				+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+              })
			
 
				+          }
			
 
				+        } else {
			
 
				+          getPrint({
			
 
				+              id: row.id
			
 
				+            })
			
 
				+            .toPromise()
			
 
				+            .then((response) => {
			
 
				+              this.dialogData = response
			
 
				+              this.isShowPrint = true
			
 
				+            })
			
 
				+            .catch((response) => {
			
 
				+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+            })
			
 
				+        }
			
 
				 
			
 
				-								if (this.warehouseList.length > 0 && !this.cangid) {
			
 
				-									this.warehouseName = this.warehouseList[0].value
			
 
				-									this.allowEdit = this.warehouseList[0].allowEdit
			
 
				-									this.cangid = this.warehouseList[0].warehouseId
			
 
				-									this.warehouseId = this.warehouseList[0].warehouseId
			
 
				-									this.WAREHOUSE[1].payname = this.warehouseList[0].value
			
 
				-									this.common.name = this.warehouseList[0].value
			
 
				-									this.monitorUrl1 = this.warehouseList[0].monitorUrl1
			
 
				-									this.monitorUrl2 = this.warehouseList[0].monitorUrl2
			
 
				-								}
			
 
				-							}
			
 
				-						}
			
 
				-						sessionStorage.setItem('ck', this.common.name)
			
 
				-						console.log(this.warehouseList)
			
 
				-						this.getList()
			
 
				-					})
			
 
				-			},
			
 
				-			getList() {
			
 
				-				getweighingList({
			
 
				-						compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				-						currentPage: this.currentPage,
			
 
				-						pageSize: this.pageSize,
			
 
				-						searchKeyWord: this.searchKeyWord,
			
 
				-						warehouseName: this.warehouseName,
			
 
				-						managementType: 1
			
 
				-					})
			
 
				-					.toPromise()
			
 
				-					.then((response) => {
			
 
				-						for (let i = 0; i < response.records.length; i++) {
			
 
				-							if (response.records[i].paymentManagement) {
			
 
				-								if (response.records[i].paymentManagement.approveStatus || response.records[i]
			
 
				-									.paymentManagement.status != '待结算') {
			
 
				-									response.records[i].allow = 2
			
 
				-								}
			
 
				-							} else {
			
 
				-								response.records[i].allow = 1
			
 
				-							}
			
 
				-						}
			
 
				-						this.weighingList = response.records
			
 
				-						this.common.commonWeighingList = response.records
			
 
				-						this.deptBudgetTotal = response.total
			
 
				-					})
			
 
				-					.catch((response) => {
			
 
				-						// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				-					})
			
 
				-			},
			
 
				-		},
			
 
				-	}
			
 
				+      },
			
 
				+      warehouseNameChange(e) {
			
 
				+        // this.warehouseName = e
			
 
				+        for (let i = 0; i < this.warehouseList.length; i++) {
			
 
				+          if (this.warehouseList[i].value == e) {
			
 
				+            this.warehouseId = this.warehouseList[i].warehouseId
			
 
				+            this.cangid = this.warehouseList[i].warehouseId
			
 
				+            this.allowEdit = this.warehouseList[i].allowEdit
			
 
				+            this.WAREHOUSE[2].payname = this.warehouseList[i].value
			
 
				+            this.common.name = this.warehouseList[i].value
			
 
				+            this.monitorUrl1 = this.warehouseList[i].monitorUrl1
			
 
				+            this.monitorUrl2 = this.warehouseList[i].monitorUrl2
			
 
				+            sessionStorage.setItem('ck', e)
			
 
				+            sessionStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
			
 
				+          }
			
 
				+        }
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      weightCheck(row, num) {
			
 
				+        this.$router.push({
			
 
				+          path: 'weightCheck',
			
 
				+          query: {
			
 
				+            tpyeNo: num,
			
 
				+            id: row.id,
			
 
				+            number: row.number,
			
 
				+            binNumber: row.binNumber,
			
 
				+            customer: row.customer,
			
 
				+            storageNumber: row.storageNumber,
			
 
				+            carNumber: row.carNumber,
			
 
				+            goodsName: row.goodsName,
			
 
				+            grossWeight: row.grossWeight,
			
 
				+            tare: row.tare,
			
 
				+            netWeight: row.netWeight,
			
 
				+            relationId: row.relationId,
			
 
				+            warehouseId: this.warehouseId,
			
 
				+            monitorUrl1: this.monitorUrl1,
			
 
				+            monitorUrl2: this.monitorUrl2,
			
 
				+            allowEdit: this.allowEdit,
			
 
				+            cangid: this.cangid,
			
 
				+            warehouseName: this.warehouseName,
			
 
				+            paramType: row.qualityInspectionManagement.paramType
			
 
				+          },
			
 
				+        })
			
 
				+      },
			
 
				+      find() {
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      handleSizeChange(val) {
			
 
				+        console.log(`每页 ${val} 条`)
			
 
				+        this.pageSize = val
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      handleCurrentChange(val) {
			
 
				+        this.currentPage = val
			
 
				+        console.log(`当前页: ${val}`)
			
 
				+        this.getList()
			
 
				+      },
			
 
				+      selectWarehouse() {
			
 
				+        let _wareHouse = sessionStorage.getItem('houseSelfCollect_house1')
			
 
				+        _wareHouse = JSON.parse(_wareHouse)
			
 
				+        selectWarehouseSelf({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            this.warehouseList = []
			
 
				+
			
 
				+            for (let i = 0; i < response.length; i++) {
			
 
				+              this.warehouseList.push({
			
 
				+                value: response[i].warehouseName,
			
 
				+                warehouseId: response[i].id,
			
 
				+                allowEdit: response[i].allowEdit,
			
 
				+                monitorUrl1: response[i].monitorUrl1,
			
 
				+                monitorUrl2: response[i].monitorUrl2,
			
 
				+                id: response[i].id,
			
 
				+                warehouseNo: response[i].commonWarehouseNo
			
 
				+              })
			
 
				+              if (_wareHouse) {
			
 
				+                this.cangid = _wareHouse.id
			
 
				+                this.warehouseName = _wareHouse.value
			
 
				+                this.common.name = _wareHouse.value
			
 
				+                this.warehouseId = _wareHouse.id
			
 
				+                this.warehouseNo = _wareHouse.warehouseNo
			
 
				+                this.monitorUrl1 = _wareHouse.monitorUrl1
			
 
				+                this.allowEdit = _wareHouse.allowEdit
			
 
				+                this.monitorUrl2 = _wareHouse.monitorUrl2
			
 
				+              } else {
			
 
				+                if (this.cangid && this.cangid == response[i].id) {
			
 
				+                  this.warehouseName = response[i].warehouseName
			
 
				+                  this.allowEdit = response[i].allowEdit
			
 
				+                  this.common.name = response[i].warehouseName
			
 
				+                  this.warehouseId = response[i].id
			
 
				+                  this.warehouseNo = response[i].commonWarehouseNo
			
 
				+                  this.monitorUrl1 = response[i].monitorUrl1
			
 
				+                  this.monitorUrl2 = response[i].monitorUrl2
			
 
				+                }
			
 
				+
			
 
				+                if (this.warehouseList.length > 0 && !this.cangid) {
			
 
				+                  this.warehouseName = this.warehouseList[0].value
			
 
				+                  this.allowEdit = this.warehouseList[0].allowEdit
			
 
				+                  this.cangid = this.warehouseList[0].warehouseId
			
 
				+                  this.warehouseId = this.warehouseList[0].warehouseId
			
 
				+                  this.WAREHOUSE[1].payname = this.warehouseList[0].value
			
 
				+                  this.common.name = this.warehouseList[0].value
			
 
				+                  this.monitorUrl1 = this.warehouseList[0].monitorUrl1
			
 
				+                  this.monitorUrl2 = this.warehouseList[0].monitorUrl2
			
 
				+                }
			
 
				+              }
			
 
				+            }
			
 
				+            sessionStorage.setItem('ck', this.common.name)
			
 
				+            console.log(this.warehouseList)
			
 
				+            this.getList()
			
 
				+          })
			
 
				+      },
			
 
				+      getList() {
			
 
				+        getweighingList({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            currentPage: this.currentPage,
			
 
				+            pageSize: this.pageSize,
			
 
				+            searchKeyWord: this.searchKeyWord,
			
 
				+            warehouseName: this.warehouseName,
			
 
				+            managementType: 1
			
 
				+          })
			
 
				+          .toPromise()
			
 
				+          .then((response) => {
			
 
				+            for (let i = 0; i < response.records.length; i++) {
			
 
				+              if (response.records[i].paymentManagement) {
			
 
				+                if (response.records[i].paymentManagement.approveStatus || response.records[i]
			
 
				+                  .paymentManagement.status != '待结算') {
			
 
				+                  response.records[i].allow = 2
			
 
				+                }
			
 
				+              } else {
			
 
				+                response.records[i].allow = 1
			
 
				+              }
			
 
				+            }
			
 
				+            this.weighingList = response.records
			
 
				+            this.common.commonWeighingList = response.records
			
 
				+            this.deptBudgetTotal = response.total
			
 
				+          })
			
 
				+          .catch((response) => {
			
 
				+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
 
				+          })
			
 
				+      },
			
 
				+    },
			
 
				+  }
			
 
				 </script>
			
 
				 <style lang="scss" scoped>
			
 
				-	.title {
			
 
				-		font-size: 20px;
			
 
				-		font-weight: 600;
			
 
				-		margin: 20px;
			
 
				-	}
			
 
				+  .title {
			
 
				+    font-size: 20px;
			
 
				+    font-weight: 600;
			
 
				+    margin: 20px;
			
 
				+  }
			
 
				 
			
 
				-	.ws-info-table {
			
 
				-		border: none;
			
 
				-	}
			
 
				+  .ws-info-table {
			
 
				+    border: none;
			
 
				+  }
			
 
				 
			
 
				-	.ws-info-table .el-form-item {
			
 
				-		width: 50%;
			
 
				-		border: none;
			
 
				-	}
			
 
				+  .ws-info-table .el-form-item {
			
 
				+    width: 50%;
			
 
				+    border: none;
			
 
				+  }
			
 
				 
			
 
				-	/deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				-		width: 30%;
			
 
				-		text-align: center;
			
 
				-		background: #ffffff;
			
 
				-		color: #8890b1;
			
 
				-	}
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__label {
			
 
				+    width: 30%;
			
 
				+    text-align: center;
			
 
				+    background: #ffffff;
			
 
				+    color: #8890b1;
			
 
				+  }
			
 
				 
			
 
				-	/deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				-		border: none;
			
 
				-	}
			
 
				+  /deep/.ws-info-table .el-form-item .el-form-item__content {
			
 
				+    border: none;
			
 
				+  }
			
 
				 
			
 
				-	/deep/.el-table .el-table__header .cell,
			
 
				-	.el-table .el-table__body .cell {
			
 
				-		text-align: center;
			
 
				-	}
			
 
				+  /deep/.el-table .el-table__header .cell,
			
 
				+  .el-table .el-table__body .cell {
			
 
				+    text-align: center;
			
 
				+  }
			
 
				 
			
 
				-	/deep/.el-table--enable-row-transition .el-table__body td {
			
 
				-		text-align: center;
			
 
				-	}
			
 
				+  /deep/.el-table--enable-row-transition .el-table__body td {
			
 
				+    text-align: center;
			
 
				+  }
			
 
				 
			
 
				-	.formItem {
			
 
				-		width: 51% !important;
			
 
				-	}
			
 
				+  .formItem {
			
 
				+    width: 51% !important;
			
 
				+  }
			
 
				 
			
 
				-	/deep/.el-dialog__title {
			
 
				-		font-size: 24px !important;
			
 
				-	}
			
 
				+  /deep/.el-dialog__title {
			
 
				+    font-size: 24px !important;
			
 
				+  }
			
 
				 
			
 
				-	/deep/.el-dialog__header {
			
 
				-		text-align: center !important;
			
 
				-		padding: 10px 0 !important;
			
 
				-		height: auto !important;
			
 
				-	}
			
 
				+  /deep/.el-dialog__header {
			
 
				+    text-align: center !important;
			
 
				+    padding: 10px 0 !important;
			
 
				+    height: auto !important;
			
 
				+  }
			
 
				 
			
 
				-	.number {
			
 
				-		text-align: right;
			
 
				-		margin: 0 0 10px 0;
			
 
				-	}
			
 
				+  .number {
			
 
				+    text-align: right;
			
 
				+    margin: 0 0 10px 0;
			
 
				+  }
			
 
				 
			
 
				-	table,
			
 
				-	table tr th,
			
 
				-	table tr td {
			
 
				-		border: 2px solid #333333;
			
 
				-		padding: 5px 0;
			
 
				-	}
			
 
				+  table,
			
 
				+  table tr th,
			
 
				+  table tr td {
			
 
				+    border: 2px solid #333333;
			
 
				+    padding: 5px 0;
			
 
				+  }
			
 
				 
			
 
				-	table {
			
 
				-		width: 100%;
			
 
				-		min-height: 25px;
			
 
				-		line-height: 25px;
			
 
				-		text-align: center;
			
 
				-		border-collapse: collapse;
			
 
				-		border: 3px solid #333333;
			
 
				-	}
			
 
				+  table {
			
 
				+    width: 100%;
			
 
				+    min-height: 25px;
			
 
				+    line-height: 25px;
			
 
				+    text-align: center;
			
 
				+    border-collapse: collapse;
			
 
				+    border: 3px solid #333333;
			
 
				+  }
			
 
				 
			
 
				-	.col-bgc {
			
 
				-		background: #f6f7fb;
			
 
				-	}
			
 
				+  .col-bgc {
			
 
				+    background: #f6f7fb;
			
 
				+  }
			
 
				 
			
 
				-	.bottom-row1 {
			
 
				-		display: flex;
			
 
				-		margin: 10px 0;
			
 
				-	}
			
 
				+  .bottom-row1 {
			
 
				+    display: flex;
			
 
				+    margin: 10px 0;
			
 
				+  }
			
 
				 
			
 
				-	.bottom-row2 {
			
 
				-		display: flex;
			
 
				-		margin: 10px 0;
			
 
				+  .bottom-row2 {
			
 
				+    display: flex;
			
 
				+    margin: 10px 0;
			
 
				 
			
 
				-		.left {
			
 
				-			img {
			
 
				-				width: 41px;
			
 
				-				height: 41px;
			
 
				-				margin-right: 118px;
			
 
				-			}
			
 
				-		}
			
 
				+    .left {
			
 
				+      img {
			
 
				+        width: 41px;
			
 
				+        height: 41px;
			
 
				+        margin-right: 118px;
			
 
				+      }
			
 
				+    }
			
 
				 
			
 
				-		.config {
			
 
				-			margin-top: 20px;
			
 
				-			margin-right: 240px;
			
 
				-		}
			
 
				+    .config {
			
 
				+      margin-top: 20px;
			
 
				+      margin-right: 240px;
			
 
				+    }
			
 
				 
			
 
				-		.autograph {
			
 
				-			margin-top: 20px;
			
 
				-		}
			
 
				-	}
			
 
				+    .autograph {
			
 
				+      margin-top: 20px;
			
 
				+    }
			
 
				+  }
			
 
				 
			
 
				-	.bottom-row3 {
			
 
				-		margin: 10px 0;
			
 
				-	}
			
 
				+  .bottom-row3 {
			
 
				+    margin: 10px 0;
			
 
				+  }
			
 
				 
			
 
				-	.bottom-row4 {
			
 
				-		margin-top: 50px;
			
 
				-		text-align: center;
			
 
				-	}
			
 
				+  .bottom-row4 {
			
 
				+    margin-top: 50px;
			
 
				+    text-align: center;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/houseSelfCollect/weightCheck.vue
+++ b/src/views/houseSelfCollect/weightCheck.vue
@@ -292,7 +292,7 @@
 
				             searchKeyWord: '',
			
 
				             warehouseName: sessionStorage.getItem('ck'),
			
 
				             managementType: 1,
			
 
				-            viewFlag:'1'
			
 
				+            // viewFlag:'1'
			
 
				           })
			
 
				           .toPromise()
			
 
				           .then((response) => {
			
@@ -323,9 +323,12 @@
 
				         console.log(this.common.commonWeighingList, 'commonWeighingList')
			
 
				         let _list = this.common.commonWeighingList
			
 
				         for (let i = 0; i < _list.length; i++) {
			
 
				-          if (_list[i].allow == 2) {
			
 
				-            continue
			
 
				-          }
			
 
				+          if (_list[i].paymentManagement) {
			
 
				+            if (_list[i].paymentManagement.status != '待结算' || _list[i].paymentManagement
			
 
				+              .approveStatus) {
			
 
				+              continue
			
 
				+            } 
			
 
				+          } 
			
 
				           if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
			
 
				             this.mList.push(_list[i])
			
 
				           }
			
@@ -460,7 +463,7 @@
 
				             // console.log("receData",receData);
			
 
				             var flag = false;
			
 
				             var flag1 = false;
			
 
				-            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')) {
			
 
				+            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')) {
			
 
				               for (var i = 0; i < value.length; i++) {
			
 
				                 var tmp = String.fromCharCode(value[i])
			
 
				                 if (tmp == '+') {
			
@@ -530,7 +533,6 @@
 
				         })
			
 
				       },
			
 
				       calculation() {
			
 
				-        // debugger
			
 
				         // if (this.weighingList.grossWeight && this.weighingList.tare) {
			
 
				         //   this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - parseInt(this.weighingList.buckleMiscellaneous)
			
 
				         //   this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)
			
--- a/src/views/outboundManagement/weighing.vue
+++ b/src/views/outboundManagement/weighing.vue
@@ -213,7 +213,7 @@
 
				 				// else{
			
 
				 				// 	this.weighingList.tare = parseInt(result) 
			
 
				 				// }
			
 
				-				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')){
			
 
				+				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')||this.warehouseName == '鲅鱼圈祥腾库'){
			
 
				 					for (var i = 0; i < value.length; i++) {
			
 
				 						var tmp = String.fromCharCode(value[i])
			
 
				 						if (tmp == '+') {
			
--- a/src/views/supply/spareParts/apply/components/addAppDetailTable.vue
+++ b/src/views/supply/spareParts/apply/components/addAppDetailTable.vue
@@ -254,7 +254,6 @@ export default {
 
				     // 当列表输入数据大于0的时候 储存否则删除  deviceList
			
 
				     addRowinfo (row, type) {
			
 
				       if (type == false) {
			
 
				-        // debugger;
			
 
				         for (let i = 0; i < this.tableRowsInfo.length; i++) {
			
 
				           if (this.tableRowsInfo[i].spId == row.spId) {
			
 
				             this.setRowsInfo(row, i)
			
--- a/src/views/supply/spareParts/inventoryManagement/components/inventoryVerificationDetail.vue
+++ b/src/views/supply/spareParts/inventoryManagement/components/inventoryVerificationDetail.vue
@@ -211,7 +211,6 @@ export default {
 
				             }
			
 
				             // id 相同品牌相同则覆盖元数据
			
 
				             if (partList) {
			
 
				-              // debugger;
			
 
				               // this.applInfo.deviceList[i].partList[
			
 
				               //   partListIndex
			
 
				               // ] = Object.assign({}, this.tableRowsInfo[k]);
			
--- a/src/views/system/shipInspection/selfReportAdd.vue
+++ b/src/views/system/shipInspection/selfReportAdd.vue
@@ -791,7 +791,6 @@ export default {
 
				         }
			
 
				       })
			
 
				       if (row.result === 'NO') {
			
 
				-        // debugger
			
 
				         if (!this.compare(row, index)) {
			
 
				           let obj = {
			
 
				             defectTypeId: '',
			
--- a/src/views/system/systemFile/systemFile.vue
+++ b/src/views/system/systemFile/systemFile.vue
@@ -102,7 +102,6 @@ export default {
 
				       const allMenu = this.elMenu.filter(i => i.hp)
			
 
				       if (allMenu.length > 0) {
			
 
				         if (sessionStorage.getItem('ws-pf_systemFile')) {
			
 
				-          // debugger
			
 
				           for (let i = 0; i < allMenu.length; i++) {
			
 
				             if (allMenu[i].hp && allMenu[i].key === sessionStorage.getItem('ws-pf_systemFile')) {
			
 
				               return sessionStorage.getItem('ws-pf_systemFile')
			
--- a/src/views/taskManagement/tranManagementTransportAdd.vue
+++ b/src/views/taskManagement/tranManagementTransportAdd.vue
@@ -37,7 +37,7 @@
 
				             disabled
			
 
				           ></el-input>
			
 
				         </el-form-item>
			
 
				-        <el-form-item prop="taskType" label="任务类型" span="1">
			
 
				+        <el-form-item style="width: 18%" prop="taskType" label="任务类型" span="1">
			
 
				           <el-select
			
 
				             v-model="deptBudgetList.taskType"
			
 
				             placeholder="请输入任务类型"
			
@@ -51,8 +51,9 @@
 
				             ></el-option>
			
 
				           </el-select>
			
 
				         </el-form-item>
			
 
				-        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1">
			
 
				+        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1" class='contractNoselect'>
			
 
				           <el-select
			
 
				+          
			
 
				             v-model="deptBudgetList.contractNo"
			
 
				             placeholder="请选择编号"
			
 
				             @change=" (val) => {
			
@@ -67,7 +68,7 @@
 
				             ></el-option>
			
 
				           </el-select>
			
 
				         </el-form-item>
			
 
				-        <el-form-item prop="goodsName" label="货名" span="1">
			
 
				+        <el-form-item style="width: 18%" prop="goodsName" label="货名" span="1">
			
 
				             <el-input
			
 
				             disabled
			
 
				             v-model="deptBudgetList.goodsName"
			
@@ -75,7 +76,7 @@
 
				             size="small"
			
 
				           ></el-input>
			
 
				         </el-form-item>
			
 
				-        <el-form-item label="重量（吨）" span="1" prop="weight">
			
 
				+        <el-form-item style="width: 18%" label="重量（吨）" span="1" prop="weight">
			
 
				           <el-input
			
 
				             @input="weightchange"
			
 
				             v-model="deptBudgetList.weight"
			
@@ -86,7 +87,7 @@
 
				         </el-form-item>
			
 
				       </ws-info-table>
			
 
				       <ws-info-table class="el-table">
			
 
				-        <div class="start-address" style="width: 36%">
			
 
				+        <div class="start-address" style="width: 37.5%;display: flex;justify-content: space-between;">
			
 
				           <el-radio-group
			
 
				             @change="warehouseTypechange"
			
 
				             v-model="deptBudgetList.warehouseType"
			
@@ -108,7 +109,7 @@
 
				             ></el-option>
			
 
				           </el-select>
			
 
				         </div>
			
 
				-        <el-form-item label="始发地" span="1" class="start-address">
			
 
				+        <el-form-item style="width: 30.333%;margin-left:7px;" label="始发地" span="1" class="start-address">
			
 
				           <el-cascader
			
 
				             :options="options_"
			
 
				             v-model="selectedOptions"
			
@@ -122,7 +123,7 @@
 
				           label="始发地详细地址"
			
 
				           span="1"
			
 
				           prop="startDetailedAddress"
			
 
				-          style="width: 31.333%"
			
 
				+          style="width: 30.633%"
			
 
				         >
			
 
				           <el-input
			
 
				             v-model="deptBudgetList.startDetailedAddress"
			
@@ -136,7 +137,7 @@
 
				           span="1"
			
 
				           prop="contractNo"
			
 
				           class="start-address"
			
 
				-          style="width: 36%"
			
 
				+          style="width: 37.9%"
			
 
				         >
			
 
				           <el-select
			
 
				             @change="sendWarehousechange1"
			
@@ -158,6 +159,7 @@
 
				           span="1"
			
 
				           prop="contractNo"
			
 
				           class="start-address"
			
 
				+          style="width: 30.333%"
			
 
				         >
			
 
				           <el-cascader
			
 
				             :options="options_"
			
@@ -169,6 +171,7 @@
 
				           />
			
 
				         </el-form-item>
			
 
				         <el-form-item
			
 
				+        style="width: 31.633%"
			
 
				           label="终到地详细地址"
			
 
				           span="1"
			
 
				           prop="endDetailedAddress"
			
@@ -608,7 +611,7 @@ export default {
 
				               type: 'success',
			
 
				               message: '选择成功'
			
 
				             });
			
 
				-            this.disabled=true
			
 
				+            // this.disabled=true
			
 
				           })
			
 
				           .catch(action => {
			
 
				           });
			
@@ -947,7 +950,7 @@ export default {
 
				       }
			
 
				       for (var i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
			
 
				         this.deptBudgetList.tranProcessInfoList[i].processNo =
			
 
				-          this.deptBudgetList.taskNo + (i + 1)
			
 
				+          this.deptBudgetList.taskNo +'-'+ (i + 1)
			
 
				         if (
			
 
				           new Date(
			
 
				             this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
			
@@ -1020,6 +1023,15 @@ export default {
 
				           })
			
 
				           return
			
 
				         }
			
 
				+        if (
			
 
				+          !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress.length>20||this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress.length<2
			
 
				+        ) {
			
 
				+          this.$message({
			
 
				+            message: '收获详细地址输入错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				         if (!this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress) {
			
 
				           this.$message({
			
 
				             message: '发货详细地址不能为空！',
			
@@ -1027,8 +1039,14 @@ export default {
 
				           })
			
 
				           return
			
 
				         }
			
 
				+        if (!this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress.length>20||this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress.length<2) {
			
 
				+          this.$message({
			
 
				+            message: '发货详细地址输入错误！',
			
 
				+            type: 'warning',
			
 
				+          })
			
 
				+          return
			
 
				+        }
			
 
				       }
			
 
				-      // debugger
			
 
				       // if (this.deptBudgetList.endFlag=='1') {
			
 
				         this.$confirm(`运输任务提交成功后将派发到物流部门，是否确定提交？`, {
			
 
				           confirmButtonText: '确定',
			
@@ -1400,4 +1418,7 @@ export default {
 
				   height: 73vh;
			
 
				   overflow: scroll;
			
 
				 }
			
 
				+.ws-info-table .contractNoselect{
			
 
				+  width:25%;
			
 
				+}
			
 
				 </style>
			
--- a/src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
+++ b/src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
@@ -82,7 +82,7 @@
 
				 					</el-form-item>
			
 
				 					<!-- 品级 -->
			
 
				 					<el-form-item label="品级">
			
 
				-						<el-select disabled v-model="dataList.grade" placeholder class="typeselect"
			
 
				+						<el-select :disabled='gradestatus' 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" />
			
@@ -409,6 +409,7 @@
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				+				gradestatus:true,
			
 
				 				flag: 1,
			
 
				 				//弹出框
			
 
				 				dialogViewSpareMoney: false,
			
@@ -659,6 +660,19 @@
 
				 				for (var i = 0; i < this.warehouseNameList.length; i++) {
			
 
				 					if (this.warehouseNameList[i].id == e) {
			
 
				 						this.dataList.warehouseName = this.warehouseNameList[i].warehouseName
			
 
				+						if(this.dataList.taskTypeKey==3||this.dataList1.taskTypeKey==3){
			
 
				+							if(this.warehouseNameList[i].warehouseType==2){
			
 
				+								this.$set(this.dataList, 'goodsName', this.warehouseNameList[i].goodsName)
			
 
				+								this.$set(this.dataList, 'grade', this.warehouseNameList[i].grade)
			
 
				+								this.$set(this.dataList1, 'goodsName', this.warehouseNameList[i].goodsName)
			
 
				+								this.$set(this.dataList1, 'grade', this.warehouseNameList[i].grade)
			
 
				+								this.gradestatus=true
			
 
				+							}else{
			
 
				+								this.gradestatus=false
			
 
				+							}
			
 
				+						}
			
 
				+						
			
 
				+						console.log(this.warehouseNameList[i])
			
 
				 						//经办人
			
 
				 						getstaff({
			
 
				 								compId: sessionStorage.getItem('ws-pf_compId'),
			
@@ -1419,8 +1433,8 @@
 
				 					var random = this.getdate() + this.MathRand()
			
 
				 					this.inOutTaskNo = 'YKC' + random
			
 
				 					this.inOutTaskNo1 = 'YKR' + random
			
 
				-          this.dataList.moveTaskNo = 'YKRW' + random
			
 
				-		   this.dataList1.moveTaskNo = 'YKRW' + random
			
 
				+        //   this.dataList.moveTaskNo = 'YKRW' + random
			
 
				+		//    this.dataList1.moveTaskNo = 'YKRW' + random
			
 
				 				} else if (this.dataList.taskTypeKey == 4) {
			
 
				 					var random = this.getdate() + this.MathRand()
			
 
				 					this.inOutTaskNo = 'TCC' + random
			
@@ -1525,7 +1539,6 @@
 
				 				//     this.deliveryType = response
			
 
				 				//   })
			
 
				 				//仓库名
			
 
				-				// debugger
			
 
				 				getwarehousename({
			
 
				 						compId: this.compId,
			
 
				 						warehouseType: 1
			
--- a/src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
+++ b/src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
@@ -112,19 +112,12 @@
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
			
 
				-            <el-select
			
 
				-              @change="selectTaskNo"
			
 
				+             <el-input
			
 
				+              disabled
			
 
				               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>
			
 
				+              size="small" 
			
 
				+            />
			
 
				           </el-form-item>
			
 
				           <!-- 货名 -->
			
 
				           <el-form-item label="货名" class="huom">
			
@@ -315,19 +308,12 @@
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
			
 
				-            <el-select
			
 
				+          <el-input
			
 
				               disabled
			
 
				-              v-model="dataList1.moveTaskNo"
			
 
				+              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>
			
 
				+              size="small" 
			
 
				+            />
			
 
				           </el-form-item>
			
 
				           <!-- 货名 -->
			
 
				           <el-form-item label="货名" class="huom">
			
@@ -522,19 +508,12 @@
 
				             </el-select>
			
 
				           </el-form-item>
			
 
				           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
			
 
				-            <el-select
			
 
				-              @change="selectTaskNo"
			
 
				+            <el-input
			
 
				+              disabled
			
 
				               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>
			
 
				+              size="small" 
			
 
				+            />
			
 
				           </el-form-item>
			
 
				           <!-- 货名 -->
			
 
				           <el-form-item label="货名" class="huom">
			
--- a/src/views/tranManagement/tranManagementDriver.vue
+++ b/src/views/tranManagement/tranManagementDriver.vue
@@ -77,7 +77,9 @@
 
				                     prop="payeeName"
			
 
				                     class="el-car name"
			
 
				                   >
			
 
				-                    <div style="width: 100%">{{ item.payeeName }}</div>
			
 
				+                    <div style="width: 100%">
			
 
				+                      {{ item.payeeName }}
			
 
				+                    </div>
			
 
				                   </ws-form-item>
			
 
				                   <ws-form-item
			
 
				                     :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
			
--- a/src/views/tranManagement/tranManagementDriverAdd.vue
+++ b/src/views/tranManagement/tranManagementDriverAdd.vue
@@ -932,14 +932,12 @@ export default {
 
				         EventBus.$emit('error', '驾驶证不能为空')
			
 
				         return
			
 
				       }
			
 
				-      // if (!this.addressUrls.way) {
			
 
				-      //   EventBus.$emit('error', '道路运营证不能为空')
			
 
				-      //   return
			
 
				-      // }
			
 
				-      // if (!this.addressUrls.qualification) {
			
 
				-      //   EventBus.$emit('error', '从业资格证不能为空')
			
 
				-      //   return
			
 
				-      // }
			
 
				+      if (!this.addressUrls.way) {
			
 
				+        this.addressUrls.way='$'
			
 
				+      }
			
 
				+      if (!this.addressUrls.qualification) {
			
 
				+        this.addressUrls.qualification='$'
			
 
				+      }
			
 
				       if (!this.addressUrls.identityjust) {
			
 
				         EventBus.$emit('error', '身份证正面不能为空')
			
 
				         return
			
@@ -949,8 +947,13 @@ export default {
 
				         return
			
 
				       }
			
 
				       var arr = []
			
 
				+      var arr1=[]
			
 
				       for (let key in this.addressUrls) {
			
 
				-        arr.push(this.addressUrls[key])
			
 
				+        if(key=='identityjust'||key=='identityagainst'){
			
 
				+          arr.push(this.addressUrls[key])
			
 
				+        }else{
			
 
				+          arr1.push(this.addressUrls[key])
			
 
				+        }
			
 
				       }
			
 
				 
			
 
				       this.$refs.deptBudgetList.validate((valid) => {
			
@@ -960,7 +963,8 @@ export default {
 
				             CodeToText[this.selectedOptions[0]]
			
 
				           this.deptBudgetList.residentCityMunicipal =
			
 
				             CodeToText[this.selectedOptions[1]]
			
 
				-          this.deptBudgetList.addressUrl = arr.toString()
			
 
				+          this.deptBudgetList.addressUrl = arr1.toString()
			
 
				+          this.deptBudgetList.cardAddressUrl = arr.toString()
			
 
				           this.deptBudgetList.driverCarInfoList = this.freightspace
			
 
				           this.deptBudgetList.driverPayeeInfoList = this.freightspace1
			
 
				           addDriver(this.deptBudgetList)
			
--- a/src/views/tranManagement/tranManagementDriverEdit.vue
+++ b/src/views/tranManagement/tranManagementDriverEdit.vue
@@ -667,15 +667,22 @@ export default {
 
				         .toPromise()
			
 
				         .then((response) => {
			
 
				           // this.selectedOptions.push()
			
 
				-          this.deptBudgetList.addressUrlArray = response.addressUrl.split(',')
			
 
				-          this.addressUrls.travel = this.deptBudgetList.addressUrlArray[0]
			
 
				-          this.addressUrls.drive = this.deptBudgetList.addressUrlArray[1]
			
 
				-          this.addressUrls.way = this.deptBudgetList.addressUrlArray[2]
			
 
				-          this.addressUrls.qualification =
			
 
				-            this.deptBudgetList.addressUrlArray[3]
			
 
				-          this.addressUrls.identityjust = this.deptBudgetList.addressUrlArray[4]
			
 
				-          this.addressUrls.identityagainst =
			
 
				-            this.deptBudgetList.addressUrlArray[5]
			
 
				+          this.deptBudgetList.addressUrlArray = response.cardAddressUrl.split(',')
			
 
				+           this.deptBudgetList.addressUrlArray1 = response.addressUrl.split(',')
			
 
				+           this.$set(this.addressUrls, 'travel', this.deptBudgetList.addressUrlArray1[0])
			
 
				+           this.$set(this.addressUrls, 'drive', this.deptBudgetList.addressUrlArray1[1])
			
 
				+          if(this.deptBudgetList.addressUrlArray1[2]!='$'){
			
 
				+            this.$set(this.addressUrls, 'way', this.deptBudgetList.addressUrlArray1[2])
			
 
				+          }else{
			
 
				+             this.$set(this.addressUrls, 'way', '')
			
 
				+          }
			
 
				+          if(this.deptBudgetList.addressUrlArray1[3]!='$'){
			
 
				+            this.$set(this.addressUrls, 'qualification', this.deptBudgetList.addressUrlArray1[3])
			
 
				+          }else{
			
 
				+            this.$set(this.addressUrls, 'qualification', '')
			
 
				+          }
			
 
				+          this.$set(this.addressUrls, 'identityjust', this.deptBudgetList.addressUrlArray[0])
			
 
				+          this.$set(this.addressUrls, 'identityagainst', this.deptBudgetList.addressUrlArray[1])
			
 
				 
			
 
				           for (var i = 0; i < response.driverPayeeInfoList.length; i++) {
			
 
				             if (response.driverPayeeInfoList[i].cardAddressUrl != null) {
			
@@ -758,6 +765,7 @@ export default {
 
				         })
			
 
				     },
			
 
				     uploadSuccessHandletravel(e) {
			
 
				+      console.log(e.url)
			
 
				       this.$set(this.addressUrls, 'travel', e.url)
			
 
				     },
			
 
				     uploadSuccessHandledrive(e) {
			
@@ -865,8 +873,25 @@ export default {
 
				     },
			
 
				 
			
 
				     submit() {
			
 
				+      if (!this.addressUrls.way) {
			
 
				+        this.addressUrls.way='$'
			
 
				+      }
			
 
				+      if (!this.addressUrls.qualification) {
			
 
				+        this.addressUrls.qualification='$'
			
 
				+      }
			
 
				+      var arr = []
			
 
				+      var arr1=[]
			
 
				+      for (let key in this.addressUrls) {
			
 
				+        if(key=='identityjust'||key=='identityagainst'){
			
 
				+          arr.push(this.addressUrls[key])
			
 
				+        }else{
			
 
				+          arr1.push(this.addressUrls[key])
			
 
				+        }
			
 
				+      }
			
 
				       this.$refs.deptBudgetList.validate((valid) => {
			
 
				         if (valid) {
			
 
				+          this.deptBudgetList.addressUrl = arr1.toString()
			
 
				+          this.deptBudgetList.cardAddressUrl = arr.toString()
			
 
				           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				           this.deptBudgetList.residentCityProvincial =
			
 
				             CodeToText[this.selectedOptions[0]]
			
--- a/src/views/tranManagement/tranManagementFireReceivingFeedback.vue
+++ b/src/views/tranManagement/tranManagementFireReceivingFeedback.vue
@@ -754,7 +754,6 @@ export default {
 
				         that.$forceUpdate();
			
 
				         that.freightspace[that.index].imgCount++
			
 
				         console.log(that.freightspace[that.index].imgCount)
			
 
				-        debugger
			
 
				         if( that.freightspace[that.index].unloadPoundImg){
			
 
				            that.freightspace[that.index].unloadPoundImg += ',' + e.url
			
 
				         }else{
			
--- a/src/views/tranManagement/tranManagementReceivingFeedback.vue
+++ b/src/views/tranManagement/tranManagementReceivingFeedback.vue
@@ -100,8 +100,14 @@
 
				         <el-table-column class="table_td" label="重量（吨）" prop="weight">
			
 
				         </el-table-column>
			
 
				         <el-table-column class="table_td" label="发货" prop="send" width="300">
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
			
 
				+          </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column class="table_td" label="收货" prop="receive" width="300">
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
			
 
				+          </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column
			
 
				           class="table_td"
			
--- a/src/views/tranManagement/tranManagementShipping.vue
+++ b/src/views/tranManagement/tranManagementShipping.vue
@@ -77,8 +77,14 @@
 
				         <el-table-column class="table_td" label="重量（吨）" prop="weight">
			
 
				         </el-table-column>
			
 
				         <el-table-column class="table_td" label="发货" prop="send" width="300">
			
 
				+           <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
			
 
				+          </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column class="table_td" label="收货" prop="receive" width="300">
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
			
 
				+          </template>
			
 
				         </el-table-column>
			
 
				         <el-table-column class="table_td" label="运输周期" prop="tranCycle"  width="160">
			
 
				           <template scope="scope">
			
@@ -257,6 +263,10 @@ export default {
 
				       })
			
 
				         .toPromise()
			
 
				         .then((response) => {
			
 
				+          // for (let i = 0; i < response.records.length; i++) {
			
 
				+          //   response.records[i].send=response.records[i].send.replace(/\n/g, '<br>')
			
 
				+          //   response.records[i].receive=response.records[i].receive.replace(/\n/g, '<br>')
			
 
				+          // }
			
 
				           this.warehouseList = response
			
 
				           this.deptCircularPage.currentPage = response.current
			
 
				           this.deptCircularPage.pageSize = response.size
			
--- a/src/views/tranManagement/tranManagementShippingArrangemen.vue
+++ b/src/views/tranManagement/tranManagementShippingArrangemen.vue
@@ -402,6 +402,9 @@
 
				           .toPromise()
			
 
				           .then((response) => {
			
 
				             this.deptBudgetList = response
			
 
				+            if(this.deptBudgetList.tranPriceIng==0){
			
 
				+            this.deptBudgetList.tranPriceIng=''
			
 
				+          }
			
 
				             this.fhaddress = response.sendPrivate + response.sendCity + response.sendArea + response
			
 
				               .sendDetailedAddress
			
 
				             this.shaddress = response.receivePrivate + response.receiveCity + response.receiveArea + response
			
@@ -511,6 +514,7 @@
 
				         this.$prompt('运输单价审核', {
			
 
				           cancelButtonText: '取消',
			
 
				           confirmButtonText: '确定',
			
 
				+          inputValue:this.deptBudgetList.tranPriceIng
			
 
				         }).then(({
			
 
				           value
			
 
				         }) => {
			
--- a/src/views/tranManagement/tranManagementTransporHairRespond.vue
+++ b/src/views/tranManagement/tranManagementTransporHairRespond.vue
@@ -97,8 +97,16 @@
 
				         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
			
 
				         <el-table-column prop="goodsName" label="货名"> </el-table-column>
			
 
				         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
			
 
				-        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
			
 
				-        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
			
 
				+        <el-table-column prop="send" label="发货" width="300"> 
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column prop="receive" label="收货" width="300"> 
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				         <el-table-column prop="tranCycle" label="运输周期" width="160">
			
 
				           <template scope="scope">
			
 
				             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
			
--- a/src/views/tranManagement/tranManagementTransporTationFire.vue
+++ b/src/views/tranManagement/tranManagementTransporTationFire.vue
@@ -78,8 +78,16 @@
 
				         </el-table-column>
			
 
				         <el-table-column prop="goodsName" label="货名"> </el-table-column>
			
 
				         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
			
 
				-        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
			
 
				-        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
			
 
				+        <el-table-column prop="send" label="发货" width="300">
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
			
 
				+          </template>
			
 
				+          </el-table-column>
			
 
				+        <el-table-column prop="receive" label="收货" width="300"> 
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				         <el-table-column prop="tranCycle" label="运输周期"  width="160">
			
 
				           <template scope="scope">
			
 
				             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
			
--- a/src/views/tranManagement/tranManagementTransporTrainNo.vue
+++ b/src/views/tranManagement/tranManagementTransporTrainNo.vue
@@ -495,6 +495,7 @@ export default {
 
				       this.$prompt('运输单价审核', {
			
 
				           cancelButtonText: '取消',
			
 
				           confirmButtonText: '确定',
			
 
				+          inputValue:this.deptBudgetList.tranPriceIng
			
 
				         }).then(({ value }) => {
			
 
				               var tranProcessInfo = {}
			
 
				               tranProcessInfo.reviewer = sessionStorage.getItem('ws-pf_roleName') +
			
@@ -543,6 +544,9 @@ export default {
 
				         .toPromise()
			
 
				         .then((response) => {
			
 
				           this.deptBudgetList = response
			
 
				+          if(this.deptBudgetList.tranPriceIng==0){
			
 
				+            this.deptBudgetList.tranPriceIng=''
			
 
				+          }
			
 
				           if (response.tranCarInfoList.length == 0){
			
 
				             this.deptBudgetList.tranCarInfoList = [
			
 
				               {
			
--- a/src/views/tranManagement/tranManagementVehicle.vue
+++ b/src/views/tranManagement/tranManagementVehicle.vue
@@ -79,8 +79,16 @@
 
				         </el-table-column>
			
 
				         <el-table-column prop="goodsName" label="货名"> </el-table-column>
			
 
				         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
			
 
				-        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
			
 
				-        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
			
 
				+        <el-table-column prop="send" label="发货" width="300"> 
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column prop="receive" label="收货" width="300"> 
			
 
				+          <template scope="scope">
			
 
				+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				         <el-table-column class="table_td" label="运输周期"  width="160">
			
 
				           <template slot-scope="scope">
			
 
				             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
			
--- a/src/views/tranManagement/tranManagementVehicleDispatching.vue
+++ b/src/views/tranManagement/tranManagementVehicleDispatching.vue
@@ -570,6 +570,7 @@ export default {
 
				       this.$prompt('运输单价审核', {
			
 
				           cancelButtonText: '取消',
			
 
				           confirmButtonText: '确定',
			
 
				+          inputValue:this.deptBudgetList.tranPriceIng
			
 
				         }).then(({ value }) => {
			
 
				               var tranProcessInfo = {}
			
 
				               tranProcessInfo.reviewer = sessionStorage.getItem('ws-pf_roleName') +
			
@@ -597,7 +598,6 @@ export default {
 
				         type: 'warning',
			
 
				       })
			
 
				         .then(() => {
			
 
				-          // debugger
			
 
				               var tranProcessInfo = {}
			
 
				               tranProcessInfo.id = this.deptBudgetList.id
			
 
				               tranProcessInfo.flag = "1"
			
@@ -689,7 +689,11 @@ export default {
 
				               }
			
 
				             }
			
 
				           }
			
 
				+          
			
 
				           this.deptBudgetList = response
			
 
				+          if(this.deptBudgetList.tranPriceIng==0){
			
 
				+            this.deptBudgetList.tranPriceIng=''
			
 
				+          }
			
 
				           if (this.deptBudgetList.tranCarInfoList.length == 0) {
			
 
				             this.deptBudgetList.tranCarInfoList = [
			
 
				               {
			
--- a/src/views/warehouse/warehouseManagementDelivery.vue
+++ b/src/views/warehouse/warehouseManagementDelivery.vue
@@ -251,7 +251,7 @@
 
				             accept=".jpg, .jpeg, .png, .gif"
			
 
				             ><el-button size="small" type="primary">点击上传</el-button>
			
 
				           </el-upload>
			
 
				-          <div v-if='deptBudgetList.addressUrl!=""'>
			
 
				+          <div @click='imgBig(deptBudgetList.addressUrl)' v-if='deptBudgetList.addressUrl!=""'>
			
 
				             <img style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
			
 
				           </div>
			
 
				       <div class="small-title">化验数据（选填）</div>
			
@@ -359,6 +359,9 @@
 
				         >
			
 
				       </div>
			
 
				     </ws-form>
			
 
				+    <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
			
 
				+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
			
 
				+    </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
@@ -403,6 +406,8 @@ export default {
 
				       // 年
			
 
				       year: '',
			
 
				       deptBudgetTotal: 0,
			
 
				+      img:'',
			
 
				+      imgshow:false,
			
 
				       currentPage: 1,
			
 
				       pageSize: 10,
			
 
				       searchType: 1,
			
@@ -468,6 +473,11 @@ export default {
 
				   
			
 
				   },
			
 
				   methods: {
			
 
				+    imgBig(item){
			
 
				+      console.log(item)
			
 
				+      this.img=item
			
 
				+      this.imgshow=true
			
 
				+    },
			
 
				       qualityInspectorChange(e){
			
 
				       console.log(e)
			
 
				     },
			
@@ -1294,14 +1304,14 @@ export default {
 
				       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
			
 
				         this.deptBudgetList.netWeight = Number(
			
 
				           this.deptBudgetList.grossWeight - this.deptBudgetList.tare
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     grossWeightchange(e) {
			
 
				       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
			
 
				         this.deptBudgetList.netWeight = Number(
			
 
				           this.deptBudgetList.grossWeight - this.deptBudgetList.tare
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     selectgoodsName(e) {
			
--- a/src/views/warehouse/warehouseManagementGross.vue
+++ b/src/views/warehouse/warehouseManagementGross.vue
--- a/src/views/warehouse/warehouseManagementIoss.vue
+++ b/src/views/warehouse/warehouseManagementIoss.vue
@@ -302,6 +302,10 @@ export default {
 
				           this.deptBudgetList.physicalInventory <=
			
 
				         0
			
 
				       ) {
			
 
				+        this.$message({
			
 
				+          message: '实际库存输入错误！',
			
 
				+          type: 'warning',
			
 
				+        })
			
 
				         return
			
 
				       }
			
 
				 
			
--- a/src/views/warehouse/warehouseManagementNoComplete.vue
+++ b/src/views/warehouse/warehouseManagementNoComplete.vue
@@ -198,7 +198,7 @@ export default {
 
				   methods: {
			
 
				     //返回按钮
			
 
				     returnWarehouse() {
			
 
				-      this.$router.push({ path: 'warehouseManagementList' })
			
 
				+      this.$router.go(-1)
			
 
				     },
			
 
				     //编辑
			
 
				     edits(row) {
			
--- a/src/views/warehouse/warehouseManagementNoWeightIn.vue
+++ b/src/views/warehouse/warehouseManagementNoWeightIn.vue
--- a/src/views/warehouse/warehouseManagementNoWeightOut.vue
+++ b/src/views/warehouse/warehouseManagementNoWeightOut.vue
--- a/src/views/warehouse/warehouseManagementPerfectDelivery.vue
+++ b/src/views/warehouse/warehouseManagementPerfectDelivery.vue
@@ -244,8 +244,8 @@
 
				             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 @click='imgBig(dataList.addressUrl)' v-if='dataList.addressUrl!=""'>
			
 
				+            <img  style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
			
 
				           </div>
			
 
				       <div class="small-title">化验数据（选填）</div>
			
 
				       <div class="inspector">
			
@@ -334,6 +334,9 @@
 
				         >
			
 
				       </div>
			
 
				     </ws-form>
			
 
				+  <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
			
 
				+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
			
 
				+    </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
@@ -423,6 +426,8 @@ export default {
 
				         month: dayjs().format('MM'),
			
 
				       },
			
 
				       contractList: [],
			
 
				+      img:'',
			
 
				+      imgshow:false,
			
 
				       dataList: {
			
 
				         id: '',
			
 
				         grossWeight: '',
			
@@ -431,6 +436,7 @@ export default {
 
				         netWeight: '',
			
 
				         grade: '',
			
 
				         agent: '',
			
 
				+        
			
 
				         carNo: '',
			
 
				         inOutDate: '',
			
 
				         inOutType: '',
			
@@ -469,7 +475,7 @@ export default {
 
				     this.dataList.warehouseName = this.$route.query.warehouseName
			
 
				     this.dataList.binNumber = this.$route.query.binNumber
			
 
				     this.dataList.tare = this.$route.query.tare
			
 
				-    this.dataList.netWeight = this.$route.query.netWeight
			
 
				+    this.dataList.netWeight = this.$route.query.netWeight.toFixed(2)
			
 
				     this.dataList.grade = this.$route.query.grade
			
 
				     this.dataList.agent = this.$route.query.agent
			
 
				     this.dataList.carNo = this.$route.query.carNo
			
@@ -486,6 +492,11 @@ export default {
 
				     console.log(this.dataList)
			
 
				   },
			
 
				   methods: {
			
 
				+    imgBig(item){
			
 
				+      console.log(item)
			
 
				+      this.img=item
			
 
				+      this.imgshow=true
			
 
				+    },
			
 
				     pureweight(status){
			
 
				       console.log(this.deptBudgetList)
			
 
				       if(this.deptBudgetList.netWeight&&this.deptBudgetList.tidalGrainWater&&this.deptBudgetList.solidGrainWater&&this.deptBudgetList.buckleWeightRatio){
			
@@ -542,7 +553,7 @@ export default {
 
				                 .toPromise()
			
 
				                 .then((response) => {
			
 
				                   this.$message.success('暂存成功')
			
 
				-                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                  this.$router.go(-1)
			
 
				                 })
			
 
				             } else {
			
 
				               EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
@@ -952,7 +963,7 @@ export default {
 
				             .toPromise()
			
 
				             .then((response) => {
			
 
				               this.$message.success('添加成功')
			
 
				-              this.$router.push({ path: 'warehouseManagementList' })
			
 
				+              this.$router.go(-1)
			
 
				             })
			
 
				         } else {
			
 
				           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
@@ -964,14 +975,14 @@ export default {
 
				       if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				         this.dataList.netWeight = Number(
			
 
				           this.dataList.grossWeight - this.dataList.tare
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     grossWeightchange(e) {
			
 
				       if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				         this.dataList.netWeight = Number(
			
 
				           this.dataList.grossWeight - this.dataList.tare
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     selectgoodsName(e) {
			
--- a/src/views/warehouse/warehouseManagementPerfectput.vue
+++ b/src/views/warehouse/warehouseManagementPerfectput.vue
@@ -327,7 +327,7 @@
 
				             accept=".jpg, .jpeg, .png, .gif"
			
 
				             ><el-button size="small" type="primary">点击上传</el-button>
			
 
				           </el-upload>
			
 
				-          <div>
			
 
				+          <div @click='imgBig(dataList.addressUrl)'>
			
 
				             <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
			
 
				           </div>
			
 
				       <div class="small-title">化验数据（选填）</div>
			
@@ -433,6 +433,9 @@
 
				         >
			
 
				       </div>
			
 
				     </ws-form>
			
 
				+    <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
			
 
				+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
			
 
				+    </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
@@ -531,6 +534,8 @@ export default {
 
				       options2: [],
			
 
				       carstatus:false,
			
 
				       contractList: [],
			
 
				+      img:'',
			
 
				+      imgshow:false,
			
 
				       dataList: {
			
 
				         id: '',
			
 
				         grossWeight: '',
			
@@ -610,6 +615,11 @@ export default {
 
				 
			
 
				   },
			
 
				   methods: {
			
 
				+    imgBig(item){
			
 
				+      console.log(item)
			
 
				+      this.img=item
			
 
				+      this.imgshow=true
			
 
				+    },
			
 
				         kkInput(val){
			
 
				       console.log(val)
			
 
				       if(this.isGetCost){
			
@@ -1275,14 +1285,14 @@ export default {
 
				       if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				         this.dataList.netWeight = Number(
			
 
				           this.dataList.grossWeight - this.dataList.tare
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     grossWeightchange(e) {
			
 
				       if (this.dataList.grossWeight && this.dataList.tare) {
			
 
				         this.dataList.netWeight = Number(
			
 
				           this.dataList.grossWeight - this.dataList.tare
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     selectgoodsName(e) {
			
--- a/src/views/warehouse/warehouseManagementPut.vue
+++ b/src/views/warehouse/warehouseManagementPut.vue
@@ -406,7 +406,7 @@
 
				       >
			
 
				       <el-button size="small" type="primary">点击上传</el-button>
			
 
				       </el-upload>
			
 
				-      <div v-if='deptBudgetList.addressUrl!=""'>
			
 
				+      <div @click='imgBig(deptBudgetList.addressUrl)' v-if='deptBudgetList.addressUrl!=""'>
			
 
				         <img
			
 
				           style="width: 100px; height: 100px"
			
 
				           :src="deptBudgetList.addressUrl"
			
@@ -530,6 +530,9 @@
 
				         >
			
 
				       </div>
			
 
				     </ws-form>
			
 
				+    <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
			
 
				+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
			
 
				+    </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
@@ -601,6 +604,8 @@ export default {
 
				       appendixIdsAdd: '',
			
 
				       uploadSuccess: {},
			
 
				       onChange: {},
			
 
				+      img:'',
			
 
				+      imgshow:false,
			
 
				       gradeList: [],
			
 
				       rules: {
			
 
				         netWeight: [
			
@@ -670,6 +675,11 @@ export default {
 
				     // }
			
 
				   },
			
 
				   methods: {
			
 
				+    imgBig(item){
			
 
				+      console.log(item)
			
 
				+      this.img=item
			
 
				+      this.imgshow=true
			
 
				+    },
			
 
				     qualityInspectorChange(e){
			
 
				       console.log(e)
			
 
				     },
			
@@ -730,7 +740,7 @@ export default {
 
				     },
			
 
				     //返回按钮
			
 
				     revert() {
			
 
				-      this.$router.push({ path: 'warehouseManagementList' })
			
 
				+       this.$router.go(-1)
			
 
				     },
			
 
				     carChange(e) {
			
 
				       for (let i = 0; i < this.tranCarInfoList.length; i++) {
			
@@ -1271,7 +1281,7 @@ export default {
 
				                 .toPromise()
			
 
				                 .then((response) => {
			
 
				                   this.$message.success('添加成功')
			
 
				-                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                  this.$router.go(-1)
			
 
				                 })
			
 
				             } else {
			
 
				               EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
@@ -1767,7 +1777,7 @@ export default {
 
				                 .toPromise()
			
 
				                 .then((response) => {
			
 
				                   this.$message.success('暂存成功')
			
 
				-                  this.$router.push({ path: 'warehouseManagementList' })
			
 
				+                  this.$router.go(-1)
			
 
				                 })
			
 
				             } else {
			
 
				               EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
			
@@ -1789,7 +1799,7 @@ export default {
 
				           this.deptBudgetList.grossWeight -
			
 
				             this.deptBudgetList.tare -
			
 
				             this.deptBudgetList.deductionWeight
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     grossWeightchange(e) {
			
@@ -1802,7 +1812,7 @@ export default {
 
				           this.deptBudgetList.grossWeight -
			
 
				             this.deptBudgetList.tare -
			
 
				             this.deptBudgetList.deductionWeight
			
 
				-        )
			
 
				+        ).toFixed(2)
			
 
				       }
			
 
				     },
			
 
				     contractNoChange(e) {
			
--- a/src/views/warehouse/warehouseManagementTare.vue
+++ b/src/views/warehouse/warehouseManagementTare.vue
@@ -6,217 +6,108 @@
 
				         <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-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"
			
 
				-          >
			
 
				+          <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="inOutTaskNo">
			
 
				-            <el-select
			
 
				-              filterable
			
 
				-              clearable
			
 
				-              v-model="deptBudgetList.inOutTaskNo"
			
 
				-              placeholder="请选择任务编号"
			
 
				-              class="typeselect"
			
 
				-              @change="contractNoChange"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in deptBudgetList1"
			
 
				-                :key="item.inOutTaskNo"
			
 
				-                :label="item.inOutTaskNo"
			
 
				-                :value="item.inOutTaskNo"
			
 
				-              />
			
 
				+            <el-select filterable clearable v-model="deptBudgetList.inOutTaskNo" placeholder="请选择任务编号"
			
 
				+              class="typeselect" @change="contractNoChange">
			
 
				+              <el-option v-for="item in deptBudgetList1" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
			
 
				+                :value="item.inOutTaskNo" />
			
 
				             </el-select>
			
 
				           </ws-form-item>
			
 
				           <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 v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
			
 
				+              @change='contractNoChange1'>
			
 
				+              <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 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-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-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-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-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-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 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 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-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 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
			
 
				-              @change="selectstaff"
			
 
				-            >
			
 
				-              <el-option
			
 
				-                v-for="item in options"
			
 
				-                :key="item.value"
			
 
				-                :label="item.staffName"
			
 
				-                :value="item.staffName"
			
 
				-              />
			
 
				+            <el-select v-model="deptBudgetList.agent" placeholder="请选择经办人" filterable clearable @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 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-input v-model='deptBudgetList.inOutType' class="right-bottom" :disabled="isSelectType"
			
 
				+              placeholder='暂无' />
			
 
				             <!-- <ws-select
			
 
				               v-model="deptBudgetList.deliveryType"
			
 
				               placeholder=""
			
@@ -232,30 +123,13 @@
 
				             </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
			
 
				-              clearable
			
 
				-              :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"
			
 
				-              />
			
 
				+          <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 clearable :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>
			
@@ -287,375 +161,329 @@
 
				             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>
			
 
				+        <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-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-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-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-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-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-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-if="!allowEdit"
			
 
				-          class="bg-bottom-up"
			
 
				-          type="primary"
			
 
				-          size="small"
			
 
				-          @click="submit()"
			
 
				-          >提交</el-button
			
 
				-        >
			
 
				+        <el-button v-if="information == '皮重检斤'" class="bg-bottom-up" size="small" @click="temporaryStorage()">保存
			
 
				+        </el-button>
			
 
				+        <el-button v-if="!allowEdit" 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,
			
 
				-  getReceiptTaskNo
			
 
				-} 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
			
 
				+  import {
			
 
				+    pullDown,
			
 
				+    addstorageputList,
			
 
				+    goodsname,
			
 
				+    xialaNo,
			
 
				+    getstaff,
			
 
				+    goodsnameXiala,
			
 
				+    getReceiptTaskNo
			
 
				+  } 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 {
			
 
				-      deptBudgetList1:[],
			
 
				-      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: [
			
 
				-          {
			
 
				+    data() {
			
 
				+      return {
			
 
				+        deptBudgetList1: [],
			
 
				+        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'),
			
 
				-      skinInspector: sessionStorage.getItem('ws-pf_staffName'),
			
 
				-      deptCircularPage: {},
			
 
				-      packtypeList: {},
			
 
				-      date: {
			
 
				-        year: dayjs().format('YYYY'),
			
 
				-        month: dayjs().format('MM'),
			
 
				-      },
			
 
				-      contractList: [],
			
 
				-      deptBudgetList: {
			
 
				-        type:'干粮',
			
 
				-        addressUrl:'',
			
 
				-        warehouseInOutDetail: {},
			
 
				-        grossWeight:0,
			
 
				-        tare:0
			
 
				-      },
			
 
				-      historyList: [],
			
 
				+          }, ],
			
 
				+        },
			
 
				+        size: 10,
			
 
				+        compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+        skinInspector: sessionStorage.getItem('ws-pf_staffName'),
			
 
				+        deptCircularPage: {},
			
 
				+        packtypeList: {},
			
 
				+        date: {
			
 
				+          year: dayjs().format('YYYY'),
			
 
				+          month: dayjs().format('MM'),
			
 
				+        },
			
 
				+        contractList: [],
			
 
				+        deptBudgetList: {
			
 
				+          type: '干粮',
			
 
				+          addressUrl: '',
			
 
				+          warehouseInOutDetail: {},
			
 
				+          grossWeight: 0,
			
 
				+          tare: 0
			
 
				+        },
			
 
				+        historyList: [],
			
 
				 
			
 
				-      pickerBeginDateBefore: {
			
 
				-        disabledDate: (time) => {
			
 
				-          return time.getTime() > Date.now()
			
 
				+        pickerBeginDateBefore: {
			
 
				+          disabledDate: (time) => {
			
 
				+            return time.getTime() > Date.now()
			
 
				+          },
			
 
				         },
			
 
				-      },
			
 
				-      accessoryTFs: false,
			
 
				-      allowEdit: true,
			
 
				-      param: 9600,
			
 
				-      information:'',
			
 
				-      result1:'00'
			
 
				-    }
			
 
				-  },
			
 
				-  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()
			
 
				-       getReceiptTaskNo().toPromise()
			
 
				-            .then((response) => {
			
 
				-                console.log(response)
			
 
				-                this.deptBudgetList1 = response
			
 
				-            })
			
 
				-  },
			
 
				-  methods: {
			
 
				-    async closePort() {
			
 
				-      console.log('closePort');
			
 
				-      this.reader.cancel()
			
 
				+        accessoryTFs: false,
			
 
				+        allowEdit: true,
			
 
				+        param: 9600,
			
 
				+        information: '',
			
 
				+        result1: '00'
			
 
				+      }
			
 
				     },
			
 
				-    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;
			
 
				-          var flag1 = 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)
			
 
				-          //   }
			
 
				-          // }
			
 
				-          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
			
 
				-            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)|| parseInt(result) == 0){
			
 
				-                this.deptBudgetList.grossWeight = parseInt(result)
			
 
				-              }
			
 
				-            } else {
			
 
				-              if(parseInt(result)|| parseInt(result) == 0){
			
 
				-                this.deptBudgetList.tare = parseInt(result)
			
 
				-              }
			
 
				+    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()
			
 
				+      getReceiptTaskNo().toPromise()
			
 
				+        .then((response) => {
			
 
				+          console.log(response)
			
 
				+          this.deptBudgetList1 = response
			
 
				+        })
			
 
				+    },
			
 
				+    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;
			
 
				             }
			
 
				-          }
			
 
				-          else{
			
 
				-            for(var i=0;i<value.length;i++){
			
 
				-              var tmp = String.fromCharCode(value[i])
			
 
				-              
			
 
				-              if((value[0] != 49 && value[0] != 2)){
			
 
				-                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
			
 
				-                  flag1 = true
			
 
				+            var result = '';
			
 
				+            //2。获取16进制字符串
			
 
				+            // var receData = HexConvert.ByteToString(value);
			
 
				+            // console.log("receData",receData);
			
 
				+            var flag = false;
			
 
				+            var flag1 = 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)
			
 
				+            //   }
			
 
				+            // }
			
 
				+            if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
			
 
				+                .deptBudgetList.warehouseName == '克东千红库' || this.warehouseName == '鲅鱼圈祥腾库')) {
			
 
				+              for (var i = 0; i < value.length; i++) {
			
 
				+                var tmp = String.fromCharCode(value[i])
			
 
				+                if (tmp == '+') {
			
 
				+                  flag = true
			
 
				                 }
			
 
				-                else{
			
 
				-                  break
			
 
				+                if (flag && result.length < 6 && tmp != '+') {
			
 
				+                  result += tmp
			
 
				                 }
			
 
				               }
			
 
				-              if (tmp == String.fromCharCode(32) ) {
			
 
				-                flag = true
			
 
				-              }
			
 
				-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
			
 
				-                result += tmp
			
 
				+              if (this.information == '毛重检斤') {
			
 
				+                if (parseInt(result) || parseInt(result) == 0) {
			
 
				+                  this.deptBudgetList.grossWeight = parseInt(result)
			
 
				+                }
			
 
				+              } else {
			
 
				+                if (parseInt(result) || parseInt(result) == 0) {
			
 
				+                  this.deptBudgetList.tare = parseInt(result)
			
 
				+                }
			
 
				               }
			
 
				-              if (flag1 && tmp != String.fromCharCode(32)) {
			
 
				-                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
			
 
				-                  if(i == 0 ){
			
 
				-                    this.result1 = tmp + '0'
			
 
				+            } else {
			
 
				+              for (var i = 0; i < value.length; i++) {
			
 
				+                var tmp = String.fromCharCode(value[i])
			
 
				+
			
 
				+                if ((value[0] != 49 && value[0] != 2)) {
			
 
				+                  if ((value[value.length - 1] == 48 && value[value.length - 2] == 48)) {
			
 
				+                    flag1 = true
			
 
				+                  } else {
			
 
				+                    break
			
 
				+                  }
			
 
				+                }
			
 
				+                if (tmp == String.fromCharCode(32)) {
			
 
				+                  flag = true
			
 
				+                }
			
 
				+                if (flag && result.length < 7 && tmp != String.fromCharCode(32) && !(value[value.length - 1] == 48 &&
			
 
				+                    value[value.length - 2] == 48)) {
			
 
				+                  result += tmp
			
 
				+                }
			
 
				+                if (flag1 && tmp != String.fromCharCode(32)) {
			
 
				+                  if ((value[value.length - 1] == 48 && value[value.length - 2] == 48)) {
			
 
				+                    if (i == 0) {
			
 
				+                      this.result1 = tmp + '0'
			
 
				+                    }
			
 
				                   }
			
 
				                 }
			
 
				               }
			
 
				-            }
			
 
				-            if (this.information == '毛重检斤') {
			
 
				-              if(parseInt(result)|| parseInt(result) == 0){
			
 
				-              this.deptBudgetList.grossWeight = parseInt(result+this.result1)
			
 
				-              }
			
 
				-            } else {
			
 
				-              if(parseInt(result)|| parseInt(result) == 0){
			
 
				-              this.deptBudgetList.tare = parseInt(result+this.result1)
			
 
				+              if (this.information == '毛重检斤') {
			
 
				+                if (parseInt(result) || parseInt(result) == 0) {
			
 
				+                  this.deptBudgetList.grossWeight = parseInt(result + this.result1)
			
 
				+                }
			
 
				+              } else {
			
 
				+                if (parseInt(result) || parseInt(result) == 0) {
			
 
				+                  this.deptBudgetList.tare = parseInt(result + this.result1)
			
 
				+                }
			
 
				               }
			
 
				             }
			
 
				+            setTimeout(1000)
			
 
				+            // value 是一个 Uint8Array
			
 
				           }
			
 
				-          setTimeout(1000)
			
 
				-          // value 是一个 Uint8Array
			
 
				+          await port.close();
			
 
				+        } else {
			
 
				+          console.log('the Web Serial API is not supported.', navigator);
			
 
				         }
			
 
				-        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
			
 
				+      },
			
 
				+      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){
			
 
				+      },
			
 
				+      typeChange(e) {
			
 
				 
			
 
				-    },
			
 
				-    contractNoChange(e){
			
 
				-      for(let i = 0 ; i < this.deptBudgetList1.length ; i ++){
			
 
				-        if(this.deptBudgetList1[i].inOutTaskNo == e){
			
 
				-          this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
			
 
				-          return
			
 
				+      },
			
 
				+      contractNoChange(e) {
			
 
				+        for (let i = 0; i < this.deptBudgetList1.length; i++) {
			
 
				+          if (this.deptBudgetList1[i].inOutTaskNo == e) {
			
 
				+            this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-      for (var i = 0; i < this.outContractNo.length; i++) {
			
 
				-        if (this.outContractNo[i].contractNo == e) {
			
 
				-             if (this.outContractNo[i].inOutType == '销售出库') {
			
 
				+        for (var i = 0; i < this.outContractNo.length; i++) {
			
 
				+          if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
			
 
				+            if (this.outContractNo[i].inOutType == '销售出库') {
			
 
				               this.deptBudgetList.inOutTypeKey = 1
			
 
				             } else if (this.outContractNo[i].inOutType == '移库出库') {
			
 
				               this.deptBudgetList.inOutTypeKey = 3
			
@@ -663,1072 +491,1162 @@ export default {
 
				               this.deptBudgetList.inOutTypeKey = 4
			
 
				             } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
			
 
				               this.deptBudgetList.inOutTypeKey = 5
			
 
				-            } else if (this.detailData.inOutType == '采购出库') {
			
 
				+            } else if (this.outContractNo[i].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
			
 
				+            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].deliverType == '1') {
			
 
				+              this.carstatus = true
			
 
				+            } else {
			
 
				+              this.carstatus = false
			
 
				+            }
			
 
				+            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
			
 
				+      },
			
 
				+      contractNoChange1(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.outContractNo[i].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
			
 
				+            }
			
 
				           }
			
 
				-        })
			
 
				-      } 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
			
 
				+        }
			
 
				+      },
			
 
				+      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
			
 
				           }
			
 
				-        })
			
 
				-      } 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 > 200000 ||
			
 
				-        (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
			
 
				-        ) {
			
 
				+      },
			
 
				+      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: '质检员姓名长度错误！',
			
 
				+            message: '货名不能为空',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
			
 
				+        if (this.information == '毛重检斤' && !this.deptBudgetList.grossWeight) {
			
 
				           this.$message({
			
 
				-            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)
			
 
				-        ) {
			
 
				+        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: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            message: '毛重输入错误',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-
			
 
				-      //杂质
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
			
 
				+        if (this.information == '皮重检斤' && !this.deptBudgetList.tare) {
			
 
				           this.$message({
			
 
				-            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)
			
 
				-        ) {
			
 
				+        if (this.information == '皮重检斤' && (
			
 
				+            this.deptBudgetList.tare < 0 ||
			
 
				+            this.deptBudgetList.tare > 200000 ||
			
 
				+            (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
			
 
				+              String(this.deptBudgetList.tare).length -
			
 
				+              (String(this.deptBudgetList.tare).indexOf('.') + 1) >
			
 
				+              3))) {
			
 
				           this.$message({
			
 
				-            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            message: '皮重输入错误',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-      //霉变
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
			
 
				+
			
 
				+        if (!this.deptBudgetList.carNo) {
			
 
				           this.$message({
			
 
				-            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)
			
 
				-        ) {
			
 
				+        if (this.deptBudgetList.carNo.length > 7) {
			
 
				           this.$message({
			
 
				-            message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            message: '车牌号输入错误,请输入7个字符之内',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-
			
 
				-      //热损伤
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.jiaorenli) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
			
 
				+        if (!this.deptBudgetList.contractNo) {
			
 
				           this.$message({
			
 
				-            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 -
			
 
				+        // 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.jiaorenli
			
 
				-              ).indexOf('.') +
			
 
				+                  this.deptBudgetList.warehouseInOutDetail.waterContent
			
 
				+                ).indexOf('.') +
			
 
				                 1) >
			
 
				               2)
			
 
				-        ) {
			
 
				-          this.$message({
			
 
				-            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				-            type: 'warning',
			
 
				-          })
			
 
				-          return
			
 
				+          ) {
			
 
				+            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.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.imperfectGrain < 1 ||
			
 
				-          this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
			
 
				-          (String(
			
 
				-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain
			
 
				-          ).indexOf('.') != -1 &&
			
 
				-            String(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)
			
 
				+        //霉变
			
 
				+        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.imperfectGrain
			
 
				-              ).indexOf('.') +
			
 
				+                  this.deptBudgetList.warehouseInOutDetail.mildewGrain
			
 
				+                ).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
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+              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
			
 
				-        ) {
			
 
				+
			
 
				+        //热损伤
			
 
				+        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.skinInspector = sessionStorage.getItem('ws-pf_staffName')
			
 
				+                this.deptBudgetList.inOutFlag = 1
			
 
				+                this.deptBudgetList.pcFlag = 1
			
 
				+                this.deptBudgetList.statusFlag = 1
			
 
				+                his.deptBudgetList.grossWeight /= 1000
			
 
				+                this.deptBudgetList.tare /= 1000
			
 
				+                this.deptBudgetList.netWeight = this.deptBudgetList.netWeight.toFixed(2)
			
 
				+                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: '容重输入错误',
			
 
				+            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.skinInspector = sessionStorage.getItem('ws-pf_staffName')
			
 
				-              this.deptBudgetList.inOutFlag = 1
			
 
				-              this.deptBudgetList.pcFlag = 1
			
 
				-              this.deptBudgetList.statusFlag = 1
			
 
				-              his.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
			
 
				-            }
			
 
				+        if (!this.deptBudgetList.grossWeight) {
			
 
				+          this.$message({
			
 
				+            message: '毛重不能为空！',
			
 
				+            type: 'warning',
			
 
				           })
			
 
				-        })
			
 
				-        .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 > 5000000 ||
			
 
				-        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
			
 
				-          String(this.deptBudgetList.grossWeight).length -
			
 
				+          return
			
 
				+        }
			
 
				+        if (
			
 
				+          this.deptBudgetList.grossWeight <= 0 ||
			
 
				+          this.deptBudgetList.grossWeight > 5000000 ||
			
 
				+          (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 > 500000 ||
			
 
				-        (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 >= 5000000
			
 
				-      ) {
			
 
				-        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 > 50
			
 
				-      ) {
			
 
				-        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: '质检员姓名长度错误！',
			
 
				+            message: '毛重输入错误',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.waterContent)) {
			
 
				+        if (!this.deptBudgetList.tare) {
			
 
				           this.$message({
			
 
				-            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.deptBudgetList.tare < 0 ||
			
 
				+          this.deptBudgetList.tare > 500000 ||
			
 
				+          (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
			
 
				+            String(this.deptBudgetList.tare).length -
			
 
				+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
			
 
				+            3)
			
 
				         ) {
			
 
				           this.$message({
			
 
				-            message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            message: '皮重输入错误',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-
			
 
				-      //杂质
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.impurity) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.impurity)) {
			
 
				+        if (!this.deptBudgetList.netWeight) {
			
 
				           this.$message({
			
 
				-            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.deptBudgetList.netWeight <= 0 ||
			
 
				+          this.deptBudgetList.netWeight >= 5000000
			
 
				         ) {
			
 
				           this.$message({
			
 
				-            message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            message: '净重输入错误！',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-      //霉变
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.mildewGrain) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.mildewGrain)) {
			
 
				+        if (!this.deptBudgetList.grade) {
			
 
				           this.$message({
			
 
				-            message: '霉变粒（%）非数字!',
			
 
				+            message: '品级不能为空！',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				+        if (this.deptBudgetList.type == '潮粮' && !this.deptBudgetList.buckleWeightRatio) {
			
 
				+          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.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: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				-            type: 'warning',
			
 
				+            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.warehouseInOutDetail.jiaorenli) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.jiaorenli)) {
			
 
				+        if (!this.deptBudgetList.agent) {
			
 
				           this.$message({
			
 
				-            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.deptBudgetList.agent.length < 2 ||
			
 
				+          this.deptBudgetList.agent.length > 10
			
 
				         ) {
			
 
				           this.$message({
			
 
				-            message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            message: '经办人姓名输入有误！',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-
			
 
				-      //不完善粒（%）
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
			
 
				+        if (!this.deptBudgetList.inOutDate) {
			
 
				           this.$message({
			
 
				-            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.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.deptBudgetList.carNo.length < 6 &&
			
 
				+          this.deptBudgetList.carNo.length <= 8
			
 
				         ) {
			
 
				           this.$message({
			
 
				-            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
			
 
				+            message: '车牌号输入有误！',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-      //容重
			
 
				-      if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
			
 
				-        if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
			
 
				+        if (!this.deptBudgetList.contractNo) {
			
 
				           this.$message({
			
 
				-            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
			
 
				+        if (
			
 
				+          this.deptBudgetList.contractNo.length < 6 ||
			
 
				+          this.deptBudgetList.contractNo.length > 50
			
 
				         ) {
			
 
				           this.$message({
			
 
				-            message: '容重输入错误',
			
 
				+            message: '合同编号输入有误！',
			
 
				             type: 'warning',
			
 
				           })
			
 
				           return
			
 
				         }
			
 
				-      }
			
 
				-      this.$confirm(`确定提交出库信息`, {
			
 
				-        cancelButtonText: '取消',
			
 
				-        confirmButtonText: '确定',
			
 
				-        type: 'warning',
			
 
				-      }).then(() => {
			
 
				-        this.$refs.deptBudgetList.validate((valid) => {
			
 
				-          if (valid) {
			
 
				-             this.deptBudgetList.grossWeight /= 1000
			
 
				-                this.deptBudgetList.tare /= 1000
			
 
				-                this.deptBudgetList.netWeight /= 1000
			
 
				-                this.deptBudgetList.pureWeight /= 1000
			
 
				-                this.deptBudgetList.deductionAmount *= 1000
			
 
				-                this.deptBudgetList.deductionWeight /= 1000
			
 
				-            this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				-            this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
			
 
				-            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
			
 
				+        //自检员
			
 
				+        if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
			
 
				+          if (
			
 
				+            this.deptBudgetList.warehouseInOutDetail.qualityInspector.length <
			
 
				+            2 ||
			
 
				+            this.deptBudgetList.warehouseInOutDetail.qualityInspector.length > 10
			
 
				+          ) {
			
 
				+            this.$message({
			
 
				+              message: '质检员姓名长度错误！',
			
 
				+              type: 'warning',
			
 
				+            })
			
 
				+            return
			
 
				           }
			
 
				-        })
			
 
				-      })
			
 
				-    },
			
 
				-    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
			
 
				+        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
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    selectstorageType(e) {
			
 
				-      for (var i = 0; i < this.deliveryType.length; i++) {
			
 
				-        if (this.deliveryType[i].constValue == e) {
			
 
				-          this.deptBudgetList.inOutTypeKey = this.deliveryType[i].constKey
			
 
				+
			
 
				+        //杂质
			
 
				+        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
			
 
				+          }
			
 
				         }
			
 
				-      }
			
 
				-    },
			
 
				-    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
			
 
				+        //热损伤
			
 
				+        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.grossWeight /= 1000
			
 
				+              this.deptBudgetList.tare /= 1000
			
 
				+              this.deptBudgetList.netWeight /= 1000
			
 
				+              this.deptBudgetList.pureWeight /= 1000
			
 
				+              this.deptBudgetList.deductionAmount *= 1000
			
 
				+              this.deptBudgetList.deductionWeight /= 1000
			
 
				+              this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
			
 
				+              this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
			
 
				+              this.deptBudgetList.inOutFlag = 1
			
 
				+              this.deptBudgetList.statusFlag = 3
			
 
				+              addstorageputList(this.deptBudgetList)
			
 
				+                .toPromise()
			
 
				+                .then((response) => {
			
 
				+                  this.$message.success('添加成功')
			
 
				+                  this.$router.push({
			
 
				+                    path: 'warehouseManagementList'
			
 
				+                  })
			
 
				+                }).catch((response) => {
			
 
				+                    this.deptBudgetList.grossWeight = Math.round(this.deptBudgetList.grossWeight*1000)
			
 
				+                    this.deptBudgetList.tare = Math.round(this.deptBudgetList.tare*1000)
			
 
				+                    this.deptBudgetList.netWeight = Math.round(this.deptBudgetList.netWeight*1000)
			
 
				+                    this.deptBudgetList.pureWeight = Math.round(this.deptBudgetList.pureWeight*1000)
			
 
				+                    this.deptBudgetList.deductionAmount = Math.round(this.deptBudgetList.deductionAmount/1000)
			
 
				+                    this.deptBudgetList.deductionWeight = Math.round(this.deptBudgetList.deductionWeight*1000)
			
 
				+                    })
			
 
				+            } 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
			
 
				+          ).toFixed(2)
			
 
				+        }
			
 
				+      },
			
 
				+      grossWeightchange(e) {
			
 
				+        if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
			
 
				+          this.deptBudgetList.netWeight = Number(
			
 
				+            this.deptBudgetList.grossWeight - this.deptBudgetList.tare
			
 
				+          ).toFixed(2)
			
 
				+        }
			
 
				+      },
			
 
				+      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'
			
 
				           })
			
 
				-        //类型
			
 
				-        pullDown({ constId: 'CON6' })
			
 
				           .toPromise()
			
 
				           .then((response) => {
			
 
				-            this.deliveryType = 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
			
 
				           })
			
 
				-      } else if (this.deptBudgetList.warehouseType == 2) {
			
 
				-        goodsnameXiala({ baseId: this.deptBudgetList.warehouseId })
			
 
				           .toPromise()
			
 
				           .then((response) => {
			
 
				-            this.goodnameList = response
			
 
				+            this.outContractNo = response
			
 
				+          })
			
 
				+        //经办人
			
 
				+        getstaff({
			
 
				+            compId: sessionStorage.getItem('ws-pf_compId'),
			
 
				+            warehouseId: this.deptBudgetList.baseId
			
 
				           })
			
 
				-        pullDown({ constId: 'WARE2' })
			
 
				           .toPromise()
			
 
				           .then((response) => {
			
 
				-            this.deliveryType = response
			
 
				+            // this.agent = response
			
 
				+            this.qualityInspectorList = response
			
 
				+            this.options = response
			
 
				+            this.staffList = 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
			
 
				+      },
			
 
				+      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 },
			
 
				-      })
			
 
				+      },
			
 
				+      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() {},
			
 
				     },
			
 
				-    //删除
			
 
				-    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;
			
 
				+  /deep/.basicInformation {
			
 
				+    .ws-info-table {
			
 
				       border: none;
			
 
				     }
			
 
				-    .el-form-item__content {
			
 
				+
			
 
				+    .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>
			
 
				+  .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/workNotification/work.vue
+++ b/src/views/workNotification/work.vue
@@ -359,7 +359,6 @@ export default {
 
				           content.forEach(item => {
			
 
				             //   // if (item.businessType === notificationType.CREW) {
			
 
				             //   //   // 船员管理
			
 
				-            //   //   debugger
			
 
				             //   //   this.number.crew = item.number;
			
 
				             //   //   this.number.sum += parseInt(item.number);
			
 
				             //   // } else if (item.businessType === notificationType.FINANCE) {
			
--- a/src/viewsjs/crew/crewManagement/crewDetailMsg/contractMsg.js
+++ b/src/viewsjs/crew/crewManagement/crewDetailMsg/contractMsg.js
@@ -351,7 +351,6 @@ export default {
 
				             if (this.contractMsgEdit.contractTermEnd === '' || this.contractMsgEdit.contractTermEnd === undefined || this.contractMsgEdit.contractTermEnd === null) {
			
 
				               this.contractMsgEdit.contractTermEnd = 0
			
 
				             }
			
 
				-            // debugger
			
 
				             SeafarerContractSaveEdit(this.contractMsgEdit).toPromise().then(response => {
			
 
				               this.loading = false
			
 
				               EventBus.$emit('success', this.$t('showMessage.saveSuccessfully'))
			
--- a/src/viewsjs/procurement/procurementMaterial/applEmail.js
+++ b/src/viewsjs/procurement/procurementMaterial/applEmail.js
@@ -229,7 +229,6 @@ export default {
 
				   },
			
 
				   mounted () {
			
 
				     // this.getSupplier()
			
 
				-    // debugger
			
 
				     // this.getFileInfo()
			
 
				     // this.exportFile()
			
 
				   },