首頁 探索 說明
註冊 登入
wangchao
/
yiliangyiyun-pc-jj
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

修改检斤批量打印

mxx 3 年之前
父節點
cc2b2bc32b
當前提交
32a1c736d0
共有 5 個文件被更改，包括 621 次插入 和 480 次删除
統一視圖 顯示文件統計
  1. 211 107
      public/static/weightCheck.html
  2. 1 2
      src/components/mapdrag/warehouseReceiptMap.vue
  3. 0 1
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  4. 408 369
      src/views/houseSelfCollect/weighingManagement.vue
  5. 1 1
      src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

+ 211 - 107
public/static/weightCheck.html
查看文件 

@@ -22,11 +22,12 @@
 
         width: 1000px;
 
         width: 1000px;
 
         padding: 30px 20px 20px 20px;
 
         padding: 30px 20px 20px 20px;
 
         font-size: 18px;
 
         font-size: 18px;
 
-        position: absolute;
 
-        top: 0;
 
+        height: 70vh;
 
+        /* position: absolute; */
 
+        /*        top: 0;
 
         bottom: 0;
 
         bottom: 0;
 
         left: 0;
 
         left: 0;
 
-        right: 0;
 
+        right: 0; */
 
       }
 
       }
 
 
 
       table {
 
       table {
 
@@ -60,9 +61,11 @@
 
         margin-top: 10px;
 
         margin-top: 10px;
 
         margin-right: 240px;
 
         margin-right: 240px;
 
       }
 
       }
 
-      .autograph{
 
-    margin-top: 10px;
 
-     }
 
+
 
+      .autograph {
 
+        margin-top: 10px;
 
+      }
 
+
 
       .bottom-row3 {
 
       .bottom-row3 {
 
         margin: 10px 0;
 
         margin: 10px 0;
 
       }
 
       }
 
@@ -114,98 +117,191 @@
 
       .small-img {
 
       .small-img {
 
         margin-right: 0;
 
         margin-right: 0;
 
       }
 
       }
 
-      .sign{
 
+
 
+      .sign {
 
         margin-right: 100px;
 
         margin-right: 100px;
 
       }
 
       }
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app">
 
     <div id="app">
 
-      <div class="content" v-if="bigContent">
 
-        <div class="title">{{tableData.compName}}</div>
 
-        <div class="title">入库检斤单</div>
 
-        <div class="number">{{tableData.number}}</div>
 
-        <table class="table">
 
-          <tr class="row">
 
-            <td class="col col-bgc">客户姓名</td>
 
-            <td class="col" colspan="2">{{tableData.customer}}</td>
 
-            <td class="col col-bgc">客户电话</td>
 
-            <td class="col" >{{tableData.customerPhone}}</td>
 
-            <td class="col col-bgc">车牌号</td>
 
-            <td class="col" colspan="2">{{tableData.carNumber}}</td>
 
-          </tr>
 
-          <tr class="row">
 
-            <td class="col col-bgc">收货单位</td>
 
-            <td class="col" colspan="2">{{tableData.compName}}</td>
 
-            <td class="col col-bgc">联系人</td>
 
-            <td class="col" >{{tableData.person}}</td>
 
-            <td class="col col-bgc">联系电话</td>
 
-            <td class="col" colspan="2">{{tableData.personPhone}}</td>
 
-          </tr>
 
-          <tr class="row">
 
-            <td class="col col-bgc">货名</td>
 
-            <td class="col">{{tableData.goodsName}}</td>
 
-            <td class="col col-bgc">类型</td>
 
-            <td class="col">{{tableData.type}}</td>
 
-            <td class="col col-bgc">容量（克/升）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
 
-            <td class="col col-bgc">不完善粒（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
 
-          </tr>
 
-          <tr class="row">
 
-            <td class="col col-bgc">等级</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.grade}}</td>
 
-            <td class="col col-bgc">水分（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
 
-            <td class="col col-bgc">热损伤（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
 
-            <td class="col col-bgc">质检时间</td>
 
-            <td class="col" >{{tableData.qualityInspectionManagement.qualityDate}}</td>
 
-          </tr>
 
-          <tr class="row">
 
-            <td class="col col-bgc">杂质（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.impurity}}</td>
 
-            <td class="col col-bgc">霉变粒（%）</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
-            <td class="col col-bgc">扣杂</td>
 
-            <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
-            <td class="col " colspan="2"></td>
 
-          </tr>
 
-          <tr class="row">
 
-            <td class="col col-bgc">毛重（公斤）</td>
 
-            <td class="col">{{tableData.grossWeight}}</td>
 
-            <td class="col col-bgc">皮重（公斤）</td>
 
-            <td class="col">{{tableData.tare}}</td>
 
-            <td class="col col-bgc">扣重（公斤）</td>
 
-            <td class="col">{{tableData.buckleMiscellaneous}}</td>
 
-            <td class="col col-bgc">净重（公斤）</td>
 
-            <td class="col">{{tableData.netWeight}}</td>
 
-            <td class="col " colspan="2"></td>
 
-           
-          </tr>
 
-          <tr class="row">
 
-            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
 
-            <td class="col" colspan="2">{{tableData.grossDate}}</td>
 
-            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
 
-            <td class="col" colspan="2">{{tableData.tareDate}}</td>
 
-          </tr>
 
-        </table>
 
-        <div class="bottom">
 
-          <div class="bottom-row1">
 
-            <div>毛检：{{tableData.secretaryWeigher}}</div>
 
-            <div style="margin-left:60px">皮检：{{tableData.skinInspector}}</div>
 
-            <!-- <div>{{tableData.qualityDate}}</div> -->
 
+      <div v-if="selectPrint">
 
+        <div v-for="(item,index) in tableData1" :key="index">
 
+          <div class="content">
 
+            <div class="title">{{item.compName}}</div>
 
+            <div class="title">入库检斤单</div>
 
+            <div class="number">{{item.number}}</div>
 
+            <table class="table">
 
