Ana Sayfa Keşfet Yardım
Üye Ol Giriş Yap
wangchao
/
yiliangyiyun-pc-jj
1
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

gjy 3 yıl önce
ebeveyn
79808e5182 08f609aa53
işleme
f218273e5a
18 değiştirilmiş dosya ile 912 ekleme ve 735 silme
Birleşik Görünüm Farklılık Durumunu Göster
  1. BIN
      public/img/mapicon.png
  2. 211 107
      public/static/weightCheck.html
  3. 4 1
      src/api/V2/tradeServicesManagement/index.js
  4. 153 141
      src/components/mapdrag/warehouseReceiptMap.vue
  5. 3 0
      src/model/tradeServicesManagement/index.js
  6. 6 5
      src/views/contractManagement/futuresPurchaseContractAdd.vue
  7. 1 1
      src/views/contractManagement/futuresPurchaseContractEdit.vue
  8. 1 1
      src/views/contractManagement/futuresSalesContractAdd.vue
  9. 1 1
      src/views/contractManagement/futuresSalesContractEdit.vue
  10. 5 1
      src/views/contractManagement/purchaseContractAdd.vue
  11. 33 29
      src/views/contractManagement/purchaseContractEdit.vue
  12. 11 8
      src/views/contractManagement/salesContractAdd.vue
  13. 7 8
      src/views/contractManagement/salesContractEdit.vue
  14. 0 1
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  15. 1 0
      src/views/houseSelfCollect/paymentManagement.vue
  16. 408 369
      src/views/houseSelfCollect/weighingManagement.vue
  17. 40 37
      src/views/tradeServicesManagement/component/routers/route.js
  18. 27 25
      src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

BIN
public/img/mapicon.png
Dosyayı Görüntüle


+ 211 - 107
public/static/weightCheck.html
Dosyayı Görüntüle 

@@ -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: 65vh;
 
