Home Explore Help
Register Sign In
wangchao
/
yiliangyiyun-pc-jj
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

zhongtianhaoyuan 3 years ago
parent
b9169aecc1 e14d262861
commit
f0c718a184
12 changed files with 1755 additions and 517 deletions
Split View Show Diff Stats
  1. 135 152
      public/static/payprint.html
  2. 17 1
      src/api/V2/outboundManagement/index.js
  3. 2 0
      src/lang/zh.js
  4. 26 1
      src/model/outboundManagement/index.js
  5. 0 52
      src/views/houseSelfCollect/component/houseSelfCollectPrint.vue
  6. 228 0
      src/views/houseSelfCollect/component/paymentPrint.vue
  7. 11 134
      src/views/houseSelfCollect/paymentManagement.vue
  8. 484 0
      src/views/outboundManagement/collectionManagement.vue
  9. 248 0
      src/views/outboundManagement/collectionment.vue
  10. 30 0
      src/views/outboundManagement/component/route.js
  11. 445 0
      src/views/outboundManagement/weighing.vue
  12. 129 177
      src/views/outboundManagement/weighingManagement.vue

+ 135 - 152
public/static/payprint.html
View File 

@@ -117,159 +117,142 @@
 
   <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 class="center">
 
+          <div class="header-top">
 
+            <div>单位：公斤、元</div>
 
+            <div>No.</div>
 
           </div>
 
-          <div class="bottom-row2">
 
-            <div class="left">
 
-              <img src="../img/add.png" alt="">
 
+          <div class="header-top">
 
+            <div>开票日期：{{printData.compName}}</div>
 
+            <div class="number">{{100000000000000}}</div>
 
+          </div>
 
+          <table class="table">
 
+            <tr class="row">
 
+              <td rowspan="4" class="col col-bgc">买方</td>
 
+              <td class="col col-bgc">单位名称</td>
 
+              <td class="col" colspan="3">{{ printData.compName}}</td>
 
+              <td rowspan="4" class="col col-bgc">买方</td>
 
+              <td class="col col-bgc">姓名</td>
 