+              <tr class="row">
 
+                <td class="col col-bgc">客户姓名</td>
 
+                <td class="col" colspan="2">{{item.customer}}</td>
 
+                <td class="col col-bgc">客户电话</td>
 
+                <td class="col">{{item.customerPhone}}</td>
 
+                <td class="col col-bgc">车牌号</td>
 
+                <td class="col" colspan="2">{{item.carNumber}}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                <td class="col col-bgc">收货单位</td>
 
+                <td class="col" colspan="2">{{item.compName}}</td>
 
+                <td class="col col-bgc">联系人</td>
 
+                <td class="col">{{item.person}}</td>
 
+                <td class="col col-bgc">联系电话</td>
 
+                <td class="col" colspan="2">{{item.personPhone}}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                <td class="col col-bgc">货名</td>
 
+                <td class="col">{{item.goodsName}}</td>
 
+                <td class="col col-bgc">类型</td>
 
+                <td class="col">{{item.type}}</td>
 
+                <td class="col col-bgc">容量（克/升）</td>
 
+                <td class="col">{{item.qualityInspectionManagement.bulkDensity}}</td>
 
+                <td class="col col-bgc">不完善粒（%）</td>
 
+                <td class="col">{{item.qualityInspectionManagement.imperfectGrain}}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                <td class="col col-bgc">等级</td>
 
+                <td class="col">{{item.qualityInspectionManagement.grade}}</td>
 
+                <td class="col col-bgc">水分（%）</td>
 
+                <td class="col">{{item.qualityInspectionManagement.waterContent}}</td>
 
+                <td class="col col-bgc">热损伤（%）</td>
 
+                <td class="col">{{item.qualityInspectionManagement.jiaorenli}}</td>
 
+                <td class="col col-bgc">质检时间</td>
 
+                <td class="col">{{item.qualityInspectionManagement.qualityDate}}</td>
 
+              </tr>
 
+              <tr class="row">
 
+                <td class="col col-bgc">杂质（%）</td>
 
+                <td class="col">{{item.qualityInspectionManagement.impurity}}</td>
 
+                <td class="col col-bgc">霉变粒（%）</td>
 
+                <td class="col">{{item.qualityInspectionManagement.mildewGrain}}</td>
 
+                <td class="col col-bgc">扣杂</td>
 