+        /* 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) {

+ 4 - 1
src/api/V2/tradeServicesManagement/index.js
Dosyayı Görüntüle 

@@ -12,6 +12,9 @@ export const API_GET_WAREHOUSE_LIST = '/warehouseBaseInfo/getWarehouse'
 
 export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/getWarehouse'
 
 export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/getWarehouse'
 
 // 获取业务编号
 
 // 获取业务编号
 
 export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
 
 export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
 
+// 列表页删除
 
+export const API_POST_DELETETRANEINFO = '/tradeWarehouseReceiptAppl/deleteTrageInfo'
 
+
 
 // 出入库记录
 
 // 出入库记录
 
 export const API_GET_RECORD = 'warehouseInOutInfo/selectInfo'
 
 export const API_GET_RECORD = 'warehouseInOutInfo/selectInfo'
 
 // 查看当天出/入数量
 
 // 查看当天出/入数量
 
@@ -19,4 +22,4 @@ export const API_GET_WAREHOUSE_COUNT = '/warehouseInOutInfo/count'
 
 // 出入库调整
 
 // 出入库调整
 
 export const API_POST_WAREHOUSE_UPDATE = '/warehouseInOutInfo/adjustment'
 
 export const API_POST_WAREHOUSE_UPDATE = '/warehouseInOutInfo/adjustment'
 
 // 结算单
 
 // 结算单
 
-export const API_GET_SETTLEACCOUT = '/warehouseInOutInfo/getInfo'
 
+export const API_GET_SETTLEACCOUT = '/warehouseInOutInfo/getInfo'

+ 153 - 141
src/components/mapdrag/warehouseReceiptMap.vue
Dosyayı Görüntüle 

@@ -1,25 +1,30 @@
 
 <style lang='scss' scoped>
 
 <style lang='scss' scoped>
 
-.mapContent {
 
-  position: relative;
 
-  height: 95%;
 
-  transition: 0.5s;
 
-  .center-add {
 
-    position: absolute;
 
-    top: 0;
 
-    bottom: 0;
 
-    left: 0;
 
-    right: 0;
 
-    margin: auto;
 
-    z-index: 999;
 
-    width: 30px;
 
-    height: 30px;
 
+  .mapContent {
 
+    position: relative;
 
+    height: 95%;
 
+    transition: 0.5s;
 
+
 
+    .center-add {
 
+      position: absolute;
 
+      top: 0;
 
+      bottom: 0;
 
+      left: 0;
 
+      right: 0;
 
+      margin: auto;
 
+      z-index: 999;
 
+      width: 30px;
 
+      height: 30px;
 
+    }
 
+  }
 
+
 
+  #mapContainer {
 
+    width: 100%;
 
+    height: 100%;
 
   }
 
   }
 
-}
 
 
 
-#mapContainer {
 
-  width: 100%;
 
-  height: 100%;
 
-}
 
+  .amap-info-close {
 
+    display: none !important;
 
+  }
 
 </style>
 
 </style>
 
 
 
 <template>
 
 <template>
 
@@ -29,132 +34,139 @@
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 
-import image from '../../../public/img/ic_locationmarker.jpg'
 
-export default {
 
-  data() {
 
-    return {
 
-      clickData: {},
 
-      map: null,
 
-      marker: null,
 
-      provinces: [],
 
-      province: '',
 
-      districts: [],
 
-      district: '',
 
-      citys: [],
 
-      city: '',
 
-      polygons: [],
 
-      selectedOptions1: [],
 
-      areacode: '',
 
-      address: '',
 
-      objPoint: [],
 
-      markers: [],
 
-      zoomEnable: true,
 
-      dragEnable: true,
 
-      status: true,
 
-      center: ''
 
-    }
 
-  },
 
-  props: [
 
-    'flagVisible',
 
-    'position',
 
-    'selectedOptions',
 
-    'isShowaddress',
 
-    'type'
 
-  ],
 
-  computed: {},
 
-  watch: {},
 
-  async created() {
 
-    // 已载入高德地图API，则直接初始化地图
 
-    if (window.AMap && window.AMapUI) {
 
-      this.initMap()
 
-      // 未载入高德地图API，则先载入API再初始化
 
-    } else {
 
-      // await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}`)
 
-      // await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
 
-      // this.initMap()
 
-    }
 
-  },
 
-  mounted() {
 
-    // console.log(this)
 
-    setTimeout(() => {
 
-      var that = this
 
-      this.map = new AMap.Map('mapContainer', {
 
-        resizeEnable: true,
 
-        zoom: 5,
 
-        center:[103.809074,36.051121],
 
-        zoomEnable: this.zoomEnable,
 
-        dragEnable: this.dragEnable
 
-      })
 
-      this.loadmap()
 
-    }, 500)
 
-  },
 
-  methods: {
 
-    loadmap(val) {
 
-      let that = this
 
-      AMap.plugin(['AMap.DistrictSearch', 'AMap.Polygon'], function() {
 
-        var geolocation = new AMap.Geolocation({
 
-          // 是否使用高精度定位，默认：true
 
-          enableHighAccuracy: true, // 设置定位超时时间，默认：无穷大
 
-          timeout: 10000, // 定位按钮的停靠位置的偏移量，默认：Pixel(10, 20)
 
-          buttonOffset: new AMap.Pixel(10, 20), // 定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
 
-          zoomToAccuracy: true, // 定位按钮的排放位置, RB表示右下
 
-          buttonPosition: 'RB'
 
+  import {
 
+    regionData,
 
+    CodeToText,
 
+    TextToCode
 
+  } from 'element-china-area-data'
 
+  import image from '../../../public/img/ic_locationmarker.jpg'
 
+  export default {
 
+    data() {
 
+      return {
 
+        map: null,
 
+        marker: null,
 
+        markers: [],
 
+        zoomEnable: true,
 
+        dragEnable: true,
 
+        status: true,
 
+      }
 
+    },
 
+    props: [
 
+      'listData'
 
+    ],
 
+    computed: {},
 
+    watch: {
 
+      listData: function(val1, val2) {
 
+        this.listData = val1
 
+        var that = this
 
+        this.map = new AMap.Map('mapContainer', {
 
+          resizeEnable: true,
 
+          zoom: 5,
 
+          center: [103.809074, 36.051121],
 
+          zoomEnable: this.zoomEnable,
 
+          dragEnable: this.dragEnable
 
         })
 
         })
 
-        geolocation.getCurrentPosition()
 
-        AMap.event.addListener(geolocation, 'complete', e => {
 
-          console.log(e) // 定位成功之后做的事 // 定位成功之后再定位处添加一个marker
 
-          that.markers = [
 
-            [122.26399, 40.583527],
 
-            [122.527662, 40.581441],
 
-            [122.26811, 40.18498]
 
-          ]
 
-          var infoWindow = new AMap.InfoWindow({
 
-            offset: new AMap.Pixel(0, -30)
 
+        this.loadmap()
 
+      }
 
+    },
 
+    async created() {
 
+      // 已载入高德地图API，则直接初始化地图
 
+      if (window.AMap && window.AMapUI) {
 
+        this.initMap()
 
+        // 未载入高德地图API，则先载入API再初始化
 
+      } else {
 
+        // await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}`)
 
+        // await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
 
+        // this.initMap()
 
+      }
 
+    },
 
+    mounted() {},
 
+    methods: {
 
+      makeMarkersList() {
 
+        let _list = this.listData
 
+        for (let i = 0; i < _list.length; i++) {
 
+          _list[i].marker = []
 
+          _list[i].marker.push(_list[i].warehousePositioning.split(',')[1])
 
+          _list[i].marker.push(_list[i].warehousePositioning.split(',')[0])
 
+        }
 
+      },
 
+      loadmap(val) {
 
+        let that = this
 
+        //构造markersList
 
+        this.makeMarkersList()
 
+        AMap.plugin(['AMap.DistrictSearch', 'AMap.Polygon'], function() {
 
+          var geolocation = new AMap.Geolocation({
 
+            // 是否使用高精度定位，默认：true
 
+            enableHighAccuracy: true, // 设置定位超时时间，默认：无穷大
 
+            timeout: 10000, // 定位按钮的停靠位置的偏移量，默认：Pixel(10, 20)
 
+            buttonOffset: new AMap.Pixel(10, 20), // 定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
 
+            zoomToAccuracy: true, // 定位按钮的排放位置, RB表示右下
 
+            buttonPosition: 'RB'
 
           })
 
           })
 
-          function infoOpen(e) {
 
-            infoWindow.setContent(e.target.content)
 
-            infoWindow.open(that.map, e.target.getPosition())
 
-          }
 
-          function infoClose(e) {
 
-            infoWindow.close(that.map, e.target.getPosition())
 
-          }
 
-              function toGetList(e) {
 
-            that.$parent.getList(e,1)
 
-          }
 
-
 
-          for (let i = 0; i < that.markers.length; i++) {
 
-            var marker = new AMap.Marker({
 
-              position: that.markers[i], // （e.position）--->定位点的点坐标, position ---> marker的定位点坐标，也就是marker最终显示在那个点上，
 
-              icon: '', // marker的图标，可以自定义，不写默认使用高德自带的
 
-              map: that.map // map ---> 要显示该marker的地图对象
 
+          geolocation.getCurrentPosition()
 
+          AMap.event.addListener(geolocation, 'complete', e => {
 
+            console.log(e) // 定位成功之后做的事 // 定位成功之后再定位处添加一个marker
 
+            var infoWindow = new AMap.InfoWindow({
 
+              offset: new AMap.Pixel(0, -30)
 
             })
 
             })
 
-            // marker.setMap(that.map);
 
-            // 设置鼠标划过点标记显示的文字提示
 
-            // marker.setTitle('我是marker的title');
 
-            marker.content = '<h4>我是第' + (i + 1) + '个</h4>'
 
-            marker.on('mouseover', infoOpen)
 
-            marker.on('mouseout', infoClose)
 
-            marker.on('click',toGetList)
 
-            // 设置label标签
 
-            // label默认蓝框白底左上角显示，样式className为：amap-marker-label
 
-            // marker.setLabel({
 
-            //     offset: new AMap.Pixel(20, 20),  //设置文本标注偏移量
 
-            //     content: "<div class='info'>我是 marker 的 label 标签</div>", //设置文本标注内容
 
-            //     direction: 'right' //设置文本标注方位
 
-            // });
 
-          }
 
-          // var marker = new AMap.Marker({
 
-          //   position: e.position, // （e.position）--->定位点的点坐标, position ---> marker的定位点坐标，也就是marker最终显示在那个点上，
 
-          //   icon: '', // marker的图标，可以自定义，不写默认使用高德自带的
 
-          //   map: that.map // map ---> 要显示该marker的地图对象
 
-          // })
 
-        })
 
-        AMap.event.addListener(geolocation, 'error', e => {
 
-          console.log(e) // 定位失败做的事
 
+
 
+            function infoOpen(e) {
 
+              infoWindow.setContent(e.target.content)
 
+              infoWindow.open(that.map, e.target.getPosition())
 
+            }
 
+
 
+            function infoClose(e) {
 
+              infoWindow.close(that.map, e.target.getPosition())
 
+            }
 
+
 
+            function toGetList(e) {
 
+              // console.log(e.target.getExtData())
 
+              
+              that.$parent.getList(e.target.getExtData().id, 1)
 
+            }
 
+            for (let i = 0; i < that.listData.length; i++) {
 
+              var marker = new AMap.Marker({
 
+                map: that.map,
 
+                position: that.listData[i]
 
+                  .marker, // marker最终显示在那个点上，
 
+                icon: new AMap.Icon({
 
+                  image: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/home_pic.png",
 
+                  size: new AMap.Size(20, 20), //图标大小
 
+                  imageSize: new AMap.Size(20, 20),
 
+                }),
 
+              })
 
+
 
+              marker.setExtData({'id':that.listData[i].warehouseName})
 
+              let _cwList = '<div class="cw-wrap">'
 
+              for (let k = 0; k < that.listData[i].tradeWarehouseReceiptAppls.length; k++) {
 
+                let _k = that.listData[i].tradeWarehouseReceiptAppls[k]
 
+                _cwList += '<div style="display:flex">' +
 
+                  '<div style="margin:10px 20px">' + _k.warehouseNo + '仓位</div>' +
 
+                  '<div style="margin:10px 20px">' + _k.goodsName + '</div>' +
 
+                  '<div style="margin:10px 20px">' + _k.weight + '</div>' +
 
+                  '</div>'
 
+              }
 
+              _cwList = _cwList + '</div>'
 
+              console.log('地图仓位数据',_cwList)
 
+              marker.content = '<div style="display:flex;justify-content: center">' + that.listData[i]
 
+                .warehouseName + '</div>' + _cwList + '</div>'
 
+              marker.on('mouseover', infoOpen)
 
+              marker.on('mouseout', infoClose)
 
+              marker.on('click', toGetList)
 
+              // 设置label标签
 
+              // label默认蓝框白底左上角显示，样式className为：amap-marker-label
 
+              // marker.setLabel({
 
+              //     offset: new AMap.Pixel(20, 20),  //设置文本标注偏移量
 
+              //     content: "<div class='info'>我是 marker 的 label 标签</div>", //设置文本标注内容
 
+              //     direction: 'right' //设置文本标注方位
 
+              // });
 
+            }
 
+          })
 
+          AMap.event.addListener(geolocation, 'error', e => {
 
+            console.log(e) // 定位失败
 
+          })
 
         })
 
         })
 
-      })
 
+      }
 
     }
 
     }
 
   }
 
   }
 
-}
 
 </script>
 
 </script>

+ 3 - 0
src/model/tradeServicesManagement/index.js
Dosyayı Görüntüle 

@@ -7,6 +7,7 @@ import {
 
     API_GET_BILLNO,
 
     API_GET_BILLNO,
 
     API_GET_TRADESERVICES_LIST,
 
     API_GET_TRADESERVICES_LIST,
 
     API_POST_RECEIPTAPPL_ADD,
 
     API_POST_RECEIPTAPPL_ADD,
 
+    API_POST_DELETETRANEINFO,
 
     API_GET_RECORD,
 
     API_GET_RECORD,
 
     API_GET_WAREHOUSE_COUNT,
 
     API_GET_WAREHOUSE_COUNT,
 
     API_POST_WAREHOUSE_UPDATE,
 
     API_POST_WAREHOUSE_UPDATE,
 
@@ -24,6 +25,8 @@ export const getwarehousewarrantList = appRx.get(API_GET_WAREHOUSE_LOOK, errorCa
 
 export const editList = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
 
 export const editList = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
 
 // 获取业务编号
 
 // 获取业务编号
 
 export const getbillno = appRx.get(API_GET_BILLNO, errorCatcher, errorHandle, filter)
 
 export const getbillno = appRx.get(API_GET_BILLNO, errorCatcher, errorHandle, filter)
 
+// 列表删除
 
+export const deleteTrageInfo = appRx.post(API_POST_DELETETRANEINFO, errorCatcher, errorHandle, filter)
 
 // 出入库记录
 
 // 出入库记录
 
 export const getrecord = appRx.get(API_GET_RECORD, errorCatcher, errorHandle, filter)
 
 export const getrecord = appRx.get(API_GET_RECORD, errorCatcher, errorHandle, filter)
 
 // 查看当天出/入数量
 
 // 查看当天出/入数量

+ 6 - 5
src/views/contractManagement/futuresPurchaseContractAdd.vue
Dosyayı Görüntüle 

@@ -15,7 +15,7 @@
 
       <div class="remark">
 
       <div class="remark">
 
         <h3>基本信息</h3>
 
         <h3>基本信息</h3>
 
         <p style="color: #8890b1">
 
         <p style="color: #8890b1">
 
-          注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。
 
+          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
 
         </p>
 
         </p>
 
       </div>
 
       </div>
 
       <ws-info-table>
 
       <ws-info-table>
 
@@ -185,7 +185,7 @@
 
         <!--临时仓库负责人-->
 
         <!--临时仓库负责人-->
 
         <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
 
         <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
 
           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable
 
           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable
 
-             @change="selectstaff">
 
+            @change="selectstaff">
 
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
 
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
 
           </el-select>
 
           </el-select>
 
         </ws-form-item>
 
         </ws-form-item>
 
@@ -1884,7 +1884,8 @@
 
     width: 100%;
 
     width: 100%;
 
     text-align: left;
 
     text-align: left;
 
   }
 
   }
 
-   .inline-input {
 
-      width: 100%;
 
-    }
 
+
 
+  .inline-input {
 
+    width: 100%;
 
+  }
 
 </style>
 
 </style>

+ 1 - 1
src/views/contractManagement/futuresPurchaseContractEdit.vue
Dosyayı Görüntüle 

@@ -30,7 +30,7 @@
 
       <div class="remark">
 
       <div class="remark">
 
         <h3>基本信息</h3>
 
         <h3>基本信息</h3>
 
         <p style="color: #8890b1">
 
         <p style="color: #8890b1">
 
-          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
 
+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
 
           标记的条目提交后不可修改。
 
           标记的条目提交后不可修改。
 
         </p>
 
         </p>
 
         <div class="queren">
 
         <div class="queren">

+ 1 - 1
src/views/contractManagement/futuresSalesContractAdd.vue
Dosyayı Görüntüle 

@@ -15,7 +15,7 @@
 
       <div class="remark">
 
       <div class="remark">
 
         <h3>基本信息</h3>
 
         <h3>基本信息</h3>
 
         <p style="color: #8890b1">
 
         <p style="color: #8890b1">
 
-          注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。
 
+          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
 
         </p>
 
         </p>
 
       </div>
 
       </div>
 
       <ws-info-table>
 
       <ws-info-table>

+ 1 - 1
src/views/contractManagement/futuresSalesContractEdit.vue
Dosyayı Görüntüle 

@@ -16,7 +16,7 @@
 
       <div class="remark">
 
       <div class="remark">
 
         <h3>基本信息</h3>
 
         <h3>基本信息</h3>
 
         <p style="color: #8890b1">
 
         <p style="color: #8890b1">
 
-          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
 
+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
 
           标记的条目提交后不可修改。
 
           标记的条目提交后不可修改。
 
         </p>
 
         </p>
 
         <div class="queren">
 
         <div class="queren">

+ 5 - 1
src/views/contractManagement/purchaseContractAdd.vue
Dosyayı Görüntüle 

@@ -14,7 +14,7 @@
 
       <div class="remark">
 
       <div class="remark">
 
         <h3>基本信息</h3>
 
         <h3>基本信息</h3>
 
         <p style="color: #8890b1">
 
         <p style="color: #8890b1">
 
-          注：基本信息和货物信息均为必填项，“*” 标记的条目提交后不可修改。
 
+          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
 
         </p>
 
         </p>
 
       </div>
 
       </div>
 
       <ws-info-table>
 
       <ws-info-table>
 
@@ -684,6 +684,10 @@
 
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.agreementType = '补充协议'
 
             this.deptBudgetList.agreementType = '补充协议'
 
+            this.newSelectedOptions = this.contractNoList[i].sourceProvince+this.contractNoList[i].sourceCity+this.contractNoList[i].sourceArea
 
+            this.deptBudgetList.sourceGoods =  this.contractNoList[i].sourceGoods
 
+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince+this.contractNoList[i].deliveryCity+this.contractNoList[i].deliveryArea
 
+            this.deptBudgetList.placeDelivery =  this.contractNoList[i].placeDelivery
 
           }
 
           }
 
         }
 
         }
 
       },
 
       },

+ 33 - 29
src/views/contractManagement/purchaseContractEdit.vue
Dosyayı Görüntüle 

@@ -16,7 +16,7 @@
 
       <div class="remark">
 
       <div class="remark">
 
         <h3>基本信息</h3>
 
         <h3>基本信息</h3>
 
         <p style="color: #8890b1">
 
         <p style="color: #8890b1">
 
-          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
 
+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
 
           标记的条目提交后不可修改。
 
           标记的条目提交后不可修改。
 
         </p>
 
         </p>
 
       </div>
 
       </div>
 
@@ -462,35 +462,39 @@
 
             if (response.unitContractPrice) {
 
             if (response.unitContractPrice) {
 
               response.unitContractPrice = String(response.unitContractPrice)
 
               response.unitContractPrice = String(response.unitContractPrice)
 
             }
 
             }
 
-            var tmp = []
 
-            tmp[0] = TextToCode[response.sourceProvince].code
 
-
 
-            tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
 
-
 
-            if (tmp[0] == 810000 || tmp[0] == 820000) {
 
-              tmp[2] = null
 
-            } else {
 
-              tmp[2] =
 
-                TextToCode[response.sourceProvince][response.sourceCity][
 
-                  response.sourceArea
 
-                ].code
 
-            }
 
-            this.selectedOptions = tmp
 
-            var tmp1 = []
 
-            tmp1[0] = TextToCode[response.deliveryProvince].code
 
-            tmp1[1] =
 
-              TextToCode[response.deliveryProvince][response.deliveryCity].code
 
-
 
-            if (tmp1[0] == 810000 || tmp1[0] == 820000) {
 
-              tmp1[2] = null
 
-            } else {
 
-              tmp1[2] =
 
-                TextToCode[response.deliveryProvince][response.deliveryCity][
 
-                  response.deliveryArea
 
-                ].code
 
-            }
 
-            this.selectedOptions1 = tmp1
 
+            // var tmp = []
 
+            // tmp[0] = TextToCode[response.sourceProvince].code
 
+
 
+            // tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
 
+
 
+            // if (tmp[0] == 810000 || tmp[0] == 820000) {
 
+            //   tmp[2] = null
 
+            // } else {
 
+            //   tmp[2] =
 
+            //     TextToCode[response.sourceProvince][response.sourceCity][
 
+            //       response.sourceArea
 
+            //     ].code
 
+            // }
 
+            // this.selectedOptions = tmp
 
+            // var tmp1 = []
 
+            // tmp1[0] = TextToCode[response.deliveryProvince].code
 
+            // tmp1[1] =
 
+            //   TextToCode[response.deliveryProvince][response.deliveryCity].code
 
+
 
+            // if (tmp1[0] == 810000 || tmp1[0] == 820000) {
 
+            //   tmp1[2] = null
 
+            // } else {
 
+            //   tmp1[2] =
 
+            //     TextToCode[response.deliveryProvince][response.deliveryCity][
 
+            //       response.deliveryArea
 
+            //     ].code
 
+            // }
 
+            // this.selectedOptions1 = tmp1
 
             this.deptBudgetList = response
 
             this.deptBudgetList = response
 
+           this.newSelectedOptions = response.sourceProvince+response.sourceCity+response.sourceArea
 
+           this.deptBudgetList.sourceGoods =  response.sourceGoods
 
+           this.newSelectedOptions1 = response.deliveryProvince+response.deliveryCity+response.deliveryArea
 
+           this.deptBudgetList.placeDelivery =  response.placeDelivery
 
             if (this.deptBudgetList.deliverType == 1) {
 
             if (this.deptBudgetList.deliverType == 1) {
 
               this.deptBudgetList.deliverType1 = '我方自提'
 
               this.deptBudgetList.deliverType1 = '我方自提'
 
             } else if (this.deptBudgetList.deliverType == 2) {
 
             } else if (this.deptBudgetList.deliverType == 2) {

+ 11 - 8
src/views/contractManagement/salesContractAdd.vue
Dosyayı Görüntüle 

@@ -10,16 +10,15 @@
 
         </el-button>
 
         </el-button>
 
       </el-col>
 
       </el-col>
 
     </el-row>
 
     </el-row>
 
-
 
-    <div class="wenzi">
 
-      <h3>基本信息</h3>
 
-      <p>
 
-        &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
 
-        标记的条目提交后不可修改。
 
-      </p>
 
-    </div>
 
     <div class="center">
 
     <div class="center">
 
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
 
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
 
+      <div class="remark">
 
+        <h3>基本信息</h3>
 
+        <p style="color: #8890b1">
 
+            &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
 
+            标记的条目提交后不可修改。
 
+          </p>
 
+      </div>
 
         <!--基本信息-->
 
         <!--基本信息-->
 
         <ws-info-table>
 
         <ws-info-table>
 
           <!--合同类型-->
 
           <!--合同类型-->
 
@@ -621,6 +620,10 @@
 
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
 
             this.deptBudgetList.agreementType = '补充协议'
 
             this.deptBudgetList.agreementType = '补充协议'
 
+            this.newSelectedOptions = this.contractNoList[i].sourceProvince+this.contractNoList[i].sourceCity+this.contractNoList[i].sourceArea
 
+            this.deptBudgetList.sourceGoods =  this.contractNoList[i].sourceGoods
 
+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince+this.contractNoList[i].deliveryCity+this.contractNoList[i].deliveryArea
 
+            this.deptBudgetList.placeDelivery =  this.contractNoList[i].placeDelivery
 
           }
 
           }
 
         }
 
         }
 
       },
 
       },

+ 7 - 8
src/views/contractManagement/salesContractEdit.vue
Dosyayı Görüntüle 

@@ -10,16 +10,15 @@
 
         </el-button>
 
         </el-button>
 
       </el-col>
 
       </el-col>
 
     </el-row>
 
     </el-row>
 
-
 
-    <div class="wenzi">
 
-      <h3>基本信息</h3>
 
-      <p>
 
-        &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“*”
 
-        标记的条目提交后不可修改。
 
-      </p>
 
-    </div>
 
     <div class="center">
 
     <div class="center">
 
       <ws-form ref="deptBudgetList" :rules="ruleDeptBudget" :model="deptBudgetList">
 
       <ws-form ref="deptBudgetList" :rules="ruleDeptBudget" :model="deptBudgetList">
 
+         <div class="remark">
 
+      <h3>基本信息</h3>
 
+      <p style="color: #8890b1">
 
+          &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
 
+          标记的条目提交后不可修改。
 
+        </p>
 
+    </div>
 
         <!--基本信息-->
 
         <!--基本信息-->
 
         <ws-info-table>
 
         <ws-info-table>
 
           <!--合同类型-->
 
           <!--合同类型-->

+ 0 - 1
src/views/houseSelfCollect/acquisitionManagementAdd.vue
Dosyayı Görüntüle 

@@ -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()

+ 1 - 0
src/views/houseSelfCollect/paymentManagement.vue
Dosyayı Görüntüle 

@@ -1172,6 +1172,7 @@ import download from '../../components/WsDownload/download'
 
   /deep/.el-table .el-table__header .cell,
 
   /deep/.el-table .el-table__header .cell,
 
   /deep/.el-table .cell {
 
   /deep/.el-table .cell {
 
     text-align: center;
 
     text-align: center;
 
+    line-height: 15px;
 
   }
 
   }
 
 
 
   /deep/.el-table--enable-row-transition .el-table__body td {
 
   /deep/.el-table--enable-row-transition .el-table__body td {

+ 408 - 369
src/views/houseSelfCollect/weighingManagement.vue
Dosyayı Görüntüle 

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

+ 40 - 37
src/views/tradeServicesManagement/component/routers/route.js
Dosyayı Görüntüle 

@@ -4,12 +4,14 @@ const tradeServicesManagementRouter = {
 
 
 
   path: '/tradeServicesManagement',
 
   path: '/tradeServicesManagement',
 
   component: Layout,
 
   component: Layout,
 
-  redirect: {name : 'warehouseReceiptRegulation'},
 
+  redirect: {
 
+    name: 'warehouseReceiptRegulation'
 
+  },
 
   name: 'warehouseReceiptRegulation',
 
   name: 'warehouseReceiptRegulation',
 
   alwaysShow: true, // will always show the root menu
 
   alwaysShow: true, // will always show the root menu
 
   meta: {
 
   meta: {
 
     title: 'warehouseReceiptRegulation',
 
     title: 'warehouseReceiptRegulation',
 
-    module: 'transportationTask.transportation.transportationInfo',
 
+    module: 'tradeServicesManagement',
 
     icon: '-renwuguanli'
 
     icon: '-renwuguanli'
 
   },
 
   },
 
   children: [
 
   children: [
 
@@ -17,12 +19,12 @@ const tradeServicesManagementRouter = {
 
     {
 
     {
 
       path: 'warehouseReceiptRegulation',
 
       path: 'warehouseReceiptRegulation',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptRegulation'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptRegulation'),
 
       name: 'stockWarehouseReceiptRegulation',
 
       name: 'stockWarehouseReceiptRegulation',
 
       meta: {
 
       meta: {
 
         title: 'stockWarehouseReceiptRegulation',
 
         title: 'stockWarehouseReceiptRegulation',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
@@ -32,12 +34,13 @@ const tradeServicesManagementRouter = {
 
     {
 
     {
 
       path: 'onWaywarehouseReceiptRegulation',
 
       path: 'onWaywarehouseReceiptRegulation',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/onWaywarehouseReceiptRegulation'),
 
+        import( /* webpackChunkName: "applDetail" */
 
