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

前端gjy

gjy 3 年之前
父節點
ed0fdfae25 1d46949992
當前提交
620f0b59a3
共有 22 個文件被更改，包括 1836 次插入 和 544 次删除
統一視圖 顯示文件統計
  1. 336 0
      public/static/inspection.html
  2. 101 0
      public/static/print.html
  3. 4 0
      src/App.vue
  4. 10 0
      src/api/V2/houseSelfCollect/index.js
  5. 0 0
      src/api/V2/outboundManagement/index.js
  6. 16 3
      src/lang/zh.js
  7. 16 1
      src/model/houseSelfCollect/index.js
  8. 7 0
      src/model/outboundManagement/index.js
  9. 8 5
      src/views/houseSelfCollect/acquisitionManagement.vue
  10. 0 2
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  11. 25 35
      src/views/houseSelfCollect/houseSelfCollectPrint.vue
  12. 36 24
      src/views/houseSelfCollect/inspectInfo.vue
  13. 343 202
      src/views/houseSelfCollect/inspectionManagement.vue
  14. 50 28
      src/views/houseSelfCollect/paymentManagement.vue
  15. 257 66
      src/views/houseSelfCollect/settlement.vue
  16. 88 78
      src/views/houseSelfCollect/weighingManagement.vue
  17. 181 98
      src/views/houseSelfCollect/weightCheck.vue
  18. 0 0
      src/views/outboundManagement/collectionManagement.vue
  19. 61 0
      src/views/outboundManagement/component/route.js
  20. 0 0
      src/views/outboundManagement/qualityInspectionManagement.vue
  21. 297 0
      src/views/outboundManagement/weighingManagement.vue
  22. 0 2
      src/views/purchasingManagement/purchaseOrderList.vue

+ 336 - 0
public/static/inspection.html
查看文件 

@@ -0,0 +1,336 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta charset="utf-8">
 
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <title></title>
 
+    <style>
 
+      table,
 
+      table tr th,
 
+      table tr td {
 
+        border: 2px solid #333333;
 
+        padding: 5px 0;
 
+      }
 
+
 
+      #app {
 
+        height: 98vh;
 
+        position: relative;
 
+      }
 
+
 
+      .content {
 
+        width: 1000px;
 
+        height: 583px;
 
+        margin: auto;
 
+        position: absolute;
 
+        top: 0;
 
+        bottom: 0;
 
+        left: 0;
 
+        right: 0;
 
+      }
 
+
 
+      table {
 
+        width: 100%;
 
+        text-align: center;
 
+        border-collapse: collapse;
 
+        border: 3px solid #333333;
 
+      }
 
+
 
+      .col-bgc {
 
+        background: #f6f7fb;
 
+      }
 
+
 
+      .bottom-row1 {
 
+        display: flex;
 
+        justify-content: space-between;
 
+        margin: 20px 0;
 
+      }
 
+
 
+      .bottom-row2 {
 
+        display: flex;
 
+        margin: 10px 0;
 
+      }
 
+
 
+      img {
 
+        width: 41px;
 
+        height: 41px;
 
+        margin-right: 118px;
 
+      }
 
+
 
+      .config {
 
+        margin-right: 240px;
 
+      }
 
+
 
+      .bottom-row3 {
 
+        margin: 10px 0;
 
+      }
 
+
 
+      .title {
 
+        text-align: center;
 
+        font-size: 24px;
 
+      }
 
+
 
+      .number {
 
+        text-align: right;
 
+        margin-bottom: 10px;
 
+      }
 
+
 
+      .small-row {
 
+        display: flex;
 
+      }
 
+
 
+      .small-content {
 
+        width: 400px;
 
+        margin: 0 auto;
 
+        border: 1px solid #ccc;
 
+        padding: 20px 20px 160px 20px;
 
+        position: absolute;
 
+        top: 0;
 
+        bottom: 0;
 
+        left: 0;
 
+        right: 0;
 
+        margin: auto;
 
+        height: 650px;
 
+      }
 
+
 
+      .small-title {
 
+        text-align: center;
 
+        font-size: 18px;
 
+        display: flex;
 
+        justify-content: space-between;
 
+        align-items: center;
 
+      }
 
+
 
+      .small-row {
 
+        display: flex;
 
+        justify-content: space-between;
 
+        margin: 10px;
 
+      }
 
+
 
+      .small-img {
 
+        margin-right: 0;
 
+      }
 
+      .sign{
 
+        margin-right: 100px;
 
+      }
 
+    </style>
 
+  </head>
 
+  <body>
 
+    <div id="app">
 
+      <div class="content" v-if="bigContent">
 
+        <div class="title">粮食质检单</div>
 
+        <div class="number">{{tableData.qualityNo}}</div>
 
+        <table class="table">
 
+          <tr class="row">
 
+            <td class="col col-bgc">客户姓名</td>
 
+            <td class="col" colspan="2">{{tableData.customerName}}</td>
 
+            <td class="col col-bgc">客户电话</td>
 
+            <td class="col" colspan="2">{{tableData.customerPhone}}</td>
 
+            <td class="col col-bgc">车牌号</td>
 
+            <td class="col">{{tableData.carNumber}}</td>
 
+          </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">收货单位</td>
 
+            <td class="col" colspan="2">{{tableData.receivingUnit}}</td>
 
+            <td class="col col-bgc">联系人</td>
 
+            <td class="col" colspan="2">{{tableData.contacts}}</td>
 
+            <td class="col col-bgc">联系电话</td>
 
+            <td class="col">{{tableData.contactsPhone}}</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.customerName}}</td>
 
+            <td class="col col-bgc">容量（克/升）</td>
 
+            <td class="col">{{tableData.bulkDensity}}</td>
 
+            <td class="col col-bgc">不完整粒（%）</td>
 
+            <td class="col">{{tableData.imperfectGrain}}</td>
 
+          </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">等级</td>
 
+            <td class="col">{{tableData.grade}}</td>
 
+            <td class="col col-bgc">水分（%）</td>
 
+            <td class="col">{{tableData.waterContent}}</td>
 
+            <td class="col col-bgc">热损伤（%）</td>
 
+            <td class="col">{{tableData.jiaorenli}}</td>
 
+            <td class="col col-bgc">单价（元/公斤）</td>
 
+            <td class="col">{{tableData.tidalGrainPrice}}</td>
 
+          </tr>
 
+          <tr class="row">
 
+            <td class="col col-bgc">杂质（%）</td>
 
+            <td class="col">{{tableData.impurity}}</td>
 
+            <td class="col col-bgc">霉变粒（%）</td>
 
+            <td class="col">{{tableData.mildewGrain}}</td>
 
+            <td class="col col-bgc" colspan="2">购粮性质</td>
 
+            <td class="col" colspan="2">{{tableData.customerName}}</td>
 
+          </tr>
 
+        </table>
 
+        <div class="bottom">
 
+          <div class="bottom-row1">
 
+            <div>质检：{{tableData.qualityInspector}}</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="">客户签名</div>
 
+          </div>
 
+          <div class="bottom-row3">扫一扫</div>
 
+        </div>
 
+      </div>
 
+      <div class="small-content" v-if="smallContent">
 
+        <div class="small-title">
 
+          <div>粮食质检单</div>
 
+          <img class="small-img" src="../img/add.png" alt="">
 
+        </div>
 
+        <div class="small-row">
 
+          <div>编号</div>
 
