更新

public/static/payprint1.html

@@ -323,7 +323,7 @@
                                 <td class="col">{{ printData1[index].netWeight}}</td>
                             </tr>
                             <tr class="row">
-                                <td class="col col-bgc">纯重</td>
+                                <td class="col col-bgc">折干净重</td>
                                 <td class="col col-bgc">
                                     单价
                                 </td>
@@ -396,7 +396,7 @@
                                 </td>
                                 <td class="col ">{{ printData1[index].carNo}}</td>
                                 <td class="col " colspan="4">
-                                    质权所有人: 中国建设银行深圳分行
+                                    质权所有人: 吉林银行
                                 </td>
                             </tr>
                             <tr class="row">
@@ -721,7 +721,7 @@
                         <!-- <td class="col">{{ printData.pureWeight}}</td> -->
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">纯重</td>
+                        <td class="col col-bgc">折干净重</td>
                         <td class="col col-bgc">单价</td>
                         <td class="col col-bgc">扣单价</td>
                         <td class="col col-bgc">粮款</td>
@@ -793,7 +793,7 @@
                             {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
                         </td>
                         <td class="col ">{{ printData.carNo}}</td>
-                        <td class="col " colspan="4">质权所有人: 中国建设银行深圳分行</td>
+                        <td class="col " colspan="4">质权所有人: 吉林银行</td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">实付金额</td>
@@ -916,7 +916,7 @@
                         <!-- <td class="col">{{ printData.pureWeight}}</td> -->
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">纯重</td>
+                        <td class="col col-bgc">折干净重</td>
                         <td class="col col-bgc">单价</td>
                         <td class="col col-bgc">扣单价</td>
                         <td class="col col-bgc">粮款</td>
@@ -987,7 +987,7 @@
                             {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
                         </td>
                         <td class="col ">{{ printData.carNo}}</td>
-                        <td class="col " colspan="4">质权所有人: 中国建设银行深圳分行</td>
+                        <td class="col " colspan="4">质权所有人: 吉林银行</td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">实付金额</td>
@@ -1250,7 +1250,7 @@
                 <div>{{printData.netWeight}}</div>
             </div>
             <div class="small-row">
-                <div>纯重</div>
+                <div>折干净重</div>
                 <div>{{printData.pureWeight}}</div>
             </div>
             <div class="small-row">

src/components/balanceAlert.vue

@@ -1,20 +1,21 @@
 <template>
   <div class="content">
-    <div v-if="deptBudgetList.warehouseName=='榆树库'">
+    <div v-if="deptBudgetList.warehouseName == '榆树库'">
       <!-- <el-radio-group @change="radiochange" v-model="radio">
           <el-radio :label="1">大秤</el-radio>
           <el-radio :label="2">小秤</el-radio>
         </el-radio-group> -->
-        <div class="select">
-          <el-select @change="radiochange" v-model="value" placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </div>
+      <div class="select">
+        <el-select @change="radiochange" v-model="value" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
     </div>
     <div class="title" v-if="information.indexOf('毛重') > -1">毛重</div>
     <div class="title" v-else>皮重</div>
@@ -38,25 +39,27 @@ export default {
       param: 9600,
       grossWeightVal: '',
       tareVal: '',
-      radio:1,
-      options: [{
+      radio: 1,
+      options: [
+        {
           value: '1',
           label: '大秤'
-        }, {
+        },
+        {
           value: '2',
           label: '小秤'
-        }],
-        value: '1'
+        }
+      ],
+      value: '1'
     }
   },
   activated() {},
   mounted() {
     console.log(this.deptBudgetList)
-    if(localStorage.getItem('balanceStatus')){
-      this.value=localStorage.getItem('balanceStatus')
+    if (localStorage.getItem('balanceStatus')) {
+      this.value = localStorage.getItem('balanceStatus')
     }
     this.openPort()
-    
   },
   computed: {},
   created() {},
@@ -71,9 +74,9 @@ export default {
         this.$emit('balanceListen', this.tareVal)
       }
     },
-    radiochange(e){
+    radiochange(e) {
       console.log(e)
-      localStorage.setItem('balanceStatus',e)
+      localStorage.setItem('balanceStatus', e)
       // this.openPort()
     },
     async closePort() {
@@ -81,30 +84,25 @@ export default {
       this.reader.cancel()
     },
     async openPort() {
-      console.log(localStorage.getItem('balanceStatus'),this.deptBudgetList.warehouseName)
+      console.log(
+        localStorage.getItem('balanceStatus'),
+        this.deptBudgetList.warehouseName
+      )
       console.log('openPort', navigator)
       if ('serial' in navigator) {
         if (!this.$store.state.app.reader) {
-          if(localStorage.getItem('balanceStatus')){
-            this.value=localStorage.getItem('balanceStatus')
+          if (localStorage.getItem('balanceStatus')) {
+            this.value = localStorage.getItem('balanceStatus')
           }
           // The Web Serial API is supported.
           console.log('the Web Serial API is supported.')
           const port = await navigator.serial.requestPort()
-          if (
-            this.deptBudgetList.warehouseName == '白城内陆港' ||
-            this.deptBudgetList.warehouseName == '肇东金信库'||
-            this.deptBudgetList.warehouseName == '白城鹏羽库'||
-            this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库'||
-            this.deptBudgetList.warehouseName == '洮南向阳乡金昊'||
-            this.deptBudgetList.warehouseName == '佳屹农仓储库'
-          ) {
-            this.param = 1200
-          } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
+          if (this.deptBudgetList.warehouseName == '测试库') {
             this.param = 2400
-          } else if(this.deptBudgetList.warehouseName == '大庆朝阳沟库' ){
-            this.param = 4800
-          }else if(this.deptBudgetList.warehouseName == '榆树库' &&this.value==1){
+          } else if (
+            this.deptBudgetList.warehouseName == '测试库1200' ||
+            this.deptBudgetList.warehouseName == '依安新屯库'
+          ) {
             this.param = 1200
           } else {
             this.param = 9600
@@ -136,17 +134,18 @@ export default {
           // console.log("receData",receData);
           var flag = false
           if (
-              this.deptBudgetList.warehouseName == '克东润津库'&&
-              value.length < 9
-            ) {
-              continue
-            }
+            this.deptBudgetList.warehouseName == '克东润津库' &&
+            value.length < 9
+          ) {
+            continue
+          }
           if (value.length > 2) {
             if (value.length <= 6) {
               // continue
             }
             if (
-              (this.deptBudgetList.warehouseName == '肇东金信库' || this.deptBudgetList.warehouseName == '甘南宏旗库') &&
+              (this.deptBudgetList.warehouseName == '肇东金信库' ||
+                this.deptBudgetList.warehouseName == '甘南宏旗库') &&
               value.length < 10
             ) {
               var start = new Date().getTime()
@@ -154,7 +153,7 @@ export default {
               continue
             }
             if (
-              this.deptBudgetList.warehouseName == '克东瑞信达'&&
+              this.deptBudgetList.warehouseName == '克东瑞信达' &&
               value.length < 10
             ) {
               var start = new Date().getTime()
@@ -170,81 +169,36 @@ export default {
           } else if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
             this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
-            this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'||
-            this.deptBudgetList.warehouseName == '洮南向阳乡金昊'||
-            this.deptBudgetList.warehouseName == '佳屹农仓储库'||
-            (this.deptBudgetList.warehouseName == '榆树库'&&this.value==1)
+            this.deptBudgetList.warehouseName == '测试库' ||
+            this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
+            this.deptBudgetList.warehouseName == '佳屹农仓储库' ||
+            this.deptBudgetList.warehouseName == '测试库1200' ||
+            this.deptBudgetList.warehouseName == '依安新屯库'
           ) {
             console.log('value:', value)
             var start = new Date().getTime()
             while (new Date().getTime() - start < 400) {}
             continue
-          }
-          else if (
-              this.deptBudgetList.warehouseName == '克东瑞信达'&&
-              value.length < 10
-            ) {
-              var start = new Date().getTime()
-              while (new Date().getTime() - start < 30) {}
-              continue
-            }
-            var zzz = ''
-            for (var i = 0; i < value.length; i++) {
-              zzz += String.fromCharCode(value[i])
-            }
-            console.log('value23:', value)
-            console.log('valuezzz:', zzz)
-          if (
-            this.deptBudgetList.warehouseName &&
-            (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
-              this.deptBudgetList.warehouseName == '山东园丰库' ||
-              this.deptBudgetList.warehouseName == '克东千红库' ||
-              this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
-              this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
-              this.deptBudgetList.warehouseName == '龙江金信库' ||
-              this.deptBudgetList.warehouseName == '白城内陆港' ||
-              this.deptBudgetList.warehouseName == '白城鹏羽库' ||
-              this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
-              this.deptBudgetList.warehouseName == '杜尔伯特家禾库' ||
-              this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
-              this.deptBudgetList.warehouseName == '洮南光明储备库' ||
-              this.deptBudgetList.warehouseName == '甘南林峰库' ||
-              this.deptBudgetList.warehouseName == '肇东金信库' ||
-              this.deptBudgetList.warehouseName == '呼兰大金仓'||
-              this.deptBudgetList.warehouseName == '克东润津库'||
-              this.deptBudgetList.warehouseName == '洮南新友谊兴旺库'||
-              this.deptBudgetList.warehouseName == '通榆瑞祥源库'||
-              this.deptBudgetList.warehouseName == '榆树民胜库'||
-              this.deptBudgetList.warehouseName == '榆树库'||
-              this.deptBudgetList.warehouseName == '洮南蛟流河烘干塔'||
-              this.deptBudgetList.warehouseName == '万马库'||
-              this.deptBudgetList.warehouseName == '克东瑞信达'||
-              this.deptBudgetList.warehouseName == '佳屹农仓储库')
+          } else if (
+            this.deptBudgetList.warehouseName == '克东瑞信达' &&
+            value.length < 10
           ) {
-            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.indexOf('毛重') > -1) {
-              if (parseInt(result) || parseInt(result) == 0) {
-                this.grossWeightVal = parseInt(result)
-              }
-            } else {
-              if (parseInt(result) || parseInt(result) == 0) {
-                this.tareVal = parseInt(result)
-              }
-            }
-          } else 
+            var start = new Date().getTime()
+            while (new Date().getTime() - start < 30) {}
+            continue
+          }
+          var zzz = ''
+          for (var i = 0; i < value.length; i++) {
+            zzz += String.fromCharCode(value[i])
+          }
+          console.log('value23:', value)
+          console.log('valuezzz:', zzz)
+
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '顺诚粮库' ||
-              this.deptBudgetList.warehouseName == '鲅鱼圈金信库'|
-              this.deptBudgetList.warehouseName == '大庆朝阳沟库')
+              (this.deptBudgetList.warehouseName == '鲅鱼圈金信库') |
+                (this.deptBudgetList.warehouseName == '大庆朝阳沟库'))
           ) {
             for (var i = value.length - 1; i >= 0; i--) {
               var tmp = String.fromCharCode(value[i])
@@ -265,101 +219,28 @@ export default {
                 this.tareVal = parseInt(result)
               }
             }
-          } else{
-
-            if (value.length > 10) {
-              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
-                //   // }
-                //   // flag1 = true
-                //   if (i == 0) {
-                //     this.result1 = tmp + '0'
-                //   }
-                // }
-                // else{
-                //   if (tmp == String.fromCharCode(32)) {
-                //     flag = true
-                //   }
-                // }
-                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
-                  // )
-                ) {
-                  if (i > 0 && value[i] == 48 && value[i - 1] == 32 && result) {
-                    break
-                  } else {
-                    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 (i == 0) {
-                //     this.result1 = tmp + '0'
-                //   }
-                // }
-              }
-            }
-
-            if (this.information.indexOf('毛重') > -1) {
-              if (parseInt(result) || parseInt(result) == 0) {
-                this.grossWeightVal = parseInt(result + this.result1)
+          } else {
+            for (var i = 0; i < value.length; i++) {
+              var tmp = String.fromCharCode(value[i])
+              if (tmp == '+') {
+                flag = true
               }
-            } else {
-              if (parseInt(result) || parseInt(result) == 0) {
-                this.tareVal = parseInt(result + this.result1)
+              if (flag && result.length < 6 && tmp != '+') {
+                result += tmp
               }
             }
           }
-          // else {
-          //   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.indexOf('毛重') > -1) {
-          //     if (parseInt(result) || parseInt(result) == 0) {
-          //       this.grossWeightVal = parseInt(result)
-          //     }
-          //   } else {
-          //     if (parseInt(result) || parseInt(result) == 0) {
-          //       this.tareVal = parseInt(result)
-          //     }
-          //   }
-          // }
-          // setTimeout(1000)
-          // value 是一个 Uint8Array
+          if (this.information.indexOf('毛重') > -1) {
+            if (parseInt(result) || parseInt(result) == 0) {
+              this.grossWeightVal = parseInt(result)
+            }
+          } else {
+            if (parseInt(result) || parseInt(result) == 0) {
+              this.tareVal = parseInt(result)
+            }
+          }
         }
         await port.close()
-      } else {
-        // console.log('the Web Serial API is not supported.', navigator)
       }
     }
   }
@@ -367,9 +248,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/.el-radio-group{
-  position:absolute;
-  top:29px;
+/deep/.el-radio-group {
+  position: absolute;
+  top: 29px;
 }
 .content {
   height: 350px;
@@ -408,7 +289,7 @@ export default {
   text-align: right;
   margin-bottom: 20px;
 }
-.select{
+.select {
   position: absolute;
   left: 20px;
 }

src/router/index.js

@@ -98,7 +98,8 @@ export const constantRoutes = [
           affix: true,
           auth: 'workTask',
           _title:'任务'
-        }
+        },
+        hidden: true
       },
       {
         path: 'message',
@@ -111,9 +112,11 @@ export const constantRoutes = [
           affix: true,
           auth: 'workInformation',
           _title:'消息'
-        }
+        },
+        hidden: true
       }
-    ]
+    ],
+    hidden: true
   }
 ]
 

src/views/contractManagement/acquisitionContractAdd.vue

@@ -16,7 +16,7 @@
         <el-row>
         <el-col :span="12">
         <p style="color: #8890b1">
-          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
+          “<span style="color:red">*</span>” 标记的条目提交后不可修改。
         </p>
         </el-col>
       <el-col :span="12" style='text-align:right;'>
@@ -50,10 +50,10 @@
         <ws-form-item  label="合同提示" span="1" prop="contractNo" >
           <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
         </ws-form-item>
-        <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
+        <!-- <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
-        </ws-form-item>
+        </ws-form-item> -->
         <!--结算方式-->
         <ws-form-item label="收购方" span="1" prop="buyer" class="readonly">
           <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
@@ -69,74 +69,19 @@
         <ws-form-item label="卖方" span="1" prop="seller">
           <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" />
         </ws-form-item>
-        <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-          <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
-          <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
-          <!-- <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 v-if="deptBudgetList.transactionSubject == '合营'" 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>
-             -->
-            <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
-            @change="jointSelect" filterable clearable>
-            <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
-              :value="item.customerName" />
-          </el-select>
-        </ws-form-item>
-        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
-          <ws-input v-model="deptBudgetList.jointVentureMarkup" placeholder="请输入合营加价" maxlength="3"
-            size="small" />
-        </ws-form-item>
-        <!--交货日期（起）-->
-        <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
-          <ws-date-picker v-model="deptBudgetList.deliveryDateStart" type="date" placeholder="请选择交货日期（起）"
-            value-format="yyyy-MM-dd" />
-        </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="sellerPhone">
-          <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" />
-        </ws-form-item>
-         <!--交货日期（止）-->
-        <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
-          <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
-            value-format="yyyy-MM-dd" />
-        </ws-form-item>
-        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
-          <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
-          <el-autocomplete class="inline-input" v-model="deptBudgetList.jointPhone" :fetch-suggestions="querySearch4"
-            placeholder="请输入合营方电话" @select="handleSelect"></el-autocomplete>
-        </ws-form-item>
-         <!--价格类型-->
-          <ws-form-item label="价格类型" span="1" prop="priceType">
-            <ws-select v-model="deptBudgetList.priceType" placeholder="请选择价格类型" @change="selectpriceType">
-              <ws-option v-for="item in priceTypeList" :key="item" :label="item" :value="item" />
-            </ws-select>
-          </ws-form-item>
-        <!--合同单价（元/吨）-->
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价收购'">
-          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
-            maxlength="100" size="small" />
-        </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="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="overShort">
           <ws-input v-model="deptBudgetList.overShort" placeholder="请输入溢短装比例（%）" maxlength="100" size="small" />
@@ -146,10 +91,6 @@
           <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-info-table>
       <div class="wenzi">
         <h3>货物信息</h3>
@@ -211,50 +152,6 @@
         </ws-form-item>
       </ws-info-table>
 
-      <div class="wenzi">
-        <h3>流程信息</h3>
-      </div>
-      <!--流程信息-->
-
-      <ws-info-table>
-        <!--已付款（元）-->
-        <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.mildewGrain" placeholder="请输入已付款（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-
-        <!--已开发票（元）-->
-        <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.goodsName" placeholder="请输入已开发票（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-
-        <!--费用支出（元）-->
-        <ws-form-item label="费用支出（元）" span="1" prop="waterContent">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.waterContent" placeholder="请输入费用支出（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-
-        <!--未开发票（元）-->
-        <ws-form-item label="未开发票（元）" span="1" prop="impurity">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.impurity" placeholder="请输入未开发票（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-        <!--双章原件回收情况-->
-        <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-          <ws-select v-model="deptBudgetList.contractProcessInfo.grade" placeholder="" class="typeselect"
-            @change="selectChapterTwo">
-            <ws-option v-for="item in ChapterTwoList" :key="item.constKey" :label="item.constValue"
-              :value="item.constValue" />
-          </ws-select>
-        </ws-form-item>
-        <!--已完成发货量（吨）-->
-        <ws-form-item label="已完成发货量（吨）" span="1" prop="imperfectGrain">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.imperfectGrain" placeholder="请输入已完成发货量（吨）"
-            maxlength="100" size="small" />
-        </ws-form-item>
-      </ws-info-table>
-
       <div class="wenzi">
         <h3>备注信息</h3>
       </div>
@@ -790,22 +687,6 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-       if(this.deptBudgetList.transactionSubject == '合营'){
-        if (!this.deptBudgetList.jointVentureParties) {
-          this.$message({
-            message: '请输入合营方名称！',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.deptBudgetList.jointVentureParties.length > 30) {
-          this.$message({
-            message: '合营方名称长度不符合要求,请输入30个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
-       }
         if(this.deptBudgetList.transactionSubject == '自营'){
           delete this.deptBudgetList.jointVentureParties
           delete this.deptBudgetList.jointPhone
@@ -825,37 +706,6 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if(this.deptBudgetList.transactionSubject == '合营'){
-        if (!this.deptBudgetList.jointPhone) {
-          this.$message({
-            message: '请输入合营方电话！',
-            type: 'warning',
-          })
-          return
-        }
-        if(!this.deptBudgetList.jointVentureMarkup&&this.deptBudgetList.jointVentureMarkup!=0){
-          this.$message({
-            message: '请输入合营加价！',
-            type: 'warning',
-          })
-          return
-        }
-        if(this.deptBudgetList.jointVentureMarkup<0||this.deptBudgetList.jointVentureMarkup>100){
-          this.$message({
-            message: '合营加价输入错误！',
-            type: 'warning',
-          })
-          return
-        }
-       }
-        
-        // if (isNaN(this.deptBudgetList.sellerPhone)) {
-        //   this.$message({
-        //     message: '输入卖方电话有误！',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         
         if (!this.deptBudgetList.weight) {
           this.$message({
@@ -871,7 +721,7 @@ import { isUndefined } from 'xe-utils/methods'
             (String(this.deptBudgetList.weight).indexOf('.') + 1) >
             3) ||
           this.deptBudgetList.weight < 0 ||
-          this.deptBudgetList.weight > 200000
+          this.deptBudgetList.weight > 20000000
         ) {
           this.$message({
             message: '输入重量有误！',
@@ -879,13 +729,6 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateStart) {
-          this.$message({
-            message: '请选择交货日期（起）',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.overShort) {
           this.$message({
             message: '请输入溢短装！',
@@ -908,101 +751,7 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateEnd) {
-          this.$message({
-            message: '请选择交货日期（止）',
-            type: 'warning',
-          })
-          return
-        }
-        //时间
-        if (
-          new Date(this.deptBudgetList.deliveryDateStart).getTime() >
-          new Date(this.deptBudgetList.deliveryDateEnd).getTime()
-        ) {
-          this.$message({
-            message: '交货日期（止）选择错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.priceType) {
-          this.$message({
-            message: '请选择价格类型',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.deptBudgetList.priceType == '定价收购') {
-          if (!this.deptBudgetList.unitContractPrice) {
-            this.$message({
-              message: '请输入合同单价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.unitContractPrice) ||
-            (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.unitContractPrice).length -
-              (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
-              2) ||
-            this.deptBudgetList.unitContractPrice <= 0 ||
-            this.deptBudgetList.unitContractPrice > 10000
-          ) {
-            this.$message({
-              message: '合同单价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.totalContractPrice) {
-            this.$message({
-              message: '请输入合同总价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.totalContractPrice) ||
-            (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.totalContractPrice).length -
-              (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
-                1) >
-              2) ||
-            this.deptBudgetList.totalContractPrice <= 0 ||
-            this.deptBudgetList.totalContractPrice > 1000000000
-          ) {
-            this.$message({
-              message: '合同总价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
-        }
         
-        if (!this.deptBudgetList.signingDate) {
-          this.$message({
-            message: '请选择签订日期',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          isNaN(this.deptBudgetList.finalTradingVolume) ||
-          (String(this.deptBudgetList.finalTradingVolume).indexOf('.') != -1 &&
-            String(this.deptBudgetList.finalTradingVolume).length -
-            (String(this.deptBudgetList.finalTradingVolume).indexOf('.') + 1) >
-            3) ||
-          this.deptBudgetList.finalTradingVolume < 0 ||
-          this.deptBudgetList.finalTradingVolume > 200000
-        ) {
-          this.$message({
-            message: '最终实际成交量有误！',
-            type: 'warning',
-          })
-          return
-        }
         //货物信息
         if (!this.deptBudgetList.contractGoodsInfo.goodsName) {
           this.$message({
@@ -1011,13 +760,7 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
-          this.$message({
-            message: '请输入水分',
-            type: 'warning',
-          })
-          return
-        }
+        
         if (
           this.deptBudgetList.contractGoodsInfo.waterContent &&
           String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
@@ -1039,219 +782,7 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.impurity) {
-        //   this.$message({
-        //     message: '请输入杂质',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   this.deptBudgetList.contractGoodsInfo.impurity &&
-        //   String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
-        //   String(this.deptBudgetList.contractGoodsInfo.impurity).length -
-        //   (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-        //   2 || this.deptBudgetList.contractGoodsInfo.impurity > 40 || this.deptBudgetList.contractGoodsInfo.impurity < 0
-        // ) {
-        //   this.$message({
-        //     message: '杂质输入错误',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
-        //   this.$message({
-        //     message: '请输入容重',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
-        //     String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
-        //     String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
-        //     (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-        //     2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo
-        //   .bulkDensity < 0
-        // ) {
-        //   this.$message({
-        //     message: '容重输入错误',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
-        //   this.$message({
-        //     message: '请输入霉变粒',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-        //   (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-        //       '.'
-        //     ) != -1 &&
-        //     String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
-        //     (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-        //         '.'
-        //       ) +
-        //       1) >
-        //     2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
-        //     .mildewGrain < 0)
-        // ) {
-        //   this.$message({
-        //     message: '霉变粒输入错误',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
-        //   this.$message({
-        //     message: '请输入热损伤',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-        //   (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
-        //     -1 &&
-        //     String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
-        //     (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf(
-        //         '.'
-        //       ) +
-        //       1) >
-        //     2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
-        //     .jiaorenli < 0)
-        // ) {
-        //   this.$message({
-        //     message: '热损伤输入错误',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
-        //   this.$message({
-        //     message: '请输入不完善粒',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-        //   (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
-        //       '.'
-        //     ) != -1 &&
-        //     String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
-        //     (String(
-        //         this.deptBudgetList.contractGoodsInfo.imperfectGrain
-        //       ).indexOf('.') +
-        //       1) >
-        //     2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
-        //     .imperfectGrain < 0)
-        // ) {
-        //   this.$message({
-        //     message: '不完善粒输入错误',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
-        //     (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||
-        //   (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
-        //     '.'
-        //   ) != -1 &&
-        //     String(this.deptBudgetList.contractProcessInfo.goodsNameKey).length -
-        //       (String(
-        //         this.deptBudgetList.contractProcessInfo.goodsNameKey
-        //       ).indexOf('.') +
-        //         1) >
-        //       2)
-        // ) {
-        //   this.$message({
-        //     message: '合同收入金额输入错误',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        if (
-          (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
-          (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.waterContent).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.waterContent
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '费用支出输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractProcessInfo.goodsName > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.goodsName < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.goodsName).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.goodsName).length -
-            (String(this.deptBudgetList.contractProcessInfo.goodsName).indexOf(
-                '.'
-              ) +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '已开发票金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractProcessInfo.impurity > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.impurity < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.impurity).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.impurity).length -
-            (String(this.deptBudgetList.contractProcessInfo.impurity).indexOf(
-                '.'
-              ) +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '未开发票金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (!this.deptBudgetList.contractProcessInfo.mildewGrain > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.mildewGrain < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.mildewGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.mildewGrain).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.mildewGrain
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '未回款金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        
         this.$refs.deptBudgetList.validate((valid) => {
           if (valid) {
             if(this.deptBudgetList.personPhone){

src/views/contractManagement/purchaseContract.vue

@@ -137,12 +137,12 @@
         </template>
       </el-table-column>
       <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column width='120' prop="contractExpenditure" label="粮款支出"> </el-table-column>
-      <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
+      <!-- <el-table-column width='120' prop="contractExpenditure" label="粮款支出"> </el-table-column> -->
+      <!-- <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column> -->
 
       <!-- <el-table-column width='130' prop="mildewGrain" label="已付款（元）"> 
       </el-table-column>-->
-      <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
+      <!-- <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column> -->
       <!-- <el-table-column prop="statementUrl" label="结算单">
         <template slot-scope="scope">
           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -152,33 +152,6 @@
           </span>
         </template>
       </el-table-column> -->
-      <el-table-column width='120' prop="goodsNames" label="已开发票 （元）">
-        <template slot-scope="scope">
-          <div v-if="!scope.row.editgoodsNames">
-            <div class="inputChenge">
-              <!-- readonly -->
-              <el-input v-model="scope.row.invoiced" v-if="scope.row.identification1 == 'true'"></el-input>
-              <div v-if="scope.row.identification1 == 'false'" class="inputs">
-                {{ scope.row.invoiced }}
-              </div>
-            </div>
-            <!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/fujian.png" @click="invoiceUploade(scope.row)" alt="" />
-            <span v-if="scope.row.invoiceUrl != null">
-              {{ scope.row.invoiceUrl ? scope.row.invoiceUrl.split(",").length : "" }}
-            </span> -->
-             <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="whether(scope.row)"
-              v-if="scope.row.identification1 == 'false'" alt="" />
-            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification1 == 'true'" @click="varietyClick(scope.row)"></i>
-          </div>
-          <div v-if="scope.row.editgoodsNames">
-            <el-input class="goodsnamesinput" v-model="scope.row.invoiced" placeholder="输入累计开票金额" ></el-input>
-            <i @click="submitgoodsNames(scope.row)" class="el-icon-check"></i>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -208,7 +181,9 @@
             " target="_blank" type="primary" :underline="false" @click="handleExamine(scope.row)"
             >查看</el-link>
             <el-divider direction="vertical"></el-divider>
-            <el-link v-hasPermission="
+            <el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
+              :disabled="(scope.row.approveStatus!=null && scope.row.approveStatus!='发起人撤回')">删除</el-link>
+            <!-- <el-link v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
               :disabled="(scope.row.approveStatus!=null && scope.row.approveStatus!='发起人撤回')">编辑</el-link>
@@ -242,7 +217,7 @@
                 <el-link :disabled="scope.row.amountEdPayable=='他运'" target="_blank" type="primary" :underline="false" @click="handletransport(scope.row)">运输详情</el-link>
               </el-dropdown-item>
               </el-dropdown-menu>
-            </el-dropdown>
+            </el-dropdown> -->
             <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
         </template>
       </el-table-column>

src/views/contractManagement/purchaseContractAdd.vue

@@ -86,10 +86,10 @@
         </ws-form-item>
 
        
-        <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
+        <!-- <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
             <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
             @change="jointSelect" filterable clearable>
@@ -111,9 +111,9 @@
             size="small" />
         </ws-form-item>
         <!--结算方式-->
-        <ws-form-item label="结算方式" span="1" prop="settlementMethod">
+        <!-- <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> -->
         <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"
@@ -125,17 +125,17 @@
               :value="item.customerName" />
           </el-select>
         </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>
-          <el-radio v-model="deptBudgetList.deliverType" label="3">对方送货(临时库)</el-radio>
+        <!-- <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> -->
+          <!-- <el-radio v-model="deptBudgetList.deliverType" label="3">对方送货(临时库)</el-radio> -->
           <!-- <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> -->
          <!--卖方-->
         <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
           <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
@@ -156,11 +156,11 @@
             </ws-select>
           </ws-form-item> -->
            <!-- 发货反馈负责人（多选） -->
-            <ws-form-item label="发货反馈负责人" span="1" prop="agent" v-if="deptBudgetList.deliverType == '2'">
+            <!-- <ws-form-item label="发货反馈负责人" span="1" prop="agent" v-if="deptBudgetList.deliverType == '2'">
               <el-select  v-model="deptBudgetList.agent"  multiple filterable clearable allow-create default-first-option placeholder="请选择经办人"  @change="feedbackLeaderChange" >
                 <el-option v-for="(item,index1) in feedbackLeaders" :key="index1" :label="item.staffName" :value="item.staffName"></el-option>
                 </el-select>
-              </ws-form-item>
+              </ws-form-item> -->
         <!--包装方式-->
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
           <ws-select v-model="deptBudgetList.packingMethod" placeholder="" class="typeselect" :value="value1"
@@ -178,43 +178,7 @@
         </ws-form-item>
 
         <!--验收方式-->
-        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable clearable
-            @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">
-                <span v-if="item.flag == 'delete'"> {{ item.constValue }}</span>
-                <!-- 新增文本框 -->
-                <div style="width: 160px" v-if="item.flag !== 'delete'" @click.stop>
-                  <ws-input v-model="item.constValue" clearable maxlength="10" style="width: 100%"></ws-input>
-                </div>
-              </span>
-              <span style="float: right; color: #8492a6; font-size: 13px">
-                <!-- 对号 -->
-                <i class="el-icon-check" style="line-height: 29px; margin-left: 10px" v-if="item.flag !== 'delete'"
-                  @click.stop="saveClick(item, index)"></i>
-                <!-- 编辑 -->
-                <i class="el-icon-edit" style="line-height: 29px; margin-left: 10px" v-if="item.flag == 'delete'"
-                  @click.stop="editClick(item, index)"></i>
-                <!-- 删除 -->
-                <i class="el-icon-delete" style="line-height: 29px" @click.stop="deleteClick(item, index)"></i>
-              </span>
-            </el-option>
-            <!-- 新增按钮 -->
-            <el-option value="" label="">
-              <div style="
-                  text-align: right;
-                  border-top: 1px solid #dcdfe6;
-                  padding: 5px;
-                ">
-                <ws-button type="primary" @click.stop="addClick">{{
-                  $t('button.add')
-                }}</ws-button>
-              </div>
-            </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" /> -->
@@ -227,19 +191,19 @@
             size="small" />
         </ws-form-item>
         <!--交货日期（起）-->
-        <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
+        <!-- <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
           <ws-date-picker v-model="deptBudgetList.deliveryDateStart" type="date" placeholder="请选择交货日期（起）"
             value-format="yyyy-MM-dd" />
-        </ws-form-item>
+        </ws-form-item> -->
         <!--溢短装（%）-->
         <ws-form-item label="溢短装（%）" span="1" prop="overShort">
           <ws-input v-model="deptBudgetList.overShort" placeholder="请输入溢短装比例（%）" maxlength="100" size="small" />
         </ws-form-item>
         <!--交货日期（止）-->
-        <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
+        <!-- <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
           <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
             value-format="yyyy-MM-dd" />
-        </ws-form-item>
+        </ws-form-item> -->
         <!--价格类型-->
           <ws-form-item label="价格类型" span="1" prop="priceType">
             <ws-select v-model="deptBudgetList.priceType" placeholder="请选择价格类型" @change="selectpriceType">
@@ -262,40 +226,23 @@
           <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_"
-            v-model="selectedOptions"
-            clearable
-            size="large"
-            placeholder="请选择货源所在地区"
-            style="width: 200%"
-            @change="handleChange"
-          /> -->
+        <!-- <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
+         
           <el-button @click="mapInputClick('source')" class='address-btn'>
             {{newSelectedOptions}}
           </el-button>
-        </ws-form-item>
-        <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
+        </ws-form-item> -->
+        <!-- <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
           <ws-input v-model="deptBudgetList.sourceGoods" placeholder="请输入货源详细地址" maxlength="20" size="small" />
-        </ws-form-item>
-        <ws-form-item label="交货所在地区" span="1" prop="sourceGoods">
-          <!-- <el-cascader
-            :options="options_"
-            v-model="selectedOptions1"
-            clearable
-            size="large"
-            placeholder="请选择交货所在地区"
-            style="width: 200%"
-            @change="handleChange1"
-          /> -->
+        </ws-form-item> -->
+        <!-- <ws-form-item label="交货所在地区" span="1" prop="sourceGoods">
           <el-button @click="mapInputClick('deliveryProv')" class='address-btn'>
             {{newSelectedOptions1}}
           </el-button>
         </ws-form-item>
         <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> -->
           <!--签订日期-->
         <ws-form-item label="签订日期" span="1" prop="signingDate" v-show="deptBudgetList.agreementType =='补充协议'">
           <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
@@ -376,50 +323,7 @@
         </ws-form-item>
       </ws-info-table>
 
-      <div class="wenzi">
-        <h3>流程信息</h3>
-      </div>
-      <!--流程信息-->
-
-      <ws-info-table>
-        <!--已付款（元）-->
-        <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.mildewGrain" placeholder="请输入已付款（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-
-        <!--已开发票（元）-->
-        <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.goodsName" placeholder="请输入已开发票（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-
-        <!--费用支出（元）-->
-        <ws-form-item label="费用支出（元）" span="1" prop="waterContent">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.waterContent" placeholder="请输入费用支出（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-
-        <!--未开发票（元）-->
-        <ws-form-item label="未开发票（元）" span="1" prop="impurity">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.impurity" placeholder="请输入未开发票（元）" maxlength="100"
-            size="small" />
-        </ws-form-item>
-        <!--双章原件回收情况-->
-        <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-          <ws-select v-model="deptBudgetList.contractProcessInfo.grade" placeholder="" class="typeselect"
-            @change="selectChapterTwo">
-            <ws-option v-for="item in ChapterTwoList" :key="item.constKey" :label="item.constValue"
-              :value="item.constValue" />
-          </ws-select>
-        </ws-form-item>
-        <!--已完成发货量（吨）-->
-        <ws-form-item label="已完成发货量（吨）" span="1" prop="imperfectGrain">
-          <ws-input v-model="deptBudgetList.contractProcessInfo.imperfectGrain" placeholder="请输入已完成发货量（吨）"
-            maxlength="100" size="small" />
-        </ws-form-item>
-      </ws-info-table>
-
+      
       <div class="wenzi">
         <h3>备注信息</h3>
       </div>
@@ -549,7 +453,7 @@ import { isUndefined } from 'xe-utils/methods'
         ChapterTwoList: [],
         agreementType: '',
         deptBudgetList: {
-          deliverType: '1',
+          deliverType: '2',
           sourceGoods:'',
           placeDelivery:'',
           agreementType: '采购合同',
@@ -666,7 +570,7 @@ import { isUndefined } from 'xe-utils/methods'
       cancelcopy(){
         this.contractNo=''
         this.deptBudgetList={
-          deliverType: '1',
+          deliverType: '2',
           sourceGoods:'',
           placeDelivery:'',
           agreementType: '采购合同',
@@ -862,7 +766,7 @@ import { isUndefined } from 'xe-utils/methods'
       },
       returnsales() {
         this.deptBudgetList =  {
-          deliverType: '1',
+          deliverType: '2',
           sourceGoods:'',
           placeDelivery:'',
           agreementType: '采购合同',
@@ -1126,23 +1030,23 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.settlementMethod) {
-          this.$message({
-            message: '结算方式不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.settlementMethod.length < 1 ||
-          this.deptBudgetList.settlementMethod.length > 20
-        ) {
-          this.$message({
-            message: '结算方式长度不符合要求,请输入1到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.settlementMethod) {
+        //   this.$message({
+        //     message: '结算方式不能为空',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.deptBudgetList.settlementMethod.length < 1 ||
+        //   this.deptBudgetList.settlementMethod.length > 20
+        // ) {
+        //   this.$message({
+        //     message: '结算方式长度不符合要求,请输入1到20个字符之内！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -1185,13 +1089,13 @@ import { isUndefined } from 'xe-utils/methods'
         //   })
         //   return
         // }
-        if (!this.deptBudgetList.acceptanceMethod) {
-          this.$message({
-            message: '请选择验收方式',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.acceptanceMethod) {
+        //   this.$message({
+        //     message: '请选择验收方式',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.weight) {
           this.$message({
             message: '请输入重量！',
@@ -1206,7 +1110,7 @@ import { isUndefined } from 'xe-utils/methods'
             (String(this.deptBudgetList.weight).indexOf('.') + 1) >
             3) ||
           this.deptBudgetList.weight < 0 ||
-          this.deptBudgetList.weight > 200000
+          this.deptBudgetList.weight > 200000000
         ) {
           this.$message({
             message: '输入重量有误！',
@@ -1214,13 +1118,13 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateStart) {
-          this.$message({
-            message: '请选择交货日期（起）',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.deliveryDateStart) {
+        //   this.$message({
+        //     message: '请选择交货日期（起）',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.overShort) {
           this.$message({
             message: '请输入溢短装！',
@@ -1243,24 +1147,24 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateEnd) {
-          this.$message({
-            message: '请选择交货日期（止）',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.deliveryDateEnd) {
+        //   this.$message({
+        //     message: '请选择交货日期（止）',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         //时间
-        if (
-          new Date(this.deptBudgetList.deliveryDateStart).getTime() >
-          new Date(this.deptBudgetList.deliveryDateEnd).getTime()
-        ) {
-          this.$message({
-            message: '交货日期（止）选择错误',
-            type: 'warning',
-          })
-          return
-        }
+        // if (
+        //   new Date(this.deptBudgetList.deliveryDateStart).getTime() >
+        //   new Date(this.deptBudgetList.deliveryDateEnd).getTime()
+        // ) {
+        //   this.$message({
+        //     message: '交货日期（止）选择错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.priceType) {
           this.$message({
             message: '请选择价格类型',
@@ -1306,7 +1210,7 @@ import { isUndefined } from 'xe-utils/methods'
                 1) >
               2) ||
             this.deptBudgetList.totalContractPrice <= 0 ||
-            this.deptBudgetList.totalContractPrice > 1000000000
+            this.deptBudgetList.totalContractPrice > 100000000000
           ) {
             this.$message({
               message: '合同总价输入有误！',
@@ -1315,42 +1219,42 @@ import { isUndefined } from 'xe-utils/methods'
             return
           }
         }
-        if (!this.newSelectedOptions) {
-          this.$message({
-            message: '请选择货源所在地区！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.sourceGoods) {
-          this.$message({
-            message: '请输入货源详细地址！',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.newSelectedOptions) {
+        //   this.$message({
+        //     message: '请选择货源所在地区！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.sourceGoods) {
+        //   this.$message({
+        //     message: '请输入货源详细地址！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
 
-        if (!this.newSelectedOptions1) {
-          this.$message({
-            message: '请选择交货所在地区！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.placeDelivery) {
-          this.$message({
-            message: '请输入交货详细地址！',
-            type: 'warning',
-          })
-          return
-        }
-        if(this.deptBudgetList.deliverType==1&&!this.deptBudgetList.personCharge){
-          this.$message({
-            message: '请选择临时仓库负责人！',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.newSelectedOptions1) {
+        //   this.$message({
+        //     message: '请选择交货所在地区！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.placeDelivery) {
+        //   this.$message({
+        //     message: '请输入交货详细地址！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if(this.deptBudgetList.deliverType==1&&!this.deptBudgetList.personCharge){
+        //   this.$message({
+        //     message: '请选择临时仓库负责人！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.signingDate) {
           this.$message({
             message: '请选择签订日期',
@@ -1358,21 +1262,21 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (
-          isNaN(this.deptBudgetList.finalTradingVolume) ||
-          (String(this.deptBudgetList.finalTradingVolume).indexOf('.') != -1 &&
-            String(this.deptBudgetList.finalTradingVolume).length -
-            (String(this.deptBudgetList.finalTradingVolume).indexOf('.') + 1) >
-            3) ||
-          this.deptBudgetList.finalTradingVolume < 0 ||
-          this.deptBudgetList.finalTradingVolume > 200000
-        ) {
-          this.$message({
-            message: '最终实际成交量有误！',
-            type: 'warning',
-          })
-          return
-        }
+        // if (
+        //   isNaN(this.deptBudgetList.finalTradingVolume) ||
+        //   (String(this.deptBudgetList.finalTradingVolume).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.finalTradingVolume).length -
+        //     (String(this.deptBudgetList.finalTradingVolume).indexOf('.') + 1) >
+        //     3) ||
+        //   this.deptBudgetList.finalTradingVolume < 0 ||
+        //   this.deptBudgetList.finalTradingVolume > 200000
+        // ) {
+        //   this.$message({
+        //     message: '最终实际成交量有误！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         //货物信息
         if (!this.deptBudgetList.contractGoodsInfo.goodsName) {
           this.$message({
@@ -1546,82 +1450,7 @@ import { isUndefined } from 'xe-utils/methods'
         //   })
         //   return
         // }
-        if (
-          (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
-          (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.waterContent).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.waterContent
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '费用支出输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractProcessInfo.goodsName > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.goodsName < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.goodsName).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.goodsName).length -
-            (String(this.deptBudgetList.contractProcessInfo.goodsName).indexOf(
-                '.'
-              ) +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '已开发票金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractProcessInfo.impurity > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.impurity < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.impurity).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.impurity).length -
-            (String(this.deptBudgetList.contractProcessInfo.impurity).indexOf(
-                '.'
-              ) +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '未开发票金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (!this.deptBudgetList.contractProcessInfo.mildewGrain > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.mildewGrain < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.mildewGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.mildewGrain).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.mildewGrain
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '未回款金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        
         this.$refs.deptBudgetList.validate((valid) => {
           if (valid) {
             if(this.deptBudgetList.personPhone){
@@ -1710,7 +1539,7 @@ import { isUndefined } from 'xe-utils/methods'
                 localStorage.setItem('deptBudgetList_data4', JSON.stringify(this.restaurants4));
                 this.$message.success('添加成功')
                 this.deptBudgetList = {
-                  deliverType: '1',
+                  deliverType: '2',
                   sourceGoods:'',
                   placeDelivery:'',
                   agreementType: '采购合同',

src/views/contractManagement/salesContract.vue

@@ -142,66 +142,7 @@
         </template>
       </el-table-column>
       <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column width='120' prop="contractRevenue" label="粮款收入"> </el-table-column>
-      <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
-      <el-table-column width='120' prop="mildewGrain" label="未回款（元）">
-        <template slot-scope="scope">
-          <!-- <span style='color:red;'
-            v-if='scope.row.datestatus && scope.row.invoiced > scope.row.contractRevenue'>{{ scope.row.mildewGrain }}</span>
-          <span v-else>{{ scope.row.mildewGrain }}</span> -->
-           <div class="inputChenge">
-              <!-- readonly -->
-              <el-input v-model="scope.row.mildewGrain" v-if="scope.row.identification == 'true'"></el-input>
-              <div v-if="scope.row.identification == 'false'" class="inputs">
-                {{ scope.row.mildewGrain }}
-              </div>
-            </div>
-           <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="whether(scope.row,1)"
-              v-if="scope.row.identification == 'false'" alt="" />
-            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row,1)"></i>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
-      <!-- <el-table-column prop="statementUrl" label="结算单">
-        <template slot-scope="scope">
-          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png" @click="settlement(scope.row)" alt="" />
-          <span v-if="scope.row.statementUrl != null">
-            {{ scope.row.statementUrl ? scope.row.statementUrl.split(",").length : "" }}
-          </span>
-        </template>
-      </el-table-column> -->
-      <el-table-column width='120' prop="goodsNames" label="已开发票 （元）">
-        <template slot-scope="scope">
-          <div v-if="!scope.row.editgoodsNames" >
-            <!-- <span @dblclick="scope.row.editgoodsNames=true">{{ scope.row.invoiced?scope.row.invoiced:0 }}</span> -->
-             <div class="inputChenge">
-              <!-- readonly -->
-              <el-input v-model="scope.row.invoiced" v-if="scope.row.identification1 == 'true'"></el-input>
-              <div v-if="scope.row.identification1 == 'false'" class="inputs">
-                {{ scope.row.invoiced }}
-              </div>
-            </div>
-            <!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/fujian.png" @click="invoiceUploade(scope.row)" alt="" />
-            <span v-if="scope.row.invoiceUrl != null">
-              {{ scope.row.invoiceUrl ? scope.row.invoiceUrl.split(",").length : "" }}
-            </span> -->
-             <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="whether(scope.row,2)"
-              v-if="scope.row.identification1 == 'false'" alt="" />
-            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification1 == 'true'" @click="varietyClick(scope.row,2)"></i>
-          </div>
-          <div v-if="scope.row.editgoodsNames">
-            <el-input class="goodsnamesinput" v-model="scope.row.invoiced" placeholder="输入累计开票金额" ></el-input>
-            <i @click="submitgoodsNames(scope.row)" class="el-icon-check"></i>
-          </div>
-        </template>
-      </el-table-column>
+      
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
           <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -225,67 +166,8 @@
             " target="_blank" type="primary" :underline="false" @click="handleExamine(scope.row)"
             >查看</el-link>
             <el-divider direction="vertical"></el-divider>
-            <el-link v-hasPermission="
-              `contractManagement.salesContract.salesContractInfo.edit`
-            " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">编辑</el-link>
-              <el-dropdown>
-              <span class="btn_css">•••</span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-hasPermission="
-              `contractManagement.salesContract.salesContractInfo.delete`
-            "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
+            <el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
               :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" >删除</el-link>
-                </el-dropdown-item>
-                <el-dropdown-item v-hasPermission="
-              `contractManagement.salesContract.salesContractInfo.edit`
-            ">
-                  <el-link  target="_blank" type="primary" :underline="false" @click="withdraw(scope.row)"
-              :disabled="scope.row.approveStatus && scope.row.approveStatus=='发起人撤回'||scope.row.status=='已驳回'">撤回</el-link>
-                </el-dropdown-item>
-                <el-dropdown-item v-hasPermission="
-              `contractManagement.salesContract.salesContractInfo.view`
-            ">
-                  <el-link target="_blank" type="primary" :underline="false" @click="handleaudit(scope.row)"
-              :disabled="!scope.row.taskId">审核</el-link>
-                </el-dropdown-item>
-                <el-dropdown-item v-hasPermission="`contractManagement.buyContract.buyContractInfo.view`">
-                <el-link target="_blank" type="primary" :underline="false" @click="handlecost(scope.row)">费用详情</el-link>
-              </el-dropdown-item>
-              <el-dropdown-item v-hasPermission="`contractManagement.buyContract.buyContractInfo.view`">
-                <el-link target="_blank" type="primary" :underline="false" @click="handleprofit(scope.row)">利润详情</el-link>
-              </el-dropdown-item>
-              <el-dropdown-item v-hasPermission="`contractManagement.buyContract.buyContractInfo.view`">
-                <el-link :disabled="scope.row.amountEdPayable=='他运'" target="_blank" type="primary" :underline="false" @click="handletransport(scope.row)">运输详情</el-link>
-              </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-             <!-- <el-button @click="handleExamine(scope.row)"  v-hasPermission="
-              `contractManagement.salesContract.salesContractInfo.view`
-            " type="primary">查看</el-button>
-            <div v-if="
-            (scope.row.approveStatus != '待决策人审核' &&
-              !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
-          " style="display: inline-block">
-          <el-button @click="handleEdit(scope.row)" v-hasPermission="
-                `contractManagement.salesContract.salesContractInfo.edit`
-              " type="primary">编辑</el-button>
-          </div>
-          <div v-if="scope.row.status == '待执行' && !scope.row.approveStatus || scope.row.status == '已驳回'" style="display: inline-block">
-          <el-button v-hasPermission="
-              `contractManagement.salesContract.salesContractInfo.delete`
-            " @click="handleDelete(scope.row)" type="primary">删除</el-button>
-          </div>
-          <div  v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
-          <el-button @click="withdraw(scope.row)" v-hasPermission="
-                            `contractManagement.salesContract.salesContractInfo.edit`
-                          " type="primary">撤回</el-button>
-          </div>
-          <div  v-if="scope.row.taskId" style="display: inline-block">
-          <el-button @click="handleaudit(scope.row)" v-hasPermission="
-                            `contractManagement.salesContract.salesContractInfo.view`
-                          " type="primary">审核</el-button>
-          </div> -->
         </template>
       </el-table-column>
     </el-table>

src/views/contractManagement/salesContractAdd.vue

@@ -47,10 +47,10 @@
           <ws-form-item  label="合同提示" span="1" prop="contractNo" >
             <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
           </ws-form-item>
-          <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
+          <!-- <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
             <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
             @change="jointSelect" filterable clearable>
@@ -63,19 +63,7 @@
           <el-autocomplete class="inline-input" v-model="deptBudgetList.jointPhone" :fetch-suggestions="querySearch4"
             placeholder="请输入合营方电话" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
-          <!--关联合同-->
-          <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
-            <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
-              <ws-option v-for="item in contractNoList" :key="item.id" :label="item.contractNo"
-                :value="item.contractNo"></ws-option>
-            </ws-select>
-          </ws-form-item>
-          <!--补充协议编号-->
-          <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>
+          
           <!--买方-->
           <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
             <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
@@ -91,15 +79,7 @@
           <!-- <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="shippingType">
-          <ws-select v-model="deptBudgetList.shippingType" placeholder="请选择运输方式" >
-            <ws-option label="汽运" value="汽运"></ws-option>
-            <ws-option label="火运" value="火运"></ws-option>
-            <ws-option label="散船" value="散船"></ws-option>
-            <ws-option label="集装箱船" value="集装箱船"></ws-option>
-          </ws-select>
-          <!-- <ws-input v-model="deptBudgetList.shippingType" 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" /> -->
@@ -109,25 +89,20 @@
               :value="item.customerName" />
               </el-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>
-
           <!--买方电话-->
           <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" label="1">我方送货</el-radio>
+          <!-- <ws-form-item label="交货方式" span="1" prop="seller" class="readonly"> -->
+            <!-- <el-radio v-model="deptBudgetList.deliverType" label="1">我方送货</el-radio> -->
               <!--  v-if="deptBudgetList.priceType == '随行就市'" disabled label="1" -->
             <!-- <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio> -->
-            <el-radio v-model="deptBudgetList.deliverType" label="2">对方自提</el-radio>
+            <!-- <el-radio v-model="deptBudgetList.deliverType" label="2">对方自提</el-radio> -->
                <!-- v-if="deptBudgetList.priceType == '随行就市'" disabled label="2" -->
             <!-- <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio> -->
-          </ws-form-item>
+          <!-- </ws-form-item> -->
           <!--卖方电话-->
           <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
             <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
@@ -135,87 +110,20 @@
               placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
           <!-- 收货反馈负责人 -->
-          <ws-form-item label="收货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType == '2'">
+          <!-- <ws-form-item label="收货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType == '2'">
             <el-select v-model="deptBudgetList.feedbackLeader" filterable placeholder="请输入收货反馈负责人" class="typeselect" @change="feedbackLeaderChange">
               <ws-option v-for="(item,index ) in feedbackLeaders" :key="item.staffId" :label="item.staffName" :value="index" />
             </el-select>
-          </ws-form-item>
-          <!--包装方式-->
-          <ws-form-item label="包装方式" span="1" prop="packingMethod">
-            <ws-select v-model="deptBudgetList.packingMethod" placeholder="" class="typeselect"
-              @change="selectpackingMethod">
-              <ws-option v-for="item in packtypeList" :key="item.constKey" :label="item.constValue"
-                :value="item.constValue" />
-            </ws-select>
-          </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-select  v-model="deptBudgetList.transitCompany" placeholder="无" class="typeselect" filterable clearable>
-                <el-option key="0"  label="无" value="无" />
-            <el-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
-              :value="item.customerName" />
-              </el-select>
-          </ws-form-item>
+          </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="acceptanceMethod">
-            <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">
-                  <span v-if="item.flag == 'delete'">
-                    {{ item.constValue }}</span>
-                  <!-- 新增文本框 -->
-                  <div style="width: 160px" v-if="item.flag !== 'delete'" @click.stop>
-                    <ws-input v-model="item.constValue" clearable maxlength="10" style="width: 100%"></ws-input>
-                  </div>
-                </span>
-                <span style="float: right; color: #8492a6; font-size: 13px">
-                  <!-- 对号 -->
-                  <i class="el-icon-check" style="line-height: 29px; margin-left: 10px" v-if="item.flag !== 'delete'"
-                    @click.stop="saveClick(item, index)"></i>
-                  <!-- 编辑 -->
-                  <i class="el-icon-edit" style="line-height: 29px; margin-left: 10px" v-if="item.flag == 'delete'"
-                    @click.stop="editClick(item, index)"></i>
-                  <!-- 删除 -->
-                  <i class="el-icon-delete" style="line-height: 29px" @click.stop="deleteClick(item, index)"></i>
-                </span>
-              </el-option>
-              <!-- 新增按钮 -->
-              <el-option value="" label="">
-                <div style="
-                    text-align: right;
-                    border-top: 1px solid #dcdfe6;
-                    padding: 5px;
-                  ">
-                  <ws-button type="primary" @click.stop="addClick">{{
-                    $t('button.add')
-                  }}</ws-button>
-                </div>
-              </el-option>
-            </el-select>
-          </ws-form-item>
-          <!--交货日期（起）-->
-          <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
-            <ws-date-picker v-model="deptBudgetList.deliveryDateStart" type="date" placeholder="请选择交货日期（起）"
-              value-format="yyyy-MM-dd" />
-          </ws-form-item>
           <!--溢短装（%）-->
           <ws-form-item label="溢短装（%）" span="1" prop="overShort">
             <ws-input v-model="deptBudgetList.overShort" placeholder="请输入溢短装比例（%）" maxlength="100" size="small" />
           </ws-form-item>
-          <!--交货日期（止）-->
-          <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
-            <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
-              value-format="yyyy-MM-dd" />
-          </ws-form-item>
           <!--价格类型-->
           <ws-form-item label="价格类型" span="1" prop="priceType">
             <ws-select v-model="deptBudgetList.priceType" placeholder="请选择价格类型" >
@@ -235,62 +143,23 @@
             <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_"
-              v-model="selectedOptions"
-              clearable
-              size="large"
-              placeholder="请选择货源所在地区"
-              style="width: 200%"
-              @change="handleChange"
-            /> -->
-            <el-button @click="mapInputClick('source')" class="address-btn">
-              {{ newSelectedOptions }}
-            </el-button>
-          </ws-form-item>
-          <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
-            <ws-input v-model="deptBudgetList.sourceGoods" placeholder="请输入货源详细地址" maxlength="20" size="small" />
-          </ws-form-item>
-          <ws-form-item label="交货所在地区" span="1" prop="placeDelivery">
-            <!-- <el-cascader
-              :options="options_"
-              v-model="selectedOptions1"
-              clearable
-              size="large"
-              placeholder="请选择交货所在地区"
-              style="width: 200%"
-              @change="handleChange1"
-            /> -->
-            <el-button @click="mapInputClick('deliveryProv')" class="address-btn">
-              {{ newSelectedOptions1 }}
-            </el-button>
-          </ws-form-item>
-          <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" 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="settlementWeightMethod" class="readonly">
+          <!-- <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly">
           <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> -->
           <!-- <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="collectionDeadline">
+          <!-- <ws-form-item label="收款截止日期" span="1" prop="collectionDeadline">
             <ws-date-picker v-model="deptBudgetList.collectionDeadline" type="date" placeholder="请选择收款截止日期"
               value-format="yyyy-MM-dd" />
-          </ws-form-item>
+          </ws-form-item> -->
         </ws-info-table>
       </ws-form>
     </div>
@@ -358,55 +227,6 @@
       </ws-form>
     </div>
 
-    <div class="wenzi">
-      <h3>流程信息</h3>
-    </div>
-    <div class="center">
-      <ws-form ref="deptBudgetList" :rules="ruleDeptBudget" :model="deptBudgetList">
-        <!--流程信息-->
-
-        <ws-info-table>
-          <!--合同收入（元）-->
-          <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
-            <ws-input v-model="deptBudgetList.contractProcessInfo.goodsNameKey" placeholder="请输入合同收入（元）" maxlength="100"
-              size="small" />
-          </ws-form-item>
-
-          <!--已开发票（元）-->
-          <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
-            <ws-input v-model="deptBudgetList.contractProcessInfo.goodsName" placeholder="请输入已开发票（元）" maxlength="100"
-              size="small" />
-          </ws-form-item>
-
-          <!--费用支出（元）-->
-          <ws-form-item label="费用支出（元）" span="1" prop="waterContent">
-            <ws-input v-model="deptBudgetList.contractProcessInfo.waterContent" placeholder="请输入费用支出（元）" maxlength="100"
-              size="small" />
-          </ws-form-item>
-
-          <!--未开发票（元）-->
-          <ws-form-item label="未开发票（元）" span="1" prop="impurity">
-            <ws-input v-model="deptBudgetList.contractProcessInfo.impurity" placeholder="请输入未开发票（元）" maxlength="100"
-              size="small" />
-          </ws-form-item>
-
-          <!--未回款（元）-->
-          <ws-form-item label="未回款（元）" span="1" prop="mildewGrain">
-            <ws-input v-model="deptBudgetList.contractProcessInfo.mildewGrain" placeholder="请输入未回款（元）" maxlength="100"
-              size="small" />
-          </ws-form-item>
-          <!--双章原件回收情况-->
-          <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-            <ws-select v-model="deptBudgetList.contractProcessInfo.grade" placeholder="" class="typeselect"
-              @change="selectpackingMethod">
-              <ws-option v-for="item in ChapterTwoList" :key="item.constKey" :label="item.constValue"
-                :value="item.constValue" />
-            </ws-select>
-          </ws-form-item>
-        </ws-info-table>
-      </ws-form>
-    </div>
-
     <div class="wenzi">
       <h3>备注信息</h3>
     </div>
@@ -512,7 +332,7 @@
         ChapterTwoList: [],
         deptBudgetList: {
           transitCompany:'无',
-          deliverType: '1',
+          deliverType: '2',
           agreementType: '销售合同',
           finalTradingVolume: 0,
           totalContractPrice: 0,
@@ -621,7 +441,7 @@
         this.contractNo=''
         this.deptBudgetList={
           transitCompany:'无',
-          deliverType: '1',
+          deliverType: '2',
           agreementType: '销售合同',
           finalTradingVolume: 0,
           totalContractPrice: 0,
@@ -735,7 +555,7 @@
       returnsales() {
         this.deptBudgetList = {
           transitCompany:'无',
-          deliverType: '1',
+          deliverType: '2',
           agreementType: '销售合同',
           finalTradingVolume: 0,
           totalContractPrice: 0,
@@ -876,48 +696,13 @@
       },
 
       submit() {
-        if(this.deptBudgetList.transactionSubject == '合营'){
-          if (!this.deptBudgetList.jointVentureParties) {
-          this.$message({
-            message: '请输入合营方名称！',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.deptBudgetList.jointVentureParties.length > 30) {
-          this.$message({
-            message: '合营方名称长度不符合要求,请输入30个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.jointPhone) {
-          this.$message({
-            message: '请输入合营方电话！',
-            type: 'warning',
-          })
-          return
-        }
-       }
+        
        if(this.deptBudgetList.transactionSubject == '自营'){
           delete this.deptBudgetList.jointVentureParties
           delete this.deptBudgetList.jointPhone
           delete this.deptBudgetList.jointVentureMarkup
        }
-        //   if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
-        //       this.$message({
-        //     message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
-        //   this.$message({
-        //   message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
-        //   type: 'warning',
-        //   })
-        //   return
-        // }
+       
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',
@@ -942,23 +727,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.shippingType) {
-          this.$message({
-            message: '运输方式不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.shippingType.length < 1 ||
-          this.deptBudgetList.shippingType.length > 20
-        ) {
-          this.$message({
-            message: '运输方式长度不符合要求,请输入1到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
+        
         if (!this.deptBudgetList.buyer) {
           this.$message({
             message: '买方名称不能为空',
@@ -973,23 +742,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.settlementMethod) {
-          this.$message({
-            message: '结算方式不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.settlementMethod.length < 1 ||
-          this.deptBudgetList.settlementMethod.length > 20
-        ) {
-          this.$message({
-            message: '结算方式长度不符合要求,请输入1到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
+        
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -1032,30 +785,7 @@
           })
           return
         }
-        if (this.deptBudgetList.transactionSubject=='合营'&&!this.deptBudgetList.transitCompany) {
-          this.$message({
-            message: '中转公司不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        if(this.deptBudgetList.deliverType == '2'){
-           if (!this.deptBudgetList.feedbackLeader){
-          this.$message({
-            message: '请选择收货反馈负责人',
-            type: 'warning',
-          })
-          return
-         }
-        }
-         
-        if (!this.deptBudgetList.acceptanceMethod) {
-          this.$message({
-            message: '请选择验收方式',
-            type: 'warning',
-          })
-          return
-        }
+        
         if (!this.deptBudgetList.weight) {
           this.$message({
             message: '请输入重量！',
@@ -1070,7 +800,7 @@
             (String(this.deptBudgetList.weight).indexOf('.') + 1) >
             3) ||
           this.deptBudgetList.weight < 0 ||
-          this.deptBudgetList.weight > 200000
+          this.deptBudgetList.weight > 20000000
         ) {
           this.$message({
             message: '输入重量有误！',
@@ -1078,13 +808,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateStart) {
-          this.$message({
-            message: '请选择交货日期（起）',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.overShort) {
           this.$message({
             message: '请输入溢短装！',
@@ -1107,24 +830,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateEnd) {
-          this.$message({
-            message: '请选择交货日期（止）',
-            type: 'warning',
-          })
-          return
-        }
-        //时间
-        if (
-          new Date(this.deptBudgetList.deliveryDateStart).getTime() >
-          new Date(this.deptBudgetList.deliveryDateEnd).getTime()
-        ) {
-          this.$message({
-            message: '交货日期（止）选择错误',
-            type: 'warning',
-          })
-          return
-        }
+       
         if (!this.deptBudgetList.priceType) {
           this.$message({
             message: '请选择价格类型',
@@ -1170,7 +876,7 @@
                 1) >
               2) ||
             this.deptBudgetList.totalContractPrice <= 0 ||
-            this.deptBudgetList.totalContractPrice > 1000000000
+            this.deptBudgetList.totalContractPrice > 100000000000
           ) {
             this.$message({
               message: '合同总价输入有误！',
@@ -1179,34 +885,7 @@
             return
           }
         }
-        if (!this.newSelectedOptions) {
-          this.$message({
-            message: '请选择货源所在地区！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.sourceGoods) {
-          this.$message({
-            message: '请输入货源详细地址！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.newSelectedOptions1) {
-          this.$message({
-            message: '请选择交货所在地区！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.placeDelivery) {
-          this.$message({
-            message: '请输入交货详细地址！',
-            type: 'warning',
-          })
-          return
-        }
+        
         if (!this.deptBudgetList.signingDate) {
           this.$message({
             message: '请选择签订日期',
@@ -1214,21 +893,7 @@
           })
           return
         }
-        if (
-          isNaN(this.deptBudgetList.finalTradingVolume) ||
-          (String(this.deptBudgetList.finalTradingVolume).indexOf('.') != -1 &&
-            String(this.deptBudgetList.finalTradingVolume).length -
-            (String(this.deptBudgetList.finalTradingVolume).indexOf('.') + 1) >
-            3) ||
-          this.deptBudgetList.finalTradingVolume < 0 ||
-          this.deptBudgetList.finalTradingVolume > 200000
-        ) {
-          this.$message({
-            message: '最终实际成交量有误！',
-            type: 'warning',
-          })
-          return
-        }
+       
         //货物信息
         if (!this.deptBudgetList.contractGoodsInfo.goodsName) {
           this.$message({
@@ -1237,13 +902,7 @@
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
-        //   this.$message({
-        //     message: '请输入水分',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
+        
         if (
           (this.deptBudgetList.contractGoodsInfo.waterContent &&
             String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf(
@@ -1404,104 +1063,6 @@
           })
           return
         }
-        if(this.deptBudgetList.contractProcessInfo.goodsNameKey ){
-
-        if (
-          !this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000 ||
-          this.deptBudgetList.contractProcessInfo.goodsNameKey < 100 ||
-          (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.goodsNameKey).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.goodsNameKey
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '合同收入金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        }
-        if (
-          this.deptBudgetList.contractProcessInfo.waterContent > 10000000 ||
-          this.deptBudgetList.contractProcessInfo.waterContent < 0 ||
-          (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.waterContent).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.waterContent
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '费用支出输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractProcessInfo.goodsName > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.goodsName < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.goodsName).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.goodsName).length -
-            (String(this.deptBudgetList.contractProcessInfo.goodsName).indexOf(
-                '.'
-              ) +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '已开发票金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractProcessInfo.impurity > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.impurity < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.impurity).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.impurity).length -
-            (String(this.deptBudgetList.contractProcessInfo.impurity).indexOf(
-                '.'
-              ) +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '未开发票金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (!this.deptBudgetList.contractProcessInfo.mildewGrain > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.mildewGrain < 0) ||
-          (String(this.deptBudgetList.contractProcessInfo.mildewGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.mildewGrain).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.mildewGrain
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '未回款金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
         this.$refs.deptBudgetList.validate((valid) => {
           if (valid) {
             this.deptBudgetList.compId = this.compId
@@ -1592,7 +1153,7 @@
                 this.$message.success('添加成功')
                 this.deptBudgetList = {
                   transitCompany:'无',
-                  deliverType: '1',
+                  deliverType: '2',
                   agreementType: '销售合同',
                   finalTradingVolume: 0,
                   totalContractPrice: 0,

src/views/home/index.vue

@@ -6,124 +6,8 @@
  * @FilePath: \web-pc\src\pages\big-screen\view\indexs\index.vue
 -->
 <template>
-  <div class="bg" id="index">
-    <div class="host-body">
-      <div class="d-flex jc-center title_wrap">
-        <!-- <div class="titlebgc"></div> -->
-        <div class="zuojuxing"></div>
-        <div class="youjuxing"></div>
-        <div class="guang"></div>
-        <div class="d-flex jc-center">
-          <div class="title">
-            <span class="title-text">招粮云仓大数据分析平台</span>
-          </div>
-        </div>
-        <div class="btn">
-         <div :class="btnIndex==1?'activeBtn':''" @click="selectData(1)" class="btn-style">新季</div>
-         <div :class="btnIndex==2?'activeBtn':''" @click="selectData(2)" class="btn-style">历史</div>  
-        </div>
-        <div class="timers">
-          {{ dateYear }} {{ dateWeek }} {{ dateDay }}
-          <i class=" blq-icon-shezhi02" style="margin-left:10px" @click="showSetting"></i>
-        </div>
-      </div>
-    </div>
-    <div class="contents ">
-      <div class="contetn_left">
-        <!-- <div class="pagetab">
-          <div class="item">实时监测</div>
-
-        </div> -->
-        <div @click="routergo(1)">
-          <ItemWrap class="contetn_left-top contetn_lr-item" title="在途信息统计">
-          <LeftTop :listData="leftTopDataList"/>
-        </ItemWrap>
-        </div>
-        <div @click="routergo(2)">
-        <ItemWrap class="contetn_left-center contetn_lr-item" title="合营比例">
-          <LeftCenter :hylistData="leftCenterDataList"/>
-        </ItemWrap>
-        </div>
-        <div @click="routergo(3)">
-        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="车辆信息" style="padding: 0 10px 16px 10px">
-          <LeftBottom :ztxxlistData="leftBottomDataList"/>
-        </ItemWrap>
-      </div>
-      </div>
-      <div class="contetn_center">
-        <div class="maptitle">
-          <div class="zuo"></div>
-          <span class="titletext">库点流向分布</span>
-          <div class="you"></div>
-        </div>
-        <dv-border-box-13>
-          <div id="china-map"></div>
-        </dv-border-box-13>
-        <dv-border-box-1 class="center_bottom">
-          <div @click="routergo(2)" class="center_bottom_content">
-            <div class="item">
-              <div class="title">头寸</div>
-              <div class="number">*****吨</div>
-              <!-- <div class="number">{{centerBottomDataList[0]}}吨</div> -->
-            </div>
-            <div class="item">
-              <div class="title">实际库存</div>
-              <div class="number">*****吨</div>
-              <!-- <div class="number">{{centerBottomDataList[1]}}吨</div> -->
-            </div>
-            <div class="item">
-              <div class="title">采购待执行</div>
-              <div class="number">*****吨</div>
-              <!-- <div class="number">{{centerBottomDataList[2]}}吨</div> -->
-            </div>
-            <div class="item">
-              <div class="title">销售待执行</div>
-              <div class="number">*****吨</div>
-              <!-- <div class="number">{{centerBottomDataList[3]}}吨</div> -->
-            </div>
-            <!-- <div class="row1">
-              <div class="item_title">
-                <span class="title-inner"> 头寸</span>
-              </div>
-              <div>123123吨</div>
-            </div>
-            <div class="row2 ">
-              <div class="item_title">
-                <span class="title-inner"> 实际库存</span>
-                <div>123123吨</div>
-              </div>
-              <div class="item_title">
-                <div class="title-inner">采购待执行（吨）</div>
-                <div>123123吨</div>
-              </div>
-              <div class="item_title">
-                <div class="title-inner">销售待执行（吨）</div>
-                <div>123123吨</div>
-              </div>
-            </div> -->
-          </div>
-        </dv-border-box-1>
-        <!-- <CenterMap class="contetn_center_top" /> -->
-        <!-- <ItemWrap class="contetn_center-bottom" title="安装计划">
-        <CenterBottom />
-      </ItemWrap> -->
-      </div>
-      <div class="contetn_right">
-        <div @click="routergo(2)">
-        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="出入库分布">
-          <RightTop :crklistData="rightTopDataObj"/>
-        </ItemWrap>
-        </div>
-        <div @click="routergo(2)">
-        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="库存排名" style="padding: 0 10px 16px 10px">
-          <RightCenter :phklistData="rightCenterDataList"/>
-        </ItemWrap>
-        </div>
-        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="最新合同 ">
-          <RightBottom :htlistData="rightBottomDataList"/>
-        </ItemWrap>
-      </div>
-    </div>
+  <div >
+    <h1 style="margin-left: 45%;margin-top: 20%;">欢迎使用</h1>
   </div>
 </template>
 
@@ -179,18 +63,18 @@ export default {
   },
   mounted() {
     
-    this.timeFn();
-    this.selectData(1)
+    // this.timeFn();
+    // this.selectData(1)
 
-    this.dataListTimer = setInterval(() => {
-      this.selectData(1)
-      }, 10*60000);
+    // this.dataListTimer = setInterval(() => {
+    //   this.selectData(1)
+    //   }, 10*60000);
     
 
   },
   beforeDestroy() {
-    clearInterval(this.timing);
-    clearInterval(this.dataListTimer);
+    // clearInterval(this.timing);
+    // clearInterval(this.dataListTimer);
     
   },
   methods: {
@@ -520,7 +404,7 @@ export default {
 //     transform-origin: left top;
 // }
 .winseaview-view {
-  background: #03050C
+  background: #fff
 }
 
 .bg {

src/views/houseSelfCollect/customerManagement.vue

@@ -3,7 +3,7 @@
   <div>
     <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
-        <ws-button type="primary" @click="getCustomer()">获取客户</ws-button>
+        <!-- <ws-button type="primary" @click="getCustomer()">获取客户</ws-button> -->
         <ws-button type="primary" @click="createCustomer(1)">创建新客户</ws-button>
       </template>
       <template slot="right">

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -35,7 +35,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: 0 auto">
               <div class="unload-img">上传身份证国徽面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader2"
@@ -47,10 +47,23 @@
                 <img v-if="imageUrl2" :src="imageUrl2" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
+            </div> -->
+            <div style="width: 330px; margin: 0 auto">
+              <div class="unload-img">上传银行卡正面</div>
+              <el-upload
+                class="avatar-uploader avatar-uploader3"
+                :action="global.uploadPath"
+                :show-file-list="false"
+                :on-success="bankSuccess1"
+                :disabled="disabled"
+              >
+                <img v-if="imageUrl3" :src="imageUrl3" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
             </div>
           </div>
 
-          <div style="display: flex; width: 100%; text-align: center">
+          <!-- <div style="display: flex; width: 100%; text-align: center">
             <div style="width: 330px; margin: 0 auto">
               <div class="unload-img">上传银行卡正面</div>
               <el-upload
@@ -77,7 +90,7 @@
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
-          </div>
+          </div> -->
           <ws-form-item
             label="姓名"
             span="1"
@@ -101,14 +114,14 @@
               :disabled="disabled"
             />
           </ws-form-item>
-           <ws-form-item label="所属供应商" span="1" prop="supplier" label-width="80px">
+           <!-- <ws-form-item label="所属供应商" span="1" prop="supplier" label-width="80px">
             <ws-input v-model="customerList.supplier" placeholder="请输入供应商姓名" maxlength="15" size="small"
               :disabled="disabled" />
           </ws-form-item>
            <ws-form-item label="供应商电话 " span="1" prop="supplierPhone" label-width="80px">
             <ws-input v-model="customerList.supplierPhone" placeholder="请输入供应商电话" maxlength="15" size="small"
               :disabled="disabled" />
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="银行卡号" span="1" prop="bankCard">
             <ws-input
               type="number"
@@ -138,7 +151,7 @@
               size="small"
               :disabled="disabled"
             />
-            <ws-select
+            <!-- <ws-select
               v-else
               v-model="customerList.bankDepositBranch"
               placeholder="请输入开户支行"
@@ -150,15 +163,15 @@
                 :label="item"
                 :value="item"
               />
-            </ws-select>
-            <el-button
+            </ws-select> -->
+            <!-- <el-button
               type="primary"
               @click="bankInputChange"
               v-if="switchType != 2"
               >{{ bankText }}</el-button
-            >
+            > -->
           </ws-form-item>
-          <ws-form-item label="收款人姓名" span="1" prop="payeeName">
+          <!-- <ws-form-item label="收款人姓名" span="1" prop="payeeName">
             <ws-input
               v-model="customerList.payeeName"
               placeholder="请输入收款人姓名"
@@ -175,7 +188,7 @@
               size="small"
               :disabled="disabled"
             />
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="手机号" span="1" prop="customerPhone">
             <ws-input
               type="number"
@@ -196,7 +209,7 @@
               :disabled="disabled"
             />
           </ws-form-item>
-          <div
+          <!-- <div
             v-if="this.switchType == 1 || this.switchType == 3"
             class="jiaoYan"
           >
@@ -219,7 +232,7 @@
               size="small"
               :disabled="disabled"
             />
-          </div>
+          </div> -->
           <!-- <ws-form-item label="村委会电话" span="1" prop="villageCommitteePhone">
             <ws-input
               v-model="customerList.villageCommitteePhone"
@@ -298,9 +311,9 @@
         bankLows: 'bankLow',
         sendText: '60S后重发',
         sendDisabled: false,
-        verifyCode: '',
+        verifyCode: '123456',
         bankList:[],
-        bankInput:false,
+        bankInput:true,
         bankText:'手动填写',
         avatarshow:false,
       }
@@ -410,7 +423,7 @@
       },
       cancel() {
         this.customerList = {}
-        this.verifyCode = ''
+        this.verifyCode = '123456'
         this.disabled = false
         this.trader = ''
         this.$router.push({
@@ -572,13 +585,13 @@
           })
           return
         }
-         if (this.customerList.payeeNumberCard.length != 18) {
-          this.$message({
-            message: '收款人身份证号输入有误，请重新输入',
-            type: 'warning',
-          })
-          return
-        }
+        //  if (this.customerList.payeeNumberCard.length != 18) {
+        //   this.$message({
+        //     message: '收款人身份证号输入有误，请重新输入',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.customerList.customerPhone) {
           this.$message({
             message: '请输入手机号',
@@ -593,13 +606,13 @@
           })
           return
         }
-        if (!this.customerList.compAddress) {
-          this.$message({
-            message: '请输入联系地址',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.customerList.compAddress) {
+        //   this.$message({
+        //     message: '请输入联系地址',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         // if (!this.customerList.villageCommitteePhone) {
         //   this.$message({
         //     message: '请输入村委会电话',
@@ -617,6 +630,8 @@
             this.customerList.compId = localStorage.getItem('ws-pf_compId')
             this.customerList.cardAddressUrl = this.identity.toString()
             this.customerList.payeeAddressUrl = this.bank.toString()
+            this.customerList.payeeName = this.customerList.customerName
+            this.customerList.payeeNumberCard = this.customerList.customerNumberCard
             this.customerList.customerTypeFlag = 1
             this.customerList.customerType = '个人'
             if (this.switchType == 1) {

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -16,16 +16,16 @@
       </template>
     </BaseHeaderLayout>
     <div style='margin:10px;'>
-      <el-row :gutter="20">
-        <el-col :span="8">
+      <el-row :gutter="8">
+        <!-- <el-col :span="8">
           <el-button v-if="qyJurisdiction || zjJurisdiction" @click='statustypechange("初检")'
             :type="statusTypetext == '初检' ? 'primary' : ''">初检</el-button>
           <el-button v-if="fjJurisdiction" @click='statustypechange("复检")'
             :type="statusTypetext == '复检' ? 'primary' : ''">复检</el-button>
           <el-button v-if="qrJurisdiction" @click='statustypechange("确认")'
             :type="statusTypetext == '确认' ? 'primary' : ''">确认</el-button>
-        </el-col>
-        <el-col :span="8">
+        </el-col> -->
+        <!-- <el-col :span="8">
           <div style='text-align:center;'>
             <span>&nbsp;</span>
             <el-button @click='add' type="primary"
@@ -34,12 +34,12 @@
               v-if="qyJurisdiction && statusTypetext == '初检' || serviceManagementType == 1 && statusTypetext == '初检'">删除
             </el-button>
           </div>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
-          <div style='text-align:right;'>
-            <el-button @click='refreshClick(1)' type="primary">刷新</el-button>
-            <el-button @click='refreshClick' type="primary">{{ timer? refresh: '自动刷新' }}</el-button>
-            <el-button @click='record' type="primary">记录</el-button>
+          <div style='text-align:left;'>
+            <!-- <el-button @click='refreshClick(1)' type="primary">刷新</el-button>
+            <el-button @click='refreshClick' type="primary">{{ timer? refresh: '自动刷新' }}</el-button> -->
+            <el-button @click='record' type="primary">质检记录</el-button>
           </div>
         </el-col>
       </el-row>
@@ -51,11 +51,11 @@
             <div style="margin: 0 auto">
               <div class="title">
                 基本信息
-                <el-checkbox v-if="statusTypetext == '初检' && zjJurisdiction" v-model="directselling">原箱直销
+                <!-- <el-checkbox v-if="statusTypetext == '初检' && zjJurisdiction" v-model="directselling">原箱直销
                   <el-tooltip class="item" effect="dark" content="集装箱入库不开箱直接销售" placement="top-start">
                     <i class="el-icon-question"></i>
                   </el-tooltip>
-                </el-checkbox>
+                </el-checkbox> -->
               </div>
               <ws-info-table>
                 <!-- <ws-form-item v-if='serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
@@ -86,99 +86,63 @@
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-                <ws-form-item
-                  v-if='serviceManagementType == 3 && qyJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
-                  label="合同编号" span="1" prop="contractNo">
-                  <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
-                    size="small" />
-                </ws-form-item>
-                <ws-form-item
+                
+                <!-- <ws-form-item
                   v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
                   label="购粮性质" span="1" prop="natureOfGrainPurchase">
                   <ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10"
                     size="small" :disabled="disabled" />
+                </ws-form-item> -->
+                <ws-form-item  label="仓位号" span="1" prop="inOutTaskNo">
+                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber"
+                    placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
+                    <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
+                      :value="item.binNumber" />
+                  </el-select>
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 1' label="仓位号" span="1" prop="inOutTaskNo">
+                <!-- <ws-form-item
+                  v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
+                  label="仓位号" span="1" prop="inOutTaskNo">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber"
                     placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
                     <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
                       :value="item.binNumber" />
                   </el-select>
+                </ws-form-item> -->
+                <ws-form-item
+                  v-if='serviceManagementType == 3 && qyJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
+                  label="合同编号" span="1" prop="contractNo">
+                  <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
+                    size="small" />
                 </ws-form-item>
-                <ws-form-item label="货名" span="1" prop="inOutTaskNo">
-                  <!-- <el-select :disabled='disablednotarize || goodsdisabled' v-model="deptBudgetList.goodsName" clearable
-                    filterable placeholder="请选择" class="typeselect" @change="goodsNameChange">
-                    <el-option v-for="item in goodnameList" :key="'huoming' + item.id" :label="item.goodsName" :value="item.goodsName" />
-                  </el-select> -->
+                <!-- <ws-form-item label="货名" span="1" prop="inOutTaskNo">
                   <el-select disabled v-model="deptBudgetList.goodsName" clearable filterable placeholder="请选择"
                     class="typeselect" @change="goodsNameChange">
                     <el-option v-for="item in goodnameList" :key="'huoming' + item.id" :label="item.goodsName"
                       :value="item.goodsName" />
                   </el-select>
-                </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="type" v-if="zjJurisdiction && statusTypetext == '初检'">
+                </ws-form-item> -->
+                <!-- <ws-form-item label="类型" span="1" prop="type" v-if="zjJurisdiction && statusTypetext == '初检'">
                   <ws-select v-model="deptBudgetList.type">
                     <ws-option v-for="item in typeList" :key="'leixin' + item" :label="item" :value="item" />
                   </ws-select>
-                </ws-form-item>
-                <ws-form-item
-                  v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
-                  label="仓位号" span="1" prop="inOutTaskNo">
-                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber"
-                    placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
-                    <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
-                      :value="item.binNumber" />
-                  </el-select>
-                </ws-form-item>
-                <ws-form-item label="箱号-1" span="1" prop="boxNo"
+                </ws-form-item> -->
+                
+                <!-- <ws-form-item label="箱号-1" span="1" prop="boxNo"
                   v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检' || serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
                     size="small" />
-                </ws-form-item>
-                <ws-form-item
-                  v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检' || serviceManagementType == 3 && statusTypetext != '初检'"
-                  label="车牌号" span="1" prop="carNo">
-                  <ws-input :disabled="disabled2" v-if="serviceManagementType == 3 && carNumberList.length == 0"
-                    v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                  <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType != 3"
-                    filterable clearable v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect"
-                    @change="carChange($event, 0)">
-                    <el-option v-for="(item, index) in options2" :key="index"
-                      :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
-                  </el-select>
-                  <!-- <el-select :disabled="disabled2"
-                    v-if="!carstatus && options2.length > 0 && serviceManagementType != 3" filterable clearable
-                     v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect"
-                    @change="carChange($event, 0)">
-                    <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
-                  </el-select> -->
-                  <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && carstatus"
-                    filterable clearable :allow-create="true" v-model="deptBudgetList.carNo" placeholder="请选择车牌号"
-                    class="typeselect" @change="carChange($event, 1)">
-                    <el-option v-for="item in carNumberList" :key="item.id" :label="item.carNo" :value="item.carNo" />
-                  </el-select>
-                  <!-- <el-select @change='carchange' v-if="statusTypetext=='初检'&&editcar==false&&carstatus||statusTypetext=='确认'&&editcar==false&&carstatus" v-model="deptBudgetList.carNo" placeholder="请选择车牌号">
-                    <el-option v-for="(item,index) in options2" :key="item.value" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index"  />
-                  </el-select>
-                  <el-select @change='carchange' v-if="statusTypetext=='初检'&&editcar==false&&!carstatus||statusTypetext=='确认'&&editcar==false&&!carstatus" v-model="deptBudgetList.carNo" placeholder="请选择车牌号">
-                    <el-option v-for="(item,index) in options2" :key="item.value" :label="item.carNo" :value="index"  />
-                  </el-select>
-                  <ws-input v-if="statusTypetext=='复检'||editcar" :disabled="disabled2" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" size="small" type="number" @mousewheel.native.prevent />
-                  <img v-if="statusTypetext=='初检'||statusTypetext=='确认'" width="17" height="18" style="
-                      vertical-align: text-top;
-                      position: relative;
-                      top: -1px;
-                    " src="../../../public/img/edit.png" @click="editClick(3)" alt="" /> -->
-                </ws-form-item>
+                </ws-form-item> -->
+                
 
 
-                <ws-form-item label="封号-1" span="1" prop="titleNo"
+                <!-- <ws-form-item label="封号-1" span="1" prop="titleNo"
                   v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检' || serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
                     size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
 
-                <ws-form-item
+                <!-- <ws-form-item
                   v-if='serviceManagementType == 3 && qyJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
                   label="运输方式" span="1" prop="outType">
                   <el-select v-if='serviceManagementType == 3' @change='outTypechange' :disabled='recheck'
@@ -192,7 +156,7 @@
                   v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检' || serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
                     size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
                 <ws-form-item
                   v-if='serviceManagementType == 3 && qyJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
                   label="客户" span="1" prop="customerName">
@@ -203,32 +167,32 @@
                   </el-select>
                 </ws-form-item>
 
-                <ws-form-item label="封号-2" span="1" prop="titleNoOther"
+                <!-- <ws-form-item label="封号-2" span="1" prop="titleNoOther"
                   v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检' || serviceManagementType == 3 && statusTypetext != '初检'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
                     size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
                 <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="交易量" span="1"
                   prop="customerName">
                   <el-input :class="redstatus ? 'volumeofbusiness' : ''" disabled
                     v-model="deptBudgetList.volumeofbusiness" placeholder="自动获取，不可编辑" maxlength="20" size="small" />
                 </ws-form-item>
-                <ws-form-item
+                <!-- <ws-form-item
                   v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检" || serviceManagementType == 3 && statusTypetext != "初检"'
                   label="囤位号（选填）" span="1" prop="storageTagNo">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.storageTagNo" placeholder="选填，1-10个字符"
                     maxlength="10" size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
 
                 <!-- <ws-form-item v-if='serviceManagementType==1' label="业务编号" span="1" prop="qualityNo">
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item> -->
 
-                <ws-form-item v-if='serviceManagementType == 1' label="囤位号（选填）" span="1" prop="storageTagNo">
+                <!-- <ws-form-item v-if='serviceManagementType == 1' label="囤位号（选填）" span="1" prop="storageTagNo">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.storageTagNo" placeholder="选填，1-10个字符"
                     maxlength="10" size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
 
                 <ws-form-item v-if='deptBudgetList.inOutType == "移库入库" && serviceManagementType == 1' label="移库编号"
                   span="1" prop="contractNo">
@@ -240,29 +204,36 @@
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 1' label="成本（元/吨）" span="1" prop="cost">
-                <ws-input v-model="deptBudgetList.cost" v-if="deptBudgetList.inOutType == '退库' " placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled />
+                <!-- <ws-form-item v-if='serviceManagementType == 1' label="成本（元/吨）" span="1" prop="cost">
+                  <ws-input v-model="deptBudgetList.cost" v-if="deptBudgetList.inOutType == '退库' " placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled />
                   <ws-input v-model="deptBudgetList.cost" v-else placeholder="自动获取，不可编辑" maxlength="100" size="small" />
-                  <!-- <img width="17" height="18" style="
-                      vertical-align: text-top;
-                      position: relative;
-                      top: -1px;
-                    " src="../../../public/img/edit.png" @click="editClick(1)" alt="" /> -->
-                </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 1' label="提示" span="1" prop="tips">
+                </ws-form-item> -->
+                <!-- <ws-form-item v-if='serviceManagementType == 1' label="提示" span="1" prop="tips">
                   <ws-input v-model="deptBudgetList.tips" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
-                </ws-form-item>
-                <ws-form-item v-if='statusTypetext != "复检" && serviceManagementType == 1' label="扣款(元/吨)" span="1"
+                </ws-form-item> -->
+                <!-- <ws-form-item v-if='statusTypetext != "复检" && serviceManagementType == 1' label="扣款(元/吨)" span="1"
                   prop="deductionAmount">
                   <ws-input @input="kkInput(deptBudgetList.deductionAmount)" v-model="deptBudgetList.deductionAmount"
                     placeholder="选填，1-10个字符" maxlength="10" size="small" />
+                </ws-form-item> -->
+                <ws-form-item v-if='serviceManagementType == 1' label="入库日期" span="1" prop="inOutDate"
+                  class="deliverydate">
+                  <el-date-picker :disabled='recheck' v-model="deptBudgetList.inOutDate" placeholder="请选择入库日期"
+                    type="date" value-format="yyyy-MM-dd"></el-date-picker>
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 1' label="货名" span="1" prop="inOutTaskNo">
+                <ws-form-item v-if='serviceManagementType == 3' label="车牌号" span="1" prop="carNo">
+                  <ws-input 
+                    v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
+                </ws-form-item>    
+                <ws-form-item  label="货名" span="1" prop="inOutTaskNo">
                   <ws-input v-model="deptBudgetList.goodsName" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-
+                <ws-form-item v-if='serviceManagementType == 1' label="车牌号" span="1" prop="carNo">
+                  <ws-input 
+                    v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
+                </ws-form-item>    
                 <ws-form-item v-if='statusTypetext != "初检" && serviceManagementType == 1' label="经办人" span="1"
                   prop="agent">
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取，不可编辑" maxlength="100" disabled
@@ -285,18 +256,30 @@
                       :value="item.constValue" />
                   </ws-select>
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 1' label="入库日期" span="1" prop="inOutDate"
-                  class="deliverydate">
-                  <el-date-picker :disabled='recheck' v-model="deptBudgetList.inOutDate" placeholder="请选择入库日期"
-                    type="date" value-format="yyyy-MM-dd"></el-date-picker>
+                <ws-form-item label="箱号-1（选填）" span="1" prop="boxNo">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+                    size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 1' label="运输方式" span="1" prop="outType">
+                <ws-form-item label="封号-1（选填）" span="1" prop="titleNo">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+                    size="small" />
+                </ws-form-item>
+                <ws-form-item label="箱号-2（选填）" span="1" prop="boxNoOther">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+                    size="small" />
+                </ws-form-item>
+                <ws-form-item label="封号-2（选填）" span="1" prop="titleNoOther">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+                    size="small" />
+                </ws-form-item>
+                
+                <!-- <ws-form-item v-if='serviceManagementType == 1' label="运输方式" span="1" prop="outType">
                   <el-select :disabled='disablednotarize || recheck' v-model="deptBudgetList.outType"
                     placeholder="请选择运输方式">
                     <el-option v-for="item in multiSelector" :key="'ysfs' + item.value" :label="item.name"
                       :value="item.name" />
                   </el-select>
-                </ws-form-item>
+                </ws-form-item> -->
                 <ws-form-item
                   v-if='serviceManagementType == 1 && deptBudgetList.outType == "汽运" || serviceManagementType == 3 && deptBudgetList.outType == "自运"'
                   label="车队" span="1" prop="fleetName">
@@ -395,7 +378,7 @@
                   <ws-input disabled v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20"
                     size="small" />
                 </ws-form-item>
-                <ws-form-item label="箱号-1" span="1" prop="boxNo"
+                <!-- <ws-form-item label="箱号-1" span="1" prop="boxNo"
                   v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船' || deptBudgetList.outType == '火运'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
                     size="small" />
@@ -414,7 +397,7 @@
                   v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船' || deptBudgetList.outType == '火运'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
                     size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
               </ws-info-table>
 
               <div class="title"
@@ -427,35 +410,28 @@
               <!-- </div> -->
               <ws-info-table
                 v-if="serviceManagementType == 3 & zjJurisdiction && statusTypetext == '初检' || serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">
+                 <ws-form-item label="水分（%）" span="1" prop="waterContent">
+                  <ws-input @change="waterContentChange('water')" v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.waterContent" type="number" @mousewheel.native.prevent placeholder="请输入水分占比"
+                    maxlength="40" size="small" />
+                  <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
+                    v-model="deptBudgetList.reWaterContent" type="number" @mousewheel.native.prevent
+                    placeholder="请输入水分占比" maxlength="40" size="small" />
+                </ws-form-item>
                 <ws-form-item label="等级" span="1" prop="outType">
                   <ws-select v-if='statusTypetext != "复检"' 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-select :disabled='disablednotarize' v-if='statusTypetext != "初检"' v-model="deptBudgetList.reGrade"
                     placeholder class="typeselect" @change="reselectpackingMethod">
                     <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="waterContent">
-                  <ws-input @change="waterContentChange('water')" v-if='statusTypetext != "复检"'
-                    v-model="deptBudgetList.waterContent" type="number" @mousewheel.native.prevent placeholder="请输入水分占比"
-                    maxlength="40" size="small" />
-                  <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
-                    v-model="deptBudgetList.reWaterContent" type="number" @mousewheel.native.prevent
-                    placeholder="请输入水分占比" maxlength="40" size="small" />
-                </ws-form-item>
-                <!--杂质（%）<=-->
-                <ws-form-item label="杂质（%）" span="1" prop="impurity">
-                  <ws-input v-if='statusTypetext != "复检"' v-model="deptBudgetList.impurity" type="number"
-                    @mousewheel.native.prevent placeholder="请输入杂质占比" maxlength="40" size="small" />
-                  <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
-                    v-model="deptBudgetList.reImpurity" type="number" @mousewheel.native.prevent placeholder="请输入杂质占比"
-                    maxlength="40" size="small" />
-                </ws-form-item>
-                <!--容重(克/升)-->
+               <!--容重(克/升)-->
                 <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity" v-if="deptBudgetList.goodsName != '大豆'">
                   <ws-input v-if='statusTypetext != "复检"' @change="obtainPrice()" v-model="deptBudgetList.bulkDensity"
                     type="number" @mousewheel.native.prevent
@@ -471,6 +447,16 @@
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
                     v-model="deptBudgetList.reProtein" type="number" placeholder="请输入蛋白" maxlength="40" size="small" />
                 </ws-form-item>
+                <!--杂质（%）<=-->
+                <ws-form-item label="杂质（%）" span="1" prop="impurity">
+                  <ws-input v-if='statusTypetext != "复检"' v-model="deptBudgetList.impurity" type="number"
+                    @mousewheel.native.prevent placeholder="请输入杂质占比" maxlength="40" size="small" />
+                  <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
+                    v-model="deptBudgetList.reImpurity" type="number" @mousewheel.native.prevent placeholder="请输入杂质占比"
+                    maxlength="40" size="small" />
+                </ws-form-item>
+                
+                
                 <!--霉变粒（%）<=-->
                 <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
                   <ws-input v-if='statusTypetext != "复检"' v-model="deptBudgetList.mildewGrain" type="number"
@@ -529,7 +515,7 @@
                     <ws-option label="异常" value="异常" />
                   </ws-select>
                 </ws-form-item>
-                <ws-form-item v-if="serviceManagementType == 3" label="水分增价（元/吨）" span="1" prop="imperfectGrain">
+                <!-- <ws-form-item v-if="serviceManagementType == 3" label="水分增价（元/吨）" span="1" prop="imperfectGrain">
                   <el-input :disabled='statusTypetext != "初检"' v-model="deptBudgetList.waterPriceIncrease" type="number"
                     @focus="pricefocus($event, 1)" @blur="priceblur($event, 1)" @input="deductionchange"
                     placeholder="请输入水分增价" maxlength="40" size="small" />
@@ -548,7 +534,7 @@
                   <el-input :disabled='statusTypetext != "初检"' v-model="deptBudgetList.qualityPriceDeduction"
                     type="number" @focus="pricefocus($event, 4)" @blur="priceblur($event, 4)" @input="deductionchange"
                     placeholder="请输入质量扣价" maxlength="40" size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
               <ws-form-item label="规格（公斤）" span="1" prop="boxNoOther"
                   v-if="compName=='辽宁佳屹农商贸有限公司'">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.specifications" placeholder="请选择规格"
@@ -615,7 +601,7 @@
           </ws-form>
         </div>
       </el-col>
-      <el-col :span="6">
+      <!-- <el-col :span="6">
         <div class="grid-content bg-purple">
           <el-button v-if='statusTypetext == "复检"' @click='statustypechangelist(1)'
             :type="statusType == 1 ? 'primary' : ''">未复检
@@ -651,7 +637,7 @@
           </el-table>
 
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
     <div class="but">
       <div style='text-align:right;'>

src/views/houseSelfCollect/inspectionManagementrecord.vue

@@ -6,12 +6,12 @@
         <div>
           <el-button @click='warehousetypechange(1)' :type="serviceManagementType==1?'primary':''">贸易入库</el-button>
           <el-button @click='warehousetypechange(3)' :type="serviceManagementType==3?'primary':''">收购入库</el-button>
-          <div style='margin-top:10px;'>
+          <!-- <div style='margin-top:10px;'>
             <el-button @click='statustypechange("全部")' :type="statusTypetext=='全部'?'primary':''">全部</el-button>
             <el-button @click='statustypechange("初检")' :type="statusTypetext=='初检'?'primary':''">已初检</el-button>
             <el-button @click='statustypechange("复检")' :type="statusTypetext=='复检'?'primary':''">已复检</el-button>
             <el-button @click='statustypechange("确认")' :type="statusTypetext=='确认'?'primary':''">已确认</el-button>
-          </div>
+          </div> -->
         </div>
         
       </template>
@@ -42,7 +42,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="qualityNo" width="100" label="业务编号"></el-table-column>
-      <el-table-column :key='Math.random()' v-if='serviceManagementType==1' prop="qualityNo" width="100" label="合同编号/移库编号">
+      <el-table-column :key='Math.random()' v-if='serviceManagementType==1' prop="qualityNo" width="100" label="合同编号">
         <template scope="scope">
           <span v-if="scope.row.contractNo">{{ scope.row.contractNo }}</span>
           <span v-else>{{ scope.row.moveTaskNo }}</span>
@@ -54,15 +54,14 @@
       <el-table-column prop="waterContent" label="水分（%）" width="120">
         <template scope="scope">
           <span class="water-left">{{scope.row.waterContent}}</span>
-          <span class="water-line">|</span>
-          <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
+          <!-- <span class="water-line">|</span> -->
+          <!-- <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span> -->
         </template>
       </el-table-column>
-      <el-table-column prop="reMemo" label="复检备注" width="120">
-       
-      </el-table-column>
+      <!-- <el-table-column prop="reMemo" label="复检备注" width="120">
+      </el-table-column> -->
       <el-table-column prop="type" label="类型"></el-table-column>
-      <el-table-column :key='Math.random()' v-if='serviceManagementType==1' prop="cost" label="成本（元/吨）"></el-table-column>
+      <!-- <el-table-column :key='Math.random()' v-if='serviceManagementType==1' prop="cost" label="成本（元/吨）"></el-table-column> -->
       <el-table-column :key='Math.random()' v-if='serviceManagementType==3' prop="tidalGrainPrice" label="单价（元/公斤）" width="120px">
         <template scope="scope">
           <span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>

src/views/houseSelfCollect/paymentManagement.vue

@@ -7,11 +7,36 @@
         <div class="print-type-title">打印凭证</div>
         <div class="print-type-checkbox">
           <el-checkbox-group v-model="ruleForm.type">
-            <el-checkbox label="打印身份证" name="type" class="label-width" @change="selectType"></el-checkbox>
-            <el-checkbox label="打印银行卡" name="type" class="label-width" @change="selectType"></el-checkbox>
-            <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
-            <el-checkbox label="打印检斤单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
-            <el-checkbox label="打印自产证明" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <el-checkbox
+              label="打印身份证"
+              name="type"
+              class="label-width"
+              @change="selectType"
+            ></el-checkbox>
+            <el-checkbox
+              label="打印银行卡"
+              name="type"
+              class="label-width"
+              @change="selectType"
+            ></el-checkbox>
+            <el-checkbox
+              label="打印结算凭证"
+              name="type"
+              class="label-width"
+              @change="selectType($event)"
+            ></el-checkbox>
+            <el-checkbox
+              label="打印检斤单"
+              name="type"
+              class="label-width"
+              @change="selectType($event)"
+            ></el-checkbox>
+            <el-checkbox
+              label="打印自产证明"
+              name="type"
+              class="label-width"
+              @change="selectType($event)"
+            ></el-checkbox>
             <!-- <el-checkbox label="打印回执单" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
             <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
           </el-checkbox-group>
@@ -27,46 +52,98 @@
         <!-- <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 == '' ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
+        <ws-button :type="searchType == '' ? 'primary' : ''" @click="screen(-1)"
+          >全部</ws-button
+        >
         <!-- <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)">待审核</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="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
+        <ws-button
+          :type="searchType == 2 ? 'primary' : ''"
+          @click="screen(2)"
+          v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
+          >待结算</ws-button
+        >
+        <!-- <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button> -->
       </template>
       <template slot="right">
-        
-        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
-          filterable clearable style="margin: 0 10px">
-          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+        <el-select
+          class="warehouse_select"
+          v-model="warehouseNameKey"
+          placeholder="请选择仓库"
+          @change="warehouseChange"
+          filterable
+          clearable
+          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-select class="warehouse_select" v-model="goodNames" placeholder="请选择货名" @change="goodsNameChange" filterable
-          clearable  multiple :multiple-limit="multipleLimit" style="margin: 0 10px">
+        <el-select
+          class="warehouse_select"
+          v-model="goodNames"
+          placeholder="请选择货名"
+          @change="goodsNameChange"
+          filterable
+          clearable
+          multiple
+          :multiple-limit="multipleLimit"
+          style="margin: 0 10px"
+        >
           <el-option label="全部货名" value="全部货名"></el-option>
-          <el-option v-for="item in goodnameList" :key="item.id" :label="item.constValue" :value="item.constValue">
+          <el-option
+            v-for="item in goodnameList"
+            :key="item.id"
+            :label="item.constValue"
+            :value="item.constValue"
+          >
           </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
+          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 class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="编号、合同号、客户名、车牌号"
-          clearable maxlength="500" type="input">
+        <ws-input
+          class="findinput"
+          @keyup.enter.native="find()"
+          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;left:-8px;"
-            src="../../../public/img/sousuo.png" alt />
+          <img
+            width="16"
+            height="16"
+            style="vertical-align: text-top; position: relative; top: 0px;left:-8px;"
+            src="../../../public/img/sousuo.png"
+            alt
+          />
         </ws-button>
       </template>
     </BaseHeaderLayout>
     <el-row>
       <el-col :span="20">
-         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
+        <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
 
@@ -74,8 +151,8 @@
         <ws-button type="primary" @click="adopt">通过</ws-button> -->
         <!-- <ws-button type="primary" @click="invoicingClick" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button> -->
         <!-- <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出</ws-button> -->
-         <!-- <ws-button type="primary" v-show='warehouseName=="丹东港"' @click="generateClick()">生成入库单</ws-button> -->
-          <!-- <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
+        <!-- <ws-button type="primary" v-show='warehouseName=="丹东港"' @click="generateClick()">生成入库单</ws-button> -->
+        <!-- <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
           :on-change="importClick" :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
           :auto-upload="false">
@@ -85,22 +162,22 @@
         <!-- <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款 -->
         <!-- </ws-button> -->
         <!-- v-hasPermission="`acquisitionManagement.acquisitionPay.finace`" -->
-        <ws-button type="primary" @click="selectPrint(1)"
+        <!-- <ws-button type="primary" @click="selectPrint(1)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">批量打印
-        </ws-button>
+        </ws-button> -->
         <!-- <ws-button type="primary" @click="selectPrint(2)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">业务批量打印
         </ws-button> -->
-        <ws-button type="primary" @click="selectPrint(3)"
+        <!-- <ws-button type="primary" @click="selectPrint(3)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">身份证银行卡打印
         </ws-button>
         <ws-button type="primary" @click="agreementPrint()"
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`">下载结算单
-        </ws-button>
+        </ws-button> -->
         <!-- <el-upload :on-change="importClick" action="" :show-file-list="false" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" :auto-upload="false"
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`"><el-button type="primary">导入</el-button>
         </el-upload> -->
-        <el-link
+        <!-- <el-link
           href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E6%94%B6%E8%B4%AD%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF%EF%BC%88%E6%96%B0%EF%BC%89.xlsx"
           style="margin-left: 8px"
         >
@@ -111,10 +188,9 @@
           style="margin-left: 8px"
         >
           <el-button type="primary">自产证明模板</el-button>
-        </el-link>
-      </el-col>
-      <el-col :span="4">
+        </el-link> -->
       </el-col>
+      <el-col :span="4"> </el-col>
     </el-row>
     <!-- <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
@@ -123,47 +199,123 @@
       </template>
       <template slot="right"></template>
     </BaseHeaderLayout> -->
-    <el-table :data="paymentList" ref="table" style="width: 100%; margin-top: 20px" border height="calc(100% - 170px)"
-      @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
+    <el-table
+      :data="paymentList"
+      ref="table"
+      style="width: 100%; margin-top: 20px"
+      border
+      height="calc(100% - 170px)"
+      @row-click="handleRowClick"
+      @selection-change="handleSelectionChange"
+      :summary-method="getSummaries"
+      show-summary
+    >
       <!-- <el-table-column :selectable="selectInit" type="selection" width="30"></el-table-column> -->
-      <el-table-column  type="selection" width="30"></el-table-column>
+      <el-table-column type="selection" width="30"></el-table-column>
       <el-table-column fixed 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 fixed class="table_td" prop="paymentNo" width="90" label="编号" sortable></el-table-column>
-      <el-table-column fixed class="table_td" prop="customerName" label="客户" sortable>
+      <el-table-column
+        fixed
+        class="table_td"
+        prop="paymentNo"
+        width="90"
+        label="编号"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        fixed
+        class="table_td"
+        prop="customerName"
+        label="客户"
+        sortable
+      >
         <template slot-scope="scope">
           <div @click.stop="customer(scope.row)">
             <span class="text_css">{{ scope.row.customerName }}</span>
           </div>
         </template>
       </el-table-column>
-      <el-table-column fixed class="table_td" prop="carNo" label="车牌号"></el-table-column>
-      <el-table-column  class="table_td" prop="contractNo" label="合同号"></el-table-column>
+      <el-table-column
+        fixed
+        class="table_td"
+        prop="carNo"
+        label="车牌号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="contractNo"
+        label="合同号"
+      ></el-table-column>
       <!-- <el-table-column class="table_td" v-show='warehouseName=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
         label="卸车过磅费（元）"></el-table-column> -->
-      <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
-      <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
-      <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="unitDeduction" width="130" label="扣单价（元/公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="solidGrainPrice" width="140" label="纯重单价（元/公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="netWeight" width="100" label="净重（公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="pureWeight" width="100" label="纯重（公斤）"></el-table-column>
-      <el-table-column class="table_td" prop="bulkDensity" width="60" label="容重"></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="goodsName"
+        width="70"
+        label="货名"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="type"
+        width="60"
+        label="类型"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="tidalGrainPrice"
+        width="140"
+        label="净重单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="unitDeduction"
+        width="130"
+        label="扣单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="solidGrainPrice"
+        width="140"
+        label="纯重单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="netWeight"
+        width="100"
+        label="净重（公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="pureWeight"
+        width="100"
+        label="纯重（公斤）"
+      ></el-table-column>
+      <!-- <el-table-column class="table_td" prop="bulkDensity" width="60" label="容重"></el-table-column>
       <el-table-column class="table_td" prop="waterContent" width="60" label="水分"></el-table-column>
-      <el-table-column class="table_td" prop="mildewGrain" width="50" label="霉变"></el-table-column>
-      <el-table-column class="table_td" prop="amountIngPayable" width="80" label="应付款(元)"></el-table-column>
-      <el-table-column class="table_td" prop="amountEdPayable" width="80" label="已付款(元)">
+      <el-table-column class="table_td" prop="mildewGrain" width="50" label="霉变"></el-table-column> -->
+      <el-table-column
+        class="table_td"
+        prop="amountIngPayable"
+        width="80"
+        label="应付款(元)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountEdPayable"
+        width="80"
+        label="已付款(元)"
+      >
         <template slot-scope="scope">
           <div @click="showPayImg(scope.row)">
             {{ scope.row.amountEdPayable }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="accountPaymentDate" width="120" label="总账付款日期"></el-table-column>
+      <!-- <el-table-column class="table_td" prop="accountPaymentDate" width="120" label="总账付款日期"></el-table-column>
       <el-table-column class="table_td" prop="paymentVoucherNumber" width="120" label="付款凭证编号"></el-table-column>
       <el-table-column class="table_td" prop="amountIngPayable" width="80" label="自产证明">
         <template slot-scope="scope">
@@ -171,44 +323,80 @@
             src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
           <span v-if="scope.row.selfCertificate != null">1</span>
         </template>
-      </el-table-column>
-      <el-table-column class="table_td" prop="updateDate" label="更新时间" width="150" sortable></el-table-column>
+      </el-table-column> -->
+      <el-table-column
+        class="table_td"
+        prop="updateDate"
+        label="更新时间"
+        width="150"
+        sortable
+      ></el-table-column>
       <el-table-column class="table_td" prop="status" width="80" label="状态">
         <template scope="scope">
-          <span v-if="scope.row.approveStatus&&scope.row.reverseFlag!=1">{{
+          <span v-if="scope.row.approveStatus && scope.row.reverseFlag != 1">{{
             scope.row.approveStatus
           }}</span>
 
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="status" width="80" label="是否开票">
+      <!-- <el-table-column class="table_td" prop="status" width="80" label="是否开票">
         <template scope="scope">
           <span v-if="scope.row.invoicing == '0'">未开票</span>
           <span v-else>已开票</span>
         </template>
-      </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="600">
+      </el-table-column> -->
+      <el-table-column
+        class="table_td"
+        prop="collectionEdPayable"
+        label="操作"
+        width="400"
+      >
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
-            <el-button v-show="
-                (!scope.row.approveStatus ||scope.row.approveStatus == '待结算') &&
-                (scope.row.status == '待结算' || scope.row.status == '已驳回' )||scope.row.approveStatus&&scope.row.reverseFlag==1
-              " @click="settlement(1, scope.row)">结算</el-button>
+            <el-button
+              v-show="
+                ((!scope.row.approveStatus ||
+                  scope.row.approveStatus == '待结算') &&
+                  (scope.row.status == '待结算' ||
+                    scope.row.status == '已驳回')) ||
+                  (scope.row.approveStatus && scope.row.reverseFlag == 1)
+              "
+              @click="settlement(1, scope.row)"
+              >结算</el-button
+            >
           </span>
-          <el-button @click="settlement(2, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.view`">查看
+          <el-button
+            @click="settlement(2, scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
+            >查看
           </el-button>
-          <el-button v-show="scope.row.approveStatus&&scope.row.reverseFlag!=1" @click="settleaccounts(scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.seet`">反结算
+          <el-button
+            v-show="scope.row.approveStatus && scope.row.reverseFlag != 1"
+            @click="settleaccounts(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.seet`"
+            >反结算
           </el-button>
-          <el-button v-show="
+          <el-button
+            v-show="
               scope.row.approveStatus ||
-              (scope.row.status != '待结算' && !scope.row.approveStatus)
-            " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
-          <el-button v-show="
+                (scope.row.status != '待结算' && !scope.row.approveStatus)
+            "
+            @click="print(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
+            >打印</el-button
+          >
+          <el-button
+            v-show="
               (scope.row.approveStatus ||
-              (scope.row.status != '待结算' && !scope.row.approveStatus))&&(compId=='6a713699e08c4cbc97a87f7648a95e3d'||compId=='5d164edcef03476dba6630f86dc96496')
-            " @click="printPY(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">三方打印</el-button>
+                (scope.row.status != '待结算' && !scope.row.approveStatus)) &&
+                (compId == '6a713699e08c4cbc97a87f7648a95e3d' ||
+                  compId == '5d164edcef03476dba6630f86dc96496')
+            "
+            @click="printPY(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
+            >三方打印</el-button
+          >
           <!-- <el-button v-show="
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
@@ -224,16 +412,27 @@
           <!-- <el-button @click="previewPayOrder(scope.row)" class="my-pre"
             v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">预览付款单
           </el-button> -->
-          <el-button type="danger" v-show="
+          <el-button
+            type="danger"
+            v-show="
               (!scope.row.approveStatus ||
                 scope.row.approveStatus == '待结算') &&
-              scope.row.status == '待结算'
-            " @click="del(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.delete`">删除</el-button>
+                scope.row.status == '待结算'
+            "
+            @click="del(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 付款弹窗 -->
-    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true" title="付款">
+    <el-dialog
+      width="40%"
+      :visible.sync="paymentForm"
+      :append-to-body="true"
+      title="付款"
+    >
       <div class="tanchuang">
         <ws-form>
           <ws-info-table>
@@ -241,16 +440,33 @@
               {{ payments.amountNotPayable }}
             </ws-form-item>
             <ws-form-item label="本次付款金额（元）" prop="money">
-              <ws-input type="number" @mousewheel.native.prevent v-model="payments.money" placeholder="请输入本次付款金额（元）"
-                maxlength="100" size="small" />
+              <ws-input
+                type="number"
+                @mousewheel.native.prevent
+                v-model="payments.money"
+                placeholder="请输入本次付款金额（元）"
+                maxlength="100"
+                size="small"
+              />
             </ws-form-item>
             <ws-form-item label="付款日期" prop=" paymentDate">
-              <el-date-picker v-model="payments.paymentDate" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker
+                v-model="payments.paymentDate"
+                type="date"
+                placeholder="选择日期"
+              ></el-date-picker>
             </ws-form-item>
-            <ws-form-item label="上传截图" prop="paymentScreenshot"></ws-form-item>
+            <ws-form-item
+              label="上传截图"
+              prop="paymentScreenshot"
+            ></ws-form-item>
             <div class="upLoad">
-              <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
-                :on-success="handleAvatarSuccess">
+              <el-upload
+                class="avatar-uploader"
+                :action="global.uploadPath"
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess"
+              >
                 <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
@@ -264,21 +480,38 @@
       </div>
     </el-dialog>
     <!-- 付款截图 -->
-    <el-dialog width="50%" :visible.sync="showPayImgs" :append-to-body="true" title="付款截图">
+    <el-dialog
+      width="50%"
+      :visible.sync="showPayImgs"
+      :append-to-body="true"
+      title="付款截图"
+    >
       <!-- <div v-for="(item, index) in payImg" :key="index" class="pay_img">
         <img :src="item" alt class="img" />
       </div> -->
-      <el-upload :action="global.uploadPath" list-type="picture-card"
-        :on-success="handleAvatarSuccess1" :file-list='payImg' :limit='1'>
+      <el-upload
+        :action="global.uploadPath"
+        list-type="picture-card"
+        :on-success="handleAvatarSuccess1"
+        :file-list="payImg"
+        :limit="1"
+      >
         <i slot="default" class="el-icon-plus"></i>
-        <div slot="file" slot-scope="{file}">
-          <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+        <div slot="file" slot-scope="{ file }">
+          <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
 
           <span class="el-upload-list__item-actions">
-            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+            <span
+              class="el-upload-list__item-preview"
+              @click="handlePictureCardPreview(file)"
+            >
               <i class="el-icon-zoom-in"></i>
             </span>
-            <span v-show="!disabled" class="el-upload-list__item-delete" @click="_handleRemove(file)">
+            <span
+              v-show="!disabled"
+              class="el-upload-list__item-delete"
+              @click="_handleRemove(file)"
+            >
               <i class="el-icon-delete"></i>
             </span>
           </span>
@@ -296,16 +529,33 @@
       </div>
     </el-dialog>
     <div style="text-align: center">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"></el-pagination>
-      <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint"
-        :title="printData.compName + '粮食收购检斤结算单'">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      ></el-pagination>
+      <el-dialog
+        width="70%"
+        class="table-content"
+        center
+        :visible.sync="isShowPrint"
+        :title="printData.compName + '粮食收购检斤结算单'"
+      >
         <!-- selectCustomerList:[],
         selectPrintList: [], -->
-        <paymentPrint :printData="printData" :customerInfo="customerList" :showType="ruleForm.type"></paymentPrint>
+        <paymentPrint
+          :printData="printData"
+          :customerInfo="customerList"
+          :showType="ruleForm.type"
+        ></paymentPrint>
         <div style="text-align: center">
-          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+          <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>
           <el-button type="primary" @click="printExtra">打印额外单据</el-button>
@@ -313,19 +563,35 @@
       </el-dialog>
     </div>
     <el-dialog :visible.sync="dialogVisible">
-      <img width="100%" :src="dialogImageUrl" alt="">
+      <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
     <!--客户信息-->
-    <el-dialog width="50%" title="客户信息" :visible.sync="customerInfo" :append-to-body="true" :close="customerclose">
+    <el-dialog
+      width="50%"
+      title="客户信息"
+      :visible.sync="customerInfo"
+      :append-to-body="true"
+      :close="customerclose"
+    >
       <el-form class="customer">
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>身份证正面</h4>
-            <img width="100%" :src="customerlist.cardAddressUrl1" alt class="img_css" />
+            <img
+              width="100%"
+              :src="customerlist.cardAddressUrl1"
+              alt
+              class="img_css"
+            />
           </div>
           <div style="flex: 1; text-align: center">
             <h4>身份证反面</h4>
-            <img width="100%" :src="customerlist.cardAddressUrl2" alt class="img_css" />
+            <img
+              width="100%"
+              :src="customerlist.cardAddressUrl2"
+              alt
+              class="img_css"
+            />
           </div>
         </div>
         <el-form-item label="姓名">
@@ -337,11 +603,21 @@
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>银行卡正面</h4>
-            <img width="100%" :src="customerlist.payeeAddressUrls[0]" alt class="img_css" />
+            <img
+              width="100%"
+              :src="customerlist.payeeAddressUrls[0]"
+              alt
+              class="img_css"
+            />
           </div>
           <div style="flex: 1; text-align: center">
             <h4>银行卡反面</h4>
-            <img width="100%" :src="customerlist.payeeAddressUrls[1]" alt class="img_css" />
+            <img
+              width="100%"
+              :src="customerlist.payeeAddressUrls[1]"
+              alt
+              class="img_css"
+            />
           </div>
         </div>
         <el-form-item label="银行卡号" label-width="100px">
@@ -353,10 +629,18 @@
         <el-form-item label="开户支行" label-width="100px">
           {{ customerlist.bankDepositBranch }}
         </el-form-item>
-        <el-form-item label="收款人姓名" label-width="100px" v-show="customerlist.customerTypeFlag == '1'">
+        <el-form-item
+          label="收款人姓名"
+          label-width="100px"
+          v-show="customerlist.customerTypeFlag == '1'"
+        >
           {{ customerlist.payeeName }}
         </el-form-item>
-        <el-form-item label="收款人身份证号" label-width="120px" v-show="customerlist.customerTypeFlag == '1'">
+        <el-form-item
+          label="收款人身份证号"
+          label-width="120px"
+          v-show="customerlist.customerTypeFlag == '1'"
+        >
           {{ customerlist.payeeNumberCard }}
         </el-form-item>
         <el-form-item label="手机号" label-width="100px">
@@ -370,18 +654,48 @@
         <el-button @click="customerclose">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog width="50%" title="付款回执单" :visible.sync="isPreviewPayOrder" :close="paymentReceiptClose">
+    <el-dialog
+      width="50%"
+      title="付款回执单"
+      :visible.sync="isPreviewPayOrder"
+      :close="paymentReceiptClose"
+    >
       <div class="no-messege" v-show="!paymentReceipt">暂未上传付款回执单</div>
-      <el-image class="my-img" ref="myImg" v-show="paymentReceipt" :src="paymentReceipt"
-        :preview-src-list="[paymentReceipt]">
+      <el-image
+        class="my-img"
+        ref="myImg"
+        v-show="paymentReceipt"
+        :src="paymentReceipt"
+        :preview-src-list="[paymentReceipt]"
+      >
       </el-image>
     </el-dialog>
-    <el-dialog width="30%" title="开票信息" :visible.sync="invoicingshow" :close="invoicingClose">
-      <el-form :label-position="labelposition" label-width="200px" style='text-align:center;' class="customer">
+    <el-dialog
+      width="30%"
+      title="开票信息"
+      :visible.sync="invoicingshow"
+      :close="invoicingClose"
+    >
+      <el-form
+        :label-position="labelposition"
+        label-width="200px"
+        style="text-align:center;"
+        class="customer"
+      >
         <el-form-item label="税控盘：">
-          <el-select v-model="invoiceFlag" placeholder="请选择税控盘" filterable clearable style="margin: 0 10px">
-            <el-option v-for="item in invoicingList" :key="'invoicing'+item.value" :label="item.label"
-              :value="item.value">
+          <el-select
+            v-model="invoiceFlag"
+            placeholder="请选择税控盘"
+            filterable
+            clearable
+            style="margin: 0 10px"
+          >
+            <el-option
+              v-for="item in invoicingList"
+              :key="'invoicing' + item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -391,14 +705,28 @@
         <el-button type="primary" @click="invoicingconfirm">确 定</el-button>
       </span>
     </el-dialog>
-    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')">
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+    >
       <div v-if="!appendixIdss">
-      <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
+        <ws-upload
+          ref="upload"
+          :size-limit="size"
+          @onChange="onChange"
+          :comp-id="compId"
+          :appendix-ids="appendixIdss"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
         />
       </div>
-      <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+      <ws-upload
+        v-else
+        ref="upload"
+        :comp-id="compId"
+        :appendix-ids="appendixIdss"
+        :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
     </WinseaContentModal>
     <div class="mask1" v-show="isShowPrintTypeBills"></div>
     <div class="print-type1" v-show="isShowPrintTypeBills">
@@ -411,34 +739,74 @@
           </el-radio-group> -->
         </div>
 
-        <div class="shdw-style1" v-if="checked||(!ddchecked&&!checked)">
+        <div class="shdw-style1" v-if="checked || (!ddchecked && !checked)">
           <div>收货单位：</div>
           <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
-            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model="companyName"
+            placeholder="请选择"
+            style="width: 75%;"
+          >
+            <el-option
+              v-for="item in companyNameOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName1=='鲅鱼圈金信库'||warehouseName1=='白城内陆港'||warehouseName1=='杜尔伯特家禾库'||warehouseName1=='洮南新友谊兴旺库'||warehouseName1=='甘南宏旗库'||warehouseName1=='哈尔滨依兰库'||warehouseName1=='山东园丰库'">
+        <div
+          v-if="
+            warehouseName1 == '鲅鱼圈金信库' ||
+              warehouseName1 == '白城内陆港' ||
+              warehouseName1 == '杜尔伯特家禾库' ||
+              warehouseName1 == '洮南新友谊兴旺库' ||
+              warehouseName1 == '甘南宏旗库' ||
+              warehouseName1 == '哈尔滨依兰库' ||
+              warehouseName1 == '山东园丰库'
+          "
+        >
           <div class="print-type-ew">
-            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
-            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+            <el-checkbox v-model="checked" @change="changeEw"
+              >打印额外票据</el-checkbox
+            >
+            <el-checkbox v-model="ddchecked" @change="changeEwDD"
+              >单独打印额外票据</el-checkbox
+            >
           </div>
           <div class="ew-print" v-if="printSeparately">
             <div class="row">
               <div>额外客户姓名：</div>
               <!-- <div>{{companyName}}</div> -->
-              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="ewCustomer"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in ewCustomerOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
             <div class="row">
               <div>额外收货单位：</div>
               <!-- <div>{{companyNameEW}}</div> -->
-              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
-                  :value="item.value">
+              <el-select
+                v-model="companyNameEW"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in companyNameEWOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
@@ -453,2113 +821,1943 @@
   </div>
 </template>
 <script>
-  import {
-    dayjs,
-    EventBus
-  } from 'base-core-lib'
-  import {
-    packList,
-  } from '@/model/contarct/index'
-  import {
-    downloadFile
-  } from '@/utils/batchDown'
-  import JSZip from 'jszip'
-  import FileSaver from 'file-saver'
-  import {
-    getpayment,
-    selectWarehouseSelf,
-    delpayment,
-    auditpayment,
-    getpaymentexamine,
-    getCustomerLook,
-    paymentCommit,
-    dandongOrder,
-    invoicing,
-    export1,
-    settlementEdit,
-    workflowcontent,
-    suspendinstance,
-    importWord,
-    getPrint,
-    getwarehouse,
-    uploadself
-  } from '@/model/houseSelfCollect/index'
-  import {
-    posthandle,
-    postqueryhandle
-  } from '@/model/purchasingManagement/index'
-  import paymentPrint from './component/paymentPrint.vue'
-  import {
-    getHp
-  } from '@/utils/getHasPermission'
-  import { getFileList } from '@/model/upload'
-  import download from '../../components/WsDownload/download'
-  import WsUpload from '@/components/WsUpload'
-  export default {
-    components: {
-      paymentPrint,
-      WsUpload
-    },
-    watch: {},
-    data() {
-      return {
-        paymentReceipt: '',
-        isPreviewPayOrder: false,
-        printType: 0,
-        invoiceFlag: '',
-        isShowPrintType1: true,
-        isShowPrintType2: true,
-        isShowPrintType3: true,
-        isShowPrintType4: true,
-        isShowPrintType5:false,
-        customerInfo: false,
-        form: {},
-        labelposition: 'right',
-        multipleLimit:0,
-        invoicingList: [{
+import { dayjs, EventBus } from 'base-core-lib'
+import { packList } from '@/model/contarct/index'
+import { downloadFile } from '@/utils/batchDown'
+import JSZip from 'jszip'
+import FileSaver from 'file-saver'
+import {
+  getpayment,
+  selectWarehouseSelf,
+  delpayment,
+  auditpayment,
+  getpaymentexamine,
+  getCustomerLook,
+  paymentCommit,
+  dandongOrder,
+  invoicing,
+  export1,
+  settlementEdit,
+  workflowcontent,
+  suspendinstance,
+  importWord,
+  getPrint,
+  getwarehouse,
+  uploadself
+} from '@/model/houseSelfCollect/index'
+import { posthandle, postqueryhandle } from '@/model/purchasingManagement/index'
+import paymentPrint from './component/paymentPrint.vue'
+import { getHp } from '@/utils/getHasPermission'
+import { getFileList } from '@/model/upload'
+import download from '../../components/WsDownload/download'
+import WsUpload from '@/components/WsUpload'
+export default {
+  components: {
+    paymentPrint,
+    WsUpload
+  },
+  watch: {},
+  data() {
+    return {
+      paymentReceipt: '',
+      isPreviewPayOrder: false,
+      printType: 0,
+      invoiceFlag: '',
+      isShowPrintType1: true,
+      isShowPrintType2: true,
+      isShowPrintType3: true,
+      isShowPrintType4: true,
+      isShowPrintType5: false,
+      customerInfo: false,
+      form: {},
+      labelposition: 'right',
+      multipleLimit: 0,
+      invoicingList: [
+        {
           label: '航天信息',
           value: 1
-        }, {
+        },
+        {
           label: '百旺',
           value: 2
-        }],
-        formLabelWidth: '300px',
-        invoicing: '',
-        deleteshow: false,
-        customerlist: {
-          payeeAddressUrls: [],
-          bankCard:'',
-          bankDeposit:'',
-          bankDepositBranch:''
-        },
+        }
+      ],
+      formLabelWidth: '300px',
+      invoicing: '',
+      deleteshow: false,
+      customerlist: {
+        payeeAddressUrls: [],
+        bankCard: '',
+        bankDeposit: '',
+        bankDepositBranch: ''
+      },
 
-        ruleForm: {
-          type: [
-            '打印身份证',
-            '打印银行卡',
-            '打印结算凭证',
-            '打印检斤单',
-            // '打印回执单'
-            // '打印发票'
-          ],
-        },
-        row: {},
-        isShowPrintType: false,
-        isShowPrintTypeBills:false,
-        customerList: {
-          customerName: '',
-          customerNumberCard: '',
-          bankCard: '',
-          bankDeposit: '',
-        },
-        selectCustomerList: [],
-        selectPrintList: [],
-        identity: [],
-        //分页
-        currentPage: 1,
-        pageSize: 10,
-        paymentList: [],
-        deptCircularPage: {},
-        deptBudgetTotal: 0,
-        paymentForm: false,
-        searchType: '',
-        searchTypeText: '',
-        searchKeyWord: '',
-        warehouseList: [],
-        warehouseNameKey: '',
-        warehouseName: '',
-        warehouseName1:'',
-        isShowPrint: false,
-        invoicingshow: false,
-        printData: {},
-        warehouse: [],
-        disabled: false,
-        dialogImageUrl: '',
-        dialogVisible: false,
-        value1: '', //付款日期
-        modification: [],
-        userJurisdiction: true,
-        payments: {
-          amountNotPayable: 0,
-          paymentDate: '',
-        },
-        showPayImgs: false,
-        isShowAdopt: false,
-        //上传截图路径
-        imageUrl: '',
-        payImg: [],
-        rowData: {},
-        value2: [],
-        date: {
-          year: dayjs().format('YYYY'),
-          month: dayjs().format('MM'),
-        },
-        accessoryTFs: false,
-        fileList: [],
-        appendixIdsAdd: '',
-        excelFreightspace: [],
-        goodnameList: [],
-        goodNames: [],
-        goodsName: '',
-        printTips:'',
-        compId:'',
-        ddchecked: false,
-        checked: false,
-        ewCustomerOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }],
-        companyNameOptions: [{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }],
-        companyNameEWOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        }],
-        companyName: '黑龙江中天昊元贸易有限公司',
-        companyNameEW: '厦门建发物产有限公司',
-        ewCustomer: '黑龙江利润元粮食贸易有限公司',
-        printSeparately:false,
-        onePrint:false,
-        dialogDataList:[],
-        id:'',
-        accessoryTFs:false,
-        appendixIdss:'',
-        deptBudgetList:{}
+      ruleForm: {
+        type: [
+          '打印身份证',
+          '打印银行卡',
+          '打印结算凭证',
+          '打印检斤单'
+          // '打印回执单'
+          // '打印发票'
+        ]
+      },
+      row: {},
+      isShowPrintType: false,
+      isShowPrintTypeBills: false,
+      customerList: {
+        customerName: '',
+        customerNumberCard: '',
+        bankCard: '',
+        bankDeposit: ''
+      },
+      selectCustomerList: [],
+      selectPrintList: [],
+      identity: [],
+      //分页
+      currentPage: 1,
+      pageSize: 10,
+      paymentList: [],
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      paymentForm: false,
+      searchType: '',
+      searchTypeText: '',
+      searchKeyWord: '',
+      warehouseList: [],
+      warehouseNameKey: '',
+      warehouseName: '',
+      warehouseName1: '',
+      isShowPrint: false,
+      invoicingshow: false,
+      printData: {},
+      warehouse: [],
+      disabled: false,
+      dialogImageUrl: '',
+      dialogVisible: false,
+      value1: '', //付款日期
+      modification: [],
+      userJurisdiction: true,
+      payments: {
+        amountNotPayable: 0,
+        paymentDate: ''
+      },
+      showPayImgs: false,
+      isShowAdopt: false,
+      //上传截图路径
+      imageUrl: '',
+      payImg: [],
+      rowData: {},
+      value2: [],
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM')
+      },
+      accessoryTFs: false,
+      fileList: [],
+      appendixIdsAdd: '',
+      excelFreightspace: [],
+      goodnameList: [],
+      goodNames: [],
+      goodsName: '',
+      printTips: '',
+      compId: '',
+      ddchecked: false,
+      checked: false,
+      ewCustomerOptions: [],
+      companyNameOptions: [],
+      companyNameEWOptions: [],
+      companyName: '',
+      companyNameEW: '',
+      ewCustomer: '',
+      printSeparately: false,
+      onePrint: false,
+      dialogDataList: [],
+      id: '',
+      accessoryTFs: false,
+      appendixIdss: '',
+      deptBudgetList: {}
+    }
+  },
+  mounted() {
+    this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+    this.currentPage = sessionStorage.getItem('currenPage') || 1
+    this.pageSize = Number(sessionStorage.getItem('pageSize')) || 10
+    console.log(this.currentPage, this.pageSize)
+    this.getPassYearFormatDate()
+    // 货名
+    packList({
+      constId: 'CON2'
+    })
+      .toPromise()
+      .then(response => {
+        this.goodnameList = response
+      })
+    this.getWarehouse()
+    this.compId = localStorage.getItem('ws-pf_compId')
+    localStorage.setItem('pengyuPrint', false)
+  },
+  // activated() {
+  //   this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+
+  //   this.getPassYearFormatDate()
+  //   this.getWarehouse()
+  //   // this.getList()
+  // },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs['table'].doLayout()
+    })
+  },
+  methods: {
+    onChange() {
+      this.$refs.upload
+        .handleSaveBill()
+        .then(async response => {
+          this.deptBudgetList.selfCertificate = response
+          this.deptBudgetList.id = this.id
+          uploadself(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()
+        })
+    },
+    fujian(row) {
+      this.id = row.id
+      this.accessoryTFs = true
+      this.appendixIdss = row.selfCertificate
+      console.log(this.appendixIdss)
+    },
+    changeEw(e) {
+      this.ddchecked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
       }
     },
-    mounted() {
-      this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-      this.currentPage = sessionStorage.getItem('currenPage') || 1;
-      this.pageSize =Number(sessionStorage.getItem('pageSize') ) || 10;
-      console.log( this.currentPage,this.pageSize)
-      this.getPassYearFormatDate()
-      // 货名
-      packList({
-            constId: 'CON2'
-          })
-          .toPromise()
-          .then((response) => {
-            this.goodnameList = response
-          })
-      this.getWarehouse()
-      this.compId=localStorage.getItem('ws-pf_compId')
-      localStorage.setItem('pengyuPrint', false)
-      if(localStorage.getItem('compNameoptions')){
-        var company=JSON.parse(localStorage.getItem('compNameoptions'))
-        
-        var extra=company.filter((item)=>{
-          return item!='黑龙江中天昊元贸易有限公司'
-          &&item!='黑龙江利润元粮食贸易有限公司'
-          &&item!= '黑龙江众利合粮食贸易有限公司'
-          &&item!='黑龙江鑫满仓粮食贸易有限公司'
-          &&item!='黑龙江谷香粮食贸易有限公司'
-          &&item!='黑龙江秋收有限公司'
-          &&item!= '黑龙江欣洋粮食贸易有限公司'
-          &&item!='黑龙江益储益运粮食贸易有限公司'
-          &&item!='黑龙江启兴粮食贸易有限公司'
-        })
-        if(extra.length>0){
-          this.companyNameOptions=[
-          {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-        
-          this.ewCustomerOptions= [
-          {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-          this.companyNameEWOptions=[
-          {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-           if(localStorage.getItem('print_company_name')){
-            this.companyName=localStorage.getItem('print_company_name')
-          }else{
-            this.companyName=extra[0]
-          }
-          if(localStorage.getItem('print_company_name_ew')){
-            this.companyNameEW=localStorage.getItem('print_company_name_ew')
-          }else{
-            this.companyNameEW=extra[0]
-          }
-          if(localStorage.getItem('print_customer_name_ew')){
-            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
-          }else{
-            this.ewCustomer=extra[0]
-          }
-          for (let i = 0; i < extra.length; i++) {
-            this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
-          }
-        }
+    changeEwDD(e) {
+      this.checked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
       }
     },
-    // activated() {
-    //   this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-
-    //   this.getPassYearFormatDate()
-    //   this.getWarehouse()
-    //   // this.getList()
-    // },
-    updated() {
-
-      this.$nextTick(() => {
-        this.$refs['table'].doLayout()
-      })
+    makeEWjjSelectPrintList() {
+      let _selectPrint_EWjjSelectPrintList = JSON.parse(
+        JSON.stringify(this.jjSelectPrintList)
+      )
+      for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
+        let _data = _selectPrint_EWjjSelectPrintList[i]
+        _data.compName = this.companyNameEW
+        _data.customer = this.ewCustomer
+      }
+      localStorage.setItem(
+        'selectPrint_EWjjSelectPrintList',
+        JSON.stringify(_selectPrint_EWjjSelectPrintList)
+      )
     },
-    methods: {
-      onChange() {
-        this.$refs.upload
-          .handleSaveBill()
-          .then(async (response) => {
-            this.deptBudgetList.selfCertificate = response
-            this.deptBudgetList.id = this.id
-            uploadself(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()
-          })
-      },
-      fujian(row) {
-        this.id = row.id
-        this.accessoryTFs = true
-        this.appendixIdss = row.selfCertificate
-        console.log(this.appendixIdss)
-      },
-      changeEw(e) {
-        this.ddchecked = false
-        if (e) {
-          this.printSeparately = true
+    printBig1(type, radioType) {
+      this.printData.extra1 = true
+      localStorage.setItem('print_company_name', this.companyName)
+      localStorage.setItem('print_company_name_ew', this.companyNameEW)
+      localStorage.setItem('print_customer_name_ew', this.ewCustomer)
+      localStorage.removeItem('print_in_data')
+      // 打印额外
+      if (this.checked || this.ddchecked) {
+        this.printData.extra2 = true
+        if (this.ddchecked) {
+          localStorage.setItem('print_alone_extra', true)
         } else {
-          this.printSeparately = false
+          localStorage.setItem('print_alone_extra', false)
         }
-      },
-      changeEwDD(e) {
-        this.checked = false
-        if (e) {
-          this.printSeparately = true
+        //  this.selectEW = true;
+      } else {
+        this.printData.extra2 = false
+      }
+      let _list1 = []
+      let _list2 = []
+
+      localStorage.setItem('printData1', _list1)
+      _list1 = JSON.stringify(this.printData)
+      _list2 = JSON.stringify(this.customerList)
+      localStorage.setItem('print_pay_data', _list1)
+      window.open(
+        '../../../../../static/payprint1.html?type=2&customerList=' +
+          _list2 +
+          '&printTypeList=' +
+          this.ruleForm.type,
+        '结算凭证'
+      )
+      // if (type == 1) {
+      //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+      //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
+      //     .checked + '&selectEWDD=' + this.ddchecked)
+      // } else if (type == 2) {
+      //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+      //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
+      // } else {
+      //   console.log(this.dialogDataList)
+
+      //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+      //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+      //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
+      // }
+    },
+    typePrintCannelClick1() {
+      this.dialogDataList = [] //打个打印取消时数组至空
+      this.isShowPrintTypeBills = false
+    },
+    goodsNameChange(e) {
+      if (e.indexOf('全部货名') != -1) {
+        this.multipleLimit = 1
+        this.goodNames = ['全部货名']
+        this.goodsName = ''
+      } else {
+        this.goodsName = this.goodNames.toString()
+        this.multipleLimit = this.goodnameList.length
+      }
+      // this.getList()
+    },
+    importClick(file, fileList) {
+      this.fileTemp = file.raw
+      let fileName = file.raw.name
+      let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+      // 判断上传文件格式
+      if (this.fileTemp) {
+        if (fileType == 'xlsx' || fileType == 'xls') {
+          this.importf(this.fileTemp)
         } else {
-          this.printSeparately = false
-        }
-      },
-      makeEWjjSelectPrintList() {
-        let _selectPrint_EWjjSelectPrintList = JSON.parse(JSON.stringify(this.jjSelectPrintList));
-        for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
-          let _data = _selectPrint_EWjjSelectPrintList[i];
-          _data.compName = this.companyNameEW;
-          _data.customer = this.ewCustomer
+          this.$message({
+            type: 'warning',
+            message: '附件格式错误，请删除后重新上传！'
+          })
         }
-        localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
-      },
-      printBig1(type, radioType) {
-        this.printData.extra1=true
-        localStorage.setItem('print_company_name',this.companyName)
-        localStorage.setItem('print_company_name_ew',this.companyNameEW)
-        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
-           localStorage.removeItem('print_in_data')
-        // 打印额外
-        if (this.checked || this.ddchecked) {
-          this.printData.extra2=true
-          if(this.ddchecked){
-            localStorage.setItem('print_alone_extra',true)
-          }else{
-            localStorage.setItem('print_alone_extra',false)
+      } else {
+        this.$message({
+          type: 'warning',
+          message: '请上传附件！'
+        })
+      }
+    },
+    importf(obj) {
+      this.excelFreightspace = []
+      // this.dialogVisible = true;
+      let _this = this
+      let inputDOM = this.$refs.inputer // 通过DOM取文件数据
+      this.file = event.currentTarget.files[0]
+      var rABS = false //是否将文件读取为二进制字符串
+      var f = this.file
+      var reader = new FileReader()
+      //if (!FileReader.prototype.readAsBinaryString) {
+      FileReader.prototype.readAsBinaryString = function(f) {
+        var binary = ''
+        var rABS = false //是否将文件读取为二进制字符串
+        var pt = this
+        var wb //读取完成的数据
+        var outdata
+        var reader = new FileReader()
+        reader.onload = function(e) {
+          var bytes = new Uint8Array(reader.result)
+          var length = bytes.byteLength
+          for (var i = 0; i < length; i++) {
+            binary += String.fromCharCode(bytes[i])
           }
-          //  this.selectEW = true;
-        }else{
-          this.printData.extra2=false
-        }
-        let _list1 = []
-        let _list2 = []
-        
-          localStorage.setItem('printData1',_list1)
-          _list1 = JSON.stringify(this.printData)
-          _list2 = JSON.stringify(this.customerList)
-          localStorage.setItem('print_pay_data',_list1)
-            window.open(
-              '../../../../../static/payprint1.html?type=2&customerList=' +
-              _list2 +
-              '&printTypeList=' +
-              this.ruleForm.type,
-              '结算凭证'
-            )
-        // if (type == 1) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
-        //     .checked + '&selectEWDD=' + this.ddchecked)
-        // } else if (type == 2) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
-        // } else {
-        //   console.log(this.dialogDataList)
-          
-        //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-        //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-        //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
-        // }
-      },
-      typePrintCannelClick1() {
-        this.dialogDataList = [] //打个打印取消时数组至空
-        this.isShowPrintTypeBills= false
-      },
-      goodsNameChange(e) {
-        if(e.indexOf('全部货名')!=-1){
-          this.multipleLimit=1
-          this.goodNames=['全部货名']
-          this.goodsName = ''
-        }else{
-          this.goodsName=this.goodNames.toString()
-          this.multipleLimit=this.goodnameList.length
-        }
-        // this.getList()
-      },
-      importClick(file, fileList) {
-        this.fileTemp = file.raw
-        let fileName = file.raw.name
-        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
-        // 判断上传文件格式
-        if (this.fileTemp) {
-          if (fileType == 'xlsx' || fileType == 'xls') {
-            this.importf(this.fileTemp)
+          var XLSX = require('xlsx')
+          if (rABS) {
+            wb = XLSX.read(btoa(fixdata(binary)), {
+              //手动转化
+              type: 'base64',
+              cellDates: true
+            })
           } else {
-            this.$message({
-              type: 'warning',
-              message: '附件格式错误，请删除后重新上传！',
+            wb = XLSX.read(binary, {
+              type: 'binary'
             })
           }
-        } else {
-          this.$message({
-            type: 'warning',
-            message: '请上传附件！',
+          // outdata就是你想要的东西 excel导入的数据
+          outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+          // excel 数据再处理
+          let arr = []
+          outdata.map(v => {
+            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+            let jsonString = JSON.stringify(v)
+              .replace(/\//g, '')
+              .replace(/\s/gi, '')
+            v = JSON.parse(jsonString)
+            let obj = {}
+            //xxx代表列名
+            obj.qualityNo = v.业务编号
+            obj.binNumber = v.仓位编号
+            obj.contractNo = v.合同编号
+            obj.customerName = v.客户姓名
+            obj.customerNumberCard = v.身份证号
+            obj.customerPhone = v.客户手机号
+            obj.carNumber = v.车牌号
+            obj.grossWeight = v.毛重
+            obj.pureWeight =
+              v.纯重 && _this.warehouseName == '榆树库' ? v.纯重 : ''
+            obj.tare = v.皮重
+            obj.netWeight = v.净重
+            obj.dryGrainPrice = v.单价
+            obj.money = v.粮款
+            console.log(v.日期)
+            obj.qualityDate = _this.formatDate(v.日期, '-')
+            obj.deductionAmount = v.扣款
+            obj.goodsName = v.货名
+            _this.excelFreightspace.push(obj)
           })
-        }
-      },
-      importf(obj) {
-        this.excelFreightspace = []
-        // this.dialogVisible = true;
-        let _this = this;
-        let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
-        this.file = event.currentTarget.files[0];
-        var rABS = false; //是否将文件读取为二进制字符串
-        var f = this.file;
-        var reader = new FileReader();
-        //if (!FileReader.prototype.readAsBinaryString) {
-        FileReader.prototype.readAsBinaryString = function(f) {
-          var binary = '';
-          var rABS = false; //是否将文件读取为二进制字符串
-          var pt = this;
-          var wb; //读取完成的数据
-          var outdata;
-          var reader = new FileReader();
-          reader.onload = function(e) {
-            var bytes = new Uint8Array(reader.result);
-            var length = bytes.byteLength;
-            for (var i = 0; i < length; i++) {
-              binary += String.fromCharCode(bytes[i]);
-            }
-            var XLSX = require('xlsx');
-            if (rABS) {
-              wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
-                type: 'base64',
-                cellDates: true
-              });
-            } else {
-              wb = XLSX.read(binary, {
-                type: 'binary'
-              });
-            }
-            // outdata就是你想要的东西 excel导入的数据
-            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
-            // excel 数据再处理
-            let arr = []
-            outdata.map(v => {
-              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-              let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
-              v = JSON.parse(jsonString);
-              let obj = {}
-              //xxx代表列名
-              obj.qualityNo = v.业务编号
-              obj.binNumber = v.仓位编号
-              obj.contractNo = v.合同编号
-              obj.customerName = v.客户姓名
-              obj.customerNumberCard = v.身份证号
-              obj.customerPhone = v.客户手机号
-              obj.carNumber = v.车牌号
-              obj.grossWeight = v.毛重
-              obj.pureWeight = v.纯重&&_this.warehouseName=='榆树库'?v.纯重:''
-              obj.tare = v.皮重
-              obj.netWeight = v.净重
-              obj.dryGrainPrice = v.单价
-              obj.money = v.粮款
-              console.log(v.日期)
-              obj.qualityDate = _this.formatDate(v.日期, '-')
-              obj.deductionAmount = v.扣款
-              obj.goodsName = v.货名
-              _this.excelFreightspace.push(obj)
+          if (_this.excelFreightspace) {
+            importWord({
+              warehouseName: _this.warehouseName,
+              qualityInspectionManagementList: _this.excelFreightspace
             })
-            if (_this.excelFreightspace) {
-              importWord({
-                  warehouseName: _this.warehouseName,
-                  qualityInspectionManagementList: _this.excelFreightspace
-                }).toPromise()
-                .then((response) => {
-                  if (response == 'ok') {
-                    _this.getList()
-                    _this.$notify({
-                      title: '成功',
-                      message: '导入成功',
-                      type: 'success'
-                    });
-                  }
-                })
-            }
+              .toPromise()
+              .then(response => {
+                if (response == 'ok') {
+                  _this.getList()
+                  _this.$notify({
+                    title: '成功',
+                    message: '导入成功',
+                    type: 'success'
+                  })
+                }
+              })
           }
-          reader.readAsArrayBuffer(f);
-        }
-        if (rABS) {
-          reader.readAsArrayBuffer(f);
-        } else {
-          reader.readAsBinaryString(f);
         }
-
-      },
-      formatDate(numb, format) {
-        const old = numb - 1;
-        const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
-        const time = new Date(1900, 0, old, 0, 0, t)
-        const year = time.getFullYear();
-        const month = time.getMonth() + 1;
-        const date = time.getDate();
-        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
-          ' 00:00:00'
-      },
-      invoicingClose() {
-        this.invoicingshow = false
-      },
-      settleaccounts(row) {
-        this.$confirm('确定将该笔业务进行反结算操作？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-
+        reader.readAsArrayBuffer(f)
+      }
+      if (rABS) {
+        reader.readAsArrayBuffer(f)
+      } else {
+        reader.readAsBinaryString(f)
+      }
+    },
+    formatDate(numb, format) {
+      const old = numb - 1
+      const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60)
+      const time = new Date(1900, 0, old, 0, 0, t)
+      const year = time.getFullYear()
+      const month = time.getMonth() + 1
+      const date = time.getDate()
+      return (
+        year +
+        format +
+        (month < 10 ? '0' + month : month) +
+        format +
+        (date < 10 ? '0' + date : date) +
+        ' 00:00:00'
+      )
+    },
+    invoicingClose() {
+      this.invoicingshow = false
+    },
+    settleaccounts(row) {
+      this.$confirm('确定将该笔业务进行反结算操作？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
           suspendinstance({
-              workflowId: row.workflowId,
-              id: row.id
-            }).toPromise()
-            .then((response) => {
+            workflowId: row.workflowId,
+            id: row.id
+          })
+            .toPromise()
+            .then(response => {
               this.$message({
                 type: 'success',
                 message: '反结算成功!'
-              });
+              })
               this.getList()
             })
-        }).catch(() => {
+        })
+        .catch(() => {
           return false
-        });
-
-      },
-      imgshow() {
-        this.deleteshow = false
-      },
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      previewPayOrder(val) {
-        this.paymentReceipt = val.paymentScreenshot
-        this.isPreviewPayOrder = true
-      },
-      paymentReceiptClose() {},
-      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(num) {
-        if(num == 2){
-          this.printTips = 2
-        }else if(num==3){
-          this.printTips = 3
-        }
-        this.printType = 1
-        this.isShowPrintType = true
-      },
-      generateClick() {
-          this.$confirm(`确定生成入库单？`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
-          })
-          .then(() => {
-              dandongOrder({}).toPromise()
-						.then((response) => {
+        })
+    },
+    imgshow() {
+      this.deleteshow = false
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    previewPayOrder(val) {
+      this.paymentReceipt = val.paymentScreenshot
+      this.isPreviewPayOrder = true
+    },
+    paymentReceiptClose() {},
+    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(num) {
+      if (num == 2) {
+        this.printTips = 2
+      } else if (num == 3) {
+        this.printTips = 3
+      }
+      this.printType = 1
+      this.isShowPrintType = true
+    },
+    generateClick() {
+      this.$confirm(`确定生成入库单？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+        .then(() => {
+          dandongOrder({})
+            .toPromise()
+            .then(response => {
               this.$notify.success({
-                  title: '成功',
-                  message: '生成入库单成功',
-                })
-                this.getList()
-						})
-          })
-          .catch(() => {
-            return false
-          })
-      },
-      agreementPrint() {
-        var arr = []
-        for (let i = 0; i < this.modification.length; i++) {
-          if (this.modification[i].pictureAddress) {
-            arr.push({
-              fileUrl: this.modification[i].pictureAddress,
-              renameFileName: '结算单' + i + '.png',
+                title: '成功',
+                message: '生成入库单成功'
+              })
+              this.getList()
             })
-          }
-
-        }
-        if (arr.length > 0) {
-          this.filesToRar(arr, '结算单文件')
-        }else{
-          this.$message.error('当前勾选的条目未生成结算单！')
-        }
-      },
-      
-      async exportlist() {
-        let _data = {
-          paymentManagementList: this.modification,
-        }
-        const {
-          data
-        } = await export1(
-          _data, {}, {
-            responseType: 'blob',
-          }
-        ).toPromise()
-        downloadFile({
-          res: data,
-          fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }结算凭证`,
-          type: 'xls',
         })
-      },
-      /**文件打包
-       * arrImages:文件list:[{fileUrl:文件url,renameFileName:文件名}]
-       * filename 压缩包名
-       * */
-      filesToRar(arrImages, filename) {
-        let _this = this
-        let zip = new JSZip()
-        let cache = {}
-        let promises = []
-        _this.title = '正在加载压缩文件'
-        for (let item of arrImages) {
-          const promise = _this.getImgArrayBuffer(item.fileUrl).then((data) => {
-            // 下载文件, 并存成ArrayBuffer对象(blob)
-            zip.file(item.renameFileName, data, {
-              binary: true
-            }) // 逐个添加文件
-            cache[item.renameFileName] = data
+        .catch(() => {
+          return false
+        })
+    },
+    agreementPrint() {
+      var arr = []
+      for (let i = 0; i < this.modification.length; i++) {
+        if (this.modification[i].pictureAddress) {
+          arr.push({
+            fileUrl: this.modification[i].pictureAddress,
+            renameFileName: '结算单' + i + '.png'
           })
-          promises.push(promise)
         }
-        Promise.all(promises)
-          .then(() => {
-            zip.generateAsync({
+      }
+      if (arr.length > 0) {
+        this.filesToRar(arr, '结算单文件')
+      } else {
+        this.$message.error('当前勾选的条目未生成结算单！')
+      }
+    },
+
+    async exportlist() {
+      let _data = {
+        paymentManagementList: this.modification
+      }
+      const { data } = await export1(
+        _data,
+        {},
+        {
+          responseType: 'blob'
+        }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${this.date.year +
+          (this.date.month ? `-${this.date.month}` : '')}结算凭证`,
+        type: 'xls'
+      })
+    },
+    /**文件打包
+     * arrImages:文件list:[{fileUrl:文件url,renameFileName:文件名}]
+     * filename 压缩包名
+     * */
+    filesToRar(arrImages, filename) {
+      let _this = this
+      let zip = new JSZip()
+      let cache = {}
+      let promises = []
+      _this.title = '正在加载压缩文件'
+      for (let item of arrImages) {
+        const promise = _this.getImgArrayBuffer(item.fileUrl).then(data => {
+          // 下载文件, 并存成ArrayBuffer对象(blob)
+          zip.file(item.renameFileName, data, {
+            binary: true
+          }) // 逐个添加文件
+          cache[item.renameFileName] = data
+        })
+        promises.push(promise)
+      }
+      Promise.all(promises)
+        .then(() => {
+          zip
+            .generateAsync({
               type: 'blob'
-            }).then((content) => {
+            })
+            .then(content => {
               _this.title = '正在压缩'
               // 生成二进制流
               FileSaver.saveAs(content, filename) // 利用file-saver保存文件 自定义文件名
               _this.title = '压缩完成'
             })
-          })
-          .catch((res) => {
-            console.log(res)
-            _this.$message.error('文件压缩失败')
-          })
-      },
-      //获取文件blob
-      getImgArrayBuffer(url) {
-        let _this = this
-        return new Promise((resolve, reject) => {
-          //通过请求获取文件blob格式
-          let xmlhttp = new XMLHttpRequest()
-          xmlhttp.open('GET', url, true)
-          xmlhttp.responseType = 'blob'
-          xmlhttp.onload = function() {
-            if (this.status == 200) {
-              resolve(this.response)
-            } else {
-              reject(this.status)
+        })
+        .catch(res => {
+          console.log(res)
+          _this.$message.error('文件压缩失败')
+        })
+    },
+    //获取文件blob
+    getImgArrayBuffer(url) {
+      let _this = this
+      return new Promise((resolve, reject) => {
+        //通过请求获取文件blob格式
+        let xmlhttp = new XMLHttpRequest()
+        xmlhttp.open('GET', url, true)
+        xmlhttp.responseType = 'blob'
+        xmlhttp.onload = function() {
+          if (this.status == 200) {
+            resolve(this.response)
+          } else {
+            reject(this.status)
+          }
+        }
+        xmlhttp.send()
+      })
+    },
+    invoicingconfirm() {
+      let data = {
+        paymentManagementList: this.modification
+      }
+      for (let i = 0; i < this.modification.length; i++) {
+        this.modification[i].invoiceFlag = this.invoiceFlag
+        if (
+          this.modification[i].status != '全部付款' &&
+          this.modification[i].status != '部分付款' &&
+          this.modification[i].status != '已通过'
+        ) {
+          this.$message.error('开票只能选择全部付款或部分付款或已通过！')
+          return
+        }
+      }
+      //开票
+      invoicing(data)
+        .toPromise()
+        .then(response => {
+          if (response.length > 0) {
+            var arr = []
+            for (let i = 0; i < response.length; i++) {
+              let _name = response[i].replace(
+                'https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/',
+                ''
+              )
+              arr.push({
+                fileUrl: response[i],
+                renameFileName: _name
+              })
             }
+            this.filesToRar(arr, '开票XML文件')
+          } else {
+            this.$message.error('暂无数据')
+            return
           }
-          xmlhttp.send()
         })
-      },
-      invoicingconfirm() {
-        let data = {
-          paymentManagementList: this.modification,
-        }
-        for (let i = 0; i < this.modification.length; i++) {
-          this.modification[i].invoiceFlag = this.invoiceFlag
-          if (
-            this.modification[i].status != '全部付款' &&
-            this.modification[i].status != '部分付款' &&
-            this.modification[i].status != '已通过'
+        .catch(() => {})
+    },
+    invoicingClick() {
+      this.invoicingshow = true
+      // let data = JSON.stringify({
+      //   paymentManagementList : this.modification
+      // })
+      // //开票
+      //   invoicing(data)
+      //   .toPromise()
+      //   .then(response => {
+      //     console.log(response)
+      //   })
+    },
+    customer(row) {
+      getCustomerLook({
+        id: row.identityId,
+        authenticationStatusKey: 7
+      })
+        .toPromise()
+        .then(response => {
+          this.customerInfo = true
+          this.customerlist = response
+          this.customerlist.cardAddressUrl1 = this.customerlist.cardAddressUrl.split(
+            ','
+          )[0]
+          this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(
+            ','
+          )[1]
+          if (row.payeeAddressUrl) {
+            this.customerlist.payeeAddressUrls = row.payeeAddressUrl.split(',')
+          } else {
+            this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(
+              ','
+            )
+          }
+          if (row.bankCard) {
+            this.customerlist.bankCard = row.bankCard
+          }
+          if (row.bankDeposit) {
+            this.customerlist.bankDeposit = row.bankDeposit
+          }
+          if (row.bankDepositBranch) {
+            this.customerlist.bankDepositBranch = row.bankDepositBranch
+          }
+        })
+    },
+    customerclose(e) {
+      //  row.textcss = false
+      this.customerInfo = false
+    },
+    //合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      var _number = [11, 12, 16, 17]
+      if (this.modification.length > 0) {
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+          } else if (
+            index === _number[0] ||
+            index === _number[1] ||
+            index === _number[2] ||
+            index === _number[3] ||
+            index === _number[4]
           ) {
-            this.$message.error('开票只能选择全部付款或部分付款或已通过！')
-            return
+            const values = this.modification.map(item =>
+              Number(item[column.property])
+            )
+            if (!values.every(value => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return prev + curr
+                } else {
+                  return prev
+                }
+              }, 0)
+              sums[index] = sums[index].toFixed(3)
+            } else {
+              // sums[index] = '元'
+            }
+          } else {
+            sums[index] = '--'
           }
-        }
-        //开票
-        invoicing(data)
-          .toPromise()
-          .then((response) => {
-            if (response.length > 0) {
-              var arr = []
-              for (let i = 0; i < response.length; i++) {
-                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/', '')
-                arr.push({
-                  fileUrl: response[i],
-                  renameFileName: _name,
-                })
-              }
-              this.filesToRar(arr, '开票XML文件')
+        })
+      } else {
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+          } else if (
+            index === _number[0] ||
+            index === _number[1] ||
+            index === _number[2] ||
+            index === _number[3] ||
+            index === _number[4]
+          ) {
+            const values = data.map(item => Number(item[column.property]))
+            if (!values.every(value => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return prev + curr
+                } else {
+                  return prev
+                }
+              }, 0)
+              sums[index] = sums[index].toFixed(3)
             } else {
-              this.$message.error('暂无数据')
-              return
+              // sums[index] = '元'
             }
-          })
-          .catch(() => {})
-      },
-      invoicingClick() {
-        this.invoicingshow = true
-        // let data = JSON.stringify({
-        //   paymentManagementList : this.modification
-        // })
-        // //开票
-        //   invoicing(data)
-        //   .toPromise()
-        //   .then(response => {
-        //     console.log(response)
-        //   })
+          } else {
+            sums[index] = '--'
+          }
+        })
+      }
 
-      },
-      customer(row) {
+      // sums[6]=sums[6].toFixed(2)
+      // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
+      return sums
+    },
+    selectType(val) {
+      for (let i = 0; i < this.ruleForm.type.length; i++) {
+        switch (this.ruleForm.type[i]) {
+          case '打印身份证':
+            this.isShowPrintType1 = !this.isShowPrintType1
+            break
+          case '打印银行卡':
+            this.isShowPrintType2 = !this.isShowPrintType2
+            break
+          case '打印结算凭证':
+            this.isShowPrintType3 = !this.isShowPrintType3
+            break
+          case '打印检斤单':
+            this.isShowPrintType4 = !this.isShowPrintType4
+            break
+          case '打印自产证明':
+            this.isShowPrintType5 = !this.isShowPrintType5
+            break
+          // case '打印回执单':
+          //   this.isShowPrintType5 = !this.isShowPrintType5
+          //   break
+        }
+      }
+    },
+    typePrintCannelClick() {
+      this.isShowPrintType = false
+    },
+    async typePrintClick(type) {
+      // type 1批量打印 0单个打印
+      //  this.isShowPrint = true
+      this.selectCustomerList = []
+      this.selectPrintList = []
+      if (type == 1) {
+        let index1 = 0
+        let index2 = 0
+        for (let i = 0; i < this.modification.length; i++) {
+          //  getCustomerLook({
+          //     id: this.modification[i].identityId,
+          //     authenticationStatusKey: 7,
+          //   })
+          //   .toPromise()
+          //   .then((response) => {
+          //     this.selectCustomerList.push(response)
+          //     index2++
+          //     if (
+          //       index1 == this.modification.length &&
+          //       index2 == this.modification.length
+          //     ) {
+          //       this.printData.compName = ''
+          //       // this.isShowPrint = true
+          //       this.printBig()
+          //     }
+          var response = await getpaymentexamine({
+            id: this.modification[i].id
+          }).toPromise()
 
-        getCustomerLook({
-            id: row.identityId,
-            authenticationStatusKey: 7,
-          })
-          .toPromise()
-          .then((response) => {
-            this.customerInfo = true
-            this.customerlist = response
-            this.customerlist.cardAddressUrl1 =
-              this.customerlist.cardAddressUrl.split(',')[0]
-            this.customerlist.cardAddressUrl2 =
-              this.customerlist.cardAddressUrl.split(',')[1]
-            if(row.payeeAddressUrl){
-              this.customerlist.payeeAddressUrls = row.payeeAddressUrl.split(',')
-            }  
-            else{
-              this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
-            }
-            if(row.bankCard){
-              this.customerlist.bankCard = row.bankCard
-            }
-            if(row.bankDeposit){
-              this.customerlist.bankDeposit = row.bankDeposit
-            }
-            if(row.bankDepositBranch){
-              this.customerlist.bankDepositBranch = row.bankDepositBranch
-            }
-          })
-      },
-      customerclose(e) {
-        //  row.textcss = false
-        this.customerInfo = false
-      },
-      //合计
-      getSummaries(param) {
-        const {
-          columns,
-          data
-        } = param
-        const sums = []
-        var _number = [11,12, 16, 17]
-        if (this.modification.length > 0) {
-          columns.forEach((column, index) => {
-            if (index === 0) {
-              sums[index] = '合计'
-            
-            } else if (index === _number[0] || index === _number[1] || index === _number[2] || index === _number[
-                3] || index === _number[4]) {
-              const values = this.modification.map((item) => Number(item[column.property]))
-              if (!values.every((value) => isNaN(value))) {
-                sums[index] = values.reduce((prev, curr) => {
-                  const value = Number(curr)
-                  if (!isNaN(value)) {
-                    return prev + curr
-                  } else {
-                    return prev
-                  }
-                }, 0)
-                sums[index] = sums[index].toFixed(3)
-              } else {
-                // sums[index] = '元'
-              }
-            } else {
-              sums[index] = '--'
-            }
-          })
-        } else {
-          columns.forEach((column, index) => {
-            if (index === 0) {
-              sums[index] = '合计'
-            } else if (index === _number[0] || index === _number[1] || index === _number[2] || index === _number[
-                3] || index === _number[4]) {
-              const values = data.map((item) => Number(item[column.property]))
-              if (!values.every((value) => isNaN(value))) {
-                sums[index] = values.reduce((prev, curr) => {
-                  const value = Number(curr)
-                  if (!isNaN(value)) {
-                    return prev + curr
-                  } else {
-                    return prev
-                  }
-                }, 0)
-                sums[index] = sums[index].toFixed(3)
-              } else {
-                // sums[index] = '元'
-              }
-            } else {
-              sums[index] = '--'
-            }
-          })
-        }
-
-        // sums[6]=sums[6].toFixed(2)
-        // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
-        return sums
-      },
-      selectType(val) {
-        for (let i = 0; i < this.ruleForm.type.length; i++) {
-          switch (this.ruleForm.type[i]) {
-            case '打印身份证':
-              this.isShowPrintType1 = !this.isShowPrintType1
-              break
-            case '打印银行卡':
-              this.isShowPrintType2 = !this.isShowPrintType2
-              break
-            case '打印结算凭证':
-              this.isShowPrintType3 = !this.isShowPrintType3
-              break
-            case '打印检斤单':
-              this.isShowPrintType4 = !this.isShowPrintType4
-              break
-            case '打印自产证明':
-              this.isShowPrintType5 = !this.isShowPrintType5
-              break
-            // case '打印回执单':
-            //   this.isShowPrintType5 = !this.isShowPrintType5
-            //   break
+          if (response.compName == '黑龙江秋收有限公司') {
+            response.compName = '黑龙江中天昊元贸易有限公司'
           }
-        }
-      },
-      typePrintCannelClick() {
-        this.isShowPrintType = false
-      },
-      async typePrintClick(type) {
-        // type 1批量打印 0单个打印
-        //  this.isShowPrint = true
-        this.selectCustomerList = []
-        this.selectPrintList = []
-        if (type == 1) {
-          let index1 = 0
-          let index2 = 0
-          for (let i = 0; i < this.modification.length; i++) {
-            //  getCustomerLook({  
-            //     id: this.modification[i].identityId,
-            //     authenticationStatusKey: 7,
-            //   })
-            //   .toPromise()
-            //   .then((response) => {
-            //     this.selectCustomerList.push(response)
-            //     index2++
-            //     if (
-            //       index1 == this.modification.length &&
-            //       index2 == this.modification.length
-            //     ) {
-            //       this.printData.compName = ''
-            //       // this.isShowPrint = true
-            //       this.printBig()
-            //     }
-                var response=await getpaymentexamine({
-                    id: this.modification[i].id,
-                  })
-                  .toPromise()
 
-                    if (response.compName == '黑龙江秋收有限公司') {
-                      response.compName = '黑龙江中天昊元贸易有限公司'
-                    }
-                    
-                    index1++
-                    let date = new Date()
-                    response.currentTime =
-                      date.getFullYear() +
-                      '年' +
-                      Number(date.getMonth() + 1) +
-                      '月' +
-                      date.getDate() +
-                      '日'
-                    this.selectCustomerList.push(response)
-                    this.selectPrintList.push(response)
-                    if (
-                      index1 == this.modification.length 
-                    ) {
-                      this.printData.compName = ''
-                      // this.isShowPrint = true
-                      this.printBig()
-                    }
-                  if(response.selfCertificate){
-                    response.selfCertificateURL=await getFileList({ appendixIds:response.selfCertificate }).toPromise()
-                  }
-              // })
+          index1++
+          let date = new Date()
+          response.currentTime =
+            date.getFullYear() +
+            '年' +
+            Number(date.getMonth() + 1) +
+            '月' +
+            date.getDate() +
+            '日'
+          this.selectCustomerList.push(response)
+          this.selectPrintList.push(response)
+          if (index1 == this.modification.length) {
+            this.printData.compName = ''
+            // this.isShowPrint = true
+            this.printBig()
+          }
+          if (response.selfCertificate) {
+            response.selfCertificateURL = await getFileList({
+              appendixIds: response.selfCertificate
+            }).toPromise()
           }
-        } else {
-          await getpaymentexamine({
-                    id: this.rowData.id,
-                  })
-                  .toPromise()
-                  .then((response) => {
-                    this.printData = response
-                    console.log(this.printData)
-                    if (response.compName == '黑龙江秋收有限公司') {
-                      this.printData.compName = '黑龙江中天昊元贸易有限公司'
-                    }
-                    this.isShowPrint = true
-                    // if(this.printData.solidGrainPrice){
-                    //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-                    // }
-                    let date = new Date()
-                    this.printData.currentTime =
-                      date.getFullYear() +
-                      '年' +
-                      Number(date.getMonth() + 1) +
-                      '月' +
-                      date.getDate() +
-                      '日'
-                  })
-          // let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
-          // let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
-          // this.$axios.all([
-          //   this.$axios.get(_url1, {
-          //     params: {
-          //       id: this.rowData.identityId,
-          //       authenticationStatusKey: 7,
-          //     }
-          //   }).then(res => res.data),
-          //   this.$axios.get(_url2, {
-          //     params: {
-          //       id: this.rowData.id
-          //     }
-          //   }).then(res => res.data)
-          // ]).then(
-          //   this.$axios.spread((val1, val2) => {
-          //     // val 是数组中每个接口返回的值 res.data
-          //     console.log('两个接口全部加载完成', val1, val2);
-              
-            // })
-          // ).catch(err => {
-          //   console.log(err);
           // })
-          // getCustomerLook({
-          //     id: this.rowData.identityId,
-          //     authenticationStatusKey: 7,
-          //   })
-          //   .toPromise()
-          //   .then((response) => {
-          //     this.customerList = response
-          //     getpaymentexamine({
-          //         id: this.rowData.id,
-          //       })
-          //       .toPromise()
-          //       .then((response) => {
-          //         this.printData = response
-          //         this.isShowPrint = true
-          //         // if(this.printData.solidGrainPrice){
-          //         //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-          //         // }
-          //         let date = new Date()
-          //         this.printData.currentTime =
-          //           date.getFullYear() +
-          //           '年' +
-          //           Number(date.getMonth() + 1) +
-          //           '月' +
-          //           date.getDate() +
-          //           '日'
-          //       })
-          //   })
         }
-      },
-      handleRowClick(row) {
-        // if (row.status != '已驳回') {
-        //   if (
-        //     row.taskId == null &&
-        //     row.status != '已通过' &&
-        //     row.status != '部分付款'
-        //   ) {
-        //     return false
-        //   } else {
-        //     this.$refs.paymentList.toggleRowSelection(row)
-        //     return true
-        //   }
-        // } else {
-        //   this.$refs.paymentList.toggleRowSelection(row)
-        //   return true
-        // }
-        return true
-      },
-      handlepass() {
-        var that = this
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择要通过的条目')
-        } else {
-          for (let i = 0; i < this.modification.length; i++) {
-            if (!this.modification[i].taskId) {
-              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
-              return
+      } else {
+        await getpaymentexamine({
+          id: this.rowData.id
+        })
+          .toPromise()
+          .then(response => {
+            this.printData = response
+            console.log(this.printData)
+            if (response.compName == '黑龙江秋收有限公司') {
+              this.printData.compName = '黑龙江中天昊元贸易有限公司'
             }
-          }
-          this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
-          }).then(() => {
-            that.audit(this.modification[0], 0, true, 2)
+            this.isShowPrint = true
+            // if(this.printData.solidGrainPrice){
+            //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+            // }
+            let date = new Date()
+            this.printData.currentTime =
+              date.getFullYear() +
+              '年' +
+              Number(date.getMonth() + 1) +
+              '月' +
+              date.getDate() +
+              '日'
           })
-        }
-      },
-      //查看付款截图
-      showPayImg(row) {
-        // if (!row.paymentScreenshot) {
-        //   this.$message({
-        //     message: '暂无付款截图！',
-        //     type: 'warning',
+        // let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
+        // let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
+        // this.$axios.all([
+        //   this.$axios.get(_url1, {
+        //     params: {
+        //       id: this.rowData.identityId,
+        //       authenticationStatusKey: 7,
+        //     }
+        //   }).then(res => res.data),
+        //   this.$axios.get(_url2, {
+        //     params: {
+        //       id: this.rowData.id
+        //     }
+        //   }).then(res => res.data)
+        // ]).then(
+        //   this.$axios.spread((val1, val2) => {
+        //     // val 是数组中每个接口返回的值 res.data
+        //     console.log('两个接口全部加载完成', val1, val2);
+
+        // })
+        // ).catch(err => {
+        //   console.log(err);
+        // })
+        // getCustomerLook({
+        //     id: this.rowData.identityId,
+        //     authenticationStatusKey: 7,
         //   })
-        //   return
-        // } else {
-        this.showPayImgs = true
-        this.id = row.id
-        var arr = row.paymentScreenshot.split('$')
-        console.log(arr)
-        this.payImg = []
-        for (let i = 0; i < arr.length; i++) {
-          if (arr[i] != '') {
-            this.payImg.push({
-              url: arr[i]
-            })
+        //   .toPromise()
+        //   .then((response) => {
+        //     this.customerList = response
+        //     getpaymentexamine({
+        //         id: this.rowData.id,
+        //       })
+        //       .toPromise()
+        //       .then((response) => {
+        //         this.printData = response
+        //         this.isShowPrint = true
+        //         // if(this.printData.solidGrainPrice){
+        //         //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+        //         // }
+        //         let date = new Date()
+        //         this.printData.currentTime =
+        //           date.getFullYear() +
+        //           '年' +
+        //           Number(date.getMonth() + 1) +
+        //           '月' +
+        //           date.getDate() +
+        //           '日'
+        //       })
+        //   })
+      }
+    },
+    handleRowClick(row) {
+      // if (row.status != '已驳回') {
+      //   if (
+      //     row.taskId == null &&
+      //     row.status != '已通过' &&
+      //     row.status != '部分付款'
+      //   ) {
+      //     return false
+      //   } else {
+      //     this.$refs.paymentList.toggleRowSelection(row)
+      //     return true
+      //   }
+      // } else {
+      //   this.$refs.paymentList.toggleRowSelection(row)
+      //   return true
+      // }
+      return true
+    },
+    handlepass() {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
+        for (let i = 0; i < this.modification.length; i++) {
+          if (!this.modification[i].taskId) {
+            this.$message.warning(
+              '勾选数据中存在超出账号权限的审核条目，请重新勾选！'
+            )
+            return
           }
         }
-        // }
-      },
-      getWarehouse() {
-        let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
-        _wareHouse = JSON.parse(_wareHouse)
-        getwarehouse({
-            compId: localStorage.getItem('ws-pf_compId'),
+        this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning'
+        }).then(() => {
+          that.audit(this.modification[0], 0, true, 2)
+        })
+      }
+    },
+    //查看付款截图
+    showPayImg(row) {
+      // if (!row.paymentScreenshot) {
+      //   this.$message({
+      //     message: '暂无付款截图！',
+      //     type: 'warning',
+      //   })
+      //   return
+      // } else {
+      this.showPayImgs = true
+      this.id = row.id
+      var arr = row.paymentScreenshot.split('$')
+      console.log(arr)
+      this.payImg = []
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i] != '') {
+          this.payImg.push({
+            url: arr[i]
           })
-          .toPromise()
-          .then((response) => {
-            this.warehouseList = response
-            if (this.$route.query.warehouseName) {
-              //判断是否在任务页面进来
-              this.warehouseName = this.$route.query.warehouseName
-              this.warehouseNameKey = this.$route.query.warehouseName
-              this.getList()
-            } else {
-              for (let index = 0; index < this.warehouseList.length; index++) {
-                if (_wareHouse && _wareHouse.value == this.warehouseList[index].warehouseName) {
-                  this.warehouseName = this.warehouseList[index].warehouseName
-                  this.warehouseNameKey = this.warehouseList[index].warehouseName
-                  break
+        }
+      }
+      // }
+    },
+    getWarehouse() {
+      let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
+      _wareHouse = JSON.parse(_wareHouse)
+      getwarehouse({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+        .toPromise()
+        .then(response => {
+          this.warehouseList = response
+          if (this.$route.query.warehouseName) {
+            //判断是否在任务页面进来
+            this.warehouseName = this.$route.query.warehouseName
+            this.warehouseNameKey = this.$route.query.warehouseName
+            this.getList()
+          } else {
+            for (let index = 0; index < this.warehouseList.length; index++) {
+              if (
+                _wareHouse &&
+                _wareHouse.value == this.warehouseList[index].warehouseName
+              ) {
+                this.warehouseName = this.warehouseList[index].warehouseName
+                this.warehouseNameKey = this.warehouseList[index].warehouseName
+                break
+              } else {
+                this.warehouseNameKey = this.warehouseList[0].id
+                if (this.warehouseName) {
+                  this.warehouseNameKey = this.WAREHOUSE[3].payname
                 } else {
-                  this.warehouseNameKey = this.warehouseList[0].id
-                  if (this.warehouseName) {
-                    this.warehouseNameKey = this.WAREHOUSE[3].payname
-                  } else {
-                    this.WAREHOUSE[3].payname = this.warehouseList[0].id
-                    this.warehouseName = this.warehouseList[0].warehouseName
-                  }
+                  this.WAREHOUSE[3].payname = this.warehouseList[0].id
+                  this.warehouseName = this.warehouseList[0].warehouseName
                 }
               }
             }
-            this.getList()
-          })
-      },
-      //上传付款截图
-      handleAvatarSuccess(e) {
-        this.imageUrl = e.data.url
-      },
-      handleAvatarSuccess1(file) {
-        if (this.payImg[0]) {
-          this.$set(this.payImg[0], 'url', file.data.url)
-        } else {
-          this.payImg[0] = {
-            url: file.data.url
           }
+          this.getList()
+        })
+    },
+    //上传付款截图
+    handleAvatarSuccess(e) {
+      this.imageUrl = e.data.url
+    },
+    handleAvatarSuccess1(file) {
+      if (this.payImg[0]) {
+        this.$set(this.payImg[0], 'url', file.data.url)
+      } else {
+        this.payImg[0] = {
+          url: file.data.url
         }
-        settlementEdit({
-            id: this.id,
-            paymentScreenshot: this.payImg[0].url
-          }).toPromise()
-          .then((response) => {
-            this.showPayImgs = false
-            this.$message.success('修改成功')
-            this.getList()
-          })
-      },
-      _handleRemove() {
-        this.payImg[0].url = ''
-        settlementEdit({
-            id: this.id,
-            paymentScreenshot: this.payImg[0].url
-          }).toPromise()
-          .then((response) => {
-            this.showPayImgs = false
-            this.$message.success('修改成功')
-            this.getList()
-          })
-      },
-      printSmall() {
-        window.open(
-          '../../../../../static/payprint.html?type=1&dataList=' +
+      }
+      settlementEdit({
+        id: this.id,
+        paymentScreenshot: this.payImg[0].url
+      })
+        .toPromise()
+        .then(response => {
+          this.showPayImgs = false
+          this.$message.success('修改成功')
+          this.getList()
+        })
+    },
+    _handleRemove() {
+      this.payImg[0].url = ''
+      settlementEdit({
+        id: this.id,
+        paymentScreenshot: this.payImg[0].url
+      })
+        .toPromise()
+        .then(response => {
+          this.showPayImgs = false
+          this.$message.success('修改成功')
+          this.getList()
+        })
+    },
+    printSmall() {
+      window.open(
+        '../../../../../static/payprint.html?type=1&dataList=' +
           JSON.stringify(this.printData)
+      )
+    },
+    printExtra() {
+      this.isShowPrint = false
+      this.isShowPrintTypeBills = true
+    },
+    printBig() {
+      localStorage.setItem('print_alone_extra', false)
+      let _list1 = []
+      let _list2 = []
+      if (this.printType == 1) {
+        localStorage.setItem('cwprint', true)
+        // if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
+        //   // 财务批量打印数据
+        //   for (let i = 0; i < this.selectPrintList.length; i++) {
+        //     if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
+        //       this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
+        //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
+        //     } else {
+        //       this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
+        //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
+        //     }
+        //   }
+        // }
+
+        localStorage.setItem(
+          'selectPrint_selectPrintList',
+          JSON.stringify(this.selectPrintList)
         )
-      },
-      printExtra(){
-        this.isShowPrint=false
-        this.isShowPrintTypeBills=true
-      },
-      printBig() {
-        localStorage.setItem('print_alone_extra',false)
-        let _list1 = []
-        let _list2 = []
-        if (this.printType == 1) {
-          localStorage.setItem('cwprint', true)
-          // if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
-          //   // 财务批量打印数据
-          //   for (let i = 0; i < this.selectPrintList.length; i++) {
-          //     if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
-          //       this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
-          //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
-          //     } else {
-          //       this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
-          //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
-          //     }
+        localStorage.setItem(
+          'selectPrint_selectCustomerList',
+          JSON.stringify(this.selectCustomerList)
+        )
+      } else if (this.printType == 0) {
+        localStorage.setItem('cwprint', true)
+        _list1 = JSON.stringify(this.printData)
+        localStorage.setItem('printData1', _list1)
+        _list2 = JSON.stringify(this.customerList)
+      } else {
+        localStorage.setItem('printData1', _list1)
+        _list1 = JSON.stringify(this.printData)
+        _list2 = JSON.stringify(this.customerList)
+      }
+      // if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
+      //     window.open(
+      //       '../../../../../static/payprint.html?type=2&dataList=' +
+      //       _list1 +
+      //       '&customerList=' +
+      //       _list2 +
+      //       '&printTypeList=' +
+      //       this.ruleForm.type,
+      //       '结算凭证'
+      //     )
+      //   }
+      //   else{
+
+      localStorage.setItem('print_pay_data', _list1)
+      if (this.printTips == 2) {
+        //业务批量打印
+        window.open(
+          '../../../../../static/payprint2.html?type=2&customerList=' +
+            _list2 +
+            '&printTypeList=' +
+            this.ruleForm.type,
+          '结算凭证'
+        )
+      } else if (this.printTips == 3) {
+        window.open(
+          '../../../../../static/payprint3.html?type=2&customerList=' +
+            _list2 +
+            '&printTypeList=' +
+            this.ruleForm.type,
+          '结算凭证'
+        )
+      } else {
+        window.open(
+          '../../../../../static/payprint1.html?type=2&customerList=' +
+            _list2 +
+            '&printTypeList=' +
+            this.ruleForm.type,
+          '结算凭证'
+        )
+      }
+      // }
+    },
+    detailpage() {
+      sessionStorage.setItem('currentPage', this.currentPage)
+      sessionStorage.setItem('pageSize', this.pageSize)
+    },
+    getList() {
+      for (let _temp = 0; _temp < this.warehouseList.length; _temp++) {
+        if (this.warehouseName == this.warehouseList[_temp].warehouseName) {
+          // if(this.warehouseList[_temp].goodsNameInfos){
+          //   for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
+          //     const res = new Map()
+          //     this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
+          //       res.set(arr.goodsName, 1))
           //   }
           // }
-          
-          localStorage.setItem(
-            'selectPrint_selectPrintList',
-            JSON.stringify(this.selectPrintList)
-          )
-          localStorage.setItem(
-            'selectPrint_selectCustomerList',
-            JSON.stringify(this.selectCustomerList)
-          )
-       
-
+        }
+      }
+      this.payments = {
+        amountNotPayable: 0,
+        paymentDate: ''
+      }
+      var searchParam = ''
+      if (this.searchType != -1) {
+        searchParam = this.searchType
+      }
+      var startDate = ''
+      var endDate = ''
+      if (this.value2) {
+        startDate = this.value2[0] ? this.value2[0] : ''
+        endDate = this.value2[1] ? this.value2[1] : ''
+      }
 
-        } else if (this.printType == 0) {
-          localStorage.setItem('cwprint', true)
-          _list1 = JSON.stringify(this.printData)
-          localStorage.setItem('printData1',_list1)
-          _list2 = JSON.stringify(this.customerList)
-        } else {
-          localStorage.setItem('printData1',_list1)
-          _list1 = JSON.stringify(this.printData)
-          _list2 = JSON.stringify(this.customerList)
+      getpayment({
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        startDate: startDate,
+        endDate: endDate,
+        searchKeyWord: this.searchKeyWord,
+        searchType: searchParam,
+        warehouseName: this.warehouseName,
+        managementType: 1,
+        invoicing: this.invoicing,
+        compId: localStorage.getItem('ws-pf_compId'),
+        goodsName: this.goodsName == '全部货名' ? '' : this.goodsName
+      })
+        .toPromise()
+        .then(response => {
+          this.paymentList = response.records
+          this.deptBudgetTotal = response.total
+        })
+      // getJurisdiction({
+      //   managementType: 1,
+      //   warehouseName: this.warehouseName,
+      //   compId: localStorage.getItem('ws-pf_compId')
+      // })
+      //   .toPromise()
+      //   .then(response => {
+      //     this.isShowAdopt = response
+      //   })
+    },
+    del(row) {
+      this.$confirm(
+        '对应的质检和检斤记录将一并删除，是否确定删除操作？',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
-        // if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
-        //     window.open(
-        //       '../../../../../static/payprint.html?type=2&dataList=' +
-        //       _list1 +
-        //       '&customerList=' +
-        //       _list2 +
-        //       '&printTypeList=' +
-        //       this.ruleForm.type,
-        //       '结算凭证'
-        //     )
-        //   }
-        //   else{
-            
-          localStorage.setItem('print_pay_data',_list1)
-          if(this.printTips == 2){//业务批量打印
-            window.open(
-              '../../../../../static/payprint2.html?type=2&customerList=' +
-              _list2 +
-              '&printTypeList=' +
-              this.ruleForm.type,
-              '结算凭证'
-            )
-          } else if(this.printTips == 3){
-            window.open(
-              '../../../../../static/payprint3.html?type=2&customerList=' +
-              _list2 +
-              '&printTypeList=' +
-              this.ruleForm.type,
-              '结算凭证'
-            )
-          } else{
-            window.open(
-              '../../../../../static/payprint1.html?type=2&customerList=' +
-              _list2 +
-              '&printTypeList=' +
-              this.ruleForm.type,
-              '结算凭证'
-            )
+      )
+        .then(() => {
+          delpayment({
+            id: row.id
+          })
+            .toPromise()
+            .then(response => {
+              this.$message.success('删除成功')
+              this.getList()
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    screen(num) {
+      if (num == 0) {
+        this.searchType = -1
+        this.invoicing = num
+      } else {
+        this.invoicing = ''
+        this.searchType = num
+      }
+      this.currentPage = 1
+      this.getList()
+    },
+    find() {
+      this.getList()
+    },
+    settlement(index, row) {
+      this.detailpage()
+      if (row.goodsName) {
+        localStorage.setItem('paymentManagementReturn', false)
+        this.$router.push({
+          path: 'settlement',
+          query: {
+            type: index,
+            id: row.id
           }
-          // }
-        
-      },
-      detailpage(){
-          sessionStorage.setItem('currentPage',this.currentPage)
-          sessionStorage.setItem('pageSize',this.pageSize)
-        },
-      getList() {
-        for (let _temp = 0; _temp < this.warehouseList.length; _temp++) {
-          if (this.warehouseName == this.warehouseList[_temp].warehouseName) {
-            // if(this.warehouseList[_temp].goodsNameInfos){
-            //   for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
-            //     const res = new Map()
-            //     this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
-            //       res.set(arr.goodsName, 1))
-            //   }
-            // }
-            
+        })
+      }
+    },
+    payment() {
+      this.imageUrl = ''
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要付款的条目')
+      } else {
+        for (let i = 0; i < this.modification.length; i++) {
+          if (this.modification[i].status != '已驳回') {
+            if (
+              this.modification[i].approveStatus == '待决策人审核' ||
+              this.modification[i].approveStatus == '待财务审核' ||
+              this.modification[i].status == '全部付款'
+            ) {
+              this.$message.error(
+                '请选择状态为已通过且待结算或者部分付款的条目'
+              )
+              return false
+            } else {
+            }
+          } else {
+            this.$message.error('状态为已驳回的条目不能付款')
+            return false
           }
         }
-        this.payments = {
-          amountNotPayable: 0,
-          paymentDate: '',
-        }
-        var searchParam = ''
-        if (this.searchType != -1) {
-          searchParam = this.searchType
+        let sum = 0
+        let count = 0
+        for (let i = 0; i < this.modification.length; i++) {
+          sum += this.modification[i].amountIngPayable
+          count += this.modification[i].amountEdPayable
         }
-        var startDate = ''
-        var endDate = ''
-        if (this.value2) {
-          startDate = this.value2[0] ? this.value2[0] : ''
-          endDate = this.value2[1] ? this.value2[1] : ''
+        this.payments.amountNotPayable = (sum - count).toFixed(2)
+        this.paymentForm = true
+      }
+    },
+    paymentSubmit() {
+      if (!this.payments.money) {
+        this.$message({
+          message: '付款金额不能为空',
+          type: 'warning'
+        })
+        return
+      }
+      if (
+        Number(this.payments.money) > Number(this.payments.amountNotPayable)
+      ) {
+        this.$message({
+          message: '付款金额不能超过未付金额',
+          type: 'warning'
+        })
+        return
+      }
+      if (!this.payments.paymentDate) {
+        this.$message({
+          message: '付款日期不能为空',
+          type: 'warning'
+        })
+        return
+      }
+      if (!this.imageUrl) {
+        this.$message({
+          message: '请上传付款截图 ',
+          type: 'warning'
+        })
+        return
+      }
+      this.payments.paymentScreenshot = this.imageUrl
+      this.payments.cashier = localStorage.getItem('ws-pf_staffName')
+      this.payments.paymentManagementList = this.modification
+      this.$confirm('确定提交付款信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          //付款提交
+          paymentCommit(this.payments)
+            .toPromise()
+            .then(response => {
+              this.$notify.success({
+                title: '成功',
+                message: '付款成功'
+              })
+              this.paymentForm = false
+              this.getList()
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    reject() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要驳回的条目')
+      } else {
+        for (let i = 0; i < this.modification.length; i++) {
+          if (!this.modification[i].taskId) {
+            this.$message.warning(
+              '勾选数据中存在超出账号权限的审核条目，请重新勾选！'
+            )
+            return
+          }
         }
-        
-        getpayment({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            startDate: startDate,
-            endDate: endDate,
-            searchKeyWord: this.searchKeyWord,
-            searchType: searchParam,
-            warehouseName: this.warehouseName,
-            managementType: 1,
-            invoicing: this.invoicing,
-            compId: localStorage.getItem('ws-pf_compId'),
-            goodsName: this.goodsName == '全部货名' ? '' : this.goodsName
-          })
-          .toPromise()
-          .then((response) => {
-            this.paymentList = response.records
-            this.deptBudgetTotal = response.total
-          })
-        // getJurisdiction({
-        //   managementType: 1,
-        //   warehouseName: this.warehouseName,
-        //   compId: localStorage.getItem('ws-pf_compId')
-        // })
-        //   .toPromise()
-        //   .then(response => {
-        //     this.isShowAdopt = response
-        //   })
-      },
-      del(row) {
-        this.$confirm(
-            '对应的质检和检斤记录将一并删除，是否确定删除操作？',
-            '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            }
-          )
+        this.$confirm('是否确定驳回？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
-            delpayment({
-                id: row.id,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$message.success('删除成功')
-                this.getList()
-              })
+            this.audit(this.modification[0], 0, false, '', '')
           })
           .catch(() => {
             return false
           })
-      },
-      screen(num) {
-        if (num == 0) {
-          this.searchType = -1
-          this.invoicing = num
-        } else {
-          this.invoicing = ''
-          this.searchType = num
-        }
-        this.currentPage = 1
-        this.getList()
-      },
-      find() {
-        this.getList()
-      },
-      settlement(index, row) {
-        this.detailpage()
-        if (row.goodsName) {
-          localStorage.setItem('paymentManagementReturn', false)
-          this.$router.push({
-            path: 'settlement',
-            query: {
-              type: index,
-              id: row.id,
-            },
+      }
+    },
+    audit(item, index, status, status2, reason) {
+      if (index < this.modification.length) {
+        if (status == true && item.status == '已驳回') {
+          auditpayment({
+            compId: localStorage.getItem('ws-pf_compId'),
+            id: item.id
           })
-        }
-      },
-      payment() {
-        this.imageUrl = ''
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择要付款的条目')
+            .toPromise()
+            .then(response => {
+              if (index == 0) {
+                workflowcontent({
+                  workflowId: item.workflowId,
+                  businessKey: item.id,
+                  type: '付款管理'
+                })
+                  .toPromise()
+                  .then(response1 => {
+                    console.log(response1)
+                    // this.$message.success('审核成功')
+                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                  })
+              }
+              this.audit(
+                this.modification[index + 1],
+                index + 1,
+                status,
+                status2,
+                reason
+              )
+            })
         } else {
-          for (let i = 0; i < this.modification.length; i++) {
-            if (this.modification[i].status != '已驳回') {
-              if (
-                this.modification[i].approveStatus == '待决策人审核' || this.modification[i].approveStatus == '待财务审核' ||
-                this.modification[i].status == '全部付款'
-              ) {
-                this.$message.error(
-                  '请选择状态为已通过且待结算或者部分付款的条目'
-                )
-                return false
-              } else {}
-            } else {
-              this.$message.error('状态为已驳回的条目不能付款')
-              return false
-
-            }
-          }
-          let sum = 0
-          let count = 0
-          for (let i = 0; i < this.modification.length; i++) {
-            sum += this.modification[i].amountIngPayable
-            count += this.modification[i].amountEdPayable
-          }
-          this.payments.amountNotPayable = (sum - count).toFixed(2)
-          this.paymentForm = true
-        }
-      },
-      paymentSubmit() {
-        if (!this.payments.money) {
-          this.$message({
-            message: '付款金额不能为空',
-            type: 'warning',
+          posthandle({
+            taskId: item.taskId,
+            approved: status,
+            auditMind: reason != undefined ? '已驳回' : '',
+            needReapply: status2 != undefined ? true : false
           })
-          return
-        }
-        if (
-          Number(this.payments.money) > Number(this.payments.amountNotPayable)
-        ) {
-          this.$message({
-            message: '付款金额不能超过未付金额',
-            type: 'warning',
-          })
-          return
+            .toPromise()
+            .then(response => {
+              if (index == 0) {
+                workflowcontent({
+                  workflowId: item.workflowId,
+                  businessKey: item.id,
+                  type: '付款管理'
+                })
+                  .toPromise()
+                  .then(response1 => {
+                    console.log(response1)
+                    // this.$message.success('审核成功')
+                    // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+                  })
+              }
+              // postqueryhandle({workflowId:item.workflowId}).toPromise()
+              // .then((response) => {
+              this.audit(
+                this.modification[index + 1],
+                index + 1,
+                status,
+                status2,
+                reason
+              )
+              // })
+            })
+            .catch(req => {
+              this.$message.warning(req.message)
+            })
         }
-        if (!this.payments.paymentDate) {
-          this.$message({
-            message: '付款日期不能为空',
-            type: 'warning',
-          })
-          return
+      } else {
+        if (status == true) {
+          this.$message.success('通过成功')
+          this.getList()
+        } else if (status == false) {
+          this.$message.success('驳回成功')
+          this.getList()
         }
-        if (!this.imageUrl) {
-          this.$message({
-            message: '请上传付款截图 ',
-            type: 'warning',
-          })
-          return
+      }
+    },
+    adopt() {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
+        for (let i = 0; i < this.modification.length; i++) {
+          if (!this.modification[i].taskId) {
+            this.$message.warning(
+              '勾选数据中存在超出账号权限的审核条目，请重新勾选！'
+            )
+            return
+          }
         }
-        this.payments.paymentScreenshot = this.imageUrl
-        this.payments.cashier = localStorage.getItem('ws-pf_staffName')
-        this.payments.paymentManagementList = this.modification
-        this.$confirm('确定提交付款信息？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
+        this.$confirm('是否确定通过？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
-            //付款提交
-            paymentCommit(this.payments)
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '付款成功',
-                })
-                this.paymentForm = false
-                this.getList()
-              })
+            this.audit(this.modification[0], 0, true)
           })
           .catch(() => {
             return false
           })
-      },
-      reject() {
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择要驳回的条目')
-        } else {
-          for (let i = 0; i < this.modification.length; i++) {
-            if (!this.modification[i].taskId) {
-              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
-              return
-            }
-          }
-          this.$confirm('是否确定驳回？', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            })
-            .then(() => {
-              this.audit(this.modification[0], 0, false, '', '')
-            })
-            .catch(() => {
-              return false
-            })
-        }
-      },
-      audit(item, index, status, status2, reason) {
-        if (index < this.modification.length) {
-          if (status == true && item.status == '已驳回') {
-            auditpayment({
-                compId: localStorage.getItem('ws-pf_compId'),
-                id: item.id,
-              })
-              .toPromise()
-              .then((response) => {
-                if (index == 0) {
-                  workflowcontent({
-                      workflowId: item.workflowId,
-                      businessKey: item.id,
-                      type: '付款管理'
-                    }).toPromise()
-                    .then((response1) => {
-                      console.log(response1)
-                      // this.$message.success('审核成功')
-                      // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-                    })
-                }
-                this.audit(
-                  this.modification[index + 1],
-                  index + 1,
-                  status,
-                  status2,
-                  reason
-                )
-              })
-          } else {
-            posthandle({
-                taskId: item.taskId,
-                approved: status,
-                auditMind: reason != undefined ? '已驳回' : '',
-                needReapply: status2 != undefined ? true : false,
-              })
-              .toPromise()
-              .then((response) => {
-                if (index == 0) {
-                  workflowcontent({
-                      workflowId: item.workflowId,
-                      businessKey: item.id,
-                      type: '付款管理'
-                    }).toPromise()
-                    .then((response1) => {
-                      console.log(response1)
-                      // this.$message.success('审核成功')
-                      // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-                    })
-                }
-                // postqueryhandle({workflowId:item.workflowId}).toPromise()
-                // .then((response) => {
-                this.audit(
-                  this.modification[index + 1],
-                  index + 1,
-                  status,
-                  status2,
-                  reason
-                )
-                // })
-              })
-              .catch((req) => {
-                this.$message.warning(req.message)
-              })
-          }
-        } else {
-          if (status == true) {
-            this.$message.success('通过成功')
-            this.getList()
-          } else if (status == false) {
-            this.$message.success('驳回成功')
-            this.getList()
-          }
-        }
-      },
-      adopt() {
-        var that = this
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择要通过的条目')
-        } else {
-          for (let i = 0; i < this.modification.length; i++) {
-            if (!this.modification[i].taskId) {
-              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
-              return
-            }
-          }
-          this.$confirm('是否确定通过？', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            })
-            .then(() => {
-              this.audit(this.modification[0], 0, true)
-            })
-            .catch(() => {
-              return false
-            })
-        }
-      },
-      print1(row,num) {
+      }
+    },
+    print1(row, num) {
       localStorage.setItem('pengyuPrint', false)
-        if(num == 2){
-          this.printTips = 2
-        }
-        this.printType = 0
-        this.isShowPrintType = true
-        this.rowData = row
-        localStorage.setItem('cwprint', true)
-      },
-      print(row) {
-        this.warehouseName1=row.warehouseName
+      if (num == 2) {
+        this.printTips = 2
+      }
+      this.printType = 0
+      this.isShowPrintType = true
+      this.rowData = row
+      localStorage.setItem('cwprint', true)
+    },
+    print(row) {
+      this.warehouseName1 = row.warehouseName
       localStorage.setItem('pengyuPrint', false)
-        this.printType = 2
-        localStorage.setItem('cwprint', false)
-        getpaymentexamine({
-            id: row.id,
-          })
-          .toPromise()
-          .then((response) => {
-            this.printData = response
-            if (response.compName == '黑龙江秋收有限公司') {
-              this.printData.compName = '黑龙江中天昊元贸易有限公司'
-            }
-            this.isShowPrint = true
-            // if(this.printData.solidGrainPrice){
-            //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-            // }
-            let date = new Date()
-            this.printData.currentTime =
-              date.getFullYear() +
-              '年' +
-              Number(date.getMonth() + 1) +
-              '月' +
-              date.getDate() +
-              '日'
-          })
-      },
-      printPY(row) {
-        this.printType = 2
-        localStorage.setItem('cwprint', false)
-        localStorage.setItem('pengyuPrint', true)
-        getpaymentexamine({
-            id: row.id,
-          })
-          .toPromise()
-          .then((response) => {
-            this.printData = response
-            if (response.compName == '黑龙江秋收有限公司') {
-              this.printData.compName = '黑龙江中天昊元贸易有限公司'
-            }
-            this.isShowPrint = true
-            // if(this.printData.solidGrainPrice){
-            //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-            // }
-            let date = new Date()
-            this.printData.currentTime =
-              date.getFullYear() +
-              '年' +
-              Number(date.getMonth() + 1) +
-              '月' +
-              date.getDate() +
-              '日'
-          })
-      },
-      examine() {
-        if (this.modification.length == 0) {
-          this.$message.warning('请选择要审核的条目')
-        } else {
-          this.$confirm('审核通过后，任务将发送给财务，是否确定通过？', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            })
-            .then(() => {})
-            .catch(() => {
-              return false
-            })
-        }
-      },
-      selectInit(row) {
-        //在这里一定要记得类型匹配的上。
-        // if (row.status != '已驳回') {
-          if (
-            row.taskId == null ) {
-            return false
-          } else {
-            return true
+      this.printType = 2
+      localStorage.setItem('cwprint', false)
+      getpaymentexamine({
+        id: row.id
+      })
+        .toPromise()
+        .then(response => {
+          this.printData = response
+          if (response.compName == '黑龙江秋收有限公司') {
+            this.printData.compName = '黑龙江中天昊元贸易有限公司'
           }
-        // } else {
-        //   return true
-        // }
-        // return true
-      },
-      handleSelectionChange(val) {
-        this.modification = val
-      },
-      warehouseChange(e) {
-        for (let i = 0; i < this.warehouseList.length; i++) {
-          if (this.warehouseList[i].id == this.warehouseNameKey) {
-            this.warehouseName = this.warehouseList[i].warehouseName
-
-
-            localStorage.setItem('houseSelfCollect_house1',
-              JSON.stringify({
-                value: this.warehouseList[i].warehouseName,
-                warehouseId: this.warehouseList[i].id,
-                allowEdit: this.warehouseList[i].allowEdit,
-                monitorUrl1: this.warehouseList[i].monitorUrl1,
-                monitorUrl2: this.warehouseList[i].monitorUrl2,
-                warehouseNo: this.warehouseList[i].commonWarehouseNo,
-                compId: localStorage.getItem('ws-pf_compId')
-              })
-            )
-            this.WAREHOUSE[3].payname = this.warehouseList[i].id
+          this.isShowPrint = true
+          // if(this.printData.solidGrainPrice){
+          //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+          // }
+          let date = new Date()
+          this.printData.currentTime =
+            date.getFullYear() +
+            '年' +
+            Number(date.getMonth() + 1) +
+            '月' +
+            date.getDate() +
+            '日'
+        })
+    },
+    printPY(row) {
+      this.printType = 2
+      localStorage.setItem('cwprint', false)
+      localStorage.setItem('pengyuPrint', true)
+      getpaymentexamine({
+        id: row.id
+      })
+        .toPromise()
+        .then(response => {
+          this.printData = response
+          if (response.compName == '黑龙江秋收有限公司') {
+            this.printData.compName = '黑龙江中天昊元贸易有限公司'
           }
+          this.isShowPrint = true
+          // if(this.printData.solidGrainPrice){
+          //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+          // }
+          let date = new Date()
+          this.printData.currentTime =
+            date.getFullYear() +
+            '年' +
+            Number(date.getMonth() + 1) +
+            '月' +
+            date.getDate() +
+            '日'
+        })
+    },
+    examine() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要审核的条目')
+      } else {
+        this.$confirm('审核通过后，任务将发送给财务，是否确定通过？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {})
+          .catch(() => {
+            return false
+          })
+      }
+    },
+    selectInit(row) {
+      //在这里一定要记得类型匹配的上。
+      // if (row.status != '已驳回') {
+      if (row.taskId == null) {
+        return false
+      } else {
+        return true
+      }
+      // } else {
+      //   return true
+      // }
+      // return true
+    },
+    handleSelectionChange(val) {
+      this.modification = val
+    },
+    warehouseChange(e) {
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseList[i].id == this.warehouseNameKey) {
+          this.warehouseName = this.warehouseList[i].warehouseName
+
+          localStorage.setItem(
+            'houseSelfCollect_house1',
+            JSON.stringify({
+              value: this.warehouseList[i].warehouseName,
+              warehouseId: this.warehouseList[i].id,
+              allowEdit: this.warehouseList[i].allowEdit,
+              monitorUrl1: this.warehouseList[i].monitorUrl1,
+              monitorUrl2: this.warehouseList[i].monitorUrl2,
+              warehouseNo: this.warehouseList[i].commonWarehouseNo,
+              compId: localStorage.getItem('ws-pf_compId')
+            })
+          )
+          this.WAREHOUSE[3].payname = this.warehouseList[i].id
         }
-        this.getList()
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
+      }
+      this.getList()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
     },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    }
   }
+}
 </script>
 <style lang="scss" scoped>
-  .ws-info-table {
-    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%;
-    min-width: 125px;
-    text-align: center;
-    background: #ffffff;
-    color: #8890b1;
-  }
-
-  /deep/.ws-info-table .el-form-item .el-form-item__content {
-    border: none;
-  }
-
-  /deep/.el-dialog__title {
-    font-size: 24px !important;
-  }
-
-  /deep/.el-dialog__header {
-    text-align: center !important;
-    padding: 10px 0 !important;
-    height: auto !important;
-    // border-bottom: none !important;
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-  }
-
-  .title {
-    font-size: 16px;
-    font-weight: 600;
-  }
-
-  table,
-  table tr th,
-  table tr td {
-    border: 2px solid #333333;
-    padding: 5px 0;
-  }
-
-  table {
+.ws-info-table {
+  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%;
+  min-width: 125px;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+
+/deep/.el-dialog__title {
+  font-size: 24px !important;
+}
+
+/deep/.el-dialog__header {
+  text-align: center !important;
+  padding: 10px 0 !important;
+  height: auto !important;
+  // border-bottom: none !important;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+
+.title {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+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;
+}
+
+.formItem {
+  width: 70% !important;
+}
+
+/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 {
+  text-align: center;
+}
+
+.title {
+  padding: 10px;
+  text-align: center;
+}
+
+.tanchuang {
+  margin: 0 auto;
+}
+
+.tanchuang .ws-info-table {
+  display: initial;
+}
+
+.tanchuang .ws-info-table .el-form-item {
+  margin: 0 auto;
+  text-align: center;
+}
+
+.upLoad {
+  width: 40%;
+  margin: 0 auto;
+  // border: 1px solid #8890b1;
+  // border-radius: 3px;
+}
+
+// .avatar{
+//   width: 150px;
+//   height: 150px;
+// }
+.avatar-uploader {
+  position: relative;
+  width: 178px;
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  width: 178px;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+  border: 1px solid #8890b1;
+  border-radius: 5px;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  border: 1px solid #8890b1;
+  border-radius: 5px;
+  display: block;
+}
+.inline-block {
+  display: inline-block;
+}
+.pay_img {
+  width: 50%;
+  // display: flex;
+  display: inline-block;
+
+  .img {
+    height: 350px;
     width: 100%;
-    min-height: 25px;
-    line-height: 25px;
-    text-align: center;
-    border-collapse: collapse;
-    border: 3px solid #333333;
   }
-
-  .formItem {
-    width: 70% !important;
-  }
-
-  /deep/.el-table .el-table__header .cell,
-  /deep/.el-table .cell {
-    text-align: center;
-    line-height: 15px;
+}
+
+.print-type {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 200px;
+  height: 250px;
+  background: white;
+  border-radius: 10px;
+  z-index: 999;
+}
+
+.label-width {
+  width: 100%;
+}
+
+.mask {
+  background: black;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  z-index: 99;
+  opacity: 0.3;
+}
+
+.print-type-title {
+  text-align: center;
+  font-size: 18px;
+  margin: 20px;
+}
+
+.bottom-btn {
+  margin: 20px 0;
+  text-align: center;
+}
+
+.print-type-checkbox {
+  padding-left: 20px;
+}
+
+.img_css {
+  width: 90%;
+  height: 220px;
+}
+
+.text_css {
+  color: #5878e8;
+}
+
+/deep/.base_header_layout {
+  height: 48px;
+}
+
+.warehouse_select {
+  width: 100%;
+}
+
+.el-button {
+  margin: 5px;
+}
+
+.no-messege {
+  text-align: center;
+  font-size: 30px;
+  padding: 50px;
+}
+
+.my-img {
+  width: 200px;
+  height: 200px;
+}
+
+.el-icon-delete {
+  font-size: 20px;
+}
+
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  margin: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.mask1 {
+  background: black;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  z-index: 1001;
+  opacity: 0.3;
+}
+
+.print-type-title1 {
+  text-align: center;
+  font-size: 18px;
+  margin: 20px;
+}
+
+.print-type-checkbox1 {
+  // padding-left: 20px;
+}
+
+.print-type1 {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 440px;
+  height: 320px;
+  background: white;
+  border-radius: 10px;
+  z-index: 1001;
+}
+.shdw-style1 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  margin-top: 20px;
+}
+.print-type-ew {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20px;
+
+  /deep/.el-radio__label {
+    font-size: 14px;
   }
 
-  /deep/.el-table--enable-row-transition .el-table__body td {
-    text-align: center;
-  }
-
-  .title {
-    padding: 10px;
-    text-align: center;
-  }
-
-  .tanchuang {
-    margin: 0 auto;
-  }
-
-  .tanchuang .ws-info-table {
-    display: initial;
-  }
-
-  .tanchuang .ws-info-table .el-form-item {
-    margin: 0 auto;
-    text-align: center;
-  }
+  margin-top: 10px;
+}
+.ew-print {
+  padding: 0 20px;
+  margin-top: 10px;
 
-  .upLoad {
-    width: 40%;
-    margin: 0 auto;
-    // border: 1px solid #8890b1;
-    // border-radius: 3px;
-  }
-
-  // .avatar{
-  //   width: 150px;
-  //   height: 150px;
-  // }
-  .avatar-uploader {
-    position: relative;
-    width: 178px;
-  }
-
-  .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-    width: 178px;
-  }
-
-  .avatar-uploader .el-upload:hover {
-    border-color: #409eff;
-  }
-
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
-    border: 1px solid #8890b1;
-    border-radius: 5px;
-  }
-
-  .avatar {
-    width: 178px;
-    height: 178px;
-    border: 1px solid #8890b1;
-    border-radius: 5px;
-    display: block;
-  }
-  .inline-block{
-    display:inline-block;
-  }
-  .pay_img {
-    width: 50%;
-    // display: flex;
-    display: inline-block;
-
-    .img {
-      height: 350px;
-      width: 100%;
-    }
-  }
-
-  .print-type {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 200px;
-    height: 250px;
-    background: white;
-    border-radius: 10px;
-    z-index: 999;
-  }
-
-  .label-width {
-    width: 100%;
-  }
-
-  .mask {
-    background: black;
-    width: 100vw;
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    z-index: 99;
-    opacity: 0.3;
-  }
-
-  .print-type-title {
-    text-align: center;
-    font-size: 18px;
-    margin: 20px;
-  }
-
-  .bottom-btn {
-    margin: 20px 0;
-    text-align: center;
-  }
-
-  .print-type-checkbox {
-    padding-left: 20px;
-  }
-
-  .img_css {
-    width: 90%;
-    height: 220px;
-  }
-
-  .text_css {
-    color: #5878e8;
-  }
-
-  /deep/.base_header_layout {
-    height: 48px;
-  }
-
-  .warehouse_select {
-    width: 100%;
-  }
-
-  .el-button {
-    margin: 5px;
-  }
-
-  .no-messege {
-    text-align: center;
-    font-size: 30px;
-    padding: 50px;
-  }
-
-  .my-img {
-    width: 200px;
-    height: 200px;
-  }
-
-  .el-icon-delete {
-    font-size: 20px;
-  }
-
-  /deep/.base_header_layout .find.el-button--primary {
-    width: 30px;
-    margin: 0;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-  }
-
-  /deep/.base_header_layout .findinput input {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-  }
-  .mask1 {
-    background: black;
-    width: 100vw;
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    z-index: 1001;
-    opacity: 0.3;
-  }
-
-  .print-type-title1 {
-    text-align: center;
-    font-size: 18px;
-    margin: 20px;
-  }
-
-
-  .print-type-checkbox1 {
-    // padding-left: 20px;
-  }
-
-  .print-type1 {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 440px;
-    height: 320px;
-    background: white;
-    border-radius: 10px;
-    z-index: 1001;
-  }
-  .shdw-style1 {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 20px;
-    margin-top: 20px;
-  }
-  .print-type-ew {
+  // display: flex;
+  // justify-content: space-between;
+  // align-content: center;
+  .row {
     display: flex;
-    justify-content: space-between;
-    padding: 0 20px;
-
-    /deep/.el-radio__label {
-      font-size: 14px;
-    }
-
-    margin-top: 10px;
-  }
-  .ew-print {
-    padding: 0 20px;
     margin-top: 10px;
-
-    // display: flex;
-    // justify-content: space-between;
-    // align-content: center;
-    .row {
-      display: flex;
-      margin-top: 10px;
-      align-items: center;
-    }
+    align-items: center;
   }
-  // /deep/.el-select-dropdown{
-  //   z-index:2036;
-  // }
-</style>
+}
+// /deep/.el-select-dropdown{
+//   z-index:2036;
+// }
+</style>

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -7,47 +7,111 @@
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button type="primary" size="small" @click="returnsales()">
-          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png" alt="" />返回
+          <img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回
         </el-button>
       </el-col>
     </el-row>
     <div class="center">
       <el-row>
         <el-col :span="6">
-          <el-button :type="warehousingType == 1?'primary':''" size="small" @click="changeType(1)"
-            class="btn_css btn_topcss">贸易入库</el-button>
-          <el-button :type="warehousingType == 3?'primary':''" size="small" @click="changeType(3)"
-            class="btn_css btn_topcss">收购入库</el-button>
+          <el-button
+            :type="warehousingType == 1 ? 'primary' : ''"
+            size="small"
+            @click="changeType(1)"
+            class="btn_css btn_topcss"
+            >贸易入库</el-button
+          >
+          <el-button
+            :type="warehousingType == 3 ? 'primary' : ''"
+            size="small"
+            @click="changeType(3)"
+            class="btn_css btn_topcss"
+            >收购入库</el-button
+          >
         </el-col>
         <el-col :span="18" class="bg-right">
           <div style="display:flex">
-            <el-select style='margin-right:5px;width:40%' v-model="warehouseName" placeholder="请选择仓库名" @change="warehouseNameChange">
-              <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
-                :value="item.warehouseName"></el-option>
+            <el-select
+              style="margin-right:5px;width:40%"
+              v-model="warehouseName"
+              placeholder="请选择仓库名"
+              @change="warehouseNameChange"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.id"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              ></el-option>
             </el-select>
-             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-          start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
-        </el-date-picker>
-            <el-input :placeholder="warehousingType == 1 ? '可按业务编号、合同编号/移库编号、车牌号查找':'可按业务编号、车牌号、客户名查找'" clearable
-              v-model="searchKeyWord" class="search_css"></el-input>
+            <el-date-picker
+              v-model="value2"
+              type="daterange"
+              align="right"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions"
+            >
+            </el-date-picker>
+            <el-input
+              :placeholder="
+                warehousingType == 1
+                  ? '可按业务编号、合同编号/移库编号、车牌号查找'
+                  : '可按业务编号、车牌号、客户名查找'
+              "
+              clearable
+              v-model="searchKeyWord"
+              class="search_css"
+            ></el-input>
             <!-- <el-input placeholder="可按业务编号、车牌号、客户名查找" clearable v-model="searchKeyWord"></el-input> -->
-            <el-button type="primary" size="small" @click="lookup">查找</el-button>
+            <el-button type="primary" size="small" @click="lookup"
+              >查找</el-button
+            >
           </div>
         </el-col>
       </el-row>
-      <el-button :type="choice == ''?'primary':''" size="small" @click="screen()" class="btn_css">全部</el-button>
-      <el-button :type="choice == 2?'primary':''" size="small" @click="screen(2)" class="btn_css">已称毛重</el-button>
-      <el-button :type="choice == 3?'primary':''" size="small" @click="screen(3)" class="btn_css">已称皮重</el-button>
-      <el-button size="small" @click="print('',1)">批量打印</el-button>
-       <el-upload style="margin-top: -35px; margin-left:430px" class="upload-demo inline-block margin-right-10" action=""
+      <el-button
+        :type="choice == '' ? 'primary' : ''"
+        size="small"
+        @click="screen()"
+        class="btn_css"
+        >全部</el-button
+      >
+      <el-button
+        :type="choice == 2 ? 'primary' : ''"
+        size="small"
+        @click="screen(2)"
+        class="btn_css"
+        >已称毛重</el-button
+      >
+      <el-button
+        :type="choice == 3 ? 'primary' : ''"
+        size="small"
+        @click="screen(3)"
+        class="btn_css"
+        >已称皮重</el-button
+      >
+      <el-button size="small" @click="print('', 1)">批量打印</el-button>
+      <!-- <el-upload style="margin-top: -35px; margin-left:430px" class="upload-demo inline-block margin-right-10" action=""
           :on-change="importClick" :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
           :auto-upload="false">
           <ws-button type="primary">导入(移库)</ws-button>
-        </el-upload>
-      <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px"
-        @selection-change="handleSelectionChange">
+        </el-upload> -->
+      <el-table
+        class="forData"
+        :data="weighingRecordList"
+        style="width: 100%; margin-top: 20px"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column key="0" type="selection" width="55"></el-table-column>
         <el-table-column key="1" type="index" label="序号" width="80">
           <template scope="scope">
@@ -55,53 +119,172 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column key="inOutTaskNo" prop="inOutTaskNo" label="任务编号" width="170"></el-table-column>
-        <el-table-column key="2" prop="number" label="业务编号" width="170"></el-table-column>
-        <el-table-column key="3" prop="contractNo" label="合同编号/移库编号" v-if="warehousingType == 1" width="130">
+        <el-table-column
+          key="inOutTaskNo"
+          prop="inOutTaskNo"
+          label="任务编号"
+          width="170"
+        ></el-table-column>
+        <el-table-column
+          key="2"
+          prop="number"
+          label="业务编号"
+          width="170"
+        ></el-table-column>
+        <el-table-column
+          key="3"
+          prop="contractNo"
+          label="合同编号/移库编号"
+          v-if="warehousingType == 1"
+          width="130"
+        >
           <template scope="scope">
-            <span v-if="scope.row.contractNo">{{scope.row.contractNo}}</span>
-            <span v-else>{{scope.row.moveTaskNo}}</span>
+            <span v-if="scope.row.contractNo">{{ scope.row.contractNo }}</span>
+            <span v-else>{{ scope.row.moveTaskNo }}</span>
           </template>
-
         </el-table-column>
         <!--//moveTaskNo -->
-        <el-table-column key="4" prop="customer" label="客户" v-if="warehousingType == 3"></el-table-column>
-        <el-table-column key="5" prop="carNumber" label="车牌号"></el-table-column>
-        <el-table-column key="6" prop="goodsName" label="货名"></el-table-column>
-        <el-table-column key="7" prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
-        <el-table-column key="8" prop="tare" label="皮重（公斤）" width="100"></el-table-column>
-        <el-table-column key="9" prop="buckleMiscellaneous" label="扣重（公斤）" width="100"></el-table-column>
-        <el-table-column key="10" prop="netWeight" label="净重（公斤）" width="100"></el-table-column>
-        <el-table-column key="11" prop="secretaryWeigher" label="司称员"></el-table-column>
-        <el-table-column key="15"  label="附件"  width="200">
+        <el-table-column
+          key="4"
+          prop="customer"
+          label="客户"
+          v-if="warehousingType == 3"
+        ></el-table-column>
+        <el-table-column
+          key="5"
+          prop="carNumber"
+          label="车牌号"
+        ></el-table-column>
+        <el-table-column
+          key="6"
+          prop="goodsName"
+          label="货名"
+        ></el-table-column>
+        <el-table-column
+          key="7"
+          prop="grossWeight"
+          label="毛重（公斤）"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          key="8"
+          prop="tare"
+          label="皮重（公斤）"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          key="9"
+          prop="buckleMiscellaneous"
+          label="扣重（公斤）"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          key="10"
+          prop="netWeight"
+          label="净重（公斤）"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          key="11"
+          prop="secretaryWeigher"
+          label="司称员"
+        ></el-table-column>
+        <el-table-column key="15" label="附件" width="200">
           <template scope="scope">
             <!-- {{scope.row.addressUrl.split(',')[0]}} -->
             <div v-if="scope.row.addressUrl" style="display:flex">
-              <img :src="scope.row.addressUrl.split(',')[0]" alt="" style="width:100px" @click="showImg(scope.row.addressUrl.split(',')[0])"/>
-              <img :src="scope.row.addressUrl.split(',')[1]" alt="" style="width:100px" @click="showImg(scope.row.addressUrl.split(',')[1])"/>
+              <img
+                :src="scope.row.addressUrl.split(',')[0]"
+                alt=""
+                style="width:100px"
+                @click="showImg(scope.row.addressUrl.split(',')[0])"
+              />
+              <img
+                :src="scope.row.addressUrl.split(',')[1]"
+                alt=""
+                style="width:100px"
+                @click="showImg(scope.row.addressUrl.split(',')[1])"
+              />
             </div>
-           
           </template>
         </el-table-column>
-        <el-table-column key="12" prop="grossDate" label="检斤时间"></el-table-column>
+        <el-table-column
+          key="12"
+          prop="grossDate"
+          label="检斤时间"
+        ></el-table-column>
         <el-table-column key="13" prop="status" label="状态"></el-table-column>
-        <el-table-column key="14" label="操作" min-width="400">
+        <el-table-column key="14" label="操作" min-width="600">
           <template scope="scope">
             <!-- <el-button size="small" @click="print(scope.row)">打印</el-button> -->
-            <el-button @click="print(scope.row,2)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
-            <el-button @click="backInfo(scope.row)" v-if="scope.row.status == '已称皮重'">退回</el-button>
-            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换仓</el-button>
-            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换任务号</el-button>
-            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeName(scope.row)" v-if="(scope.row.status == '已称毛重'|| scope.row.status == '已质检') && warehousingType == 3">换客户</el-button>
-            <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">删除</el-button>
+            <el-button
+              @click="print(scope.row, 2)"
+              v-if="
+                scope.row.status == '已称皮重' || scope.row.status == '已称毛重'
+              "
+              v-hasPermission="`acquisitionManagement.acquisitionWeight.print`"
+              >打印</el-button
+            >
+            <el-button
+              @click="backInfo(scope.row)"
+              v-if="scope.row.status == '已称皮重'"
+              >退回</el-button
+            >
+            <el-button
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfo.huan`
+              "
+              class="putstorage"
+              @click="exchange(scope.row)"
+              v-if="
+                scope.row.status == '已称毛重' || scope.row.status == '已质检'
+              "
+              >换仓</el-button
+            >
+            <el-button
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfo.huan`
+              "
+              class="putstorage"
+              @click="exchangeNo(scope.row)"
+              v-if="
+                scope.row.status == '已称毛重' || scope.row.status == '已质检'
+              "
+              >换任务号</el-button
+            >
+            <el-button
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfo.huan`
+              "
+              class="putstorage"
+              @click="exchangeName(scope.row)"
+              v-if="
+                (scope.row.status == '已称毛重' ||
+                  scope.row.status == '已质检') &&
+                  warehousingType == 3
+              "
+              >换客户</el-button
+            >
+            <el-button
+              @click="deleteInfo(scope.row)"
+              v-if="
+                scope.row.status == '已称毛重' || scope.row.status == '已质检'
+              "
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div style="text-align: center; padding: 10px">
-      <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
+        @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>
     <div class="mask" v-show="isShowPrintType"></div>
@@ -115,81 +298,157 @@
           </el-radio-group> -->
         </div>
 
-        <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
+        <div class="shdw-style" v-if="checked || (!ddchecked && !checked)">
           <div>收货单位：</div>
           <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
-            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model="companyName"
+            placeholder="请选择"
+            style="width: 75%;"
+          >
+            <el-option
+              v-for="item in companyNameOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </div>
-        <div class="shdw-style" v-if="checked && serviceManagementType==3 || (!ddchecked && !checked && serviceManagementType==3)">
+        <div
+          class="shdw-style"
+          v-if="
+            (checked && serviceManagementType == 3) ||
+              (!ddchecked && !checked && serviceManagementType == 3)
+          "
+        >
           <div>发货单位：</div>
           <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="customer" placeholder="请选择" style="width: 75%;">
-            <el-option v-for="item in customerOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model="customer"
+            placeholder="请选择"
+            style="width: 75%;"
+          >
+            <el-option
+              v-for="item in customerOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'&&printType==2||
-        warehouseName=='白城内陆港'&&printType==2||
-        warehouseName=='杜尔伯特家禾库'&&printType==2||
-        warehouseName=='洮南新友谊兴旺库'&&printType==2||
-        warehouseName=='甘南宏旗库'&&printType==2||
-        warehouseName=='洮南向阳乡金昊'&&printType==2||
-        warehouseName=='山东园丰库'&&printType==2">
+        <div
+          v-if="
+            (warehouseName == '鲅鱼圈金信库' && printType == 2) ||
+              (warehouseName == '白城内陆港' && printType == 2) ||
+              (warehouseName == '杜尔伯特家禾库' && printType == 2) ||
+              (warehouseName == '洮南新友谊兴旺库' && printType == 2) ||
+              (warehouseName == '甘南宏旗库' && printType == 2) ||
+              (warehouseName == '洮南向阳乡金昊' && printType == 2) ||
+              (warehouseName == '山东园丰库' && printType == 2)
+          "
+        >
           <div class="print-type-ew">
-            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
-            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+            <el-checkbox v-model="checked" @change="changeEw"
+              >打印额外票据</el-checkbox
+            >
+            <el-checkbox v-model="ddchecked" @change="changeEwDD"
+              >单独打印额外票据</el-checkbox
+            >
           </div>
           <div class="ew-print" v-if="printSeparately">
             <div class="row">
               <div>额外客户姓名：</div>
               <!-- <div>{{companyName}}</div> -->
-              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="ewCustomer"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in ewCustomerOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
             <div class="row">
               <div>额外收货单位：</div>
               <!-- <div>{{companyNameEW}}</div> -->
-              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
-                  :value="item.value">
+              <el-select
+                v-model="companyNameEW"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in companyNameEWOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
           </div>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'&&printType==2">
+        <div v-if="warehouseName == '鲅鱼圈金信库' && printType == 2">
           <div class="print-type-ew">
-            <el-checkbox v-model="outchecked" @change="changeOut">是否打印出库</el-checkbox>
+            <el-checkbox v-model="outchecked" @change="changeOut"
+              >是否打印出库</el-checkbox
+            >
           </div>
           <div class="ew-print" v-if="printout">
             <div class="row">
               <div>出库发货单位：</div>
               <!-- <div>{{companyName}}</div> -->
-              <el-select v-model="inshipments" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="inshipments"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in ewCustomerOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
             <div class="row">
               <div>出库收货单位：</div>
               <!-- <div>{{companyNameEW}}</div> -->
-              <el-select v-model="outshipments" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
-                  :value="item.value">
+              <el-select
+                v-model="outshipments"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in companyNameEWOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
             <div class="row">
               <div>出库仓位号：</div>
               <!-- <div>{{companyNameEW}}</div> -->
-              <el-select v-model="outbinNumber" placeholder="请选择仓位号" style="width: 75%;">
-                <el-option v-for="item in binNumberList1" :key="item.id" :label="item.binNumber"
-                  :value="item.binNumber">
+              <el-select
+                v-model="outbinNumber"
+                placeholder="请选择仓位号"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in binNumberList1"
+                  :key="item.id"
+                  :label="item.binNumber"
+                  :value="item.binNumber"
+                >
                 </el-option>
               </el-select>
             </div>
@@ -201,7 +460,13 @@
         <el-button @click="typePrintCannelClick">取消</el-button>
       </div>
     </div>
-    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
+    <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>
@@ -209,1400 +474,1312 @@
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
     </el-dialog>
-     <el-dialog
-          title="提示"
-          :visible.sync="dialogVisible"
-          width="30%"
-          :before-close="handleClose">
-          <div style="text-align:center">
-             <el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
-              @change="binNumberChange">
-              <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
-                :value="item.binNumber" />
-            </el-select>
-          </div>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
-          </span>
-        </el-dialog>
-         <el-dialog
-          title="提示"
-          :visible.sync="dialogVisible1"
-          width="30%"
-          :before-close="handleClose1">
-          <div style="text-align:center">
-            <el-form ref="form" label-width="110px">
-              <el-form-item label="任务编号">
-             <el-select filterable clearable v-model="inOutTaskNo" placeholder="请选择任务号" class="typeselect"
-              @change="taskNoChange">
-              <el-option v-for="item in taskNolist" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
-                :value="item.inOutTaskNo" />
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <div style="text-align:center">
+        <el-select
+          filterable
+          clearable
+          v-model="binNumber"
+          placeholder="请选择仓位"
+          class="typeselect"
+          @change="binNumberChange"
+        >
+          <el-option
+            v-for="item in binnumberList"
+            :key="item.binNumber"
+            :label="item.binNumber"
+            :value="item.binNumber"
+          />
+        </el-select>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisibleconfirm"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible1"
+      width="30%"
+      :before-close="handleClose1"
+    >
+      <div style="text-align:center">
+        <el-form ref="form" label-width="110px">
+          <el-form-item label="任务编号">
+            <el-select
+              filterable
+              clearable
+              v-model="inOutTaskNo"
+              placeholder="请选择任务号"
+              class="typeselect"
+              @change="taskNoChange"
+            >
+              <el-option
+                v-for="item in taskNolist"
+                :key="item.inOutTaskNo"
+                :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo"
+              />
             </el-select>
-            </el-form-item>
-           <el-form-item label="合同编号">
-            <el-input v-model="contractNo" placeholder="合同编号" :disabled="disabled" maxlength="15">
+          </el-form-item>
+          <el-form-item label="合同编号">
+            <el-input
+              v-model="contractNo"
+              placeholder="合同编号"
+              :disabled="disabled"
+              maxlength="15"
+            >
             </el-input>
-             </el-form-item>
-         </el-form>
-          </div>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible1 = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisibleconfirm1">确 定</el-button>
-          </span>
-        </el-dialog>
-        <el-dialog
-          title="提示"
-          :visible.sync="dialogVisible2"
-          width="30%"
-          :before-close="handleClose2">
-          <div style="text-align:center">
-            <el-form ref="form" label-width="110px">
-              <el-form-item label="客户名">
-             <el-select filterable clearable v-model="customerNumberCard" placeholder="请选择客户" class="typeselect"
-              @change="customerChange">
-              <el-option v-for="item in customerlist" :key="item.customerNumberCard" :label="item.customerName"
-                :value="item.customerNumberCard" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible1 = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisibleconfirm1"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible2"
+      width="30%"
+      :before-close="handleClose2"
+    >
+      <div style="text-align:center">
+        <el-form ref="form" label-width="110px">
+          <el-form-item label="客户名">
+            <el-select
+              filterable
+              clearable
+              v-model="customerNumberCard"
+              placeholder="请选择客户"
+              class="typeselect"
+              @change="customerChange"
+            >
+              <el-option
+                v-for="item in customerlist"
+                :key="item.customerNumberCard"
+                :label="item.customerName"
+                :value="item.customerNumberCard"
+              />
             </el-select>
-            </el-form-item>
-           <el-form-item label="手机号">
-            <el-input v-model="customerPhone" placeholder="手机号" :disabled="disabled" maxlength="15">
+          </el-form-item>
+          <el-form-item label="手机号">
+            <el-input
+              v-model="customerPhone"
+              placeholder="手机号"
+              :disabled="disabled"
+              maxlength="15"
+            >
             </el-input>
-             </el-form-item>
-             <el-form-item label="身份证号码">
-            <el-input v-model="customerNumberCard" placeholder="身份证号码" :disabled="disabled" maxlength="20">
+          </el-form-item>
+          <el-form-item label="身份证号码">
+            <el-input
+              v-model="customerNumberCard"
+              placeholder="身份证号码"
+              :disabled="disabled"
+              maxlength="20"
+            >
             </el-input>
-             </el-form-item>
-         </el-form>
-          </div>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible2 = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisibleconfirm2">确 定</el-button>
-          </span>
-        </el-dialog>
-        <el-dialog
-          title="附件信息"
-          :visible.sync="isShowImg"
-          width="60%">
-         <img :src="imgSrc" style="width:100%"/>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="isShowImg = false">取 消</el-button>
-          </span>
-        </el-dialog>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible2 = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisibleconfirm2"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+    <el-dialog title="附件信息" :visible.sync="isShowImg" width="60%">
+      <img :src="imgSrc" style="width:100%" />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="isShowImg = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
-  import {
-    selectWarehouseSelf,
-    getweighingList,
-    getPrint,
-    returnInfo,
-    changeNo,
-    changeTaskNo,
-    changeCustomer,
-    getcustomer,
-    importWordYk,
-    getweighingDelete,
-    getbinNumber
-  } from '@/model/houseSelfCollect/index'
-   import {
-    getReceiptTaskNo,
-  } from '@/model/warehouse/index'
-  import {
-    getcomp
-  } from '@/model/indexRx'
-  import weightCheckPrint from './component/weightCheckPrint.vue'
-  export default {
-    components: {
-      weightCheckPrint
-    },
-    data() {
-      return {
-        imgSrc:'',
-        isShowImg:false,
-        weighingRecordList: [],
-        warehouseId: '',
-        warehouseName: '',
-        // goodsNameList: [],
-        // goodsNameAllList: [],
-        // binNoList: [],
-        // binNumberId: '', //仓位Id
-        // warehouseType: '',
-        compId: '',
-        outbinNumber:'',
-        printType:0,
-        binNumberList1:[],
-        UserInfo:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')),
-        pickerOptions: {
-          shortcuts: [{
-              text: '本周',
-              onClick(picker) {
-                const end = new Date()
-                const start = new Date()
-                var thisDay = start.getDay()
-                var thisDate = start.getDate()
-                if (thisDay != 0) {
-                  start.setDate(thisDate - thisDay)
-                }
-                picker.$emit('pick', [start, end])
-              },
-            },
-            {
-              text: '本月',
-              onClick(picker) {
-                const end = new Date()
-                const start = new Date()
-                start.setDate(1)
-                picker.$emit('pick', [start, end])
-              },
-            },
-            {
-              text: '本季度',
-              onClick(picker) {
-                var oDate = new Date()
+import {
+  selectWarehouseSelf,
+  getweighingList,
+  getPrint,
+  returnInfo,
+  changeNo,
+  changeTaskNo,
+  changeCustomer,
+  getcustomer,
+  importWordYk,
+  getweighingDelete,
+  getbinNumber
+} from '@/model/houseSelfCollect/index'
+import { getReceiptTaskNo } from '@/model/warehouse/index'
+import { getcomp } from '@/model/indexRx'
+import weightCheckPrint from './component/weightCheckPrint.vue'
+export default {
+  components: {
+    weightCheckPrint
+  },
+  data() {
+    return {
+      imgSrc: '',
+      isShowImg: false,
+      weighingRecordList: [],
+      warehouseId: '',
+      warehouseName: '',
+      // goodsNameList: [],
+      // goodsNameAllList: [],
+      // binNoList: [],
+      // binNumberId: '', //仓位Id
+      // warehouseType: '',
+      compId: '',
+      outbinNumber: '',
+      printType: 0,
+      binNumberList1: [],
+      UserInfo: JSON.parse(
+        localStorage.getItem('ws_login_getTenantInfoByUser')
+      ),
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '本周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              var thisDay = start.getDay()
+              var thisDate = start.getDate()
+              if (thisDay != 0) {
+                start.setDate(thisDate - thisDay)
+              }
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '本月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setDate(1)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '本季度',
+            onClick(picker) {
+              var oDate = new Date()
 
-                var thisYear = oDate.getFullYear()
-                var thisMonth = oDate.getMonth() + 1
+              var thisYear = oDate.getFullYear()
+              var thisMonth = oDate.getMonth() + 1
 
-                var n = Math.ceil(thisMonth / 3) // 季度
+              var n = Math.ceil(thisMonth / 3) // 季度
 
-                var Month = n * 3 - 1
+              var Month = n * 3 - 1
 
-                var start = new Date(thisYear, Month - 2, 1)
-                var end = new Date()
+              var start = new Date(thisYear, Month - 2, 1)
+              var end = new Date()
 
-                picker.$emit('pick', [start, end])
-              },
-            },
-          ],
-        },
-        //分页
-        currentPage: 1,
-        pageSize: 10,
-        value2:[],
-        deptCircularPage: {},
-        deptBudgetTotal: 0,
-        warehouseList: [], //仓库
-        searchKeyWord: '',
-        choice: '',
-        warehousingType: 1,
-        isShowPrint: false,
-        dialogData: {},
-        title: '',
-        disabled: true,
-        taskflag:2,
-        modification: [],
-        ewCustomerOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }, {
-          value: '吉林中翰兴粮食贸易有限公司',
-          label: '吉林中翰兴粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天绿粮供应链服务有限公司',
-          label: '黑龙江中天绿粮供应链服务有限公司'
-        }],
-        companyNameOptions: [{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }, {
-          value: '吉林中翰兴粮食贸易有限公司',
-          label: '吉林中翰兴粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天绿粮供应链服务有限公司',
-          label: '黑龙江中天绿粮供应链服务有限公司'
-        }],
-        companyNameEWOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        }],
-        companyName: '黑龙江中天昊元贸易有限公司',
-        companyNameEW: '厦门建发物产有限公司',
-        ewCustomer: '黑龙江利润元粮食贸易有限公司',
-        inshipments:'黑龙江中天昊元贸易有限公司',
-        outshipments:'黑龙江中天昊元贸易有限公司',
-        ewradio: '',
-        ddchecked: false,
-        checked: false,
-        outchecked:false,
-        customerOptions:[],
-        customer:'',
-        isShowPrintType: false,
-        dialogDataList: [],
-        jjSelectPrintList: [],
-        outPrintList: [],
-        printSeparately: false,
-        printout:false,
-        onePrint: false,
-        startDate:'',
-        endDate:'',
-        dialogVisible:false,
-        dialogVisible1:false,
-        dialogVisible2:false,
-        binNumber:'',
-        binnumberList:[],
-        taskNolist:[],
-        customerlist:[],
-        cangweiNum:'',
-        contractNum:'',
-        inOutTaskNo:'',
-        customerName:'',
-        contractNo:'',
-        customerPhone:'',
-        customerNumberCard:'',
-        positionId:'',
-        warehouseInOutDetail:{},
-        serviceManagementType:1,
-      }
-    },
-    activated() {
-      //仓库
-      console.log(localStorage.getItem('compNameoptions'))
-      getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
-        this.compNameoptions=res
-    if (this.compNameoptions.length>0) {
-        var company=this.compNameoptions
-        
-        var extra=company.filter((item)=>{
-          return item!='黑龙江中天昊元贸易有限公司'
-          &&item!='黑龙江利润元粮食贸易有限公司'
-          &&item!= '黑龙江众利合粮食贸易有限公司'
-          &&item!='黑龙江鑫满仓粮食贸易有限公司'
-          &&item!='黑龙江谷香粮食贸易有限公司'
-          &&item!='黑龙江秋收有限公司'
-          &&item!= '黑龙江欣洋粮食贸易有限公司'
-          &&item!='黑龙江益储益运粮食贸易有限公司'
-          &&item!='黑龙江启兴粮食贸易有限公司'
-        })
-        if(extra.length>0){
-          this.companyNameOptions=[
-          {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }, {
-          value: '吉林中翰兴粮食贸易有限公司',
-          label: '吉林中翰兴粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天绿粮供应链服务有限公司',
-          label: '黑龙江中天绿粮供应链服务有限公司'
-        }]
-          this.ewCustomerOptions= [
-          {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }, {
-          value: '吉林中翰兴粮食贸易有限公司',
-          label: '吉林中翰兴粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天绿粮供应链服务有限公司',
-          label: '黑龙江中天绿粮供应链服务有限公司'
-        }]
-          this.companyNameEWOptions=[
-          {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天绿粮供应链服务有限公司',
-          label: '黑龙江中天绿粮供应链服务有限公司'
-        }]
-           if(localStorage.getItem('print_company_name')){
-            this.companyName=localStorage.getItem('print_company_name')
-          }else{
-            this.companyName=extra[0]
-          }
-          if(localStorage.getItem('print_company_name_ew')){
-            this.companyNameEW=localStorage.getItem('print_company_name_ew')
-          }else{
-            this.companyNameEW=extra[0]
-          }
-          if(localStorage.getItem('print_customer_name_ew')){
-            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
-          }else{
-            this.ewCustomer=extra[0]
-          }
-          for (let i = 0; i < extra.length; i++) {
-            this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
+              picker.$emit('pick', [start, end])
+            }
           }
-        }
-      }
+        ]
+      },
+      //分页
+      currentPage: 1,
+      pageSize: 10,
+      value2: [],
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      warehouseList: [], //仓库
+      searchKeyWord: '',
+      choice: '',
+      warehousingType: 1,
+      isShowPrint: false,
+      dialogData: {},
+      title: '',
+      disabled: true,
+      taskflag: 2,
+      modification: [],
+      ewCustomerOptions: [],
+      companyNameOptions: [],
+      companyNameEWOptions: [],
+      companyName: '',
+      companyNameEW: '',
+      ewCustomer: '',
+      inshipments: '',
+      outshipments: '',
+      ewradio: '',
+      ddchecked: false,
+      checked: false,
+      outchecked: false,
+      customerOptions: [],
+      customer: '',
+      isShowPrintType: false,
+      dialogDataList: [],
+      jjSelectPrintList: [],
+      outPrintList: [],
+      printSeparately: false,
+      printout: false,
+      onePrint: false,
+      startDate: '',
+      endDate: '',
+      dialogVisible: false,
+      dialogVisible1: false,
+      dialogVisible2: false,
+      binNumber: '',
+      binnumberList: [],
+      taskNolist: [],
+      customerlist: [],
+      cangweiNum: '',
+      contractNum: '',
+      inOutTaskNo: '',
+      customerName: '',
+      contractNo: '',
+      customerPhone: '',
+      customerNumberCard: '',
+      positionId: '',
+      warehouseInOutDetail: {},
+      serviceManagementType: 1
+    }
+  },
+  activated() {
+    //仓库
+    console.log(localStorage.getItem('compNameoptions'))
+    getcomp({
+      userMobilePhone: JSON.parse(
+        localStorage.getItem('ws_login_getTenantInfoByUser')
+      ).loginInfo.userMobilePhone
     })
-      selectWarehouseSelf({
-          compId: localStorage.getItem('ws-pf_compId'),
-        })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = response
-        })
-      this.compId = localStorage.getItem('ws-pf_compId')
-      this.warehousingType = this.$route.query.inWarehouseType
-      this.warehouseName = this.$route.query.warehouseName //仓库名
-      this.warehouseId = this.$route.query.warehouseId 
-      this.getList()
+      .toPromise()
+      .then(res => {
+        this.compNameoptions = res
+      })
+    selectWarehouseSelf({
+      compId: localStorage.getItem('ws-pf_compId')
+    })
+      .toPromise()
+      .then(response => {
+        this.warehouseList = response
+      })
+    this.compId = localStorage.getItem('ws-pf_compId')
+    this.warehousingType = this.$route.query.inWarehouseType
+    this.warehouseName = this.$route.query.warehouseName //仓库名
+    this.warehouseId = this.$route.query.warehouseId
+    this.getList()
+  },
+  methods: {
+    showImg(val) {
+      this.imgSrc = val
+      this.isShowImg = true
     },
-    methods: {
-      showImg(val){
-        this.imgSrc = val
-        this.isShowImg = true
-      },
-      importClick(file, fileList) {
-        this.fileTemp = file.raw
-        let fileName = file.raw.name
-        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
-        // 判断上传文件格式
-        if (this.fileTemp) {
-          if (fileType == 'xlsx' || fileType == 'xls') {
-            this.importf(this.fileTemp)
-          } else {
-            this.$message({
-              type: 'warning',
-              message: '附件格式错误，请删除后重新上传！',
-            })
-          }
+    importClick(file, fileList) {
+      this.fileTemp = file.raw
+      let fileName = file.raw.name
+      let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+      // 判断上传文件格式
+      if (this.fileTemp) {
+        if (fileType == 'xlsx' || fileType == 'xls') {
+          this.importf(this.fileTemp)
         } else {
           this.$message({
             type: 'warning',
-            message: '请上传附件！',
+            message: '附件格式错误，请删除后重新上传！'
           })
         }
-      },
-      importf(obj) {
-        this.excelFreightspace = []
-        // this.dialogVisible = true;
-        let _this = this;
-        let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
-        this.file = event.currentTarget.files[0];
-        var rABS = false; //是否将文件读取为二进制字符串
-        var f = this.file;
-        var reader = new FileReader();
-        //if (!FileReader.prototype.readAsBinaryString) {
-        FileReader.prototype.readAsBinaryString = function(f) {
-          var binary = '';
-          var rABS = false; //是否将文件读取为二进制字符串
-          var pt = this;
-          var wb; //读取完成的数据
-          var outdata;
-          var reader = new FileReader();
-          reader.onload = function(e) {
-            var bytes = new Uint8Array(reader.result);
-            var length = bytes.byteLength;
-            for (var i = 0; i < length; i++) {
-              binary += String.fromCharCode(bytes[i]);
-            }
-            var XLSX = require('xlsx');
-            if (rABS) {
-              wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
-                type: 'base64',
-                cellDates: true
-              });
-            } else {
-              wb = XLSX.read(binary, {
-                type: 'binary'
-              });
-            }
-            // outdata就是你想要的东西 excel导入的数据
-            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
-            // excel 数据再处理
-            let arr = []
-            outdata.map(v => {
-              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-              let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
-              v = JSON.parse(jsonString);
-              let obj = {}
-              //xxx代表列名
-              obj.number = v.业务编号
-              obj.inOutTaskNo = v.移库任务编号
-              obj.outType = v.运输方式
-              obj.carNumber = v.车牌号
-              obj.grossWeight = v.毛重
-              obj.tare = v.皮重
-              obj.netWeight = v.净重
-              obj.grossDate = _this.formatDate(v.入库日期, '-')
-              _this.excelFreightspace.push(obj)
+      } else {
+        this.$message({
+          type: 'warning',
+          message: '请上传附件！'
+        })
+      }
+    },
+    importf(obj) {
+      this.excelFreightspace = []
+      // this.dialogVisible = true;
+      let _this = this
+      let inputDOM = this.$refs.inputer // 通过DOM取文件数据
+      this.file = event.currentTarget.files[0]
+      var rABS = false //是否将文件读取为二进制字符串
+      var f = this.file
+      var reader = new FileReader()
+      //if (!FileReader.prototype.readAsBinaryString) {
+      FileReader.prototype.readAsBinaryString = function(f) {
+        var binary = ''
+        var rABS = false //是否将文件读取为二进制字符串
+        var pt = this
+        var wb //读取完成的数据
+        var outdata
+        var reader = new FileReader()
+        reader.onload = function(e) {
+          var bytes = new Uint8Array(reader.result)
+          var length = bytes.byteLength
+          for (var i = 0; i < length; i++) {
+            binary += String.fromCharCode(bytes[i])
+          }
+          var XLSX = require('xlsx')
+          if (rABS) {
+            wb = XLSX.read(btoa(fixdata(binary)), {
+              //手动转化
+              type: 'base64',
+              cellDates: true
+            })
+          } else {
+            wb = XLSX.read(binary, {
+              type: 'binary'
             })
-            if (_this.excelFreightspace) {
-              importWordYk({
-                  warehouseName: _this.warehouseName,
-                  weighingManagementList: _this.excelFreightspace
-                }).toPromise()
-                .then((response) => {
-                  if (response == 'ok') {
-                    this.$notify({
-                      title: '成功',
-                      message: '导入成功',
-                      type: 'success'
-                    });
-                    _this.getList()
-                  }
-                })
-
-            }
           }
-          reader.readAsArrayBuffer(f);
-        }
-        if (rABS) {
-          reader.readAsArrayBuffer(f);
-        } else {
-          reader.readAsBinaryString(f);
-        }
-
-      },
-      formatDate(numb, format) {
-        const old = numb - 1;
-        const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
-        const time = new Date(1900, 0, old, 0, 0, t)
-        const year = time.getFullYear();
-        const month = time.getMonth() + 1;
-        const date = time.getDate();
-        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
-          ' 00:00:00'
-      },
-      binNumberChange(e){
-        this.binNumber = e
-        for(let i = 0 ; i < this.binnumberList.length ; i++){
-          if(this.binNumber == this.binnumberList[i].binNumber){
-            this.positionId = this.binnumberList[i].id
+          // outdata就是你想要的东西 excel导入的数据
+          outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+          // excel 数据再处理
+          let arr = []
+          outdata.map(v => {
+            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+            let jsonString = JSON.stringify(v)
+              .replace(/\//g, '')
+              .replace(/\s/gi, '')
+            v = JSON.parse(jsonString)
+            let obj = {}
+            //xxx代表列名
+            obj.number = v.业务编号
+            obj.inOutTaskNo = v.移库任务编号
+            obj.outType = v.运输方式
+            obj.carNumber = v.车牌号
+            obj.grossWeight = v.毛重
+            obj.tare = v.皮重
+            obj.netWeight = v.净重
+            obj.grossDate = _this.formatDate(v.入库日期, '-')
+            _this.excelFreightspace.push(obj)
+          })
+          if (_this.excelFreightspace) {
+            importWordYk({
+              warehouseName: _this.warehouseName,
+              weighingManagementList: _this.excelFreightspace
+            })
+              .toPromise()
+              .then(response => {
+                if (response == 'ok') {
+                  this.$notify({
+                    title: '成功',
+                    message: '导入成功',
+                    type: 'success'
+                  })
+                  _this.getList()
+                }
+              })
           }
         }
-      },
-      taskNoChange(e){
-        this.inOutTaskNo = e
-        for(let i = 0 ; i < this.taskNolist.length ; i++){
-          if(this.inOutTaskNo == this.taskNolist[i].inOutTaskNo){
-            if(this.taskNolist[i].contractNo){
-              this.contractNo = this.taskNolist[i].contractNo
-            }
-            else{
-              this.contractNo = this.taskNolist[i].moveTaskNo
-            }
-          }
+        reader.readAsArrayBuffer(f)
+      }
+      if (rABS) {
+        reader.readAsArrayBuffer(f)
+      } else {
+        reader.readAsBinaryString(f)
+      }
+    },
+    formatDate(numb, format) {
+      const old = numb - 1
+      const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60)
+      const time = new Date(1900, 0, old, 0, 0, t)
+      const year = time.getFullYear()
+      const month = time.getMonth() + 1
+      const date = time.getDate()
+      return (
+        year +
+        format +
+        (month < 10 ? '0' + month : month) +
+        format +
+        (date < 10 ? '0' + date : date) +
+        ' 00:00:00'
+      )
+    },
+    binNumberChange(e) {
+      this.binNumber = e
+      for (let i = 0; i < this.binnumberList.length; i++) {
+        if (this.binNumber == this.binnumberList[i].binNumber) {
+          this.positionId = this.binnumberList[i].id
         }
-      },
-      customerChange(e){
-        for(let i = 0 ; i < this.customerlist.length ; i++){
-          if(this.customerNumberCard == this.customerlist[i].customerNumberCard){
-            this.customerPhone = this.customerlist[i].customerPhone
-            this.customerName = this.customerlist[i].customerName
+      }
+    },
+    taskNoChange(e) {
+      this.inOutTaskNo = e
+      for (let i = 0; i < this.taskNolist.length; i++) {
+        if (this.inOutTaskNo == this.taskNolist[i].inOutTaskNo) {
+          if (this.taskNolist[i].contractNo) {
+            this.contractNo = this.taskNolist[i].contractNo
+          } else {
+            this.contractNo = this.taskNolist[i].moveTaskNo
           }
         }
-      },
-      handleClose(){
-        this.dialogVisible = false
-      },
-      handleClose1(){
-        this.inOutTaskNo=''
-        this.dialogVisible1 = false
-      },
-      handleClose2(){
-        this.customerName=''
-        this.customerPhone=''
-        this.customerNumberCard=''
-        this.dialogVisible2 = false
-      },
-      dialogVisibleconfirm(){
-        if(this.binNumber == this.cangweiNum){
-          this.$message.error('已是该仓位无需修改')
-          return
+      }
+    },
+    customerChange(e) {
+      for (let i = 0; i < this.customerlist.length; i++) {
+        if (
+          this.customerNumberCard == this.customerlist[i].customerNumberCard
+        ) {
+          this.customerPhone = this.customerlist[i].customerPhone
+          this.customerName = this.customerlist[i].customerName
         }
-        this.$confirm(`确定修改仓位？`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
+      }
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    handleClose1() {
+      this.inOutTaskNo = ''
+      this.dialogVisible1 = false
+    },
+    handleClose2() {
+      this.customerName = ''
+      this.customerPhone = ''
+      this.customerNumberCard = ''
+      this.dialogVisible2 = false
+    },
+    dialogVisibleconfirm() {
+      if (this.binNumber == this.cangweiNum) {
+        this.$message.error('已是该仓位无需修改')
+        return
+      }
+      this.$confirm(`确定修改仓位？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+        .then(() => {
+          // let _obj = JSON.parse(this.warehouseInOutDetail)
+          // _obj.binNumber = this.binNumber
+          changeNo({
+            id: this.id,
+            changePositionId: this.positionId,
+            changeBinNumer: this.binNumber
           })
-          .then(() => {
-            // let _obj = JSON.parse(this.warehouseInOutDetail)
-            // _obj.binNumber = this.binNumber
-              changeNo({id:this.id,changePositionId:this.positionId,changeBinNumer:this.binNumber}).toPromise()
-						.then((response) => {
+            .toPromise()
+            .then(response => {
               this.$notify.success({
-                  title: '成功',
-                  message: '修改仓位成功',
-                })
-                this.getList()
-                this.dialogVisible=false
-						})
-          })
-          .catch(() => {
-            return false
-          })
-      },
-      dialogVisibleconfirm1(){
-        // if(this.contractNo == this.contractNum){
-        //   this.$message.error('已是该任务号无需修改')
-        //   return
-        // }
-        this.$confirm(`确定修改任务号？`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
+                title: '成功',
+                message: '修改仓位成功'
+              })
+              this.getList()
+              this.dialogVisible = false
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    dialogVisibleconfirm1() {
+      // if(this.contractNo == this.contractNum){
+      //   this.$message.error('已是该任务号无需修改')
+      //   return
+      // }
+      this.$confirm(`确定修改任务号？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+        .then(() => {
+          changeTaskNo({
+            id: this.id,
+            inOutTaskNo: this.inOutTaskNo,
+            contractNo: this.contractNo
           })
-          .then(() => {
-              changeTaskNo({id:this.id,inOutTaskNo:this.inOutTaskNo,contractNo:this.contractNo}).toPromise()
-						.then((response) => {
+            .toPromise()
+            .then(response => {
               this.$notify.success({
-                  title: '成功',
-                  message: '修改任务号成功',
-                })
-                this.getList()
-                this.inOutTaskNo=''
-                this.dialogVisible1=false
-						})
-          })
-          .catch(() => {
-            return false
-          })
-      },
-      dialogVisibleconfirm2(){
-        this.$confirm(`确定修改客户？`, {
-            cancelButtonText: '取消',
-            confirmButtonText: '确定',
-            type: 'warning',
+                title: '成功',
+                message: '修改任务号成功'
+              })
+              this.getList()
+              this.inOutTaskNo = ''
+              this.dialogVisible1 = false
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    dialogVisibleconfirm2() {
+      this.$confirm(`确定修改客户？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+        .then(() => {
+          changeCustomer({
+            id: this.id,
+            customer: this.customerName,
+            customerPhone: this.customerPhone,
+            customerNumberCard: this.customerNumberCard
           })
-          .then(() => {
-              changeCustomer({id:this.id,customer:this.customerName,customerPhone:this.customerPhone,customerNumberCard:this.customerNumberCard}).toPromise()
-						.then((response) => {
+            .toPromise()
+            .then(response => {
               this.$notify.success({
-                  title: '成功',
-                  message: '修改客户成功',
-                })
-                this.getList()
-                this.customerName=''
-                this.customerPhone=''
-                this.customerNumberCard=''
-                this.dialogVisible2=false
-						})
-          })
-          .catch(() => {
-            return false
-          })
-      },
-        exchange(row){
-          for(let i = 0 ; i < this.warehouseList.length; i++ ){
-            if(this.warehouseName == this.warehouseList[i].warehouseName){
-              		this.binnumberList = this.warehouseList[i].positionInfos
-            }
-          }
-            this.id = row.id
-            this.binNumber = row.binNumber
-            this.cangweiNum = row.binNumber
-            this.dialogVisible = true
-       },
-       exchangeNo(row){
-        if (row.serviceManagementType == 1) {
-            this.taskflag=2
-          } else {
-            this.taskflag=3
-          }
-          getReceiptTaskNo({
-            flag: this.taskflag,
-            warehouseName: this.warehouseName,
-          })
+                title: '成功',
+                message: '修改客户成功'
+              })
+              this.getList()
+              this.customerName = ''
+              this.customerPhone = ''
+              this.customerNumberCard = ''
+              this.dialogVisible2 = false
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    exchange(row) {
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseName == this.warehouseList[i].warehouseName) {
+          this.binnumberList = this.warehouseList[i].positionInfos
+        }
+      }
+      this.id = row.id
+      this.binNumber = row.binNumber
+      this.cangweiNum = row.binNumber
+      this.dialogVisible = true
+    },
+    exchangeNo(row) {
+      if (row.serviceManagementType == 1) {
+        this.taskflag = 2
+      } else {
+        this.taskflag = 3
+      }
+      getReceiptTaskNo({
+        flag: this.taskflag,
+        warehouseName: this.warehouseName
+      })
+        .toPromise()
+        .then(response => {
+          this.taskNolist = response
+        })
+      this.id = row.id
+      this.contractNo = row.contractNo
+      this.contractNum = row.contractNo
+      this.dialogVisible1 = true
+    },
+    exchangeName(row) {
+      getcustomer({
+        warehouseId: this.warehouseId,
+        goodsName: row.goodsName
+      })
+        .toPromise()
+        .then(response => {
+          this.customerlist = response
+        })
+      this.id = row.id
+      this.dialogVisible2 = true
+    },
+    backInfo(row) {
+      this.$confirm('确定要退回该信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        returnInfo(row)
           .toPromise()
-          .then((response) => {
-            this.taskNolist = response
-          })
-            this.id = row.id
-            this.contractNo = row.contractNo
-            this.contractNum = row.contractNo
-            this.dialogVisible1 = true
-       },
-       exchangeName(row){
-           getcustomer({
-            warehouseId: this.warehouseId,
-            goodsName: row.goodsName
+          .then(response => {
+            this.$notify.success({
+              title: '成功',
+              message: '退回成功！'
+            })
+            this.getList()
           })
-          .toPromise()
-          .then((response) => {
-            this.customerlist = response
+          .catch(response => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           })
-            this.id = row.id
-            this.dialogVisible2 = true
-       },
-       backInfo(row){
-           this.$confirm('确定要退回该信息？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
+      })
+    },
+    deleteInfo(row) {
+      //删除
+      this.$confirm('确定删除检斤信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          getweighingDelete({
+            id: row.id
           })
-          .then(() => {
-              returnInfo(row)
             .toPromise()
-            .then((response) => {
-               this.$notify.success({
-                    title: '成功',
-                    message: '退回成功！',
-                })
-                this.getList()
+            .then(response => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功'
+              })
+              this.getList()
             })
-            .catch((response) => {
+            .catch(response => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    typePrintCannelClick() {
+      this.onePrint = false //单个打印标识
+      this.dialogDataList = [] //打个打印取消时数组至空
+      this.isShowPrintType = false
+    },
+    handleSelectionChange(val) {
+      this.modification = val
+    },
+    // batchPrint(){
+    //   if(this.modification.length == 0){
+    //     this.$message.error("请选择批量打印的条目！")
+    //     return
+    //   }
+    //   // this.isShowPrintType = true
+    // },
+    changeEw(e) {
+      this.ddchecked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
+      }
+    },
+    changeEwDD(e) {
+      this.checked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
+      }
+    },
+    changeOut(e) {
+      if (e) {
+        this.printout = true
+      } else {
+        this.printout = false
+      }
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString() // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    lookup() {
+      if (this.value2 && this.value2.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
+      this.currentPage = 1
+      this.getList()
+    },
+    changeType(val) {
+      this.warehousingType = val
+      this.getList()
+    },
+    screen(num) {
+      this.choice = num
+      this.getList()
+    },
+    returnsales() {
+      this.$router.go(-1)
+    },
+    async typePrintClick(type) {
+      localStorage.setItem('print_company_name', this.companyName)
+      localStorage.setItem('print_company_name_ew', this.companyNameEW)
+      localStorage.setItem('print_customer_name_ew', this.ewCustomer)
+      localStorage.setItem('print_out', this.outchecked)
+      if (this.onePrint) {
+        //判断是否是单个打印
+        getPrint({
+          id: this.idPrint
+        })
+          .toPromise()
+          .then(response => {
+            // 判断是否打印出库
+            this.dialogDataList = [] //点击确认时先清空要打印的数组
+            this.dialogData = response
+            if (response.compName == '黑龙江秋收有限公司') {
+              this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+            } else {
+              this.dialogData.compName = this.companyName
+            }
+            this.dialogData.customer = this.customer
+            if (this.checked) {
+              if (
+                this.dialogData &&
+                !this.dialogData.customer &&
+                this.dialogData.contractManagement
+              ) {
+                this.dialogData.customer = this.dialogData.contractManagement.seller
+              }
+              this.dialogDataList.push(this.dialogData)
+              var _datas = JSON.stringify(this.dialogData)
+              _datas = JSON.parse(_datas)
+              _datas.compName = this.companyNameEW
+              _datas.customer = this.ewCustomer
+              this.dialogDataList.push(_datas)
+            } else if (this.ddchecked) {
+              _datas = this.dialogData
+              _datas.compName = this.companyNameEW
+              _datas.customer = this.ewCustomer
+              this.dialogDataList.push(_datas)
+            } else {
+              this.dialogData.compName = this.companyName
+              if (
+                this.dialogData &&
+                this.dialogData.contractManagement &&
+                this.warehousingType != 3
+              ) {
+                this.dialogData.customer = this.dialogData.contractManagement.seller
+              }
+
+              this.dialogDataList.push(this.dialogData)
+            }
+            if (this.outchecked) {
+              if (!this.checked && !this.ddchecked) {
+                this.dialogDataList = []
+                var _data = JSON.parse(JSON.stringify(this.dialogData))
+                this.$set(_data, 'printtype', 'out')
+                _data.compName = this.outshipments
+                _data.customer = this.inshipments
+                _data.binNumber = this.outbinNumber
+                this.dialogDataList.push(_data)
+              } else {
+                var _data = JSON.parse(JSON.stringify(this.dialogData))
+                this.$set(_data, 'printtype', 'out')
+                _data.compName = this.outshipments
+                _data.customer = this.inshipments
+                _data.binNumber = this.outbinNumber
+                this.dialogDataList.push(_data)
+              }
+            }
+            this.printBig('', this.radio)
           })
-      },
-      deleteInfo(row){
-            //删除
-        this.$confirm('确定删除检斤信息？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
-          .then(() => {
-            getweighingDelete({
-                id: row.id,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '删除成功',
-                })
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              })
+          .catch(response => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           })
-          .catch(() => {
-            return false
+      } else {
+        //   if (this.isExcelPrint) {
+        //   this.printBig(2, this.radio)
+        //   this.isExcelPrint = false
+        // } else {
+        this.jjSelectPrintList = []
+        let index1 = 0
+        for (let i = 0; i < this.modification.length; i++) {
+          await getPrint({
+            id: this.modification[i].id
           })
-      },
-      typePrintCannelClick() {
-        this.onePrint = false //单个打印标识
-        this.dialogDataList = [] //打个打印取消时数组至空
-        this.isShowPrintType = false
-      },
-      handleSelectionChange(val) {
-        this.modification = val;
-      },
-      // batchPrint(){
-      //   if(this.modification.length == 0){
-      //     this.$message.error("请选择批量打印的条目！")
-      //     return
-      //   }
-      //   // this.isShowPrintType = true
-      // },
-      changeEw(e) {
-        this.ddchecked = false
-        if (e) {
-          this.printSeparately = true
-        } else {
-          this.printSeparately = false
-        }
-      },
-      changeEwDD(e) {
-        this.checked = false
-        if (e) {
-          this.printSeparately = true
-        } else {
-          this.printSeparately = false
-        }
-      },
-      changeOut(e) {
-        if (e) {
-          this.printout = true
-        } else {
-          this.printout = false
-        }
-      },
-       dateFormat(fmt, date) {
-        let ret
-        const opt = {
-          'Y+': date.getFullYear().toString(), // 年
-          'm+': (date.getMonth() + 1).toString(), // 月
-          'd+': date.getDate().toString(), // 日
-          'H+': date.getHours().toString(), // 时
-          // "M+": date.getMinutes().toString(),         // 分
-          // "S+": date.getSeconds().toString()          // 秒
-          // 有其他格式化字符需求可以继续添加，必须转化成字符串
-        }
-        for (let k in opt) {
-          ret = new RegExp('(' + k + ')').exec(fmt)
-          if (ret) {
-            fmt = fmt.replace(
-              ret[1],
-              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-            )
-          }
-        }
-        return fmt
-      },
-      lookup() {
-        if (this.value2&&this.value2.length>0) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-        } else {
-          this.startDate = ''
-          this.endDate = ''
-        }
-        this.currentPage = 1
-        this.getList()
-      },
-      changeType(val) {
-        this.warehousingType = val
-        this.getList()
-      },
-      screen(num) {
-        this.choice = num
-        this.getList()
-      },
-      returnsales() {
-        this.$router.go(-1)
-      },
-      async typePrintClick(type) {
-        localStorage.setItem('print_company_name',this.companyName)
-        localStorage.setItem('print_company_name_ew',this.companyNameEW)
-        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
-        localStorage.setItem('print_out',this.outchecked)
-        if (this.onePrint) { //判断是否是单个打印
-          getPrint({
-              id: this.idPrint
-            })
             .toPromise()
-            .then((response) => {
-              // 判断是否打印出库
-              this.dialogDataList = [] //点击确认时先清空要打印的数组
-              this.dialogData = response
+            .then(response => {
+              index1++
+              response.compName = this.companyName
               if (response.compName == '黑龙江秋收有限公司') {
-                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
-              }else{
-                this.dialogData.compName = this.companyName
-              }
-              this.dialogData.customer=this.customer
-              if (this.checked) {
-                if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
-                  this.dialogData.customer = this.dialogData.contractManagement.seller
-                }
-                this.dialogDataList.push(this.dialogData)
-                var _datas = JSON.stringify(this.dialogData)
-                _datas = JSON.parse(_datas)
-                _datas.compName = this.companyNameEW;
-                _datas.customer = this.ewCustomer
-                this.dialogDataList.push(_datas)
-              } else if (this.ddchecked) {
-                _datas = this.dialogData
-                _datas.compName = this.companyNameEW;
-                _datas.customer = this.ewCustomer
-                this.dialogDataList.push(_datas)
-              }else {
-                this.dialogData.compName = this.companyName
-                if(this.dialogData&&this.dialogData.contractManagement&& this.warehousingType != 3){
-                  this.dialogData.customer = this.dialogData.contractManagement.seller
-                }
-                
-                this.dialogDataList.push(this.dialogData)
-               
+                response.compName = '黑龙江中天昊元贸易有限公司'
               }
-              if(this.outchecked){
-                if(!this.checked&&!this.ddchecked){
-                  this.dialogDataList=[]
-                  var _data = JSON.parse(JSON.stringify(this.dialogData))
-                  this.$set(_data,'printtype','out')
-                  _data.compName = this.outshipments;
-                  _data.customer = this.inshipments
-                  _data.binNumber = this.outbinNumber
-                  this.dialogDataList.push(_data)
-                }else{
-                  var _data = JSON.parse(JSON.stringify(this.dialogData))
-                  this.$set(_data,'printtype','out')
-                  _data.compName = this.outshipments;
-                  _data.customer = this.inshipments
-                  _data.binNumber = this.outbinNumber
-                  this.dialogDataList.push(_data)
-                }  
+              response.customer = this.customer
+              this.jjSelectPrintList.push(response)
+              if (index1 == this.modification.length) {
+                this.printBig(1, this.radio)
               }
-              this.printBig('', this.radio)
             })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        } else {
-          //   if (this.isExcelPrint) {
-          //   this.printBig(2, this.radio)
-          //   this.isExcelPrint = false
-          // } else {
-          this.jjSelectPrintList = []
-          let index1 = 0;
-          for (let i = 0; i < this.modification.length; i++) {
-            await getPrint({
-                id: this.modification[i].id
-              })
-              .toPromise()
-              .then((response) => {
-                index1++;
-                response.compName = this.companyName
-                if (response.compName == '黑龙江秋收有限公司') {
-                  response.compName = '黑龙江中天昊元贸易有限公司'
-                }
-                response.customer=this.customer
-                this.jjSelectPrintList.push(response)
-                if (index1 == this.modification.length) {
-                  this.printBig(1, this.radio)
-                }
-              })
-              .catch((response) => {})
-          }
-          // }
-        }
-      },
-      makeEWjjSelectPrintList() {
-        let _selectPrint_EWjjSelectPrintList = JSON.parse(JSON.stringify(this.jjSelectPrintList));
-        for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
-          let _data = _selectPrint_EWjjSelectPrintList[i];
-          _data.compName = this.companyNameEW;
-          _data.customer = this.ewCustomer
+            .catch(response => {})
         }
-        localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
-      },
-      check(name, type) {
-        if (type == 1) {
-          for (var _tmp = 0; _tmp < this.ewCustomerOptions.length; _tmp++) {
-            if (this.ewCustomerOptions[_tmp].label == name) {
-              return false
-            }
-          }
-          return true
-        } else if (type == 2) {
-          for (var _tmp = 0; _tmp < this.companyNameEWOptions.length; _tmp++) {
-            if (this.companyNameEWOptions[_tmp].label == name) {
-              return false
-            }
+        // }
+      }
+    },
+    makeEWjjSelectPrintList() {
+      let _selectPrint_EWjjSelectPrintList = JSON.parse(
+        JSON.stringify(this.jjSelectPrintList)
+      )
+      for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
+        let _data = _selectPrint_EWjjSelectPrintList[i]
+        _data.compName = this.companyNameEW
+        _data.customer = this.ewCustomer
+      }
+      localStorage.setItem(
+        'selectPrint_EWjjSelectPrintList',
+        JSON.stringify(_selectPrint_EWjjSelectPrintList)
+      )
+    },
+    check(name, type) {
+      if (type == 1) {
+        for (var _tmp = 0; _tmp < this.ewCustomerOptions.length; _tmp++) {
+          if (this.ewCustomerOptions[_tmp].label == name) {
+            return false
           }
-          return true
-
-        } else if (type == 3) {
-          for (var _tmp = 0; _tmp < this.companyNameOptions.length; _tmp++) {
-            console.log(name)
-            if (this.companyNameOptions[_tmp].label == name) {
-              return false
-            }
+        }
+        return true
+      } else if (type == 2) {
+        for (var _tmp = 0; _tmp < this.companyNameEWOptions.length; _tmp++) {
+          if (this.companyNameEWOptions[_tmp].label == name) {
+            return false
           }
-          return true
-
         }
-
-      },
-      async print(row, type, pageType) {
-       this.printType=type
-        //打印
-        if (type == 1) { //
-          if (this.modification.length == 0) {
-            this.$message.error('请选择批量打印的条目！')
-            return
+        return true
+      } else if (type == 3) {
+        for (var _tmp = 0; _tmp < this.companyNameOptions.length; _tmp++) {
+          console.log(name)
+          if (this.companyNameOptions[_tmp].label == name) {
+            return false
           }
-          for (let _num = 0; _num < this.modification.length; _num++) {
-            this.serviceManagementType=this.modification[_num].serviceManagementType
-            if(this.modification[_num].serviceManagementType == 3){
-                    this.customerOptions=[{label:this.modification[_num].customer,value:this.modification[_num].customer}]
-                    this.customerOptions.push({label:this.modification[_num].seller,value:this.modification[_num].seller})
-                    this.customer=this.modification[_num].customer
-                  }
-            if (this.modification[_num].serviceManagementType == 1&&(this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')){
-              if (this.modification[_num].seller && this.modification[_num].buyer) {
-                let cang = {}
-                cang.value = this.modification[_num].seller
-                cang.label = this.modification[_num].seller
-                let cang1 = {}
-                cang1.value = this.modification[_num].buyer
-                cang1.label = this.modification[_num].buyer
-                // if (this.check(this.modification[_num].seller, 1)) {
-                //   this.ewCustomerOptions.push(cang)
-                // }
-                
-                
-                if(this.warehouseName=='佳屹农仓储库'){
-                  if (this.check(this.modification[_num].buyer, 3)) {
-                    this.companyNameOptions.push(cang1)
-                    this.companyName=this.modification[_num].buyer
-                  }
-                  
-                }else{
-                  if (this.check(this.modification[_num].buyer, 2)) {
-                    this.ewCustomerOptions.push(cang1)
-                  }
-                }
-                
-                if (this.check(this.modification[_num].seller, 1)) {
-                  this.companyNameEWOptions.push(cang)
-                }
+        }
+        return true
+      }
+    },
+    async print(row, type, pageType) {
+      this.printType = type
+      //打印
+      if (type == 1) {
+        //
+        if (this.modification.length == 0) {
+          this.$message.error('请选择批量打印的条目！')
+          return
+        }
+        for (let _num = 0; _num < this.modification.length; _num++) {
+          this.serviceManagementType = this.modification[
+            _num
+          ].serviceManagementType
+          if (this.modification[_num].serviceManagementType == 3) {
+            this.customerOptions = [
+              {
+                label: this.modification[_num].customer,
+                value: this.modification[_num].customer
               }
-            }
-          }
-          
-          this.isShowPrintType = true
-          
-        } else {
-          this.serviceManagementType=row.serviceManagementType
-          if(row.serviceManagementType == 3){
-            this.customerOptions=[{label:row.customer,value:row.customer}]
-            this.customerOptions.push({label:row.seller,value:row.seller})
-            this.customer=row.customer
-            console.log(this.customerOptions,this.customer,222222)
+            ]
+            this.customerOptions.push({
+              label: this.modification[_num].seller,
+              value: this.modification[_num].seller
+            })
+            this.customer = this.modification[_num].customer
           }
-          if (row.serviceManagementType == 1&&(this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')) {
-            if (row.seller && row.buyer) {
+          if (
+            this.modification[_num].serviceManagementType == 1 &&
+            (this.warehouseName == '鲅鱼圈金信库' ||
+              this.warehouseName == '杜尔伯特家禾库' ||
+              this.warehouseName == '洮南新友谊兴旺库' ||
+              this.warehouseName == '甘南宏旗库' ||
+              this.warehouseName == '白城内陆港' ||
+              this.warehouseName == '洮南向阳乡金昊' ||
+              this.warehouseName == '山东园丰库' ||
+              this.warehouseName == '佳屹农仓储库')
+          ) {
+            if (
+              this.modification[_num].seller &&
+              this.modification[_num].buyer
+            ) {
               let cang = {}
-              cang.value = row.seller
-              cang.label = row.seller
-              // if (this.check(row.seller, 1)) {
+              cang.value = this.modification[_num].seller
+              cang.label = this.modification[_num].seller
+              let cang1 = {}
+              cang1.value = this.modification[_num].buyer
+              cang1.label = this.modification[_num].buyer
+              // if (this.check(this.modification[_num].seller, 1)) {
               //   this.ewCustomerOptions.push(cang)
               // }
-              let cang1 = {}
-              cang1.value = row.buyer
-              cang1.label = row.buyer
-              
-              if(this.warehouseName=='佳屹农仓储库'){
-                if (this.check(row.buyer, 3)) {
+
+              if (this.warehouseName == '佳屹农仓储库') {
+                if (this.check(this.modification[_num].buyer, 3)) {
                   this.companyNameOptions.push(cang1)
-                  this.companyName=row.buyer
+                  this.companyName = this.modification[_num].buyer
                 }
-                
-               
-              }else{
-                if (this.check(row.buyer, 2)) {
-                  this.companyNameEWOptions.push(cang1)
+              } else {
+                if (this.check(this.modification[_num].buyer, 2)) {
+                  this.ewCustomerOptions.push(cang1)
                 }
               }
-              if (this.check(row.seller, 1)) {
-                  this.ewCustomerOptions.push(cang)
-                }
-              
+
+              if (this.check(this.modification[_num].seller, 1)) {
+                this.companyNameEWOptions.push(cang)
+              }
             }
           }
-          this.idPrint = row.id
-          if(type==2&&this.warehouseName=='鲅鱼圈金信库'){
-            var data=await getbinNumber({id:row.warehouseId}).toPromise()
-            this.binNumberList1=data.warehousePositionInfoList
-          }
-          this.isShowPrintType = true
-          this.onePrint = true //单个打印标识
         }
 
-      },
-      printSmall() {
-        window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData).replace(/%/g, 'baifenhao'))
-      },
-      printBig(type, radioType) {
-           localStorage.removeItem('print_in_data')
-        // 打印额外
-        if (this.checked || this.ddchecked) {
-          this.makeEWjjSelectPrintList()
-          //  this.selectEW = true;
-        }
-        // if(this.outchecked){
-        //   var _data = JSON.parse(JSON.stringify(this.dialogData))
-        //   this.$set(_data,'printtype','out')
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
-        // }
-        if (type == 1) {
-          localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
-          window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
-            .checked + '&selectEWDD=' + this.ddchecked)
-        } else if (type == 2) {
-          localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
-          window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
-        } else {
-          console.log(this.dialogDataList)
-          localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-          // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-          window.open('../../../../static/weightCheck.html?type=2&tableData=' )
+        this.isShowPrintType = true
+      } else {
+        this.serviceManagementType = row.serviceManagementType
+        if (row.serviceManagementType == 3) {
+          this.customerOptions = [{ label: row.customer, value: row.customer }]
+          this.customerOptions.push({ label: row.seller, value: row.seller })
+          this.customer = row.customer
+          console.log(this.customerOptions, this.customer, 222222)
         }
-      },
-      warehouseNameChange() {
-        for(let i = 0 ; i < this.warehouseList.length; i++ ){
-            if(this.warehouseName == this.warehouseList[i].warehouseName){
-              		this.warehouseId = this.warehouseList[i].id
+        if (
+          row.serviceManagementType == 1 &&
+          (this.warehouseName == '鲅鱼圈金信库' ||
+            this.warehouseName == '杜尔伯特家禾库' ||
+            this.warehouseName == '洮南新友谊兴旺库' ||
+            this.warehouseName == '甘南宏旗库' ||
+            this.warehouseName == '白城内陆港' ||
+            this.warehouseName == '洮南向阳乡金昊' ||
+            this.warehouseName == '山东园丰库' ||
+            this.warehouseName == '佳屹农仓储库')
+        ) {
+          if (row.seller && row.buyer) {
+            let cang = {}
+            cang.value = row.seller
+            cang.label = row.seller
+            // if (this.check(row.seller, 1)) {
+            //   this.ewCustomerOptions.push(cang)
+            // }
+            let cang1 = {}
+            cang1.value = row.buyer
+            cang1.label = row.buyer
+
+            if (this.warehouseName == '佳屹农仓储库') {
+              if (this.check(row.buyer, 3)) {
+                this.companyNameOptions.push(cang1)
+                this.companyName = row.buyer
+              }
+            } else {
+              if (this.check(row.buyer, 2)) {
+                this.companyNameEWOptions.push(cang1)
+              }
+            }
+            if (this.check(row.seller, 1)) {
+              this.ewCustomerOptions.push(cang)
             }
           }
-        this.getList()
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
-      getList() {
-        // 列表
-        getweighingList({
-            compId: localStorage.getItem('ws-pf_compId'),
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchKeyWord: this.searchKeyWord,
-            warehouseName: this.warehouseName,
-            managementType: 1,
-            serviceManagementType: this.warehousingType,
-            statusType: this.choice,
-            startDate: this.startDate,
-            endDate: this.endDate,
-          })
-          .toPromise()
-          .then((response) => {
-            this.weighingRecordList = response.records
-            this.deptBudgetTotal = response.total
-          })
-          .catch((response) => {
-            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          })
-      },
-
+        }
+        this.idPrint = row.id
+        if (type == 2 && this.warehouseName == '鲅鱼圈金信库') {
+          var data = await getbinNumber({ id: row.warehouseId }).toPromise()
+          this.binNumberList1 = data.warehousePositionInfoList
+        }
+        this.isShowPrintType = true
+        this.onePrint = true //单个打印标识
+      }
+    },
+    printSmall() {
+      window.open(
+        '../../../../static/weightCheck.html?type=1&tableData=' +
+          JSON.stringify(this.dialogData).replace(/%/g, 'baifenhao')
+      )
+    },
+    printBig(type, radioType) {
+      localStorage.removeItem('print_in_data')
+      // 打印额外
+      if (this.checked || this.ddchecked) {
+        this.makeEWjjSelectPrintList()
+        //  this.selectEW = true;
+      }
+      // if(this.outchecked){
+      //   var _data = JSON.parse(JSON.stringify(this.dialogData))
+      //   this.$set(_data,'printtype','out')
+      //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+      // }
+      if (type == 1) {
+        localStorage.setItem(
+          'selectPrint_jjSelectPrintList',
+          JSON.stringify(this.jjSelectPrintList)
+        )
+        window.open(
+          '../../../../static/weightCheck.html?type=2&radioType=' +
+            radioType +
+            '&selectEW=' +
+            this.checked +
+            '&selectEWDD=' +
+            this.ddchecked
+        )
+      } else if (type == 2) {
+        localStorage.setItem(
+          'selectPrint_jjSelectPrintList',
+          JSON.stringify(this.excelPrintData)
+        )
+        window.open(
+          '../../../../static/weightCheck.html?type=2&radioType=' + radioType
+        )
+      } else {
+        console.log(this.dialogDataList)
+        localStorage.setItem(
+          'print_in_data',
+          JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao')
+        )
+        // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+        window.open('../../../../static/weightCheck.html?type=2&tableData=')
+      }
+    },
+    warehouseNameChange() {
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseName == this.warehouseList[i].warehouseName) {
+          this.warehouseId = this.warehouseList[i].id
+        }
+      }
+      this.getList()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
     },
+    getList() {
+      // 列表
+      getweighingList({
+        compId: localStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+        warehouseName: this.warehouseName,
+        managementType: 1,
+        serviceManagementType: this.warehousingType,
+        statusType: this.choice,
+        startDate: this.startDate,
+        endDate: this.endDate
+      })
+        .toPromise()
+        .then(response => {
+          this.weighingRecordList = response.records
+          this.deptBudgetTotal = response.total
+        })
+        .catch(response => {
+          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+        })
+    }
   }
+}
 </script>
 <style lang="scss" scoped>
-  .toptitle {
-    background: #f6f7fc;
-  }
+.toptitle {
+  background: #f6f7fc;
+}
 
-  .bg-left {
-    padding-left: 30px;
-  }
+.bg-left {
+  padding-left: 30px;
+}
 
-  .bg-right {
-    text-align: right;
-    padding: 16px 20px;
-  }
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
 
-  .top-title {
-    width: 50%;
-    display: flex;
-  }
+.top-title {
+  width: 50%;
+  display: flex;
+}
 
-  .title {
-    position: relative;
-  }
-
-  .title::before {
-    content: '';
-    display: inline-block;
-    width: 5px;
-    height: 30px;
-    background: #5473e8;
-    position: absolute;
-    left: 0;
-  }
+.title {
+  position: relative;
+}
 
-  .container {
-    overflow: scroll;
-    height: 93vh;
-  }
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
 
-  .center {
-    margin: auto;
-  }
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
 
-  .centertitle {
-    display: flex;
-    margin: 10px 0;
-  }
-
-  .temporary {
-    line-height: 80px;
-    font-size: 20px;
-    color: #abaaaa;
-  }
-
-  /deep/.forData .cell {
-    text-align: center;
-  }
+.center {
+  margin: auto;
+}
 
-  //弹出框
-  .eject-warehouse {
-    font-size: 20px;
-    margin-left: 15px;
-    font-weight: 600;
-  }
+.centertitle {
+  display: flex;
+  margin: 10px 0;
+}
 
-  .table_css {
-    margin: 20px auto;
+.temporary {
+  line-height: 80px;
+  font-size: 20px;
+  color: #abaaaa;
+}
 
-    tr {
-      height: 50px;
-    }
+/deep/.forData .cell {
+  text-align: center;
+}
 
-    .table_item {
-      min-width: 70px;
-    }
+//弹出框
+.eject-warehouse {
+  font-size: 20px;
+  margin-left: 15px;
+  font-weight: 600;
+}
 
-    td {
-      text-align: center;
-      font-size: 18px;
-      font-weight: 600;
-    }
+.table_css {
+  margin: 20px auto;
 
-    .el-select {
-      width: 90%;
-    }
+  tr {
+    height: 50px;
   }
 
-  .btn_topcss {
-    margin-top: 15px;
-
+  .table_item {
+    min-width: 70px;
   }
 
-  .btn_css {
-    width: 90px;
-    margin-left: 10px;
+  td {
+    text-align: center;
+    font-size: 18px;
+    font-weight: 600;
   }
 
-  .search_css {
-    margin: 0 20px;
+  .el-select {
+    width: 90%;
   }
+}
 
-  .mask {
-    background: black;
-    width: 100vw;
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    z-index: 99;
-    opacity: 0.3;
-  }
+.btn_topcss {
+  margin-top: 15px;
+}
 
-  .print-type-title {
-    text-align: center;
-    font-size: 18px;
-    margin: 20px;
-  }
+.btn_css {
+  width: 90px;
+  margin-left: 10px;
+}
 
-  .bottom-btn {
-    display: flex;
-    margin-top: 20px;
-    justify-content: space-around;
-  }
+.search_css {
+  margin: 0 20px;
+}
 
-  .print-type-checkbox {
-    // padding-left: 20px;
-  }
+.mask {
+  background: black;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  z-index: 99;
+  opacity: 0.3;
+}
 
-  .print-type {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 440px;
-    height: 446px;
-    background: white;
-    border-radius: 10px;
-    z-index: 999;
-  }
+.print-type-title {
+  text-align: center;
+  font-size: 18px;
+  margin: 20px;
+}
 
-  /deep/.el-radio-group {
-    width: 100%;
-    display: flex;
-  }
+.bottom-btn {
+  display: flex;
+  margin-top: 20px;
+  justify-content: space-around;
+}
 
-  /deep/.el-radio__label {
-    font-size: 20px;
-  }
+.print-type-checkbox {
+  // padding-left: 20px;
+}
 
-  /deep/.el-radio__inner {
-    // background: red;
-    height: 20px;
-    width: 20px;
-  }
+.print-type {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 440px;
+  height: 446px;
+  background: white;
+  border-radius: 10px;
+  z-index: 999;
+}
 
-  .label-width {
-    width: 100%;
-    text-align: center;
-    font-size: 20px;
-  }
+/deep/.el-radio-group {
+  width: 100%;
+  display: flex;
+}
 
-  .show-excel {
-    opacity: 0;
-  }
+/deep/.el-radio__label {
+  font-size: 20px;
+}
 
-  /deep/.base_header_layout .find.el-button--primary {
-    width: 30px;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-  }
+/deep/.el-radio__inner {
+  // background: red;
+  height: 20px;
+  width: 20px;
+}
 
-  /deep/.base_header_layout .findinput input {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-  }
+.label-width {
+  width: 100%;
+  text-align: center;
+  font-size: 20px;
+}
 
-  .ew-print {
-    padding: 0 20px;
-    margin-top: 10px;
+.show-excel {
+  opacity: 0;
+}
 
-    // display: flex;
-    // justify-content: space-between;
-    // align-content: center;
-    .row {
-      display: flex;
-      margin-top: 10px;
-      align-items: center;
-    }
-  }
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
 
-  .sh-address {
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+
+.ew-print {
+  padding: 0 20px;
+  margin-top: 10px;
+
+  // display: flex;
+  // justify-content: space-between;
+  // align-content: center;
+  .row {
     display: flex;
+    margin-top: 10px;
+    align-items: center;
   }
+}
 
-  .print-type-ew {
-    display: flex;
-    justify-content: space-between;
-    padding: 0 20px;
+.sh-address {
+  display: flex;
+}
 
-    /deep/.el-radio__label {
-      font-size: 14px;
-    }
+.print-type-ew {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20px;
 
-    margin-top: 10px;
+  /deep/.el-radio__label {
+    font-size: 14px;
   }
 
-  /deep/.el-table .cell {
-    text-align: center;
-  }
+  margin-top: 10px;
+}
 
-  .shdw-style {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 20px;
-    margin-top: 20px;
-  }
+/deep/.el-table .cell {
+  text-align: center;
+}
+
+.shdw-style {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  margin-top: 20px;
+}
 </style>

src/views/login/index.vue

@@ -273,13 +273,13 @@
       :before-close="serviceClose" :closeOnClickModal="true" :appendToBody="true">
       <serviceDialog @close="serviceClose"></serviceDialog>
     </el-dialog>
-    <div class="bottom">
+    <!-- <div class="bottom">
           <div class="row1">
           Copyright www.eliangeyun.com All Right Reserved @淘粮（海南）科技发展有限公司  </div>
           <div class="">
           <a href="https://beian.miit.gov.cn">琼ICP备2021004821号-2</a>
           </div>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/views/taskManagement/component/routers/route.js

@@ -2,274 +2,275 @@ import Layout from '@/layout/index';
 
 const tranManagementRouter = {
 
-  path: '/transportationTask',
-  component: Layout,
-  redirect: '/taskManagement',
-  name: 'transportationTask',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'taskManagement',
-    module: 'transportationTask.transportation.transportationInfo',
-    icon: '-renwuguanli'
-  },
-  children: [
-    //出入库任务
-    {
-      path: 'tranManagementWarehouseInOuttask',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTask'),
-      name: 'tranManagementWarehouseInOuttask',
-      meta: {
-        title: 'tranManagementWarehouseInOutTask',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-        _title:'出入库任务'
-      },
-    },
-    //出入库任务查看
-    {
-      path: 'inOutWarehousetaskEdit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/inOutWarehouseTaskEdit'),
-      name: 'inOutWarehousetaskEdit',
-      meta: {
-        title: 'inOutWarehouseTaskEdit',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-        _title:'出入库任务查看'
-      },
-      hidden: true
-    },
-    //出入库任务出库选择货源
-    {
-      path: 'supplyofgoods',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/supplyofgoods'),
-      name: 'supplyofgoods',
-      meta: {
-        title: 'supplyofgoods',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-        _title:'出入库任务出库选择货源'
-      },
-      hidden: true
-    },
-     //出入库任务退库选择货源
-     {
-      path: 'outsupplyofgoods',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/outsupplyofgoods'),
-      name: 'outsupplyofgoods',
-      meta: {
-        title: 'outsupplyofgoods',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-        _title:'出入库任务退库选择货源'
-      },
-      hidden: true
-    },
-    //出入库任务出库查看货源
-    {
-      path: 'supplyofgoodslook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/supplyofgoodslook'),
-      name: 'supplyofgoodslook',
-      meta: {
-        title: 'supplyofgoodslook',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-        _title:'出入库任务出库查看货源'
-      },
-      hidden: true
-    },
-     //出入库任务退库查看货源
-     {
-      path: 'outsupplyofgoodslook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/outsupplyofgoodslook'),
-      name: 'outsupplyofgoodslook',
-      meta: {
-        title: 'outsupplyofgoodslook',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-        _title:'出入库任务退库查看货源'
-      },
-      hidden: true
+    path: '/transportationTask',
+    component: Layout,
+    redirect: '/taskManagement',
+    name: 'transportationTask',
+    alwaysShow: true, // will always show the root menu
+    meta: {
+        title: 'taskManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        icon: '-renwuguanli'
     },
+    children: [
+        //出入库任务
+        {
+            path: 'tranManagementWarehouseInOuttask',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTask'),
+            name: 'tranManagementWarehouseInOuttask',
+            meta: {
+                title: 'tranManagementWarehouseInOutTask',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务'
+            },
+        },
+        //出入库任务查看
+        {
+            path: 'inOutWarehousetaskEdit',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/inOutWarehouseTaskEdit'),
+            name: 'inOutWarehousetaskEdit',
+            meta: {
+                title: 'inOutWarehouseTaskEdit',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务查看'
+            },
+            hidden: true
+        },
+        //出入库任务出库选择货源
+        {
+            path: 'supplyofgoods',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/supplyofgoods'),
+            name: 'supplyofgoods',
+            meta: {
+                title: 'supplyofgoods',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务出库选择货源'
+            },
+            hidden: true
+        },
+        //出入库任务退库选择货源
+        {
+            path: 'outsupplyofgoods',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/outsupplyofgoods'),
+            name: 'outsupplyofgoods',
+            meta: {
+                title: 'outsupplyofgoods',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务退库选择货源'
+            },
+            hidden: true
+        },
+        //出入库任务出库查看货源
+        {
+            path: 'supplyofgoodslook',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/supplyofgoodslook'),
+            name: 'supplyofgoodslook',
+            meta: {
+                title: 'supplyofgoodslook',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务出库查看货源'
+            },
+            hidden: true
+        },
+        //出入库任务退库查看货源
+        {
+            path: 'outsupplyofgoodslook',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/outsupplyofgoodslook'),
+            name: 'outsupplyofgoodslook',
+            meta: {
+                title: 'outsupplyofgoodslook',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务退库查看货源'
+            },
+            hidden: true
+        },
         //出入库任务出库编辑选择货源
         {
-          path: 'supplyofgoodsedit',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/supplyofgoodsedit'),
-          name: 'supplyofgoodsedit',
-          meta: {
-            title: 'supplyofgoodsedit',
-            shortcutEntrance: 'tranManagement',
-            module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-            _title:'出入库任务出库编辑货源'
-          },
-          hidden: true
+            path: 'supplyofgoodsedit',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/supplyofgoodsedit'),
+            name: 'supplyofgoodsedit',
+            meta: {
+                title: 'supplyofgoodsedit',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务出库编辑货源'
+            },
+            hidden: true
         },
-         //出入库任务退库编辑选择货源
-         {
-          path: 'outsupplyofgoodsedit',
-          component: () =>
-            import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/outsupplyofgoodsedit'),
-          name: 'outsupplyofgoodsedit',
-          meta: {
-            title: 'outsupplyofgoodsedit',
-            shortcutEntrance: 'tranManagement',
-            module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
-            _title:'出入库任务退库编辑货源'
-          },
-          hidden: true
+        //出入库任务退库编辑选择货源
+        {
+            path: 'outsupplyofgoodsedit',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/outsupplyofgoodsedit'),
+            name: 'outsupplyofgoodsedit',
+            meta: {
+                title: 'outsupplyofgoodsedit',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+                _title: '出入库任务退库编辑货源'
+            },
+            hidden: true
         },
-    //出入库任务添加
-    {
-      path: 'tranManagementWarehouseInOuttaskAdd',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAdd'),
-      name: 'tranManagementWarehouseInOuttaskAdd',
-      meta: {
-        title: 'tranManagementWarehouseInOutTaskAdd',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'出入库任务添加'
-      },
-      hidden: true
-    },
-    //出入库任务编辑
-    {
-      path: 'tranManagementWarehouseInOuttaskedit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
-      name: 'tranManagementWarehouseInOuttaskedit',
-      meta: {
-        title: 'tranManagementWarehouseInOutTaskEdit',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.edit',
-        permissicon: [],
-        keepAlive: true,
-        _title:'出入库任务编辑'
-      },
-      hidden: true
-    },
-    //出入库任务审核
-    {
-      path: 'tranManagementWarehouseInOuttaskaudit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAudit'),
-      name: 'tranManagementWarehouseInOutTaskEdit',
-      meta: {
-        title: 'tranManagementWarehouseInOutTaskaudit',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.audit',
-        permissicon: [],
-        keepAlive: true,
-        _title:'出入库任务审核'
-      },
-      hidden: true
-    },
-    //运输任务
-    {
-      path: 'tranManagementTransport',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransport'),
-      name: 'tranManagementTransport',
-      meta: {
-        title: 'tranManagementTransport',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务'
-      },
+        //出入库任务添加
+        {
+            path: 'tranManagementWarehouseInOuttaskAdd',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAdd'),
+            name: 'tranManagementWarehouseInOuttaskAdd',
+            meta: {
+                title: 'tranManagementWarehouseInOutTaskAdd',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '出入库任务添加'
+            },
+            hidden: true
+        },
+        //出入库任务编辑
+        {
+            path: 'tranManagementWarehouseInOuttaskedit',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
+            name: 'tranManagementWarehouseInOuttaskedit',
+            meta: {
+                title: 'tranManagementWarehouseInOutTaskEdit',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.edit',
+                permissicon: [],
+                keepAlive: true,
+                _title: '出入库任务编辑'
+            },
+            hidden: true
+        },
+        //出入库任务审核
+        {
+            path: 'tranManagementWarehouseInOuttaskaudit',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAudit'),
+            name: 'tranManagementWarehouseInOutTaskEdit',
+            meta: {
+                title: 'tranManagementWarehouseInOutTaskaudit',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask.audit',
+                permissicon: [],
+                keepAlive: true,
+                _title: '出入库任务审核'
+            },
+            hidden: true
+        },
+        //运输任务
+        {
+            path: 'tranManagementTransport',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransport'),
+            name: 'tranManagementTransport',
+            meta: {
+                title: 'tranManagementTransport',
+                shortcutEntrance: 'tranManagement',
+                module: 'transportationTask.transportation.transportationInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '运输任务'
+            },
 
-      // hidden: true
-    },
-    //运输查看
-    {
-      path: 'tranManagementLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementLook'),
-      name: 'tranManagementLook',
-      meta: {
-        title: 'tranManagementLook',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务查看'
-      },
-      hidden: true
-    },
-    //运输添加
-    {
-      path: 'tranManagementTransportAdd',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportAdd'),
-      name: 'tranManagemen  tTransportAdd',
-      meta: {
-        title: 'tranManagementTransportAdd',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务添加'
-      },
-      hidden: true
-    },
-    //运输编辑
-    {
-      path: 'tranManagementTransportEdit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportEdit'),
-      name: 'tranManagementTransportEdit',
-      meta: {
-        title: 'tranManagementTransportEdit',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务编辑'
-      },
-      hidden: true
+            hidden: true
+        },
+        //运输查看
+        {
+            path: 'tranManagementLook',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementLook'),
+            name: 'tranManagementLook',
+            meta: {
+                title: 'tranManagementLook',
+                shortcutEntrance: 'tranManagement',
+                module: 'transportationTask.transportation.transportationInfo.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '运输任务查看'
+            },
+            hidden: true
+        },
+        //运输添加
+        {
+            path: 'tranManagementTransportAdd',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportAdd'),
+            name: 'tranManagemen  tTransportAdd',
+            meta: {
+                title: 'tranManagementTransportAdd',
+                shortcutEntrance: 'tranManagement',
+                module: 'transportationTask.transportation.transportationInfo.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '运输任务添加'
+            },
+            hidden: true
+        },
+        //运输编辑
+        {
+            path: 'tranManagementTransportEdit',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportEdit'),
+            name: 'tranManagementTransportEdit',
+            meta: {
+                title: 'tranManagementTransportEdit',
+                shortcutEntrance: 'tranManagement',
+                module: 'transportationTask.transportation.transportationInfo.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '运输任务编辑'
+            },
+            hidden: true
+
+        },
+        //移库任务
+        {
+            path: 'moveWarehouseTask',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTask'),
+            name: 'moveWarehouseTask',
+            meta: {
+                title: 'moveWarehouseTask',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask',
+                permissicon: [],
+                keepAlive: true,
+                _title: '移库任务'
+            },
+            hidden: true,
+        },
+        //移库查看 
+        {
+            path: 'moveWarehouseTaskLook',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTaskLook'),
+            name: 'moveWarehouseTaskLook',
+            meta: {
+                title: 'moveWarehouseTaskLook',
+                shortcutEntrance: 'tranManagement',
+                module: 'warehouseManagement.warehouse.warehouseInfoTask',
+                _title: '移库任务查看'
+            },
+            hidden: true,
+        },
 
-    },
-    //移库任务
-    {
-      path: 'moveWarehouseTask',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTask'),
-      name: 'moveWarehouseTask',
-      meta: {
-        title: 'moveWarehouseTask',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
-        permissicon: [],
-        keepAlive: true,
-        _title:'移库任务'
-      },
-    },
-    //移库查看 
-    {
-      path: 'moveWarehouseTaskLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTaskLook'),
-      name: 'moveWarehouseTaskLook',
-      meta: {
-        title: 'moveWarehouseTaskLook',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
-        _title:'移库任务查看'
-      },
-      hidden: true,
-    },
-    
 
-  ],
+    ],
 
 };
 

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -7,10 +7,10 @@
             `warehouseManagement.warehouse.warehouseInfoTask.add`
           ">添加
         </ws-button>
-         <ws-button type="primary" @click="outData()" v-hasPermission="
+         <!-- <ws-button type="primary" @click="outData()" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
           ">导出销售出库任务
-        </ws-button>
+        </ws-button> -->
       </template>
       <template slot="right">
         <el-select filterable v-model="warehouseNametext" placeholder class="typeselect" @change="warehousechange" :value="warehouseName">
@@ -19,19 +19,19 @@
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName"
             style="color: #8890b1" />
         </el-select>
-        <ws-select v-model="publishertext" placeholder class="typeselect" @change="publisherchange" :value="publisher">
+        <!-- <ws-select v-model="publishertext" placeholder class="typeselect" @change="publisherchange" :value="publisher">
           <ws-option  key="全部发布者" label="全部发布者" value="全部发布者" style="color: #8890b1" />
           <ws-option v-for="item in staffList" :key="item.id" :label="item.staffName" :value="item.staffName"
             style="color: #8890b1" />
-        </ws-select>
+        </ws-select> -->
         <ws-select v-model="searchTypeText" placeholder class="typeselect" @change="selecttaskType" :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <ws-select v-model="inOutType" placeholder class="typeselect" @change="selectinOutType" :value="inOutType">
+        <!-- <ws-select v-model="inOutType" placeholder class="typeselect" @change="selectinOutType" :value="inOutType">
           <ws-option v-for="item in inOutTypeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
-        </ws-select>
+        </ws-select> -->
         <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找" clearable maxlength="500" type="input"></ws-input>
         <ws-button class="find" type="primary" @click="lookUp()">
           <img width="16" height="16" style="

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1,2227 +1,2379 @@
 // 创建出入库任务
 <template>
-	<div class="container">
-		<el-row>
-			<el-col :span="12">
-				<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-col>
-		</el-row>
-		<div class="basicInformation">
-			<div class="annu">
-				<el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-					<el-radio label="1" class="a">出库</el-radio>
-					<el-radio label="2" class="a">入库</el-radio>
-					<el-radio label="3" class="a">移库</el-radio>
-					<el-radio label="4" class="a">退库并出库</el-radio>
-				</el-radio-group>
-			</div>
-			<div class="ding"></div>
-			<div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
-				<img style="position: relative; top: 40px; left: 300px" width="19" height="19"
-					src="../../../public/img/cangku.png" alt />
-				<!--出库=-->
-				<div class="small-title">
-					<h3>出库任务({{ inOutTaskNo }})</h3>
-				</div>
-				<el-form ref="dataList" :model="dataList" label-width="140px" input-width="300px">
-					<!-- 仓库名 -->
-					<el-form-item label="仓库名">
-						<el-select v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect"  filterable  clearable
-							@change="selectwarehouseName">
-							<el-option v-for="item in warehouseNameList" :key="item.constKey"
-								:label="item.warehouseName" :value="item.id" />
-						</el-select>
-					</el-form-item>
-					<!-- 出库类型 -->
-					<el-form-item label="出库类型">
-						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-							v-model="dataList.inOutType" placeholder="请选择出库类型" class="typeselect"
-							@change="selectstorageType" filterable clearable>
-							<el-option v-for="item in storageType" :key="item.constKey" v-if="
-                  (dataList.taskTypeKey == 1 &&
-                    item.constValue != '移库出库') ||
-                  (dataList.taskTypeKey == 3 &&
-                    item.constValue == '移库出库') ||
-                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
-                " :label="item.constValue" :value="item.constValue" />
-						</el-select>
-					</el-form-item>
-					<!-- 合同编号 -->
-					<el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-						<el-select filterable @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
-								:value="item.contractNo"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
-						<el-input @input="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号"
-							class="typeselect">
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
-								:value="item.contractNo"></el-option>
-						</el-input>
-					</el-form-item>
-					<!-- 货名 -->
-					<el-form-item v-if="dataList.taskTypeKey != 3" label="货名" class="huom">
-						<el-select disabled v-model="dataList.goodsName" placeholder="货名" class="huom" @change="selectgoodsName"
-						filterable clearable>
-						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
-							:value="item.constValue"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="货源" class="huom">
-						<el-input disabled v-model="goods" placeholder="请选择货源"
-							maxlength="120" size="small" class="huom" />
-						<el-button class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item>
-					<!--重量（吨）-->
-					<el-form-item label="重量（吨）">
-						<el-input disabled  @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量（吨）"
-							maxlength="120" size="small" class="huom" />
-					</el-form-item>
-					<!-- 品级 -->
-					<el-form-item label="品级">
-						<!-- <el-select :disabled='gradestatus' v-model="dataList.grade" placeholder class="typeselect"
-							@change="selectpackingMethod" filterable clearable>
-							<el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
-								:value="item.constValue" />
-						</el-select> -->
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <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-col>
+    </el-row>
+    <div class="basicInformation">
+      <div class="annu">
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
+          <el-radio label="1" class="a">出库</el-radio>
+          <el-radio label="2" class="a">入库</el-radio>
+          <!-- <el-radio label="3" class="a">移库</el-radio> -->
+          <!-- <el-radio label="4" class="a">退库并出库</el-radio> -->
+        </el-radio-group>
+      </div>
+      <div class="ding"></div>
+      <div
+        v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4"
+        class="center1"
+      >
+        <img
+          style="position: relative; top: 40px; left: 300px"
+          width="19"
+          height="19"
+          src="../../../public/img/cangku.png"
+          alt
+        />
+        <!--出库=-->
+        <div class="small-title">
+          <h3>出库任务({{ inOutTaskNo }})</h3>
+        </div>
+        <el-form
+          ref="dataList"
+          :model="dataList"
+          label-width="140px"
+          input-width="300px"
+        >
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+              v-model="dataList.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+              filterable
+              clearable
+              @change="selectwarehouseName"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="出库类型">
+            <el-select
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
+              v-model="dataList.inOutType"
+              placeholder="请选择出库类型"
+              class="typeselect"
+              @change="selectstorageType"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
+            <el-select
+              filterable
+              @change="changecontract"
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+              clearable
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="
+                  item.contractNo +
+                    (item.pointOut ? '（' + item.pointOut + '）' : '')
+                "
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item
+            v-if="dataList.taskTypeKey != 3"
+            label="货名"
+            class="huom"
+          >
+            <el-select
+              disabled
+              v-model="dataList.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="货源" class="huom">
+            <el-input
+              disabled
+              v-model="goods"
+              placeholder="请选择货源"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+            <el-button
+              class="bg-bottom"
+              type="primary"
+              size="small"
+              @click="supplygoods()"
+              >选择货源</el-button
+            >
+          </el-form-item> -->
+          <!--重量（吨）-->
+          <el-form-item label="重量（吨）">
+            <el-input
+              @input="weightchange1"
+              v-model="dataList.weight"
+              placeholder="请输入重量（吨）"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <!-- <el-form-item label="品级">
 						<el-select v-model="dataList.grade" placeholder class="typeselect"
 							@change="selectpackingMethod" filterable clearable>
 							<el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue" />
 						</el-select>
-					</el-form-item>
-					<!--容重(克/升)>=-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=" span="1">
+					</el-form-item> -->
+          <!--容重(克/升)>=-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=" span="1">
 						<el-input @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重"
 							maxlength="120" size="small" class="huom" />
-					</el-form-item>
-					<!--水分（%）<=-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
+					</el-form-item> -->
+          <!--水分（%）<=-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input @input="waterContentchange" v-model="dataList.waterContent"
 							placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
-					</el-form-item>
-					<!--单价(元/吨)-->
-					<!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
+					</el-form-item> -->
+          <!--单价(元/吨)-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 						<el-input disabled @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item> -->
-					<!--预计出库日期-->
-					<el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+          <!--预计出库日期-->
+          <!-- <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
 							value-format="yyyy-MM-dd" />
-					</el-form-item>
-						<!--预估运费（元/吨）-->
-					<!-- <el-form-item label="预估运费（元/吨）" span="1">
+					</el-form-item> -->
+          <!--预估运费（元/吨）-->
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small" type="number"/>
 					</el-form-item> -->
-					<!--经办人-->
-					<el-form-item label="发货人">
+          <!--经办人-->
+          <!-- <el-form-item label="发货人">
 						<el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
 						@change="selectstaff">
 						<el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
 						</el-select>
-					</el-form-item>
-					<el-form-item label="任务标识">
-						<el-input  @input="taskFlaginput" v-model="dataList.taskFlag"
-							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
-					</el-form-item>
-					<!--业务描述=-->
-					<el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
+					</el-form-item> -->
+          <el-form-item label="任务标识">
+            <el-input
+              @input="taskFlaginput"
+              v-model="dataList.taskFlag"
+              placeholder="请输入任务标识"
+              maxlength="6"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--业务描述=-->
+          <!-- <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
 							maxlength="500" size="large" />
-					</el-form-item>
-				</el-form>
-			</div>
-			<div v-show="dataList.taskTypeKey != 1" class="center1">
-				<img style="position: relative; top: 40px; left: 300px" width="19" height="19"
-					src="../../../public/img/cangku.png" alt />
-				<div class="small-title">
-					<h3>入库任务({{ inOutTaskNo1 }} )</h3>
-				</div>
-				<el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
-					<!-- 仓库名 -->
-					<el-form-item label="仓库名">
-						<el-select v-model="dataList1.warehouseName" placeholder="请选择仓库名" class="typeselect" filterable  clearable
-							@change="selectwarehouseName1">
-							<el-option v-for="item in warehouseNameList" :key="item.constKey"
-								:label="item.warehouseName" :value="item.id" />
-						</el-select>
-					</el-form-item>
-					<!-- 入库类型 -->
-					<el-form-item label="入库类型">
-						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-							v-model="dataList1.inOutType" placeholder="请选择入库类型" class="typeselect"
-							@change="selectstorageType1" filterable clearable>
-							<el-option v-for="item in storageType1" :key="item.constKey" v-if="
+					</el-form-item> -->
+        </el-form>
+      </div>
+      <div v-show="dataList.taskTypeKey != 1" class="center1">
+        <img
+          style="position: relative; top: 40px; left: 300px"
+          width="19"
+          height="19"
+          src="../../../public/img/cangku.png"
+          alt
+        />
+        <div class="small-title">
+          <h3>入库任务({{ inOutTaskNo1 }} )</h3>
+        </div>
+        <el-form
+          v-if="!deletetask"
+          ref="form"
+          :model="form"
+          label-width="140px"
+        >
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+              v-model="dataList1.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+              filterable
+              clearable
+              @change="selectwarehouseName1"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 入库类型 -->
+          <el-form-item label="入库类型">
+            <el-select
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
+              v-model="dataList1.inOutType"
+              placeholder="请选择入库类型"
+              class="typeselect"
+              @change="selectstorageType1"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in storageType1"
+                :key="item.constKey"
+                v-if="
                   (dataList1.taskTypeKey == 2 &&
                     item.constValue != '移库入库') ||
-                  (dataList1.taskTypeKey == 3 &&
-                    item.constValue == '移库入库') ||
-                  (dataList1.taskTypeKey == 4 && item.constValue == '退库')
-                " :label="item.constValue" :value="item.constValue" />
-						</el-select>
-					</el-form-item>
-					<!-- 合同编号 -->
-					<el-form-item v-if="dataList1.taskTypeKey == 2" label="合同编号">
-						<el-select @change="changecontract1" v-model="dataList1.contractNo" placeholder="请输入合同编号"
-							class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
-								:value="item.contractNo"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item v-if="dataList1.taskTypeKey == 4" label="移库任务编号">
-						<el-select v-model="dataList1.contractNo"  filterable clearable placeholder="请输入移库任务编号" class="typeselect">
-							<el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
-								:value="item.contractNo"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
-						<el-select disabled v-model="dataList1.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
-								:value="item.contractNo"></el-option>
-						</el-select>
-					</el-form-item>
-					<!-- 货名 -->
-					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2||dataList1.taskTypeKey == 3' label="货名" class="huom">
-						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
-						filterable clearable>
-						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
-							:value="item.constValue"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item v-else-if='dataList1.inOutType=="退库"&&dataList1.taskTypeKey == 4' label="货源" class="huom">
-						<el-input disabled v-model="goods" placeholder="请选择货源"
-							maxlength="120" size="small" class="huom" />
-						<el-button v-if='dataList.taskTypeKey!=3' class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item>
-					<el-form-item v-else label="出库任务编号" class="huom">
-						<el-select v-model="dataList1.inOutTaskNo" placeholder="请选择出库任务编号" class="huom" @change="selectinOutTaskNo"
-						filterable clearable>
-						<el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo"
-							:value="item.inOutTaskNo"></el-option>
-						</el-select>
-					</el-form-item>
-					<!--重量（吨）-->
-					<el-form-item label="重量（吨）">
-						<el-input :disabled='dataList1.inOutType=="收购入库"||dataList1.inOutType=="移库入库"' @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
-							maxlength="120" size="small" class="huom" />
-					</el-form-item>
-					<!-- 品级 -->
-					<el-form-item label="品级">
+                    (dataList1.taskTypeKey == 3 &&
+                      item.constValue == '移库入库') ||
+                    (dataList1.taskTypeKey == 4 && item.constValue == '退库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if="dataList1.taskTypeKey == 2" label="合同编号">
+            <el-select
+              @change="changecontract1"
+              v-model="dataList1.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in contractNoList1"
+                :key="item.constKey"
+                :label="
+                  item.contractNo +
+                    (item.pointOut ? '（' + item.pointOut + '）' : '')
+                "
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dataList1.taskTypeKey == 4" label="移库任务编号">
+            <el-select
+              v-model="dataList1.contractNo"
+              filterable
+              clearable
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList1"
+                :key="item.constKey"
+                :label="
+                  item.contractNo +
+                    (item.pointOut ? '（' + item.pointOut + '）' : '')
+                "
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
+            <el-select
+              disabled
+              v-model="dataList1.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="
+                  item.contractNo +
+                    (item.pointOut ? '（' + item.pointOut + '）' : '')
+                "
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item
+            v-if="
+              (dataList1.inOutType != '退库' && dataList1.taskTypeKey == 2) ||
+                dataList1.taskTypeKey == 3
+            "
+            label="货名"
+            class="huom"
+          >
+            <el-select
+              disabled
+              v-model="dataList1.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName1"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-else-if="
+              dataList1.inOutType == '退库' && dataList1.taskTypeKey == 4
+            "
+            label="货源"
+            class="huom"
+          >
+            <el-input
+              disabled
+              v-model="goods"
+              placeholder="请选择货源"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+            <el-button
+              v-if="dataList.taskTypeKey != 3"
+              class="bg-bottom"
+              type="primary"
+              size="small"
+              @click="supplygoods()"
+              >选择货源</el-button
+            >
+          </el-form-item>
+          <el-form-item v-else label="出库任务编号" class="huom">
+            <el-select
+              v-model="dataList1.inOutTaskNo"
+              placeholder="请选择出库任务编号"
+              class="huom"
+              @change="selectinOutTaskNo"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in taskNolist"
+                :key="item.id"
+                :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--重量（吨）-->
+          <el-form-item label="重量（吨）">
+            <el-input
+              :disabled="
+                dataList1.inOutType == '收购入库' ||
+                  dataList1.inOutType == '移库入库'
+              "
+              @input="weightchange"
+              v-model="dataList1.weight"
+              placeholder="请输入重量（吨）"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <!-- <el-form-item label="品级">
 						<el-select :disabled="dataList.taskTypeKey == 3" v-model="dataList1.grade" placeholder
 							class="typeselect" @change="selectpackingMethod1" filterable clearable>
 							<el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue" />
 						</el-select>
-					</el-form-item>
-					<!--容重(克/升)>=-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
+					</el-form-item> -->
+          <!--容重(克/升)>=-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input @input="bulkDensitychange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
-					</el-form-item>
-					<!--水分（%）<=-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
+					</el-form-item> -->
+          <!--水分（%）<=-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
-					</el-form-item>
-					<!--单价(元/吨)-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
+					</el-form-item> -->
+          <!--单价(元/吨)-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
-					</el-form-item>
-					<!--预计出库日期-->
-					<el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
+					</el-form-item> -->
+          <!--预计出库日期-->
+          <!-- <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList1.predictDate" type="date" placeholder="请选择预计入库日期"
 							value-format="yyyy-MM-dd" />
-					</el-form-item>
-							<!--预估运费（元/吨）-->
-					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
+					</el-form-item> -->
+          <!--预估运费（元/吨）-->
+          <!-- <el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small" type="number" />
 					</el-form-item> -->
-					<!-- 经办人-->
-					<el-form-item label="收货负责人">
+          <!-- 经办人-->
+          <!-- <el-form-item label="收货负责人">
 						<el-select v-model="dataList1.agent" placeholder="请选择收货负责人" filterable clearable :filter-method="dataFilter1"
 						@change="selectstaff1">
 						<el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
 						</el-select>
-					</el-form-item>
-					<el-form-item label="任务标识">
-						<el-input :disabled="dataList.taskTypeKey == 3" @input="taskFlaginput" v-model="dataList.taskFlag"
-							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
-					</el-form-item>
-					<!--业务描述=-->
-					<el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
+					</el-form-item> -->
+          <el-form-item label="任务标识">
+            <el-input
+              :disabled="dataList.taskTypeKey == 3"
+              @input="taskFlaginput"
+              v-model="dataList.taskFlag"
+              placeholder="请输入任务标识"
+              maxlength="6"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--业务描述=-->
+          <!-- <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
 						<el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
 							maxlength="500" size="large" />
-					</el-form-item>
-				</el-form>
-			</div>
-			<div v-if="dataList.taskTypeKey == 4" class="center1">
-				<!--出库=-->
-				<div class="small-title">
-					<img style="position: relative; top: 40px; left: -22px" width="19" height="19"
-						src="../../../public/img/cangku.png" alt />
-					<h3>出库任务({{ inOutTaskNo }})</h3>
-				</div>
-				<el-form ref="dataList" :model="dataList" label-width="140px">
-					<!-- 仓库名 -->
-					<el-form-item label="仓库名">
-						<el-select v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect" filterable  clearable
-							@change="selectwarehouseName">
-							<el-option v-for="item in warehouseNameList" :key="item.constKey"
-								:label="item.warehouseName" :value="item.id" />
-						</el-select>
-					</el-form-item>
-					<!-- 出库类型 -->
-					<el-form-item label="出库类型">
-						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-							v-model="dataList.inOutType" placeholder="请选择出库类型" class="typeselect"
-							@change="selectstorageType1" filterable clearable>
-							<el-option v-for="item in storageType" :key="item.constKey" v-if="
+					</el-form-item> -->
+        </el-form>
+      </div>
+      <div v-if="dataList.taskTypeKey == 4" class="center1">
+        <!--出库=-->
+        <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -22px"
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt
+          />
+          <h3>出库任务({{ inOutTaskNo }})</h3>
+        </div>
+        <el-form ref="dataList" :model="dataList" label-width="140px">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+              v-model="dataList.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+              filterable
+              clearable
+              @change="selectwarehouseName"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="出库类型">
+            <el-select
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
+              v-model="dataList.inOutType"
+              placeholder="请选择出库类型"
+              class="typeselect"
+              @change="selectstorageType1"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
-                  (dataList.taskTypeKey == 3 &&
-                    item.constValue == '移库出库') ||
-                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
-                " :label="item.constValue" :value="item.constValue" />
-						</el-select>
-					</el-form-item>
-					<!-- 合同编号 -->
-					<el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-						<el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号"
-							class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
-								:value="item.contractNo"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
-						<el-select @change="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号"
-							class="typeselect" filterable clearable>
-							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo+(item.pointOut?'（'+item.pointOut+'）':'')"
-								:value="item.contractNo"></el-option>
-						</el-select>
-					</el-form-item>
-					<!-- 货名 -->
-					<el-form-item label="货源" class="huom">
-						<el-input disabled v-model="goods" placeholder="请选择货源"
-							maxlength="120" size="small" class="huom" />
-						 <el-button class="bg-bottom" v-if='dataList.taskTypeKey!=4' type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item>
-					<!--重量（吨）-->
-					<el-form-item label="重量（吨）">
-						<el-input disabled v-model="dataList.weight" placeholder="请输入重量（吨）"
-							maxlength="120" size="small" class="huom" />
-					</el-form-item>
-					<!-- 品级 -->
-					<el-form-item label="品级">
+                    (dataList.taskTypeKey == 3 &&
+                      item.constValue == '移库出库') ||
+                    (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
+            <el-select
+              @change="changecontract"
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="
+                  item.contractNo +
+                    (item.pointOut ? '（' + item.pointOut + '）' : '')
+                "
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
+            <el-select
+              @change="selectTaskNo"
+              v-model="dataList.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="
+                  item.contractNo +
+                    (item.pointOut ? '（' + item.pointOut + '）' : '')
+                "
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货源" class="huom">
+            <el-input
+              disabled
+              v-model="goods"
+              placeholder="请选择货源"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+            <el-button
+              class="bg-bottom"
+              v-if="dataList.taskTypeKey != 4"
+              type="primary"
+              size="small"
+              @click="supplygoods()"
+              >选择货源</el-button
+            >
+          </el-form-item>
+          <!--重量（吨）-->
+          <el-form-item label="重量（吨）">
+            <el-input
+              disabled
+              v-model="dataList.weight"
+              placeholder="请输入重量（吨）"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <!-- <el-form-item label="品级">
 						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod" filterable clearable>
 							<el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue" />
 						</el-select>
-					</el-form-item>
-					<!--容重(克/升)>=-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
+					</el-form-item> -->
+          <!--容重(克/升)>=-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
-					</el-form-item>
-					<!--水分（%）<=-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
+					</el-form-item> -->
+          <!--水分（%）<=-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
-					</el-form-item>
-					<!--单价(元/吨)-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
+					</el-form-item> -->
+          <!--单价(元/吨)-->
+          <!-- <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
-					</el-form-item>
-					<!--预计出库日期-->
-					<el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+					</el-form-item> -->
+          <!--预计出库日期-->
+          <!-- <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
 							value-format="yyyy-MM-dd" />
-					</el-form-item>
-							<!--预估运费（元/吨）-->
-					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
+					</el-form-item> -->
+          <!--预估运费（元/吨）-->
+          <!-- <el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small" type="number" />
 					</el-form-item> -->
-					<!--发货人-->
-					<el-form-item label="发货负责人">
+          <!--发货人-->
+          <!-- <el-form-item label="发货负责人">
 						<el-select v-model="dataList.agent" placeholder="请选择发货负责人" filterable clearable
 						@change="selectstaff">
 						<el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
 						</el-select>
-					</el-form-item>
-					<el-form-item label="任务标识">
-						<el-input @input='taskFlaginput' :disabled="dataList.taskTypeKey == 4" v-model="dataList.taskFlag"
-							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
-					</el-form-item>
-					<!--业务描述=-->
-					<el-form-item label="业务描述">
+					</el-form-item> -->
+          <el-form-item label="任务标识">
+            <el-input
+              @input="taskFlaginput"
+              :disabled="dataList.taskTypeKey == 4"
+              v-model="dataList.taskFlag"
+              placeholder="请输入任务标识"
+              maxlength="6"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--业务描述=-->
+          <!-- <el-form-item label="业务描述">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
 							maxlength="500" size="large" />
-					</el-form-item>
-				</el-form>
-			</div>
-		</div>
-		<!-- 提交 -->
-		<div style="text-align: center; padding: 10px">
-			<el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交</el-button>
-		</div>
-	</div>
+					</el-form-item> -->
+        </el-form>
+      </div>
+    </div>
+    <!-- 提交 -->
+    <div style="text-align: center; padding: 10px">
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >提交</el-button
+      >
+    </div>
+  </div>
 </template>
 <script>
-	import {
-		getwarehousename,
-		xialaNo,
-		addoreditoutput,
-		getGoodsName,
-		gettaskNo
-	} from '@/model/tasksport/index'
-	import {
-		mapGetters
-	} from 'vuex'
-	import {
-		pullDown,
-		getstaff
-	} from '@/model/warehouse/index'
-	import Pagination from '@/components/Pagination'
-	import WsUpload from '@/components/WsUpload'
-	// import { dayjs, fmoney, EventBus } from 'base-core-lib'
-	import {
-		dayjs,
-		EventBus
-	} from 'base-core-lib'
-	export default {
-		name: 'viewSpareMoney',
-		components: {
-			WsUpload,
-			Pagination
-		},
-		watch: {
-			// vesselId(val) {
-			//   this.getList()
-			// },
-			isShow(val) {
-				this.showType = val
-			},
-			flag(val) {
-				xialaNo({
-						compId: this.compId,
-						flag: val
-					})
-					.toPromise()
-					.then(response => {
-						if (
-							this.dataList1.taskTypeKey == 2 ||
-							this.dataList1.taskTypeKey == 4
-						) {
-							this.contractNoList1 = response
-							if (this.dataList1.taskTypeKey == 2) {
-								this.contractNoList = response
-							}
-						} else {
-							this.contractNoList = response
-						}
-					})
-			}
-		},
-		computed: {
-			...mapGetters(['deptBudgetList'])
-		},
-		data() {
-			return {
-				gradestatus:true,
-				flag: 1,
-				//弹出框
-				dialogViewSpareMoney: false,
-				dialogApproveFormVisible: false,
-				// 船舶类型
-				monetaryKey: null,
-				// 表格显示数据
-				tableDate: [],
-				// 是否显示
-				showType: true,
-				disabled: false,
-				// 年
-				year: '',
-				inOutType:'',
-				contractNoList: [],
-				contractNoList1: [],
-				deptBudgetTotal: 0,
-				readonly: true,
-				currentPage: 1,
-				taskNolist:[],
-				pageSize: 10,
-				searchType: 1,
-				searchKeyWord: '',
-				radio: '1',
-				contractType: 2,
-				startDate: null,
-				endDate: null,
-				goodnameList: [],
-				checked: true,
-				form: {},
-				staffList: [],
-				staffList1: [],
-				options: [],
-				options1: [],
-				storageType: [],
-				storageType1: [],
-				outContractNo: [],
-				// 提交类型
-				submitType: true,
-				status: [],
-				warehouseNameList: [],
-				warehouseNameList1: [],
-				appendixIdsAdd: '',
-				uploadSuccess: {},
-				baseId:'',
-				deletetask: false,
-				warehouseInOutDetail: {},
-				onChange: {},
-				deptBudgetList1: [],
-				gradeList: [],
-				rules: {
-					netWeight: [{
-						required: true,
-						type: 'number',
-						message: '请输入活动名称',
-						trigger: 'blur'
-					}]
-				},
-				size: 10,
-				goods:'',
-				compId: localStorage.getItem('ws-pf_compId'),
-				deptCircularPage: {},
-				packtypeList: {},
-				date: {
-					year: dayjs().format('YYYY'),
-					month: dayjs().format('MM')
-				},
-				contractList: [],
-				inOutTaskNo: '',
-				inOutTaskNo1: '',
-				sourceId:'',
-				dataList: {
-					taskTypeKey: '1',
-					weight:0,
-					moveTaskNo:'',
-					contractNo:''
-				},
-				dataList1: {
-					taskTypeKey: '1',
-					inOutType: '',
-					weight:0,
-					moveTaskNo:'',
-					contractNo:''
-				},
-				historyList: [],
-				pickerBeginDateBefore: {
-					disabledDate: time => {
-						return time.getTime() > Date.now()
-					}
-				},
-				accessoryTFs: false,
-				Pricetype:true,//价格类型为随行就市隐藏单价
-			}
-		},
-		activated() {
-			this.getList()
-			var num=0
-			this.goods=''
-			this.sourceId=''
-			this.dataList.weight=0
-			this.dataList1.weight=0
-			if(localStorage.getItem('taskTypeKey')){
-				this.dataList.taskTypeKey=localStorage.getItem('taskTypeKey')
-				this.dataList1.taskTypeKey=localStorage.getItem('taskTypeKey')
-				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					if(localStorage.getItem('warehouse')){
-						this.dataList.warehouseName=localStorage.getItem('warehouse')
-					}
-					if(localStorage.getItem('warehouseId')){
-						this.baseId=localStorage.getItem('warehouseId')
-					}
-					if(localStorage.getItem('goodsName')){
-						this.dataList.goodsName=localStorage.getItem('goodsName')
-						this.dataList.goodsNameKey=localStorage.getItem('goodsName')
-					}
-					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
-					.toPromise()
-					.then(response => {
-						this.options = response
-						this.staffList = response
-						//  this.agent = response
-					})
-					this.dataList.contractNo=localStorage.getItem('contractNo')
-					if(this.dataList.taskTypeKey==3){
-						
-						if(localStorage.getItem('contractNo')){
-							this.dataList.moveTaskNo=localStorage.getItem('contractNo')
-							this.dataList1.moveTaskNo=localStorage.getItem('contractNo')
-						}
-					}
-				}
-				else if(this.dataList.taskTypeKey==2||this.dataList.taskTypeKey==4){
-					if(localStorage.getItem('warehouse')){
-						this.dataList1.warehouseName=localStorage.getItem('warehouse')
-					}
-					if(localStorage.getItem('warehouseId')){
-						this.baseId=localStorage.getItem('warehouseId')
-					}
-					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
-					.toPromise()
-					.then(response => {
-						this.options = response
-						this.staffList = response
-						//  this.agent = response
-					})
-					this.dataList1.contractNo=localStorage.getItem('contractNo')
-					if(this.dataList.taskTypeKey==2){
-						if(localStorage.getItem('goodsName')){
-							this.dataList1.goodsName=localStorage.getItem('goodsName')
-							this.dataList1.goodsNameKey=localStorage.getItem('goodsNameKey')
-						}
-						if(localStorage.getItem('weight')){
-							this.dataList1.weight=localStorage.getItem('weight')
-						}
-					}
-					
-				}
-			}
-			if(localStorage.getItem('supplygoods1')){
-				if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'||this.dataList.taskTypeKey==4){
-					var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
-					for (let i = 0; i < supplygoods.length; i++) {
-						if(supplygoods[i].sourceRelationInfoList){
-							if(localStorage.getItem('supplygoodsstatus')&&localStorage.getItem('supplygoodsstatus')==1){
-							for (let q = 0; q < supplygoods[i].sourceRelationInfoList.length; q++) {
-								
-								if(this.goods.indexOf(supplygoods[i].sourceRelationInfoList[q].goodsName)==-1){
-									this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].sourceRelationInfoList[q].goodsName
-								}
-								this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].sourceRelationInfoList[q].surplusWeight)
-							this.dataList.weight=Number(this.dataList.weight)+Number(supplygoods[i].sourceRelationInfoList[q].surplusWeight)
-							}
-							}
-						}
-						console.log(this.goods)
-					}
-					this.dataList1.weight=this.dataList1.weight.toFixed(3)
-					this.dataList.weight=this.dataList.weight.toFixed(3)
-				}else if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
-					
-					if(localStorage.getItem('supplygoodsstatus')&&localStorage.getItem('supplygoodsstatus')==0){
-						for (let i = 0; i < supplygoods.length; i++) {
-							this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
-							this.dataList1.goodsName =this.goods!=''?this.goods:''+supplygoods[i].goodsName
-							this.dataList.goodsName=this.goods!=''?this.goods:''+supplygoods[i].goodsName
-							this.dataList1.weight=Number(this.dataList1.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
-							this.dataList.weight=Number(this.dataList.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
-						}
-					}
-					
-				}
-				
-			}
-			
-		},
-		methods: {
-			taskFlaginput(e){
-				if(this.dataList.taskTypeKey==1){
-					this.dataList.taskFlag=e
-				}
-				if(this.dataList.taskTypeKey==2){
-					this.dataList1.taskFlag=e
-				}
-				if(this.dataList.taskTypeKey==3){
-					this.dataList1.taskFlag=e
-				}
-				if(this.dataList.taskTypeKey==4){
-					this.dataList.taskFlag=e
-				}
-			},
-			//返回按钮
-			revert() {
-				this.$router.go(-1)
-			},
-			supplygoods(){
-				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					if(this.dataList.warehouseName){
-						localStorage.setItem('goodsName',this.dataList.goodsName);
-						localStorage.setItem('warehouse',this.dataList.warehouseName);
-						if(this.dataList.taskTypeKey==3){
-							if(this.dataList.moveTaskNo){
-								localStorage.setItem('contractNo',this.dataList.moveTaskNo);
-							}
-						}else{
-							if(this.dataList.contractNo){
-								localStorage.setItem('contractNo',this.dataList.contractNo);
-							}
-						}
-            			localStorage.setItem('taskTypeKey',this.dataList.taskTypeKey);
-						localStorage.setItem('warehouseId',this.baseId);
-						if(this.dataList.taskTypeKey==1){
-							this.$router.push({name:'supplyofgoods',query:{baseId:this.baseId,goodsName:this.dataList.goodsName}})
-						}else{
-							this.$router.push({name:'supplyofgoods',query:{baseId:this.baseId}})
-						}
-						
-					}else{
-						this.$message({
-							message: '请先选择仓库',
-							type: 'warning'
-						});
-					}
-				}else if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'||this.dataList1.taskTypeKey==4){
-					if(this.dataList1.moveTaskNo||this.dataList1.contractNo){
-						localStorage.setItem('warehouse',this.dataList1.warehouseName);
-						localStorage.setItem('contractNo',this.dataList1.contractNo);
-            			localStorage.setItem('taskTypeKey',this.dataList1.taskTypeKey);
-						localStorage.setItem('warehouseId',this.baseId);
-						this.$router.push({name:'outsupplyofgoods',query:{contractNo:this.dataList1.contractNo,taskTypeKey:this.dataList1.taskTypeKey}})
-					}else{
-						this.$message({
-							message: '请先选择合同/移库编号',
-							type: 'warning'
-						});
-					}
-				}
-      		},
-			returnsales() {
-				this.dataList = {
-								taskTypeKey: 1
-							}
-				localStorage.removeItem('supplygoods1')
-				this.$router.go(-1)
-			},
-			// 获取当前年月日
-			getdate() {
-				var date = new Date()
-				var year = date.getFullYear() //获取完整的年份(4位)
-				var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-				var datetime = date.getDate() //获取当前日(1-31)
-				var hour = date.getHours()
-				var minutes = date.getMinutes()
-				var seconds = date.getSeconds()
-				if (mouth < 10) {
-					mouth = '0' + mouth
-				}
-				if (datetime < 10) {
-					datetime = '0' + datetime
-				}
-				if (hour < 10) {
-					hour = '0' + hour
-				}
-				if (minutes < 10) {
-					minutes = '0' + minutes
-				}
-				if (seconds < 10) {
-					seconds = '0' + seconds
-				}
-				return year + '' + mouth + datetime + hour + minutes + seconds
-			},
-			// 随机验证码
-			verifyinit() {
-				var arr = []
-				for (var i = 48; i < 57; i++) {
-					arr.push(String.fromCharCode(i))
-				}
-				arr.sort(function() {
-					return Math.random() - 0.5
-				})
-				arr.length = 4
+import {
+  getwarehousename,
+  xialaNo,
+  addoreditoutput,
+  getGoodsName,
+  gettaskNo
+} from '@/model/tasksport/index'
+import { mapGetters } from 'vuex'
+import { pullDown, getstaff } from '@/model/warehouse/index'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination
+  },
+  watch: {
+    // vesselId(val) {
+    //   this.getList()
+    // },
+    isShow(val) {
+      this.showType = val
+    },
+    flag(val) {
+      xialaNo({
+        compId: this.compId,
+        flag: val
+      })
+        .toPromise()
+        .then(response => {
+          if (
+            this.dataList1.taskTypeKey == 2 ||
+            this.dataList1.taskTypeKey == 4
+          ) {
+            this.contractNoList1 = response
+            if (this.dataList1.taskTypeKey == 2) {
+              this.contractNoList = response
+            }
+          } else {
+            this.contractNoList = response
+          }
+        })
+    }
+  },
+  computed: {
+    ...mapGetters(['deptBudgetList'])
+  },
+  data() {
+    return {
+      gradestatus: true,
+      flag: 1,
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      disabled: false,
+      // 年
+      year: '',
+      inOutType: '',
+      contractNoList: [],
+      contractNoList1: [],
+      deptBudgetTotal: 0,
+      readonly: true,
+      currentPage: 1,
+      taskNolist: [],
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      radio: '1',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      goodnameList: [],
+      checked: true,
+      form: {},
+      staffList: [],
+      staffList1: [],
+      options: [],
+      options1: [],
+      storageType: [],
+      storageType1: [],
+      outContractNo: [],
+      // 提交类型
+      submitType: true,
+      status: [],
+      warehouseNameList: [],
+      warehouseNameList1: [],
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      baseId: '',
+      deletetask: false,
+      warehouseInOutDetail: {},
+      onChange: {},
+      deptBudgetList1: [],
+      gradeList: [],
+      rules: {
+        netWeight: [
+          {
+            required: true,
+            type: 'number',
+            message: '请输入活动名称',
+            trigger: 'blur'
+          }
+        ]
+      },
+      size: 10,
+      goods: '',
+      compId: localStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM')
+      },
+      contractList: [],
+      inOutTaskNo: '',
+      inOutTaskNo1: '',
+      sourceId: '',
+      dataList: {
+        taskTypeKey: '1',
+        weight: 0,
+        moveTaskNo: '',
+        contractNo: ''
+      },
+      dataList1: {
+        taskTypeKey: '1',
+        inOutType: '',
+        weight: 0,
+        moveTaskNo: '',
+        contractNo: ''
+      },
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: time => {
+          return time.getTime() > Date.now()
+        }
+      },
+      accessoryTFs: false,
+      Pricetype: true //价格类型为随行就市隐藏单价
+    }
+  },
+  activated() {
+    this.getList()
+    var num = 0
+    this.goods = ''
+    this.sourceId = ''
+    this.dataList.weight = 0
+    this.dataList1.weight = 0
+    if (localStorage.getItem('taskTypeKey')) {
+      this.dataList.taskTypeKey = localStorage.getItem('taskTypeKey')
+      this.dataList1.taskTypeKey = localStorage.getItem('taskTypeKey')
+      if (this.dataList.taskTypeKey == 1 || this.dataList.taskTypeKey == 3) {
+        if (localStorage.getItem('warehouse')) {
+          this.dataList.warehouseName = localStorage.getItem('warehouse')
+        }
+        if (localStorage.getItem('warehouseId')) {
+          this.baseId = localStorage.getItem('warehouseId')
+        }
+        if (localStorage.getItem('goodsName')) {
+          this.dataList.goodsName = localStorage.getItem('goodsName')
+          this.dataList.goodsNameKey = localStorage.getItem('goodsName')
+        }
+        getstaff({
+          compId: localStorage.getItem('ws-pf_compId'),
+          warehouseId: this.dataList.warehouseId
+        })
+          .toPromise()
+          .then(response => {
+            this.options = response
+            this.staffList = response
+            //  this.agent = response
+          })
+        this.dataList.contractNo = localStorage.getItem('contractNo')
+        if (this.dataList.taskTypeKey == 3) {
+          if (localStorage.getItem('contractNo')) {
+            this.dataList.moveTaskNo = localStorage.getItem('contractNo')
+            this.dataList1.moveTaskNo = localStorage.getItem('contractNo')
+          }
+        }
+      } else if (
+        this.dataList.taskTypeKey == 2 ||
+        this.dataList.taskTypeKey == 4
+      ) {
+        if (localStorage.getItem('warehouse')) {
+          this.dataList1.warehouseName = localStorage.getItem('warehouse')
+        }
+        if (localStorage.getItem('warehouseId')) {
+          this.baseId = localStorage.getItem('warehouseId')
+        }
+        getstaff({
+          compId: localStorage.getItem('ws-pf_compId'),
+          warehouseId: this.dataList.warehouseId
+        })
+          .toPromise()
+          .then(response => {
+            this.options = response
+            this.staffList = response
+            //  this.agent = response
+          })
+        this.dataList1.contractNo = localStorage.getItem('contractNo')
+        if (this.dataList.taskTypeKey == 2) {
+          if (localStorage.getItem('goodsName')) {
+            this.dataList1.goodsName = localStorage.getItem('goodsName')
+            this.dataList1.goodsNameKey = localStorage.getItem('goodsNameKey')
+          }
+          if (localStorage.getItem('weight')) {
+            this.dataList1.weight = localStorage.getItem('weight')
+          }
+        }
+      }
+    }
+    if (localStorage.getItem('supplygoods1')) {
+      if (
+        (this.dataList1.taskTypeKey == 2 &&
+          this.dataList1.inOutType == '退库') ||
+        this.dataList.taskTypeKey == 4
+      ) {
+        var supplygoods = JSON.parse(localStorage.getItem('supplygoods1'))
+        for (let i = 0; i < supplygoods.length; i++) {
+          if (supplygoods[i].sourceRelationInfoList) {
+            if (
+              localStorage.getItem('supplygoodsstatus') &&
+              localStorage.getItem('supplygoodsstatus') == 1
+            ) {
+              for (
+                let q = 0;
+                q < supplygoods[i].sourceRelationInfoList.length;
+                q++
+              ) {
+                if (
+                  this.goods.indexOf(
+                    supplygoods[i].sourceRelationInfoList[q].goodsName
+                  ) == -1
+                ) {
+                  this.goods =
+                    this.goods != ''
+                      ? this.goods + ','
+                      : '' + supplygoods[i].sourceRelationInfoList[q].goodsName
+                }
+                this.dataList1.weight =
+                  Number(this.dataList1.weight) +
+                  Number(supplygoods[i].sourceRelationInfoList[q].surplusWeight)
+                this.dataList.weight =
+                  Number(this.dataList.weight) +
+                  Number(supplygoods[i].sourceRelationInfoList[q].surplusWeight)
+              }
+            }
+          }
+          console.log(this.goods)
+        }
+        this.dataList1.weight = this.dataList1.weight.toFixed(3)
+        this.dataList.weight = this.dataList.weight.toFixed(3)
+      } else if (
+        this.dataList.taskTypeKey == 1 ||
+        this.dataList.taskTypeKey == 3
+      ) {
+        var supplygoods = JSON.parse(localStorage.getItem('supplygoods1'))
 
-				return arr.join('')
-			},
-			MathRand() {
-				var Num = ''
-				for (var i = 0; i < 4; i++) {
-					Num += Math.floor(Math.random() * 10)
-				}
-				return Num
-			},
-			selectTaskNo(e) {
-				if (this.dataList.taskTypeKey == 3) {
-					this.$set(this.dataList1, 'moveTaskNo', e)
-				}
-			},
-			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
-				}
-			},
-			dataFilter1(val) {
-				// console.log(val,"名")
-				this.deptBudgetList.staffList1 = val
-				if (val) {
-					//val存在
-					this.options = this.staffList1.filter(item => {
-						if (
-							!!~item.staffName.indexOf(val) ||
-							!!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-						) {
-							return true
-						}
-					})
-				} else {
-					//val为空时，还原数组
-					this.options1 = this.staffList1
-				}
-			},
-			weightchange(e) {
-				if (this.dataList.taskTypeKey == 4) {
-					this.$set(this.dataList, 'weight', e)
-				}else if (this.dataList.taskTypeKey == 2) {
-					this.$set(this.dataList1, 'weight', e)
-				}
-			},
-			weightchange1(e) {
-				if (this.dataList.taskTypeKey == 3) {
-					this.$set(this.dataList1, 'weight', e)
-				}
-			},
-			bulkDensitychange(e) {
-				if (this.dataList.taskTypeKey == 4) {
-					this.$set(this.dataList, 'bulkDensity', e)
-				} else if (this.dataList1.taskTypeKey == 3) {
-					this.$set(this.dataList1, 'bulkDensity', e)
-				}
-			},
-			waterContentchange(e) {
-				if (this.dataList.taskTypeKey == 4) {
-					this.$set(this.dataList, 'waterContent', e)
-				} else if (this.dataList1.taskTypeKey == 3) {
-					this.$set(this.dataList1, 'waterContent', e)
-				}
-			},
-			unitPricechange(e) {
-				if (this.dataList.taskTypeKey == 4) {
-					this.$set(this.dataList, 'unitPrice', e)
-				} else if (this.dataList1.taskTypeKey == 3) {
-					this.$set(this.dataList1, 'unitPrice', e)
-				}
-			},
-			changecontract(e) {
-				
-				if (this.dataList.taskTypeKey != 3) {
-					for (let i = 0; i < this.contractNoList.length; i++) {
-						if (this.contractNoList[i].contractNo == e) {
-							console.log(this.contractNoList[i],11222)
-							this.inOutType=this.contractNoList[i].inOutType
-							if(this.contractNoList[i].priceType == '随行就市'){
-								this.Pricetype = false
-							}else{
-								this.Pricetype = true
-							}
-							getGoodsName({
-									contractId: this.contractNoList[i].id,
-									contractNo: this.contractNoList[i].contractNo
-								})
-								.toPromise()
-								.then(response => {
-									this.$set(this.dataList, 'goodsName', response.goodsName)
-									this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
-									this.$set(this.dataList, 'grade', response.grade)
-									this.$set(this.dataList, 'gradeKey', response.gradeKey)
-									this.$set(this.dataList, 'waterContent', response.waterContent)
-									this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-									// this.$set(this.dataList, 'weight', response.weight)
-									this.$set(
-										this.dataList,
-										'unitPrice',
-										response.unitContractPrice
-									)
-								})
-						}
-					}
-				}
-			},
-			selectwarehouseName(e) {
-				this.baseId=e
-				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==2||this.dataList.taskTypeKey==3){
-					this.goods=''
-					localStorage.removeItem('supplygoods1')
-				}
-				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
-							}
-						}
+        if (
+          localStorage.getItem('supplygoodsstatus') &&
+          localStorage.getItem('supplygoodsstatus') == 0
+        ) {
+          for (let i = 0; i < supplygoods.length; i++) {
+            this.goods =
+              this.goods != ''
+                ? this.goods + ','
+                : '' + supplygoods[i].goodsName
+            this.dataList1.goodsName =
+              this.goods != '' ? this.goods : '' + supplygoods[i].goodsName
+            this.dataList.goodsName =
+              this.goods != '' ? this.goods : '' + supplygoods[i].goodsName
+            this.dataList1.weight =
+              Number(this.dataList1.weight) +
+              Number(
+                Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3)
+              )
+            this.dataList.weight =
+              Number(this.dataList.weight) +
+              Number(
+                Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3)
+              )
+          }
+        }
+      }
+    }
+  },
+  methods: {
+    taskFlaginput(e) {
+      if (this.dataList.taskTypeKey == 1) {
+        this.dataList.taskFlag = e
+      }
+      if (this.dataList.taskTypeKey == 2) {
+        this.dataList1.taskFlag = e
+      }
+      if (this.dataList.taskTypeKey == 3) {
+        this.dataList1.taskFlag = e
+      }
+      if (this.dataList.taskTypeKey == 4) {
+        this.dataList.taskFlag = e
+      }
+    },
+    //返回按钮
+    revert() {
+      this.$router.go(-1)
+    },
+    supplygoods() {
+      if (this.dataList.taskTypeKey == 1 || this.dataList.taskTypeKey == 3) {
+        if (this.dataList.warehouseName) {
+          localStorage.setItem('goodsName', this.dataList.goodsName)
+          localStorage.setItem('warehouse', this.dataList.warehouseName)
+          if (this.dataList.taskTypeKey == 3) {
+            if (this.dataList.moveTaskNo) {
+              localStorage.setItem('contractNo', this.dataList.moveTaskNo)
+            }
+          } else {
+            if (this.dataList.contractNo) {
+              localStorage.setItem('contractNo', this.dataList.contractNo)
+            }
+          }
+          localStorage.setItem('taskTypeKey', this.dataList.taskTypeKey)
+          localStorage.setItem('warehouseId', this.baseId)
+          if (this.dataList.taskTypeKey == 1) {
+            this.$router.push({
+              name: 'supplyofgoods',
+              query: { baseId: this.baseId, goodsName: this.dataList.goodsName }
+            })
+          } else {
+            this.$router.push({
+              name: 'supplyofgoods',
+              query: { baseId: this.baseId }
+            })
+          }
+        } else {
+          this.$message({
+            message: '请先选择仓库',
+            type: 'warning'
+          })
+        }
+      } else if (
+        (this.dataList1.taskTypeKey == 2 &&
+          this.dataList1.inOutType == '退库') ||
+        this.dataList1.taskTypeKey == 4
+      ) {
+        if (this.dataList1.moveTaskNo || this.dataList1.contractNo) {
+          localStorage.setItem('warehouse', this.dataList1.warehouseName)
+          localStorage.setItem('contractNo', this.dataList1.contractNo)
+          localStorage.setItem('taskTypeKey', this.dataList1.taskTypeKey)
+          localStorage.setItem('warehouseId', this.baseId)
+          this.$router.push({
+            name: 'outsupplyofgoods',
+            query: {
+              contractNo: this.dataList1.contractNo,
+              taskTypeKey: this.dataList1.taskTypeKey
+            }
+          })
+        } else {
+          this.$message({
+            message: '请先选择合同/移库编号',
+            type: 'warning'
+          })
+        }
+      }
+    },
+    returnsales() {
+      this.dataList = {
+        taskTypeKey: 1
+      }
+      localStorage.removeItem('supplygoods1')
+      this.$router.go(-1)
+    },
+    // 获取当前年月日
+    getdate() {
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var datetime = date.getDate() //获取当前日(1-31)
+      var hour = date.getHours()
+      var minutes = date.getMinutes()
+      var seconds = date.getSeconds()
+      if (mouth < 10) {
+        mouth = '0' + mouth
+      }
+      if (datetime < 10) {
+        datetime = '0' + datetime
+      }
+      if (hour < 10) {
+        hour = '0' + hour
+      }
+      if (minutes < 10) {
+        minutes = '0' + minutes
+      }
+      if (seconds < 10) {
+        seconds = '0' + seconds
+      }
+      return year + '' + mouth + datetime + hour + minutes + seconds
+    },
+    // 随机验证码
+    verifyinit() {
+      var arr = []
+      for (var i = 48; i < 57; i++) {
+        arr.push(String.fromCharCode(i))
+      }
+      arr.sort(function() {
+        return Math.random() - 0.5
+      })
+      arr.length = 4
 
-						console.log(this.warehouseNameList[i])
-						//经办人
-						getstaff({
-								compId: localStorage.getItem('ws-pf_compId'),
-								warehouseId: e
-							})
-							.toPromise()
-							.then(response => {
-								this.options = response
-								this.staffList = response
-								//  this.agent = response
-							})
-					}
-				}
-			},
-			selectwarehouseName1(e) {
-				if(this.dataList1.taskTypeKey==4){
-					this.goods=''
-					localStorage.removeItem('supplygoods1')
-				}
-				for (var i = 0; i < this.warehouseNameList.length; i++) {
-					if (this.warehouseNameList[i].id == e) {
-						this.dataList1.warehouseName = this.warehouseNameList[i].warehouseName
-						//经办人
-						getstaff({
-								compId: localStorage.getItem('ws-pf_compId'),
-								warehouseId: e
-							})
-							.toPromise()
-							.then(response => {
-								this.options1 = response
-								this.staffList1 = response
-								//  this.agent = response
-							})
-					}
-				}
-			},
-			changecontract1(e) {
-				localStorage.setItem('contractNo',e)
-				if (this.dataList1.taskTypeKey != 3) {
-					for (let i = 0; i < this.contractNoList1.length; i++) {
-						if (this.contractNoList1[i].contractNo == e) {
-							if(this.dataList1.inOutType=='收购入库'){
-								this.dataList1.weight=this.contractNoList1[i].weight
-								localStorage.setItem('weight',this.contractNoList1[i].weight)
-							}
-							this.inOutType=this.contractNoList1[i].inOutType
-							if(this.contractNoList1[i].priceType == '随行就市'){
-								this.Pricetype = false
-							}else{
-								this.Pricetype = true
-							}
-							getGoodsName({
-									contractId: this.contractNoList1[i].id,
-									contractNo: this.contractNoList1[i].contractNo
-								})
-								.toPromise()
-								.then(response => {
-									localStorage.setItem('goodsName',response.goodsName)
-									localStorage.setItem('goodsNameKey',response.goodsNameKey)
-									this.$set(this.dataList1, 'goodsName', response.goodsName)
-									this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
-									this.$set(this.dataList1, 'grade', response.grade)
-									this.$set(this.dataList1, 'gradeKey', response.gradeKey)
-									this.$set(this.dataList1, 'waterContent', response.waterContent)
-									this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
-									if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'){
-										this.dataList1.weight=0
-										gettaskNo({
-											contractNo: this.dataList1.contractNo,
-										})
-										.toPromise()
-										.then((response) => {
-											this.taskNolist = response
-										})
-									}else{
-										this.$set(this.dataList1, 'weight', response.weight)
-										localStorage.setItem('weight',response.weight)
-									}
-									this.$set(
-										this.dataList1,
-										'unitPrice',
-										response.unitContractPrice
-									)
-								})
-						}
-					}
-				}
-			},
-			selectstaff(e) {
-				for (var i = 0; i < this.staffList.length; i++) {
-					if (this.staffList[i].staffName == e) {
-						this.dataList.agentKey = this.staffList[i].staffId
-					}
-				}
-			},
-			selectstaff1(e) {
-				for (var i = 0; i < this.staffList1.length; i++) {
-					if (this.staffList1[i].staffName == e) {
-						this.dataList1.agentKey = this.staffList1[i].staffId
-					}
-				}
-			},
-			requestadd(list, status) {
-				localStorage.removeItem('supplygoods1')
-				list.compId = localStorage.getItem('ws-pf_compId')
-				list.publisher =
-					localStorage.getItem('ws-pf_roleName') +
-					localStorage.getItem('ws-pf_staffName')
-				addoreditoutput(list)
-					.toPromise()
-					.then(response => {
-						var that = this
-						if(response=='该合同累计任务量已超过溢短装！'){
-							this.$message({
-							message: '该合同累计任务量已超过溢短装！',
-							type: 'error',
-							duration:15000
-							})
-						}else{
-							this.$message({
-							message: '提交成功!',
-							type: 'success',
-							})
-						}
-						setTimeout(function() {
-							that.dataList = {
-								taskTypeKey: 1
-							}
-							this.goods=''
-							that.dataList1 = {}
-							that.$router.push({
-								path: 'tranManagementWarehouseInOuttask'
-							})
-						}, 2000)
-					})
-			},
-			//提交按钮
-			submit() {
-				if (this.dataList.taskTypeKey == 1) {
-					if (!this.dataList.warehouseName) {
-						this.$message({
-							message: '仓库名不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList.contractNo) {
-						this.$message({
-							message: '合同编号不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList.weight) {
-						this.$message({
-							message: '重量（吨）不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					// if (
-					// 	isNaN(this.dataList.weight) ||
-					// 	(String(this.dataList.weight).indexOf('.') != -1 &&
-					// 		String(this.dataList.weight).length -
-					// 		(String(this.dataList.weight).indexOf('.') + 1) >
-					// 		2) ||
-					// 	this.dataList.weight < 0 ||
-					// 	this.dataList.weight > 200000
-					// ) {
-					// 	this.$message({
-					// 		message: '重量（吨）输入有误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList.bulkDensity) {
-					// 	this.$message({
-					// 		message: '容重不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	this.dataList.bulkDensity < 0 ||
-					// 	this.dataList.bulkDensity > 1000
-					// ) {
-					// 	this.$message({
-					// 		message: '容重输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	String(this.dataList.bulkDensity).indexOf('.') != -1 &&
-					// 	String(this.dataList.bulkDensity).length -
-					// 	(String(this.dataList.bulkDensity).indexOf('.') + 1) >
-					// 	0
-					// ) {
-					// 	this.$message({
-					// 		message: '容重需输入整数',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList.waterContent) {
-					// 	this.$message({
-					// 		message: '水分不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (this.dataList.waterContent < 0 || this.dataList.waterContent > 40) {
-					// 	this.$message({
-					// 		message: '水分输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	String(this.dataList.waterContent).indexOf('.') != -1 &&
-					// 	String(this.dataList.waterContent).length -
-					// 	(String(this.dataList.waterContent).indexOf('.') + 1) >
-					// 	1
-					// ) {
-					// 	this.$message({
-					// 		message: '水分输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if(this.Pricetype){
-					// 	if (!this.dataList.unitPrice) {
-					// 	this.$message({
-					// 		message: '单价不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	(this.dataList.unitPrice &&
-					// 		String(this.dataList.unitPrice).indexOf('.') != -1 &&
-					// 		String(this.dataList.unitPrice).length -
-					// 		(String(this.dataList.unitPrice).indexOf('.') + 1) >
-					// 		2) ||
-					// 	this.dataList.unitPrice > 100000 ||
-					// 	this.dataList.unitPrice < 1
-					// ) {
-					// 	this.$message({
-					// 		message: '单价输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// }
+      return arr.join('')
+    },
+    MathRand() {
+      var Num = ''
+      for (var i = 0; i < 4; i++) {
+        Num += Math.floor(Math.random() * 10)
+      }
+      return Num
+    },
+    selectTaskNo(e) {
+      if (this.dataList.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'moveTaskNo', e)
+      }
+    },
+    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
+      }
+    },
+    dataFilter1(val) {
+      // console.log(val,"名")
+      this.deptBudgetList.staffList1 = val
+      if (val) {
+        //val存在
+        this.options = this.staffList1.filter(item => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options1 = this.staffList1
+      }
+    },
+    weightchange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'weight', e)
+      } else if (this.dataList.taskTypeKey == 2) {
+        this.$set(this.dataList1, 'weight', e)
+      }
+    },
+    weightchange1(e) {
+      if (this.dataList.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'weight', e)
+      }
+    },
+    bulkDensitychange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'bulkDensity', e)
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'bulkDensity', e)
+      }
+    },
+    waterContentchange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'waterContent', e)
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'waterContent', e)
+      }
+    },
+    unitPricechange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'unitPrice', e)
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'unitPrice', e)
+      }
+    },
+    changecontract(e) {
+      if (this.dataList.taskTypeKey != 3) {
+        for (let i = 0; i < this.contractNoList.length; i++) {
+          if (this.contractNoList[i].contractNo == e) {
+            console.log(this.contractNoList[i], 11222)
+            this.inOutType = this.contractNoList[i].inOutType
+            if (this.contractNoList[i].priceType == '随行就市') {
+              this.Pricetype = false
+            } else {
+              this.Pricetype = true
+            }
+            getGoodsName({
+              contractId: this.contractNoList[i].id,
+              contractNo: this.contractNoList[i].contractNo
+            })
+              .toPromise()
+              .then(response => {
+                this.$set(this.dataList, 'goodsName', response.goodsName)
+                this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
+                this.$set(this.dataList, 'grade', response.grade)
+                this.$set(this.dataList, 'gradeKey', response.gradeKey)
+                this.$set(this.dataList, 'waterContent', response.waterContent)
+                this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
+                // this.$set(this.dataList, 'weight', response.weight)
+                this.$set(
+                  this.dataList,
+                  'unitPrice',
+                  response.unitContractPrice
+                )
+              })
+          }
+        }
+      }
+    },
+    selectwarehouseName(e) {
+      this.baseId = e
+      if (
+        this.dataList.taskTypeKey == 1 ||
+        this.dataList.taskTypeKey == 2 ||
+        this.dataList.taskTypeKey == 3
+      ) {
+        this.goods = ''
+        localStorage.removeItem('supplygoods1')
+      }
+      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: localStorage.getItem('ws-pf_compId'),
+            warehouseId: e
+          })
+            .toPromise()
+            .then(response => {
+              this.options = response
+              this.staffList = response
+              //  this.agent = response
+            })
+        }
+      }
+    },
+    selectwarehouseName1(e) {
+      if (this.dataList1.taskTypeKey == 4) {
+        this.goods = ''
+        localStorage.removeItem('supplygoods1')
+      }
+      for (var i = 0; i < this.warehouseNameList.length; i++) {
+        if (this.warehouseNameList[i].id == e) {
+          this.dataList1.warehouseName = this.warehouseNameList[i].warehouseName
+          //经办人
+          getstaff({
+            compId: localStorage.getItem('ws-pf_compId'),
+            warehouseId: e
+          })
+            .toPromise()
+            .then(response => {
+              this.options1 = response
+              this.staffList1 = response
+              //  this.agent = response
+            })
+        }
+      }
+    },
+    changecontract1(e) {
+      localStorage.setItem('contractNo', e)
+      if (this.dataList1.taskTypeKey != 3) {
+        for (let i = 0; i < this.contractNoList1.length; i++) {
+          if (this.contractNoList1[i].contractNo == e) {
+            if (this.dataList1.inOutType == '收购入库') {
+              this.dataList1.weight = this.contractNoList1[i].weight
+              localStorage.setItem('weight', this.contractNoList1[i].weight)
+            }
+            this.inOutType = this.contractNoList1[i].inOutType
+            if (this.contractNoList1[i].priceType == '随行就市') {
+              this.Pricetype = false
+            } else {
+              this.Pricetype = true
+            }
+            getGoodsName({
+              contractId: this.contractNoList1[i].id,
+              contractNo: this.contractNoList1[i].contractNo
+            })
+              .toPromise()
+              .then(response => {
+                localStorage.setItem('goodsName', response.goodsName)
+                localStorage.setItem('goodsNameKey', response.goodsNameKey)
+                this.$set(this.dataList1, 'goodsName', response.goodsName)
+                this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
+                this.$set(this.dataList1, 'grade', response.grade)
+                this.$set(this.dataList1, 'gradeKey', response.gradeKey)
+                this.$set(this.dataList1, 'waterContent', response.waterContent)
+                this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
+                if (
+                  this.dataList1.taskTypeKey == 2 &&
+                  this.dataList1.inOutType == '退库'
+                ) {
+                  this.dataList1.weight = 0
+                  gettaskNo({
+                    contractNo: this.dataList1.contractNo
+                  })
+                    .toPromise()
+                    .then(response => {
+                      this.taskNolist = response
+                    })
+                } else {
+                  this.$set(this.dataList1, 'weight', response.weight)
+                  localStorage.setItem('weight', response.weight)
+                }
+                this.$set(
+                  this.dataList1,
+                  'unitPrice',
+                  response.unitContractPrice
+                )
+              })
+          }
+        }
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    selectstaff1(e) {
+      for (var i = 0; i < this.staffList1.length; i++) {
+        if (this.staffList1[i].staffName == e) {
+          this.dataList1.agentKey = this.staffList1[i].staffId
+        }
+      }
+    },
+    requestadd(list, status) {
+      localStorage.removeItem('supplygoods1')
+      list.compId = localStorage.getItem('ws-pf_compId')
+      list.publisher =
+        localStorage.getItem('ws-pf_roleName') +
+        localStorage.getItem('ws-pf_staffName')
+      addoreditoutput(list)
+        .toPromise()
+        .then(response => {
+          var that = this
+          if (response == '该合同累计任务量已超过溢短装！') {
+            this.$message({
+              message: '该合同累计任务量已超过溢短装！',
+              type: 'error',
+              duration: 15000
+            })
+          } else {
+            this.$message({
+              message: '提交成功!',
+              type: 'success'
+            })
+          }
+          setTimeout(function() {
+            that.dataList = {
+              taskTypeKey: 1
+            }
+            this.goods = ''
+            that.dataList1 = {}
+            that.$router.push({
+              path: 'tranManagementWarehouseInOuttask'
+            })
+          }, 2000)
+        })
+    },
+    //提交按钮
+    submit() {
+      if (this.dataList.taskTypeKey == 1) {
+        if (!this.dataList.warehouseName) {
+          this.$message({
+            message: '仓库名不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList.taskFlag) {
+          this.$message({
+            message: '任务标识不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+      }
 
-					if (!this.dataList.predictDate) {
-						this.$message({
-							message: '预计出库日期不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-				    // if (isNaN(this.dataList.estimatedFreight)) {
-					// 	this.$message({
-					// 		message: '预估运费输入错误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList.agent) {
-					//   this.$message({
-					//     message: '出库经办人不能为空！',
-					//     type: 'warning'
-					//   })
-					//   return
-					// }
-					if (!this.dataList.businessDescribe) {
-						this.$message({
-							message: '业务描述不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-				}
+      if (this.dataList.taskTypeKey == 2) {
+        if (!this.dataList1.warehouseName) {
+          this.$message({
+            message: '仓库名不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.taskFlag) {
+          this.$message({
+            message: '任务标识不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+      }
+      if (this.dataList.taskTypeKey == 3) {
+        if (!this.dataList.warehouseName) {
+          this.$message({
+            message: '出库仓库名不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.warehouseName) {
+          this.$message({
+            message: '入库仓库名不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        this.dataList.contractNo = ''
+        this.dataList1.contractNo = ''
+        if (!this.dataList1.moveTaskNo) {
+          this.$message({
+            message: '移库任务编号不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        // if (
+        // 	isNaN(this.dataList1.weight) ||
+        // 	(String(this.dataList1.weight).indexOf('.') != -1 &&
+        // 		String(this.dataList1.weight).length -
+        // 		(String(this.dataList1.weight).indexOf('.') + 1) >
+        // 		2) ||
+        // 	this.dataList1.weight < 0 ||
+        // 	this.dataList1.weight > 200000
+        // ) {
+        // 	this.$message({
+        // 		message: '重量（吨）输入有误！',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        if (!this.dataList.predictDate) {
+          this.$message({
+            message: '预计出库日期不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        //  if (isNaN(this.dataList1.estimatedFreight)) {
+        // 	this.$message({
+        // 		message: '预估运费输入错误！',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        if (!this.dataList1.predictDate) {
+          this.$message({
+            message: '预计入库日期不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        // if (!this.dataList.agent) {
+        //   this.$message({
+        //     message: '出库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (!this.dataList1.agent) {
+        //   this.$message({
+        //     message: '入库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        if (!this.dataList1.businessDescribe) {
+          this.$message({
+            message: '业务描述不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+      }
 
-				if (this.dataList.taskTypeKey == 2) {
-					if (!this.dataList1.warehouseName) {
-						this.$message({
-							message: '仓库名不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.contractNo) {
-						this.$message({
-							message: '合同编号不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.weight) {
-						this.$message({
-							message: '重量（吨）不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					// if (
-					// 	isNaN(this.dataList1.weight) ||
-					// 	(String(this.dataList1.weight).indexOf('.') != -1 &&
-					// 		String(this.dataList1.weight).length -
-					// 		(String(this.dataList1.weight).indexOf('.') + 1) >
-					// 		2) ||
-					// 	this.dataList1.weight < 0 ||
-					// 	this.dataList1.weight > 200000
-					// ) {
-					// 	this.$message({
-					// 		message: '重量（吨）输入有误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList1.bulkDensity) {
-					// 	this.$message({
-					// 		message: '容重不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	this.dataList1.bulkDensity < 500 ||
-					// 	this.dataList1.bulkDensity > 1000
-					// ) {
-					// 	this.$message({
-					// 		message: '容重输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-					// 	String(this.dataList1.bulkDensity).length -
-					// 	(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
-					// 	0
-					// ) {
-					// 	this.$message({
-					// 		message: '容重需输入整数',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList1.waterContent) {
-					// 	this.$message({
-					// 		message: '水分不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	this.dataList1.waterContent < 0 ||
-					// 	this.dataList1.waterContent > 40
-					// ) {
-					// 	this.$message({
-					// 		message: '水分输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	String(this.dataList1.waterContent).indexOf('.') != -1 &&
-					// 	String(this.dataList1.waterContent).length -
-					// 	(String(this.dataList1.waterContent).indexOf('.') + 1) >
-					// 	1
-					// ) {
-					// 	this.$message({
-					// 		message: '水分输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if(this.Pricetype){
-					// 	if (!this.dataList1.unitPrice) {
-					// 	this.$message({
-					// 		message: '单价不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	(this.dataList1.unitPrice &&
-					// 		String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-					// 		String(this.dataList1.unitPrice).length -
-					// 		(String(this.dataList1.unitPrice).indexOf('.') + 1) >
-					// 		2) ||
-					// 	this.dataList1.unitPrice > 100000 ||
-					// 	this.dataList1.unitPrice < 1
-					// ) {
-					// 	this.$message({
-					// 		message: '单价输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// }
+      if (this.dataList1.taskTypeKey == 4) {
+        if (!this.dataList.warehouseName) {
+          this.$message({
+            message: '出库仓库名不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.warehouseName) {
+          this.$message({
+            message: '入库仓库名不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.dataList1.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        // if (
+        // 	isNaN(this.dataList1.weight) ||
+        // 	(String(this.dataList1.weight).indexOf('.') != -1 &&
+        // 		String(this.dataList1.weight).length -
+        // 		(String(this.dataList1.weight).indexOf('.') + 1) >
+        // 		2) ||
+        // 	this.dataList1.weight < 0 ||
+        // 	this.dataList1.weight > 200000
+        // ) {
+        // 	this.$message({
+        // 		message: '重量（吨）输入有误！',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (!this.dataList1.bulkDensity) {
+        // 	this.$message({
+        // 		message: '容重不能为空！',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (
+        // 	this.dataList1.bulkDensity < 500 ||
+        // 	this.dataList1.bulkDensity > 1000
+        // ) {
+        // 	this.$message({
+        // 		message: '容重输入错误',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (
+        // 	String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
+        // 	String(this.dataList1.bulkDensity).length -
+        // 	(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
+        // 	0
+        // ) {
+        // 	this.$message({
+        // 		message: '容重需输入整数',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (!this.dataList1.waterContent) {
+        // 	this.$message({
+        // 		message: '水分不能为空！',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (
+        // 	this.dataList1.waterContent < 0 ||
+        // 	this.dataList1.waterContent > 40
+        // ) {
+        // 	this.$message({
+        // 		message: '水分输入错误',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (
+        // 	String(this.dataList1.waterContent).indexOf('.') != -1 &&
+        // 	String(this.dataList1.waterContent).length -
+        // 	(String(this.dataList1.waterContent).indexOf('.') + 1) >
+        // 	1
+        // ) {
+        // 	this.$message({
+        // 		message: '水分输入错误',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if(this.Pricetype){
+        // 	if (!this.dataList1.unitPrice) {
+        // 	this.$message({
+        // 		message: '单价不能为空！',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (
+        // 	(this.dataList1.unitPrice &&
+        // 		String(this.dataList1.unitPrice).indexOf('.') != -1 &&
+        // 		String(this.dataList1.unitPrice).length -
+        // 		(String(this.dataList1.unitPrice).indexOf('.') + 1) >
+        // 		2) ||
+        // 	this.dataList1.unitPrice > 100000 ||
+        // 	this.dataList1.unitPrice < 1
+        // ) {
+        // 	this.$message({
+        // 		message: '单价输入错误',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // }
 
-					if (!this.dataList1.predictDate) {
-						this.$message({
-							message: '预计入库日期不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					//  if (isNaN(this.dataList1.estimatedFreight)) {
-					// 	this.$message({
-					// 		message: '预估运费输入错误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList1.agent) {
-					//   this.$message({
-					//     message: '入库经办人不能为空！',
-					//     type: 'warning'
-					//   })
-					//   return
-					// }
-					if (!this.dataList1.businessDescribe) {
-						this.$message({
-							message: '业务描述不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-				}
-				if (this.dataList.taskTypeKey == 3) {
-					if (!this.dataList.warehouseName) {
-						this.$message({
-							message: '出库仓库名不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.warehouseName) {
-						this.$message({
-							message: '入库仓库名不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					this.dataList.contractNo=''
-					this.dataList1.contractNo=''
-					if (!this.dataList1.moveTaskNo) {
-						this.$message({
-							message: '移库任务编号不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.weight) {
-						this.$message({
-							message: '重量（吨）不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					// if (
-					// 	isNaN(this.dataList1.weight) ||
-					// 	(String(this.dataList1.weight).indexOf('.') != -1 &&
-					// 		String(this.dataList1.weight).length -
-					// 		(String(this.dataList1.weight).indexOf('.') + 1) >
-					// 		2) ||
-					// 	this.dataList1.weight < 0 ||
-					// 	this.dataList1.weight > 200000
-					// ) {
-					// 	this.$message({
-					// 		message: '重量（吨）输入有误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					if (!this.dataList.predictDate) {
-						this.$message({
-							message: '预计出库日期不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					//  if (isNaN(this.dataList1.estimatedFreight)) {
-					// 	this.$message({
-					// 		message: '预估运费输入错误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					if (!this.dataList1.predictDate) {
-						this.$message({
-							message: '预计入库日期不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					// if (!this.dataList.agent) {
-					//   this.$message({
-					//     message: '出库经办人不能为空！',
-					//     type: 'warning'
-					//   })
-					//   return
-					// }
-					// if (!this.dataList1.agent) {
-					//   this.$message({
-					//     message: '入库经办人不能为空！',
-					//     type: 'warning'
-					//   })
-					//   return
-					// }
-					if (!this.dataList1.businessDescribe) {
-						this.$message({
-							message: '业务描述不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-				}
+        if (!this.dataList.predictDate) {
+          this.$message({
+            message: '预计出库日期不能为空！',
+            type: 'warning'
+          })
+          return
+        }
 
-				if (this.dataList1.taskTypeKey == 4) {
-					if (!this.dataList.warehouseName) {
-						this.$message({
-							message: '出库仓库名不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.warehouseName) {
-						this.$message({
-							message: '入库仓库名不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.contractNo) {
-						this.$message({
-							message: '合同编号不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList.contractNo) {
-						this.$message({
-							message: '合同编号不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.weight) {
-						this.$message({
-							message: '重量（吨）不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					// if (
-					// 	isNaN(this.dataList1.weight) ||
-					// 	(String(this.dataList1.weight).indexOf('.') != -1 &&
-					// 		String(this.dataList1.weight).length -
-					// 		(String(this.dataList1.weight).indexOf('.') + 1) >
-					// 		2) ||
-					// 	this.dataList1.weight < 0 ||
-					// 	this.dataList1.weight > 200000
-					// ) {
-					// 	this.$message({
-					// 		message: '重量（吨）输入有误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList1.bulkDensity) {
-					// 	this.$message({
-					// 		message: '容重不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	this.dataList1.bulkDensity < 500 ||
-					// 	this.dataList1.bulkDensity > 1000
-					// ) {
-					// 	this.$message({
-					// 		message: '容重输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-					// 	String(this.dataList1.bulkDensity).length -
-					// 	(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
-					// 	0
-					// ) {
-					// 	this.$message({
-					// 		message: '容重需输入整数',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList1.waterContent) {
-					// 	this.$message({
-					// 		message: '水分不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	this.dataList1.waterContent < 0 ||
-					// 	this.dataList1.waterContent > 40
-					// ) {
-					// 	this.$message({
-					// 		message: '水分输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	String(this.dataList1.waterContent).indexOf('.') != -1 &&
-					// 	String(this.dataList1.waterContent).length -
-					// 	(String(this.dataList1.waterContent).indexOf('.') + 1) >
-					// 	1
-					// ) {
-					// 	this.$message({
-					// 		message: '水分输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if(this.Pricetype){
-					// 	if (!this.dataList1.unitPrice) {
-					// 	this.$message({
-					// 		message: '单价不能为空！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	(this.dataList1.unitPrice &&
-					// 		String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-					// 		String(this.dataList1.unitPrice).length -
-					// 		(String(this.dataList1.unitPrice).indexOf('.') + 1) >
-					// 		2) ||
-					// 	this.dataList1.unitPrice > 100000 ||
-					// 	this.dataList1.unitPrice < 1
-					// ) {
-					// 	this.$message({
-					// 		message: '单价输入错误',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// }
-
-					if (!this.dataList.predictDate) {
-						this.$message({
-							message: '预计出库日期不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-
-					if (!this.dataList1.predictDate) {
-						this.$message({
-							message: '预计入库日期不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					//  if (isNaN(this.dataList1.estimatedFreight)) {
-					// 	this.$message({
-					// 		message: '预估运费输入错误！',
-					// 		type: 'warning'
-					// 	})
-					// 	return
-					// }
-					// if (!this.dataList.agent) {
-					//   this.$message({
-					//     message: '出库经办人不能为空！',
-					//     type: 'warning'
-					//   })
-					//   return
-					// }
-					// if (!this.dataList1.agent) {
-					//   this.$message({
-					//     message: '入库经办人不能为空！',
-					//     type: 'warning'
-					//   })
-					//   return
-					// }
-					if (!this.dataList.businessDescribe) {
-						this.$message({
-							message: '业务描述不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-				}
-				localStorage.removeItem('warehouse')
-				localStorage.removeItem('contractNo');
-            	localStorage.removeItem('taskTypeKey');
-				localStorage.removeItem('inOutType')
-				localStorage.removeItem('inOutTypeKey')
-				localStorage.removeItem('contractNo')
-				localStorage.removeItem('goodsName')
-				localStorage.removeItem('goodsNameKey')
-				localStorage.removeItem('weight')
-				// this.dataList.goodsNameKey =
-				// this.dataList.positionId =
-				// this.dataList.baseId =
-				this.dataList.inOutFlag = 1
-				this.dataList1.inOutFlag = 2
-				var data=JSON.parse(localStorage.getItem('supplygoods'))
-				if(data){
-					for (let i = 0; i < data.length; i++) {
-						data[i].sourceId=data[i].id
-					}
-
-				}else{
-					// ||this.dataList1.taskTypeKey == 2&&this.dataList1.inOutType
-					if(this.dataList.taskTypeKey == 1||this.dataList.taskTypeKey == 3||this.dataList.taskTypeKey == 4){
-						this.$message({
-							message: '请选择货源！',
-							type: 'warning'
-						})
-						return
-					}
-					
-				}
-				var supplygoods=data
-				if(this.dataList.taskTypeKey != 2){
-					this.dataList.sourceId=this.goods
-					this.dataList1.sourceId=this.goods
-				}
-				if (this.dataList.taskTypeKey == 1) {
-					this.dataList.inOutTaskNo = this.inOutTaskNo
-					this.dataList.sourceRelationInfoList=supplygoods
-					this.requestadd(this.dataList)
-				} else if (this.dataList1.taskTypeKey == 2) {
-					this.dataList1.inOutTaskNo = this.inOutTaskNo1
-					this.requestadd(this.dataList1)
-				} else if (
-					this.dataList.taskTypeKey == 3 ||
-					this.dataList.taskTypeKey == 4
-				) {
-					this.dataList.inOutTaskNo = this.inOutTaskNo
-					this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-					this.dataList.sourceRelationInfoList=supplygoods
-					this.dataList1.sourceRelationInfoList=supplygoods
-					if (this.dataList.taskTypeKey == 3) {
-						this.dataList.sendWarehouse=this.dataList.warehouseName
-						this.dataList.receiveWarehouse=this.dataList1.warehouseName
-						this.dataList1.sendWarehouse=this.dataList.warehouseName
-						this.dataList1.receiveWarehouse=this.dataList1.warehouseName
-						this.dataList.businessDescribe = this.dataList1.businessDescribe
-					} else {
-						this.dataList1.businessDescribe = this.dataList.businessDescribe
-					}
-					this.requestadd(this.dataList, 'repetition')
-					this.dataList1.inOutTaskNo = this.inOutTaskNo1
-					this.dataList1.relevanceId = this.dataList.relevanceId
-					this.dataList1.goodsName = this.dataList.goodsName
-					this.requestadd(this.dataList1, 'repetition')
-				}
-			},
-			tarechange(e) {
-				if (this.dataList.grossWeight && this.dataList.tare) {
-					this.dataList.netWeight = Number(
-						this.dataList.grossWeight - this.dataList.tare
-					)
-				}
-			},
-			grossWeightchange(e) {
-				if (this.dataList.grossWeight && this.dataList.tare) {
-					this.dataList.netWeight = Number(
-						this.dataList.grossWeight - this.dataList.tare
-					)
-				}
-			},
-			selectgoodsName(e) {
-
-				for (var i = 0; i < this.goodnameList.length; i++) {
-					if (this.goodnameList[i].constValue == e) {
-						this.dataList.goodsNameKey = this.goodnameList[i].constKey
-					}
-				}
-			},
-			selectgoodsName1(e) {
-				for (var i = 0; i < this.goodnameList.length; i++) {
-					if (this.goodnameList[i].constValue == e) {
-						this.dataList1.goodsNameKey = this.goodnameList[i].constKey
-					}
-				}
-			},
-			selectinOutTaskNo(e) {
-				for (var i = 0; i < this.taskNolist.length; i++) {
-					if (this.taskNolist[i].inOutTaskNo == e) {
-						this.dataList1.sourceId = this.taskNolist[i].id
-						// this.dataList1.weight = this.taskNolist[i].weight
-					}
-				}
-			},
-			selectpackingMethod(e) {
-				for (var i = 0; i < this.gradeList.length; i++) {
-					if (this.gradeList[i].constValue == e) {
-						this.dataList.gradeKey = this.gradeList[i].constKey
-						if (this.dataList.taskTypeKey == 3) {
-							this.$set(this.dataList1, 'grade', e)
-							this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
-						}
-					}
-				}
-			},
-			selectpackingMethod1(e) {
-				for (var i = 0; i < this.gradeList.length; i++) {
-					if (this.gradeList[i].constValue == e) {
-						this.dataList1.packingMethodKey = this.gradeList[i].constKey
-						if (this.dataList1.taskTypeKey == 4) {
-							this.$set(this.dataList, 'grade', e)
-							this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
-						}
-					}
-				}
-			},
-			selectstorageType(e) {
-				switch (e) {
-					case '采购出库':
-						this.flag = 8
-						break
-					case '销售出库':
-						this.flag = 1
-						break
-				}
-				for (var i = 0; i < this.storageType.length; i++) {
-					if (this.storageType[i].constValue == e) {
-						this.dataList.inOutTypeKey = this.storageType[i].constKey
-					}
-				}
-			},
-			selectstorageType1(e) {
-				switch (e) {
-					case '收购入库':
-						this.flag = 9
-						break
-					case '采购入库':
-						this.flag = 8
-						break
-					case '暂存入库':
-						this.flag = 0
-						break
-					case '贸易服务入库':
-						this.flag = 0
-						break
-					case '退库':
-						this.flag = 5
-						break
-				}
-				localStorage.setItem('inOutType',e)
-				for (var i = 0; i < this.storageType1.length; i++) {
-					if (this.storageType1[i].constValue == e) {
-						this.dataList1.inOutTypeKey = this.storageType1[i].constKey
-						localStorage.setItem('inOutTypeKey',this.storageType1[i].constKey)
-					}
-				}
-			},
-			handleClose() {
-				this.accessoryTFs = false
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`)
-				this.pageSize = val
-				this.getList()
-			},
-			businessDescriptionchange(e) {
-				console.log(e)
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val
-				console.log(`当前页: ${val}`)
-				this.getList()
-			},
-			tasknumber() {
-				console.log(this.dataList.taskTypeKey)
-				if (this.dataList.taskTypeKey == 1) {
-					this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
-				} else if (this.dataList.taskTypeKey == 2) {
-					this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
-				} else if (this.dataList.taskTypeKey == 3) {
-					var random = this.getdate() + this.MathRand()
-					this.inOutTaskNo = 'YKC' + random
-					this.inOutTaskNo1 = 'YKR' + random
+        if (!this.dataList1.predictDate) {
+          this.$message({
+            message: '预计入库日期不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        //  if (isNaN(this.dataList1.estimatedFreight)) {
+        // 	this.$message({
+        // 		message: '预估运费输入错误！',
+        // 		type: 'warning'
+        // 	})
+        // 	return
+        // }
+        // if (!this.dataList.agent) {
+        //   this.$message({
+        //     message: '出库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (!this.dataList1.agent) {
+        //   this.$message({
+        //     message: '入库经办人不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        if (!this.dataList.businessDescribe) {
+          this.$message({
+            message: '业务描述不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+      }
+      localStorage.removeItem('warehouse')
+      localStorage.removeItem('contractNo')
+      localStorage.removeItem('taskTypeKey')
+      localStorage.removeItem('inOutType')
+      localStorage.removeItem('inOutTypeKey')
+      localStorage.removeItem('contractNo')
+      localStorage.removeItem('goodsName')
+      localStorage.removeItem('goodsNameKey')
+      localStorage.removeItem('weight')
+      // this.dataList.goodsNameKey =
+      // this.dataList.positionId =
+      // this.dataList.baseId =
+      this.dataList.inOutFlag = 1
+      this.dataList1.inOutFlag = 2
+      var data = JSON.parse(localStorage.getItem('supplygoods'))
+      if (data) {
+        for (let i = 0; i < data.length; i++) {
+          data[i].sourceId = data[i].id
+        }
+      }
+      //   else {
+      //     // ||this.dataList1.taskTypeKey == 2&&this.dataList1.inOutType
+      //     if (
+      //       this.dataList.taskTypeKey == 1 ||
+      //       this.dataList.taskTypeKey == 3 ||
+      //       this.dataList.taskTypeKey == 4
+      //     ) {
+      //       this.$message({
+      //         message: '请选择货源！',
+      //         type: 'warning'
+      //       })
+      //       return
+      //     }
+      //   }
+      var supplygoods = data
+      if (this.dataList.taskTypeKey != 2) {
+        this.dataList.sourceId = this.goods
+        this.dataList1.sourceId = this.goods
+      }
+      if (this.dataList.taskTypeKey == 1) {
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.dataList.sourceRelationInfoList = supplygoods
+        this.requestadd(this.dataList)
+      } else if (this.dataList1.taskTypeKey == 2) {
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.requestadd(this.dataList1)
+      } else if (
+        this.dataList.taskTypeKey == 3 ||
+        this.dataList.taskTypeKey == 4
+      ) {
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+        this.dataList.sourceRelationInfoList = supplygoods
+        this.dataList1.sourceRelationInfoList = supplygoods
+        if (this.dataList.taskTypeKey == 3) {
+          this.dataList.sendWarehouse = this.dataList.warehouseName
+          this.dataList.receiveWarehouse = this.dataList1.warehouseName
+          this.dataList1.sendWarehouse = this.dataList.warehouseName
+          this.dataList1.receiveWarehouse = this.dataList1.warehouseName
+          this.dataList.businessDescribe = this.dataList1.businessDescribe
+        } else {
+          this.dataList1.businessDescribe = this.dataList.businessDescribe
+        }
+        this.requestadd(this.dataList, 'repetition')
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.dataList1.relevanceId = this.dataList.relevanceId
+        this.dataList1.goodsName = this.dataList.goodsName
+        this.requestadd(this.dataList1, 'repetition')
+      }
+    },
+    tarechange(e) {
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
+        )
+      }
+    },
+    grossWeightchange(e) {
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
+        )
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectgoodsName1(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectinOutTaskNo(e) {
+      for (var i = 0; i < this.taskNolist.length; i++) {
+        if (this.taskNolist[i].inOutTaskNo == e) {
+          this.dataList1.sourceId = this.taskNolist[i].id
+          // this.dataList1.weight = this.taskNolist[i].weight
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.dataList.gradeKey = this.gradeList[i].constKey
+          if (this.dataList.taskTypeKey == 3) {
+            this.$set(this.dataList1, 'grade', e)
+            this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
+          }
+        }
+      }
+    },
+    selectpackingMethod1(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.dataList1.packingMethodKey = this.gradeList[i].constKey
+          if (this.dataList1.taskTypeKey == 4) {
+            this.$set(this.dataList, 'grade', e)
+            this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
+          }
+        }
+      }
+    },
+    selectstorageType(e) {
+      switch (e) {
+        case '采购出库':
+          this.flag = 8
+          break
+        case '销售出库':
+          this.flag = 1
+          break
+      }
+      for (var i = 0; i < this.storageType.length; i++) {
+        if (this.storageType[i].constValue == e) {
+          this.dataList.inOutTypeKey = this.storageType[i].constKey
+        }
+      }
+    },
+    selectstorageType1(e) {
+      switch (e) {
+        case '收购入库':
+          this.flag = 9
+          break
+        case '采购入库':
+          this.flag = 8
+          break
+        case '暂存入库':
+          this.flag = 0
+          break
+        case '贸易服务入库':
+          this.flag = 0
+          break
+        case '退库':
+          this.flag = 5
+          break
+      }
+      localStorage.setItem('inOutType', e)
+      for (var i = 0; i < this.storageType1.length; i++) {
+        if (this.storageType1[i].constValue == e) {
+          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+          localStorage.setItem('inOutTypeKey', this.storageType1[i].constKey)
+        }
+      }
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    businessDescriptionchange(e) {
+      console.log(e)
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    tasknumber() {
+      console.log(this.dataList.taskTypeKey)
+      if (this.dataList.taskTypeKey == 1) {
+        this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
+      } else if (this.dataList.taskTypeKey == 2) {
+        this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
+      } else if (this.dataList.taskTypeKey == 3) {
+        var random = this.getdate() + this.MathRand()
+        this.inOutTaskNo = 'YKC' + random
+        this.inOutTaskNo1 = 'YKR' + random
         //   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
-					this.inOutTaskNo1 = 'TCR' + random
-				}
-			},
-			tasknumber1() {
-				console.log(this.dataList.taskTypeKey)
-				if (this.dataList.taskTypeKey == 1) {
-					this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
-				} else if (this.dataList.taskTypeKey == 2) {
-					this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
-				} else if (this.dataList.taskTypeKey == 3) {
-					var random = this.getdate() + this.MathRand()
-					this.inOutTaskNo = 'YKC' + random
-					this.inOutTaskNo1 = 'YKR' + random
+        //    this.dataList1.moveTaskNo = 'YKRW' + random
+      } else if (this.dataList.taskTypeKey == 4) {
+        var random = this.getdate() + this.MathRand()
+        this.inOutTaskNo = 'TCC' + random
+        this.inOutTaskNo1 = 'TCR' + random
+      }
+    },
+    tasknumber1() {
+      console.log(this.dataList.taskTypeKey)
+      if (this.dataList.taskTypeKey == 1) {
+        this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
+      } else if (this.dataList.taskTypeKey == 2) {
+        this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
+      } else if (this.dataList.taskTypeKey == 3) {
+        var random = this.getdate() + this.MathRand()
+        this.inOutTaskNo = 'YKC' + random
+        this.inOutTaskNo1 = 'YKR' + random
         //   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
-					this.inOutTaskNo1 = 'TCR' + random
-				}
-				localStorage.removeItem('warehouse')
-				localStorage.removeItem('contractNo');
-            	localStorage.removeItem('taskTypeKey');
-				localStorage.removeItem('inOutType')
-				localStorage.removeItem('inOutTypeKey')
-				localStorage.removeItem('contractNo')
-				localStorage.removeItem('goodsName')
-				localStorage.removeItem('goodsNameKey')
-				localStorage.removeItem('weight')
-			},
-			tasktypechange(e) {
-				localStorage.setItem('taskTypeKey',e)
-				console.log('localStorage.getItem(\'taskTypeKey\')',localStorage.getItem('taskTypeKey'))
-				
-				if (!this.$route.query.relevanceId) {
-					this.tasknumber1()
-				}
-				this.dataList1.taskTypeKey = e
-				if (this.dataList.taskTypeKey == 1) {
-					this.dataList.inOutType = '销售出库'
-					this.dataList.inOutTypeKey = '1'
-					this.flag = 1
-				}
-				if (this.dataList1.taskTypeKey == 2) {
-					this.dataList1.inOutType = '采购入库'
-					this.dataList1.inOutTypeKey = '1'
-					this.flag = 8
-				} else if (this.dataList1.taskTypeKey == 3) {
-					this.disabled = true
-					this.gradestatus=false
-					this.dataList1.inOutType = '移库入库'
-					this.dataList1.inOutTypeKey = '3'
-					this.dataList.inOutType = '移库出库'
-					this.dataList.inOutTypeKey = '3'
-				} else if (this.dataList1.taskTypeKey == 4) {
-					this.disabled = true
-					this.dataList1.inOutType = '退库'
-					this.dataList1.inOutTypeKey = '6'
-					this.dataList.inOutType = '销售出库'
-					this.flag = 2
-					this.dataList.inOutTypeKey = '1'
-				}
-			},
-			GetRandomNum(Min, Max) {
-				var Range = Max - Min
-				var Rand = Math.random()
-				return Min + Math.round(Rand * Range)
-			},
-			getList() {
-				if(localStorage.getItem('taskTypeKey')){
-					this.dataList.taskTypeKey =localStorage.getItem('taskTypeKey')
-				}
-				this.tasknumber()
-				if(localStorage.getItem('taskTypeKey')){
-					if(localStorage.getItem('taskTypeKey') == 1){
-						if(localStorage.getItem('inOutType')){
-							this.$set(this.dataList, 'inOutType', localStorage.getItem('inOutType'))
-							this.$set(this.dataList, 'inOutTypeKey', localStorage.getItem('inOutTypeKey'))
-						}else{
-							this.$set(this.dataList, 'inOutType', '销售出库')
-							this.$set(this.dataList, 'inOutTypeKey', '1')
-						}
-						this.$set(this.dataList, 'goodsName', '玉米')
-						this.$set(this.dataList, 'goodsNameKey', '1')
-						this.$set(this.dataList1, 'goodsName', '玉米')
-						this.$set(this.dataList1, 'goodsNameKey', '1')
-						this.flag = 1
-					}else if(localStorage.getItem('taskTypeKey') == 2){
-						if(localStorage.getItem('inOutType')){
-							this.$set(this.dataList1, 'inOutType', localStorage.getItem('inOutType'))
-							this.$set(this.dataList1, 'inOutTypeKey', localStorage.getItem('inOutTypeKey'))
-						}else{
-							this.$set(this.dataList1, 'inOutType', '采购入库')
-							this.$set(this.dataList1, 'inOutTypeKey', '2')
-						}
-						this.flag = 8
-					}else if(localStorage.getItem('taskTypeKey') == 3){
-						this.$set(this.dataList, 'inOutType', '移库出库')
-						this.$set(this.dataList, 'inOutTypeKey', '3')
-						this.$set(this.dataList1, 'inOutType', '移库入库')
-						this.$set(this.dataList1, 'inOutTypeKey', '3')
-					}else if(localStorage.getItem('taskTypeKey') == 4){
-						this.$set(this.dataList, 'inOutType', '销售出库')
-						this.$set(this.dataList, 'inOutTypeKey', '4')
-						this.$set(this.dataList1, 'inOutType', '退库')
-						this.$set(this.dataList1, 'inOutTypeKey', '4')
-						this.flag = 2
-					}
-					this.$set(this.dataList, 'grade', '一等品')
-					this.$set(this.dataList, 'gradeKey', '1')
-					this.$set(this.dataList1, 'grade', '一等品')
-					this.$set(this.dataList1, 'gradeKey', '1')
-				}else{
-					this.$set(this.dataList, 'inOutType', '销售出库')
-					this.$set(this.dataList, 'inOutTypeKey', '1')
-					this.$set(this.dataList, 'goodsName', '玉米')
-					this.$set(this.dataList, 'goodsNameKey', '1')
-					this.$set(this.dataList, 'grade', '一等品')
-					this.$set(this.dataList, 'gradeKey', '1')
-					this.$set(this.dataList1, 'goodsName', '玉米')
-					this.$set(this.dataList1, 'goodsNameKey', '1')
-					this.$set(this.dataList1, 'grade', '一等品')
-					this.$set(this.dataList1, 'gradeKey', '1')
-				}
-				
-				// 货名
-				pullDown({
-						constId: 'CON2'
-					})
-					.toPromise()
-					.then(response => {
-						this.goodnameList = response
-					})
-				// 品级
-				pullDown({
-						constId: 'CON3'
-					})
-					.toPromise()
-					.then(response => {
-						this.gradeList = response
-					})
-				pullDown({
-						constId: 'CON6'
-					})
-					.toPromise()
-					.then(response => {
-						this.storageType = response
-					})
-				pullDown({
-						constId: 'CON5'
-					})
-					.toPromise()
-					.then(response => {
-						this.storageType1 = response
-					})
-				xialaNo({
-						compId: this.compId,
-						flag: this.flag
-					})
-					.toPromise()
-					.then(response => {
-						this.contractNoList = response
-						// this.contractNoList1 = response
-					})
-				// //临时仓库入库类型
-				// pullDown({ constId: 'WARE1' })
-				//   .toPromise()
-				//   .then((response) => {
-				//     this.storageType = respons
-				//   })
-				// //临时仓库出库类型
-				// pullDown({ constId: 'WARE2' })
-				//   .toPromise()
-				//   .then((response) => {
-				//     this.deliveryType = response
-				//   })
-				//仓库名
-				getwarehousename({
-						compId: this.compId,
-						warehouseType: 1
-					})
-					.toPromise()
-					.then(response => {
-						this.warehouseNameList = response
-						getwarehousename({
-								compId: this.compId,
-								warehouseType: 2
-							})
-							.toPromise()
-							.then(response => {
-								console.log('查仓库sss',response)
-								for (var i = 0; i < response.length; i++) {
-									this.warehouseNameList.push(response[i])
-								}
-							})
-					})
-			},
-			selecttaskType(e) {
-				for (var i = 0; i < this.taskTypeList.length; i++) {
-					if (this.taskTypeList[i].value == e) {
-						this.searchType = this.taskTypeList[i].type
-					}
-				}
-			},
-			fujian(row) {
-				if (
-					row.receiveAttachmentPath === null ||
-					row.receiveAttachmentPath === ''
-				) {
-					EventBus.$emit(
-						'warning',
-						this.$t('system.noticeCircular.NoInformation')
-					)
-				} else {
-					this.accessoryTFs = true
-				}
-				this.appendixIdss = row.receiveAttachmentPath
-			},
-			handleExamine(row) {
-				this.$router.push({
-					name: 'salesContractExamine',
-					query: {
-						id: row.id
-					}
-				})
-			},
+        //    this.dataList1.moveTaskNo = 'YKRW' + random
+      } else if (this.dataList.taskTypeKey == 4) {
+        var random = this.getdate() + this.MathRand()
+        this.inOutTaskNo = 'TCC' + random
+        this.inOutTaskNo1 = 'TCR' + random
+      }
+      localStorage.removeItem('warehouse')
+      localStorage.removeItem('contractNo')
+      localStorage.removeItem('taskTypeKey')
+      localStorage.removeItem('inOutType')
+      localStorage.removeItem('inOutTypeKey')
+      localStorage.removeItem('contractNo')
+      localStorage.removeItem('goodsName')
+      localStorage.removeItem('goodsNameKey')
+      localStorage.removeItem('weight')
+    },
+    tasktypechange(e) {
+      localStorage.setItem('taskTypeKey', e)
+      console.log(
+        "localStorage.getItem('taskTypeKey')",
+        localStorage.getItem('taskTypeKey')
+      )
+
+      if (!this.$route.query.relevanceId) {
+        this.tasknumber1()
+      }
+      this.dataList1.taskTypeKey = e
+      if (this.dataList.taskTypeKey == 1) {
+        this.dataList.inOutType = '销售出库'
+        this.dataList.inOutTypeKey = '1'
+        this.flag = 1
+      }
+      if (this.dataList1.taskTypeKey == 2) {
+        this.dataList1.inOutType = '采购入库'
+        this.dataList1.inOutTypeKey = '1'
+        this.flag = 8
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.disabled = true
+        this.gradestatus = false
+        this.dataList1.inOutType = '移库入库'
+        this.dataList1.inOutTypeKey = '3'
+        this.dataList.inOutType = '移库出库'
+        this.dataList.inOutTypeKey = '3'
+      } else if (this.dataList1.taskTypeKey == 4) {
+        this.disabled = true
+        this.dataList1.inOutType = '退库'
+        this.dataList1.inOutTypeKey = '6'
+        this.dataList.inOutType = '销售出库'
+        this.flag = 2
+        this.dataList.inOutTypeKey = '1'
+      }
+    },
+    GetRandomNum(Min, Max) {
+      var Range = Max - Min
+      var Rand = Math.random()
+      return Min + Math.round(Rand * Range)
+    },
+    getList() {
+      if (localStorage.getItem('taskTypeKey')) {
+        this.dataList.taskTypeKey = localStorage.getItem('taskTypeKey')
+      }
+      this.tasknumber()
+      if (localStorage.getItem('taskTypeKey')) {
+        if (localStorage.getItem('taskTypeKey') == 1) {
+          if (localStorage.getItem('inOutType')) {
+            this.$set(
+              this.dataList,
+              'inOutType',
+              localStorage.getItem('inOutType')
+            )
+            this.$set(
+              this.dataList,
+              'inOutTypeKey',
+              localStorage.getItem('inOutTypeKey')
+            )
+          } else {
+            this.$set(this.dataList, 'inOutType', '销售出库')
+            this.$set(this.dataList, 'inOutTypeKey', '1')
+          }
+          this.$set(this.dataList, 'goodsName', '玉米')
+          this.$set(this.dataList, 'goodsNameKey', '1')
+          this.$set(this.dataList1, 'goodsName', '玉米')
+          this.$set(this.dataList1, 'goodsNameKey', '1')
+          this.flag = 1
+        } else if (localStorage.getItem('taskTypeKey') == 2) {
+          if (localStorage.getItem('inOutType')) {
+            this.$set(
+              this.dataList1,
+              'inOutType',
+              localStorage.getItem('inOutType')
+            )
+            this.$set(
+              this.dataList1,
+              'inOutTypeKey',
+              localStorage.getItem('inOutTypeKey')
+            )
+          } else {
+            this.$set(this.dataList1, 'inOutType', '采购入库')
+            this.$set(this.dataList1, 'inOutTypeKey', '2')
+          }
+          this.flag = 8
+        } else if (localStorage.getItem('taskTypeKey') == 3) {
+          this.$set(this.dataList, 'inOutType', '移库出库')
+          this.$set(this.dataList, 'inOutTypeKey', '3')
+          this.$set(this.dataList1, 'inOutType', '移库入库')
+          this.$set(this.dataList1, 'inOutTypeKey', '3')
+        } else if (localStorage.getItem('taskTypeKey') == 4) {
+          this.$set(this.dataList, 'inOutType', '销售出库')
+          this.$set(this.dataList, 'inOutTypeKey', '4')
+          this.$set(this.dataList1, 'inOutType', '退库')
+          this.$set(this.dataList1, 'inOutTypeKey', '4')
+          this.flag = 2
+        }
+        this.$set(this.dataList, 'grade', '一等品')
+        this.$set(this.dataList, 'gradeKey', '1')
+        this.$set(this.dataList1, 'grade', '一等品')
+        this.$set(this.dataList1, 'gradeKey', '1')
+      } else {
+        this.$set(this.dataList, 'inOutType', '销售出库')
+        this.$set(this.dataList, 'inOutTypeKey', '1')
+        this.$set(this.dataList, 'goodsName', '玉米')
+        this.$set(this.dataList, 'goodsNameKey', '1')
+        this.$set(this.dataList, 'grade', '一等品')
+        this.$set(this.dataList, 'gradeKey', '1')
+        this.$set(this.dataList1, 'goodsName', '玉米')
+        this.$set(this.dataList1, 'goodsNameKey', '1')
+        this.$set(this.dataList1, 'grade', '一等品')
+        this.$set(this.dataList1, 'gradeKey', '1')
+      }
+
+      // 货名
+      pullDown({
+        constId: 'CON2'
+      })
+        .toPromise()
+        .then(response => {
+          this.goodnameList = response
+        })
+      // 品级
+      pullDown({
+        constId: 'CON3'
+      })
+        .toPromise()
+        .then(response => {
+          this.gradeList = response
+        })
+      pullDown({
+        constId: 'CON6'
+      })
+        .toPromise()
+        .then(response => {
+          this.storageType = response
+        })
+      pullDown({
+        constId: 'CON5'
+      })
+        .toPromise()
+        .then(response => {
+          this.storageType1 = response
+        })
+      xialaNo({
+        compId: this.compId,
+        flag: this.flag
+      })
+        .toPromise()
+        .then(response => {
+          this.contractNoList = response
+          // this.contractNoList1 = response
+        })
+      // //临时仓库入库类型
+      // pullDown({ constId: 'WARE1' })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.storageType = respons
+      //   })
+      // //临时仓库出库类型
+      // pullDown({ constId: 'WARE2' })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.deliveryType = response
+      //   })
+      //仓库名
+      getwarehousename({
+        compId: this.compId,
+        warehouseType: 1
+      })
+        .toPromise()
+        .then(response => {
+          this.warehouseNameList = response
+          getwarehousename({
+            compId: this.compId,
+            warehouseType: 2
+          })
+            .toPromise()
+            .then(response => {
+              console.log('查仓库sss', response)
+              for (var i = 0; i < response.length; i++) {
+                this.warehouseNameList.push(response[i])
+              }
+            })
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: {
+          id: row.id
+        }
+      })
+    },
 
-			// 关闭 dialog时 处理文件url 初始化upload组件
-			handleCloe() {
-				this.dialogViewSpareMoney = false
-			},
-			history(row) {
-				console.log(row)
-				billoperatehis({
-						id: row.id
-					})
-					.toPromise()
-					.then(response => {
-						this.historyList = response
-					})
-			}
-		}
-	}
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({
+        id: row.id
+      })
+        .toPromise()
+        .then(response => {
+          this.historyList = response
+        })
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
-	/deep/.basicInformation {
-		.el-info-table {
-			border: none;
-			position: relative;
-		}
+/deep/.basicInformation {
+  .el-info-table {
+    border: none;
+    position: relative;
+  }
 
-		.el-form-item {
-			width: 33.3333%;
-			border: none;
-			margin: 0;
+  .el-form-item {
+    width: 33.3333%;
+    border: none;
+    margin: 0;
 
-			.el-form-item__label {
-				text-align: left;
-				font-size: 14px;
-				font-family: PingFangSC-Regular, PingFang SC;
-				font-weight: 400;
-				color: #8890b1;
-			}
+    .el-form-item__label {
+      text-align: left;
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #8890b1;
+    }
 
-			.el-form-item__content {
-				padding-left: 0px;
-				padding-right: 10px;
-				// background: #fff;
-				white-space: nowrap;
-				height: 40px;
-				display: flex;
-				-webkit-box-align: center;
-				align-items: center;
-				text-align: left;
-				overflow: hidden;
-			}
-		}
-	}
+    .el-form-item__content {
+      padding-left: 0px;
+      padding-right: 10px;
+      // background: #fff;
+      white-space: nowrap;
+      height: 40px;
+      display: flex;
+      -webkit-box-align: center;
+      align-items: center;
+      text-align: left;
+      overflow: hidden;
+    }
+  }
+}
 
-	/deep/.el-radio {
-		color: #606266;
-		font-weight: 500;
-		line-height: 1;
-		cursor: pointer;
-		white-space: nowrap;
-		outline: 0;
-		margin-right: 30px;
-		margin-top: 15px;
-	}
+/deep/.el-radio {
+  color: #606266;
+  font-weight: 500;
+  line-height: 1;
+  cursor: pointer;
+  white-space: nowrap;
+  outline: 0;
+  margin-right: 30px;
+  margin-top: 15px;
+}
 
-	/deep/.el-radio__inner {
-		border: 1px solid #dcdfe6;
-		border-radius: 100%;
-		width: 14px;
-		height: 14px;
-		background-color: #fff;
-		cursor: pointer;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		margin-left: 100px;
-	}
+/deep/.el-radio__inner {
+  border: 1px solid #dcdfe6;
+  border-radius: 100%;
+  width: 14px;
+  height: 14px;
+  background-color: #fff;
+  cursor: pointer;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-left: 100px;
+}
 
-	/deep/.el-radio__input {
-		white-space: nowrap;
-		cursor: pointer;
-		outline: 0;
-		line-height: 1;
-		vertical-align: middle;
-		margin-top: -1px;
-	}
+/deep/.el-radio__input {
+  white-space: nowrap;
+  cursor: pointer;
+  outline: 0;
+  line-height: 1;
+  vertical-align: middle;
+  margin-top: -1px;
+}
 
-	.title {
-		position: relative;
-		padding-left: 10px;
-	}
+.title {
+  position: relative;
+  padding-left: 10px;
+}
 
-	.title::before {
-		content: '';
-		display: inline-block;
-		width: 5px;
-		height: 30px;
-		background: #5473e8;
-		position: absolute;
-		left: 0;
-	}
+.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-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
 
-	.el-col {
-		background: #f6f7fc;
-	}
+.el-col {
+  background: #f6f7fc;
+}
 
-	.bg-right {
-		text-align: right;
-		padding: 16px 20px;
-	}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
 
-	.center {
-		position: relative;
-		top: 50px;
-		width: 40%;
-		margin: 0 auto;
-		margin-right: 180px;
-	}
+.center {
+  position: relative;
+  top: 50px;
+  width: 40%;
+  margin: 0 auto;
+  margin-right: 180px;
+}
 
-	/deep/.el-form-item__label {
-		width: 160px;
-	}
+/deep/.el-form-item__label {
+  width: 160px;
+}
 
-	.inspector {
-		width: 50%;
-	}
+.inspector {
+  width: 50%;
+}
 
-	/deep/.el-form-item--small .el-form-item__label,
-	.el-form-item--small .el-form-item__content {
-		text-align: left;
-	}
+/deep/.el-form-item--small .el-form-item__label,
+.el-form-item--small .el-form-item__content {
+  text-align: left;
+}
 
-	/deep/.el-input--small {
-		font-size: 13px;
-		position: relative;
-		display: inline-block;
-	}
+/deep/.el-input--small {
+  font-size: 13px;
+  position: relative;
+  display: inline-block;
+}
 
-	.center1 .small-title {
-		margin-left: 323px;
-	}
+.center1 .small-title {
+  margin-left: 323px;
+}
 
-	.center1 {
-		width: 90%;
-		margin: 0 auto;
-		margin-left: 10px;
-		margin-top: 25px;
-	}
+.center1 {
+  width: 90%;
+  margin: 0 auto;
+  margin-left: 10px;
+  margin-top: 25px;
+}
 
-	/deep/.el-input--small .el-input__inner {
-		height: 32px;
-		line-height: 32px;
-	}
+/deep/.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
 
-	/deep/.el-select {
-		display: inline-block;
-		position: relative;
-		width: 100%;
-	}
+/deep/.el-select {
+  display: inline-block;
+  position: relative;
+  width: 100%;
+}
 
-	.annu {
-		height: 81px;
-		background: #ffffff;
-		border-radius: 4px;
-	}
+.annu {
+  height: 81px;
+  background: #ffffff;
+  border-radius: 4px;
+}
 
-	.basicInformation .el-form-item {
-		width: 50.3333%;
-		border: none;
-		margin: 0;
-	}
+.basicInformation .el-form-item {
+  width: 50.3333%;
+  border: none;
+  margin: 0;
+}
 
-	.huom {
-		width: 100%;
-	}
-	.a {
-		margin-left: -32px;
-	}
-	.ding {
-		height: 23px;
-		background: #e8ecf6;
-		box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
-	}
-	.el-radio-group {
-		font-size: 0;
-		margin-top: 20px;
-		margin-left: 251px;
-	}
+.huom {
+  width: 100%;
+}
+.a {
+  margin-left: -32px;
+}
+.ding {
+  height: 23px;
+  background: #e8ecf6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.el-radio-group {
+  font-size: 0;
+  margin-top: 20px;
+  margin-left: 251px;
+}
 
-	/deep/.el-form {
-		padding: 0 15%;
-		display: -webkit-box;
-		display: -ms-flexbox;
-		display: flex;
-		-ms-flex-wrap: wrap;
-		flex-wrap: wrap;
-		margin-left: 130px;
-		margin-top: 15px;
-		width: 100%;
-		font-size: 14px;
-		font-family: PingFangSC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #8890b1;
-		line-height: 16px;
-	}
+/deep/.el-form {
+  padding: 0 15%;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  margin-left: 130px;
+  margin-top: 15px;
+  width: 100%;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
 </style>

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

@@ -1,621 +1,624 @@
 import Layout from '@/layout/index';
 
 const warehouseManagementRouter = {
-  path: '/warehouse',
-  component: Layout,
-  redirect: { name: 'warehouseManagementList' },
-  name: 'warehouseManagementList',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'warehouseManagementList',
-    module: 'warehouseManagement.warehouse.warehouseInfo',
-    icon: '-cangkubeifen'
-  },
-  children: [
-    {
-      path: 'warehousingOrder',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehousingOrder'),
-      name: 'warehousingOrder',
-      meta: {
-        title: 'warehousingOrder',
-        shortcutEntrance: 'warehousingOrder',
-        module: 'warehouseManagement.warehousingOrder',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库单'
-        // module: 'procurement.sparepart.applDetail'
-      },
-    },
-    {
-      path: 'warehouseManagementList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementList'),
-      name: 'warehouseManagementList',
-      meta: {
+    path: '/warehouse',
+    component: Layout,
+    redirect: { name: 'warehouseManagementList' },
+    name: 'warehouseManagementList',
+    alwaysShow: true, // will always show the root menu
+    meta: {
         title: 'warehouseManagementList',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'仓库管理'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
-    // {
-    //   path: 'costmanagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/costmanagement'),
-    //   name: 'warehouseManagementList',
-    //   meta: {
-    //     title: 'costmanagement',
-    //     shortcutEntrance: 'warehouseManagementList',
-    //     module: 'warehouseManagement.costControl.View',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    // },
-    {
-      path: 'warehouselocation',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouselocation'),
-      name: 'warehouselocation',
-      meta: {
-        title: 'warehouselocation',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'库点费用'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true
-    },
-    {
-      path: 'warehouseManagement',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagement'),
-      name: 'warehouseManagement',
-      meta: {
-        title: 'warehouseManagement',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'全部仓库'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true
-    },
-    {
-      path: 'weightedsubsidiary',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/weightedsubsidiary'),
-      name: 'weightedsubsidiary',
-      meta: {
-        title: 'weightedsubsidiary',
-        shortcutEntrance: 'warehouseManagementList',
         module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'加权明细'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true
-    },
-    {
-      path: 'warehouseNewManagementAdd',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementAdd'),
-      name: 'warehouseManagementAdd',
-      meta: {
-        title: 'warehouseManagementAdd',
-        shortcutEntrance: 'warehouseManagementAdd',
-        module: 'warehouseManagement.warehouse.warehouseInfo.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'添加仓库'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
+        icon: '-cangkubeifen'
+    },
+    children: [
+        {
+            path: 'warehousingOrder',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehousingOrder'),
+            name: 'warehousingOrder',
+            meta: {
+                title: 'warehousingOrder',
+                shortcutEntrance: 'warehousingOrder',
+                module: 'warehouseManagement.warehousingOrder',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库单'
+                // module: 'procurement.sparepart.applDetail'
+            },
+        },
+        {
+            path: 'warehouseManagementList',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementList'),
+            name: 'warehouseManagementList',
+            meta: {
+                title: 'warehouseManagementList',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '仓库管理'
+                // module: 'procurement.sparepart.applDetail'
+            }
+        },
+        // {
+        //   path: 'costmanagement',
+        //   component: () =>
+        //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/costmanagement'),
+        //   name: 'warehouseManagementList',
+        //   meta: {
+        //     title: 'costmanagement',
+        //     shortcutEntrance: 'warehouseManagementList',
+        //     module: 'warehouseManagement.costControl.View',
+        //     permissicon: [],
+        //     keepAlive: true
+        //     // module: 'procurement.sparepart.applDetail'
+        //   },
+        // },
+        {
+            path: 'warehouselocation',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouselocation'),
+            name: 'warehouselocation',
+            meta: {
+                title: 'warehouselocation',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '库点费用'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagement',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagement'),
+            name: 'warehouseManagement',
+            meta: {
+                title: 'warehouseManagement',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '全部仓库'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'weightedsubsidiary',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/weightedsubsidiary'),
+            name: 'weightedsubsidiary',
+            meta: {
+                title: 'weightedsubsidiary',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '加权明细'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseNewManagementAdd',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementAdd'),
+            name: 'warehouseManagementAdd',
+            meta: {
+                title: 'warehouseManagementAdd',
+                shortcutEntrance: 'warehouseManagementAdd',
+                module: 'warehouseManagement.warehouse.warehouseInfo.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '添加仓库'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
 
-    {
-      path: 'warehouseNewManagementEdit',
-             
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementEdit'),
-      name: 'warehouseManagementEdit',
-      meta: {
-        title: 'warehouseManagementEdit',
-        shortcutEntrance: 'warehouseManagementEdit',
-        module: 'warehouseManagement.warehouse.warehouseInfo.edit',
-        permissicon: [],
-        keepAlive: true,
-        _title:'编辑仓库'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseNewManagementLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementLook'),
-      name: 'warehouseManagementLookNew',
-      meta: {
-        title: 'warehouseManagementLook',
-        shortcutEntrance: 'warehouseManagementLook',
-        module: 'warehouseManagement.warehouse.warehouseInfo.view',
+        {
+            path: 'warehouseNewManagementEdit',
 
-        permissicon: [],
-        keepAlive: true,
-        _title:'查看仓库详情'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementMintor',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementMintor'),
-      name: 'warehouseManagementMintor',
-      meta: {
-        title: 'warehouseManagementMintor',
-        shortcutEntrance: 'warehouseManagementMintor',
-        module: 'warehouseManagement.warehouse.warehouseInfo.view',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementEdit'),
+            name: 'warehouseManagementEdit',
+            meta: {
+                title: 'warehouseManagementEdit',
+                shortcutEntrance: 'warehouseManagementEdit',
+                module: 'warehouseManagement.warehouse.warehouseInfo.edit',
+                permissicon: [],
+                keepAlive: true,
+                _title: '编辑仓库'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseNewManagementLook',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementLook'),
+            name: 'warehouseManagementLookNew',
+            meta: {
+                title: 'warehouseManagementLook',
+                shortcutEntrance: 'warehouseManagementLook',
+                module: 'warehouseManagement.warehouse.warehouseInfo.view',
 
-        permissicon: [],
-        keepAlive: true,
-        _title:'查看监控'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
+                permissicon: [],
+                keepAlive: true,
+                _title: '查看仓库详情'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementMintor',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementMintor'),
+            name: 'warehouseManagementMintor',
+            meta: {
+                title: 'warehouseManagementMintor',
+                shortcutEntrance: 'warehouseManagementMintor',
+                module: 'warehouseManagement.warehouse.warehouseInfo.view',
 
-      path: 'warehouseManagementPut',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPut'),
-      name: 'warehouseManagementPut',
-      meta: {
-        title: 'warehouseManagementPut',
-        shortcutEntrance: 'warehouseManagementPut',
-        module: 'warehouseManagement.warehouse.warehouseInfo.in',
-        _title:'入库登记'
-      },
-      hidden: true
-    },
-    
-    {
+                permissicon: [],
+                keepAlive: true,
+                _title: '查看监控'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
 
-      path: 'warehouseManagementGross',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementGross'),
-      name: 'warehouseManagementGross',
-      meta: {
-        title: 'warehouseManagementGross',
-        shortcutEntrance: 'warehouseManagementGross',
-        module: 'warehouseManagement.warehouse.warehouseInfo.in',
-      },
-      hidden: true
-    },
-    {
+            path: 'warehouseManagementPut',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPut'),
+            name: 'warehouseManagementPut',
+            meta: {
+                title: 'warehouseManagementPut',
+                shortcutEntrance: 'warehouseManagementPut',
+                module: 'warehouseManagement.warehouse.warehouseInfo.in',
+                _title: '入库登记'
+            },
+            hidden: true
+        },
 
-      path: 'warehouseManagementTare',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementTare'),
-      name: 'warehouseManagementTare',
-      meta: {
-        title: 'warehouseManagementTare',
-        shortcutEntrance: 'warehouseManagementTare',
-        module: 'warehouseManagement.warehouse.warehouseInfo.in',
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementDelete',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementDelete'),
-      name: 'warehouseManagementDelete',
-      meta: {
-        title: 'warehouseManagementDelete',
-        shortcutEntrance: 'warehouseManagementDelete',
-        module: 'warehouseManagement.warehouse.warehouseInfo.delete',
+        {
 
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-  
-    {
-      path: 'warehouseManagementDelivery',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementDelivery'),
-      name: 'warehouseManagementDelivery',
-      meta: {
-        title: 'warehouseManagementDelivery',
-        shortcutEntrance: 'warehouseManagementDelivery',
-        module: 'warehouseManagement.warehouse.warehouseInfo.out',
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseNewManagementIoss',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementIoss'),
-      name: 'warehouseManagementIoss',
-      meta: {
-        title: 'warehouseManagementIoss',
-        shortcutEntrance: 'warehouseManagementIoss',
-        module: 'warehouseManagement.warehouse.warehouseInfo.debit',
-        permissicon: [],
-        keepAlive: true,
-        _title:'仓库管理盘损'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
+            path: 'warehouseManagementGross',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementGross'),
+            name: 'warehouseManagementGross',
+            meta: {
+                title: 'warehouseManagementGross',
+                shortcutEntrance: 'warehouseManagementGross',
+                module: 'warehouseManagement.warehouse.warehouseInfo.in',
+            },
+            hidden: true
+        },
+        {
 
-    {
-      path: 'warehouseManagementIossRecord',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementIossRecord'),
-      name: 'warehouseManagementIossRecord',
-      meta: {
-        title: 'warehouseManagementIossRecord',
-        shortcutEntrance: 'warehouseManagementIossRecord',
-        module: 'warehouseManagement.warehouse.warehouseInfo.debit',
+            path: 'warehouseManagementTare',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementTare'),
+            name: 'warehouseManagementTare',
+            meta: {
+                title: 'warehouseManagementTare',
+                shortcutEntrance: 'warehouseManagementTare',
+                module: 'warehouseManagement.warehouse.warehouseInfo.in',
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementDelete',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementDelete'),
+            name: 'warehouseManagementDelete',
+            meta: {
+                title: 'warehouseManagementDelete',
+                shortcutEntrance: 'warehouseManagementDelete',
+                module: 'warehouseManagement.warehouse.warehouseInfo.delete',
 
-        permissicon: [],
-        keepAlive: true,
-        _title:'盘损记录'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
+                permissicon: [],
+                keepAlive: true
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
 
-    {
-      path: 'warehouseNewManagementRecord',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementRecord'),
-      name: 'warehouseManagementRecord',
-      meta: {
-        title: 'warehouseManagementRecord',
-        shortcutEntrance: 'warehouseManagementRecord',
-        module: 'warehouseManagement.warehouse.warehouseInfo.view',
+        {
+            path: 'warehouseManagementDelivery',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementDelivery'),
+            name: 'warehouseManagementDelivery',
+            meta: {
+                title: 'warehouseManagementDelivery',
+                shortcutEntrance: 'warehouseManagementDelivery',
+                module: 'warehouseManagement.warehouse.warehouseInfo.out',
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseNewManagementIoss',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementIoss'),
+            name: 'warehouseManagementIoss',
+            meta: {
+                title: 'warehouseManagementIoss',
+                shortcutEntrance: 'warehouseManagementIoss',
+                module: 'warehouseManagement.warehouse.warehouseInfo.debit',
+                permissicon: [],
+                keepAlive: true,
+                _title: '仓库管理盘损'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
 
-        permissicon: [],
-        keepAlive: true,
-        _title:'仓库记录'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementNoWeight',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoWeight'),
-      name: 'warehouseManagementNoWeight',
-      meta: {
-        title: 'warehouseManagementNoWeight',
-        shortcutEntrance: 'warehouseManagementNoWeight',
-        module: 'warehouseManagement.warehouse.warehouseInfo.view',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden:true
-    },
-    {
-      path: 'warehouseManagementNoComplete',
-            
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoComplete'),
-      name: 'warehouseManagementNoComplete',
-      meta: {
-        title: 'warehouseManagementNoComplete',
-        shortcutEntrance: 'warehouseManagementNoComplete',
-        module: 'warehouseManagement.warehouse.warehouseInfo.view',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden:true
-    },
-    {
-      path: 'warehouseManagementPerfectput',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPerfectput'),
-      name: 'warehouseManagementPerfectput',
-      meta: {
-        title: 'warehouseManagementPerfectput',
-        shortcutEntrance: 'warehouseManagementPerfectput',
-        module: 'warehouseManagement.warehouse.warehouseInfo.in',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementNoWeightIn',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoWeightIn'),
-      name: 'warehouseManagementNoWeightIn',
-      meta: {
-        title: 'warehouseManagementNoWeightIn',
-        shortcutEntrance: 'warehouseManagementNoWeightIn',
-        module: 'warehouseManagement.warehouse.warehouseInfo.in',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementPerfectDelivery',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPerfectDelivery'),
-      name: 'warehouseManagementPerfectDelivery',
-      meta: {
-        title: 'warehouseManagementPerfectDelivery',
-        shortcutEntrance: 'warehouseManagementPerfectDelivery',
-        module: 'warehouseManagement.warehouse.warehouseInfo.out',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementNoWeightOut',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoWeightOut'),
-      name: 'warehouseManagementNoWeightOut',
-      meta: {
-        title: 'warehouseManagementNoWeightOut',
-        shortcutEntrance: 'warehouseManagementNoWeightOut',
-        module: 'warehouseManagement.warehouse.warehouseInfo.out',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    // 出入库任务
-    {
-      path: 'warehouseManagementPutOut',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPutOut'),
-      name: 'warehouseManagementPutOut',
-      meta: {
-        title: 'warehouseManagementPutOut',
-        shortcutEntrance: 'warehouseManagementPutOut',
-        module: 'warehouse.warehouseManagementPutOut',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    // 出入库任务查看
-    {
-      path: 'warehouseManagementPutOutLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPutOutLook'),
-      name: 'warehouseManagementPutOutLook',
-      meta: {
-        title: 'warehouseManagementPutOutLook',
-        shortcutEntrance: 'warehouseManagementPutOutLook',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: false
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    }, 
-    // 出入库任务列表
-    {
-      path: 'tranManagementWarehouseInOutTask',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/tranManagementWarehouseInOutTask'),
-      name: 'tranManagementWarehouseInOutTask',
-      meta: {
-        title: 'tranManagementWarehouseInOutTask',
-        shortcutEntrance: 'tranManagementWarehouseInOutTask',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },  
-    // 折转
-    {
-      path: 'transformation',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/transformation'),
-      name: 'transformation',
-      meta: {
-        title: 'transformation',
-        shortcutEntrance: 'transformation',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'仓库管理折转'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },  
-    
-    {
-      path: 'inventoryCheck',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/inventoryCheck'),
-      name: 'inventoryCheck',
-      meta: {
-        title: 'inventoryCheck',
-        shortcutEntrance: 'inventoryCheck',
-        module: 'warehouseManagement.warehousingOrder',
-        permissicon: [],
-        keepAlive: true,
-        _title:'库存盘点'
-        // module: 'procurement.sparepart.applDetail'
-      },
-    },
-    {
-      path: 'dryWarehousing',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/dryWarehousing'),
-      name: 'dryWarehousing',
-      meta: {
-        title: 'dryWarehousing',
-        shortcutEntrance: 'dryWarehousing',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'烘干入库'
-      },
-      hidden: true
-    },
-    {
-      path: 'addCar',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/addCar'),
-      name: 'addCar',
-      meta: {
-        title: 'addCar',
-        shortcutEntrance: 'addCar',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'常用车辆'
-      },
-      hidden: true
-    },
-    {
-      path: 'dryRecord',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/dryRecord'),
-      name: 'dryRecord',
-      meta: {
-        title: 'dryRecord',
-        shortcutEntrance: 'dryRecord',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库记录'
-      },
-      hidden: true
-    },
-    {
-      path: 'awaitRansom',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/awaitRansom'),
-      name: 'awaitRansom',
-      meta: {
-        title: 'awaitrAnsom',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'待赎回'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true
-    },
-    {
-      path: 'gooddetail',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/gooddetail'),
-      name: 'gooddetail',
-      meta: {
-        title: 'gooddetail',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'货权明细'
-        // module: 'procurement.sparepart.applDetail'
-      },
-    },
-    {
-      path: 'inspectionRecords',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/inspectionRecords'),
-      name: 'inspectionRecords',
-      meta: {
-        title: 'inspectionRecords',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'巡检记录'
-        // module: 'procurement.sparepart.applDetail'
-      },
-    },
-    {
-      path: 'customerrecord',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/customerrecord'),
-      name: 'customerrecord',
-      meta: {
-        title: 'customerrecord',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'客户操作记录'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true
-    },
-    {
-      path: 'goodsrollIn',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/goodsrollIn'),
-      name: 'goodsrollIn',
-      meta: {
-        title: 'goodsrollIn',
-        shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'货权转入'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true
-    },
-    {
-      path: 'materialInOutWarehouse',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/materialInOutWarehouse'),
-      name: 'materialInOutWarehouse',
-      meta: {
-        title: 'materialInOutWarehouse',
-        shortcutEntrance: 'materialInOutWarehouse',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'物料出入库'
-      },
-      hidden: true
-    },
-    {
-      path: 'materialInOutRecord',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/materialInOutRecord'),
-      name: 'materialInOutRecord',
-      meta: {
-        title: 'materialInOutRecord',
-        shortcutEntrance: 'materialInOutRecord',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'物料出入库记录'
-      },
-      hidden: true
-    },
-  ],
+        {
+            path: 'warehouseManagementIossRecord',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementIossRecord'),
+            name: 'warehouseManagementIossRecord',
+            meta: {
+                title: 'warehouseManagementIossRecord',
+                shortcutEntrance: 'warehouseManagementIossRecord',
+                module: 'warehouseManagement.warehouse.warehouseInfo.debit',
+
+                permissicon: [],
+                keepAlive: true,
+                _title: '盘损记录'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+
+        {
+            path: 'warehouseNewManagementRecord',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementRecord'),
+            name: 'warehouseManagementRecord',
+            meta: {
+                title: 'warehouseManagementRecord',
+                shortcutEntrance: 'warehouseManagementRecord',
+                module: 'warehouseManagement.warehouse.warehouseInfo.view',
+
+                permissicon: [],
+                keepAlive: true,
+                _title: '仓库记录'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementNoWeight',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoWeight'),
+            name: 'warehouseManagementNoWeight',
+            meta: {
+                title: 'warehouseManagementNoWeight',
+                shortcutEntrance: 'warehouseManagementNoWeight',
+                module: 'warehouseManagement.warehouse.warehouseInfo.view',
+                permissicon: [],
+                keepAlive: true
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementNoComplete',
+
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoComplete'),
+            name: 'warehouseManagementNoComplete',
+            meta: {
+                title: 'warehouseManagementNoComplete',
+                shortcutEntrance: 'warehouseManagementNoComplete',
+                module: 'warehouseManagement.warehouse.warehouseInfo.view',
+                permissicon: [],
+                keepAlive: true
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementPerfectput',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPerfectput'),
+            name: 'warehouseManagementPerfectput',
+            meta: {
+                title: 'warehouseManagementPerfectput',
+                shortcutEntrance: 'warehouseManagementPerfectput',
+                module: 'warehouseManagement.warehouse.warehouseInfo.in',
+                permissicon: [],
+                keepAlive: true
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementNoWeightIn',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoWeightIn'),
+            name: 'warehouseManagementNoWeightIn',
+            meta: {
+                title: 'warehouseManagementNoWeightIn',
+                shortcutEntrance: 'warehouseManagementNoWeightIn',
+                module: 'warehouseManagement.warehouse.warehouseInfo.in',
+                permissicon: [],
+                keepAlive: true
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementPerfectDelivery',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPerfectDelivery'),
+            name: 'warehouseManagementPerfectDelivery',
+            meta: {
+                title: 'warehouseManagementPerfectDelivery',
+                shortcutEntrance: 'warehouseManagementPerfectDelivery',
+                module: 'warehouseManagement.warehouse.warehouseInfo.out',
+                permissicon: [],
+                keepAlive: true
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'warehouseManagementNoWeightOut',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementNoWeightOut'),
+            name: 'warehouseManagementNoWeightOut',
+            meta: {
+                title: 'warehouseManagementNoWeightOut',
+                shortcutEntrance: 'warehouseManagementNoWeightOut',
+                module: 'warehouseManagement.warehouse.warehouseInfo.out',
+                permissicon: [],
+                keepAlive: true
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        // 出入库任务
+        {
+            path: 'warehouseManagementPutOut',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPutOut'),
+            name: 'warehouseManagementPutOut',
+            meta: {
+                title: 'warehouseManagementPutOut',
+                shortcutEntrance: 'warehouseManagementPutOut',
+                module: 'warehouse.warehouseManagementPutOut',
+                permissicon: [],
+                keepAlive: true
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        // 出入库任务查看
+        {
+            path: 'warehouseManagementPutOutLook',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementPutOutLook'),
+            name: 'warehouseManagementPutOutLook',
+            meta: {
+                title: 'warehouseManagementPutOutLook',
+                shortcutEntrance: 'warehouseManagementPutOutLook',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: false
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        // 出入库任务列表
+        {
+            path: 'tranManagementWarehouseInOutTask',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/tranManagementWarehouseInOutTask'),
+            name: 'tranManagementWarehouseInOutTask',
+            meta: {
+                title: 'tranManagementWarehouseInOutTask',
+                shortcutEntrance: 'tranManagementWarehouseInOutTask',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        // 折转
+        {
+            path: 'transformation',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/transformation'),
+            name: 'transformation',
+            meta: {
+                title: 'transformation',
+                shortcutEntrance: 'transformation',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '仓库管理折转'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+
+        {
+            path: 'inventoryCheck',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/inventoryCheck'),
+            name: 'inventoryCheck',
+            meta: {
+                title: 'inventoryCheck',
+                shortcutEntrance: 'inventoryCheck',
+                module: 'warehouseManagement.warehousingOrder',
+                permissicon: [],
+                keepAlive: true,
+                _title: '库存盘点'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'dryWarehousing',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/dryWarehousing'),
+            name: 'dryWarehousing',
+            meta: {
+                title: 'dryWarehousing',
+                shortcutEntrance: 'dryWarehousing',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '烘干入库'
+            },
+            hidden: true
+        },
+        {
+            path: 'addCar',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/addCar'),
+            name: 'addCar',
+            meta: {
+                title: 'addCar',
+                shortcutEntrance: 'addCar',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '常用车辆'
+            },
+            hidden: true
+        },
+        {
+            path: 'dryRecord',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/dryRecord'),
+            name: 'dryRecord',
+            meta: {
+                title: 'dryRecord',
+                shortcutEntrance: 'dryRecord',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库记录'
+            },
+            hidden: true
+        },
+        {
+            path: 'awaitRansom',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/awaitRansom'),
+            name: 'awaitRansom',
+            meta: {
+                title: 'awaitrAnsom',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '待赎回'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'gooddetail',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/gooddetail'),
+            name: 'gooddetail',
+            meta: {
+                title: 'gooddetail',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '货权明细'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectionRecords',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/inspectionRecords'),
+            name: 'inspectionRecords',
+            meta: {
+                title: 'inspectionRecords',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '巡检记录'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'customerrecord',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/customerrecord'),
+            name: 'customerrecord',
+            meta: {
+                title: 'customerrecord',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '客户操作记录'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'goodsrollIn',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/goodsrollIn'),
+            name: 'goodsrollIn',
+            meta: {
+                title: 'goodsrollIn',
+                shortcutEntrance: 'warehouseManagementList',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '货权转入'
+                // module: 'procurement.sparepart.applDetail'
+            },
+            hidden: true
+        },
+        {
+            path: 'materialInOutWarehouse',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/materialInOutWarehouse'),
+            name: 'materialInOutWarehouse',
+            meta: {
+                title: 'materialInOutWarehouse',
+                shortcutEntrance: 'materialInOutWarehouse',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '物料出入库'
+            },
+            hidden: true
+        },
+        {
+            path: 'materialInOutRecord',
+            component: () =>
+                import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/materialInOutRecord'),
+            name: 'materialInOutRecord',
+            meta: {
+                title: 'materialInOutRecord',
+                shortcutEntrance: 'materialInOutRecord',
+                module: 'warehouseManagement.warehouse.warehouseInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '物料出入库记录'
+            },
+            hidden: true
+        },
+    ],
 };
 export default warehouseManagementRouter;

src/views/warehousenew/dryRecord.vue

@@ -1,77 +1,136 @@
 // 烘干入库记录
 <template>
-    <div class="container">
-        <el-row class="toptitle">
-            <el-col :span="12">
-                <h2 class="bg-left title">烘干入库记录</h2>
-            </el-col>
-            <el-col :span="12" class="bg-right">
-                <el-button 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>
-        <div class="center">
-            <el-row>
-                <el-col :span="6" style="height: 45px"></el-col>
-                <el-col :span="18" class="bg-right">
-                    <div style="display:flex">
-                        <el-select style='margin-right:5px; width:40%' v-model="warehouseName" placeholder="请选择仓库名"
-                            @change="warehouseNameChange">
-                            <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
-                                :value="item.warehouseName"></el-option>
-                        </el-select>
-                        <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
-                            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                            :picker-options="pickerOptions">
-                        </el-date-picker>
-                        <el-input placeholder=" 可按车牌号和检斤员姓名查找" clearable v-model="searchKeyWord" class="search_css">
-                        </el-input>
-                        <el-button type="primary" size="small" @click="lookup">查找</el-button>
-                    </div>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="18" style="height: 20px"></el-col>
-                <el-col :span="6">
-                    <div style="text-align:right;margin-right:20px">净重合计（吨）：{{ count }}</div>
-                </el-col>
-            </el-row>
-            <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="535"
-                @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column type="index" label="序号" width="80">
-                    <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="dryNumber" label="业务编号"></el-table-column>
-                <el-table-column prop="carNo" label="车牌号" width="130"></el-table-column>
-                <el-table-column prop="goodsName" label="货名"></el-table-column>
-                <el-table-column prop="binNumber" label="仓位号"></el-table-column>
-                <el-table-column prop="weigher" label="检斤员"></el-table-column>
-                <el-table-column prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
-                <el-table-column prop="tare" label="皮重（公斤）" width="100"></el-table-column>
-                <el-table-column prop="netWeight" label="净重（公斤）" width="100"></el-table-column>
-                <el-table-column prop="status" label="状态"></el-table-column>
-                <el-table-column prop="updateDate" label="检斤时间"></el-table-column>
-                <el-table-column label="操作"  width="200">
-                    <template scope="scope">
-                        <el-button @click="printInfo(scope.row)" >打印</el-button>
-                        <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '待称皮重'">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div style="text-align: center; padding: 10px">
-            <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>
-        <div class="mask1" v-show="isShowPrintTypeBills"></div>
+  <div class="container">
+    <el-row class="toptitle">
+      <el-col :span="12">
+        <h2 class="bg-left title">烘干入库记录</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button 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>
+    <div class="center">
+      <el-row>
+        <el-col :span="6" style="height: 45px"></el-col>
+        <el-col :span="18" class="bg-right">
+          <div style="display:flex">
+            <el-select
+              style="margin-right:5px; width:40%"
+              v-model="warehouseName"
+              placeholder="请选择仓库名"
+              @change="warehouseNameChange"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.id"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              ></el-option>
+            </el-select>
+            <el-date-picker
+              v-model="value2"
+              type="daterange"
+              align="right"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions"
+            >
+            </el-date-picker>
+            <el-input
+              placeholder=" 可按车牌号和检斤员姓名查找"
+              clearable
+              v-model="searchKeyWord"
+              class="search_css"
+            >
+            </el-input>
+            <el-button type="primary" size="small" @click="lookup"
+              >查找</el-button
+            >
+          </div>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="18" style="height: 20px"></el-col>
+        <el-col :span="6">
+          <div style="text-align:right;margin-right:20px">
+            净重合计（吨）：{{ count }}
+          </div>
+        </el-col>
+      </el-row>
+      <el-table
+        class="forData"
+        :data="weighingRecordList"
+        style="width: 100%; margin-top: 20px"
+        height="535"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column type="index" label="序号" width="80">
+          <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="dryNumber" label="业务编号"></el-table-column>
+        <el-table-column
+          prop="carNo"
+          label="车牌号"
+          width="130"
+        ></el-table-column>
+        <el-table-column prop="goodsName" label="货名"></el-table-column>
+        <el-table-column prop="binNumber" label="仓位号"></el-table-column>
+        <el-table-column prop="weigher" label="检斤员"></el-table-column>
+        <el-table-column
+          prop="grossWeight"
+          label="毛重（公斤）"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="tare"
+          label="皮重（公斤）"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          prop="netWeight"
+          label="净重（公斤）"
+          width="100"
+        ></el-table-column>
+        <el-table-column prop="status" label="状态"></el-table-column>
+        <el-table-column prop="updateDate" label="检斤时间"></el-table-column>
+        <el-table-column label="操作" width="200">
+          <template scope="scope">
+            <el-button @click="printInfo(scope.row)">打印</el-button>
+            <el-button
+              @click="deleteInfo(scope.row)"
+              v-if="scope.row.status == '待称皮重'"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="text-align: center; padding: 10px">
+      <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>
+    <div class="mask1" v-show="isShowPrintTypeBills"></div>
     <div class="print-type1" v-show="isShowPrintTypeBills">
       <div class="print-type-content">
         <div class="print-type-title">请选择打印纸张类型</div>
@@ -82,34 +141,74 @@
           </el-radio-group> -->
         </div>
 
-        <div class="shdw-style1" v-if="checked||(!ddchecked&&!checked)">
+        <div class="shdw-style1" v-if="checked || (!ddchecked && !checked)">
           <div>收货单位：</div>
           <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
-            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model="companyName"
+            placeholder="请选择"
+            style="width: 75%;"
+          >
+            <el-option
+              v-for="item in companyNameOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName1=='鲅鱼圈金信库'||warehouseName1=='白城内陆港'||warehouseName1=='杜尔伯特家禾库'||warehouseName1=='洮南新友谊兴旺库'||warehouseName1=='甘南宏旗库'||warehouseName1=='哈尔滨依兰库'||warehouseName1=='山东园丰库'">
+        <div
+          v-if="
+            warehouseName1 == '鲅鱼圈金信库' ||
+              warehouseName1 == '白城内陆港' ||
+              warehouseName1 == '杜尔伯特家禾库' ||
+              warehouseName1 == '洮南新友谊兴旺库' ||
+              warehouseName1 == '甘南宏旗库' ||
+              warehouseName1 == '哈尔滨依兰库' ||
+              warehouseName1 == '山东园丰库'
+          "
+        >
           <div class="print-type-ew">
-            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
-            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+            <el-checkbox v-model="checked" @change="changeEw"
+              >打印额外票据</el-checkbox
+            >
+            <el-checkbox v-model="ddchecked" @change="changeEwDD"
+              >单独打印额外票据</el-checkbox
+            >
           </div>
           <div class="ew-print" v-if="printSeparately">
             <div class="row">
               <div>额外客户姓名：</div>
               <!-- <div>{{companyName}}</div> -->
-              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="ewCustomer"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in ewCustomerOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
             <div class="row">
               <div>额外收货单位：</div>
               <!-- <div>{{companyNameEW}}</div> -->
-              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
-                  :value="item.value">
+              <el-select
+                v-model="companyNameEW"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in companyNameEWOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
@@ -121,777 +220,576 @@
         <el-button @click="typePrintCannelClick1">取消</el-button>
       </div>
     </div>
-    </div>
+  </div>
 </template>
 <script>
-import {
-    delRecord,
-    getRecord
-} from '@/model/warehouse/index'
-import {
-    selectWarehouseSelf,
-} from '@/model/outboundManagement/index'
-import {
-    getcomp
-  } from '@/model/indexRx'
+import { delRecord, getRecord } from '@/model/warehouse/index'
+import { selectWarehouseSelf } from '@/model/outboundManagement/index'
+import { getcomp } from '@/model/indexRx'
 export default {
-    data() {
-        return {
-            weighingRecordList: [],
-            warehouseId: '',
-            warehouseName: '',
-            warehouseName1: '',
-
-            compId: '',
-            //分页
-            currentPage: 1,
-            pageSize: 10,
-            value2: [],
-            deptCircularPage: {},
-            deptBudgetTotal: 0,
-            warehouseList: [], //仓库
-            searchKeyWord: '',
-            title: '',
-            modification: [],
-            isShowPrintTypeBills:false,
-            count: 0,//合计
-            startDate: '',
-            endDate: '',
-            pickerOptions: {
-                shortcuts: [{
-                    text: '本周',
-                    onClick(picker) {
-                        const end = new Date()
-                        const start = new Date()
-                        var thisDay = start.getDay()
-                        var thisDate = start.getDate()
-                        if (thisDay != 0) {
-                            start.setDate(thisDate - thisDay)
-                        }
-                        picker.$emit('pick', [start, end])
-                    },
-                },
-                {
-                    text: '本月',
-                    onClick(picker) {
-                        const end = new Date()
-                        const start = new Date()
-                        start.setDate(1)
-                        picker.$emit('pick', [start, end])
-                    },
-                },
-                {
-                    text: '本季度',
-                    onClick(picker) {
-                        var oDate = new Date()
-
-                        var thisYear = oDate.getFullYear()
-                        var thisMonth = oDate.getMonth() + 1
-
-                        var n = Math.ceil(thisMonth / 3) // 季度
-
-                        var Month = n * 3 - 1
-
-                        var start = new Date(thisYear, Month - 2, 1)
-                        var end = new Date()
-
-                        picker.$emit('pick', [start, end])
-                    },
-                },
-                ],
-            },
-            ddchecked: false,
-        checked: false,
-        ewCustomerOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }],
-        companyNameOptions: [{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }],
-        companyNameEWOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        }],
-        companyName: '黑龙江中天昊元贸易有限公司',
-        companyNameEW: '厦门建发物产有限公司',
-        ewCustomer: '黑龙江利润元粮食贸易有限公司',
-        printSeparately:false,
-        onePrint:false,
-        dialogDataList:[],
-        printData:{
-          
-        }
-
-        }
-    },
-    activated() {
-        //仓库
-        selectWarehouseSelf({
-            compId: localStorage.getItem('ws-pf_compId'),
-        })
-            .toPromise()
-            .then((response) => {
-                this.warehouseList = response
-            })
-        this.compId = localStorage.getItem('ws-pf_compId')
-        this.warehouseName = this.$route.query.warehouseName //仓库名
-        this.warehouseId = this.$route.query.warehouseId //仓库Id
-        getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
-        this.compNameoptions=res
-        localStorage.setItem('compNameoptions',JSON.stringify(this.compNameoptions))
-        if(this.compNameoptions.length>0){
-        var company=JSON.parse(localStorage.getItem('compNameoptions'))
-        
-        var extra=company.filter((item)=>{
-          return item!='黑龙江中天昊元贸易有限公司'
-          &&item!='黑龙江利润元粮食贸易有限公司'
-          &&item!= '黑龙江众利合粮食贸易有限公司'
-          &&item!='黑龙江鑫满仓粮食贸易有限公司'
-          &&item!='黑龙江谷香粮食贸易有限公司'
-          &&item!='黑龙江秋收有限公司'
-          &&item!= '黑龙江欣洋粮食贸易有限公司'
-          &&item!='黑龙江益储益运粮食贸易有限公司'
-          &&item!='黑龙江启兴粮食贸易有限公司'
-        })
-        if(extra.length>0){
-          this.companyNameOptions=[
+  data() {
+    return {
+      weighingRecordList: [],
+      warehouseId: '',
+      warehouseName: '',
+      warehouseName1: '',
+
+      compId: '',
+      //分页
+      currentPage: 1,
+      pageSize: 10,
+      value2: [],
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      warehouseList: [], //仓库
+      searchKeyWord: '',
+      title: '',
+      modification: [],
+      isShowPrintTypeBills: false,
+      count: 0, //合计
+      startDate: '',
+      endDate: '',
+      pickerOptions: {
+        shortcuts: [
           {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-        
-          this.ewCustomerOptions= [
+            text: '本周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              var thisDay = start.getDay()
+              var thisDate = start.getDate()
+              if (thisDay != 0) {
+                start.setDate(thisDate - thisDay)
+              }
+              picker.$emit('pick', [start, end])
+            }
+          },
           {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-          this.companyNameEWOptions=[
+            text: '本月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setDate(1)
+              picker.$emit('pick', [start, end])
+            }
+          },
           {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-           if(localStorage.getItem('print_company_name')){
-            this.companyName=localStorage.getItem('print_company_name')
-          }else{
-            this.companyName=extra[0]
-          }
-          if(localStorage.getItem('print_company_name_ew')){
-            this.companyNameEW=localStorage.getItem('print_company_name_ew')
-          }else{
-            this.companyNameEW=extra[0]
-          }
-          if(localStorage.getItem('print_customer_name_ew')){
-            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
-          }else{
-            this.ewCustomer=extra[0]
-          }
-          
-          for (let i = 0; i < extra.length; i++) {
-            this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
+            text: '本季度',
+            onClick(picker) {
+              var oDate = new Date()
+
+              var thisYear = oDate.getFullYear()
+              var thisMonth = oDate.getMonth() + 1
+
+              var n = Math.ceil(thisMonth / 3) // 季度
+
+              var Month = n * 3 - 1
+
+              var start = new Date(thisYear, Month - 2, 1)
+              var end = new Date()
+
+              picker.$emit('pick', [start, end])
+            }
           }
+        ]
+      },
+      ddchecked: false,
+      checked: false,
+      ewCustomerOptions: [],
+      companyNameOptions: [],
+      companyNameEWOptions: [],
+      companyName: '',
+      companyNameEW: '',
+      ewCustomer: '',
+      printSeparately: false,
+      onePrint: false,
+      dialogDataList: [],
+      printData: {}
+    }
+  },
+  activated() {
+    //仓库
+    selectWarehouseSelf({
+      compId: localStorage.getItem('ws-pf_compId')
+    })
+      .toPromise()
+      .then(response => {
+        this.warehouseList = response
+      })
+    this.compId = localStorage.getItem('ws-pf_compId')
+    this.warehouseName = this.$route.query.warehouseName //仓库名
+    this.warehouseId = this.$route.query.warehouseId //仓库Id
+    getcomp({
+      userMobilePhone: JSON.parse(
+        localStorage.getItem('ws_login_getTenantInfoByUser')
+      ).loginInfo.userMobilePhone
+    })
+      .toPromise()
+      .then(res => {
+        this.compNameoptions = res
+        localStorage.setItem(
+          'compNameoptions',
+          JSON.stringify(this.compNameoptions)
+        )
+      })
+    this.getList()
+  },
+  methods: {
+    changeEw(e) {
+      this.ddchecked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
+      }
+    },
+    changeEwDD(e) {
+      this.checked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
+      }
+    },
+    printBig1(type, radioType) {
+      this.printData.extra1 = true
+      localStorage.setItem('print_company_name', this.companyName)
+      localStorage.setItem('print_company_name_ew', this.companyNameEW)
+      localStorage.setItem('print_customer_name_ew', this.ewCustomer)
+      // 打印额外
+      if (this.checked || this.ddchecked) {
+        this.printData.extra2 = true
+        if (this.ddchecked) {
+          localStorage.setItem('print_alone_extra', true)
+        } else {
+          localStorage.setItem('print_alone_extra', false)
         }
+        //  this.selectEW = true;
+      } else {
+        this.printData.extra2 = false
       }
+      localStorage.setItem('printdrydata', JSON.stringify(this.printData))
+      window.open(
+        '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
+      )
+      // if (type == 1) {
+      //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+      //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
+      //     .checked + '&selectEWDD=' + this.ddchecked)
+      // } else if (type == 2) {
+      //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+      //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
+      // } else {
+      //   console.log(this.dialogDataList)
+
+      //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+      //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+      //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
+      // }
+    },
+    typePrintCannelClick1() {
+      this.dialogDataList = [] //打个打印取消时数组至空
+      this.isShowPrintTypeBills = false
+    },
+    printInfo(row) {
+      this.printData = row
+      this.warehouseName1 = row.warehouseName
+
+      this.isShowPrintTypeBills = true
+      // window.open('../../../static/printdry.html')
+    },
+    deleteInfo(row) {
+      //删除
+      this.$confirm('确定删除检斤信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
-        this.getList()
+        .then(() => {
+          delRecord({
+            id: row.id
+          })
+            .toPromise()
+            .then(response => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功'
+              })
+              this.getList()
+            })
+            .catch(response => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
     },
-    methods: {
-        changeEw(e) {
-        this.ddchecked = false
-        if (e) {
-          this.printSeparately = true
-        } else {
-          this.printSeparately = false
+    handleSelectionChange(val) {
+      this.modification = val
+      this.count = 0
+      for (let i = 0; i < this.modification.length; i++) {
+        if (this.modification[i].netWeight) {
+          this.count += this.modification[i].netWeight
         }
-      },
-      changeEwDD(e) {
-        this.checked = false
-        if (e) {
-          this.printSeparately = true
-        } else {
-          this.printSeparately = false
+      }
+      this.count = this.count.toFixed(2)
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString() // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
         }
-      },
-        printBig1(type, radioType) {
-        this.printData.extra1=true
-        localStorage.setItem('print_company_name',this.companyName)
-        localStorage.setItem('print_company_name_ew',this.companyNameEW)
-        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
-        // 打印额外
-        if (this.checked || this.ddchecked) {
-          this.printData.extra2=true
-          if(this.ddchecked){
-            localStorage.setItem('print_alone_extra',true)
-          }else{
-            localStorage.setItem('print_alone_extra',false)
-          }
-          //  this.selectEW = true;
-        }else{
-          this.printData.extra2=false
+      }
+      return fmt
+    },
+    lookup() {
+      if (this.value2) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
+      this.currentPage = 1
+      this.getList()
+    },
+    returnsales() {
+      this.$router.go(-1)
+    },
+    warehouseNameChange(e) {
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (e == this.warehouseList[i].warehouseName) {
+          this.warehouseId = this.warehouseList[i].id
         }
-        localStorage.setItem('printdrydata',JSON.stringify(this.printData))
-            window.open(
-              '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
-            )
-        // if (type == 1) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
-        //     .checked + '&selectEWDD=' + this.ddchecked)
-        // } else if (type == 2) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
-        // } else {
-        //   console.log(this.dialogDataList)
-          
-        //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-        //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-        //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
-        // }
-      },
-      typePrintCannelClick1() {
-        this.dialogDataList = [] //打个打印取消时数组至空
-        this.isShowPrintTypeBills= false
-      },
-        printInfo(row){
-            this.printData=row
-            this.warehouseName1=row.warehouseName
-            
-            this.isShowPrintTypeBills=true
-            // window.open('../../../static/printdry.html')
-        },
-        deleteInfo(row) {
-            //删除
-            this.$confirm('确定删除检斤信息？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            })
-                .then(() => {
-                    delRecord({
-                        id: row.id,
-                    })
-                        .toPromise()
-                        .then((response) => {
-                            this.$notify.success({
-                                title: '成功',
-                                message: '删除成功',
-                            })
-                            this.getList()
-                        })
-                        .catch((response) => {
-                            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                        })
-                })
-                .catch(() => {
-                    return false
-                })
-        },
-        handleSelectionChange(val) {
-            this.modification = val;
-            this.count = 0
-            for (let i = 0; i < this.modification.length; i++) {
-                if (this.modification[i].netWeight) {
-                    this.count += this.modification[i].netWeight
-                }
-            }
-            this.count = this.count.toFixed(2)
-        },
-        dateFormat(fmt, date) {
-            let ret
-            const opt = {
-                'Y+': date.getFullYear().toString(), // 年
-                'm+': (date.getMonth() + 1).toString(), // 月
-                'd+': date.getDate().toString(), // 日
-                'H+': date.getHours().toString(), // 时
-                // "M+": date.getMinutes().toString(),         // 分
-                // "S+": date.getSeconds().toString()          // 秒
-                // 有其他格式化字符需求可以继续添加，必须转化成字符串
-            }
-            for (let k in opt) {
-                ret = new RegExp('(' + k + ')').exec(fmt)
-                if (ret) {
-                    fmt = fmt.replace(
-                        ret[1],
-                        ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-                    )
-                }
-            }
-            return fmt
-        },
-        lookup() {
-            if (this.value2) {
-                this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-                this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-            } else {
-                this.startDate = ''
-                this.endDate = ''
-            }
-            this.currentPage = 1
-            this.getList()
-        },
-        returnsales() {
-            this.$router.go(-1)
-        },
-        warehouseNameChange(e) {
-            for (let i = 0; i < this.warehouseList.length; i++) {
-                if (e == this.warehouseList[i].warehouseName) {
-                    this.warehouseId = this.warehouseList[i].id
-                }
-            }
-            this.getList()
-        },
-        handleSizeChange(val) {
-            console.log(`每页 ${val} 条`)
-            this.pageSize = val
-            this.getList()
-        },
-        handleCurrentChange(val) {
-            this.currentPage = val
-            console.log(`当前页: ${val}`)
-            this.getList()
-        },
-        getList() {
-            // 列表
-            getRecord({
-                baseId: this.warehouseId,
-                currentPage: this.currentPage,
-                pageSize: this.pageSize,
-                searchKeyWord: this.searchKeyWord,
-                searchType: '',
-                startDate: this.startDate,
-                endDate: this.endDate,
-            })
-                .toPromise()
-                .then((response) => {
-                    this.weighingRecordList = response.records
-                    this.deptBudgetTotal = response.total
-                })
-                .catch((response) => {
-                    // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                })
-        },
-
+      }
+      this.getList()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
     },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    getList() {
+      // 列表
+      getRecord({
+        baseId: this.warehouseId,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+        searchType: '',
+        startDate: this.startDate,
+        endDate: this.endDate
+      })
+        .toPromise()
+        .then(response => {
+          this.weighingRecordList = response.records
+          this.deptBudgetTotal = response.total
+        })
+        .catch(response => {
+          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+        })
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
 .toptitle {
-    background: #f6f7fc;
+  background: #f6f7fc;
 }
 
 .bg-left {
-    padding-left: 30px;
+  padding-left: 30px;
 }
 
 .bg-right {
-    text-align: right;
-    padding: 16px 20px;
+  text-align: right;
+  padding: 16px 20px;
 }
 
 .top-title {
-    width: 50%;
-    display: flex;
+  width: 50%;
+  display: flex;
 }
 
 .title {
-    position: relative;
+  position: relative;
 }
 
 .title::before {
-    content: '';
-    display: inline-block;
-    width: 5px;
-    height: 30px;
-    background: #5473e8;
-    position: absolute;
-    left: 0;
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
 }
 
 .container {
-    overflow: scroll;
-    height: 93vh;
+  overflow: scroll;
+  height: 93vh;
 }
 
 .center {
-    margin: auto;
+  margin: auto;
 }
 
 .centertitle {
-    display: flex;
-    margin: 10px 0;
+  display: flex;
+  margin: 10px 0;
 }
 
 .temporary {
-    line-height: 80px;
-    font-size: 20px;
-    color: #abaaaa;
+  line-height: 80px;
+  font-size: 20px;
+  color: #abaaaa;
 }
 
 /deep/.forData .cell {
-    text-align: center;
+  text-align: center;
 }
 
 //弹出框
 .eject-warehouse {
-    font-size: 20px;
-    margin-left: 15px;
-    font-weight: 600;
+  font-size: 20px;
+  margin-left: 15px;
+  font-weight: 600;
 }
 
 .table_css {
-    margin: 20px auto;
+  margin: 20px auto;
 
-    tr {
-        height: 50px;
-    }
+  tr {
+    height: 50px;
+  }
 
-    .table_item {
-        min-width: 70px;
-    }
+  .table_item {
+    min-width: 70px;
+  }
 
-    td {
-        text-align: center;
-        font-size: 18px;
-        font-weight: 600;
-    }
+  td {
+    text-align: center;
+    font-size: 18px;
+    font-weight: 600;
+  }
 
-    .el-select {
-        width: 90%;
-    }
+  .el-select {
+    width: 90%;
+  }
 }
 
 .btn_topcss {
-    margin-top: 15px;
-
+  margin-top: 15px;
 }
 
 .btn_css {
-    width: 90px;
-    margin-left: 10px;
+  width: 90px;
+  margin-left: 10px;
 }
 
 .search_css {
-    margin: 0 20px;
+  margin: 0 20px;
 }
 
 .mask {
-    background: black;
-    width: 100vw;
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    z-index: 99;
-    opacity: 0.3;
+  background: black;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  z-index: 99;
+  opacity: 0.3;
 }
 
 .print-type-title {
-    text-align: center;
-    font-size: 18px;
-    margin: 20px;
+  text-align: center;
+  font-size: 18px;
+  margin: 20px;
 }
 
 .bottom-btn {
-    display: flex;
-    margin-top: 20px;
-    justify-content: space-around;
+  display: flex;
+  margin-top: 20px;
+  justify-content: space-around;
 }
 
 .print-type-checkbox {
-    // padding-left: 20px;
+  // padding-left: 20px;
 }
 
 .print-type {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 440px;
-    height: 320px;
-    background: white;
-    border-radius: 10px;
-    z-index: 999;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 440px;
+  height: 320px;
+  background: white;
+  border-radius: 10px;
+  z-index: 999;
 }
 
 /deep/.el-radio-group {
-    width: 100%;
-    display: flex;
+  width: 100%;
+  display: flex;
 }
 
 /deep/.el-radio__label {
-    font-size: 20px;
+  font-size: 20px;
 }
 
 /deep/.el-radio__inner {
-    // background: red;
-    height: 20px;
-    width: 20px;
+  // background: red;
+  height: 20px;
+  width: 20px;
 }
 
 .label-width {
-    width: 100%;
-    text-align: center;
-    font-size: 20px;
+  width: 100%;
+  text-align: center;
+  font-size: 20px;
 }
 
 .show-excel {
-    opacity: 0;
+  opacity: 0;
 }
 
 /deep/.base_header_layout .find.el-button--primary {
-    width: 30px;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
 }
 
 /deep/.base_header_layout .findinput input {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
 }
 
 .ew-print {
-    padding: 0 20px;
-    margin-top: 10px;
+  padding: 0 20px;
+  margin-top: 10px;
 
-    // display: flex;
-    // justify-content: space-between;
-    // align-content: center;
-    .row {
-        display: flex;
-        margin-top: 10px;
-        align-items: center;
-    }
+  // display: flex;
+  // justify-content: space-between;
+  // align-content: center;
+  .row {
+    display: flex;
+    margin-top: 10px;
+    align-items: center;
+  }
 }
 
 .sh-address {
-    display: flex;
+  display: flex;
 }
 
 .print-type-ew {
-    display: flex;
-    justify-content: space-between;
-    padding: 0 20px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20px;
 
-    /deep/.el-radio__label {
-        font-size: 14px;
-    }
+  /deep/.el-radio__label {
+    font-size: 14px;
+  }
 
-    margin-top: 10px;
+  margin-top: 10px;
 }
 
 /deep/.el-table .cell {
-    text-align: center;
+  text-align: center;
 }
 
 .shdw-style {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 20px;
-    margin-top: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  margin-top: 20px;
 }
 .mask1 {
-    background: black;
-    width: 100vw;
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    z-index: 1001;
-    opacity: 0.3;
-  }
+  background: black;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  z-index: 1001;
+  opacity: 0.3;
+}
+
+.print-type-title1 {
+  text-align: center;
+  font-size: 18px;
+  margin: 20px;
+}
+
+.print-type-checkbox1 {
+  // padding-left: 20px;
+}
+
+.print-type1 {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 440px;
+  height: 320px;
+  background: white;
+  border-radius: 10px;
+  z-index: 1001;
+}
+.shdw-style1 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  margin-top: 20px;
+}
+.print-type-ew {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20px;
 
-  .print-type-title1 {
-    text-align: center;
-    font-size: 18px;
-    margin: 20px;
+  /deep/.el-radio__label {
+    font-size: 14px;
   }
 
+  margin-top: 10px;
+}
+.ew-print {
+  padding: 0 20px;
+  margin-top: 10px;
 
-  .print-type-checkbox1 {
-    // padding-left: 20px;
-  }
-
-  .print-type1 {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 440px;
-    height: 320px;
-    background: white;
-    border-radius: 10px;
-    z-index: 1001;
-  }
-  .shdw-style1 {
+  // display: flex;
+  // justify-content: space-between;
+  // align-content: center;
+  .row {
     display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 20px;
-    margin-top: 20px;
-  }
-  .print-type-ew {
-    display: flex;
-    justify-content: space-between;
-    padding: 0 20px;
-
-    /deep/.el-radio__label {
-      font-size: 14px;
-    }
-
-    margin-top: 10px;
-  }
-  .ew-print {
-    padding: 0 20px;
     margin-top: 10px;
-
-    // display: flex;
-    // justify-content: space-between;
-    // align-content: center;
-    .row {
-      display: flex;
-      margin-top: 10px;
-      align-items: center;
-    }
+    align-items: center;
   }
+}
 </style>

src/views/warehousenew/dryWarehousing.vue

@@ -1,158 +1,289 @@
 <template>
-    <div class="center">
-        <BaseHeaderLayout :leftSpan="12">
-            <template slot="left"> </template>
-            <template slot="right">
-                <el-select style="width: 400px" v-model="warehouseName" filterable placeholder="请选择仓库"
-                    @change="warehouseNameChange">
-                    <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
-                        :value="item.warehouseName" style="color: #8890b1" />
-                </el-select>
-            </template>
-        </BaseHeaderLayout>
-        <div style="display: flex">
-            <div style="background: #f6f7fc; padding: 10px" class="grid-content bg-purple size_css">
-                <BalanceAlert v-if="isShowBalance" ref="weightChild" :deptBudgetList="deptBudgetList"
-                    :information="information" v-on:balanceListen="setVal" class="zujian">
-                </BalanceAlert>
-                <div class="top">
-                    <div class="confirmWeight">
-                        <div class="titleWeight">确认重量</div>
-                        <div v-if="index == 0" class="weight">
-                            {{ weighingList.tare }} <span class="kg-style">kg</span>
-                        </div>
-                        <div v-else class="weight">
-                            {{ weighingList.grossWeight }} <span class="kg-style">kg</span>
-                        </div>
-                    </div>
-                    <div class="confirmInfo">
-                        <div class="car-type">车牌号</div>
-                        <div class="car-no">{{ weighingList.carNo }}</div>
-                    </div>
-                </div>
-                <div class="bg-left titleup">
-                    <span class="word_css">实时监控</span>
-                </div>
-                <div class="bottom">
-                    <div v-if="!monitorUrl1" class="video1">
-                        <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
-                        <div>监控视频未连接</div>
-                    </div>
-                    <div v-else class="video1">
-                        <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen="true"
-                            webkitallowfullscreen="true" mozallowfullscreen="true"
-                            allow="autoplay; fullscreen; microphone;"></iframe>
-                    </div>
-                    <div v-if="!monitorUrl2" class="video1">
-                        <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
-                        <div>监控视频未连接</div>
-                    </div>
-                    <div v-else class="video2">
-                        <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true"
-                            webkitallowfullscreen="true" mozallowfullscreen="true"
-                            allow="autoplay; fullscreen; microphone;"></iframe>
+  <div class="center">
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left"> </template>
+      <template slot="right">
+        <el-select
+          style="width: 400px"
+          v-model="warehouseName"
+          filterable
+          placeholder="请选择仓库"
+          @change="warehouseNameChange"
+        >
+          <el-option
+            v-for="item in warehouseList"
+            :key="item.id"
+            :label="item.warehouseName"
+            :value="item.warehouseName"
+            style="color: #8890b1"
+          />
+        </el-select>
+      </template>
+    </BaseHeaderLayout>
+    <div style="display: flex">
+      <div
+        style="background: #f6f7fc; padding: 10px"
+        class="grid-content bg-purple size_css"
+      >
+        <BalanceAlert
+          v-if="isShowBalance"
+          ref="weightChild"
+          :deptBudgetList="deptBudgetList"
+          :information="information"
+          v-on:balanceListen="setVal"
+          class="zujian"
+        >
+        </BalanceAlert>
+        <div class="top">
+          <div class="confirmWeight">
+            <div class="titleWeight">确认重量</div>
+            <div v-if="index == 0" class="weight">
+              {{ weighingList.tare }} <span class="kg-style">kg</span>
+            </div>
+            <div v-else class="weight">
+              {{ weighingList.grossWeight }} <span class="kg-style">kg</span>
+            </div>
+          </div>
+          <div class="confirmInfo">
+            <div class="car-type">车牌号</div>
+            <div class="car-no">{{ weighingList.carNo }}</div>
+          </div>
+        </div>
+        <div class="bg-left titleup">
+          <span class="word_css">实时监控</span>
+        </div>
+        <div class="bottom">
+          <div v-if="!monitorUrl1" class="video1">
+            <img
+              src="../../../public/img/quesheng@2x.png"
+              alt=""
+              class="img1"
+            />
+            <div>监控视频未连接</div>
+          </div>
+          <div v-else class="video1">
+            <iframe
+              :src="monitorUrl1"
+              width="440"
+              height="360"
+              allowfullscreen="true"
+              webkitallowfullscreen="true"
+              mozallowfullscreen="true"
+              allow="autoplay; fullscreen; microphone;"
+            ></iframe>
+          </div>
+          <div v-if="!monitorUrl2" class="video1">
+            <img
+              src="../../../public/img/quesheng@2x.png"
+              alt=""
+              class="img1"
+            />
+            <div>监控视频未连接</div>
+          </div>
+          <div v-else class="video2">
+            <iframe
+              :src="monitorUrl2"
+              width="440"
+              height="360"
+              allowfullscreen="true"
+              webkitallowfullscreen="true"
+              mozallowfullscreen="true"
+              allow="autoplay; fullscreen; microphone;"
+            ></iframe>
+          </div>
+        </div>
+      </div>
+      <div>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <div class="grid-content bg-purple">
+              <div class="tab weigh_btn">
+                <el-button :type="tpyeNo == 2 ? 'primary' : ''">
+                  <div @click="tabClick(1)">称毛重</div>
+                </el-button>
+                <el-button :type="tpyeNo == 1 ? 'primary' : ''">
+                  <div @click="tabClick(0)">称皮重</div>
+                </el-button>
+              </div>
+              <ws-form class="right-content">
+                <div class="left1">
+                  <div class="weightInfo">
+                    <ws-info-table>
+                      <ws-form-item label="货名" span="1" prop="tare">
+                        <el-select
+                          style="width: 400px"
+                          v-model="weighingList.goodsName"
+                          filterable
+                          placeholder="请选择货名"
+                          @change="goodsNameChange"
+                          :disabled="tpyeNo == 1"
+                        >
+                          <el-option
+                            v-for="item in goodsNameList"
+                            :key="item.constValue"
+                            :label="item.constValue"
+                            :value="item.constValue"
+                            style="color: #8890b1"
+                          />
+                        </el-select>
+                      </ws-form-item>
+                      <ws-form-item label="车牌号" span="1" prop="carNo">
+                        <ws-input
+                          @mousewheel.native.prevent
+                          v-if="cartips == '下拉选择'"
+                          v-model="weighingList.carNo"
+                          placeholder="请输入车牌号"
+                          maxlength="7"
+                          size="small"
+                          :disabled="tpyeNo == 1"
+                        />
+                        <el-select
+                          style="width: 400px"
+                          v-model="weighingList.carNo"
+                          filterable
+                          v-else
+                          placeholder="请选择车牌号"
+                          @change="carNochange"
+                          :disabled="tpyeNo == 1"
+                        >
+                          <el-option
+                            v-for="item in carList"
+                            :key="item.carNo"
+                            :label="item.carNo"
+                            :value="item.id"
+                            style="color: #8890b1"
+                          />
+                        </el-select>
+                        <el-button @click="carNoTypechange" v-if="tpyeNo == 2"
+                          >{{ cartips }}
+                        </el-button>
+                      </ws-form-item>
+                      <ws-form-item
+                        v-if="tpyeNo == 2 && warehouseType == 1"
+                        label="仓位号"
+                        span="1"
+                        prop="inOutTaskNo"
+                      >
+                        <el-select
+                          @change="binNumberchange"
+                          filterable
+                          clearable
+                          v-model="weighingList.binNumber"
+                          placeholder="请选择仓位号"
+                          class="typeselect"
+                        >
+                          <el-option
+                            v-for="item in positionInfos"
+                            :key="item.id"
+                            :label="item.binNumber"
+                            :value="item.binNumber"
+                          />
+                        </el-select>
+                      </ws-form-item>
+                      <ws-form-item
+                        label="毛重(KG)"
+                        span="1"
+                        prop="grossWeight"
+                      >
+                        <ws-input
+                          type="number"
+                          @mousewheel.native.prevent
+                          v-model="weighingList.grossWeight"
+                          @input="calculation"
+                          placeholder="自动获取"
+                          maxlength="100"
+                          size="small"
+                          :disabled="disabled || tpyeNo == 1"
+                        />
+                        <el-button v-if="tpyeNo == 2" @click="openPort">
+                          重新获取</el-button
+                        >
+                      </ws-form-item>
+                      <ws-form-item
+                        label="皮重(KG)"
+                        span="1"
+                        prop="tare"
+                        v-if="tpyeNo == 1"
+                      >
+                        <ws-input
+                          type="number"
+                          @mousewheel.native.prevent
+                          v-model="weighingList.tare"
+                          @input="calculation"
+                          placeholder="自动获取"
+                          maxlength="100"
+                          size="small"
+                          :disabled="disabled"
+                        />
+                        <el-button v-if="tpyeNo == 1" @click="openPort">
+                          重新获取</el-button
+                        >
+                      </ws-form-item>
+                      <ws-form-item
+                        label="净重(KG)"
+                        span="1"
+                        prop="tare"
+                        v-if="tpyeNo == 1"
+                      >
+                        <ws-input
+                          type="number"
+                          @mousewheel.native.prevent
+                          v-model="weighingList.netWeight"
+                          @input="calculation"
+                          placeholder="自动计算"
+                          maxlength="100"
+                          size="small"
+                          disabled
+                        />
+                      </ws-form-item>
+                    </ws-info-table>
+                    <div class="but">
+                      <el-button @click="submit" type="primary">提交</el-button>
+                      <el-button @click="canel" type="primary">清空</el-button>
                     </div>
+                  </div>
                 </div>
+              </ws-form>
             </div>
-            <div>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <div class="grid-content bg-purple">
-                            <div class="tab weigh_btn">
-                                <el-button :type="tpyeNo == 2 ? 'primary' : ''">
-                                    <div @click="tabClick(1)">称毛重</div>
-                                </el-button>
-                                <el-button :type="tpyeNo == 1 ? 'primary' : ''">
-                                    <div @click="tabClick(0)">称皮重</div>
-                                </el-button>
-                            </div>
-                            <ws-form class="right-content">
-                                <div class="left1">
-                                    <div class="weightInfo">
-                                        <ws-info-table>
-                                            <ws-form-item label="货名" span="1" prop="tare">
-                                                <el-select style="width: 400px" v-model="weighingList.goodsName"
-                                                    filterable placeholder="请选择货名" @change="goodsNameChange"
-                                                    :disabled="tpyeNo == 1">
-                                                    <el-option v-for="item in goodsNameList" :key="item.constValue"
-                                                        :label="item.constValue" :value="item.constValue"
-                                                        style="color: #8890b1" />
-                                                </el-select>
-                                            </ws-form-item>
-                                            <ws-form-item label="车牌号" span="1" prop="carNo">
-                                                <ws-input @mousewheel.native.prevent v-if="cartips == '下拉选择'"
-                                                    v-model="weighingList.carNo" placeholder="请输入车牌号" maxlength="7"
-                                                    size="small" :disabled="tpyeNo == 1" />
-                                                <el-select style="width: 400px" v-model="weighingList.carNo" filterable
-                                                    v-else placeholder="请选择车牌号" @change="carNochange"
-                                                    :disabled="tpyeNo == 1">
-                                                    <el-option v-for="item in carList" :key="item.carNo"
-                                                        :label="item.carNo" :value="item.id" style="color: #8890b1" />
-                                                </el-select>
-                                                <el-button @click="carNoTypechange" v-if="tpyeNo == 2">{{ cartips }}
-                                                </el-button>
-                                            </ws-form-item>
-                                            <ws-form-item v-if="tpyeNo == 2 && warehouseType == 1" label="仓位号" span="1" prop="inOutTaskNo">
-                                              <el-select @change="binNumberchange" filterable clearable
-                                                v-model="weighingList.binNumber" placeholder="请选择仓位号" class="typeselect">
-                                                <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
-                                                  :value="item.binNumber" />
-                                              </el-select>
-                                            </ws-form-item>
-                                            <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
-                                                <ws-input type="number" @mousewheel.native.prevent
-                                                    v-model="weighingList.grossWeight" @input="calculation"
-                                                    placeholder="自动获取" maxlength="100" size="small"
-                                                    :disabled="disabled || tpyeNo == 1" />
-                                                <el-button v-if="tpyeNo == 2" @click="openPort">
-                                                    重新获取</el-button>
-                                            </ws-form-item>
-                                            <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="tpyeNo == 1">
-                                                <ws-input type="number" @mousewheel.native.prevent
-                                                    v-model="weighingList.tare" @input="calculation" placeholder="自动获取"
-                                                    maxlength="100" size="small" :disabled="disabled" />
-                                                <el-button v-if="tpyeNo == 1" @click="openPort">
-                                                    重新获取</el-button>
-                                            </ws-form-item>
-                                            <ws-form-item label="净重(KG)" span="1" prop="tare" v-if="tpyeNo == 1">
-                                                <ws-input type="number" @mousewheel.native.prevent
-                                                    v-model="weighingList.netWeight" @input="calculation"
-                                                    placeholder="自动计算" maxlength="100" size="small" disabled />
-                                            </ws-form-item>
-                                        </ws-info-table>
-                                        <div class="but">
-                                            <el-button @click="submit" type="primary">提交</el-button>
-                                            <el-button @click="canel" type="primary">清空</el-button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </ws-form>
-                        </div>
-                    </el-col>
-                    <el-col :span="12">
-                        <div class="list-info">
-                            <div style="justify-content: space-between" class="flex">
-                                <div style="display: flex;">
-                                    <el-button @click="record" type="primary">记录</el-button>
-                                    <el-button @click="addCar" type="primary">添加车辆</el-button>
-                                </div>
-                            </div>
-                            <el-table @cell-click="listclick" :data="deliveryList" style="width: 100%; margin-top: 20px"
-                                ref="deliveryList" border>
-                                <el-table-column prop="dryNumber" width="120" label="业务编号"></el-table-column>
-                                <el-table-column prop="carNo" label="车牌号"></el-table-column>
-                                <el-table-column prop="status" label="状态"></el-table-column>
-                            </el-table>
-                            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                                :current-page="currentPage" :page-size="pageSize"
-                                layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
-                            </el-pagination>
-                        </div>
-                    </el-col>
-                </el-row>
+          </el-col>
+          <el-col :span="12">
+            <div class="list-info">
+              <div style="justify-content: space-between" class="flex">
+                <div style="display: flex;">
+                  <el-button @click="record" type="primary">记录</el-button>
+                  <el-button @click="addCar" type="primary">添加车辆</el-button>
+                </div>
+              </div>
+              <el-table
+                @cell-click="listclick"
+                :data="deliveryList"
+                style="width: 100%; margin-top: 20px"
+                ref="deliveryList"
+                border
+              >
+                <el-table-column
+                  prop="dryNumber"
+                  width="120"
+                  label="业务编号"
+                ></el-table-column>
+                <el-table-column prop="carNo" label="车牌号"></el-table-column>
+                <el-table-column prop="status" label="状态"></el-table-column>
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="deptBudgetTotal"
+              >
+              </el-pagination>
             </div>
-        </div>
-        <div class="mask1" v-show="isShowPrintTypeBills"></div>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <div class="mask1" v-show="isShowPrintTypeBills"></div>
     <div class="print-type1" v-show="isShowPrintTypeBills">
       <div class="print-type-content">
         <div class="print-type-title">请选择打印纸张类型</div>
@@ -163,34 +294,74 @@
           </el-radio-group> -->
         </div>
 
-        <div class="shdw-style1" v-if="checked||(!ddchecked&&!checked)">
+        <div class="shdw-style1" v-if="checked || (!ddchecked && !checked)">
           <div>收货单位：</div>
           <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
-            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model="companyName"
+            placeholder="请选择"
+            style="width: 75%;"
+          >
+            <el-option
+              v-for="item in companyNameOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </div>
-        <div v-if="printData.warehouseName=='鲅鱼圈金信库'||printData.warehouseName=='白城内陆港'||printData.warehouseName=='杜尔伯特家禾库'||printData.warehouseName=='洮南新友谊兴旺库'||printData.warehouseName=='甘南宏旗库'||printData.warehouseName=='哈尔滨依兰库'||printData.warehouseName=='山东园丰库'">
+        <div
+          v-if="
+            printData.warehouseName == '鲅鱼圈金信库' ||
+              printData.warehouseName == '白城内陆港' ||
+              printData.warehouseName == '杜尔伯特家禾库' ||
+              printData.warehouseName == '洮南新友谊兴旺库' ||
+              printData.warehouseName == '甘南宏旗库' ||
+              printData.warehouseName == '哈尔滨依兰库' ||
+              printData.warehouseName == '山东园丰库'
+          "
+        >
           <div class="print-type-ew">
-            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
-            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+            <el-checkbox v-model="checked" @change="changeEw"
+              >打印额外票据</el-checkbox
+            >
+            <el-checkbox v-model="ddchecked" @change="changeEwDD"
+              >单独打印额外票据</el-checkbox
+            >
           </div>
           <div class="ew-print" v-if="printSeparately">
             <div class="row">
               <div>额外客户姓名：</div>
               <!-- <div>{{companyName}}</div> -->
-              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="ewCustomer"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in ewCustomerOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
             <div class="row">
               <div>额外收货单位：</div>
               <!-- <div>{{companyNameEW}}</div> -->
-              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
-                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
-                  :value="item.value">
+              <el-select
+                v-model="companyNameEW"
+                placeholder="请选择"
+                style="width: 75%;"
+              >
+                <el-option
+                  v-for="item in companyNameEWOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </div>
@@ -202,1047 +373,858 @@
         <el-button @click="typePrintCannelClick1">取消</el-button>
       </div>
     </div>
-    </div>
+  </div>
 </template>
 <script>
+import { selectWarehouseSelf } from '@/model/outboundManagement/index'
+import { getcomp } from '@/model/indexRx'
 import {
-    selectWarehouseSelf,
-} from '@/model/outboundManagement/index'
-import {
-    getcomp
-  } from '@/model/indexRx'
-import {
-    pullDown,
-    carXiala,
-    addDryWarehouse,
-    getRecord,
-    editDryWarehouse,
-    getdrylist
+  pullDown,
+  carXiala,
+  addDryWarehouse,
+  getRecord,
+  editDryWarehouse,
+  getdrylist
 } from '@/model/warehouse/index'
 import { hasPermission } from '../../utils/getHasPermission'
 import WsUpload from '@/components/WsUpload'
 import BalanceAlert from '@/components/balanceAlert'
 import { EventBus } from 'base-core-lib'
 export default {
-    components: {
-        WsUpload,
-        BalanceAlert,
+  components: {
+    WsUpload,
+    BalanceAlert
+  },
+  data() {
+    return {
+      isShowBalance: false,
+      isShowPrint: false,
+      warehouseName: '',
+      currentPage: 1,
+      pageSize: 10,
+      disabled: false,
+      tpyeNo: 2,
+      information: '毛重',
+      carChange1: '手动填写',
+      taskNolist: [],
+      deliveryList: [],
+      warehouseType: 1,
+      weighingList: {
+        grossWeight: '',
+        tare: '',
+        netWeight: 0
+      },
+      positionInfos: [],
+      deptBudgetList: {},
+      warehouseList: [],
+      goodsNameList: [],
+      carList: [],
+      index: 1,
+      monitorUrl1: '',
+      monitorUrl2: '',
+      deptBudgetTotal: 0,
+      cartips: '手动输入',
+      warehouseId: '',
+      ddchecked: false,
+      checked: false,
+      ewCustomerOptions: [],
+      companyNameOptions: [],
+      companyNameEWOptions: [],
+      isShowPrintTypeBills: false,
+      companyName: '',
+      companyNameEW: '',
+      ewCustomer: '',
+      printSeparately: false,
+      onePrint: false,
+      dialogDataList: [],
+      printData: {
+        warehouseName: ''
+      },
+      compNameoptions: []
+    }
+  },
+  mounted() {},
+  activated() {
+    this.selectWarehouse()
+    this.getGoodsList()
+    this.isShowBalance = true
+    getcomp({
+      userMobilePhone: JSON.parse(
+        localStorage.getItem('ws_login_getTenantInfoByUser')
+      ).loginInfo.userMobilePhone
+    })
+      .toPromise()
+      .then(res => {
+        this.compNameoptions = res
+        localStorage.setItem(
+          'compNameoptions',
+          JSON.stringify(this.compNameoptions)
+        )
+      })
+
+    this.openPort()
+  },
+  methods: {
+    binNumberchange(e) {
+      for (let i = 0; i < this.positionInfos.length; i++) {
+        if (this.positionInfos[i].binNumber == e) {
+          this.weighingList.positionId = this.positionInfos[i].id
+        }
+      }
     },
-    data() {
-        return {
-            isShowBalance: false,
-            isShowPrint: false,
-            warehouseName: '',
-            currentPage: 1,
-            pageSize: 10,
-            disabled: false,
-            tpyeNo: 2,
-            information: '毛重',
-            carChange1: '手动填写',
-            taskNolist: [],
-            deliveryList: [],
-            warehouseType: 1,
-            weighingList: {
-                grossWeight: '',
-                tare: '',
-                netWeight: 0
-            },
-            positionInfos:[],
-            deptBudgetList: {},
-            warehouseList: [],
-            goodsNameList: [],
-            carList: [],
-            index: 1,
-            monitorUrl1: '',
-            monitorUrl2: '',
-            deptBudgetTotal: 0,
-            cartips: '手动输入',
-            warehouseId: '',
-            ddchecked: false,
-        checked: false,
-        ewCustomerOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }],
-        companyNameOptions: [{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        }, {
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        }, {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }],
-        companyNameEWOptions: [{
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '厦门建发物产有限公司',
-          label: '厦门建发物产有限公司'
-        }],
-        isShowPrintTypeBills:false,
-        companyName: '黑龙江中天昊元贸易有限公司',
-        companyNameEW: '厦门建发物产有限公司',
-        ewCustomer: '黑龙江利润元粮食贸易有限公司',
-        printSeparately:false,
-        onePrint:false,
-        dialogDataList:[],
-        printData:{
-            warehouseName:''
-        },compNameoptions:[]
-        } 
+    changeEw(e) {
+      this.ddchecked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
+      }
+    },
+    changeEwDD(e) {
+      this.checked = false
+      if (e) {
+        this.printSeparately = true
+      } else {
+        this.printSeparately = false
+      }
     },
-    mounted() { },
-    activated() {
-        this.selectWarehouse()
-        this.getGoodsList()
-        this.isShowBalance = true
-        getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
-        this.compNameoptions=res
-        localStorage.setItem('compNameoptions',JSON.stringify(this.compNameoptions))
-        if(this.compNameoptions.length>0){
-        var company=JSON.parse(localStorage.getItem('compNameoptions'))
-        
-        var extra=company.filter((item)=>{
-          return item!='黑龙江中天昊元贸易有限公司'
-          &&item!='黑龙江利润元粮食贸易有限公司'
-          &&item!= '黑龙江众利合粮食贸易有限公司'
-          &&item!='黑龙江鑫满仓粮食贸易有限公司'
-          &&item!='黑龙江谷香粮食贸易有限公司'
-          &&item!='黑龙江秋收有限公司'
-          &&item!= '黑龙江欣洋粮食贸易有限公司'
-          &&item!='黑龙江益储益运粮食贸易有限公司'
-          &&item!='黑龙江启兴粮食贸易有限公司'
+    printBig1(type, radioType) {
+      this.printData.extra1 = true
+      localStorage.setItem('print_company_name', this.companyName)
+      localStorage.setItem('print_company_name_ew', this.companyNameEW)
+      localStorage.setItem('print_customer_name_ew', this.ewCustomer)
+      // 打印额外
+      if (this.checked || this.ddchecked) {
+        this.printData.extra2 = true
+        if (this.ddchecked) {
+          localStorage.setItem('print_alone_extra', true)
+        } else {
+          localStorage.setItem('print_alone_extra', false)
+        }
+        //  this.selectEW = true;
+      } else {
+        this.printData.extra2 = false
+      }
+      localStorage.setItem('printdrydata', JSON.stringify(this.printData))
+      window.open(
+        '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
+      )
+      // if (type == 1) {
+      //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+      //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
+      //     .checked + '&selectEWDD=' + this.ddchecked)
+      // } else if (type == 2) {
+      //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+      //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
+      // } else {
+      //   console.log(this.dialogDataList)
+
+      //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+      //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+      //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
+      // }
+    },
+    typePrintCannelClick1() {
+      this.dialogDataList = [] //打个打印取消时数组至空
+      this.isShowPrintTypeBills = false
+    },
+    goodsNameChange(e) {
+      this.weighingList.goodsName = e
+      for (let i = 0; i < this.goodsNameList.length; i++) {
+        if (e == this.goodsNameList[i].constValue) {
+          this.weighingList.goodsNameKey = this.goodsNameList[i].constKey
+          break
+        }
+      }
+    },
+    getCarXiaLa() {
+      carXiala({
+        baseId: this.warehouseId
+      })
+        .toPromise()
+        .then(response => {
+          this.carList = response
         })
-        if(extra.length>0){
-          this.companyNameOptions=[
-          {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-        
-          this.ewCustomerOptions= [
-          {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-          this.companyNameEWOptions=[
-          {
-          value: '天津建源供应链管理有限公司',
-          label: '天津建源供应链管理有限公司'
-        },{
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, {
-          value: '黑龙江利润元粮食贸易有限公司',
-          label: '黑龙江利润元粮食贸易有限公司'
-        }, {
-          value: '黑龙江众利合粮食贸易有限公司',
-          label: '黑龙江众利合粮食贸易有限公司'
-        }, {
-          value: '黑龙江鑫满仓粮食贸易有限公司',
-          label: '黑龙江鑫满仓粮食贸易有限公司'
-        },{
-          value: '黑龙江欣洋粮食贸易有限公司',
-          label: '黑龙江欣洋粮食贸易有限公司'
-        },{
-          value: '黑龙江谷香粮食贸易有限公司',
-          label: '黑龙江谷香粮食贸易有限公司'
-        },{
-          value: '黑龙江秋收有限公司',
-          label: '黑龙江秋收有限公司'
-        },  {
-          value: '黑龙江益储益运粮食贸易有限公司',
-          label: '黑龙江益储益运粮食贸易有限公司'
-        }, {
-          value: '黑龙江启兴粮食贸易有限公司',
-          label: '黑龙江启兴粮食贸易有限公司'
-        }]
-           if(localStorage.getItem('print_company_name')){
-            this.companyName=localStorage.getItem('print_company_name')
-          }else{
-            this.companyName=extra[0]
-          }
-          if(localStorage.getItem('print_company_name_ew')){
-            this.companyNameEW=localStorage.getItem('print_company_name_ew')
-          }else{
-            this.companyNameEW=extra[0]
-          }
-          if(localStorage.getItem('print_customer_name_ew')){
-            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
-          }else{
-            this.ewCustomer=extra[0]
-          }
-          
-          for (let i = 0; i < extra.length; i++) {
-            this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameOptions.push({value: extra[i],label:extra[i]})
-            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
+    },
+    getGoodsList() {
+      pullDown({
+        constId: 'CON2'
+      })
+        .toPromise()
+        .then(response => {
+          this.goodsNameList = []
+          for (let i = 0; i < response.length; i++) {
+            if (response[i].constValue.indexOf('潮粮') == -1) {
+              this.goodsNameList.push(response[i])
+            }
           }
+          this.weighingList.goodsName = this.goodsNameList[0].constValue
+          this.weighingList.goodsNameKey = this.goodsNameList[0].constKey
+        })
+    },
+    carNochange(e) {
+      //车牌号下拉选中
+      for (let i = 0; i < this.carList.length; i++) {
+        if (e == this.carList[i].id) {
+          this.weighingList.carNo = this.carList[i].carNo
+          // this.weighingList.tare = this.carList[i].tare
+          // if (this.weighingList.grossWeight) {
+          //     this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare
+          // }
+          break
         }
       }
+    },
+    carNoTypechange() {
+      if (this.cartips == '手动输入') {
+        this.cartips = '下拉选择'
+      } else {
+        this.cartips = '手动输入'
+      }
+    },
+    record() {
+      this.$router.push({
+        path: 'dryRecord',
+        query: {
+          warehouseName: this.warehouseName,
+          warehouseId: this.warehouseId
+        }
       })
-        
-        this.openPort()
-        
     },
-    methods: {
-      binNumberchange(e) {
-        for (let i = 0; i < this.positionInfos.length; i++) {
-          if (this.positionInfos[i].binNumber == e) {
-            this.weighingList.positionId = this.positionInfos[i].id
-          }
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    setVal(data) {
+      if (this.information == '毛重') {
+        this.weighingList.grossWeight = data
+        // this.weighingList.netWeight =
+        //     Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
+      } else {
+        this.weighingList.tare = data
+        this.weighingList.netWeight =
+          Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
+      }
+    },
+    openPort() {
+      this.$refs.weightChild.openPort()
+    },
+
+    listclick(row) {
+      this.weighingList = row
+      this.information = '皮重'
+      this.index = 0
+      this.cartips = '手动输入'
+      this.tpyeNo = '1'
+    },
+    addCar() {
+      this.$router.push({
+        path: 'addCar'
+      })
+    },
+    canel() {
+      if (this.tpyeNo == '1') {
+        this.weighingList.tare = ''
+      } else {
+        this.weighingList.carNo = ''
+        this.weighingList.grossWeight = ''
+        this.weighingList.tare = ''
+        this.weighingList.netWeight = ''
+      }
+    },
+    submit() {
+      // var allow = hasPermission('warehouseManagement.warehouse.warehouseInfo.hong')
+      // if (!allow) {// 提交为外勤权限，错误提示“暂未获得权限”
+      //     this.$message({
+      //         message: '暂未获得权限，不可保存检斤信息！',
+      //         type: 'warning',
+      //     })
+      //     return
+      // }
+      this.weighingList.compId = localStorage.getItem('ws-pf_compId')
+      this.weighingList.weigher = localStorage.getItem('ws-pf_staffName')
+      this.weighingList.warehouseName = this.warehouseName
+      this.weighingList.baseId = this.warehouseId
+      this.weighingList.warehouseNo = this.weighingList.warehouseNo
+      if (this.tpyeNo == 2) {
+        this.weighingList.statusFlag = 1
+        if (!this.weighingList.goodsName) {
+          this.$message({
+            message: '货名不能为空',
+            type: 'warning'
+          })
+          return
         }
-      },
-        changeEw(e) {
-        this.ddchecked = false
-        if (e) {
-          this.printSeparately = true
-        } else {
-          this.printSeparately = false
+        if (!this.weighingList.carNo) {
+          this.$message({
+            message: '车牌号不能为空',
+            type: 'warning'
+          })
+          return
         }
-      },
-      changeEwDD(e) {
-        this.checked = false
-        if (e) {
-          this.printSeparately = true
-        } else {
-          this.printSeparately = false
+        if (!this.weighingList.grossWeight) {
+          this.$message({
+            message: '毛重不能为空',
+            type: 'warning'
+          })
+          return
         }
-      },
-        printBig1(type, radioType) {
-        this.printData.extra1=true
-        localStorage.setItem('print_company_name',this.companyName)
-        localStorage.setItem('print_company_name_ew',this.companyNameEW)
-        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
-        // 打印额外
-        if (this.checked || this.ddchecked) {
-          this.printData.extra2=true
-          if(this.ddchecked){
-            localStorage.setItem('print_alone_extra',true)
-          }else{
-            localStorage.setItem('print_alone_extra',false)
-          }
-          //  this.selectEW = true;
-        }else{
-          this.printData.extra2=false
+        if (
+          isNaN(this.weighingList.grossWeight) ||
+          (String(this.weighingList.grossWeight).indexOf('.') != -1 &&
+            String(this.weighingList.grossWeight).length -
+              (String(this.weighingList.grossWeight).indexOf('.') + 1) >
+              1) ||
+          this.weighingList.grossWeight < 1 ||
+          this.weighingList.grossWeight > 100000
+        ) {
+          this.$message({
+            message: '毛重输入错误！',
+            type: 'warning'
+          })
+          return
         }
-        localStorage.setItem('printdrydata',JSON.stringify(this.printData))
-            window.open(
-              '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
-            )
-        // if (type == 1) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
-        //     .checked + '&selectEWDD=' + this.ddchecked)
-        // } else if (type == 2) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
-        // } else {
-        //   console.log(this.dialogDataList)
-          
-        //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-        //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-        //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
-        // }
-      },
-      typePrintCannelClick1() {
-        this.dialogDataList = [] //打个打印取消时数组至空
-        this.isShowPrintTypeBills= false
-      },
-        goodsNameChange(e) {
-            this.weighingList.goodsName = e
-            for (let i = 0; i < this.goodsNameList.length; i++) {
-                if (e == this.goodsNameList[i].constValue) {
-                    this.weighingList.goodsNameKey = this.goodsNameList[i].constKey
-                    break
-                }
-            }
-        },
-        getCarXiaLa() {
-            carXiala({
-                baseId: this.warehouseId,
-            })
-                .toPromise()
-                .then((response) => {
-                    this.carList = response
-                })
-        },
-        getGoodsList() {
-            pullDown({
-                constId: 'CON2',
-            })
-                .toPromise()
-                .then((response) => {
-                    this.goodsNameList=[]
-                    for (let i = 0; i < response.length; i++) {
-                        if (response[i].constValue.indexOf('潮粮') == -1) {
-                            this.goodsNameList.push(response[i])
-                        }
-                    }
-                    this.weighingList.goodsName = this.goodsNameList[0].constValue
-                    this.weighingList.goodsNameKey = this.goodsNameList[0].constKey
-                })
-        },
-        carNochange(e) {
-            //车牌号下拉选中
-            for (let i = 0; i < this.carList.length; i++) {
-                if (e == this.carList[i].id) {
-                    this.weighingList.carNo = this.carList[i].carNo
-                    // this.weighingList.tare = this.carList[i].tare
-                    // if (this.weighingList.grossWeight) {
-                    //     this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare
-                    // }
-                    break
-                }
-            }
-        },
-        carNoTypechange() {
-            if (this.cartips == '手动输入') {
-                this.cartips = '下拉选择'
-            } else {
-                this.cartips = '手动输入'
-            }
-        },
-        record() {
-            this.$router.push({
-                path: 'dryRecord',
-                query: {
-                    warehouseName: this.warehouseName,
-                    warehouseId: this.warehouseId
-                }
-            })
-        },
-        handleSizeChange(val) {
-            console.log(`每页 ${val} 条`)
-            this.pageSize = val
-            this.getList()
-        },
-        handleCurrentChange(val) {
-            this.currentPage = val
-            console.log(`当前页: ${val}`)
-            this.getList()
-        },
-        setVal(data) {
-            if (this.information == '毛重') {
-                this.weighingList.grossWeight = data
-                // this.weighingList.netWeight =
-                //     Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
-            } else {
-                this.weighingList.tare = data
-                this.weighingList.netWeight =
-                    Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
-            }
-        },
-        openPort() {
-            this.$refs.weightChild.openPort()
-        },
+      }
+      if (this.tpyeNo == 1) {
+        //称皮重
+        this.weighingList.statusFlag = 3
+        if (!this.weighingList.tare) {
+          this.$message({
+            message: '皮重不能为空',
+            type: 'warning'
+          })
+          return
+        }
+        if (
+          isNaN(this.weighingList.tare) ||
+          (String(this.weighingList.tare).indexOf('.') != -1 &&
+            String(this.weighingList.tare).length -
+              (String(this.weighingList.tare).indexOf('.') + 1) >
+              1) ||
+          this.weighingList.tare < 1 ||
+          this.weighingList.tare > 100000
+        ) {
+          this.$message({
+            message: '皮重输入错误！',
+            type: 'warning'
+          })
+          return
+        }
+        if (this.weighingList.netWeight < 0) {
+          this.$message({
+            message: '净重不能为负',
+            type: 'warning'
+          })
+          return
+        }
+      }
 
-        listclick(row) {
-            this.weighingList = row
-            this.information = '皮重'
-            this.index=0
-            this.cartips = '手动输入'
-            this.tpyeNo = '1'
-        },
-        addCar() {
-            this.$router.push({
-                path: 'addCar',
-            })
-        },
-        canel() {
-            if (this.tpyeNo == '1') {
-                this.weighingList.tare = ''
-            } else {
+      this.$confirm('确定保存检斤信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          if (this.tpyeNo == 2) {
+            //称毛重
+            addDryWarehouse(this.weighingList)
+              .toPromise()
+              .then(response => {
+                this.$message({
+                  message: '操作成功！',
+                  type: 'success'
+                })
                 this.weighingList.carNo = ''
                 this.weighingList.grossWeight = ''
                 this.weighingList.tare = ''
                 this.weighingList.netWeight = ''
-            }
-        },
-        submit() {
-            // var allow = hasPermission('warehouseManagement.warehouse.warehouseInfo.hong')
-            // if (!allow) {// 提交为外勤权限，错误提示“暂未获得权限”
-            //     this.$message({
-            //         message: '暂未获得权限，不可保存检斤信息！',
-            //         type: 'warning',
-            //     })
-            //     return
-            // }
-            this.weighingList.compId = localStorage.getItem('ws-pf_compId')
-            this.weighingList.weigher = localStorage.getItem('ws-pf_staffName')
-            this.weighingList.warehouseName = this.warehouseName
-            this.weighingList.baseId = this.warehouseId
-            this.weighingList.warehouseNo = this.weighingList.warehouseNo
-            if (this.tpyeNo == 2) {
-                this.weighingList.statusFlag = 1
-                if (!this.weighingList.goodsName) {
-                    this.$message({
-                        message: '货名不能为空',
-                        type: 'warning',
-                    })
-                    return
-                }
-                if (!this.weighingList.carNo) {
-                    this.$message({
-                        message: '车牌号不能为空',
-                        type: 'warning',
-                    })
-                    return
-                }
-                if (!this.weighingList.grossWeight) {
-                    this.$message({
-                        message: '毛重不能为空',
-                        type: 'warning',
-                    })
-                    return
-                }
-                if (
-                    isNaN(this.weighingList.grossWeight) ||
-                    (String(this.weighingList.grossWeight).indexOf('.') != -1 &&
-                        String(this.weighingList.grossWeight).length -
-                        (String(this.weighingList.grossWeight).indexOf('.') + 1) >
-                        1) ||
-                    this.weighingList.grossWeight < 1 ||
-                    this.weighingList.grossWeight > 100000
-                ) {
-                    this.$message({
-                        message: '毛重输入错误！',
-                        type: 'warning',
-                    })
-                    return
-                }
-            }
-            if (this.tpyeNo == 1) { //称皮重
-                this.weighingList.statusFlag = 3
-                if (!this.weighingList.tare) {
-                    this.$message({
-                        message: '皮重不能为空',
-                        type: 'warning',
-                    })
-                    return
-                }
-                if (
-                    isNaN(this.weighingList.tare) ||
-                    (String(this.weighingList.tare).indexOf('.') != -1 &&
-                        String(this.weighingList.tare).length -
-                        (String(this.weighingList.tare).indexOf('.') + 1) >
-                        1) ||
-                    this.weighingList.tare < 1 ||
-                    this.weighingList.tare > 100000
-                ) {
-                    this.$message({
-                        message: '皮重输入错误！',
-                        type: 'warning',
-                    })
-                    return
-                }
-                if (this.weighingList.netWeight < 0) {
-                    this.$message({
-                        message: '净重不能为负',
-                        type: 'warning',
-                    })
-                    return
-                }
-            }
-
-            this.$confirm('确定保存检斤信息？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            })
-                .then(() => {
-                    if (this.tpyeNo == 2) { //称毛重
-                        addDryWarehouse(this.weighingList)
-                            .toPromise()
-                            .then((response) => {
-                                this.$message({
-                                    message: '操作成功！',
-                                    type: 'success'
-                                });
-                                this.weighingList.carNo = ''
-                                this.weighingList.grossWeight = ''
-                                this.weighingList.tare = ''
-                                this.weighingList.netWeight = ''
-                                this.getList()
-                            })
-                    } else if (this.tpyeNo == 1) {//称皮重
-                        editDryWarehouse(this.weighingList)
-                            .toPromise()
-                            .then((response) => {
-                                this.$message({
-                                    message: '操作成功！',
-                                    type: 'success'
-                                });
-                                this.weighingList.carNo = ''
-                                this.weighingList.grossWeight = ''
-                                this.weighingList.tare = ''
-                                this.weighingList.netWeight = ''
-                                getdrylist({id:this.weighingList.id}).toPromise()
-                                .then((response) => {
-                                    this.printData=response
-                                    this.isShowPrintTypeBills=true
-                                })
-                                console.log(this.weighingList)
-                                this.getList()
-                            })
-                    }
-
+                this.getList()
+              })
+          } else if (this.tpyeNo == 1) {
+            //称皮重
+            editDryWarehouse(this.weighingList)
+              .toPromise()
+              .then(response => {
+                this.$message({
+                  message: '操作成功！',
+                  type: 'success'
                 })
-                .catch(() => {
-                    return false
-                })
-        },
-        tabClick(val) {
-            this.weighingList = {}
-            for (let i = 0; i < this.warehouseList.length; i++) {
-                if (this.warehouseList[i].warehouseName == this.warehouseName) {
-                    this.warehouseId = this.warehouseList[i].id
-                    this.weighingList.baseId = this.warehouseList[i].id
-                    this.weighingList.warehouseNo = this.warehouseList[i].commonWarehouseNo
-                    this.positionInfos =  this.warehouseList[i].positionInfos
-                }
-            }
-            this.index = val
-            if (val == 0) {
-                this.information = '皮重'
-                this.tpyeNo = '1'
-                this.cartips = '手动输入'//用来点称皮重时显示皮重输入框
+                this.weighingList.carNo = ''
+                this.weighingList.grossWeight = ''
+                this.weighingList.tare = ''
+                this.weighingList.netWeight = ''
+                getdrylist({ id: this.weighingList.id })
+                  .toPromise()
+                  .then(response => {
+                    this.printData = response
+                    this.isShowPrintTypeBills = true
+                  })
+                console.log(this.weighingList)
+                this.getList()
+              })
+          }
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    tabClick(val) {
+      this.weighingList = {}
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseList[i].warehouseName == this.warehouseName) {
+          this.warehouseId = this.warehouseList[i].id
+          this.weighingList.baseId = this.warehouseList[i].id
+          this.weighingList.warehouseNo = this.warehouseList[
+            i
+          ].commonWarehouseNo
+          this.positionInfos = this.warehouseList[i].positionInfos
+        }
+      }
+      this.index = val
+      if (val == 0) {
+        this.information = '皮重'
+        this.tpyeNo = '1'
+        this.cartips = '手动输入' //用来点称皮重时显示皮重输入框
+      } else {
+        this.weighingList.goodsName = this.goodsNameList[0].constValue
+        this.weighingList.goodsNameKey = this.goodsNameList[0].constKey
+        this.tpyeNo = '2'
+        this.information = '毛重'
+      }
+      this.getList()
+    },
+    warehouseNameChange(e) {
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseList[i].warehouseName == e) {
+          this.warehouseId = this.warehouseList[i].id
+          this.weighingList.baseId = this.warehouseList[i].id
+          this.weighingList.warehouseNo = this.warehouseList[
+            i
+          ].commonWarehouseNo
+          this.positionInfos = this.warehouseList[i].positionInfos
+          // if (this.warehouseList[i].allowEdit == 1) {
+          //     this.disabled = false
+          // } else {
+          //     this.disabled = true
+          // }
+        }
+      }
+      this.getList()
+      this.getCarXiaLa()
+    },
+    calculation() {
+      //計算净重
+      if (this.weighingList.grossWeight && this.weighingList.tare) {
+        let count = 0
+        this.weighingList.netWeight =
+          this.weighingList.grossWeight -
+          this.weighingList.tare -
+          Number(
+            this.weighingList.buckleMiscellaneous
+              ? this.weighingList.buckleMiscellaneous
+              : 0
+          )
+      }
+    },
+    selectWarehouse() {
+      selectWarehouseSelf({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+        .toPromise()
+        .then(response => {
+          this.warehouseList = response
+          var obj = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
+          if (obj) {
+            this.warehouseName = obj.value
+            if (obj.allowEdit == 1) {
+              this.disabled = false
             } else {
-              this.weighingList.goodsName = this.goodsNameList[0].constValue
-              this.weighingList.goodsNameKey = this.goodsNameList[0].constKey
-                this.tpyeNo = '2'
-                this.information = '毛重'
+              this.disabled = true
             }
+            this.warehouseId = obj.warehouseId
+            this.weighingList.baseId = obj.warehouseId
+            this.weighingList.warehouseNo = obj.No
+            this.getCarXiaLa()
             this.getList()
-        },
-        warehouseNameChange(e) {
-            for (let i = 0; i < this.warehouseList.length; i++) {
-                if (this.warehouseList[i].warehouseName == e) {
-                    this.warehouseId = this.warehouseList[i].id
-                    this.weighingList.baseId = this.warehouseList[i].id
-                    this.weighingList.warehouseNo = this.warehouseList[i].commonWarehouseNo
-                    this.positionInfos =  this.warehouseList[i].positionInfos
-                    // if (this.warehouseList[i].allowEdit == 1) {
-                    //     this.disabled = false
-                    // } else {
-                    //     this.disabled = true
-                    // }
-                }
+            for (let i = 0; i < response.length; i++) {
+              this.positionInfos = response[i].positionInfos
             }
-            this.getList()
-            this.getCarXiaLa()
-        },
-        calculation() {
-            //計算净重
-            if (this.weighingList.grossWeight && this.weighingList.tare) {
-                let count = 0
-                this.weighingList.netWeight =
-                    this.weighingList.grossWeight -
-                    this.weighingList.tare -
-                    Number(
-                        this.weighingList.buckleMiscellaneous
-                            ? this.weighingList.buckleMiscellaneous
-                            : 0
-                    )
+          } else {
+            this.warehouseName = response[0].warehouseName
+            this.weighingList.baseId = response[0].id
+            this.warehouseId = response[0].id
+            this.weighingList.warehouseNo = response[0].commonWarehouseNo
+            this.positionInfos = response[0].positionInfos
+            if (response[0].allowEdit == 1) {
+              this.disabled = false
+            } else {
+              this.disabled = true
             }
-        },
-        selectWarehouse() {
-            selectWarehouseSelf({
-                compId: localStorage.getItem('ws-pf_compId'),
-            })
-                .toPromise()
-                .then((response) => {
-                    this.warehouseList = response
-                    var obj = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
-                    if (obj) {
-                        this.warehouseName = obj.value
-                        if (obj.allowEdit == 1) {
-                            this.disabled = false
-                        } else {
-                            this.disabled = true
-                        }
-                        this.warehouseId = obj.warehouseId
-                        this.weighingList.baseId = obj.warehouseId
-                        this.weighingList.warehouseNo = obj.No
-                        this.getCarXiaLa()
-                        this.getList()
-                        for (let i = 0; i < response.length; i++) {
-                          this.positionInfos = response[i].positionInfos
-                          
-                        }
-                    } else {
-                        this.warehouseName = response[0].warehouseName
-                        this.weighingList.baseId = response[0].id
-                        this.warehouseId = response[0].id
-                        this.weighingList.warehouseNo = response[0].commonWarehouseNo
-                        this.positionInfos = response[0].positionInfos
-                        if (response[0].allowEdit == 1) {
-                            this.disabled = false
-                        } else {
-                            this.disabled = true
-                        }
-                        this.getCarXiaLa()
-                        this.getList()
-                    }
-                    this.deptBudgetList.warehouseName = this.warehouseName
-                    
-                })
-        },
-        getList() {
-            getRecord({
-                baseId: this.warehouseId,
-                currentPage: this.currentPage,
-                pageSize: this.pageSize,
-                searchType: 1,
-                startDate: '',
-                endDate: '',
-                searchKeyWord: '',
-            })
-                .toPromise()
-                .then((response) => {
-                    this.deliveryList = response.records
-                    this.deptBudgetTotal = response.total
-                })
-        },
+            this.getCarXiaLa()
+            this.getList()
+          }
+          this.deptBudgetList.warehouseName = this.warehouseName
+        })
     },
+    getList() {
+      getRecord({
+        baseId: this.warehouseId,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: 1,
+        startDate: '',
+        endDate: '',
+        searchKeyWord: ''
+      })
+        .toPromise()
+        .then(response => {
+          this.deliveryList = response.records
+          this.deptBudgetTotal = response.total
+        })
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
 .center {
-    background: #fff;
+  background: #fff;
 }
 
 .size_css {
-    width: 540px;
-    min-width: 540px;
-    overflow-x: scroll;
-    position: relative;
+  width: 540px;
+  min-width: 540px;
+  overflow-x: scroll;
+  position: relative;
 }
 
 .ws-info-table {
-    border: none;
+  border: none;
 }
 
 .base_header_layout {
-    padding: 10px;
-    margin-bottom: 10px;
+  padding: 10px;
+  margin-bottom: 10px;
 }
 
 .ws-info-table .el-form-item {
-    width: 50%;
-    border: none;
+  width: 50%;
+  border: none;
 }
 
 .formItem {
-    width: 100%;
-    display: inline;
+  width: 100%;
+  display: inline;
 }
 
 .ws-info-table {
-    border: none;
+  border: none;
 }
 
 .ws-info-table .el-form-item {
-    width: 100%;
-    border: none;
+  width: 100%;
+  border: none;
 }
 
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 30%;
-    text-align: center;
-    background: #ffffff;
-    color: #8890b1;
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
 }
 
 /deep/.ws-info-table .el-form-item .el-form-item__content {
-    border: none;
+  border: none;
 }
 
 /deep/.el-textarea__inner {
-    width: 92%;
+  width: 92%;
 }
 
 /deep/.ws-info-table .el-form-item.rememo .el-form-item__content {
-    height: 76px;
+  height: 76px;
 }
 
 .title {
-    font-size: 16px;
-    font-weight: 600;
-    margin: 10px;
+  font-size: 16px;
+  font-weight: 600;
+  margin: 10px;
 }
 
 .titleup {
-    position: relative;
+  position: relative;
 }
 
 .title::before {
-    content: '';
-    display: inline-block;
-    width: 5px;
-    height: 15px;
-    background: #8890b1;
-    margin-right: 5px;
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 15px;
+  background: #8890b1;
+  margin-right: 5px;
 }
 
 .substance {
-    background: #ffffff;
-    width: 100%;
-    border-radius: 4px;
-    margin: 0 auto;
-    padding-top: 20px;
+  background: #ffffff;
+  width: 100%;
+  border-radius: 4px;
+  margin: 0 auto;
+  padding-top: 20px;
 }
 
 /deep/.el-table .el-table__header .cell,
 .el-table .el-table__body .cell {
-    text-align: center;
+  text-align: center;
 }
 
 /deep/.el-table--enable-row-transition .el-table__body td {
-    text-align: center;
+  text-align: center;
 }
 
 .bg-left {
-    padding-left: 30px;
+  padding-left: 30px;
 }
 
 .bg-right {
-    padding-right: 10px;
-    text-align: right;
+  padding-right: 10px;
+  text-align: right;
 }
 
 .bg-bottom {
-    margin: 15px 0px;
+  margin: 15px 0px;
 }
 
 .titleup {
-    position: relative;
+  position: relative;
 }
 
 .el-upload--picture-card {
-    background-color: #fbfdff;
-    border: 1px dashed #c0ccda;
-    border-radius: 6px;
-    box-sizing: border-box;
-    width: 148px;
-    height: 148px;
-    line-height: 146px;
-    vertical-align: top;
-    margin-left: -289px;
+  background-color: #fbfdff;
+  border: 1px dashed #c0ccda;
+  border-radius: 6px;
+  box-sizing: border-box;
+  width: 148px;
+  height: 148px;
+  line-height: 146px;
+  vertical-align: top;
+  margin-left: -289px;
 }
 
 .but {
-    text-align: center;
-    margin: 20px auto;
+  text-align: center;
+  margin: 20px auto;
 }
 
 .top {
-    background: black;
-    color: #2aff7c;
-    font-size: 32px;
-    text-align: right;
-    padding: 0 10px 0 20px;
-    border-radius: 10px;
-    margin: 0 20px 20px 21px;
-    position: absolute;
-    top: 140px;
-    width: 465px;
+  background: black;
+  color: #2aff7c;
+  font-size: 32px;
+  text-align: right;
+  padding: 0 10px 0 20px;
+  border-radius: 10px;
+  margin: 0 20px 20px 21px;
+  position: absolute;
+  top: 140px;
+  width: 465px;
 
-    .zujian {
-        position: relative;
-    }
+  .zujian {
+    position: relative;
+  }
 
-    .kg-style {
-        font-size: 30px;
-        color: red;
-    }
+  .kg-style {
+    font-size: 30px;
+    color: red;
+  }
 
-    .confirmInfo {
-        display: flex;
+  .confirmInfo {
+    display: flex;
 
-        .car-type {
-            text-align: left;
-            width: 50%;
-            min-width: 200px;
-        }
+    .car-type {
+      text-align: left;
+      width: 50%;
+      min-width: 200px;
+    }
 
-        .car-no {
-            width: 50%;
-            text-align: right;
-        }
+    .car-no {
+      width: 50%;
+      text-align: right;
     }
+  }
 
-    .confirmWeight {
-        display: flex;
-        align-items: center;
+  .confirmWeight {
+    display: flex;
+    align-items: center;
 
-        .titleWeight {
-            width: 35%;
-            min-width: 200px;
-            text-align: left;
-            line-height: 90px;
-            color: red;
-        }
+    .titleWeight {
+      width: 35%;
+      min-width: 200px;
+      text-align: left;
+      line-height: 90px;
+      color: red;
+    }
 
-        .weight {
-            width: 65%;
-            text-align: right;
-            color: red;
-        }
+    .weight {
+      width: 65%;
+      text-align: right;
+      color: red;
     }
+  }
 }
 
 .bottom {
-    // text-align: center;
-    background: white;
-    margin: 20px 20px 0 20px;
-    // border-radius: 10px;
-    padding-bottom: 20px;
+  // text-align: center;
+  background: white;
+  margin: 20px 20px 0 20px;
+  // border-radius: 10px;
+  padding-bottom: 20px;
 
-    .img1,
-    .img2 {
-        width: 200px;
-        padding: 20px;
-    }
+  .img1,
+  .img2 {
+    width: 200px;
+    padding: 20px;
+  }
 
-    .video-content {
-        width: 100%;
-    }
+  .video-content {
+    width: 100%;
+  }
 
-    .video1 {
-        text-align: center;
-    }
+  .video1 {
+    text-align: center;
+  }
 }
 
 /deep/.title_css .el-dialog__header {
-    text-align: center !important;
+  text-align: center !important;
 }
 
 .bottom-btn {
-    display: flex;
-    margin-top: 20px;
-    justify-content: space-around;
+  display: flex;
+  margin-top: 20px;
+  justify-content: space-around;
 }
 
 /deep/.el-radio-group {
-    width: 100%;
-    display: flex;
+  width: 100%;
+  display: flex;
 }
 
 /deep/.el-radio__label {
-    font-size: 20px;
+  font-size: 20px;
 }
 
 /deep/.el-radio__inner {
-    // background: red;
-    height: 20px;
-    width: 20px;
+  // background: red;
+  height: 20px;
+  width: 20px;
 }
 
 .label-width {
-    width: 100%;
-    text-align: center;
-    font-size: 20px;
+  width: 100%;
+  text-align: center;
+  font-size: 20px;
 }
 
 .show-excel {
-    opacity: 0;
+  opacity: 0;
 }
 
 /deep/.base_header_layout .find.el-button--primary {
-    width: 30px;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
 }
 
 /deep/.base_header_layout .findinput input {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
 }
 
 .sh-address {
-    display: flex;
+  display: flex;
 }
 
 .print-type-ew {
-    display: flex;
-    justify-content: space-between;
-    padding: 0 20px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20px;
 
-    /deep/.el-radio__label {
-        font-size: 14px;
-    }
+  /deep/.el-radio__label {
+    font-size: 14px;
+  }
 
-    margin-top: 10px;
+  margin-top: 10px;
 }
-.right-content{
-    margin-top: 20px;
+.right-content {
+  margin-top: 20px;
 }
 
 .mask1 {
-    background: black;
-    width: 100vw;
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    z-index: 1001;
-    opacity: 0.3;
-  }
+  background: black;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  z-index: 1001;
+  opacity: 0.3;
+}
 
-  .print-type-title {
-    text-align: center;
-    font-size: 18px;
-    margin: 20px;
-  }
+.print-type-title {
+  text-align: center;
+  font-size: 18px;
+  margin: 20px;
+}
 
+.print-type-checkbox1 {
+  // padding-left: 20px;
+}
 
-  .print-type-checkbox1 {
-    // padding-left: 20px;
-  }
+.print-type1 {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 440px;
+  height: 320px;
+  background: white;
+  border-radius: 10px;
+  z-index: 1001;
+}
+.shdw-style1 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  margin-top: 20px;
+}
+.print-type-ew {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20px;
 
-  .print-type1 {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 440px;
-    height: 320px;
-    background: white;
-    border-radius: 10px;
-    z-index: 1001;
+  /deep/.el-radio__label {
+    font-size: 14px;
   }
-  .shdw-style1 {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 20px;
-    margin-top: 20px;
-  }
-  .print-type-ew {
-    display: flex;
-    justify-content: space-between;
-    padding: 0 20px;
 
-    /deep/.el-radio__label {
-      font-size: 14px;
-    }
+  margin-top: 10px;
+}
+.ew-print {
+  padding: 0 20px;
+  margin-top: 10px;
 
+  // display: flex;
+  // justify-content: space-between;
+  // align-content: center;
+  .row {
+    display: flex;
     margin-top: 10px;
+    align-items: center;
   }
-  .ew-print {
-    padding: 0 20px;
-    margin-top: 10px;
-
-    // display: flex;
-    // justify-content: space-between;
-    // align-content: center;
-    .row {
-      display: flex;
-      margin-top: 10px;
-      align-items: center;
-    }
-  }
-</style>
+}
+</style>