+              <td class="col" colspan="3">{{ printData.customerName}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">税务登记号</td>
 
+              <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
 
+              <td class="col col-bgc">身份证号</td>
 
+              <td class="col" colspan="3">{{ printData.customerNumberCard}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">化验单号</td>
 
+              <td class="col" colspan="3">{{ printData.paymentNo}}</td>
 
+              <td class="col col-bgc">卡号</td>
 
+              <td class="col" colspan="3">{{ printData. bankCard}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">收货仓库</td>
 
+              <td class="col" colspan="3">{{printData.warehouseName}}</td>
 
+              <td class="col col-bgc">地址</td>
 
+              <td class="col" colspan="3">{{printData.compAddress}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">货名</td>
 
+              <td class="col col-bgc">类型</td>
 
+              <td class="col col-bgc">等级</td>
 
+              <td class="col col-bgc">水分%</td>
 
+              <td class="col col-bgc">杂质%</td>
 
+              <td class="col col-bgc">毛重</td>
 
+              <td class="col col-bgc">皮重</td>
 
+              <td class="col col-bgc">扣杂重</td>
 
+              <td class="col col-bgc">净重</td>
 
+              <td class="col col-bgc">纯重</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col">{{ printData.goodsName}}</td>
 
+              <td class="col">{{ printData.type}}</td>
 
+              <td class="col">{{ printData.grade}}</td>
 
+              <td class="col">{{ printData.waterContent}}</td>
 
+              <td class="col">{{ printData.impurity}}</td>
 
+              <td class="col">{{ printData.grossWeight}}</td>
 
+              <td class="col">{{ printData.tare}}</td>
 
+              <td class="col">{{ printData.buckleMiscellaneous}}</td>
 
+              <td class="col">{{ printData.netWeight}}</td>
 
+              <td class="col">{{ printData.pureWeight}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">净重单价</td>
 
+              <td class="col col-bgc">粮款</td>
 
+              <td class="col col-bgc">称重补助</td>
 
+              <td class="col col-bgc">运费补助</td>
 
+              <td class="col col-bgc">卸车补助</td>
 
+              <td class="col col-bgc">其他补助</td>
 
+              <td class="col col-bgc">称重扣款</td>
 
+              <td class="col col-bgc">运费扣款</td>
 
+              <td class="col col-bgc">卸车扣款</td>
 
+              <td class="col col-bgc">质量扣款</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col ">{{ printData.tidalGrainPrice}}</td>
 
+              <td class="col ">{{ printData.grainMoney}}</td>
 
+              <td class="col ">{{ printData.weighingSubsidy}}</td>
 
+              <td class="col ">{{ printData.freightSubsidy}}</td>
 
+              <td class="col ">{{ printData.unloadSubsidy}}</td>
 
+              <td class="col ">{{ printData.otherSubsidy}}</td>
 
+              <td class="col ">{{ printData.weighingDeduction}}</td>
 
+              <td class="col ">{{ printData.freightDeduction}}</td>
 
+              <td class="col ">{{ printData.unloadDeduction}}</td>
 
+              <td class="col ">{{ printData.qualityDeduction}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">其他扣款</td>
 
+              <td class="col col-bgc">纯重单价</td>
 
+              <td class="col col-bgc">合计应付</td>
 
+              <td class="col col-bgc">购粮性质</td>
 
+              <td class="col col-bgc">车牌号</td>
 
+              <td class="col col-bgc" colspan="5">记事</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col ">{{ printData.otherDeduction}}</td>
 
+              <td class="col ">{{ printData.solidGrainPrice}}</td>
 
+              <td class="col ">{{ printData.calculationPayable}}</td>
 
+              <td class="col ">{{ printData.natureOfGrainPurchase}}</td>
 
+              <td class="col ">{{ printData.carNo}}</td>
 
+              <td class="col " colspan="5">{{ printData.remarks}}</td>
 
+            </tr>
 
+            <tr class="row">
 
+              <td class="col col-bgc">实付金额</td>
 
+              <td class="col " colspan="2">{{printData.actualPayment}}</td>
 
+              <td class="col col-bgc" colspan="3">人民币（大写）</td>
 
+              <td class="col " colspan="4">{{printData.capitalize}}</td>
 
+
 
+            </tr>
 
+          </table>
 
+
 
+          <div class="bottom">
 
+            <div class="bottom-row1">
 
+              <div>质检：{{ printData.qualityInspector}}</div>
 
+              <div>毛检：{{ printData.skinInspector}}</div>
 
+              <div>皮检：{{ printData.qualityInspector}}</div>
 
+              <div>结算：{{ printData.settlementClerk}}</div>
 
+              <div>付款：{{ printData.qualityInspector}}</div>
 
+              <div>复点：{{ printData.qualityInspector}}</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="config">收货单位签名或盖章</div>
 
-            <div class="">客户签名</div>
 
+            <div class="bottom-row3">扫一扫</div>
 
           </div>
 
-          <div class="bottom-row3">扫一扫</div>
 
         </div>
 
       </div>
 
-      <div class="small-content" v-if="smallContent">
 
-        <div class="small-title">
 
-          <div>粮食质检单</div>
 
+    <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>
 
     </div>
 
   </body>
 
   <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
 
@@ -278,7 +261,7 @@
 
     new Vue({
 
       el: '#app',
 
       data: {
 
-        tableData: "",
 
+        printData:[],
 
         name: "",
 
         bigContent: false,
 
         smallContent: false
 
@@ -321,12 +304,12 @@
 
           this.bigContent = false
 
         }
 
         // console.log(_data)
 
-        this.tableData = JSON.parse(_data)
 
+        this.printData = JSON.parse(_data)
 
         // console.log(this.tableData)
 
-        // window.print()
 
-        // window.onafterprint = function(event) {
 
-        //   window.history.back(-1)
 
-        // };
 
+        window.print()
 
+        window.onafterprint = function(event) {
 
+          window.history.back(-1)
 
+        };
 
       },
 
       watch: {}
 
     })

+ 17 - 1
src/api/V2/outboundManagement/index.js
View File 

@@ -5,4 +5,20 @@ export const API_GET_INSPECT_GETINSPECTLOOK = '/qualityInspectionManagement/api/
 
 //质检添加
 
 export const API_POST_INSPECT_ADDOUT = '/qualityInspectionManagement/api/addQualityInspectionOut'
 
 //查询仓库列表
 
-export const API_GET_WAREHOUSESELF = '/warehouseBaseInfo/selectWarehouseSelf'
 
+export const API_GET_WAREHOUSESELF = '/warehouseBaseInfo/selectWarehouseSelf'
 
+//检斤列表查看
 
+export const API_GET_WEIGHTCHECK_GETWEIGHINGLIST = '/weighingManagement/selectWeighingManagement'
 
+//皮重检斤保存
 
+export const API_POST_WEIGHTCHECK_TARE= '/weighingManagement/api/editTare'
 
+//出库管理添加皮重检斤
 
+export const API_POST_WEIGHTCHECK_ADDTARE= '/weighingManagement/api/addTare'
 
+//出库管理编辑皮重检斤
 
+export const API_POST_WEIGHTCHECK_EDITTAREOUT= '/weighingManagement/api/editTareOut'
 
+//毛重检斤保存
 
+export const API_POST_WEIGHTCHECK_GROSSWEIGHT = '/weighingManagement/api/editGrossWeight'
 
+//检斤仓位下拉
 
+export const API_GET_INSPECT_GETBINNUMBER = '/warehouseBaseInfo/getWarehouse'
 
+//删除检斤信息
 
+export const API_POST_INSPECT_DELETEWEIGHING = '/weighingManagement/api/deleteWeightcheck'
 
+//合同编号下拉
 
+export const API_GET_INSPECT_CONTRANCLIST= '/warehouseBaseInfo/selectContractNoList'

+ 2 - 0
src/lang/zh.js
View File 

@@ -1007,6 +1007,8 @@ export default {
 
     qualityInspectionManagement: '质检管理',
 
     qualityInspection: '质检信息',
 
     collectionManagement: '收款管理',
 
+    collectionment:'查看收款管理',
 
+    weighing: '检斤信息',
 
 
   },
 
   // 后台错误码

+ 26 - 1
src/model/outboundManagement/index.js
View File 

@@ -5,7 +5,15 @@ import {
 
     API_POST_INSPECT_ADDOUT,
 
     API_GET_INSPECT_GETINSPECTLIST,
 
     API_GET_INSPECT_GETINSPECTLOOK,
 
-    API_GET_WAREHOUSESELF
 
+    API_GET_WAREHOUSESELF,
 
+    API_GET_WEIGHTCHECK_GETWEIGHINGLIST,
 
+    API_POST_WEIGHTCHECK_TARE,
 
+    API_POST_WEIGHTCHECK_GROSSWEIGHT,
 
+    API_GET_INSPECT_GETBINNUMBER,
 
+    API_POST_INSPECT_DELETEWEIGHING,
 
+    API_GET_INSPECT_CONTRANCLIST,
 
+    API_POST_WEIGHTCHECK_ADDTARE,
 
+    API_POST_WEIGHTCHECK_EDITTAREOUT
 
 
 }   from '@/api/V2/outboundManagement'
 
 
@@ -17,4 +25,21 @@ import {
 
   export const addOut = appRx.post(API_POST_INSPECT_ADDOUT, errorCatcher, errorHandle, filter)
 
   //查看仓库
 
   export const selectWarehouseSelf = appRx.get(API_GET_WAREHOUSESELF, 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 tareAdd = appRx.post(API_POST_WEIGHTCHECK_ADDTARE, errorCatcher, errorHandle, filter)
 
+//出库管理编辑皮重检斤
 
+export const tareEdit = appRx.post(API_POST_WEIGHTCHECK_EDITTAREOUT, errorCatcher, errorHandle, filter)
 
+//仓位下拉
 
+export const getbinNumber = appRx.get(API_GET_INSPECT_GETBINNUMBER, errorCatcher, errorHandle, filter)
 
+//删除检斤信息
 
+export const delelteWeighing = appRx.post(API_POST_INSPECT_DELETEWEIGHING, errorCatcher, errorHandle, filter)
 
+//合同编号下拉
 
+export const contractList = appRx.get(API_GET_INSPECT_CONTRANCLIST, errorCatcher, errorHandle, filter)
 
+

+ 0 - 52
src/views/houseSelfCollect/component/houseSelfCollectPrint.vue
View File 

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

+ 228 - 0
src/views/houseSelfCollect/component/paymentPrint.vue
View File 

@@ -0,0 +1,228 @@
 
+<template>
 
+  <div class="center">
 
+    <div class="header-top">
 
+      <div>单位：公斤、元</div>
 
+      <div>No.</div>
 
+    </div>
 
+    <div class="header-top">
 
+      <div>开票日期：{{printData.compName}}</div>
 
+      <div class="number">{{100000000000000}}</div>
 
+    </div>
 
+    <table class="table">
 
+      <tr class="row">
 
+        <td rowspan="4" class="col col-bgc">买方</td>
 
+        <td class="col col-bgc">单位名称</td>
 
+        <td class="col" colspan="3">{{ printData.compName}}</td>
 
+        <td rowspan="4" class="col col-bgc">买方</td>
 
+        <td class="col col-bgc">姓名</td>
 
+        <td class="col" colspan="3">{{ printData.customerName}}</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col col-bgc">税务登记号</td>
 
+        <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
 
+        <td class="col col-bgc">身份证号</td>
 
+        <td class="col" colspan="3">{{ printData.customerNumberCard}}</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col col-bgc">化验单号</td>
 
+        <td class="col" colspan="3">{{ printData.paymentNo}}</td>
 
+        <td class="col col-bgc">卡号</td>
 
+        <td class="col" colspan="3">{{ printData. bankCard}}</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col col-bgc">收货仓库</td>
 
+        <td class="col" colspan="3">{{printData.warehouseName}}</td>
 
+        <td class="col col-bgc">地址</td>
 
+        <td class="col" colspan="3">{{printData.compAddress}}</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col col-bgc">货名</td>
 
+        <td class="col col-bgc">类型</td>
 
+        <td class="col col-bgc">等级</td>
 
+        <td class="col col-bgc">水分%</td>
 
+        <td class="col col-bgc">杂质%</td>
 
+        <td class="col col-bgc">毛重</td>
 
+        <td class="col col-bgc">皮重</td>
 
+        <td class="col col-bgc">扣杂重</td>
 
+        <td class="col col-bgc">净重</td>
 
+        <td class="col col-bgc">纯重</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col">{{ printData.goodsName}}</td>
 
+        <td class="col">{{ printData.type}}</td>
 
+        <td class="col">{{ printData.grade}}</td>
 
+        <td class="col">{{ printData.waterContent}}</td>
 
+        <td class="col">{{ printData.impurity}}</td>
 
+        <td class="col">{{ printData.grossWeight}}</td>
 
+        <td class="col">{{ printData.tare}}</td>
 
+        <td class="col">{{ printData.buckleMiscellaneous}}</td>
 
+        <td class="col">{{ printData.netWeight}}</td>
 
+        <td class="col">{{ printData.pureWeight}}</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col col-bgc">净重单价</td>
 
+        <td class="col col-bgc">粮款</td>
 
+        <td class="col col-bgc">称重补助</td>
 
+        <td class="col col-bgc">运费补助</td>
 
+        <td class="col col-bgc">卸车补助</td>
 
+        <td class="col col-bgc">其他补助</td>
 
+        <td class="col col-bgc">称重扣款</td>
 
+        <td class="col col-bgc">运费扣款</td>
 
+        <td class="col col-bgc">卸车扣款</td>
 
+        <td class="col col-bgc">质量扣款</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col ">{{ printData.tidalGrainPrice}}</td>
 
+        <td class="col ">{{ printData.grainMoney}}</td>
 
+        <td class="col ">{{ printData.weighingSubsidy}}</td>
 
+        <td class="col ">{{ printData.freightSubsidy}}</td>
 
+        <td class="col ">{{ printData.unloadSubsidy}}</td>
 
+        <td class="col ">{{ printData.otherSubsidy}}</td>
 
+        <td class="col ">{{ printData.weighingDeduction}}</td>
 
+        <td class="col ">{{ printData.freightDeduction}}</td>
 
+        <td class="col ">{{ printData.unloadDeduction}}</td>
 
+        <td class="col ">{{ printData.qualityDeduction}}</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col col-bgc">其他扣款</td>
 
+        <td class="col col-bgc">纯重单价</td>
 
+        <td class="col col-bgc">合计应付</td>
 
+        <td class="col col-bgc">购粮性质</td>
 
+        <td class="col col-bgc">车牌号</td>
 
+        <td class="col col-bgc" colspan="5">记事</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col ">{{ printData.otherDeduction}}</td>
 
+        <td class="col ">{{ printData.solidGrainPrice}}</td>
 
+        <td class="col ">{{ printData.calculationPayable}}</td>
 
+        <td class="col ">{{ printData.natureOfGrainPurchase}}</td>
 
+        <td class="col ">{{ printData.carNo}}</td>
 
+        <td class="col " colspan="5">{{ printData.remarks}}</td>
 
+      </tr>
 
+      <tr class="row">
 
+        <td class="col col-bgc">实付金额</td>
 
+        <td class="col " colspan="2">{{printData.actualPayment}}</td>
 
+        <td class="col col-bgc" colspan="3">人民币（大写）</td>
 
+        <td class="col " colspan="4">{{printData.capitalize}}</td>
 
+
 
+      </tr>
 
+    </table>
 
+
 
+    <div class="bottom">
 
+      <div class="bottom-row1">
 
+        <div>质检：{{ printData.qualityInspector}}</div>
 
+        <div>毛检：{{ printData.skinInspector}}</div>
 
+        <div>皮检：{{ printData.qualityInspector}}</div>
 
+        <div>结算：{{ printData.settlementClerk}}</div>
 
+        <div>付款：{{ printData.qualityInspector}}</div>
 
+        <div>复点：{{ printData.qualityInspector}}</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>
 
+  </div>
 
+</template>
 
+<script>
 
+  export default {
 
+    components: {},
 
+    props: {
 
+      printData: {
 
+        type: Object
 
+      }
 
+    },
 
+    data() {
 
+      return {
 
+
 
+      }
 
+    },
 
+    activated() {
 
+
 
+    },
 
+    methods: {
 
+      printSmall() {
 
+        window.location.href =
 
+          '../../../../../static/payprint.html?type=1&dataList=' +
 
+          JSON.stringify(this.printData)
 
+      },
 
+      printBig() {debugger
 
+        window.location.href =
 
+          '../../../../../static/payprint.html?type=2&dataList=' +
 
+          JSON.stringify(this.printData)
 
+      },
 
+    },
 
+  }
 
+</script>
 
+<style lang="scss" scoped>
 
+  .number {
 
+    text-align: right;
 
+    margin: 0 0 10px 0;
 
+  }
 
+
 
+  table,
 
+  table tr th,
 
+  table tr td {
 
+    border: 2px solid #333333;
 
+    padding: 5px 0;
 
+  }
 
+
 
+  table {
 
+    width: 100%;
 
+    min-height: 25px;
 
+    line-height: 25px;
 
+    text-align: center;
 
+    border-collapse: collapse;
 
+    border: 3px solid #333333;
 
+  }
 
+
 
+  .col-bgc {
 
+    background: #f6f7fb;
 
+    // background-color: red;
 
+  }
 
+
 
+  .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;
 
+  }
 
+  .header-top{
 
+    display: flex;
 
+    justify-content: space-between;
 
+  }
 
+</style>

+ 11 - 134
src/views/houseSelfCollect/paymentManagement.vue
View File 

@@ -177,7 +177,6 @@
 
         </div>
 
       </ws-form>
 
     </el-dialog>
 
-    <!-- <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint> -->
 
     <div style="text-align:center">
 
     <el-pagination
 
       @size-change="handleSizeChange"
 
@@ -195,128 +194,7 @@
 
       :visible.sync="isShowPrint"
 
       title="中天昊元粮食贸易有限公司结算凭证"
 
     >
 
-    <div>
 
-      <div class="number">100000000000000</div>
 
-      <table class="table">
 
-        <tr class="row">
 
-          <td rowspan="4" class="col col-bgc">买方</td>
 
-          <td class="col col-bgc">单位名称</td>
 
-          <td class="col" colspan="3">{{ printData.receivingUnit }}</td>
 
-          <td rowspan="4" class="col col-bgc">买方</td>
 
-          <td class="col col-bgc">姓名</td>
 
-          <td class="col" colspan="3">{{ printData.receivingUnit }}</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col col-bgc">税务登记号</td>
 
-          <td class="col" colspan="3">{{ printData.receivingUnit }}</td>
 
-          <td class="col col-bgc">身份证号</td>
 
-          <td class="col" colspan="3">{{ printData.contacts }}</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col col-bgc">化验单号</td>
 
-          <td class="col" colspan="3">{{ printData.receivingUnit }}</td>
 
-          <td class="col col-bgc">卡号</td>
 
-          <td class="col" colspan="3">{{ printData.contacts }}</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col col-bgc">收货仓库</td>
 
-          <td class="col" colspan="3">{{ printData.receivingUnit }}</td>
 
-          <td class="col col-bgc">地址</td>
 
-          <td class="col" colspan="3">{{ printData.contacts }}</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col col-bgc">货名</td>
 
-          <td class="col col-bgc">类型</td>
 
-          <td class="col col-bgc">等级</td>
 
-          <td class="col col-bgc">水分%</td>
 
-          <td class="col col-bgc">杂质%</td>
 
-          <td class="col col-bgc">毛重</td>
 
-          <td class="col col-bgc">皮重</td>
 
-          <td class="col col-bgc">扣杂重</td>
 
-          <td class="col col-bgc">净重</td>
 
-          <td class="col col-bgc">纯重</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col">货名</td>
 
-          <td class="col">类型</td>
 
-          <td class="col">等级</td>
 
-          <td class="col">水分%</td>
 
-          <td class="col">杂质%</td>
 
-          <td class="col">毛重</td>
 
-          <td class="col">皮重</td>
 
-          <td class="col">扣杂重</td>
 
-          <td class="col">净重</td>
 
-          <td class="col">纯重</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col col-bgc">净重单价</td>
 
-          <td class="col col-bgc">粮款</td>
 
-          <td class="col col-bgc">称重补助</td>
 
-          <td class="col col-bgc">运费补助</td>
 
-          <td class="col col-bgc">卸车补助</td>
 
-          <td class="col col-bgc">其他补助</td>
 
-          <td class="col col-bgc">称重扣款</td>
 
-          <td class="col col-bgc">运费扣款</td>
 
-          <td class="col col-bgc">卸车扣款</td>
 
-          <td class="col col-bgc">质量扣款</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col ">净重单价</td>
 
-          <td class="col ">粮款</td>
 
-          <td class="col ">称重补助</td>
 
-          <td class="col ">运费补助</td>
 
-          <td class="col ">卸车补助</td>
 
-          <td class="col ">其他补助</td>
 
-          <td class="col ">称重扣款</td>
 
-          <td class="col ">运费扣款</td>
 
-          <td class="col ">卸车扣款</td>
 
-          <td class="col ">质量扣款</td>
 
-        </tr>
 
-        <tr class="row">
 
-          <td class="col col-bgc">其他扣款</td>
 
-          <td class="col col-bgc">纯重单价</td>
 
-          <td class="col col-bgc">合计应付</td>
 
-          <td class="col col-bgc">购粮性质</td>
 
-          <td class="col col-bgc">车牌号</td>
 
-          <td class="col col-bgc" colspan="5">记事</td>
 
-        </tr>
 
-        <tr class="row">
 
-           <td class="col ">其他扣款</td>
 
-          <td class="col ">纯重单价</td>
 
-          <td class="col ">合计应付</td>
 
-          <td class="col ">购粮性质</td>
 
-          <td class="col ">车牌号</td>
 
-          <td class="col " colspan="5">记事</td>
 
-        </tr>
 
-        <tr class="row">
 
-           <td class="col col-bgc">实付金额</td>
 
-          <td class="col " colspan="2"></td>
 
-          <td class="col col-bgc" colspan="3">人民币（大写）</td>
 
-          <td class="col " colspan="4"></td>
 
-          
-        </tr>
 
-      </table>
 
-    </div>
 
-      
-      <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>
 
+      <paymentPrint :printData="printData"></paymentPrint>
 
     </el-dialog>
 
     </div>
 
   </div>
 
@@ -324,10 +202,9 @@
 
 <script>
 
 import {getpayment,selectWarehouseSelf,delpayment,auditpayment,getpaymentexamine} from '@/model/houseSelfCollect/index'
 
 import { posthandle } from '@/model/purchasingManagement/index'
 
+import paymentPrint from './component/paymentPrint.vue'
 
 export default {
 
-  components: {
 
-
 
-  },
 
+  components: {paymentPrint},
 
   watch: {},
 
   data() {
 
     return {
 
@@ -366,7 +243,7 @@ export default {
 
           this.warehouseName = this.warehouseList[0].warehouseName
 
           this.getList()
 
         })
 
-    
+
 
   },
 
   methods: {
 
    getList(){
 
@@ -444,7 +321,7 @@ export default {
 
           type: 'warning',
 
         })
 
           .then(() => {
 
-            this.audit(this.modification[0], 0,false,'','') 
+            this.audit(this.modification[0], 0,false,'','')
 
           })
 
           .catch(() => {
 
             return false
 
@@ -475,7 +352,7 @@ export default {
 
             this.$message.warning(req.message)
 
           })
 
         }
 
-        
+
 
       } else {
 
         if (status==true) {
 
           this.$message.success('通过成功')
 
@@ -501,7 +378,7 @@ export default {
 
           }
 
         )
 
           .then(() => {
 
-            this.audit(this.modification[0], 0, true) 
+            this.audit(this.modification[0], 0, true)
 
           })
 
           .catch(() => {
 
             return false
 
@@ -512,8 +389,9 @@ export default {
 
       getpaymentexamine({id:row.id}).toPromise().then((response) => {
 
           this.isShowPrint = true
 
           this.printData =response
 
+          console.log("printData",response)
 
         })
 
-      
+
 
       // 打印价格对照表
 
         // window.location.href="../../../static/payprint.html?data="+JSON.stringify(row)
 
       },
 
@@ -553,9 +431,9 @@ export default {
 
       }else{
 
         return true
 
       }
 
-        
+
 
     },
 
-     
+
 
     handleSelectionChange(val) {
 
       this.modification = val
 
     },
 
@@ -646,4 +524,3 @@ table {
 
 
 
 </style>
 
-

+ 484 - 0
src/views/outboundManagement/collectionManagement.vue
View File 

@@ -0,0 +1,484 @@
 
+<!--收款管理-->
 
+<template>
 
+  <div>
 
+    <BaseHeaderLayout :leftSpan="12">
 
+      <template slot="left">
 
+        <ws-button type="primary">待收款</ws-button>
 
+        <ws-button type="primary">已收款</ws-button>
 
+        <ws-button type="primary">全部</ws-button>
 
+        <ws-button type="primary" @click="adopt">备注</ws-button>
 
+        <ws-button type="primary" @click="collect">收款</ws-button>
 
+      </template>
 
+      <template slot="right">
 
+        <el-col
 
+          style="text-align: right; line-height: 60px; padding-right: 10px"
 
+          :span="8"
 
+        >
 
+          <el-select
 
+            v-model="contractNo"
 
+            placeholder="请选择合同"
 
+            clearable
 
+            filterable
 
+            :filter-method="dataFilter"
 
+            @change="contractchange"
 
+            maxlength="500"
 
+            type="input"
 
+            class="findValue"
 
+          >
 
+            <el-option
 
+              v-if="item.reportStatus"
 
+              v-for="item in options"
 
+              :key="item.constKey"
 
+              :label="item.contractNo + '(' + item.reportStatus + ')'"
 
+              :value="item.contractNo"
 
+            />
 
+            <el-option
 
+              v-if="!item.reportStatus"
 
+              v-for="item in options"
 
+              :key="item.constKey"
 
+              :label="item.contractNo"
 
+              :value="item.contractNo"
 
+            />
 
+          </el-select>
 
+        </el-col>
 
+      </template>
 
+    </BaseHeaderLayout>
 
+    <el-table
 
+      :data="warehouseList"
 
+      style="width: 100%; margin-top: 20px"
 
+      ref="warehouseList"
 
+      border
 
+      height="780"
 
+      @selection-change="handleSelectionChange"
 
+    >
 
+      <el-table-column
 
+        :selectable="selectInit"
 
+        type="selection"
 
+        width="55"
 
+      ></el-table-column>
 
+      <el-table-column type="index" label="序号" width="50">
 
+        <template scope="scope">
 
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
+          <span v-else>{{ scope.$index + 1 }}</span>
 
+        </template>
 
+      </el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="closingQuantity"
 
+        label="车牌号"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="transactionPrice"
 
+        label="货名"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="amountIngPayable"
 
+        label="毛重（公斤）"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="amountEdPayable"
 
+        label="皮重（公斤）"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="amountIngPayable"
 
+        label="净重（公斤）"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="closeRate"
 
+        label="合同单价（元/公斤）"
 
+        width="150"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="basisPrice"
 
+        label="计算应收（元）"
 
+      ></el-table-column>
 
+
 
+       <el-table-column
 
+        class="table_td"
 
+        prop="basis"
 
+        label="计算应收（元）"
 
+        width="100"
 
+      >
 
+        <template slot-scope="scope">
 
+          <div class="inputChenge">
 
+          <input
 
+            style="width: 60px"
 
+            v-model="scope.row.basis"
 
+            type="text"
 
+          />
 
+          </div>
 
+          <img
 
+            width="17"
 
+            height="18"
 
+            style="vertical-align: text-top; position: relative; top: -1px"
 
+            src="../../../public/img/edit.png"
 
+            @click="whether(scope.row)"
 
+            v-if="scope.row.identification == 'false'"
 
+            alt=""
 
+          />
 
+          <i
 
+            class="el-icon-check"
 
+            style="line-height: 29px; margin-left: 10px"
 
+            @click="varietyClick(scope.row)"
 
+            v-if="scope.row.identification == 'true'"
 
+          ></i>
 
+        </template>
 
+      </el-table-column>
 
+
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="basisPrice"
 
+        label="实际应收（元）"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="collectDate"
 
+        label="已收款(元)"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="collectionIngPayable"
 
+        label="收款时间"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="collectionEdPayable"
 
+        label="状态"
 
+      ></el-table-column>
 
+      <el-table-column
 
+        class="table_td"
 
+        prop="collectionEdPayable"
 
+        label="操作"
 
+        width="200"
 
+      >
 
+        <el-button @click="collectment(2)">查看</el-button>
 
+      </el-table-column>
 
+    </el-table>
 
+    <!-- 收款 -->
 
+    <el-dialog
 
+      width="25%"
 
+      title="收款"
 
+      :visible.sync="collectForm"
 
+      :append-to-body="true"
 
+    >
 
+      <el-form :model="form">
 
+        <el-form-item label="未收金额（元）" :label-width="formLabelWidth">
 
+          <el-input
 
+            v-model="allmoney1"
 
+            autocomplete="off"
 
+            class="deal"
 
+          ></el-input>
 
+        </el-form-item>
 
+        <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
 
+          <el-input
 
+            v-model="collectmoney"
 
+            autocomplete="off"
 
+            placeholder="请输入本次收款金额"
 
+            class="deal"
 
+          ></el-input>
 
+        </el-form-item>
 
+        <el-form-item
 
+          label="收款日期"
 
+          prop="submissionDate"
 
+          :label-width="formLabelWidth"
 
+          class="deal"
 
+        >
 
+          <ws-date-picker
 
+            v-model="collectionDate"
 
+            type="date"
 
+            placeholder="请选择收款日期"
 
+            value-format="yyyy-MM-dd"
 
+            class="deal"
 
+          />
 
+        </el-form-item>
 
+        <el-form-item label="上传收款截图" :label-width="formLabelWidth">
 
+          <el-upload
 
+            action="https://www.zthymaoyi.com/upload/admin"
 
+            list-type="picture-card"
 
+            :on-success="handlePictureCardPreview1"
 
+            :on-remove="handleRemove"
 
+            class="photo2"
 
+          >
 
+            <i class="el-icon-plus"></i>
 
+          </el-upload>
 
+          <el-dialog :visible.sync="dialogVisible">
 
+            <img width="100%" :src="collectionScreenshot" alt="" />
 
+          </el-dialog>
 
+        </el-form-item>
 
+      </el-form>
 
+      <div slot="footer" class="dialog-footer">
 
+        <el-button @click="collectForm = false">取 消</el-button>
 
+        <el-button type="primary" @click="collectSubmit">提 交</el-button>
 
+      </div>
 
+    </el-dialog>
 
+    <!--备注-->
 
+
 
+    <el-dialog
 
+      width="25%"
 
+      title="备注"
 
+      :visible.sync="collectForm1"
 
+      :append-to-body="true"
 
+    >
 
+      <el-form :model="form">
 
+        <div class="beizhu">
 
+          <el-input
 
+            v-model="remarks"
 
+            autocomplete="off"
 
+            placeholder="备注信息,不超过1000字"
 
+            class="deal"
 
+          ></el-input>
 
+        </div>
 
+      </el-form>
 
+      <div slot="footer" class="dialog-footer">
 
+        <el-button @click="collectForm1 = false">取 消</el-button>
 
+        <el-button type="primary" @click="collectSubmit1">保存</el-button>
 
+      </div>
 
+    </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>
 
+</template>
 
+<script>
 
+import {} from '@/model/houseSelfCollect/index'
 
+export default {
 
+  watch: {},
 
+  data() {
 
+    return {
 
+      //分页
 
+      currentPage: 1,
 
+      pageSize: 10,
 
+      deptCircularPage: {},
 
+      deptBudgetTotal: 0,
 
+      warehouseList: [
 
+        {
 
+          collectionEdPayable: '快收款',
 
+        },
 
+      ],
 
+      dialogVisible: false,
 
+      form: {},
 
+      collectForm: false,
 
+      collectForm1: false,
 
+      taskTypeList: ['一号库'],
 
+      searchType: '',
 
+      searchTypeText: '',
 
+      formLabelWidth: '120px',
 
+      searchKeyWord: '',
 
+      value1: '', //收款日期
 
+      modification: [],
 
+    }
 
+  },
 
+  activated() {},
 
+  methods: {
 
+    contractchange(e) {
 
+      this.contractNo = e
 
+      this.getList()
 
+    },
 
+        //修改基差
 
+    varietyClick(row) {
 
+    //   if (row.basis) {
 
+    //     if (isNaN(row.basis)) {
 
+    //       this.$message({
 
+    //         message: '基差非数字!',
 
+    //         type: 'warning',
 
+    //       })
 
+    //       return
 
+    //     }
 
+    //   }
 
+    //   if (
 
+    //     (row.basis&&
 
+    //       String(row.basis).indexOf('.') != -1 &&
 
+    //       String(row.basis).length -
 
+    //         (String(row.basis).indexOf('.') + 1) >
 
+    //         2) ||
 
+    //     row.basis > 100000 ||
 
+    //     row.basis < -100000
 
+    //   ) {
 
+    //     this.$message({
 
+    //       message: '基差输入错误',
 
+    //       type: 'warning',
 
+    //     })
 
+    //     return
 
+    //   }
 
+    //   if (!String(row.basis)) {
 
+    //     this.$message({
 
+    //       message: '基差不能为空！',
 
+    //       type: 'warning',
 
+    //     })
 
+    //     return
 
+    //   }
 
+      this.$confirm(`确定要修改应收？`, {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {
 
+          editCollect({
 
+            basis: row.basis,
 
+            id: row.id,
 
+          })
 
+            .toPromise()
 
+            .then((response) => {
 
+              this.$notify.success({
 
+                title: '成功',
 
+                message: '修改成功',
 
+              })
 
+              this.getList()
 
+            })
 
+            .catch((response) => {})
 
+        })
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+    whether(row) {
 
+      row.identification = 'true'
 
+    },
 
+    collectment(index) {
 
+      this.$router.push({ path: 'collectionment', query: { type: index } })
 
+    },
 
+    collect() {
 
+      if (this.modification.length == 0) {
 
+        this.$message.warning('请选择要收款的条目')
 
+      } else {
 
+        this.collectForm = true
 
+      }
 
+    },
 
+    collectSubmit() {
 
+      this.$confirm('确定提交收款信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {})
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+    collectSubmit1() {
 
+      this.$confirm('确定保存备注信息？', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning',
 
+      })
 
+        .then(() => {})
 
+        .catch(() => {
 
+          return false
 
+        })
 
+    },
 
+    handlePictureCardPreview1(file) {
 
+      this.collectionScreenshot = file.url
 
+    },
 
+    adopt() {
 
+      if (this.modification.length == 0) {
 
+        this.$message.warning('请选择要备注的条目')
 
+      } else {
 
+        this.collectForm1 = true
 
+      }
 
+    },
 
+    selectInit(row) {
 
+      //在这里一定要记得类型匹配的上。
 
+      if (row.approveStatus == null) {
 
+        return true
 
+      } else if (row.approveStatus != null) {
 
+        if (row.taskId == null) {
 
+          return false
 
+        } else {
 
+          return true
 
+        }
 
+      }
 
+    },
 
+    getList(){
 
+      detailsList({
 
+        compId: sessionStorage.getItem('ws-pf_compId'),
 
+        currentPage: this.currentPage,
 
+        pageSize: this.pageSize,
 
+        pcFlag: this.pcFlag,
 
+        searchType: this.searchType,
 
+        searchKeyWord: this.searchKeyWord,
 
+      })
 
+        .toPromise()
 
+        .then((response) => {
 
+          for (var i = 0; i < response.records.length; i++) {
 
+            response.records[i].identification = 'false'
 
+          }
 
+          this.warehouseList = response
 
+          this.deptCircularPage.currentPage = response.current
 
+          this.deptCircularPage.pageSize = response.size
 
+          this.deptBudgetTotal = response.total
 
+        })
 
+      }
 
+    },
 
+    handleSelectionChange(val) {
 
+      this.modification = val
 
+    },
 
+    selecttaskType() {},
 
+    handleSizeChange(val) {
 
+      console.log(`每页 ${val} 条`)
 
+      this.pageSize = val
 
+      this.getList()
 
+    },
 
+    handleCurrentChange(val) {
 
+      this.currentPage = val
 
+      console.log(`当前页: ${val}`)
 
+      this.getList()
 
+    },
 
+}
 
+</script>
 
+<style lang="scss" scoped>
 
+.ws-info-table {
 
+  border: none;
 
+}
 
+.ws-info-table .el-form-item {
 
+  width: 50%;
 
+  border: none;
 
+}
 
+/deep/.ws-info-table .el-form-item .el-form-item__label {
 
+  width: 30%;
 
+  text-align: center;
 
+  background: #ffffff;
 
+  color: #8890b1;
 
+}
 
+/deep/.ws-info-table .el-form-item .el-form-item__content {
 
+  border: none;
 
+}
 
+.title {
 
+  font-size: 16px;
 
+  font-weight: 600;
 
+}
 
+.formItem {
 
+  width: 70% !important;
 
+}
 
+/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/.beizhu .el-input--small .el-input__inner {
 
+  height: 220px;
 
+  line-height: 28px;
 
+}
 
+.inputChenge {
 
+  width: 40%;
 
+  display: inline-flex;
 
+}
 
+</style>
 
+

+ 248 - 0
src/views/outboundManagement/collectionment.vue
View File 

@@ -0,0 +1,248 @@
 
+<!--结算-->
 
+<template>
 
+  <div class="center">
 
+    <el-row>
 
+      <el-col :span="12">
 
+        <h2 class="bg-left titleup">{{information}}信息</h2>
 
+      </el-col>
 
+      <el-col :span="12" class="bg-right">
 
+        <el-button
 
+          class="bg-bottom"
 
+          type="primary"
 
+          size="small"
 
+          @click="cancel"
 
+          ><img
 
+            width="6"
 
+            height="10"
 
+            style="vertical-align: bottom; margin-right: 3px"
 
+            src="../../../public/img/lujing.png"
 
+            alt=""
 
+          />返回</el-button
 
+        >
 
+      </el-col>
 
+    </el-row>
 
+    <div class="substance">
 
+      <ws-form>
 
+        <div style="width: 50%; margin: 0 auto">
 
+          <div class="title">基本信息</div>
 
+          <ws-info-table>
 
+            <ws-form-item label="合同编号" span="1" prop="contractNo">
 
+              <ws-input
 
+                placeholder="请输入合同编号"
 
+                maxlength="100"
 
+                disabled
 
+                size="small"
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="仓位号" span="1" prop="binNumber">
 
+              <ws-input
 
+                placeholder="请输入仓位号"
 
+                maxlength="100"
 
+                size="small"
 
+              disabled
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="货名" span="1" prop="goodsName">
 
+              <ws-select
 
+                v-model="warehouseList.a"
 
+                placeholder="请输入货名"
 
+                class="typeselect"
 
+                @change="selectpackingMethod"
 
+               disabled
 
+              >
 
+                <ws-option
 
+                  v-for="item in goodnameList"
 
+                  :key="item.constKey"
 
+                  :label="item.constValue"
 
+                  :value="item.constValue"
 
+                />
 
+              </ws-select>
 
+            </ws-form-item>
 
+            <ws-form-item label="囤位号" span="1" prop="storageTagNo">
 
+              <ws-input placeholder="请输入囤位号" maxlength="100" size="small" disabled />
 
+            </ws-form-item>
 
+            <ws-form-item label="单价(元/公斤)" span="1" prop="waterContent">
 
+              <ws-input placeholder="请输入单价" maxlength="100" size="small" disabled/>
 
+            </ws-form-item>
 
+            <ws-form-item label="车牌号" span="1" prop="carNumber">
 
+              <ws-input placeholder="请输入车牌号" maxlength="100" size="small" disabled/>
 
+            </ws-form-item>
 
+          </ws-info-table>
 
+
 
+          <div class="title">质检数据</div>
 
+          <ws-info-table>
 
+            <ws-form-item label="等级" span="1" prop="waterContent">
 
+              <ws-input placeholder="请输入编号" maxlength="100" size="small" disabled/>
 
+            </ws-form-item>
 
+            <ws-form-item label="杂质（%）" span="1" prop="waterContent">
 
+              <ws-input
 
+                placeholder="请输入杂质占比"
 
+                maxlength="100"
 
+                size="small"
 
+               disabled
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="水分（%）" span="1" prop="waterContent">
 
+              <ws-input
 
+                placeholder="请输入水分占比"
 
+                maxlength="100"
 
+                size="small"
 
+                disabled
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="霉变粒（%）" span="1" prop="waterContent">
 
+              <ws-input
 
+                placeholder="请输入霉变粒占比"
 
+                maxlength="100"
 
+                size="small"
 
+                disabled
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
 
+              <ws-input placeholder="请输入容重" maxlength="100" size="small" disabled/>
 
+            </ws-form-item>
 
+            <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
 
+              <ws-input
 
+                placeholder="请输入热损伤占比"
 
+                maxlength="100"
 
+                size="small"
 
+                disabled
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
 
+              <ws-input
 
+                placeholder="请输入不完整粒占比"
 
+                maxlength="100"
 
+                size="small"
 
+                disabled
 
+              />
 
+            </ws-form-item>
 
+          </ws-info-table>
 
+
 
+          <div class="title">检斤信息</div>
 
+          <ws-info-table>
 
+            <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
 
+              <ws-input placeholder="请输入毛重" maxlength="100" size="small" disabled/>
 
+            </ws-form-item>
 
+            <ws-form-item label="皮重（公斤）" span="1" prop="tare">
 
+              <ws-input placeholder="请输入皮重" maxlength="100" size="small" disabled/>
 
+            </ws-form-item>
 
+            <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
 
+              <ws-input placeholder="请输入净重" maxlength="100" size="small" disabled/>
 
+            </ws-form-item>
 
+          </ws-info-table>
 
+          <div class="but">
 
+            <el-button @click="cancel" v-if="this.types == 2" type="primary">关闭</el-button>
 
+          </div>
 
+        </div>
 
+      </ws-form>
 
+    </div>
 
+  </div>
 
+</template>
 
+<script>
 
+import {} from '@/model/houseSelfCollect/index'
 
+export default {
 
+  watch: {},
 
+  data() {
 
+    return {
 
+      warehouseList: {},
 
+      disabled:false,
 
+      types:'',
 
+      information:'结算',
 
+    }
 
+  },
 
+  activated() {
 
+    this.types = this.$route.query.type
 
+    if( this.types == 2){
 
+         this.disabled=true
 
+         this.information = '查看'   
+    }
 
+    console.log( this.information)
 
+  },
 
+  methods: {
 
+    cancel() {
 
+      this.$router.push({ path: 'collectionManagement' })
 
+    },
 
+  },
 
+}
 
+</script>
 
+<style lang="scss" scoped>
 
+.center {
 
+  background: #f6f7fc;
 
+}
 
+
 
+.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;
 
+  font-size: 14px;
 
+  color: #8890b1;
 
+}
 
+/deep/.ws-info-table .el-form-item .el-form-item__content {
 
+  border: none;
 
+}
 
+.title {
 
+  font-size: 16px;
 
+  font-weight: 600;
 
+  margin: 10px;
 
+}
 
+.title::before {
 
+  content: '';
 
+  display: inline-block;
 
+  width: 5px;
 
+  height: 15px;
 
+  background: #8890b1;
 
+  margin-right: 5px;
 
+}
 
+
 
+.substance {
 
+  background: #ffffff;
 
+  width: 100%;
 
+  border-radius: 4px;
 
+  margin: 0 auto;
 
+  padding-top: 20px;
 
+}
 
+.formItem {
 
+  width: 70% !important;
 
+}
 
+/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;
 
+}
 
+.bg-left {
 
+  padding-left: 30px;
 
+}
 
+.bg-right {
 
+  padding-right: 10px;
 
+  text-align: right;
 
+}
 
+.bg-bottom {
 
+  margin: 15px 0px;
 
+}
 
+.titleup {
 
+  position: relative;
 
+}
 
+.titleup::before {
 
+  content: '';
 
+  display: inline-block;
 
+  width: 5px;
 
+  height: 30px;
 
+  background: #5473e8;
 
+  position: absolute;
 
+  left: 0;
 
+}
 
+.but {
 
+  text-align: center;
 
+  margin: 20px auto;
 
+}
 
+</style>

+ 30 - 0
src/views/outboundManagement/component/route.js
View File 

@@ -26,6 +26,21 @@ const outboundManagementRouter = {
 
                 keepAlive: true
 
             }
 
         },
 
+        //检斤信息
 
+        {
 
+            path: 'weighing',
 
+            component: () =>
 
+              import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/weighing'),
 
+            name: 'weighing',
 
+            meta: {
 
+              title: 'weighing',
 
+              shortcutEntrance: 'weighing',
 
+              module: 'procurement.procurementOrder.delete',
 
+              permissicon: [],
 
+              keepAlive: true
 
+            },
 
+            hidden: true
 
+          },
 
         // 质检管理
 
         {
 
             path: 'qualityInspectionManagement',
 
@@ -71,6 +86,21 @@ const outboundManagementRouter = {
 
                 keepAlive: true
 
             }
 
         },
 
+        //查看收款管理
 
+        {
 
+            path: 'collectionment',
 
+            component: () =>
 
+              import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/collectionment'),
 
+            name: 'collectionment',
 
+            meta: {
 
+              title: 'collectionment',
 
+              shortcutEntrance: 'collectionment',
 
+              module: 'procurement.procurementOrder.delete',
 
+              permissicon: [],
 
+              keepAlive: true
 
+            },
 
+            hidden: true
 
+          },
 
     ],
 
 
 };

+ 445 - 0
src/views/outboundManagement/weighing.vue
View File 

@@ -0,0 +1,445 @@
 
+<template>
 
+  <div class="center">
 
+    <el-row>
 
+      <el-col :span="12">
 
+        <h2 class="bg-left titleup">{{ information }}检斤信息</h2>
 
+      </el-col>
 
+      <el-col :span="12" class="bg-right">
 
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
 
+          ><img
 
+            width="6"
 
+            height="10"
 
+            style="vertical-align: bottom; margin-right: 3px"
 
+            src="../../../public/img/lujing.png"
 
+            alt=""
 
+          />返回</el-button
 
+        >
 
+      </el-col>
 
+    </el-row>
 
+    <div class="substance">
 
+      <ws-form>
 
+        <div style="width: 50%; margin: 0 auto">
 
+          <div class="title">基本信息</div>
 
+          <ws-info-table>
 
+            <ws-form-item label="合同编号" span="1">
 
+              <ws-select
 
+                v-model="weighingList.contractNo"
 
+              @change="contractChange"
 
+                maxlength="100"
 
+                :disabled = "disabled1"
 
+                size="small"
 
+              >
 
+                <ws-option
 
+                  v-for="item in contractNoList"
 
+                  :key="item.contractNo"
 
+                  :label="item.contractNo"
 
+                  :value="item.contractNo"
 
+                />
 
+              </ws-select>
 
+            </ws-form-item>
 
+            <ws-form-item label="仓位号" span="1" prop="binNumber">
 
+              <ws-select
 
+                v-model="weighingList.binNumber"
 
+        
+                class="typeselect"
 
+                :disabled="disabled"
 
+              >
 
+                <ws-option
 
+                  v-for="item in getbinNumberList"
 
+                  :key="item.value"
 
+                  :label="item.value"
 
+                  :value="item.value"
 
+                />
 
+              </ws-select>
 
+            </ws-form-item>
 
+            <ws-form-item label="货名" span="1" prop="goodsName">
 
+              <ws-input
 
+                v-model="weighingList.goodsName"
 
+                placeholder="请输入货名"
 
+                maxlength="100"
 
+                 disabled 
+                size="small"
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="囤位号" span="1" prop="storageNumber">
 
+              <ws-input
 
+                v-model="weighingList.storageNumber"
 
+                placeholder="请输入囤位号"
 
+                maxlength="100"
 
+                size="small"
 
+                 :disabled = "disabled"
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="车牌号" span="1" prop="carNumber">
 
+              <ws-input
 
+                v-model="weighingList.carNumber"
 
+                placeholder="请输入车牌号"
 
+                maxlength="100"
 
+                size="small"
 
+                 :disabled = "disabled"
 
+              />
 
+            </ws-form-item>
 
+            <ws-form-item label="出库类型" span="1" prop="inOutType">
 
+              <ws-select
 
+                v-model="weighingList.inOutType"
 
+   
+                :disabled="disabled"
 
+              >
 
+                <ws-option
 
+                  v-for="item in inOutType"
 
+                  :key="item.value"
 
+                  :label="item.value"
 
+                  :value="item.value"
 
+                />
 
+              </ws-select>
 
+            </ws-form-item>
 
+            <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight" v-if="this.types == 1">
 
+              <ws-input
 
+                v-model="weighingList.grossWeight"
 
+                @change="calculation"
 
+                placeholder="未获取到毛重"
 
+                maxlength="100"
 
+                size="small"
 
+                :disabled="disabled2"
 
+              />
 
+            </ws-form-item>
 
+            <el-button
 
+              type="primary"
 
+              v-if="this.types == 1"
 
+              
+              @click="chongxin"
 
+              >重新获取</el-button
 
+            >
 
+
 
+            <ws-form-item
 
+              label="皮重（公斤）"
 
+              span="1"
 
+              prop="tare"
 
+              
+            >
 
+              <ws-input
 
+                v-model="weighingList.tare"
 
+                placeholder="未获取到皮重"
 
+                maxlength="100"
 
+                size="small"
 
+                disabled
 
+              />
 
+            </ws-form-item>
 
+
 
+            <el-button type="primary" v-if="this.types == 2 || this.types == 3"
 
+              >重新获取</el-button
 
+            >
 
+            <div class="formItem">
 
+              <ws-form-item
 
+                label="净重（公斤）"
 
+                span="1"
 
+                prop="netWeight"
 
+                v-if="this.types == 1"
 
+              >
 
+                <ws-input
 
+                  v-model="weighingList.netWeight"
 
+                  placeholder="请输入净重"
 
+                  maxlength="100"
 
+                  size="small"
 
+                  disabled
 
+                />
 
+              </ws-form-item>
 
+        </div>
 
+            <div class="bangdan">
 
+        <el-form-item label="上传磅单"  :label-width="formLabelWidth" v-if="this.types == 1">
 
+          
+        </el-form-item>
 
+          <el-upload
 
+            action="https://www.zthymaoyi.com/upload/admin"
 
+            list-type="picture-card"
 
+            :on-success="handlePictureCardPreview1"
 
+            :on-remove="handleRemove"
 
+            class="photo2"
 
+            v-if="this.types == 1"
 
+          >
 
+            <i class="el-icon-plus"></i>
 
+          </el-upload>
 
+          <el-dialog :visible.sync="dialogVisible">
 
+            <img width="100%" :src="collectionScreenshot" alt="" />
 
+          </el-dialog>
 
+            </div>
 
+          </ws-info-table>
 
+          <div class="but">
 
+            <el-button @click="cancel" type="primary">取消</el-button>
 
+            <el-button @click="print" type="primary" >保存</el-button>
 
+          </div>
 
+        </div>
 
+      </ws-form>
 
+    </div>
 
+  </div>
 
+</template>
 
+<script>
 
+import { 
+  grossWeight, 
+  getbinNumber, 
+  contractList, 
+  tareAdd, 
+  tareEdit
 
+} from '@/model/outboundManagement/index'
 
+export default {
 
+  data() {
 
+    return {
 
+      inspect: {},
 
+      types: 3,
 
+      information: '添加皮重',
 
+      weighingList: {
 
+        carNumber:'',
 
+        storageNumber:'',
 
+        buckleMiscellaneous: 0,
 
+      },
 
+      disabled: false,
 
+      disabled1:false,
 
+      disabled2:false,
 
+      dialogVisible: false,
 
+      getbinNumberList: [],
 
+      contractNoList: [],
 
+      inOutType: [
 
+        { value: '销售出库', type: 1 },
 
+        { value: '移库出库', type: 3 },
 
+        { value: '暂存出库', type: 5 },
 
+        { value: '贸易服务出库', type: 7 },        
+      ],
 
+      relationId: '',
 
+      warehouseId: '',//仓库id
 
+      
+    }
 
+  },
 
+  activated() {
 
+    this.types = this.$route.query.typeNo
 
+    this.weighingList.number = this.$route.query.number
 
+    this.weighingList.binNumber = this.$route.query.binNumber
 
+    this.weighingList.storageNumber = this.$route.query.storageNumber
 
+    this.weighingList.carNumber = this.$route.query.carNumber
 
+    this.weighingList.goodsName = this.$route.query.goodsName
 
+    this.weighingList.inOutType = this.$route.query.inOutType
 
+    let id = this.$route.query.id
 
+    this.relationId = this.$route.query.relationId
 
+    this.warehouseId = this.$route.query.warehouseId
 
+    if (this.types == 1) {
 
+      this.information = '毛重'
 
+      this.disabled = true
 
+      this.disabled1 = true
 
+    } else if (this.types == 2) {
 
+      this.information = '编辑皮重'
 
+      this.disabled1 = true
 
+      this.disabled2=true
 
+    }
 
+    this.getList(id)
 
+  },
 
+  methods: {
 
+    chongxin() {
 
+      if (this.types == 2 || this.types == 3) {
 
+        return
 
+      }
 
+    },
 
+    handlePictureCardPreview1(file) {
 
+      this.collectionScreenshot = file.url
 
+    },
 
+    cancel() {
 
+      this.weighingList = {} 
+      this.$router.push({ path: 'weighingManagement' })
 
+    },
 
+    calculation() {
 
+      if ( this.weighingList.grossWeight  && this.weighingList.tare ) {
 
+        let  count = 0
 
+        this.weighingList.netWeight =this.weighingList.grossWeight -this.weighingList.tare-this.weighingList.buckleMiscellaneous
 
+      }
 
+    },
 
+    contractChange(e){
 
+      for(let i = 0 ; i < this.contractNoList.length ; i++){
 
+        if(e == this.contractNoList[i].contractNo){
 
+         this.weighingList.goodsName = this.contractNoList[i].goodsName
 
+        }
 
+      }
 
+    },
 
+    getList() {
 
+      // 仓位
 
+      getbinNumber({ id: this.warehouseId })
 
+        .toPromise()
 
+        .then((response) => {
 
+          this.getbinNumberList = []
 
+          for (let i = 0; i < response.warehousePositionInfoList.length; i++) {
 
+            this.getbinNumberList.push({
 
+              value: response.warehousePositionInfoList[i].binNumber,
 
+            })
 
+          }
 
+        })
 
+      //合同编号
 
+      contractList({ compId: sessionStorage.getItem('ws-pf_compId') })
 
+        .toPromise()
 
+        .then((response) => {
 
+          this.contractNoList = response
 
+        })
 
+    },
 
+    print() {
 
+      console.log(this.types,'dkshioyhado')
 
+      this.weighingList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName'),
 
+
 
+        this.$confirm('确定保存检斤信息？', '提示', {
 
+          confirmButtonText: '确定',
 
+          cancelButtonText: '取消',
 
+          type: 'warning',
 
+        })
 
+          .then(() => {
 
+            debugger
 
+            if (this.types == 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.types == 2) {
 
+              this.weighingList.warehouseId = this.warehouseId
 
+              tareEdit(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.types == 3) {
 
+              this.weighingList.warehouseId = this.warehouseId
 
+              tareAdd(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
 
+          })
 
+    },
 
+  },
 
+}
 
+</script>
 
+<style lang="scss" scoped>
 
+.center {
 
+  background: #f6f7fc;
 
+}
 
+.ws-info-table {
 
+  border: none;
 
+}
 
+.ws-info-table .el-form-item {
 
+  width: 50%;
 
+  border: none;
 
+}
 
+.formItem {
 
+  width: 100%;
 
+  display: inline;
 
+}
 
+/deep/.ws-info-table .el-form-item .el-form-item__label {
 
+  width: 30%;
 
+  text-align: center;
 
+  background: #ffffff;
 
+  font-size: 14px;
 
+  color: #8890b1;
 
+}
 
+/deep/.ws-info-table .el-form-item .el-form-item__content {
 
+  border: none;
 
+}
 
+.title {
 
+  font-size: 16px;
 
+  font-weight: 600;
 
+  margin: 10px;
 
+}
 
+.titleup {
 
+  position: relative;
 
+}
 
+.title::before {
 
+  content: '';
 
+  display: inline-block;
 
+  width: 5px;
 
+  height: 15px;
 
+  background: #8890b1;
 
+  margin-right: 5px;
 
+}
 
+
 
+.substance {
 
+  background: #ffffff;
 
+  width: 100%;
 
+  border-radius: 4px;
 
+  margin: 0 auto;
 
+  padding-top: 20px;
 
+}
 
+/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;
 
+}
 
+.bg-left {
 
+  padding-left: 30px;
 
+}
 
+.bg-right {
 
+  padding-right: 10px;
 
+  text-align: right;
 
+}
 
+.bg-bottom {
 
+  margin: 15px 0px;
 
+}
 
+.titleup {
 
+  position: relative;
 
+}
 
+/deep/ .substance .bangdan {
 
+    width: 100%;
 
+    padding-top: 6%;
 
+    padding-bottom: 6%;
 
+}
 
+// // .photo2{
 
+// //   margin-top: 10px;
 
+// // }
 
+.el-upload--picture-card {
 
+    background-color: #fbfdff;
 
+    border: 1px dashed #c0ccda;
 
+    border-radius: 6px;
 
+    box-sizing: border-box;
 
+    width: 148px;
 
+    height: 148px;
 
+    line-height: 146px;
 
+    vertical-align: top;
 
+    margin-left: -289px;
 
+    }
 
+.titleup::before {
 
+  content: '';
 
+  display: inline-block;
 
+  width: 5px;
 
+  height: 30px;
 
+  background: #5473e8;
 
+  position: absolute;
 
+  left: 0;
 
+}
 
+.but {
 
+  text-align: center;
 
+  margin: 20px auto;
 
+}
 
+.butCss {
 
+  opacity: 0;
 
+}
 
+</style>

+ 129 - 177
src/views/outboundManagement/weighingManagement.vue
View File 

@@ -2,16 +2,19 @@
 
 <template>
 
   <div>
 
     <BaseHeaderLayout :leftSpan="12">
 
-      <template slot="left"> </template>
 
+    <template slot="left">
 
+        <ws-button type="primary" @click="weighing(3)">添加</ws-button>
 
+      </template>
 
+      <!-- <template slot="left"> </template> -->
 
       <template slot="right">
 
         <ws-select
 
-          v-model="searchTypeText"
 
+          v-model="warehouseName"
 
           placeholder=""
 
-          @change="selecttaskType"
 
+          @change="warehouseNameChange"
 
           :value="searchType"
 
         >
 
           <ws-option
 
-            v-for="item in taskTypeList"
 
+            v-for="item in warehouseList"
 
             :key="item.value"
 
             :label="item.value"
 
             :value="item.value"
 
@@ -21,7 +24,7 @@
 
         <div></div>
 
         <ws-input
 
           v-model="searchKeyWord"
 
-          placeholder="可按编号、车牌号查找"
 
+          placeholder="可按编号、客户名、车牌号查找"
 
           clearable
 
           maxlength="500"
 
           type="input"
 
@@ -42,9 +45,9 @@
 
       </template>
 
     </BaseHeaderLayout>
 
     <el-table
 
-      :data="warehouseList"
 
+      :data="weighingList"
 
       style="width: 100%; margin-top: 20px"
 
-      ref="warehouseList"
 
+      ref="weighingList"
 
       border
 
       height="780"
 
     >
 
@@ -54,210 +57,159 @@
 
           <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 prop="contractNo" width="120" label="合同编号"></el-table-column>
 
+      <el-table-column prop="goodsName" label="货名"></el-table-column>
 
+      <el-table-column prop="carNumber" 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="netWeight" label="净重（公斤）"></el-table-column>
 
+      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
 
+      <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
 
+      <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
 
+      <el-table-column prop="suqualityTestingDate" label="称重时间"></el-table-column>
 
+      <el-table-column prop="address" label="附件"></el-table-column>
 
+      <el-table-column prop="status" 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>
 
+        <template slot-scope="scope">
 
+        <el-button @click="weighing(scope.row,1)" v-if="scope.row.status !='已质检'">毛重</el-button>
 
+        <el-button @click="weighing(scope.row,2)" v-if="scope.row.status =='已称皮重'">皮重</el-button>
 
+        <el-button @click="del(scope.row)" v-if="scope.row.status =='已称皮重'">删除</el-button>
 
+        </template>
 
       </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 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'
 
+import { getweighingList, selectWarehouseSelf, delelteWeighing,  } from '@/model/outboundManagement/index'
 
+
 
 export default {
 
-  components: {
 
-    
-  },
 
-  watch: {},
 
   data() {
 
     return {
 
-       //分页
 
+      //分页
 
       currentPage: 1,
 
       pageSize: 10,
 
-      deptCircularPage:{},
 
+      deptCircularPage: {},
 
       deptBudgetTotal: 0,
 
       paymentForm: false,
 
       paymentForm1: false,
 
-      warehouseList: [
 
-        {
 
-          contractNo: '56454',
 
-        },
 
-      ],
 
+      weighingList: [],
 
       searchKeyWord: '',
 
       searchType: [],
 
-      searchTypeText: '',
 
+      warehouseName: '',
 
       value1: '', //选择时间
 
-      taskTypeList: [],
 
+      warehouseList: [],
 
+      warehouseId:'',
 
     }
 
   },
 
-  activated() {},
 
+  activated() {
 
+    this.getList()
 
+  },
 
   methods: {
 
-    GrossWeight() {
 
-      //毛重
 
-      this.paymentForm = true
 
+    warehouseNameChange(e) {
 
+      // this.warehouseName = e
 
+      console.log(this.warehouseList )
 
+      for(let i = 0 ; i < this.warehouseList.length ; i++){
 
+        if(this.warehouseList[i].value == e){
 
+          this.warehouseId = this.warehouseList[i].warehouseId
 
+        }
 
+
 
+      }
 
+    },
 
+    weighing(row,num) {
 
+      console.log
 
+      this.$router.push({
 
+        path: 'weighing',
 
+        query: { typeNo: num ,id:row.id,number:row.number,binNumber:row.binNumber,customer:row.customer,storageNumber:row.storageNumber,carNumber:row.carNumber,goodsName:row.goodsName,grossWeight:row.grossWeight,tare:row.tare,netWeight:row.netWeight,relationId:row.relationId,warehouseId:this.warehouseId},
 
+      })
 
     },
 
-    tare() {
 
-      //皮重
 
-      this.paymentForm1 = true
 
+    // Reacquire() {
 
+    //   //重新获取
 
+    // },
 
+    find(){
 
+      this.getList()
 
+
 
     },
 
-    selecttaskType() {
 
-      //选择仓库改变方法
 
+    handleSizeChange(val) {
 
+      console.log(`每页 ${val} 条`)
 
+      this.pageSize = val
 
+      this.getList()
 
     },
 
-    Reacquire() {
 
-      //重新获取
 
+    handleCurrentChange(val) {
 
+      this.currentPage = val
 
+      console.log(`当前页: ${val}`)
 
+      this.getList()
 
     },
 
-    commit() {
 
-      //毛重保存
 
-      this.$confirm('确定保存检斤信息？', '提示', {
 
-        confirmButtonText: '确定',
 
+    del(row){
 
+      this.$confirm(`检斤信息删除后不可恢复，是否确定删除？`, {
 
         cancelButtonText: '取消',
 
+        confirmButtonText: '确定',
 
         type: 'warning',
 
       })
 
-        .then(() => {})
 
+        .then(() => {
 
+          delelteWeighing({ id: row.id })
 
+            .toPromise()
 
+            .then((response) => {
 
+              this.$notify.success({
 
+                title: '成功',
 
+                message: '删除成功',
 
+              })
 
+              this.getList()
 
+            })
 
+            .catch((response) => {
 
+            })
 
+        })
 
         .catch(() => {
 
           return false
 
         })
 
     },
 
-    submit() {//皮重保存
 
-       this.$confirm('确定保存检斤信息？', '提示', {
 
-        confirmButtonText: '确定',
 
-        cancelButtonText: '取消',
 
-        type: 'warning',
 
+    getList() {
 
+      selectWarehouseSelf({
 
+        compId: sessionStorage.getItem('ws-pf_compId'),
 
+        personCharge: sessionStorage.getItem('ws-pf_staffName'),
 
       })
 
-        .then(() => {})
 
-        .catch(() => {
 
-          return false
 
+        .toPromise()
 
+        .then((response) => {
 
+          this.warehouseList = []
 
+          for (let i = 0; i < response.length; i++) {
 
+            this.warehouseList.push({
 
+              value: response[i].warehouseName,
 
+              warehouseId :response[i].id
 
+            })
 
+          }
 
+          this.warehouseName =  this.warehouseList[0].value
 
+          this.warehouseId = this.warehouseList[0].warehouseId
 
+        })
 
+      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 
+          this.deptBudgetTotal = response.total
 
+          
+        })
 
+        .catch((response) => {
 
+          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
 
         })
 
-    },
 
-     handleSizeChange(val) {
 
-      console.log(`每页 ${val} 条`)
 
-      this.pageSize = val
 
-      this.getList()
 
-    },
 
-    handleCurrentChange(val) {
 
-      this.currentPage = val
 
-      console.log(`当前页: ${val}`)
 
-      this.getList()
 
     },
 
   },
 
 }