+          <div>{{tableData.qualityNo}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>客户姓名</div>
 
+          <div>{{tableData.customerName}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>客户电话</div>
 
+          <div>{{tableData.customerPhone}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>车牌号</div>
 
+          <div>{{tableData.carNumber}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>收货单位</div>
 
+          <div>{{tableData.receivingUnit}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>联系人</div>
 
+          <div>{{tableData.contacts}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>联系电话</div>
 
+          <div>{{tableData.contactsPhone}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>货名</div>
 
+          <div>{{tableData.goodsName}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>类型</div>
 
+          <div>{{tableData.customerName}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>容量（克/升）</div>
 
+          <div>{{tableData.bulkDensity}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>不完整粒（%）</div>
 
+          <div>{{tableData.imperfectGrain}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>等级</div>
 
+          <div>{{tableData.grade}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>水分（%）</div>
 
+          <div>{{tableData.waterContent}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>热损伤（%）</div>
 
+          <div>{{tableData.jiaorenli}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>单价（元/公斤）</div>
 
+          <div>{{tableData.tidalGrainPrice}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>杂质（%）</div>
 
+          <div>{{tableData.impurity}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>>霉变粒（%）</div>
 
+          <div>{{tableData.mildewGrain}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>购粮性质</div>
 
+          <div>{{tableData.customerName}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>质检</div>
 
+          <div>{{tableData.qualityInspector}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>时间</div>
 
+          <div>{{tableData.qualityDate}}</div>
 
+        </div>
 
+        <div class="small-row">
 
+          <div>收货单位签名或盖章:</div>
 
+          <div class="sign">客户签名:</div>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </body>
 
+  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
 
+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script type="text/javascript">
 
+    new Vue({
 
+      el: '#app',
 
+      data: {
 
+        tableData: "",
 
+        name: "",
 
+        bigContent: false,
 
+        smallContent: false
 
+      },
 
+      computed: {},
 
+      methods: {
 
+        tableRowClassName({
 
+          row,
 
+          rowIndex
 
+        }) {
 
+          if (rowIndex === 1) {
 
+            return 'warning-row';
 
+          } else if (rowIndex === 3) {
 
+            return 'success-row';
 
+          }
 
+          return '';
 
+        },
 
+        getQueryVariable(variable) {
 
+          var query = window.location.search.substring(1);
 
+          var vars = query.split("&");
 
+          for (var i = 0; i < vars.length; i++) {
 
+            var pair = vars[i].split("=");
 
+            if (pair[0] == variable) {
 
+              return pair[1];
 
+            }
 
+          }
 
+          return (false);
 
+        },
 
+        printSmall() {},
 
+        printBig() {},
 
+      },
 
+      mounted() {
 
+        debugger
 
+        let _data = decodeURIComponent(this.getQueryVariable("dataList"))
 
+        let _type = decodeURIComponent(this.getQueryVariable("type"))
 
+        if (_type == 2) {
 
+          this.bigContent = true
 
+          this.smallContent = false
 
+        } else {
 
+          this.smallContent = true
 
+          this.bigContent = false
 
+        }
 
+        console.log(_data)
 
+        this.tableData = JSON.parse(_data)
 
+        console.log(this.tableData)
 
+        window.print()
 
+        window.onafterprint = function(event) {
 
+          window.history.back(-1)
 
+        };
 
+      },
 
+      watch: {}
 
+    })
 
+  </script>
 
+
 
+</html>

+ 101 - 0
public/static/print.html
查看文件 

@@ -4,9 +4,42 @@
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
     <title></title>
 
     <title></title>
 
+    <style>
 
+    .content{
 
+      text-align: center;
 
+      display: flex;
 
+      align-items: center;
 
+      justify-content: center;
 
+      flex-direction: column;
 
+    }
 
+    .title{
 
+      width: 600px;
 
+      position: relative;
 
+      border-top: 1px solid #EBEEF5;
 
+       border-left: 1px solid #EBEEF5;
 
+        border-right: 1px solid #EBEEF5;
 
+        padding: 20px;
 
+        box-sizing: border-box;
 
+    }
 
+    .name{
 
+      font-size: 20px;
 
+      font-weight: 500;
 
+      color: #323233;
 
+    }
 
+    .price{
 
+      position: absolute;
 
+     top: 25px;
 
+         right: 10px;
 
+         bottom: 0;
 
+         margin: auto;
 
+         font-size: 14px;
 
+
 
+    }
 
+    </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app">
 
     <div id="app">
 
+<<<<<<< HEAD
 
       {{dataList}}
 
       {{dataList}}
 
        <el-button @click="visible = true">Button</el-button>
 
        <el-button @click="visible = true">Button</el-button>
 
     </div>
 
     </div>
 
@@ -32,6 +65,74 @@
 
         // window.onafterprint = function(event) {
 
         // window.onafterprint = function(event) {
 
         //   window.history.back(-1)
 
         //   window.history.back(-1)
 
         // };
 
         // };
 
+=======
 
+      <div class="content">
 
+        <div class="title">
 
+          <div class="name">{{name}}价格对照表（按水分）</div>
 
+          <div class="price">价格单位：元/公斤</div>
 
+        </div>
 
+         <el-table :data="tableData" border style="width: 600px" :row-class-name="tableRowClassName">
 
+           <el-table-column prop="waterMin" label="水分下限(%)">
 
+           </el-table-column>
 
+           <el-table-column prop="waterMax" label="水分上限(%)">
 
+           </el-table-column>
 
+           <el-table-column prop="price1" label="一等单价">
 
+           </el-table-column>
 
+           <el-table-column prop="price2" label="二等单价">
 
+           </el-table-column>
 
+           <el-table-column prop="price3" label="三等单价">
 
+           </el-table-column>
 
+           <el-table-column prop="priceOther" label="等外单价">
 
+           </el-table-column>
 
+         </el-table>
 
+      </div>
 
+
 
+    </div>
 
+  </body>
 
+  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
 
+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script type="text/javascript">
 
+    new Vue({
 
+      el: '#app',
 
+      data: {
 
+        tableData: "",
 
+        name:""
 
+      },
 
+      computed: {},
 
+      methods: {
 
+  tableRowClassName({
 
+        row,
 
+        rowIndex
 
+      }) {
 
+        if (rowIndex === 1) {
 
+          return 'warning-row';
 
+        } else if (rowIndex === 3) {
 
+          return 'success-row';
 
+        }
 
+        return '';
 
+      },
 
+      getQueryVariable(variable) {
 
+        var query = window.location.search.substring(1);
 
+        var vars = query.split("&");
 
+        for (var i = 0; i < vars.length; i++) {
 
+          var pair = vars[i].split("=");
 
+          if (pair[0] == variable) {
 
+            return pair[1];
 
+          }
 
+        }
 
+        return (false);
 
+      }
 
+      },
 
+      mounted() {debugger
 
+       let _data = localStorage.getItem("pricePrintList")
 
+         this.name = decodeURIComponent(this.getQueryVariable("name"))
 
+        console.log(_data)
 
+        this.tableData = JSON.parse(_data)
 
+        window.print()
 
+        window.onafterprint = function(event) {
 
+          window.history.back(-1)
 
+        };
 
+>>>>>>> 1d46949992a1fc8a79736807784052ab343c9846
 
       },
 
       },
 
       watch: {
 
       watch: {
 
       }
 
       }

+ 4 - 0
src/App.vue
查看文件 

@@ -86,4 +86,8 @@ export default {
 
 ::-webkit-scrollbar-track-piece {
 
 ::-webkit-scrollbar-track-piece {
 
   background: #f9fafe !important;
 
   background: #f9fafe !important;
 
 }
 
 }
 
+.el-button--primary{
 
+    background-color: #5878e8;
 
+    border-color: #5878e8;
 
+}
 
 </style>
 
 </style>

+ 10 - 0
src/api/V2/houseSelfCollect/index.js
查看文件 

@@ -44,4 +44,14 @@ export const API_POST_INSPECT_GETINSPECTEDIT = '/qualityInspectionManagement/api
 
 export const API_POST_INSPECT_GETINSPECTDELETE = '/qualityInspectionManagement/api/deleteQualityInspection'
 
 export const API_POST_INSPECT_GETINSPECTDELETE = '/qualityInspectionManagement/api/deleteQualityInspection'
 
 //付款管理列表
 
 //付款管理列表
 
 export const API_GET_PAYMENTMANAGEMENT = '/paymentManagement/selectPaymentManagement'
 
 export const API_GET_PAYMENTMANAGEMENT = '/paymentManagement/selectPaymentManagement'
 
+//检斤列表查看
 
+export const API_GET_WEIGHTCHECK_GETWEIGHINGLIST = '/weighingManagement/selectWeighingManagement'
 
+//皮重检斤保存
 
+export const API_POST_WEIGHTCHECK_TARE= '/weighingManagement/api/editTare'
 
+//毛重检斤保存
 
+export const API_POST_WEIGHTCHECK_GROSSWEIGHT = '/weighingManagement/api/editGrossWeight'
 
+//付款查看
 
+export const API_GET_PAYMENT = '/paymentManagement/getInfo'
 
+// 付款结算
 
+export const API_POST_PAYMENT_EDIT = '/paymentManagement/api/editInfo'

+ 0 - 0
src/api/V2/outboundManagement/index.js
查看文件


+ 16 - 3
src/lang/zh.js
查看文件 

@@ -999,7 +999,14 @@
 
     customerManagementAdd:'客户管理添加',
 
     customerManagementAdd:'客户管理添加',
 
     settlement:'结算',
 
     settlement:'结算',
 
     inspectInfo:'质检信息',
 
     inspectInfo:'质检信息',
 
-    weightCheck:'检斤'
 
+    weightCheck:'检斤',
 
+
 
+    //出库管理
 
+    outboundManagement: '出库管理',
 
+    weighingManagement: '检斤管理',
 
+    qualityInspectionManagement: '质检管理',
 
+    collectionManagement: '收款管理',
 
+
 
   },
 
   },
 
   // 后台错误码
 
   // 后台错误码
 
   message: {
 
   message: {
 
@@ -4826,6 +4833,7 @@
 
   financialManagement:{
 
   financialManagement:{
 
     collectionManagementList:'收款管理',
 
     collectionManagementList:'收款管理',
 
   },
 
   },
 
+  
   //运输管理
 
   //运输管理
 
   tranManagement: {
 
   tranManagement: {
 
     tranManagementDriver: '司机管理',
 
     tranManagementDriver: '司机管理',
 
@@ -7427,7 +7435,12 @@
 
     settlement:'结算',
 
     settlement:'结算',
 
     inspectInfo:'质检信息',
 
     inspectInfo:'质检信息',
 
     weightCheck:'检斤'
 
     weightCheck:'检斤'
 
-
 
+  },
 
+  //出库管理
 
+  outboundManagement: {
 
+    weighingManagement: '检斤管理',
 
+    qualityInspectionManagement: '质检管理',
 
+    collectionManagement: '收款管理',
 
   }
 
   }
 
-
 
+     
 }
 
 }

+ 16 - 1
src/model/houseSelfCollect/index.js
查看文件 

@@ -24,7 +24,12 @@ import {
 
   API_GET_INSPECT_GETINSPECTLOOKGOODS,
 
   API_GET_INSPECT_GETINSPECTLOOKGOODS,
 
   API_POST_INSPECT_GETINSPECTEDIT,
 
   API_POST_INSPECT_GETINSPECTEDIT,
 
   API_POST_INSPECT_GETINSPECTDELETE,
 
   API_POST_INSPECT_GETINSPECTDELETE,
 
-  API_GET_PAYMENTMANAGEMENT
 
+  API_GET_PAYMENTMANAGEMENT,
 
+  API_GET_WEIGHTCHECK_GETWEIGHINGLIST,
 
+  API_POST_WEIGHTCHECK_GROSSWEIGHT,
 
+  API_POST_WEIGHTCHECK_TARE,
 
+  API_GET_PAYMENT,
 
+  API_POST_PAYMENT_EDIT
 
 } from '@/api/V2/houseSelfCollect'
 
 } from '@/api/V2/houseSelfCollect'
 
 //客户管理列表
 
 //客户管理列表
 
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
 
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
 
@@ -73,3 +78,13 @@ export const getinspectEdit = appRx.post(API_POST_INSPECT_GETINSPECTEDIT, errorC
 
 export const getinspectDelete = appRx.post(API_POST_INSPECT_GETINSPECTDELETE, errorCatcher, errorHandle, filter)
 
 export const getinspectDelete = appRx.post(API_POST_INSPECT_GETINSPECTDELETE, errorCatcher, errorHandle, filter)
 
 //付款管理列表
 
 //付款管理列表
 
 export const getpayment = appRx.get(API_GET_PAYMENTMANAGEMENT, errorCatcher, errorHandle, filter)
 
 export const getpayment = appRx.get(API_GET_PAYMENTMANAGEMENT, errorCatcher, errorHandle, filter)
 
+//检斤列表查看
 
+export const getweighingList = appRx.get(API_GET_WEIGHTCHECK_GETWEIGHINGLIST, errorCatcher, errorHandle, filter)
 
+//皮重检斤保存
 
+export const tare = appRx.post(API_POST_WEIGHTCHECK_TARE, errorCatcher, errorHandle, filter)
 
+//毛重检斤保存
 
+export const grossWeight = appRx.post(API_POST_WEIGHTCHECK_GROSSWEIGHT, errorCatcher, errorHandle, filter)
 
+//付款信息查看
 
+export const getpaymentexamine = appRx.get(API_GET_PAYMENT, errorCatcher, errorHandle, filter)
 
+//付款信息结算
 
+export const postpaymentedit = appRx.post(API_POST_PAYMENT_EDIT, errorCatcher, errorHandle, filter)

+ 7 - 0
src/model/outboundManagement/index.js
查看文件 

@@ -0,0 +1,7 @@
 
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 
+import { appRx } from '../defalutConfig/indexRx'
 
+
 
+import {
 
+  
+
 
+} from '@/api/V2/outboundManagement'

+ 8 - 5
src/views/houseSelfCollect/acquisitionManagement.vue
查看文件 

@@ -93,7 +93,6 @@
 
     activated() {},
 
     activated() {},
 
     computed() {},
 
     computed() {},
 
     created() {
 
     created() {
 
-      debugger
 
       //获取公司id
 
       //获取公司id
 
       this.compId = sessionStorage.getItem('ws-pf_compId')
 
       this.compId = sessionStorage.getItem('ws-pf_compId')
 
       //用户名
 
       //用户名
 
@@ -116,7 +115,6 @@
 
         console.log(e)
 
         console.log(e)
 
       },
 
       },
 
       newAcquisition(index, row, type) {
 
       newAcquisition(index, row, type) {
 
-        debugger
 
         let _obj = {}
 
         let _obj = {}
 
         let _query = {}
 
         let _query = {}
 
         switch (type) {
 
         switch (type) {
 
@@ -155,7 +153,6 @@
 
           compId: this.compId,
 
           compId: this.compId,
 
           personCharge: this.accountName,
 
           personCharge: this.accountName,
 
         }).toPromise().then((response) => {
 
         }).toPromise().then((response) => {
 
-          debugger
 
           console.log(response)
 
           console.log(response)
 
           this.warehouseList = response
 
           this.warehouseList = response
 
           this.selectVal = this.warehouseList[0].id
 
           this.selectVal = this.warehouseList[0].id
 
@@ -192,9 +189,15 @@
 
         this.visible = true
 
         this.visible = true
 
         console.log(index, row);
 
         console.log(index, row);
 
       },
 
       },
 
-      print(index,row) {debugger
 
+      print(index,row) {
 
       // 打印价格对照表
 
       // 打印价格对照表
 
-        window.location.href="../../../static/print.html?data="+JSON.stringify(row)
 
+     purchasePriceLook({id:row.id}).toPromise().then((response) => {
 
+            console.log(response.detailPrints)
 
+            // this.tableData = response.records
 
+            // this.getList()
 
+            localStorage.setItem('pricePrintList', JSON.stringify(response.detailPrints));
 
+            window.location.href="../../../static/print.html?name="+row.goodsName
 
+          })
 
       }
 
       }
 
     },
 
     },
 
   }
 
   }

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

@@ -236,7 +236,6 @@
 
       }
 
       }
 
     },
 
     },
 
     activated() {
 
     activated() {
 
-debugger
 
       switch (this.$route.query.type) {
 
       switch (this.$route.query.type) {
 
         case "新增":
 
         case "新增":
 
         let _goodsNameList = []
 
         let _goodsNameList = []
 
@@ -277,7 +276,6 @@ debugger
 
         case "查看":
 
         case "查看":
 
          this.baseInfoForm =JSON.parse(this.$route.query.data)
 
          this.baseInfoForm =JSON.parse(this.$route.query.data)
 
        purchasePriceLook({id:this.baseInfoForm.id}).toPromise().then((response) => {
 
        purchasePriceLook({id:this.baseInfoForm.id}).toPromise().then((response) => {
 
-              debugger
 
               console.log(response)
 
               console.log(response)
 
               // this.tableData = response.records
 
               // this.tableData = response.records
 
               // this.getList()
 
               // this.getList()

+ 25 - 35
src/views/houseSelfCollect/houseSelfCollectPrint.vue
查看文件 

@@ -1,62 +1,52 @@
 
 <!--打印-->
 
 <!--打印-->
 
 <template>
 
 <template>
 
   <div id="print" class="center">
 
   <div id="print" class="center">
 
-   <div class="title">{{name}}</div>
 
+    <div class="title">{{ name }}</div>
 
     <div @click="print">打印</div>
 
     <div @click="print">打印</div>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
-import {
 
-  // getList,
 
-} from '@/model/houseSelfCollect/index'
 
+import // getList,
 
+'@/model/houseSelfCollect/index'
 
 
 
 export default {
 
 export default {
 
-
 
-  components: {
 
-
 
-  },
 
-  watch: {
 
-
 
-  },
 
+  components: {},
 
+  watch: {},
 
   data() {
 
   data() {
 
     return {
 
     return {
 
-      tableData:{},
 
-      name:""
 
- 
+      tableData: {},
 
+      name: '',
 
     }
 
     }
 
   },
 
   },
 
-  activated() {
 
-
 
-  },
 
-  created(){
 
-    
-  // this.$route.query.type
 
-this.name = this.$route.query.name
 
+  activated() {},
 
+  created() {
 
+    // this.$route.query.type
 
+    this.name = this.$route.query.name
 
   },
 
   },
 
   methods: {
 
   methods: {
 
-print(){
 
-        let newstr = document.getElementById('print').innerHTML
 
+    print() {
 
+      let newstr = document.getElementById('print').innerHTML
 
       let oldstr = document.body.innerHTML
 
       let oldstr = document.body.innerHTML
 
       document.body.innerHTML = newstr
 
       document.body.innerHTML = newstr
 
       window.print()
 
       window.print()
 
-            document.body.innerHTML = oldstr
 
-}
 
+      document.body.innerHTML = oldstr
 
+    },
 
   },
 
   },
 
 }
 
 }
 
 </script>
 
 </script>
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>
 
-.center{
 
+.center {
 
   width: 90%;
 
   width: 90%;
 
-  border: 1px solid #D8DCE6;
 
+  border: 1px solid #d8dce6;
 
   margin: 10px auto;
 
   margin: 10px auto;
 
 }
 
 }
 
-.title{
 
-    width: 325px;
 
-    font-size: 20px;
 
-    margin: 10px auto;
 
-    text-align: center;
 
-    color: #323233;
 
-    font-weight: 600;
 
-    border-bottom-style: double ;
 
+.title {
 
+  width: 325px;
 
+  font-size: 20px;
 
+  margin: 10px auto;
 
+  text-align: center;
 
+  color: #323233;
 
+  font-weight: 600;
 
+  border-bottom-style: double;
 
 }
 
 }
 
 </style>
 
 </style>

+ 36 - 24
src/views/houseSelfCollect/inspectInfo.vue
查看文件 

@@ -48,7 +48,6 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="客户" span="1" prop="customerName">
 
             <ws-form-item label="客户" span="1" prop="customerName">
 
               <ws-select
 
               <ws-select
 
-                v-model="inspect.customerName"
 
                 placeholder="请输入客户"
 
                 placeholder="请输入客户"
 
                 class="typeselect"
 
                 class="typeselect"
 
                 @change="selectpackingMethod"
 
                 @change="selectpackingMethod"
 
@@ -182,7 +181,8 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
           </ws-info-table>
 
           </ws-info-table>
 
           <div style="text-align: right; color: #323233">
 
           <div style="text-align: right; color: #323233">
 
-            潮粮单价（元/公斤）：{{ inspect.tidalGrainPrice ==null?"0": inspect.tidalGrainPrice}}
 
+            潮粮单价（元/公斤）：{{ unitPrice}}
 
+            <!-- 潮粮单价（元/公斤）：{{ inspect.tidalGrainPrice == null?"0": inspect.tidalGrainPrice}} -->
 
           </div>
 
           </div>
 
           <div class="but">
 
           <div class="but">
 
             <el-button @click="cancel" v-if="this.types != 2" type="primary"
 
             <el-button @click="cancel" v-if="this.types != 2" type="primary"
 
@@ -223,7 +223,7 @@ export default {
 
       // warehouseList: {},
 
       // warehouseList: {},
 
       inspect: {},
 
       inspect: {},
 
       disabled: false,
 
       disabled: false,
 
-      types: '',
 
+      types: '1',
 
       information: '添加',
 
       information: '添加',
 
       goodnameList: [],
 
       goodnameList: [],
 
       gradeList: [],
 
       gradeList: [],
 
@@ -231,14 +231,18 @@ export default {
 
       getbinNumberList: [],
 
       getbinNumberList: [],
 
       cangid: '', //仓库id
 
       cangid: '', //仓库id
 
       warehouseName:'',
 
       warehouseName:'',
 
-      // calculation:''
 
+       unitPrice:0,
 
+       count:0,
 
+       cangNo:"",
 
     }
 
     }
 
   },
 
   },
 
   activated() {
 
   activated() {
 
     this.types = this.$route.query.type
 
     this.types = this.$route.query.type
 
     this.cangid = this.$route.query.cangid
 
     this.cangid = this.$route.query.cangid
 
-    this.warehouseName = this.$route.warehouseName
 
+    this.warehouseName = this.$route.query.warehouseName
 
     let id = this.$route.query.id
 
     let id = this.$route.query.id
 
+    this.cangNo = this.$route.query.warehouseNo
 
+    this.count = Number(this.$route.query.count)+1 
     if (this.types == 2) {
 
     if (this.types == 2) {
 
       this.disabled = true
 
       this.disabled = true
 
       this.information = '查看'
 
       this.information = '查看'
 
@@ -264,30 +268,33 @@ export default {
 
       return year + mouth + datetime
 
       return year + mouth + datetime
 
     },
 
     },
 
     calculation() {
 
     calculation() {
 
-      this.inspect.qualityNo = 'SGRK' + this.getdate()
 
+      let number ="000"+ this.count
 
+      number = number.substring(number.length - 4,number.length)
 
+      this.inspect.qualityNo = 'SGRK' + this.getdate()+this.cangNo+number //SGRK+8位时间+3位仓库编号+4位序列号
 
       // + this.verifyinit()
 
       // + this.verifyinit()
 
     },
 
     },
 
     print() {
 
     print() {
 
-      if(this.types == 1){
 
+      this.inspect.warehouseName = this.warehouseName
 
+          this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
 
+      if(this.types == null){
 
          this.$confirm('确定保存质检信息？', '提示', {
 
          this.$confirm('确定保存质检信息？', '提示', {
 
         confirmButtonText: '确定',
 
         confirmButtonText: '确定',
 
         cancelButtonText: '取消',
 
         cancelButtonText: '取消',
 
         type: 'warning',
 
         type: 'warning',
 
       })
 
       })
 
         .then(() => {
 
         .then(() => {
 
-          this.inspect.warehouseName = this.warehouseName
 
-          this.inspect.compId = sessionStorage.getItem('ws-pf_compId'),
 
+          
           inspectAdd(this.inspect)
 
           inspectAdd(this.inspect)
 
             .toPromise()
 
             .toPromise()
 
             .then((response) => {
 
             .then((response) => {
 
               this.$message.success('保存成功')
 
               this.$message.success('保存成功')
 
               // this.xx = true;
 
               // this.xx = true;
 
-              let newstr = document.getElementById('print').innerHTML
 
-              let oldstr = document.body.innerHTML
 
-              document.body.innerHTML = newstr
 
-              window.print()
 
-              document.body.innerHTML = oldstr
 
-              // window.location.reload()
 
+              // let newstr = document.getElementById('print').innerHTML
 
+              // let oldstr = document.body.innerHTML
 
+              // document.body.innerHTML = newstr
 
+              // window.print()
 
+              // document.body.innerHTML = oldstr
 
+              // // window.location.reload()
 
               this.$router.push({ path: 'paymentManagement' })
 
               this.$router.push({ path: 'paymentManagement' })
 
             })
 
             })
 
         })
 
         })
 
@@ -308,11 +315,11 @@ export default {
 
             .then((response) => {
 
             .then((response) => {
 
               this.$message.success('修改成功')
 
               this.$message.success('修改成功')
 
               // this.xx = true;
 
               // this.xx = true;
 
-              let newstr = document.getElementById('print').innerHTML
 
-              let oldstr = document.body.innerHTML
 
-              document.body.innerHTML = newstr
 
-              window.print()
 
-              document.body.innerHTML = oldstr
 
+              // let newstr = document.getElementById('print').innerHTML
 
+              // let oldstr = document.body.innerHTML
 
+              // document.body.innerHTML = newstr
 
+              // window.print()
 
+              // document.body.innerHTML = oldstr
 
               // window.location.reload()
 
               // window.location.reload()
 
               this.$router.push({ path: 'paymentManagement' })
 
               this.$router.push({ path: 'paymentManagement' })
 
             })
 
             })
 
@@ -329,7 +336,8 @@ export default {
 
     },
 
     },
 
     waterContentChange() {
 
     waterContentChange() {
 
       //潮粮单价改变事件
 
       //潮粮单价改变事件
 
-      getinspectLookUnitPrice({
 
+      if(this.inspect.goodsName != null && this.inspect.waterContent != null && this.inspect.grade != null){
 
+        getinspectLookUnitPrice({
 
         warehouseId: this.cangid,
 
         warehouseId: this.cangid,
 
         goodsName: this.inspect.goodsName,
 
         goodsName: this.inspect.goodsName,
 
         waterContent: this.inspect.waterContent,
 
         waterContent: this.inspect.waterContent,
 
@@ -338,14 +346,18 @@ export default {
 
         .toPromise()
 
         .toPromise()
 
         .then((response) => {
 
         .then((response) => {
 
           this.inspect.tidalGrainPrice = response
 
           this.inspect.tidalGrainPrice = response
 
+          this.unitPrice = response
 
         })
 
         })
 
+      }
 
+      
     },
 
     },
 
     //货名改变事件
 
     //货名改变事件
 
     selectpackingMethod(e) {
 
     selectpackingMethod(e) {
 
-      let customers = e.split("(").split(")")[0]
 
+      let customers = e.split("(")
 
+      //  customers = customers[1].split(")")
 
+
 
       this.inspect.customerName = customers[0]
 
       this.inspect.customerName = customers[0]
 
-      this.inspect.customerPhone = customers[1]
 
-     console.log()
 
+      this.inspect.customerPhone = customers[1].split(")")[0]
 
 
 
     },
 
     },
 
     getList(ids) {
 
     getList(ids) {

+ 343 - 202
src/views/houseSelfCollect/inspectionManagement.vue
查看文件 

@@ -6,252 +6,393 @@
 
         <ws-button type="primary" @click="inspectInfo(1)">添加</ws-button>
 
         <ws-button type="primary" @click="inspectInfo(1)">添加</ws-button>
 
       </template>
 
       </template>
 
       <template slot="right">
 
       <template slot="right">
 
-        <ws-select
 
-          v-model="warehouseName"
 
-          placeholder=""
 
-          @change="selecttaskType"
 
-          :value="searchType"
 
-        >
 
-          <ws-option
 
-            v-for="item in warehouseList"
 
-            :key="item.value"
 
-            :label="item.value"
 
-            :value="item.value"
 
-            style="color: #8890b1"
 
-          />
 
+        <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType">
 
+          <ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
 
+            style="color: #8890b1" />
 
         </ws-select>
 
         </ws-select>
 
         <div></div>
 
         <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="
 
+        <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;
 
               left: -8px;
 
               left: -8px;
 
-            "
 
-            src="../../../public/img/sousuo.png"
 
-            alt=""
 
-        /></ws-button>
 
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 
       </template>
 
       </template>
 
     </BaseHeaderLayout>
 
     </BaseHeaderLayout>
 
-    <el-table
 
-      :data="inspect"
 
-      style="width: 100%; margin-top: 20px"
 
-      ref="inspect"
 
-      border
 
-      height="780"
 
-    >
 
+    <el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="780">
 
       <el-table-column type="index" label="序号" width="50">
 
       <el-table-column type="index" label="序号" width="50">
 
         <template scope="scope">
 
         <template scope="scope">
 
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
           <span v-else>{{ scope.$index + 1 }}</span>
 
           <span v-else>{{ scope.$index + 1 }}</span>
 
         </template>
 
         </template>
 
       </el-table-column>
 
       </el-table-column>
 
-      <el-table-column
 
-        prop="qualityNo"
 
-        width="120"
 
-        label="编号"
 
-      ></el-table-column>
 
+      <el-table-column prop="qualityNo" width="120" label="编号"></el-table-column>
 
       <el-table-column prop="customerName" label="客户"></el-table-column>
 
       <el-table-column prop="customerName" label="客户"></el-table-column>
 
       <el-table-column prop="carNumber" 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="goodsName" label="货名"></el-table-column>
 
       <el-table-column prop="waterContent" label="水分（%）"></el-table-column>
 
       <el-table-column prop="waterContent" label="水分（%）"></el-table-column>
 
-      <el-table-column
 
-        prop="tidalGrainPrice"
 
-        label="净重单价（元/公斤）"
 
-      ></el-table-column>
 
+      <el-table-column prop="tidalGrainPrice" label="净重单价（元/公斤）"></el-table-column>
 
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
 
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
 
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
 
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
 
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
 
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
 
       <el-table-column prop="qualityDate" label="质检时间"></el-table-column>
 
       <el-table-column prop="qualityDate" label="质检时间"></el-table-column>
 
       <el-table-column prop="status" label="状态"></el-table-column>
 
       <el-table-column prop="status" label="状态"></el-table-column>
 
-      <el-table-column width="300" label="操作">
 
+      <el-table-column width="400" label="操作">
 
         <template slot-scope="scope">
 
         <template slot-scope="scope">
 
           <el-button @click="inspectInfo(scope.row, 2)">查看</el-button>
 
           <el-button @click="inspectInfo(scope.row, 2)">查看</el-button>
 
           <el-button @click="inspectInfo(scope.row, 3)">编辑</el-button>
 
           <el-button @click="inspectInfo(scope.row, 3)">编辑</el-button>
 
           <el-button @click="del(scope.row)">删除</el-button>
 
           <el-button @click="del(scope.row)">删除</el-button>
 
+          <el-button @click="print(scope.row)">打印</el-button>
 
         </template>
 
         </template>
 
       </el-table-column>
 
       </el-table-column>
 
     </el-table>
 
     </el-table>
 
+     <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
 
+      <div class="number">{{printData.qualityNo}}</div>
 
+  <table class="table">
 
+    <tr class="row">
 
+      <td class="col col-bgc">客户姓名</td>
 
+      <td class="col" colspan="2">{{printData.customerName}}</td>
 
+      <td class="col col-bgc">客户电话</td>
 
+      <td class="col" colspan="2">{{printData.customerPhone}}</td>
 
+      <td class="col col-bgc">车牌号</td>
 
+      <td class="col">{{printData.carNumber}}</td>
 
+    </tr>
 
+    <tr class="row">
 
+      <td class="col col-bgc">收货单位</td>
 
+      <td class="col" colspan="2">{{printData.receivingUnit}}</td>
 
+      <td class="col col-bgc">联系人</td>
 
+      <td class="col" colspan="2">{{printData.contacts}}</td>
 
+      <td class="col col-bgc">联系电话</td>
 
+      <td class="col">{{printData.contactsPhone}}</td>
 
+    </tr>
 
+    <tr class="row">
 
+      <td class="col col-bgc">货名</td>
 
+      <td class="col">{{printData.goodsName}}</td>
 
+      <td class="col col-bgc">类型</td>
 
+      <td class="col">{{printData.customerName}}</td>
 
+      <td class="col col-bgc">容量（克/升）</td>
 
+      <td class="col">{{printData.bulkDensity}}</td>
 
+      <td class="col col-bgc">不完整粒（%）</td>
 
+      <td class="col">{{printData.imperfectGrain}}</td>
 
+    </tr>
 
+    <tr class="row">
 
+      <td class="col col-bgc">等级</td>
 
+      <td class="col">{{printData.grade}}</td>
 
+      <td class="col col-bgc">水分（%）</td>
 
+      <td class="col">{{printData.waterContent}}</td>
 
+      <td class="col col-bgc">热损伤（%）</td>
 
+      <td class="col">{{printData.jiaorenli}}</td>
 
+      <td class="col col-bgc">单价（元/公斤）</td>
 
+      <td class="col">{{printData.tidalGrainPrice}}</td>
 
+    </tr>
 
+    <tr class="row">
 
+      <td class="col col-bgc">杂质（%）</td>
 
+      <td class="col">{{printData.impurity}}</td>
 
+      <td class="col col-bgc">霉变粒（%）</td>
 
+      <td class="col">{{printData.mildewGrain}}</td>
 
+      <td class="col col-bgc" colspan="2">购粮性质</td>
 
+      <td class="col" colspan="2">{{printData.customerName}}</td>
 
+    </tr>
 
+  </table>
 
+      <div class="bottom">
 
+        <div class="bottom-row1">
 
+          <div>质检：{{printData.qualityInspector}}</div>
 
+          <div>{{printData.qualityDate}}</div>
 
+        </div>
 
+        <div class="bottom-row2">
 
+          <div class="left">
 
+            <img src="../../../public/img/add.png" alt="">
 
+          </div>
 
+          <div class="config">收货单位签名或盖章</div>
 
+          <div class="">客户签名</div>
 
+        </div>
 
+        <div class="bottom-row3">扫一扫</div>
 
+        <div class="bottom-row4">
 
+          <el-button type="primary">关闭</el-button>
 
+          <el-button type="primary" @click="printSmall">打印小票</el-button>
 
+          <el-button type="primary" @click="printBig">打印单据</el-button>
 
+        </div>
 
+
 
+      </div>
 
+    </el-dialog>
 
     <div style="text-align: center">
 
     <div style="text-align: center">
 
-      <el-pagination
 
-        @size-change="handleSizeChange"
 
-        @current-change="handleCurrentChange"
 
-        :current-page="currentPage"
 
-        :page-size="deptCircularPage.pageSize"
 
-        layout="total, sizes, prev, pager, next, jumper"
 
-        :total="deptBudgetTotal"
 
-      >
 
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
 
+        :total="deptBudgetTotal">
 
       </el-pagination>
 
       </el-pagination>
 
     </div>
 
     </div>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
-import {
 
-  selectWarehouseSelf,
 
-  getinspectList,
 
-  getinspectDelete,
 
-} from '@/model/houseSelfCollect/index'
 
+  import {
 
+    selectWarehouseSelf,
 
+    getinspectList,
 
+    getinspectDelete,
 
+    getinspectLook
 
+  } from '@/model/houseSelfCollect/index'
 
 
 
-export default {
 
-  components: {},
 
-  watch: {},
 
-  data() {
 
-    return {
 
-      //分页
 
-      currentPage: 1,
 
-      pageSize: 10,
 
-      deptCircularPage: {},
 
-      deptBudgetTotal: 0,
 
+  export default {
 
+    components: {},
 
+    watch: {},
 
+    data() {
 
+      return {
 
+        //分页
 
+        currentPage: 1,
 
+        pageSize: 10,
 
+        deptCircularPage: {},
 
+        deptBudgetTotal: 0,
 
 
 
-      searchKeyWord: '',
 
-      taskTypeList: [],
 
-      searchType: 0,
 
-      warehouseName: '',
 
-      inspect: [],
 
-      warehouseList: [],
 
-      cangid: '', //仓库id
 
-    }
 
-  },
 
-  activated() {
 
-    this.getList()
 
-  },
 
-  methods: {
 
-    find(){
 
-     this.getList()
 
-    },
 
-    inspectInfo(row, index) {
 
-      //添加,编辑，查看
 
-      console.log(row.id, 'id值')
 
-      this.$router.push({
 
-        path: 'inspectInfo',
 
-        query: { type: index, cangid: this.cangid, id: row.id ,warehouseName:this.warehouseName},
 
-      })
 
-    },
 
-    selecttaskType(e) {
 
-      console.log(e)
 
-    },
 
-    del(row) {
 
-      //删除
 
-      this.$confirm('确定删除质检信息？', '提示', {
 
-        confirmButtonText: '确定',
 
-        cancelButtonText: '取消',
 
-        type: 'warning',
 
-      })
 
-        .then(() => {
 
-          getinspectDelete({ id: row.id })
 
-            .toPromise()
 
-            .then((response) => {
 
-              this.$notify.success({
 
-                title: '成功',
 
-                message: '删除成功',
 
-              })
 
-              this.getList()
 
-            })
 
-            .catch((response) => {
 
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
-            })
 
-        })
 
-        .catch(() => {
 
-          return false
 
-        })
 
-    },
 
-    handleSizeChange(val) {
 
-      console.log(`每页 ${val} 条`)
 
-      this.pageSize = val
 
-      this.getList()
 
+        searchKeyWord: '',
 
+        taskTypeList: [],
 
+        searchType: 0,
 
+        warehouseName: '',
 
+        inspect: [],
 
+        warehouseList: [],
 
+        cangid: '', //仓库id
 
+        warehouseCount: "",
 
+        warehouseNo: "",
 
+        isShowPrint: false,
 
+        printData:{}
 
+      }
 
     },
 
     },
 
-    handleCurrentChange(val) {
 
-      this.currentPage = val
 
-      console.log(`当前页: ${val}`)
 
+    activated() {
 
       this.getList()
 
       this.getList()
 
     },
 
     },
 
-    getList() {
 
-      selectWarehouseSelf({
 
-        compId: sessionStorage.getItem('ws-pf_compId'),
 
-        personCharge: sessionStorage.getItem('ws-pf_staffName'),
 
-      })
 
-        .toPromise()
 
-        .then((response) => {
 
-          this.warehouseList = []
 
-          for (let i = 0; i < response.length; i++) {
 
-            this.warehouseList.push({
 
-              // valueKey: i,
 
-              value: response[i].warehouseName,
 
-              id: response[i].id,
 
-            })
 
-          }
 
-          this.warehouseName = response[0].warehouseName
 
-          this.cangid = response[0].id
 
+    methods: {
 
+      find() {
 
+        this.getList()
 
+      },
 
+      inspectInfo(row, index) {
 
+        //添加,编辑，查看
 
+        this.$router.push({
 
+          path: 'inspectInfo',
 
+          query: {
 
+            type: index,
 
+            cangid: this.cangid,
 
+            id: row.id,
 
+            warehouseName: this.warehouseName,
 
+            count: this.warehouseCount,
 
+            warehouseNo: this.warehouseNo
 
+          },
 
         })
 
         })
 
+      },
 
+      warehouseNameChange(e) {
 
+        console.log(e, "eeeeeeeeeeeeeeeeee")
 
+      },
 
+      del(row) {
 
+        //删除
 
+        this.$confirm('确定删除质检信息？', '提示', {
 
+            confirmButtonText: '确定',
 
+            cancelButtonText: '取消',
 
+            type: 'warning',
 
+          })
 
+          .then(() => {
 
+            getinspectDelete({
 
+                id: row.id
 
+              })
 
+              .toPromise()
 
+              .then((response) => {
 
+                this.$notify.success({
 
+                  title: '成功',
 
+                  message: '删除成功',
 
+                })
 
+                this.getList()
 
+              })
 
+              .catch((response) => {
 
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
+              })
 
+          })
 
+          .catch(() => {
 
+            return false
 
+          })
 
+      },
 
+      handleSizeChange(val) {
 
+        console.log(`每页 ${val} 条`)
 
+        this.pageSize = val
 
+        this.getList()
 
+      },
 
+      handleCurrentChange(val) {
 
+        this.currentPage = val
 
+        console.log(`当前页: ${val}`)
 
+        this.getList()
 
+      },
 
+      getList() {
 
+        selectWarehouseSelf({
 
+            compId: sessionStorage.getItem('ws-pf_compId'),
 
+            personCharge: sessionStorage.getItem('ws-pf_staffName'),
 
+          })
 
+          .toPromise()
 
+          .then((response) => {
 
+            this.warehouseList = []
 
+            for (let i = 0; i < response.length; i++) {
 
+              this.warehouseList.push({
 
+                // valueKey: i,
 
+                value: response[i].warehouseName,
 
+                id: response[i].id,
 
+                count: response[i].count
 
+              })
 
+            }
 
+            this.warehouseName = response[0].warehouseName
 
+            this.warehouseCount = response[0].count
 
+            this.warehouseNo = response[0].commonWarehouseNo
 
+            this.cangid = response[0].id
 
+          })
 
 
 
-      getinspectList({
 
-        compId: sessionStorage.getItem('ws-pf_compId'),
 
-        currentPage: this.currentPage,
 
-        pageSize: this.pageSize,
 
-        searchKeyWord: this.searchKeyWord,
 
-        warehouseName: this.warehouseName,
 
-      })
 
-        .toPromise()
 
-        .then((response) => {
 
-          // for (let i = 0; i < response.length; i++) {
 
-          //   this.warehouseList.push({
 
-          //     valueKey: i,
 
-          //     value: response[i].warehouseName,
 
-          //     id:response[i].id
 
-          //   })
 
-          // }
 
-          // this.searchTypeText = response[0].warehouseName
 
-          // this.id = response[0].id
 
-          // console.log(response)
 
-          this.inspect = response.records
 
-          this.deptBudgetTotal = response.total
 
-        })
 
+        getinspectList({
 
+            compId: sessionStorage.getItem('ws-pf_compId'),
 
+            currentPage: this.currentPage,
 
+            pageSize: this.pageSize,
 
+            searchKeyWord: this.searchKeyWord,
 
+            warehouseName: this.warehouseName,
 
+          })
 
+          .toPromise()
 
+          .then((response) => {
 
+            // for (let i = 0; i < response.length; i++) {
 
+            //   this.warehouseList.push({
 
+            //     valueKey: i,
 
+            //     value: response[i].warehouseName,
 
+            //     id:response[i].id
 
+            //   })
 
+            // }
 
+            // this.searchTypeText = response[0].warehouseName
 
+            // this.id = response[0].id
 
+            // console.log(response)
 
+            this.inspect = response.records
 
+            this.deptBudgetTotal = response.total
 
+          })
 
+      },
 
+      print(row) {
 
+        getinspectLook({
 
+            id: row.id
 
+          })
 
+          .toPromise()
 
+          .then((response) => {
 
+            this.isShowPrint = true
 
+            this.printData = response
 
+            // window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
 
+          })
 
+      },
 
+      printSmall() {
 
+        window.location.href = "../../../static/inspection.html?type=1&dataList=" + JSON.stringify(this.printData)
 
+      },
 
+      printBig() {
 
+        window.location.href = "../../../static/inspection.html?type=2&dataList=" + JSON.stringify(this.printData)
 
+      },
 
     },
 
     },
 
-  },
 
-}
 
+  }
 
 </script>
 
 </script>
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>
 
-.title {
 
-  font-size: 20px;
 
-  font-weight: 600;
 
-  margin: 20px 0 0 20px;
 
-}
 
-.tit {
 
-  font-size: 16px;
 
-  font-weight: 600;
 
-  margin: 20px;
 
-}
 
-.ws-info-table {
 
-  border: none;
 
-}
 
-.ws-info-table .el-form-item {
 
-  width: 50%;
 
-  border: none;
 
-}
 
-/deep/.ws-info-table .el-form-item .el-form-item__label {
 
-  width: 30%;
 
-  text-align: center;
 
-  background: #ffffff;
 
-  color: #8890b1;
 
-}
 
-/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--enable-row-transition .el-table__body td {
 
-  text-align: center;
 
-}
 
+  /deep/.el-dialog__header {
 
+    text-align: center !important;
 
+    padding: 10px 0 !important;
 
+    height: auto !important;
 
+  }
 
+
 
+  /deep/.el-dialog__title {
 
+    font-size: 24px !important;
 
+  }
 
+
 
+  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;
 
+  }
 
+
 
+  .title {
 
+    font-size: 20px;
 
+    font-weight: 600;
 
+    margin: 20px 0 0 20px;
 
+  }
 
+
 
+  .tit {
 
+    font-size: 16px;
 
+    font-weight: 600;
 
+    margin: 20px;
 
+  }
 
+
 
+  .ws-info-table {
 
+    border: none;
 
+  }
 
+
 
+  .ws-info-table .el-form-item {
 
+    width: 50%;
 
+    border: none;
 
+  }
 
+
 
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
 
+    width: 30%;
 
+    text-align: center;
 
+    background: #ffffff;
 
+    color: #8890b1;
 
+  }
 
+
 
+  /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--enable-row-transition .el-table__body td {
 
+    text-align: center;
 
+  }
 
+
 
+  .number {
 
+    text-align: right;
 
+    margin: 0 0 10px 0;
 
+  }
 
+
 
+  .col-bgc {
 
+    background: #f6f7fb;
 
+  }
 
+
 
+  .bottom-row1 {
 
+    display: flex;
 
+    justify-content: space-between;
 
+    margin: 10px 0;
 
+  }
 
+
 
+  .bottom-row2 {
 
+    display: flex;
 
+    margin: 10px 0;
 
+
 
+    .left {
 
+      img {
 
+        width: 41px;
 
+        height: 41px;
 
+        margin-right: 118px;
 
+      }
 
+    }
 
+
 
+    .config {
 
+      margin-right: 240px;
 
+    }
 
+  }
 
+
 
+  .bottom-row3 {
 
+    margin: 10px 0;
 
+  }
 
+
 
+  .bottom-row4 {
 
+    margin-top: 50px;
 
+    text-align: center;
 
+  }
 
+
 
+  /deep/.el-dialog__body {
 
+    padding: 20px !important;
 
+  }
 
 </style>
 
 </style>

+ 50 - 28
src/views/houseSelfCollect/paymentManagement.vue
查看文件 

@@ -12,20 +12,10 @@
 
         <ws-button type="primary" @click="examine">审核</ws-button>
 
         <ws-button type="primary" @click="examine">审核</ws-button>
 
       </template>
 
       </template>
 
       <template slot="right">
 
       <template slot="right">
 
-        <ws-select
 
-          v-model="warehouseName"
 
-          placeholder=""
 
-          @change="selectwarehouseName"
 
-          :value="searchType"
 
-        >
 
-          <ws-option
 
-            v-for="item in warehouseList"
 
-            :key="item.warehouseName"
 
-            :label="item.warehouseName"
 
-            :value="item.warehouseName"
 
-            style="color: #8890b1"
 
-          />
 
-        </ws-select>
 
+        <el-select v-model="warehouseNameKey" placeholder="请选择" @change="warehouseChange">
 
+          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
 
+          </el-option>
 
+          </el-select>
 
         <div></div>
 
         <div></div>
 
         <ws-input
 
         <ws-input
 
           v-model="searchKeyWord"
 
           v-model="searchKeyWord"
 
@@ -51,11 +41,11 @@
 
       </template>
 
       </template>
 
     </BaseHeaderLayout>
 
     </BaseHeaderLayout>
 
     <el-table
 
     <el-table
 
-      :data="paymentList"
 
+      :data="paymentList.records"
 
       style="width: 100%; margin-top: 20px"
 
       style="width: 100%; margin-top: 20px"
 
       ref="paymentList"
 
       ref="paymentList"
 
       border
 
       border
 
-      height="780"
 
+      height="680"
 
       @selection-change="handleSelectionChange"
 
       @selection-change="handleSelectionChange"
 
     >
 
     >
 
       <el-table-column
 
       <el-table-column
 
@@ -92,8 +82,14 @@
 
       ></el-table-column>
 
       ></el-table-column>
 
       <el-table-column
 
       <el-table-column
 
         class="table_td"
 
         class="table_td"
 
-        prop="tidalGrainPrice"
 
         width='180'
 
         width='180'
 
+        prop="type"
 
+        label="类型"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="tidalGrainPrice"
 
+         width='180'
 
         label="净重单价（元/公斤）"
 
         label="净重单价（元/公斤）"
 
       ></el-table-column>
 
       ></el-table-column>
 
       <el-table-column
 
       <el-table-column
 
@@ -142,8 +138,8 @@
 
       >
 
       >
 
       <template scope="scope">
 
       <template scope="scope">
 
         <el-button @click="del">删除</el-button>
 
         <el-button @click="del">删除</el-button>
 
-        <el-button @click="settlement(1)">结算</el-button>
 
-        <el-button @click="settlement(2)">查看</el-button>
 
+        <el-button @click="settlement(1,scope.row)">结算</el-button>
 
+        <el-button @click="settlement(2,scope.row)">查看</el-button>
 
         <el-button @click='print(scope.row)'>打印</el-button>
 
         <el-button @click='print(scope.row)'>打印</el-button>
 
       </template>
 
       </template>
 
       </el-table-column>
 
       </el-table-column>
 
@@ -214,12 +210,26 @@ export default {
 
       searchTypeText: '',
 
       searchTypeText: '',
 
       searchKeyWord: '',
 
       searchKeyWord: '',
 
       warehouseList:[],
 
       warehouseList:[],
 
+      warehouseNameKey:'',
 
       warehouseName:'',
 
       warehouseName:'',
 
+      warehouse:[],
 
       value1: '', //付款日期
 
       value1: '', //付款日期
 
       modification: [],
 
       modification: [],
 
     }
 
     }
 
   },
 
   },
 
   activated() {
 
   activated() {
 
+     selectWarehouseSelf({
 
+        compId: sessionStorage.getItem('ws-pf_compId'),
 
+        personCharge: sessionStorage.getItem('ws-pf_staffName'),
 
+      }).toPromise().then((response) => {
 
+          this.warehouseList = response
 
+          // this.$set(this.warehouseName,response[0].warehouseName)
 
+          // this.warehouseName=response[0].warehouseName
 
+          // this.warehouse=response[0]
 
+          this.warehouseList = response
 
+          this.warehouseNameKey = this.warehouseList[0].id
 
+          this.warehouseName = this.warehouseList[0].warehouseName
 
+        })
 
     this.getList()
 
     this.getList()
 
   },
 
   },
 
   methods: {
 
   methods: {
 
@@ -233,12 +243,6 @@ export default {
 
       }).toPromise().then((response) => {
 
       }).toPromise().then((response) => {
 
           this.paymentList = response
 
           this.paymentList = response
 
         })
 
         })
 
-      selectWarehouseSelf({
 
-        compId: sessionStorage.getItem('ws-pf_compId'),
 
-        personCharge: sessionStorage.getItem('ws-pf_staffName'),
 
-      }).toPromise().then((response) => {
 
-          this.warehouseList = response
 
-        })
 
    },
 
    },
 
     del() {
 
     del() {
 
       this.$confirm(
 
       this.$confirm(
 
@@ -255,8 +259,21 @@ export default {
 
           return false
 
           return false
 
         })
 
         })
 
     },
 
     },
 
-    settlement(index) {
 
-      this.$router.push({ path: 'settlement', query: { type: index } })
 
+    settlement(index,row) {
 
+      var data={}
 
+      var data1={}
 
+      for (let i = 0; i < this.warehouseList.length; i++) {
 
+        if(this.warehouseList[i].id==this.warehouseNameKey){
 
+          data=this.warehouseList[i]
 
+        }
 
+      }
 
+      for (let i = 0; i < data.purchasePriceList.length; i++) {
 
+        if(data.purchasePriceList[i].goodsName==row.goodsName){
 
+          data1=data.purchasePriceList[i]
 
+        }
 
+      }
 
+      if(row.goodsName)
 
+      this.$router.push({ path: 'settlement', query: { type: index,id: row.id,waterMin:data1.waterMin} })
 
     },
 
     },
 
     payment() {
 
     payment() {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
@@ -367,7 +384,12 @@ export default {
 
     //     }
 
     //     }
 
     //   }
 
     //   }
 
     // },
 
     // },
 
-    selectwarehouseName(e) {
 
+    warehouseChange(e) {
 
+      for (let i = 0; i < this.warehouseList.length; i++) {
 
+        if(this.warehouseList[i].id==this.warehouseNameKey){
 
+          this.warehouseName=this.warehouseList[i].warehouseName
 
+        }
 
+      }
 
       this.getList()
 
       this.getList()
 
     },
 
     },
 
      handleSizeChange(val) {
 
      handleSizeChange(val) {

+ 257 - 66
src/views/houseSelfCollect/settlement.vue
查看文件 

@@ -26,187 +26,211 @@
 
         <div style="width: 50%; margin: 0 auto">
 
         <div style="width: 50%; margin: 0 auto">
 
           <div class="title">基本信息</div>
 
           <div class="title">基本信息</div>
 
           <ws-info-table>
 
           <ws-info-table>
 
-            <ws-form-item label="编号" span="1" prop="waterContent">
 
+            <ws-form-item label="编号" span="1" prop="paymentNo">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.paymentNo"
 
                 placeholder="请输入编号"
 
                 placeholder="请输入编号"
 
                 maxlength="100"
 
                 maxlength="100"
 
-                :disabled='disabled'
 
+                disabled
 
                 size="small"
 
                 size="small"
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="仓位号" span="1" prop="waterContent">
 
             <ws-form-item label="仓位号" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.binNumber"
 
                 placeholder="请输入仓位号"
 
                 placeholder="请输入仓位号"
 
                 maxlength="100"
 
                 maxlength="100"
 
+                disabled
 
                 size="small"
 
                 size="small"
 
-              :disabled='disabled'
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="客户" span="1" prop="waterContent">
 
             <ws-form-item label="客户" span="1" prop="waterContent">
 
-              <ws-select
 
-                v-model="warehouseList.a"
 
-                placeholder="请输入货名"
 
-                class="typeselect"
 
-                @change="selectpackingMethod"
 
-               :disabled='disabled'
 
-              >
 
-                <ws-option
 
-                  v-for="item in goodnameList"
 
-                  :key="item.constKey"
 
-                  :label="item.constValue"
 
-                  :value="item.constValue"
 
-                />
 
-              </ws-select>
 
+               <ws-input
 
+              v-model="paymentList.customerName"
 
+                placeholder="请输入仓位号"
 
+                maxlength="100"
 
+                disabled
 
+                size="small"
 
+              />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="囤位号" span="1" prop="waterContent">
 
             <ws-form-item label="囤位号" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入客户" maxlength="100" size="small" :disabled='disabled' />
 
+              <ws-input  v-model="paymentList.storageNumber" placeholder="请输入囤位号" maxlength="100" size="small" disabled />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="车牌号" span="1" prop="waterContent">
 
             <ws-form-item label="车牌号" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入客户" maxlength="100" size="small" :disabled='disabled'/>
 
+              <ws-input v-model="paymentList.carNumber" placeholder="请输入车牌号" maxlength="100" size="small" disabled />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="货名" span="1" prop="waterContent">
 
             <ws-form-item label="货名" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入客户" maxlength="100" size="small" :disabled='disabled'/>
 
+                <ws-input v-model="paymentList.goodsName" placeholder="请输入货名" maxlength="100" size="small" disabled />
 
+            </ws-form-item>
 
+            <ws-form-item label="类型" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.type" placeholder="请输入类型" maxlength="100" size="small" disabled />
 
+            </ws-form-item>
 
+            <ws-form-item label="购粮性质" span="1" prop="waterContent">
 
+                <ws-input v-model="paymentList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
 
+            </ws-form-item>
 
+            <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价" span="1" prop="waterContent">
 
+                <ws-input v-model="paymentList.solidGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" :disabled='disabled' />
 
             </ws-form-item>
 
             </ws-form-item>
 
           </ws-info-table>
 
           </ws-info-table>
 
-
 
           <div class="title">质检数据</div>
 
           <div class="title">质检数据</div>
 
           <ws-info-table>
 
           <ws-info-table>
 
             <ws-form-item label="等级" span="1" prop="waterContent">
 
             <ws-form-item label="等级" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入编号" maxlength="100" size="small" :disabled='disabled'/>
 
+              <ws-input v-model="paymentList.qualityInspectionManagement.grade" placeholder="请输入等级" maxlength="100" size="small" disabled />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="杂质（%）" span="1" prop="waterContent">
 
             <ws-form-item label="杂质（%）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.qualityInspectionManagement.impurity"
 
                 placeholder="请输入杂质占比"
 
                 placeholder="请输入杂质占比"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-               :disabled='disabled'
 
+               disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="水分（%）" span="1" prop="waterContent">
 
             <ws-form-item label="水分（%）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.qualityInspectionManagement.waterContent"
 
                 placeholder="请输入水分占比"
 
                 placeholder="请输入水分占比"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled='disabled'
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="霉变粒（%）" span="1" prop="waterContent">
 
             <ws-form-item label="霉变粒（%）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.qualityInspectionManagement.mildewGrain"
 
                 placeholder="请输入霉变粒占比"
 
                 placeholder="请输入霉变粒占比"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled='disabled'
 
+               disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
 
             <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入容重" maxlength="100" size="small" :disabled='disabled'/>
 
+              <ws-input v-model="paymentList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100" size="small" disabled />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
 
             <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+               v-model="paymentList.qualityInspectionManagement.jiaorenli"
 
                 placeholder="请输入热损伤占比"
 
                 placeholder="请输入热损伤占比"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled='disabled'
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
 
             <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.qualityInspectionManagement.imperfectGrain"
 
                 placeholder="请输入不完整粒占比"
 
                 placeholder="请输入不完整粒占比"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled='disabled'
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
           </ws-info-table>
 
           </ws-info-table>
 
 
 
-          <div class="title">单价核算</div>
 
-          <ws-info-table>
 
+          <div v-if='paymentList.type=="潮粮"' class="title">单价核算</div>
 
+          <ws-info-table v-if='paymentList.type=="潮粮"'>
 
             <ws-form-item label="潮粮水分（%）" span="1" prop="waterContent">
 
             <ws-form-item label="潮粮水分（%）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.qualityInspectionManagement.waterContent"
 
                 placeholder="请输入潮粮水分"
 
                 placeholder="请输入潮粮水分"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled='disabled'
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="扣重比" span="1" prop="waterContent">
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="扣重比" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='buckleWeightRatiochange'
 
+              v-model="paymentList.buckleWeightRatio"
 
                 placeholder="请输入扣重比"
 
                 placeholder="请输入扣重比"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
                 :disabled='disabled'
 
                 :disabled='disabled'
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="干粮水分（%）" span="1" prop="waterContent">
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="干粮水分（%）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.qualityInspectionManagement.waterMin"
 
                 placeholder="请输入干粮水分"
 
                 placeholder="请输入干粮水分"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled='disabled'
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="扣重" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入扣重" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="扣重" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.qualityInspectionManagement.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="掉水(%)" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入掉水" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="掉水(%)" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin" placeholder="请输入掉水" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="基数" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入基数" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="基数" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.base" placeholder="请输入基数" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="毛重（公斤）" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入毛重" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="毛重（公斤）" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.weighingManagement.grossWeight" placeholder="请输入毛重" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="纯重（公斤）" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入纯重" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="纯重（公斤）" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.pureWeight" placeholder="请输入纯重" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="皮重（公斤）" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入皮重" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="皮重（公斤）" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.weighingManagement.tare" placeholder="请输入皮重" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item
 
+            <ws-form-item v-if='paymentList.type=="潮粮"'
 
               label="净重单价（元/公斤）"
 
               label="净重单价（元/公斤）"
 
               span="1"
 
               span="1"
 
               prop="waterContent"
 
               prop="waterContent"
 
             >
 
             >
 
               <ws-input
 
               <ws-input
 
+               v-model="paymentList.qualityInspectionManagement.tidalGrainPrice"
 
                 placeholder="请输入净重单价"
 
                 placeholder="请输入净重单价"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-              :disabled='disabled'
 
+              disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="扣杂（公斤）" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入扣杂" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="扣杂（公斤）" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.weighingManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item
 
+            <ws-form-item v-if='paymentList.type=="潮粮"'
 
               label="纯重单价（元/公斤）"
 
               label="纯重单价（元/公斤）"
 
               span="1"
 
               span="1"
 
               prop="waterContent"
 
               prop="waterContent"
 
             >
 
             >
 
               <ws-input
 
               <ws-input
 
+               v-model="paymentList.solidGrainPrice"
 
                 placeholder="请输入纯重单价"
 
                 placeholder="请输入纯重单价"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled='disabled'
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="净重（公斤）" span="1" prop="waterContent">
 
-              <ws-input placeholder="请输入净重" maxlength="100" size="small" :disabled='disabled'/>
 
+            <ws-form-item v-if='paymentList.type=="潮粮"' label="净重（公斤）" span="1" prop="waterContent">
 
+              <ws-input v-model="paymentList.weighingManagement.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled/>
 
             </ws-form-item>
 
             </ws-form-item>
 
           </ws-info-table>
 
           </ws-info-table>
 
 
 
-          <div class="title">核算金额（元）</div>
 
+          <div class="title">结算金额（元）</div>
 
           <ws-info-table>
 
           <ws-info-table>
 
-            <ws-form-item
 
+            <ws-form-item v-if='paymentList.type=="潮粮"'
 
               label="粮款 = 净重 x 净重单价 ="
 
               label="粮款 = 净重 x 净重单价 ="
 
               span="1"
 
               span="1"
 
               prop="waterContent"
 
               prop="waterContent"
 
               class="formItem"
 
               class="formItem"
 
             >
 
             >
 
-              <ws-input placeholder="请输入粮款" maxlength="100" size="small" :disabled='disabled'/>
 
+              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" :disabled='disabled'/>
 
+            </ws-form-item>
 
+            <ws-form-item v-if='paymentList.type=="干粮"'
 
+              label="粮款 = 净重 x  干粮单价 ="
 
+              span="1"
 
+              prop="waterContent"
 
+              class="formItem"
 
+            >
 
+              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" :disabled='disabled'/>
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="称重补助" span="1" prop="waterContent">
 
             <ws-form-item label="称重补助" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+               v-model="paymentList.weighingSubsidy"
 
                 placeholder="请输入称重补助"
 
                 placeholder="请输入称重补助"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
@@ -215,6 +239,8 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="称重扣款" span="1" prop="waterContent">
 
             <ws-form-item label="称重扣款" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+              v-model="paymentList.weighingDeduction"
 
                 placeholder="请输入称重扣款"
 
                 placeholder="请输入称重扣款"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
@@ -223,6 +249,8 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="运费补助" span="1" prop="waterContent">
 
             <ws-form-item label="运费补助" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+              v-model="paymentList.freightSubsidy"
 
                 placeholder="请输入运费补助"
 
                 placeholder="请输入运费补助"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
@@ -231,6 +259,8 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="运费扣款" span="1" prop="waterContent">
 
             <ws-form-item label="运费扣款" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+               v-model="paymentList.freightDeduction"
 
                 placeholder="请输入运费扣款"
 
                 placeholder="请输入运费扣款"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
@@ -239,6 +269,8 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="卸车补助" span="1" prop="waterContent">
 
             <ws-form-item label="卸车补助" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+              v-model="paymentList.unloadSubsidy"
 
                 placeholder="请输入卸车补助"
 
                 placeholder="请输入卸车补助"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
@@ -247,6 +279,8 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="卸车扣款" span="1" prop="waterContent">
 
             <ws-form-item label="卸车扣款" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+              v-model="paymentList.unloadDeduction"
 
                 placeholder="请输入卸车扣款"
 
                 placeholder="请输入卸车扣款"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
@@ -255,14 +289,28 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="其他补助" span="1" prop="waterContent">
 
             <ws-form-item label="其他补助" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+              v-model="paymentList.otherSubsidy"
 
                 placeholder="请输入其他补助"
 
                 placeholder="请输入其他补助"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
                 size="small"
 
                 size="small"
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
+            <ws-form-item label="质量扣款" span="1" prop="qualityDeduction">
 
+              <ws-input
 
+              @input='grainMoney'
 
+              v-model="paymentList.qualityDeduction"
 
+                placeholder="请输入质量扣款"
 
+                maxlength="100"
 
+                :disabled="disabled"
 
+                size="small"
 
+              />
 
+            </ws-form-item>
 
             <ws-form-item label="其他扣款" span="1" prop="waterContent">
 
             <ws-form-item label="其他扣款" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='grainMoney'
 
+              v-model="paymentList.otherDeduction"
 
                 placeholder="请输入其他扣款"
 
                 placeholder="请输入其他扣款"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
@@ -276,14 +324,17 @@
 
               class="formItem"
 
               class="formItem"
 
             >
 
             >
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.calculationPayable"
 
                 placeholder="请输入计算应付"
 
                 placeholder="请输入计算应付"
 
                 maxlength="100"
 
                 maxlength="100"
 
-               :disabled='disabled'
 
+                disabled
 
                 size="small"
 
                 size="small"
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="实际付款" span="1" prop="waterContent">
 
             <ws-form-item label="实际付款" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              @input='actualPayment'
 
+              v-model="paymentList.actualPayment"
 
                 placeholder="请输入实际付款"
 
                 placeholder="请输入实际付款"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
@@ -292,9 +343,10 @@
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="人民币大写" span="1" prop="waterContent">
 
             <ws-form-item label="人民币大写" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.capitalize"
 
                 placeholder="请输入人民币大写"
 
                 placeholder="请输入人民币大写"
 
                 maxlength="100"
 
                 maxlength="100"
 
-                :disabled='disabled'
 
+                disabled
 
                 size="small"
 
                 size="small"
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
@@ -312,6 +364,7 @@
 
             </ws-form-item> -->
 
             </ws-form-item> -->
 
             <ws-form-item label="记事（选填）" span="1" prop="waterContent">
 
             <ws-form-item label="记事（选填）" span="1" prop="waterContent">
 
               <ws-input
 
               <ws-input
 
+              v-model="paymentList.remarks"
 
                 placeholder="备注信息，不超过20个字"
 
                 placeholder="备注信息，不超过20个字"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
@@ -331,7 +384,7 @@
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
-import {} from '@/model/houseSelfCollect/index'
 
+import {getpaymentexamine,postpaymentedit} from '@/model/houseSelfCollect/index'
 
 // import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 
 // import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 
 export default {
 
 export default {
 
   components: {
 
   components: {
 
@@ -340,9 +393,16 @@ export default {
 
   watch: {},
 
   watch: {},
 
   data() {
 
   data() {
 
     return {
 
     return {
 
-      warehouseList: {},
 
+     paymentList: {
 
+       qualityInspectionManagement:{
 
+         waterContent:'',
 
+         buckleWeightRatio:0,
 
+         grainMoney:0
 
+       }
 
+     },
 
       disabled:false,
 
       disabled:false,
 
       types:'',
 
       types:'',
 
+
 
       information:'结算',
 
       information:'结算',
 
     }
 
     }
 
   },
 
   },
 
@@ -355,19 +415,141 @@ export default {
 
       this.disabled=false
 
       this.disabled=false
 
          this.information = '结算'   
          this.information = '结算'   
     }
 
     }
 
-    console.log( this.information)
 
+   this.getList()
 
   },
 
   },
 
   methods: {
 
   methods: {
 
+    getList(){
 
+      getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
 
+          this.paymentList = response
 
+          this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
 
+          this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
 
+          this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
 
+          this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
 
+          if(!this.paymentList.solidGrainPrice){
 
+            this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
 
+          }
 
+          if(this.paymentList.type='潮粮'){
 
+            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.tidalGrainPrice*this.paymentList.weighingManagement.netWeight
 
+          }else{
 
+            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
 
+          }
 
+          console.log(this.paymentList.grainMoney)
 
+          
+        })
 
+    },
 
+    actualPayment(e){
 
+     this.paymentList.capitalize=this.convertCurrency(e)
 
+    },
 
+    grainMoney(){
 
+      this.paymentList.calculationPayable=(Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy))-this.paymentList.weighingDeduction-this.paymentList.freightDeduction-this.paymentList.unloadDeduction-this.paymentList.otherDeduction-this.paymentList.qualityDeduction
 
+    },
 
+     /**
 
+         * 将金额数字转为汉字大写
 
+         * 12.42 -> 壹拾贰元肆角贰分
 
+         * @param {Number} money - 数字金额
 
+         * @return String
 
+        */
 
+        convertCurrency(money)
 
+        {
 
+          //汉字的数字
 
+          var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
 
+          //基本单位
 
+          var cnIntRadice = new Array('', '拾', '佰', '仟');
 
+          //对应整数部分扩展单位
 
+          var cnIntUnits = new Array('', '万', '亿', '兆');
 
+          //对应小数部分单位
 
+          var cnDecUnits = new Array('角', '分', '毫', '厘');
 
+          //整数金额时后面跟的字符
 
+          var cnInteger = '整';
 
+          //整型完以后的单位
 
+          var cnIntLast = '元';
 
+          //最大处理的数字
 
+          var maxNum = 999999999999999.9999;
 
+          //金额整数部分
 
+          var integerNum;
 
+          //金额小数部分
 
+          var decimalNum;
 
+          //输出的中文金额字符串
 
+          var chineseStr = '';
 
+          //分离金额后用的数组，预定义
 
+          var parts;
 
+          if (money == '') { return ''; }
 
+          money = parseFloat(money);
 
+          if (money >= maxNum) {
 
+            //超出最大处理数字
 
+            return '';
 
+          }
 
+          if (money == 0) {
 
+            chineseStr = cnNums[0] + cnIntLast + cnInteger;
 
+            return chineseStr;
 
+          }
 
+          //转换为字符串
 
+          money = money.toString();
 
+          if (money.indexOf('.') == -1) {
 
+            integerNum = money;
 
+            decimalNum = '';
 
+          } else {
 
+            parts = money.split('.');
 
+            integerNum = parts[0];
 
+            decimalNum = parts[1].substr(0, 4);
 
+          }
 
+          //获取整型部分转换
 
+          if (parseInt(integerNum, 10) > 0) {
 
+            var zeroCount = 0;
 
+            var IntLen = integerNum.length;
 
+            for (var i = 0; i < IntLen; i++) {
 
+              var n = integerNum.substr(i, 1);
 
+              var p = IntLen - i - 1;
 
+              var q = p / 4;
 
+              var m = p % 4;
 
+              if (n == '0') {
 
+                zeroCount++;
 
+              } else {
 
+                if (zeroCount > 0) {
 
+                  chineseStr += cnNums[0];
 
+                }
 
+                //归零
 
+                zeroCount = 0;
 
+                chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
 
+              }
 
+              if (m == 0 && zeroCount < 4) {
 
+                chineseStr += cnIntUnits[q];
 
+              }
 
+            }
 
+            chineseStr += cnIntLast;
 
+          }
 
+          //小数部分
 
+          if (decimalNum != '') {
 
+            var decLen = decimalNum.length;
 
+            for (var i = 0; i < decLen; i++) {
 
+              var n = decimalNum.substr(i, 1);
 
+              if (n != '0') {
 
+                chineseStr += cnNums[Number(n)] + cnDecUnits[i];
 
+              }
 
+            }
 
+          }
 
+          if (chineseStr == '') {
 
+            chineseStr += cnNums[0] + cnIntLast + cnInteger;
 
+          } else if (decimalNum == '') {
 
+            chineseStr += cnInteger;
 
+          }
 
+          return chineseStr;
 
+        },
 
     print() {
 
     print() {
 
+      this.paymentList.id=this.$route.query.id
 
+      postpaymentedit(this.paymentList).toPromise().then((response) => {
 
+          this.$router.push({ path: 'houseSelfCollectPrint',
 
+            query:{
 
+          name:"123"
 
+        }
 
+          
+        })
 
       // this.xx = true;
 
       // this.xx = true;
 
       // let newstr = document.getElementById('print').innerHTML
 
       // let newstr = document.getElementById('print').innerHTML
 
       // let oldstr = document.body.innerHTML
 
       // let oldstr = document.body.innerHTML
 
       // document.body.innerHTML = newstr
 
       // document.body.innerHTML = newstr
 
       // window.print()
 
       // window.print()
 
-        this.$router.push({ path: 'houseSelfCollectPrint',
 
-            query:{
 
-          name:"123"
 
-        }
 
+       
         },
 
         },
 
     
     
         )
 
         )
 
@@ -375,6 +557,11 @@ export default {
 
       // window.location.reload()
 
       // window.location.reload()
 
       // this.$router.push({ path: 'paymentManagement' })
 
       // this.$router.push({ path: 'paymentManagement' })
 
     },
 
     },
 
+    buckleWeightRatiochange(e){
 
+      this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
 
+      this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
 
+      this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
 
+    },
 
     cancel() {
 
     cancel() {
 
       this.$router.push({ path: 'paymentManagement' })
 
       this.$router.push({ path: 'paymentManagement' })
 
     },
 
     },
 
@@ -460,4 +647,8 @@ export default {
 
   text-align: center;
 
   text-align: center;
 
   margin: 20px auto;
 
   margin: 20px auto;
 
 }
 
 }
 
+.el-form{
 
+      overflow: scroll;
 
+    height: 86vh;
 
+}
 
 </style>
 
 </style>

+ 88 - 78
src/views/houseSelfCollect/weighingManagement.vue
查看文件 

@@ -42,9 +42,9 @@
 
       </template>
 
       </template>
 
     </BaseHeaderLayout>
 
     </BaseHeaderLayout>
 
     <el-table
 
     <el-table
 
-      :data="warehouseList"
 
+      :data="weighingList"
 
       style="width: 100%; margin-top: 20px"
 
       style="width: 100%; margin-top: 20px"
 
-      ref="warehouseList"
 
+      ref="weighingList"
 
       border
 
       border
 
       height="780"
 
       height="780"
 
     >
 
     >
 
@@ -55,30 +55,39 @@
 
         </template>
 
         </template>
 
       </el-table-column>
 
       </el-table-column>
 
       <el-table-column
 
       <el-table-column
 
-        prop="contractNo"
 
+        prop="number"
 
         width="120"
 
         width="120"
 
         label="编号"
 
         label="编号"
 
       ></el-table-column>
 
       ></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="contractNo" 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="contractNo" 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="contractNo" label="称重时间"></el-table-column>
 
-      <el-table-column prop="contractNo" 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="binNumber" label="仓位号"></el-table-column>
 
+      <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
 
+      <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
 
+      <el-table-column
 
+        prop="suqualityTestingDate"
 
+        label="称重时间"
 
+      ></el-table-column>
 
+      <el-table-column prop="status" label="状态"></el-table-column>
 
       <el-table-column width="300" prop="contractNo1" label="操作">
 
       <el-table-column width="300" prop="contractNo1" label="操作">
 
-        <el-button @click="GrossWeight">毛重</el-button>
 
-        <el-button @click="tare">皮重</el-button>
 
-        <el-button @click="print">打印</el-button>
 
+        <template slot-scope="scope">
 
+
 
+        <el-button @click="weightCheck(scope.row,1)" v-if="(scope.row.status !='已称皮重'&& scope.row.status !='已质检')">毛重</el-button>
 
+        <el-button @click="weightCheck(scope.row,2)" v-if="scope.row.status =='已称毛重' || scope.row.status =='已称皮重'">皮重</el-button>
 
+        <el-button @click="print" v-if="scope.row.status =='已称皮重'">打印</el-button>
 
+        </template>
 
       </el-table-column>
 
       </el-table-column>
 
     </el-table>
 
     </el-table>
 
 
 
     <!-- 毛重检斤 -->
 
     <!-- 毛重检斤 -->
 
-    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
 
+    <!-- <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
 
       <ws-form>
 
       <ws-form>
 
         <div class="title">毛重检斤</div>
 
         <div class="title">毛重检斤</div>
 
         <ws-info-table>
 
         <ws-info-table>
 
@@ -110,9 +119,9 @@
 
           <el-button @click="commit">保存</el-button>
 
           <el-button @click="commit">保存</el-button>
 
         </div>
 
         </div>
 
       </ws-form>
 
       </ws-form>
 
-    </el-dialog>
 
+    </el-dialog> -->
 
     <!-- 皮重检斤 -->
 
     <!-- 皮重检斤 -->
 
-    <el-dialog width="40%" :visible.sync="paymentForm1" :append-to-body="true">
 
+    <!-- <el-dialog width="40%" :visible.sync="paymentForm1" :append-to-body="true">
 
       <ws-form>
 
       <ws-form>
 
         <div class="title">皮重检斤</div>
 
         <div class="title">皮重检斤</div>
 
         <ws-info-table>
 
         <ws-info-table>
 
@@ -169,43 +178,37 @@
 
           <el-button @click="submit">保存</el-button>
 
           <el-button @click="submit">保存</el-button>
 
         </div>
 
         </div>
 
       </ws-form>
 
       </ws-form>
 
-    </el-dialog>
 
-    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
 
-     <div style="text-align:center">
 
-    <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>
 
+    </el-dialog> -->
 
+    <!-- <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint> -->
 
+    <div style="text-align: center">
 
+      <el-pagination
 
+        @size-change="handleSizeChange"
 
+        @current-change="handleCurrentChange"
 
+        :current-page="currentPage"
 
+        :page-size="deptCircularPage.pageSize"
 
+        layout="total, sizes, prev, pager, next, jumper"
 
+        :total="deptBudgetTotal"
 
+      >
 
+      </el-pagination>
 
     </div>
 
     </div>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
-import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 
-import {} from '@/model/houseSelfCollect/index'
 
+import { getweighingList } from '@/model/houseSelfCollect/index'
 
+
 
 export default {
 
 export default {
 
-  components: {
 
-    houseSelfCollectPrint,
 
-  },
 
+  components: {},
 
   watch: {},
 
   watch: {},
 
   data() {
 
   data() {
 
     return {
 
     return {
 
-       //分页
 
+      //分页
 
       currentPage: 1,
 
       currentPage: 1,
 
       pageSize: 10,
 
       pageSize: 10,
 
-      deptCircularPage:{},
 
+      deptCircularPage: {},
 
       deptBudgetTotal: 0,
 
       deptBudgetTotal: 0,
 
       paymentForm: false,
 
       paymentForm: false,
 
       paymentForm1: false,
 
       paymentForm1: false,
 
-      warehouseList: [
 
-        {
 
-          contractNo: '56454',
 
-        },
 
-      ],
 
+      weighingList: [],
 
       searchKeyWord: '',
 
       searchKeyWord: '',
 
       searchType: [],
 
       searchType: [],
 
       searchTypeText: '',
 
       searchTypeText: '',
 
@@ -213,45 +216,31 @@ export default {
 
       taskTypeList: [],
 
       taskTypeList: [],
 
     }
 
     }
 
   },
 
   },
 
-  activated() {},
 
+  activated() {
 
+    this.getList()
 
+  },
 
   methods: {
 
   methods: {
 
-    GrossWeight() {
 
-      //毛重
 
-      this.paymentForm = true
 
-    },
 
-    tare() {
 
-      //皮重
 
-      this.paymentForm1 = true
 
-    },
 
+    // GrossWeight() {
 
+    //   //毛重
 
+    //   this.paymentForm = true
 
+    // },
 
+    // tare() {
 
+    //   //皮重
 
+    //   this.paymentForm1 = true
 
+    // },
 
     selecttaskType() {
 
     selecttaskType() {
 
       //选择仓库改变方法
 
       //选择仓库改变方法
 
     },
 
     },
 
-    Reacquire() {
 
-      //重新获取
 
-    },
 
-    commit() {
 
-      //毛重保存
 
-      this.$confirm('确定保存检斤信息？', '提示', {
 
-        confirmButtonText: '确定',
 
-        cancelButtonText: '取消',
 
-        type: 'warning',
 
-      })
 
-        .then(() => {})
 
-        .catch(() => {
 
-          return false
 
-        })
 
-    },
 
-    submit() {//皮重保存
 
-       this.$confirm('确定保存检斤信息？', '提示', {
 
-        confirmButtonText: '确定',
 
-        cancelButtonText: '取消',
 
-        type: 'warning',
 
+    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},
 
       })
 
       })
 
-        .then(() => {})
 
-        .catch(() => {
 
-          return false
 
-        })
 
     },
 
     },
 
+    // Reacquire() {
 
+    //   //重新获取
 
+    // },
 
+
 
     print() {
 
     print() {
 
       let newstr = document.getElementById('print').innerHTML
 
       let newstr = document.getElementById('print').innerHTML
 
       let oldstr = document.body.innerHTML
 
       let oldstr = document.body.innerHTML
 
@@ -261,7 +250,7 @@ export default {
 
       // window.location.reload()
 
       // window.location.reload()
 
       this.$router.push({ path: 'paymentManagement' })
 
       this.$router.push({ path: 'paymentManagement' })
 
     },
 
     },
 
-     handleSizeChange(val) {
 
+    handleSizeChange(val) {
 
       console.log(`每页 ${val} 条`)
 
       console.log(`每页 ${val} 条`)
 
       this.pageSize = val
 
       this.pageSize = val
 
       this.getList()
 
       this.getList()
 
@@ -271,6 +260,27 @@ export default {
 
       console.log(`当前页: ${val}`)
 
       console.log(`当前页: ${val}`)
 
       this.getList()
 
       this.getList()
 
     },
 
     },
 
+    getList() {
 
+      getweighingList({
 
+        compId: sessionStorage.getItem('ws-pf_compId'),
 
+        currentPage: this.currentPage,
 
+        pageSize: this.pageSize,
 
+        searchKeyWord: this.searchKeyWord,
 
+        warehouseName: this.warehouseName,
 
+      })
 
+        .toPromise()
 
+        .then((response) => {
 
+          // this.$notify.success({
 
+          //   title: '成功',
 
+          //   message: '删除成功',
 
+          // })
 
+          this.weighingList = response.records 
+          
+        })
 
+        .catch((response) => {
 
+          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
+        })
 
+    },
 
   },
 
   },
 
 }
 
 }
 
 </script>
 
 </script>

+ 181 - 98
src/views/houseSelfCollect/weightCheck.vue
查看文件 

@@ -21,9 +21,9 @@
 
         <div style="width: 50%; margin: 0 auto">
 
         <div style="width: 50%; margin: 0 auto">
 
           <div class="title">基本信息</div>
 
           <div class="title">基本信息</div>
 
           <ws-info-table>
 
           <ws-info-table>
 
-            <ws-form-item label="编号" span="1" prop="qualityNo">
 
+            <ws-form-item label="编号" span="1" prop="number">
 
               <ws-input
 
               <ws-input
 
-                v-model="inspect.qualityNo"
 
+                v-model="weighingList.number"
 
                 placeholder="请输入编号"
 
                 placeholder="请输入编号"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 disabled
 
                 disabled
 
@@ -31,146 +31,122 @@
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="仓位号" span="1" prop="binNumber">
 
             <ws-form-item label="仓位号" span="1" prop="binNumber">
 
-              <!-- <ws-select
 
-                v-model="inspect.binNumber"
 
-                placeholder="请输入仓位号"
 
-                class="typeselect"
 
-                @change="selectpackingMethod"
 
-                :disabled="disabled"
 
-              >
 
-                <ws-option
 
-                  v-for="item in getbinNumberList"
 
-                  :key="item.value"
 
-                  :label="item.value"
 
-                  :value="item.value"
 
-                />
 
-              </ws-select> -->
 
-               <ws-input
 
-                v-model="inspect.binNumber"
 
+              <ws-input
 
+                v-model="weighingList.binNumber"
 
                 placeholder="请输入仓位号"
 
                 placeholder="请输入仓位号"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 disabled
 
                 disabled
 
                 size="small"
 
                 size="small"
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="客户" span="1" prop="customerName">
 
-              <!-- <ws-select
 
-                v-model="inspect.customerName"
 
-                placeholder="请输入客户"
 
-                class="typeselect"
 
-                @change="selectpackingMethod"
 
-                :disabled="disabled"
 
-              >
 
-                <ws-option
 
-                  v-for="item in customerList"
 
-                  :key="item.valueKey"
 
-                  :label="item.value"
 
-                  :value="item.value"
 
-                />
 
-              </ws-select> -->
 
-               <ws-input
 
-                v-model="inspect.customerName"
 
+            <ws-form-item label="客户" span="1" prop="customer">
 
+              <ws-input
 
+                v-model="weighingList.customer"
 
                 placeholder="请输入客户"
 
                 placeholder="请输入客户"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 disabled
 
                 disabled
 
                 size="small"
 
                 size="small"
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="囤位号" span="1" prop="storageTagNo">
 
+            <ws-form-item label="囤位号" span="1" prop="storageNumber">
 
               <ws-input
 
               <ws-input
 
-                v-model="inspect.storageTagNo"
 
+                v-model="weighingList.storageNumber"
 
                 placeholder="请输入囤位号"
 
                 placeholder="请输入囤位号"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled="disabled"
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="车牌号" span="1" prop="carNumber">
 
             <ws-form-item label="车牌号" span="1" prop="carNumber">
 
               <ws-input
 
               <ws-input
 
-                v-model="inspect.carNumber"
 
+                v-model="weighingList.carNumber"
 
                 placeholder="请输入车牌号"
 
                 placeholder="请输入车牌号"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled="disabled"
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
             <ws-form-item label="货名" span="1" prop="goodsName">
 
             <ws-form-item label="货名" span="1" prop="goodsName">
 
-              <!-- <ws-select
 
-                v-model="inspect.goodsName"
 
-                placeholder=""
 
-                class="typeselect"
 
-                :disabled="disabled"
 
-                @change="waterContentChange"
 
-              >
 
-                <ws-option
 
-                  v-for="item in goodnameList"
 
-                  :key="item.goodsNameKey"
 
-                  :label="item.goodsName"
 
-                  :value="item.goodsName"
 
-                />
 
-              </ws-select> -->
 
-
 
               <ws-input
 
               <ws-input
 
-                v-model="inspect.goodsName"
 
+                v-model="weighingList.goodsName"
 
                 placeholder="请输入货名"
 
                 placeholder="请输入货名"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled="disabled"
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="毛重（公斤）" span="1" prop="buckleWeightRatio">
 
+            <!-- <div class="formitem"> -->
 
+            <ws-form-item
 
+              label="毛重（公斤）"
 
+              span="1"
 
+              prop="grossWeight"
 
+            >
 
               <ws-input
 
               <ws-input
 
-                v-model="inspect.buckleWeightRatio"
 
+                v-model="weighingList.grossWeight"
 
                 placeholder="请输入毛重"
 
                 placeholder="请输入毛重"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
-                :disabled="disabled"
 
-              />
 
-            </ws-form-item>
 
-             <ws-form-item label="皮重（公斤）" span="1" prop="buckleWeightRatio">
 
-              <ws-input
 
-                v-model="inspect.buckleWeightRatio"
 
-                placeholder="请输入皮重）"
 
-                maxlength="100"
 
-                size="small"
 
-                :disabled="disabled"
 
-              />
 
-            </ws-form-item>
 
-             <ws-form-item label="扣杂（公斤）" span="1" prop="buckleWeightRatio">
 
-              <ws-input
 
-                v-model="inspect.buckleWeightRatio"
 
-                placeholder="请输入扣杂"
 
-                maxlength="100"
 
-                size="small"
 
-                :disabled="disabled"
 
+                disabled
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
-            <ws-form-item label="净重（公斤）" span="1" prop="buckleWeightRatio">
 
+            <el-button type="primary" :class="tpyeNo != 2?'':'css1'" @click="chongxin">重新获取</el-button>
 
+            <ws-form-item
 
+              label="皮重（公斤）"
 
+              span="1"
 
+              prop="tare"
 
+              v-if="this.tpyeNo == 2"
 
+            >
 
               <ws-input
 
               <ws-input
 
-                v-model="inspect.buckleWeightRatio"
 
-                placeholder="请输入净重"
 
+                v-model="weighingList.tare"
 
+                placeholder="请输入皮重"
 
                 maxlength="100"
 
                 maxlength="100"
 
                 size="small"
 
                 size="small"
 
                 :disabled="disabled"
 
                 :disabled="disabled"
 
               />
 
               />
 
             </ws-form-item>
 
             </ws-form-item>
 
+
 
+            <el-button type="primary"  v-if="this.tpyeNo == 2">重新获取</el-button>
 
+            <div class="formItem">
 
+              <ws-form-item
 
+                label="扣杂（公斤）"
 
+                span="1"
 
+                prop="buckleWeightRatio"
 
+                 v-if="this.tpyeNo == 2"
 
+              >
 
+                <ws-input
 
+                  v-model="weighingList.buckleMiscellaneous"
 
+                  placeholder="请输入扣杂"
 
+                  maxlength="100"
 
+                  size="small"
 
+                  :disabled="disabled"
 
+                />
 
+              </ws-form-item>
 
+
 
+              <ws-form-item
 
+                label="净重（公斤）"
 
+                span="1"
 
+                prop="netWeight"
 
+                 v-if="this.tpyeNo == 2"
 
+              >
 
+                <ws-input
 
+                  v-model="weighingList.netWeight"
 
+                  placeholder="请输入净重"
 
+                  maxlength="100"
 
+                  size="small"
 
+                  disabled
 
+                />
 
+              </ws-form-item>
 
+            </div>
 
           </ws-info-table>
 
           </ws-info-table>
 
-           
-          
-          <div style="text-align: right; color: #323233">
 
-            潮粮单价（元/公斤）：{{
 
-              inspect.tidalGrainPrice == null ? '0' : inspect.tidalGrainPrice
 
-            }}
 
-          </div>
 
           <div class="but">
 
           <div class="but">
 
-            <el-button @click="cancel" v-if="this.types != 2" type="primary"
 
+            <el-button @click="cancel" type="primary"
 
               >取消</el-button
 
               >取消</el-button
 
             >
 
             >
 
-            <el-button @click="print" v-if="this.types != 2" type="primary"
 
-              >保存并打印</el-button
 
+            <el-button @click="print" v-if="this.tpyeNo == 1" type="primary"
 
+              >保存</el-button
 
             >
 
             >
 
-            <el-button @click="cancel" v-if="this.types == 2" type="primary"
 
-              >关闭</el-button
 
+            <el-button @click="print" v-if="this.tpyeNo == 2" type="primary"
 
+              >保存并打印</el-button
 
             >
 
             >
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
@@ -179,16 +155,113 @@
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
+import { tare,grossWeight } from '@/model/houseSelfCollect/index'
 
 export default {
 
 export default {
 
   data() {
 
   data() {
 
     return {
 
     return {
 
-        inspect:{},
 
-        types:1,
 
-        information:"头部信息",
 
+      inspect: {},
 
+      types: 1,
 
+      information: '',
 
+      weighingList: {},
 
+      tpyeNo: '',
 
+      disabled:false,
 
+      relationId:"",
 
     }
 
     }
 
   },
 
   },
 
-  activated() {},
 
-  methods: {},
 
+  activated() {
 
+    this.tpyeNo = this.$route.query.tpyeNo
 
+    this.weighingList.number = this.$route.query.number
 
+    this.weighingList.binNumber = this.$route.query.binNumber
 
+    this.weighingList.customer = this.$route.query.customer
 
+    this.weighingList.storageNumber = this.$route.query.storageNumber
 
+    this.weighingList.carNumber = this.$route.query.carNumber
 
+    this.weighingList.goodsName = this.$route.query.goodsName
 
+    this.weighingList.id = this.$route.query.id
 
+    // this.weighingList.grossWeight = this.$route.query.grossWeight
 
+    // this.weighingList.tare = this.$route.query.tare
 
+    // this.weighingList.netWeight = this.$route.query.netWeight
 
+    this.relationId = this.$route.query.relationId
 
+    if(this.tpyeNo == 1){
 
+      this.information = "毛重"
 
+    }else if(this.tpyeNo == 2){
 
+      this.information = "皮重"
 
+    }
 
+  },
 
+  methods: {
 
+    submit() {
 
+      //皮重保存
 
+      this.$confirm('确定保存检斤信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {})
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+    chongxin(){
 
+      if(this.tpyeNo == 2){
 
+        return
 
+      }
 
+console.log("dfsgfgdgdsgszdf")
 
+    },
 
+     cancel() {
 
+      this.$router.push({ path: 'weighingManagement' })
 
+    },
 
+    print(){
 
+      this.$confirm('确定保存检斤信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {
 
+          if(this.tpyeNo == 1){
 
+            this.weighingList.relationId = this.relationId
 
+            grossWeight(this.weighingList)
 
+            .toPromise()
 
+            .then((response) => {
 
+              this.$notify.success({
 
+                title: '成功',
 
+                message: '保存成功',
 
+              })
 
+              this.$router.go(-1) 
+            })
 
+            .catch((response) => {
 
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
+            })
 
+           }else if(this.tpyeNo == 2){
 
+              tare(this.weighingList)
 
+            .toPromise()
 
+            .then((response) => {
 
+              this.$notify.success({
 
+                title: '成功',
 
+                message: '保存成功',
 
+              })
 
+              this.$router.go(-1)
 
+            })
 
+            .catch((response) => {
 
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
+            })
 
+           }
 
+        })
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+    commit() {
 
+      //毛重保存
 
+      this.$confirm('确定保存检斤信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {})
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+  },
 
 }
 
 }
 
 </script>
 
 </script>
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>
 
@@ -202,6 +275,13 @@ export default {
 
   width: 50%;
 
   width: 50%;
 
   border: none;
 
   border: none;
 
 }
 
 }
 
+.formItem {
 
+  width: 100%;
 
+  display: inline;
 
+}
 
+//  .ws-info-table .widthChange {
 
+//    width: 51%;
 
+// }
 
 /deep/.ws-info-table .el-form-item .el-form-item__label {
 
 /deep/.ws-info-table .el-form-item .el-form-item__label {
 
   width: 30%;
 
   width: 30%;
 
   text-align: center;
 
   text-align: center;
 
@@ -269,4 +349,7 @@ export default {
 
   text-align: center;
 
   text-align: center;
 
   margin: 20px auto;
 
   margin: 20px auto;
 
 }
 
 }
 
+.css1{
 
+  opacity: 0;
 
+}
 
 </style> 
 </style>

+ 0 - 0
src/views/outboundManagement/collectionManagement.vue
查看文件


+ 61 - 0
src/views/outboundManagement/component/route.js
查看文件 

@@ -0,0 +1,61 @@
 
+import Layout from '@/layout/index';
 
+
 
+const outboundManagementRouter = {
 
+    path: '/outboundManagement',
 
+    component: Layout,
 
+    redirect: '/outboundManagement',
 
+    name: 'outboundManagement',
 
+    alwaysShow: true, // will always show the root menu
 
+    meta: {
 
+        title: 'outboundManagement',
 
+        module: 'contractManagement',
 
+        icon: '-hetongguanli'
 
+    },
 
+    children: [
 
+        // 检斤管理
 
+        {
 
+            path: 'weighingManagement',
 
+            component: () =>
 
+                import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/weighingManagement'),
 
+            name: 'weighingManagement',
 
+            meta: {
 
+                title: 'weighingManagement',
 
+                shortcutEntrance: 'outboundManagement',
 
+                module: 'procurement.procurementOrder.delete',
 
+                permissicon: [],
 
+                keepAlive: true
 
+            }
 
+        },
 
+        // 质检管理
 
+        {
 
+            path: 'qualityInspectionManagement',
 
+            component: () =>
 
+                import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/qualityInspectionManagement'),
 
+            name: 'qualityInspectionManagement',
 
+            meta: {
 
+                title: 'qualityInspectionManagement',
 
+                shortcutEntrance: 'outboundManagement',
 
+                module: 'procurement.procurementOrder.delete',
 
+                permissicon: [],
 
+                keepAlive: true
 
+            }
 
+        },
 
+        // 付款管理
 
+        {
 
+            path: 'collectionManagement',
 
+            component: () =>
 
+                import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/collectionManagement'),
 
+            name: 'collectionManagement',
 
+            meta: {
 
+                title: 'collectionManagement',
 
+                shortcutEntrance: 'outboundManagement',
 
+                module: 'procurement.procurementOrder.delete',
 
+                permissicon: [],
 
+                keepAlive: true
 
+            }
 
+        },
 
+    ],
 
+
 
+};
 
+
 
+export default outboundManagementRouter;

+ 0 - 0
src/views/outboundManagement/qualityInspectionManagement.vue
查看文件


+ 297 - 0
src/views/outboundManagement/weighingManagement.vue
查看文件 

@@ -0,0 +1,297 @@
 
+<!--检斤管理-->
 
+<template>
 
+  <div>
 
+    <BaseHeaderLayout :leftSpan="12">
 
+      <template slot="left"> </template>
 
+      <template slot="right">
 
+        <ws-select
 
+          v-model="searchTypeText"
 
+          placeholder=""
 
+          @change="selecttaskType"
 
+          :value="searchType"
 
+        >
 
+          <ws-option
 
+            v-for="item in taskTypeList"
 
+            :key="item.value"
 
+            :label="item.value"
 
+            :value="item.value"
 
+            style="color: #8890b1"
 
+          />
 
+        </ws-select>
 
+        <div></div>
 
+        <ws-input
 
+          v-model="searchKeyWord"
 
+          placeholder="可按编号、车牌号查找"
 
+          clearable
 
+          maxlength="500"
 
+          type="input"
 
+        ></ws-input>
 
+        <ws-button class="find" type="primary" @click="find()"
 
+          ><img
 
+            width="16"
 
+            height="16"
 
+            style="
 
+              vertical-align: text-top;
 
+              position: relative;
 
+              top: 0px;
 
+              left: -8px;
 
+            "
 
+            src="../../../public/img/sousuo.png"
 
+            alt=""
 
+        /></ws-button>
 
+      </template>
 
+    </BaseHeaderLayout>
 
+    <el-table
 
+      :data="warehouseList"
 
+      style="width: 100%; margin-top: 20px"
 
+      ref="warehouseList"
 
+      border
 
+      height="780"
 
+    >
 
+      <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="contractNo"
 
+        width="120"
 
+        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="contractNo" 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="contractNo" 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="contractNo" label="称重时间"></el-table-column>
 
+      <el-table-column prop="contractNo" label="状态"></el-table-column>
 
+      <el-table-column width="300" prop="contractNo1" label="操作">
 
+        <el-button @click="GrossWeight">毛重</el-button>
 
+        <el-button @click="tare">皮重</el-button>
 
+        <el-button @click="print">删除</el-button>
 
+      </el-table-column>
 
+    </el-table>
 
+
 
+    <!-- 毛重检斤 -->
 
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
 
+      <ws-form>
 
+        <div class="title">毛重检斤</div>
 
+        <ws-info-table>
 
+          <ws-form-item label="编号"  prop="waterContent">
 
+            <ws-input placeholder="请输入编号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="仓位号" prop="waterContent">
 
+            <ws-input placeholder="请输入仓位号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="客户" prop="waterContent">
 
+            <ws-input placeholder="请输入客户" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="囤位号" prop="waterContent">
 
+            <ws-input placeholder="请输入囤位号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="车牌号" prop="waterContent">
 
+            <ws-input placeholder="请输入车牌号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="货名" prop="waterContent">
 
+            <ws-input placeholder="请输入货名" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="毛重（公斤）" prop="waterContent">
 
+            <ws-input placeholder="请输入毛重" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <div><el-button @click="Reacquire">重新获取</el-button></div>
 
+        </ws-info-table>
 
+        <div style="text-align: center">
 
+          <el-button @click="paymentForm = false">取消</el-button>
 
+          <el-button @click="commit">保存</el-button>
 
+        </div>
 
+      </ws-form>
 
+    </el-dialog>
 
+    <!-- 皮重检斤 -->
 
+    <el-dialog width="40%" :visible.sync="paymentForm1" :append-to-body="true">
 
+      <ws-form>
 
+        <div class="title">皮重检斤</div>
 
+        <ws-info-table>
 
+          <ws-form-item label="编号" prop="waterContent">
 
+            <ws-input placeholder="请输入编号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="仓位号" prop="waterContent">
 
+            <ws-input placeholder="请输入仓位号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="客户" prop="waterContent">
 
+            <ws-input placeholder="请输入客户" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="囤位号" prop="waterContent">
 
+            <ws-input placeholder="请输入囤位号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="车牌号" prop="waterContent">
 
+            <ws-input placeholder="请输入车牌号" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item label="货名" prop="waterContent">
 
+            <ws-input placeholder="请输入货名" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item
 
+            label="毛重（公斤）"
 
+            prop="waterContent"
 
+            class="formItem"
 
+          >
 
+            <ws-input placeholder="请输入毛重" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item
 
+            label="皮重（公斤）"
 
+            prop="waterContent"
 
+            class="formItem"
 
+          >
 
+            <ws-input placeholder="请输入皮重" maxlength="100" size="small" />
 
+            <el-button @click="Reacquire">重新获取</el-button>
 
+          </ws-form-item>
 
+          <ws-form-item
 
+            label="扣杂（公斤）"
 
+            prop="waterContent"
 
+            class="formItem"
 
+          >
 
+            <ws-input placeholder="请输入扣杂" maxlength="100" size="small" />
 
+          </ws-form-item>
 
+          <ws-form-item
 
+            label="净重（公斤）"
 
+            prop="waterContent"
 
+            class="formItem"
 
+          >
 
+            <ws-input placeholder="请输入净重" maxlength="100" disabled size="small" />
 
+          </ws-form-item>
 
+        </ws-info-table>
 
+        <div style="text-align: center">
 
+          <el-button @click="paymentForm1 = false">取消</el-button>
 
+          <el-button @click="submit">保存</el-button>
 
+        </div>
 
+      </ws-form>
 
+    </el-dialog>
 
+     <div style="text-align:center">
 
+    <el-pagination
 
+      @size-change="handleSizeChange"
 
+      @current-change="handleCurrentChange"
 
+      :current-page="currentPage"
 
+      :page-size="deptCircularPage.pageSize"
 
+      layout="total, sizes, prev, pager, next, jumper"
 
+      :total="deptBudgetTotal"
 
+    >
 
+    </el-pagination>
 
+    </div>
 
+  </div>
 
+</template>
 
+<script>
 
+import {} from '@/model/houseSelfCollect/index'
 
+export default {
 
+  components: {
 
+    
+  },
 
+  watch: {},
 
+  data() {
 
+    return {
 
+       //分页
 
+      currentPage: 1,
 
+      pageSize: 10,
 
+      deptCircularPage:{},
 
+      deptBudgetTotal: 0,
 
+      paymentForm: false,
 
+      paymentForm1: false,
 
+      warehouseList: [
 
+        {
 
+          contractNo: '56454',
 
+        },
 
+      ],
 
+      searchKeyWord: '',
 
+      searchType: [],
 
+      searchTypeText: '',
 
+      value1: '', //选择时间
 
+      taskTypeList: [],
 
+    }
 
+  },
 
+  activated() {},
 
+  methods: {
 
+    GrossWeight() {
 
+      //毛重
 
+      this.paymentForm = true
 
+    },
 
+    tare() {
 
+      //皮重
 
+      this.paymentForm1 = true
 
+    },
 
+    selecttaskType() {
 
+      //选择仓库改变方法
 
+    },
 
+    Reacquire() {
 
+      //重新获取
 
+    },
 
+    commit() {
 
+      //毛重保存
 
+      this.$confirm('确定保存检斤信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {})
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+    submit() {//皮重保存
 
+       this.$confirm('确定保存检斤信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {})
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+     handleSizeChange(val) {
 
+      console.log(`每页 ${val} 条`)
 
+      this.pageSize = val
 
+      this.getList()
 
+    },
 
+    handleCurrentChange(val) {
 
+      this.currentPage = val
 
+      console.log(`当前页: ${val}`)
 
+      this.getList()
 
+    },
 
+  },
 
+}
 
+</script>
 
+<style lang="scss" scoped>
 
+.title {
 
+  font-size: 20px;
 
+  font-weight: 600;
 
+  margin: 20px;
 
+}
 
+.ws-info-table {
 
+  border: none;
 
+}
 
+.ws-info-table .el-form-item {
 
+  width: 50%;
 
+  border: none;
 
+}
 
+/deep/.ws-info-table .el-form-item .el-form-item__label {
 
+  width: 30%;
 
+  text-align: center;
 
+  background: #ffffff;
 
+  color: #8890b1;
 
+}
 
+/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--enable-row-transition .el-table__body td {
 
+  text-align: center;
 
+}
 
+.formItem {
 
+  width: 51% !important;
 
+}
 
+</style>

+ 0 - 2
src/views/purchasingManagement/purchaseOrderList.vue
查看文件 

@@ -1556,8 +1556,6 @@ export default {
 
           //  if(this.aduitlist.invoiceFee){
 
           //  if(this.aduitlist.invoiceFee){
 
           //    this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
 
           //    this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
 
           //  }
 
           //  }
 
-            this.aduitlist.unloadingCharge = '-' + this.aduitlist.unloadingCharge
 
-            this.aduitlist.basis = '-' + this.aduitlist.basis
 
        }
 
        }
 
       this.dialogFormVisible4 = false
 
       this.dialogFormVisible4 = false
 
       this.$confirm(`审核通过后，将通知客户订单生效，是否确定通过审核？`, {
 
       this.$confirm(`审核通过后，将通知客户订单生效，是否确定通过审核？`, {