+                <td class="col">{{item.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
+                <td class="col " colspan="2"></td>
 
+              </tr>
 
+              <tr class="row">
 
+                <td class="col col-bgc">毛重（公斤）</td>
 
+                <td class="col">{{item.grossWeight}}</td>
 
+                <td class="col col-bgc">皮重（公斤）</td>
 
+                <td class="col">{{item.tare}}</td>
 
+                <td class="col col-bgc">扣重（公斤）</td>
 
+                <td class="col">{{item.buckleMiscellaneous}}</td>
 
+                <td class="col col-bgc">净重（公斤）</td>
 
+                <td class="col">{{item.netWeight}}</td>
 
+                <!-- <td class="col " colspan="2"></td> -->
 
+
 
+              </tr>
 
+              <tr class="row">
 
+                <td class="col col-bgc" colspan="2">毛重检斤时间</td>
 
+                <td class="col" colspan="2">{{item.grossDate}}</td>
 
+                <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
 
+                <td class="col" colspan="2">{{item.tareDate}}</td>
 
+              </tr>
 
+            </table>
 
+            <div class="bottom">
 
+              <div class="bottom-row1">
 
+                <div>毛检：{{item.secretaryWeigher}}</div>
 
+                <div style="margin-left:60px">皮检：{{item.skinInspector}}</div>
 
+                <!-- <div>{{tableData.qualityDate}}</div> -->
 
+              </div>
 
+              <div class="bottom-row2">
 
+                <!-- <div class="left">
 
+                <img src="../img/add.png" alt="">
 
+              </div> -->
 
+                <div class="config">收货单位签名或盖章：</div>
 
+                <div class="autograph">客户签名：</div>
 
+              </div>
 
+              <!-- <div class="bottom-row3">扫一扫</div> -->
 
+            </div>
 
           </div>
 
           </div>
 
-          <div class="bottom-row2">
 
-            <!-- <div class="left">
 
-              <img src="../img/add.png" alt="">
 
-            </div> -->
 
-            <div class="config">收货单位签名或盖章：</div>
 
-            <div class="autograph">客户签名：</div>
 
+        </div>
 
+      </div>
 
+      <div v-else>
 
+        <div class="content" v-if="bigContent">
 
+          <div class="title">{{tableData.compName}}</div>
 
+          <div class="title">入库检斤单</div>
 
+          <div class="number">{{tableData.number}}</div>
 
+          <table class="table">
 
+            <tr class="row">
 
+              <td class="col col-bgc">客户姓名</td>
 
+              <td class="col" colspan="2">{{tableData.customer}}</td>
 
+              <td class="col col-bgc">客户电话</td>
 
+              <td class="col">{{tableData.customerPhone}}</td>
 
+              <td class="col col-bgc">车牌号</td>
 
+              <td class="col" colspan="2">{{tableData.carNumber}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">收货单位</td>
 
+              <td class="col" colspan="2">{{tableData.compName}}</td>
 
+              <td class="col col-bgc">联系人</td>
 
+              <td class="col">{{tableData.person}}</td>
 
+              <td class="col col-bgc">联系电话</td>
 
+              <td class="col" colspan="2">{{tableData.personPhone}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">货名</td>
 
+              <td class="col">{{tableData.goodsName}}</td>
 
+              <td class="col col-bgc">类型</td>
 
+              <td class="col">{{tableData.type}}</td>
 
+              <td class="col col-bgc">容量（克/升）</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
 
+              <td class="col col-bgc">不完善粒（%）</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">等级</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.grade}}</td>
 
+              <td class="col col-bgc">水分（%）</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
 
+              <td class="col col-bgc">热损伤（%）</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
 
+              <td class="col col-bgc">质检时间</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.qualityDate}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">杂质（%）</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.impurity}}</td>
 
+              <td class="col col-bgc">霉变粒（%）</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
+              <td class="col col-bgc">扣杂</td>
 
+              <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
+              <td class="col " colspan="2"></td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">毛重（公斤）</td>
 
+              <td class="col">{{tableData.grossWeight}}</td>
 
+              <td class="col col-bgc">皮重（公斤）</td>
 
+              <td class="col">{{tableData.tare}}</td>
 
+              <td class="col col-bgc">扣重（公斤）</td>
 
+              <td class="col">{{tableData.buckleMiscellaneous}}</td>
 
+              <td class="col col-bgc">净重（公斤）</td>
 
+              <td class="col">{{tableData.netWeight}}</td>
 
+              <td class="col " colspan="2"></td>
 
+
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc" colspan="2">毛重检斤时间</td>
 
+              <td class="col" colspan="2">{{tableData.grossDate}}</td>
 
+              <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
 
+              <td class="col" colspan="2">{{tableData.tareDate}}</td>
 
+            </tr>
 
+          </table>
 
+          <div class="bottom">
 
+            <div class="bottom-row1">
 
+              <div>毛检：{{tableData.secretaryWeigher}}</div>
 
+              <div style="margin-left:60px">皮检：{{tableData.skinInspector}}</div>
 
+              <!-- <div>{{tableData.qualityDate}}</div> -->
 
+            </div>
 
+            <div class="bottom-row2">
 
+              <!-- <div class="left">
 
+                <img src="../img/add.png" alt="">
 
+              </div> -->
 
+              <div class="config">收货单位签名或盖章：</div>
 
+              <div class="autograph">客户签名：</div>
 
+            </div>
 
+            <!-- <div class="bottom-row3">扫一扫</div> -->
 
           </div>
 
           </div>
 
-          <!-- <div class="bottom-row3">扫一扫</div> -->
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
+
 
       <div class="small-content" v-if="smallContent">
 
       <div class="small-content" v-if="smallContent">
 
         <div class="small-title">
 
         <div class="small-title">
 
           <div>粮食检斤单</div>
 
           <div>粮食检斤单</div>
 
@@ -247,22 +343,22 @@
 
           <div>{{tableData.type}}</div>
 
           <div>{{tableData.type}}</div>
 
         </div>
 
         </div>
 
         <div class="small-row">
 
         <div class="small-row">
 
-            <div>皮重（公斤）</div>
 
-            <div>{{tableData.tare}}</div>
 
-          </div>
 
-          <div class="small-row">
 
-            <div>皮检时间</div>
 
-            <div>{{tableData.tareDate}}</div>
 
-          </div>
 
-          <div class="small-row">
 
-            <div>毛重（公斤）</div>
 
-            <div>{{tableData.grossWeight}}</div>
 
-          </div>
 
-          <div class="small-row">
 
-            <div>毛检时间</div>
 
-            <div>{{tableData.grossDate}}</div>
 
-          </div>
 
-        
+          <div>皮重（公斤）</div>
 
+          <div>{{tableData.tare}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>皮检时间</div>
 
+          <div>{{tableData.tareDate}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>毛重（公斤）</div>
 
+          <div>{{tableData.grossWeight}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>毛检时间</div>
 
+          <div>{{tableData.grossDate}}</div>
 
+        </div>
 
+
 
         <!-- <div class="small-row">
 
         <!-- <div class="small-row">
 
           <div>扣杂（公斤）</div>
 
           <div>扣杂（公斤）</div>
 
           <div>{{tableData.buckleMiscellaneous}}</div>
 
           <div>{{tableData.buckleMiscellaneous}}</div>
 
@@ -287,6 +383,8 @@
 
         tableData: {
 
         tableData: {
 
           // qualityInspectionManagement:{}
 
           // qualityInspectionManagement:{}
 
         },
 
         },
 
+        tableData1: [],
 
+        selectPrint: false,
 
         name: "",
 
         name: "",
 
         bigContent: false,
 
         bigContent: false,
 
         smallContent: false
 
         smallContent: false
 
@@ -328,9 +426,15 @@
 
           this.smallContent = true
 
           this.smallContent = true
 
           this.bigContent = false
 
           this.bigContent = false
 
         }
 
         }
 
-        console.log(_data,"sddsd")
 
-        this.tableData = JSON.parse(_data)
 
-        console.log(this.tableData)
 
+        if (_data == 'false') {
 
+          this.selectPrint = true;
 
+          this.tableData1 = JSON.parse(sessionStorage.getItem('selectPrint_jjSelectPrintList'))
 
+        } else {
 
+          this.tableData = JSON.parse(_data)
 
+          console.log(this.tableData)
 
+
 
+        }
 
+
 
         document.title = "粮食检斤单"
 
         document.title = "粮食检斤单"
 
         window.print()
 
         window.print()
 
         window.onafterprint = function(event) {
 
         window.onafterprint = function(event) {

+ 1 - 2
src/components/mapdrag/warehouseReceiptMap.vue
查看文件 

@@ -57,7 +57,6 @@
 
     computed: {},
 
     computed: {},
 
     watch: {
 
     watch: {
 
       listData: function(val1, val2) {
 
       listData: function(val1, val2) {
 
-        debugger
 
         this.listData = val1
 
         this.listData = val1
 
         var that = this
 
         var that = this
 
         this.map = new AMap.Map('mapContainer', {
 
         this.map = new AMap.Map('mapContainer', {
 
@@ -120,7 +119,7 @@
 
               infoWindow.close(that.map, e.target.getPosition())
 
               infoWindow.close(that.map, e.target.getPosition())
 
             }
 
             }
 
 
 
-            function toGetList(e) {debugger
 
+            function toGetList(e) {
 
               // console.log(e.target.getExtData())
 
               // console.log(e.target.getExtData())
 
               
               
               that.$parent.getList(e.target.getExtData().id, 1)
 
               that.$parent.getList(e.target.getExtData().id, 1)

+ 0 - 1
src/views/houseSelfCollect/acquisitionManagementAdd.vue
查看文件 

@@ -853,7 +853,6 @@
 
           isValidate = this.validate()
 
           isValidate = this.validate()
 
          
          
         if (isValidate) {
 
         if (isValidate) {
 
-          debugger
 
           this.makeTableList()
 
           this.makeTableList()
 
           this.baseInfoForm.details = []
 
           this.baseInfoForm.details = []
 
           this.makePriceDataList()
 
           this.makePriceDataList()

+ 408 - 369
src/views/houseSelfCollect/weighingManagement.vue
查看文件 

@@ -1,408 +1,447 @@
 
 <!--检斤管理-->
 
 <!--检斤管理-->
 
 <template>
 
 <template>
 
-	<div>
 
-		<BaseHeaderLayout :leftSpan="16">
 
-			<template slot="left"> </template>
 
-			<template slot="right">
 
-				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
 
-					style="margin: 0 10px">
 
-					<ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
 
-						style="color: #8890b1" />
 
-				</ws-select>
 
-				<div></div>
 
-				<ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
 
-				</ws-input>
 
-				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
 
+  <div>
 
+    <BaseHeaderLayout :leftSpan="16">
 
+      <template slot="left">
 
+        <ws-button type="primary" @click="print('',1)"
 
+          v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">批量打印
 
+        </ws-button>
 
+      </template>
 
+      <template slot="right">
 
+        <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
 
+          style="margin: 0 10px">
 
+          <ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
 
+            style="color: #8890b1" />
 
+        </ws-select>
 
+        <div></div>
 
+        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
 
+        </ws-input>
 
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
 
               vertical-align: text-top;
 
               vertical-align: text-top;
 
               position: relative;
 
               position: relative;
 
               top: 0px;
 
               top: 0px;
 
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 
-			</template>
 
-		</BaseHeaderLayout>
 
-		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600">
 
-			<el-table-column type="index" label="序号" width="50">
 
-				<template scope="scope">
 
-					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
-					<span v-else>{{ scope.$index + 1 }}</span>
 
-				</template>
 
-			</el-table-column>
 
-			<el-table-column prop="number" width="150" label="编号"></el-table-column>
 
-			<el-table-column prop="customer" label="客户"></el-table-column>
 
-			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
 
-			<el-table-column prop="goodsName" label="货名"></el-table-column>
 
-			<el-table-column prop="type" label="类型"></el-table-column>
 
-			<el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
 
-			<el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
 
-			<el-table-column prop="buckleMiscellaneous" label="扣杂"></el-table-column>
 
-			<el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
 
-			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
 
-			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>
 
-			<el-table-column prop="secretaryWeigher" label="司称员">
 
-				<template slot-scope="scope">
 
-					<div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
 
-					<div v-else>{{scope.row.secretaryWeigher}}<span
 
-							v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
 
-				</template>
 
-			</el-table-column>
 
-			<el-table-column prop="suqualityTestingDate" label="称重时间" width="90">
 
-				<template slot-scope="scope">
 
-					<div v-if="
 
+      </template>
 
+    </BaseHeaderLayout>
 
+    <el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600"
 
+      @row-click="handleRowClick" @selection-change="handleSelectionChange">
 
+      <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
 
+      <el-table-column type="index" label="序号" width="50">
 
+        <template scope="scope">
 
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
+          <span v-else>{{ scope.$index + 1 }}</span>
 
+        </template>
 
+      </el-table-column>
 
+      <el-table-column prop="number" width="150" label="编号"></el-table-column>
 
+      <el-table-column prop="customer" label="客户"></el-table-column>
 
+      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
 
+      <el-table-column prop="goodsName" label="货名"></el-table-column>
 
+      <el-table-column prop="type" label="类型"></el-table-column>
 
+      <el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
 
+      <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
 
+      <el-table-column prop="buckleMiscellaneous" label="扣杂"></el-table-column>
 
+      <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
 
+      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
 
+      <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
 
+      <el-table-column prop="secretaryWeigher" label="司称员">
 
+        <template slot-scope="scope">
 
+          <div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
 
+          <div v-else>{{scope.row.secretaryWeigher}}<span
 
+              v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
 
+        </template>
 
+      </el-table-column>
 
+      <el-table-column prop="suqualityTestingDate" label="称重时间" width="90">
 
+        <template slot-scope="scope">
 
+          <div v-if="
 
               scope.row.status == '已称毛重'
 
               scope.row.status == '已称毛重'
 
             "> {{scope.row.grossDate}}</div>
 
             "> {{scope.row.grossDate}}</div>
 
-					<div v-if="
 
+          <div v-if="
 
               scope.row.status == '已称皮重'
 
               scope.row.status == '已称皮重'
 
             "> {{scope.row.tareDate}}</div>
 
             "> {{scope.row.tareDate}}</div>
 
-				</template>
 
-			</el-table-column>
 
-			<el-table-column prop="status" label="状态"></el-table-column>
 
-			<el-table-column width="300" prop="contractNo1" label="操作">
 
-				<template slot-scope="scope">
 
-					<el-button @click="weightCheck(scope.row, 1)"
 
-						v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' "
 
-						v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`">毛重</el-button>
 
-					<!-- scope.row.paymentManagement.status == '待结算' && -->
 
-					<el-button :disabled="scope.row.allow == 2" @click="weightCheck(scope.row, 2)"
 
-						v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
 
-						v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
 
-					<el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"
 
-						v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
 
-				</template>
 
-			</el-table-column>
 
-		</el-table>
 
-		<div style="text-align: center;margin-top:20px">
 
-			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 
-				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 
-				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 
-			</el-pagination>
 
-		</div>
 
-		<el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
 
-			<weightCheckPrint :tableData="dialogData"></weightCheckPrint>
 
-			<div style="text-align:center">
 
-				<el-button type="primary" @click="isShowPrint = false">关闭</el-button>
 
-				<el-button type="primary" @click="printSmall">打印小票</el-button>
 
-				<el-button type="primary" @click="printBig">打印单据</el-button>
 
-			</div>
 
-		</el-dialog>
 
-	</div>
 
+        </template>
 
+      </el-table-column>
 
+      <el-table-column prop="status" label="状态"></el-table-column>
 
+      <el-table-column width="300" prop="contractNo1" label="操作">
 
+        <template slot-scope="scope">
 
+          <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' "
 
+            v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`">毛重</el-button>
 
+          <!-- scope.row.paymentManagement.status == '待结算' && -->
 
+          <el-button :disabled="scope.row.allow == 2" @click="weightCheck(scope.row, 2)"
 
+            v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
 
+            v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
 
+          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"
 
+            v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
 
+        </template>
 
+      </el-table-column>
 
+    </el-table>
 
+    <div style="text-align: center;margin-top:20px">
 
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
 
+        :total="deptBudgetTotal">
 
+      </el-pagination>
 
+    </div>
 
+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
 
+      <weightCheckPrint :tableData="dialogData"></weightCheckPrint>
 
+      <div style="text-align:center">
 
+        <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
 
+        <el-button type="primary" @click="printSmall">打印小票</el-button>
 
+        <el-button type="primary" @click="printBig">打印单据</el-button>
 
+      </div>
 
+    </el-dialog>
 
+  </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
-	import {
 
-		getweighingList,
 
-		selectWarehouseSelf,
 
-		getPrint
 
-	} from '@/model/houseSelfCollect/index'
 
-	import weightCheckPrint from './component/weightCheckPrint.vue'
 
+  import {
 
+    getweighingList,
 
+    selectWarehouseSelf,
 
+    getPrint
 
+  } from '@/model/houseSelfCollect/index'
 
+  import weightCheckPrint from './component/weightCheckPrint.vue'
 
 
 
-	export default {
 
-		components: {
 
-			weightCheckPrint
 
-		},
 
-		watch: {},
 
-		data() {
 
-			return {
 
-				//分页
 
-				currentPage: 1,
 
-				pageSize: 10,
 
-				deptCircularPage: {},
 
-				deptBudgetTotal: 0,
 
-				paymentForm: false,
 
-				paymentForm1: false,
 
-				weighingList: [],
 
-				searchKeyWord: '',
 
-				searchType: [],
 
-				warehouseName: '',
 
-				value1: '', //选择时间
 
-				warehouseList: [],
 
-				warehouseId: '',
 
-				cangid: '',
 
-				monitorUrl1: '',
 
-				monitorUrl2: '',
 
-				isShowPrint: false, //打印弹出
 
-				dialogData: {
 
-					qualityInspectionManagement: {},
 
-				},
 
-				purchasePriceList: [],
 
-				allowEdit: '0',
 
-				disabled: false
 
-			}
 
-		},
 
-		activated() {
 
-			this.selectWarehouse()
 
+  export default {
 
+    components: {
 
+      weightCheckPrint
 
+    },
 
+    watch: {},
 
+    data() {
 
+      return {
 
+        //分页
 
+        currentPage: 1,
 
+        pageSize: 10,
 
+        deptCircularPage: {},
 
+        deptBudgetTotal: 0,
 
+        paymentForm: false,
 
+        paymentForm1: false,
 
+        weighingList: [],
 
+        searchKeyWord: '',
 
+        searchType: [],
 
+        warehouseName: '',
 
+        value1: '', //选择时间
 
+        warehouseList: [],
 
+        warehouseId: '',
 
+        cangid: '',
 
+        monitorUrl1: '',
 
+        monitorUrl2: '',
 
+        isShowPrint: false, //打印弹出
 
+        dialogData: {
 
+          qualityInspectionManagement: {},
 
+        },
 
+        purchasePriceList: [],
 
+        allowEdit: '0',
 
+        disabled: false,
 
+        isShowPrintType: false,
 
+        modification: [],
 
+        jjSelectPrintList: [],
 
+      }
 
+    },
 
+    activated() {
 
+      this.selectWarehouse()
 
 
 
-		},
 
-		methods: {
 
-			printSmall() {
 
-				window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData))
 
-			},
 
-			printBig() {
 
-				window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
 
-			},
 
-			print(row) {
 
-				getPrint({
 
-						id: row.id
 
-					})
 
-					.toPromise()
 
-					.then((response) => {
 
-						this.dialogData = response
 
-						this.isShowPrint = true
 
-					})
 
-					.catch((response) => {
 
-						// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
-					})
 
-			},
 
-			warehouseNameChange(e) {
 
-				// this.warehouseName = e
 
-				for (let i = 0; i < this.warehouseList.length; i++) {
 
-					if (this.warehouseList[i].value == e) {
 
-						this.warehouseId = this.warehouseList[i].warehouseId
 
-						this.cangid = this.warehouseList[i].warehouseId
 
-						this.allowEdit = this.warehouseList[i].allowEdit
 
-						this.WAREHOUSE[2].payname = this.warehouseList[i].value
 
-						this.common.name = this.warehouseList[i].value
 
-						this.monitorUrl1 = this.warehouseList[i].monitorUrl1
 
-						this.monitorUrl2 = this.warehouseList[i].monitorUrl2
 
-						sessionStorage.setItem('ck', e)
 
-						sessionStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
 
-					}
 
-				}
 
-				this.getList()
 
-			},
 
-			weightCheck(row, num) {
 
-				this.$router.push({
 
-					path: 'weightCheck',
 
-					query: {
 
-						tpyeNo: num,
 
-						id: row.id,
 
-						number: row.number,
 
-						binNumber: row.binNumber,
 
-						customer: row.customer,
 
-						storageNumber: row.storageNumber,
 
-						carNumber: row.carNumber,
 
-						goodsName: row.goodsName,
 
-						grossWeight: row.grossWeight,
 
-						tare: row.tare,
 
-						netWeight: row.netWeight,
 
-						relationId: row.relationId,
 
-						warehouseId: this.warehouseId,
 
-						monitorUrl1: this.monitorUrl1,
 
-						monitorUrl2: this.monitorUrl2,
 
-						allowEdit: this.allowEdit,
 
-						cangid: this.cangid,
 
-						warehouseName:this.warehouseName,
 
-						paramType: row.qualityInspectionManagement.paramType
 
-					},
 
-				})
 
-			},
 
-			find() {
 
-				this.getList()
 
-			},
 
-			handleSizeChange(val) {
 
-				console.log(`每页 ${val} 条`)
 
-				this.pageSize = val
 
-				this.getList()
 
-			},
 
-			handleCurrentChange(val) {
 
-				this.currentPage = val
 
-				console.log(`当前页: ${val}`)
 
-				this.getList()
 
-			},
 
-			selectWarehouse() {
 
-				let _wareHouse = sessionStorage.getItem('houseSelfCollect_house1')
 
-				_wareHouse = JSON.parse(_wareHouse)
 
-				selectWarehouseSelf({
 
-						compId: sessionStorage.getItem('ws-pf_compId'),
 
-					})
 
-					.toPromise()
 
-					.then((response) => {
 
-						this.warehouseList = []
 
+    },
 
+    methods: {
 
+      handleRowClick(row) {},
 
+      handleSelectionChange(val) {
 
+        this.modification = val
 
+      },
 
+      printSmall() {
 
+        window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData))
 
+      },
 
+      printBig(type) {
 
+        if (type == 1) {
 
+          sessionStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
 
+          window.open('../../../../static/weightCheck.html?type=2')
 
+        } else {
 
 
 
-						for (let i = 0; i < response.length; i++) {
 
-							this.warehouseList.push({
 
-								value: response[i].warehouseName,
 
-								warehouseId: response[i].id,
 
-								allowEdit: response[i].allowEdit,
 
-								monitorUrl1: response[i].monitorUrl1,
 
-								monitorUrl2: response[i].monitorUrl2,
 
-								id: response[i].id,
 
-								warehouseNo:response[i].commonWarehouseNo
 
-							})
 
-							if (_wareHouse) {
 
-								this.cangid = _wareHouse.id
 
-								this.warehouseName = _wareHouse.value
 
-								this.common.name = _wareHouse.value
 
-								this.warehouseId = _wareHouse.id
 
-								this.warehouseNo = _wareHouse.warehouseNo
 
-								this.monitorUrl1 = _wareHouse.monitorUrl1
 
-								this.allowEdit = _wareHouse.allowEdit
 
-								this.monitorUrl2 = _wareHouse.monitorUrl2
 
-							} else {
 
-								if (this.cangid && this.cangid == response[i].id) {
 
-									this.warehouseName = response[i].warehouseName
 
-									this.allowEdit = response[i].allowEdit
 
-									this.common.name = response[i].warehouseName
 
-									this.warehouseId = response[i].id
 
-									this.warehouseNo = response[i].commonWarehouseNo
 
-									this.monitorUrl1 = response[i].monitorUrl1
 
-									this.monitorUrl2 = response[i].monitorUrl2
 
-								}
 
+          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
 
+        }
 
+      },
 
+      print(row, type) {
 
+        if (type == 1) {
 
+          let index1 = 0;
 
+          for (let i = 0; i < this.modification.length; i++) {
 
+            getPrint({
 
+                id: this.modification[i].id
 
+              })
 
+              .toPromise()
 
+              .then((response) => {
 
+                index1++;
 
+                  this.jjSelectPrintList.push(response)
 
+                if (index1 == this.modification.length) {
 
+                  this.printBig(1)
 
+                }
 
+              })
 
+              .catch((response) => {
 
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
+              })
 
+          }
 
+        } else {
 
+          getPrint({
 
+              id: row.id
 
+            })
 
+            .toPromise()
 
+            .then((response) => {
 
+              this.dialogData = response
 
+              this.isShowPrint = true
 
+            })
 
+            .catch((response) => {
 
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
+            })
 
+        }
 
 
 
-								if (this.warehouseList.length > 0 && !this.cangid) {
 
-									this.warehouseName = this.warehouseList[0].value
 
-									this.allowEdit = this.warehouseList[0].allowEdit
 
-									this.cangid = this.warehouseList[0].warehouseId
 
-									this.warehouseId = this.warehouseList[0].warehouseId
 
-									this.WAREHOUSE[1].payname = this.warehouseList[0].value
 
-									this.common.name = this.warehouseList[0].value
 
-									this.monitorUrl1 = this.warehouseList[0].monitorUrl1
 
-									this.monitorUrl2 = this.warehouseList[0].monitorUrl2
 
-								}
 
-							}
 
-						}
 
-						sessionStorage.setItem('ck', this.common.name)
 
-						console.log(this.warehouseList)
 
-						this.getList()
 
-					})
 
-			},
 
-			getList() {
 
-				getweighingList({
 
-						compId: sessionStorage.getItem('ws-pf_compId'),
 
-						currentPage: this.currentPage,
 
-						pageSize: this.pageSize,
 
-						searchKeyWord: this.searchKeyWord,
 
-						warehouseName: this.warehouseName,
 
-						managementType: 1
 
-					})
 
-					.toPromise()
 
-					.then((response) => {
 
-						for (let i = 0; i < response.records.length; i++) {
 
-							if (response.records[i].paymentManagement) {
 
-								if (response.records[i].paymentManagement.approveStatus || response.records[i]
 
-									.paymentManagement.status != '待结算') {
 
-									response.records[i].allow = 2
 
-								}
 
-							} else {
 
-								response.records[i].allow = 1
 
-							}
 
-						}
 
-						this.weighingList = response.records
 
-						this.common.commonWeighingList = response.records
 
-						this.deptBudgetTotal = response.total
 
-					})
 
-					.catch((response) => {
 
-						// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
-					})
 
-			},
 
-		},
 
-	}
 
+      },
 
+      warehouseNameChange(e) {
 
+        // this.warehouseName = e
 
+        for (let i = 0; i < this.warehouseList.length; i++) {
 
+          if (this.warehouseList[i].value == e) {
 
+            this.warehouseId = this.warehouseList[i].warehouseId
 
+            this.cangid = this.warehouseList[i].warehouseId
 
+            this.allowEdit = this.warehouseList[i].allowEdit
 
+            this.WAREHOUSE[2].payname = this.warehouseList[i].value
 
+            this.common.name = this.warehouseList[i].value
 
+            this.monitorUrl1 = this.warehouseList[i].monitorUrl1
 
+            this.monitorUrl2 = this.warehouseList[i].monitorUrl2
 
+            sessionStorage.setItem('ck', e)
 
+            sessionStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
 
+          }
 
+        }
 
+        this.getList()
 
+      },
 
+      weightCheck(row, num) {
 
+        this.$router.push({
 
+          path: 'weightCheck',
 
+          query: {
 
+            tpyeNo: num,
 
+            id: row.id,
 
+            number: row.number,
 
+            binNumber: row.binNumber,
 
+            customer: row.customer,
 
+            storageNumber: row.storageNumber,
 
+            carNumber: row.carNumber,
 
+            goodsName: row.goodsName,
 
+            grossWeight: row.grossWeight,
 
+            tare: row.tare,
 
+            netWeight: row.netWeight,
 
+            relationId: row.relationId,
 
+            warehouseId: this.warehouseId,
 
+            monitorUrl1: this.monitorUrl1,
 
+            monitorUrl2: this.monitorUrl2,
 
+            allowEdit: this.allowEdit,
 
+            cangid: this.cangid,
 
+            warehouseName: this.warehouseName,
 
+            paramType: row.qualityInspectionManagement.paramType
 
+          },
 
+        })
 
+      },
 
+      find() {
 
+        this.getList()
 
+      },
 
+      handleSizeChange(val) {
 
+        console.log(`每页 ${val} 条`)
 
+        this.pageSize = val
 
+        this.getList()
 
+      },
 
+      handleCurrentChange(val) {
 
+        this.currentPage = val
 
+        console.log(`当前页: ${val}`)
 
+        this.getList()
 
+      },
 
+      selectWarehouse() {
 
+        let _wareHouse = sessionStorage.getItem('houseSelfCollect_house1')
 
+        _wareHouse = JSON.parse(_wareHouse)
 
+        selectWarehouseSelf({
 
+            compId: sessionStorage.getItem('ws-pf_compId'),
 
+          })
 
+          .toPromise()
 
+          .then((response) => {
 
+            this.warehouseList = []
 
+
 
+            for (let i = 0; i < response.length; i++) {
 
+              this.warehouseList.push({
 
+                value: response[i].warehouseName,
 
+                warehouseId: response[i].id,
 
+                allowEdit: response[i].allowEdit,
 
+                monitorUrl1: response[i].monitorUrl1,
 
+                monitorUrl2: response[i].monitorUrl2,
 
+                id: response[i].id,
 
+                warehouseNo: response[i].commonWarehouseNo
 
+              })
 
+              if (_wareHouse) {
 
+                this.cangid = _wareHouse.id
 
+                this.warehouseName = _wareHouse.value
 
+                this.common.name = _wareHouse.value
 
+                this.warehouseId = _wareHouse.id
 
+                this.warehouseNo = _wareHouse.warehouseNo
 
+                this.monitorUrl1 = _wareHouse.monitorUrl1
 
+                this.allowEdit = _wareHouse.allowEdit
 
+                this.monitorUrl2 = _wareHouse.monitorUrl2
 
+              } else {
 
+                if (this.cangid && this.cangid == response[i].id) {
 
+                  this.warehouseName = response[i].warehouseName
 
+                  this.allowEdit = response[i].allowEdit
 
+                  this.common.name = response[i].warehouseName
 
+                  this.warehouseId = response[i].id
 
+                  this.warehouseNo = response[i].commonWarehouseNo
 
+                  this.monitorUrl1 = response[i].monitorUrl1
 
+                  this.monitorUrl2 = response[i].monitorUrl2
 
+                }
 
+
 
+                if (this.warehouseList.length > 0 && !this.cangid) {
 
+                  this.warehouseName = this.warehouseList[0].value
 
+                  this.allowEdit = this.warehouseList[0].allowEdit
 
+                  this.cangid = this.warehouseList[0].warehouseId
 
+                  this.warehouseId = this.warehouseList[0].warehouseId
 
+                  this.WAREHOUSE[1].payname = this.warehouseList[0].value
 
+                  this.common.name = this.warehouseList[0].value
 
+                  this.monitorUrl1 = this.warehouseList[0].monitorUrl1
 
+                  this.monitorUrl2 = this.warehouseList[0].monitorUrl2
 
+                }
 
+              }
 
+            }
 
+            sessionStorage.setItem('ck', this.common.name)
 
+            console.log(this.warehouseList)
 
+            this.getList()
 
+          })
 
+      },
 
+      getList() {
 
+        getweighingList({
 
+            compId: sessionStorage.getItem('ws-pf_compId'),
 
+            currentPage: this.currentPage,
 
+            pageSize: this.pageSize,
 
+            searchKeyWord: this.searchKeyWord,
 
+            warehouseName: this.warehouseName,
 
+            managementType: 1
 
+          })
 
+          .toPromise()
 
+          .then((response) => {
 
+            for (let i = 0; i < response.records.length; i++) {
 
+              if (response.records[i].paymentManagement) {
 
+                if (response.records[i].paymentManagement.approveStatus || response.records[i]
 
+                  .paymentManagement.status != '待结算') {
 
+                  response.records[i].allow = 2
 
+                }
 
+              } else {
 
+                response.records[i].allow = 1
 
+              }
 
+            }
 
+            this.weighingList = response.records
 
+            this.common.commonWeighingList = response.records
 
+            this.deptBudgetTotal = response.total
 
+          })
 
+          .catch((response) => {
 
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
+          })
 
+      },
 
+    },
 
+  }
 
 </script>
 
 </script>
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>
 
-	.title {
 
-		font-size: 20px;
 
-		font-weight: 600;
 
-		margin: 20px;
 
-	}
 
+  .title {
 
+    font-size: 20px;
 
+    font-weight: 600;
 
+    margin: 20px;
 
+  }
 
 
 
-	.ws-info-table {
 
-		border: none;
 
-	}
 
+  .ws-info-table {
 
+    border: none;
 
+  }
 
 
 
-	.ws-info-table .el-form-item {
 
-		width: 50%;
 
-		border: none;
 
-	}
 
+  .ws-info-table .el-form-item {
 
+    width: 50%;
 
+    border: none;
 
+  }
 
 
 
-	/deep/.ws-info-table .el-form-item .el-form-item__label {
 
-		width: 30%;
 
-		text-align: center;
 
-		background: #ffffff;
 
-		color: #8890b1;
 
-	}
 
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
 
+    width: 30%;
 
+    text-align: center;
 
+    background: #ffffff;
 
+    color: #8890b1;
 
+  }
 
 
 
-	/deep/.ws-info-table .el-form-item .el-form-item__content {
 
-		border: none;
 
-	}
 
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
 
+    border: none;
 
+  }
 
 
 
-	/deep/.el-table .el-table__header .cell,
 
-	.el-table .el-table__body .cell {
 
-		text-align: center;
 
-	}
 
+  /deep/.el-table .el-table__header .cell,
 
+  .el-table .el-table__body .cell {
 
+    text-align: center;
 
+  }
 
 
 
-	/deep/.el-table--enable-row-transition .el-table__body td {
 
-		text-align: center;
 
-	}
 
+  /deep/.el-table--enable-row-transition .el-table__body td {
 
+    text-align: center;
 
+  }
 
 
 
-	.formItem {
 
-		width: 51% !important;
 
-	}
 
+  .formItem {
 
+    width: 51% !important;
 
+  }
 
 
 
-	/deep/.el-dialog__title {
 
-		font-size: 24px !important;
 
-	}
 
+  /deep/.el-dialog__title {
 
+    font-size: 24px !important;
 
+  }
 
 
 
-	/deep/.el-dialog__header {
 
-		text-align: center !important;
 
-		padding: 10px 0 !important;
 
-		height: auto !important;
 
-	}
 
+  /deep/.el-dialog__header {
 
+    text-align: center !important;
 
+    padding: 10px 0 !important;
 
+    height: auto !important;
 
+  }
 
 
 
-	.number {
 
-		text-align: right;
 
-		margin: 0 0 10px 0;
 
-	}
 
+  .number {
 
+    text-align: right;
 
+    margin: 0 0 10px 0;
 
+  }
 
 
 
-	table,
 
-	table tr th,
 
-	table tr td {
 
-		border: 2px solid #333333;
 
-		padding: 5px 0;
 
-	}
 
+  table,
 
+  table tr th,
 
+  table tr td {
 
+    border: 2px solid #333333;
 
+    padding: 5px 0;
 
+  }
 
 
 
-	table {
 
-		width: 100%;
 
-		min-height: 25px;
 
-		line-height: 25px;
 
-		text-align: center;
 
-		border-collapse: collapse;
 
-		border: 3px solid #333333;
 
-	}
 
+  table {
 
+    width: 100%;
 
+    min-height: 25px;
 
+    line-height: 25px;
 
+    text-align: center;
 
+    border-collapse: collapse;
 
+    border: 3px solid #333333;
 
+  }
 
 
 
-	.col-bgc {
 
-		background: #f6f7fb;
 
-	}
 
+  .col-bgc {
 
+    background: #f6f7fb;
 
+  }
 
 
 
-	.bottom-row1 {
 
-		display: flex;
 
-		margin: 10px 0;
 
-	}
 
+  .bottom-row1 {
 
+    display: flex;
 
+    margin: 10px 0;
 
+  }
 
 
 
-	.bottom-row2 {
 
-		display: flex;
 
-		margin: 10px 0;
 
+  .bottom-row2 {
 
+    display: flex;
 
+    margin: 10px 0;
 
 
 
-		.left {
 
-			img {
 
-				width: 41px;
 
-				height: 41px;
 
-				margin-right: 118px;
 
-			}
 
-		}
 
+    .left {
 
+      img {
 
+        width: 41px;
 
+        height: 41px;
 
+        margin-right: 118px;
 
+      }
 
+    }
 
 
 
-		.config {
 
-			margin-top: 20px;
 
-			margin-right: 240px;
 
-		}
 
+    .config {
 
+      margin-top: 20px;
 
+      margin-right: 240px;
 
+    }
 
 
 
-		.autograph {
 
-			margin-top: 20px;
 
-		}
 
-	}
 
+    .autograph {
 
+      margin-top: 20px;
 
+    }
 
+  }
 
 
 
-	.bottom-row3 {
 
-		margin: 10px 0;
 
-	}
 
+  .bottom-row3 {
 
+    margin: 10px 0;
 
+  }
 
 
 
-	.bottom-row4 {
 
-		margin-top: 50px;
 
-		text-align: center;
 
-	}
 
+  .bottom-row4 {
 
+    margin-top: 50px;
 
+    text-align: center;
 
+  }
 
 </style>
 
 </style>

+ 1 - 1
src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
查看文件 

@@ -207,7 +207,7 @@
 
             this.warehouseList = response
 
             this.warehouseList = response
 
           })
 
           })
 
       },
 
       },
 
-      getList(val, type) {debugger
 
+      getList(val, type) {
 
         // type=1 地图点击
 
         // type=1 地图点击
 
         if (type == 1) {
 
         if (type == 1) {
 
           this.isActive = true
 
           this.isActive = true