前端

package.json

@@ -76,6 +76,7 @@
     "vue-amap": "^0.5.10",
     "vue-i18n": "7.3.2",
     "vue-pdf": "^4.2.0",
+    "vue-print-nb": "^1.7.5",
     "vue-router": "3.0.2",
     "vue-seamless-scroll": "^1.1.17",
     "vuedraggable": "2.20.0",

print.js

@@ -0,0 +1,123 @@
+// 打印类属性、方法定义
+/* eslint-disable */
+const Print =function(dom, options) {
+    if (!(this instanceof Print)) return new Print(dom, options);
+  
+    this.options = this.extend({
+      'noPrint': '.no-print'
+    }, options);
+  
+    if ((typeof dom) === "string") {
+      this.dom = document.querySelector(dom);
+    } else {
+      this.dom = dom;
+    }
+  
+    this.init();
+  };
+  Print.prototype = {
+    init: function () {
+      var content = this.getStyle() + this.getHtml();
+      this.writeIframe(content);
+    },
+    extend: function (obj, obj2) {
+      for (var k in obj2) {
+        obj[k] = obj2[k];
+      }
+      return obj;
+    },
+  
+    getStyle: function () {
+      var str = "",
+        styles = document.querySelectorAll('style,link');
+      for (var i = 0; i < styles.length; i++) {
+        str += styles[i].outerHTML;
+      }
+      str += "<style>" + (this.options.noPrint ? this.options.noPrint : '.no-print') + "{display:none;}</style>";
+  
+      return str;
+    },
+  
+    getHtml: function () {
+      var inputs = document.querySelectorAll('input');
+      var textareas = document.querySelectorAll('textarea');
+      var selects = document.querySelectorAll('select');
+  
+      for (var k in inputs) {
+        if (inputs[k].type == "checkbox" || inputs[k].type == "radio") {
+          if (inputs[k].checked == true) {
+            inputs[k].setAttribute('checked', "checked")
+          } else {
+            inputs[k].removeAttribute('checked')
+          }
+        } else if (inputs[k].type == "text") {
+          inputs[k].setAttribute('value', inputs[k].value)
+        }
+      }
+  
+      for (var k2 in textareas) {
+        if (textareas[k2].type == 'textarea') {
+          textareas[k2].innerHTML = textareas[k2].value
+        }
+      }
+  
+      for (var k3 in selects) {
+        if (selects[k3].type == 'select-one') {
+          var child = selects[k3].children;
+          for (var i in child) {
+            if (child[i].tagName == 'OPTION') {
+              if (child[i].selected == true) {
+                child[i].setAttribute('selected', "selected")
+              } else {
+                child[i].removeAttribute('selected')
+              }
+            }
+          }
+        }
+      }
+  
+      return this.dom.outerHTML;
+    },
+  
+    writeIframe: function (content) {
+      var w, doc, iframe = document.createElement('iframe'),
+        f = document.body.appendChild(iframe);
+      iframe.id = "myIframe";
+      iframe.style = "position:absolute;width:0;height:0;top:-10px;left:-10px;";
+  
+      w = f.contentWindow || f.contentDocument;
+      doc = f.contentDocument || f.contentWindow.document;
+      doc.open();
+      doc.write(content);
+      doc.close();
+      this.toPrint(w);
+  
+      setTimeout(function () {
+        document.body.removeChild(iframe)
+      }, 100)
+    },
+  
+    toPrint: function (frameWindow) {
+      try {
+        setTimeout(function () {
+          frameWindow.focus();
+          try {
+            if (!frameWindow.document.execCommand('print', false, null)) {
+              frameWindow.print();
+            }
+          } catch (e) {
+            frameWindow.print();
+          }
+          frameWindow.close();
+        }, 10);
+      } catch (err) {
+        console.log('err', err);
+      }
+    }
+  };
+  const MyPlugin = {}
+  MyPlugin.install = function (Vue, options) {
+    // 4. 添加实例方法
+    Vue.prototype.$print = Print
+  }
+  export default MyPlugin

src/api/V2/tradeServicesManagement/index.js

@@ -15,4 +15,8 @@ export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
 // 出入库记录
 export const API_GET_RECORD = 'warehouseInOutInfo/selectInfo'
 // 查看当天出/入数量