+          '@/views/tradeServicesManagement/onWaywarehouseReceiptRegulation'),
 
       name: 'onWaywarehouseReceiptRegulation',
 
       name: 'onWaywarehouseReceiptRegulation',
 
       meta: {
 
       meta: {
 
         title: 'onWaywarehouseReceiptRegulation',
 
         title: 'onWaywarehouseReceiptRegulation',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
@@ -47,12 +50,12 @@ const tradeServicesManagementRouter = {
 
     {
 
     {
 
       path: 'warehouseReceiptAdd',
 
       path: 'warehouseReceiptAdd',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptAdd'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptAdd'),
 
       name: 'warehouseReceiptAdd',
 
       name: 'warehouseReceiptAdd',
 
       meta: {
 
       meta: {
 
         title: 'warehouseReceiptAdd',
 
         title: 'warehouseReceiptAdd',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.add',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
@@ -62,27 +65,27 @@ const tradeServicesManagementRouter = {
 
     {
 
     {
 
       path: 'reviewWarehouseReceipt',
 
       path: 'reviewWarehouseReceipt',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/reviewWarehouseReceipt'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/reviewWarehouseReceipt'),
 
       name: 'reviewWarehouseReceipt',
 
       name: 'reviewWarehouseReceipt',
 
       meta: {
 
       meta: {
 
         title: 'reviewWarehouseReceipt',
 
         title: 'reviewWarehouseReceipt',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
       hidden: true
 
       hidden: true
 
     },
 
     },
 
-     //审批仓单
 
-     {
 
+    //审批仓单
 
+    {
 
       path: 'approveWarehouseReceipt',
 
       path: 'approveWarehouseReceipt',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/approveWarehouseReceipt'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/approveWarehouseReceipt'),
 
       name: 'approveWarehouseReceipt',
 
       name: 'approveWarehouseReceipt',
 
       meta: {
 
       meta: {
 
         title: 'approveWarehouseReceipt',
 
         title: 'approveWarehouseReceipt',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
@@ -92,57 +95,57 @@ const tradeServicesManagementRouter = {
 
     {
 
     {
 
       path: 'inOutRecord',
 
       path: 'inOutRecord',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/inOutRecord'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/inOutRecord'),
 
       name: 'inOutRecord',
 
       name: 'inOutRecord',
 
       meta: {
 
       meta: {
 
         title: 'inOutRecord',
 
         title: 'inOutRecord',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
       hidden: true
 
       hidden: true
 
     },
 
     },
 
-     //修改仓单
 
-     {
 
+    //修改仓单
 
+    {
 
       path: 'warehouseReceiptEdit',
 
       path: 'warehouseReceiptEdit',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptEdit'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptEdit'),
 
       name: 'warehouseReceiptEdit',
 
       name: 'warehouseReceiptEdit',
 
       meta: {
 
       meta: {
 
         title: 'warehouseReceiptEdit',
 
         title: 'warehouseReceiptEdit',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.edit',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
       hidden: true
 
       hidden: true
 
     },
 
     },
 
-     //查看仓单
 
-     {
 
+    //查看仓单
 
+    {
 
       path: 'warehouseReceiptLook',
 
       path: 'warehouseReceiptLook',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptLook'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptLook'),
 
       name: 'warehouseReceiptLook',
 
       name: 'warehouseReceiptLook',
 
       meta: {
 
       meta: {
 
         title: 'warehouseReceiptLook',
 
         title: 'warehouseReceiptLook',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },
 
       hidden: true
 
       hidden: true
 
     },
 
     },
 
-     //还款
 
-     {
 
+    //还款
 
+    {
 
       path: 'repayment',
 
       path: 'repayment',
 
       component: () =>
 
       component: () =>
 
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/repayment'),
 
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/repayment'),
 
       name: 'repayment',
 
       name: 'repayment',
 
       meta: {
 
       meta: {
 
         title: 'repayment',
 
         title: 'repayment',
 
-        shortcutEntrance: 'tradeServicesManagement',
 
-        module: 'transportationTask.transportation.transportationInfo',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
         permissicon: [],
 
         permissicon: [],
 
         keepAlive: true
 
         keepAlive: true
 
       },
 
       },

+ 27 - 25
src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
Dosyayı Görüntüle 

@@ -1,7 +1,7 @@
 
 //贸易服务管理
 
 //贸易服务管理
 
 <template>
 
 <template>
 
   <div class="container">
 
   <div class="container">
 
-    <map-drag :class="{active:isActive}"></map-drag>
 
+    <map-drag :class="{active:isActive}" :listData='mapInfo'></map-drag>
 
     <div class="bottom" :class="{active:isActive}">
 
     <div class="bottom" :class="{active:isActive}">
 
       <div class="bottom-content">
 
       <div class="bottom-content">
 
         <div class="bottom-item" @click="startHacking">查看申请记录</div>
 
         <div class="bottom-item" @click="startHacking">查看申请记录</div>
 
@@ -25,7 +25,7 @@
 
         <el-button type="" :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(5)">已还</el-button>
 
         <el-button type="" :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(5)">已还</el-button>
 
         <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input" v-model="searchKeyWord"></el-input>
 
         <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input" v-model="searchKeyWord"></el-input>
 
         <el-button type="primary" @click='findList'>查找</el-button>
 
         <el-button type="primary" @click='findList'>查找</el-button>
 
-        <el-button type="primary" class="add" @click="add">添加</el-button>
 
+        <el-button type="primary" v-hasPermission=" `tradeServicesManagement.tradeService.add`" class="add" @click="add">添加</el-button>
 
       </div>
 
       </div>
 
       <el-table :data="tradeServicesList" style="width: 100%; margin-top: 20px" ref="tradeServicesList" border
 
       <el-table :data="tradeServicesList" style="width: 100%; margin-top: 20px" ref="tradeServicesList" border
 
         height="calc(100% - 90px)">
 
         height="calc(100% - 90px)">
 
@@ -38,11 +38,7 @@
 
         <el-table-column prop="billNo" label="业务编号"></el-table-column>
 
         <el-table-column prop="billNo" label="业务编号"></el-table-column>
 
         <el-table-column prop="contractNo" label="合同编号"></el-table-column>
 
         <el-table-column prop="contractNo" label="合同编号"></el-table-column>
 
         <el-table-column prop="warehouseName" label="仓库名"></el-table-column>
 
         <el-table-column prop="warehouseName" label="仓库名"></el-table-column>
 
-        <el-table-column prop="warehouseNo" label="仓位号">
 
-          <!-- <template slot-scope="scope">
 
-            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
 
-          </template> -->
 
-        </el-table-column>
 
+        <el-table-column prop="warehouseNo" label="仓位号"></el-table-column>
 
         <el-table-column prop="goodsName" label="货名"></el-table-column>
 
         <el-table-column prop="goodsName" label="货名"></el-table-column>
 
         <el-table-column prop="weight" label="重量（吨）"></el-table-column>
 
         <el-table-column prop="weight" label="重量（吨）"></el-table-column>
 
         <el-table-column prop="unitPrice" label="单价（元/吨）"></el-table-column>
 
         <el-table-column prop="unitPrice" label="单价（元/吨）"></el-table-column>
 
@@ -51,27 +47,23 @@
 
         <el-table-column prop="amountDue" label="应还金额（元）"></el-table-column>
 
         <el-table-column prop="amountDue" label="应还金额（元）"></el-table-column>
 
         <el-table-column prop="amountRepaid" label="已还金额（元）"></el-table-column>
 
         <el-table-column prop="amountRepaid" label="已还金额（元）"></el-table-column>
 
         <el-table-column prop="amountToRepaid" label="待还金额（元）"></el-table-column>
 
         <el-table-column prop="amountToRepaid" label="待还金额（元）"></el-table-column>
 
-        <el-table-column prop="status" label="状态">
 
-          <!-- <template slot-scope="scope">
 
-            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
 
-          </template> -->
 
+        <el-table-column prop="approveStatus" label="状态">
 
+          <template slot-scope="scope">
 
+            <div>{{scope.row.approveStatus}}</div>
 
+          </template>
 
         </el-table-column>
 
         </el-table-column>
 
         <el-table-column prop="address" label="操作" width="430">
 
         <el-table-column prop="address" label="操作" width="430">
 
           <template slot-scope="scope">
 
           <template slot-scope="scope">
 
-            <el-button size="mini" @click="lookBtnClick(scope.row, 2)" v-show="scope.row.authenticationStatus!='已删除'">
 
+            <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
 
               查看</el-button>
 
               查看</el-button>
 
-            <el-button size="mini" @click="toExamineBtnClick(scope.row, 2)"
 
-              v-show="scope.row.authenticationStatus!='已删除'">
 
+            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
 
               审核</el-button>
 
               审核</el-button>
 
-            <el-button size="mini" @click="approveBtnClick(scope.row, 2)"
 
-              v-show="scope.row.authenticationStatus!='已删除'">
 
+            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
 
               审批</el-button>
 
               审批</el-button>
 
-            <el-button size="mini" @click="repaymentBtnClick(scope.row, 2)"
 
-              v-show="scope.row.authenticationStatus!='已删除'">
 
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.return`" size="mini" @click="repaymentBtnClick(scope.row, 2)">
 
               还款</el-button>
 
               还款</el-button>
 
-            <el-button size="mini" @click="rowEditBtnClick(scope.row, 3)"
 
-              v-show="scope.row.authenticationStatus!='已删除'">修改</el-button>
 
-            <el-button size="mini" type="danger" @click="rowDeleteBtnClick(scope.row, '')">删除</el-button>
 
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.edit`" size="mini" @click="rowEditBtnClick(scope.row, 3)">修改</el-button>
 
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.delete`" size="mini" type="danger" @click="rowDeleteBtnClick(scope.row)">删除</el-button>
 
           </template>
 
           </template>
 
         </el-table-column>
 
         </el-table-column>
 
       </el-table>
 
       </el-table>
 
@@ -87,7 +79,8 @@
 
   import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
 
   import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
 
   import {
 
   import {
 
     getList,
 
     getList,
 
-    getMapInfo
 
+    getMapInfo,
 
+    deleteTrageInfo
 
   } from '@/model/tradeServicesManagement/index'
 
   } from '@/model/tradeServicesManagement/index'
 
   import {
 
   import {
 
     selectWarehouseSelf,
 
     selectWarehouseSelf,
 
@@ -140,7 +133,8 @@
 
     methods: {
 
     methods: {
 
       getMapInfo() {
 
       getMapInfo() {
 
         getMapInfo().toPromise().then((response) => {
 
         getMapInfo().toPromise().then((response) => {
 
-          console.log('地图数据', response)
 
+          // console.log('地图数据', response)
 
+          this.mapInfo = response
 
           // this.mapInfo = response.data.records
 
           // this.mapInfo = response.data.records
 
         })
 
         })
 
       },
 
       },
 
@@ -180,7 +174,13 @@
 
           name: 'warehouseReceiptEdit'
 
           name: 'warehouseReceiptEdit'
 
         })
 
         })
 
       },
 
       },
 
-      rowDeleteBtnClick(val1, val2) {},
 
+      rowDeleteBtnClick(val1) {
 
+          deleteTrageInfo().toPromise().then((response) => {
 
+             this.$message.success('删除成功')
 
+            // this.mapInfo = response.data.records
 
+          })
 
+
 
+      },
 
       handleSizeChange(val) {
 
       handleSizeChange(val) {
 
         console.log(`每页 ${val} 条`)
 
         console.log(`每页 ${val} 条`)
 
         this.pageSize = val
 
         this.pageSize = val
 
@@ -207,9 +207,11 @@
 
             this.warehouseList = response
 
             this.warehouseList = response
 
           })
 
           })
 
       },
 
       },
 
-      getList(e, type) {
 
+      getList(val, type) {
 
+        // type=1 地图点击
 
         if (type == 1) {
 
         if (type == 1) {
 
           this.isActive = true
 
           this.isActive = true
 
+          this.searchKeyWord = val
 
         }
 
         }
 
         getList({
 
         getList({
 
             compId: this.compId,
 
             compId: this.compId,