-export const API_GET_WAREHOUSE_COUNT = '/warehouseInOutInfo/count'
+export const API_GET_WAREHOUSE_COUNT = '/warehouseInOutInfo/count'
+// 出入库调整
+export const API_POST_WAREHOUSE_UPDATE = '/warehouseInOutInfo/adjustment'
+// 结算单
+export const API_GET_SETTLEACCOUT = '/warehouseInOutInfo/getInfo'

src/main.js

@@ -8,6 +8,8 @@ import '@/styles/common.scss' // global css
 import i18n from '@/lang' // Internationalization
 import './permission' // permission control
 import './registerServiceWorker'; 
+import Print from 'vue-print-nb'
+Vue.use(Print);
 import crudCommon from '@/mixins/crud'
 window.$crudCommon = crudCommon;
 import vendors from '@/vendors'

src/model/tradeServicesManagement/index.js

@@ -8,7 +8,9 @@ import {
     API_GET_TRADESERVICES_LIST,
     API_POST_RECEIPTAPPL_ADD,
     API_GET_RECORD,
-    API_GET_WAREHOUSE_COUNT
+    API_GET_WAREHOUSE_COUNT,
+    API_POST_WAREHOUSE_UPDATE,
+    API_GET_SETTLEACCOUT
 } from '@/api/V2/tradeServicesManagement'
 
 // 列表
@@ -26,3 +28,7 @@ export const getbillno = appRx.get(API_GET_BILLNO, errorCatcher, errorHandle, fi
 export const getrecord = appRx.get(API_GET_RECORD, errorCatcher, errorHandle, filter)
 // 查看当天出/入数量
 export const getwarehousecount = appRx.get(API_GET_WAREHOUSE_COUNT, errorCatcher, errorHandle, filter)
+// 出入库调整
+export const postwarehouseadjustment = appRx.post(API_POST_WAREHOUSE_UPDATE, errorCatcher, errorHandle, filter)
+// 出入库调整
+export const getsettleaccout = appRx.get(API_GET_SETTLEACCOUT, errorCatcher, errorHandle, filter)

src/views/tradeServicesManagement/component/paymentPrint.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="center">
+    <!-- {{customerInfo}} -->
+    <div class="header">
+       <div>单位名称：{{ printData.compName}}</div>
+       <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
+    </div>
+    <div class="header-top">
+      <div>单位：公斤、元</div>
+      <div>No.</div>
+    </div>
+    <div class="header-top">
+      <div>开票日期：{{printData.createDate}}</div>
+      <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
+      <div class="number">{{dealNo(printData.paymentNo)}}</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="4">{{ 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="4">{{ printData.identityAuthenticationInfo.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="4">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.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="4">{{printData.identityAuthenticationInfo.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.qualityInspectionManagement.grade}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
+        <td class="col">{{ printData.grossWeight}}</td>
+        <td class="col">{{ printData.tare}}</td>
+        <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>
+        <td class="col">{{ printData.netWeight}}</td>
+        <td class="col">{{ printData.pureWeight}}</td>
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc"  v-if="printData.type == '潮粮'">净重单价</td>
+        <td class="col col-bgc" v-if="printData.type == '干粮'">单价</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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
+        <td class="col ">{{ printData.unitDeduction}}</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>
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc">质量扣款</td>
+        <td class="col col-bgc">其他扣款</td>
+        <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</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.qualityDeduction}}</td>
+        <td class="col ">{{ printData.otherDeduction}}</td>
+        <td class="col " v-if="printData.type == '潮粮'">{{ printData.solidGrainPrice}}</td>
+        <td class="col ">{{ printData.calculationPayable}}</td>
+        <td class="col ">{{ printData.qualityInspectionManagement.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.qualityInspectionManagement.qualityInspector}}</div>
+        <div>毛检：{{ printData.weighingManagement.secretaryWeigher}}</div>
+        <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
+        <div>结算：{{ printData.settlementClerk}}</div>
+        <div>付款：{{ printData.cashier}}</div>
+        <div>复点：{{ }}</div>
+        <div></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
+      },
+        customerInfo: {
+        type: Object
+      },
+      showType:{
+        type: Array
+      },
+       selectPrintList:{
+        type: Array
+      },
+       selectCustomerList:{
+        type: Array
+      },
+      billingDate:'',
+    },
+    data() {
+      return {
+
+      }
+    },
+    activated() {
+      let date = new Date()
+      console.log( date.getFullYear())
+      console.log(this.selectPrintList)
+      console.log(this.selectCustomerList)
+    },
+    methods: {
+      dealNo(str){
+        return str.slice(4)
+      },
+      date(){
+        let date = new Date()
+       let datas = date.getDate
+        console.log(new Data())
+        return datas
+      },
+      printSmall() {
+        window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
+      },
+      printBig() {
+         window.open('../../../../../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{
+    display: flex;
+    justify-content: space-between;
+    font-size: 16px;
+    margin: 10px 0;
+  }
+  .header-top{
+    display: flex;
+    justify-content: space-between;
+  }
+</style>

src/views/tradeServicesManagement/inOutRecord.vue

@@ -23,7 +23,7 @@
         </el-col>
 			</el-col>
 			<el-col :span="12" class="bg-right">
-				<el-button class="bg-bottom" type="primary" size="small" @click="adjustment()">
+				<el-button class="bg-bottom" type="primary" size="small" @click="adjustmentchange()">
 				调整</el-button>
 				<el-button class="bg-bottom" type="primary" size="small" @click="print()">
 				打印</el-button>
@@ -31,11 +31,12 @@
 		</el-row>
 		<el-table
         class="wenzi"
+        @selection-change="handleSelectionChange"
         :data="recordList"
         style="width: 100%"
       >
 	  <el-table-column
-        :selectable="selectInit"
+        
         type="selection"
         width="55"
       ></el-table-column>
@@ -64,7 +65,7 @@
     </el-table-column>
 		<el-table-column prop="operatorMajorRoleName" label="结算单">
       <template scope="scope">
-         <el-button @click='handleLook(2,scope.row)' v-if="scope.row.settlementSheet">查看</el-button>
+         <el-button @click='handleLook(2,scope.row)' v-if="scope.row.inOutType=='收购入库'">查看</el-button>
        </template>
     </el-table-column>
 		<el-table-column prop="inOutDate" label="出入库日期">
@@ -73,11 +74,15 @@
 	<el-dialog :visible.sync="isShowadjustment" title="收款截图">
      <div>
 		 <el-input
-            v-model="deptBudgetList.goodsName"
+            v-model="adjustment"
             placeholder="输入申请金额"
             size="small"
           ></el-input>
+          
 	 </div>
+   <div class="bottom-btn">
+        <el-button @click="adjustmentClick()">确定</el-button>
+      </div>
     </el-dialog>
 	<div class="mask" v-show="isShowPrintType"></div>
 	<div class="print-type" v-show="isShowPrintType">
@@ -91,13 +96,9 @@
           </el-checkbox-group>
         </div>
       </div>
-      <div class="bottom-btn">
-        <el-button @click="typePrintClick(printType)">确定</el-button>
-        <el-button @click="typePrintCannelClick">取消</el-button>
-      </div>
     </div>
     <el-dialog :visible.sync="isCountShow" title="磅单">
-      <div class="content" v-if="true">
+      <div id="printTest" class="content" v-if="true">
         <div class="title">磅码单</div>
         <div class="title">{{tableData.code}}</div>
         <table class="table">
@@ -134,76 +135,194 @@
             <div class="config">毛检：{{tableData.secretaryWeigher}}皮检：{{tableData.skinInspector}}</div>
             <div class="autograph">日期：{{tableData.inOutDate}}</div>
           </div>
+          
         </div>
       </div>
-    </el-dialog>
-    <el-dialog :visible.sync="isCountShow1" title="结算单">
-      <div class="content" v-if="true">
-        <div class="title">磅码单</div>
-        <div class="title">{{tableData.code}}</div>
-        <table class="table">
-          <tr class="row">
-            <td class="col col-bgc">单位</td>
-            <td class="col" colspan="4">{{tableData.companyName}}</td>
-            <td class="col col-bgc">类型</td>
-            <td class="col"colspan="1">{{tableData.inOutType}}</td>
-            <td class="col col-bgc">车牌号</td>
-            <td class="col" colspan="1">{{tableData.carNo}}</td>
-            
-          </tr>
-          <tr class="row">
-            <td class="col col-bgc">仓库</td>
-            <td class="col" colspan="4">{{tableData.warehouseName}}</td>
-            <td class="col col-bgc">仓位</td>
-            <td class="col" colspan="1">{{tableData.binNumber}}</td>
-            <td class="col col-bgc">货名</td>
-            <td class="col" colspan="1">{{tableData.goodsName}}</td>
-          </tr>
-          <tr class="row">
-            <td class="col col-bgc">毛重（公斤）</td>
-            <td class="col" colspan="1">{{tableData.grossWeight}}</td>
-            <td class="col col-bgc">皮重（公斤）</td>
-            <td class="col" colspan="2">{{tableData.tare}}</td>
-            <td class="col col-bgc">扣重（公斤）</td>
-            <td class="col" colspan="1">{{tableData.weight}}</td>
-            <td class="col col-bgc">净重（公斤）</td>
-            <td class="col" colspan="1">{{tableData.netWeight}}</td>
-          </tr>
-        </table> 
-        <div class="bottom">
-          <div style='justify-content: space-between;' class="bottom-row1">
-            <div class="config">毛检：{{tableData.secretaryWeigher}}皮检：{{tableData.skinInspector}}</div>
-            <div class="autograph">日期：{{tableData.inOutDate}}</div>
-          </div>
+      <div style="text-align: center">
+          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+          <el-button type="primary" v-print="'#printTest'" @click='isShowPrint = false'>打印单据</el-button>
         </div>
+    </el-dialog>
+    <el-dialog width="70%" :visible.sync="isShowPrint" title="结算单">
+      <div class="center">
+    <!-- {{customerInfo}} -->
+    <div class="header">
+       <div>单位名称：{{ printData.compName}}</div>
+       <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
+    </div>
+    <div class="header-top">
+      <div>单位：公斤、元</div>
+      <div>No.</div>
+    </div>
+    <div class="header-top">
+      <!-- <div>开票日期：{{printData.createDate}}</div> -->
+      <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
+      <!-- <div class="number">{{dealNo(printData.paymentNo)}}</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="4">{{ 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="4">{{ printData.identityAuthenticationInfo.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="4">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.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="4">{{printData.identityAuthenticationInfo.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.qualityInspectionManagement.grade}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
+        <td class="col">{{ printData.grossWeight}}</td>
+        <td class="col">{{ printData.tare}}</td>
+        <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>
+        <td class="col">{{ printData.netWeight}}</td>
+        <td class="col">{{ printData.pureWeight}}</td> -->
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc"  v-if="printData.type == '潮粮'">净重单价</td>
+        <td class="col col-bgc" v-if="printData.type == '干粮'">单价</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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
+        <td class="col ">{{ printData.unitDeduction}}</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> -->
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc">质量扣款</td>
+        <td class="col col-bgc">其他扣款</td>
+        <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</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.qualityDeduction}}</td>
+        <td class="col ">{{ printData.otherDeduction}}</td>
+        <td class="col " v-if="printData.type == '潮粮'">{{ printData.solidGrainPrice}}</td>
+        <td class="col ">{{ printData.calculationPayable}}</td>
+        <td class="col ">{{ printData.qualityInspectionManagement.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.qualityInspectionManagement.qualityInspector}}</div>
+        <div>毛检：{{ printData.weighingManagement.secretaryWeigher}}</div>
+        <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
+        <div>结算：{{ printData.settlementClerk}}</div>
+        <div>付款：{{ printData.cashier}}</div>
+        <div>复点：{{ }}</div> -->
+        <div></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>
+          <div style="text-align: center">
+          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+          <el-button type="primary" v-print="'#printTest'">打印单据</el-button>
+        </div>
     </el-dialog>
-    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint"
-        :title="printData.compName + '结算凭证'">
-        <!-- selectCustomerList:[],
-        selectPrintList: [], -->
-        <paymentPrint :printData="printData" :customerInfo="customerList" :showType="ruleForm.type"></paymentPrint>
+    <!-- <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint"
+        :title="tableData.companyName + '结算凭证'">
+        <paymentPrint :printData="tableData" :customerInfo="customerList" :showType="ruleForm.type"></paymentPrint>
         <div style="text-align: center">
           <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
-          <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
           <el-button type="primary" @click="printBig">打印单据</el-button>
         </div>
-      </el-dialog>
+      </el-dialog> -->
 	</div>
 </template>
 <script>
 	import {
 		getList,
     getrecord,
-    getwarehousecount
+    getwarehousecount,
+    postwarehouseadjustment,
+    getsettleaccout
 	} from '@/model/tradeServicesManagement/index'
+    import paymentPrint from './component/paymentPrint.vue'
 	export default {
-		components: {},
+		components: {
+      paymentPrint
+    },
 		data() {
 			return {
 				recordList:[],
 				value2:'',
+        customerList:{},
 				isShowadjustment:false,
+        adjustment:'',
+        id:0,
 				ruleForm: {
 					type: [
 						'打印磅单',
@@ -218,22 +337,27 @@
 				isShowPrintType:false,
 				deptBudgetList:{},
 				pickerOptions:[],
-        tableData:{}
+        tableData:{},
+        selection:[],
+        printData:{}
 			}
 		},
 		activated() {
+      this.deptBudgetList.baseId=this.$route.query.baseId
+      this.deptBudgetList.positionId=this.$route.query.positionId
+      this.deptBudgetList.warehouseName=this.$route.query.warehouseName
 			this.getList()
 		},
 		methods: {
       getList(){
         getrecord({
             compId: sessionStorage.getItem('ws-pf_compId'),
-						// baseId: this.deptBudgetList.baseId,
-						// positionId: this.deptBudgetList.positionId,
-						// warehouseName: this.deptBudgetList.warehouseName,
-            baseId: "264d297cffb543f9a2d5004b11efc124",
-positionId: "6a46921d2f7a468d9c73663d6c28e294",
-warehouseName: "erp测试库",
+						baseId: this.deptBudgetList.baseId,
+						positionId: this.deptBudgetList.positionId,
+						warehouseName: this.deptBudgetList.warehouseName,
+//             baseId: "264d297cffb543f9a2d5004b11efc124",
+// positionId: "6a46921d2f7a468d9c73663d6c28e294",
+// warehouseName: "erp测试库",
 						searchType: this.searchType,
 						currentPage: this.currentPage,
 						pageSize: this.pageSize,
@@ -261,38 +385,75 @@ warehouseName: "erp测试库",
 			returnsales() {
 				this.$router.go(-1)
 			},
-			adjustment(){
-				this.isShowadjustment=true
+			adjustmentchange(){
+        // console.log(this.selection)
+        if(this.selection.length>0){
+          this.isShowadjustment=true
+        }else{
+          this.$message.error('请勾选要调整的条目');
+        }
 			},
 			print(){
 				this.isShowPrintType=true
 			},
+      adjustmentClick(){
+        postwarehouseadjustment({warehouseInOutInfoList:this.selection,adjustment:this.adjustment}).toPromise()
+          .then((res) => {
+            this.isShowadjustment=false
+            this.$message.success('调整成功');
+            this.getList()
+          })
+      },
 			selectType(){
 
 			},
 			typePrintClick(){
 
 			},
-			selectInit(){
+			handleSelectionChange(val){
+        this.selection=val
+        console.log(val)
+			},
+      printBig(){
 
+      },
+      print(){
+
+      },
+      verifyinit() {
+				var arr = []
+				for (var i = 48; i < 57; i++) {
+					arr.push(String.fromCharCode(i))
+				}
+				arr.sort(function() {
+					return Math.random() - 0.5
+				})
+				arr.length = 4
+
+				return arr.join('')
 			},
       handleLook(status,item){
         if(status==1){
-          this.isCountShow=true
           this.tableData=item
-          getwarehousecount({
-            // positionId:this.deptBudgetList.positionId,
-            positionId: "6a46921d2f7a468d9c73663d6c28e294",
-            inOutFlag:item.inOutFlag
-            }).toPromise()
+          // getwarehousecount({
+          //   positionId:this.deptBudgetList.positionId,
+          //   // positionId: "6a46921d2f7a468d9c73663d6c28e294",
+          //   inOutFlag:item.inOutFlag
+          //   }).toPromise()
+          // .then((res) => {
+            // var count='000'+(res+1)
+            // count=count.substring(count.length-3)
+            this.tableData.code=this.getdate()+item.commonWarehouseNo+this.verifyinit()
+            this.isCountShow=true
+          // })
+        }else{
+         
+          printData({id:item.id}).toPromise()
           .then((res) => {
-            console.log(res)
+            this.printData=res 
+            this.isShowPrint=true
           })
-          this.tableData.code=this.getdate()+item.commonWarehouseNo
-          console.log(this.tableData)
-        }else{
-          this.isShowPrint=true
-          this.tableData=item
+          // this.tableData=item
         }
       },
       getdate() {