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

# Conflicts:
#	src/api/V2/tradeServicesManagement/index.js
#	src/model/tradeServicesManagement/index.js

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

public/static/payprint.html

@@ -584,7 +584,7 @@
         </div>
         <div class="small-row">
           <div>开票日期</div>
-          <div>{{date}}</div>
+          <div>{{printData.createDate}}</div>
         </div>
         <div class="small-row">
           <div>买方单位名称</div>

src/api/V2/tradeServicesManagement/index.js

@@ -15,3 +15,11 @@ export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
 // 列表页删除
 export const API_POST_DELETETRANEINFO = '/tradeWarehouseReceiptAppl/deleteTrageInfo'
 
+// 出入库记录
+export const API_GET_RECORD = 'warehouseInOutInfo/selectInfo'
+// 查看当天出/入数量
+export const API_GET_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

@@ -7,7 +7,11 @@ import {
     API_GET_BILLNO,
     API_GET_TRADESERVICES_LIST,
     API_POST_RECEIPTAPPL_ADD,
-    API_POST_DELETETRANEINFO
+    API_POST_DELETETRANEINFO,
+    API_GET_RECORD,
+    API_GET_WAREHOUSE_COUNT,
+    API_POST_WAREHOUSE_UPDATE,
+    API_GET_SETTLEACCOUT
 } from '@/api/V2/tradeServicesManagement'
 
 // 列表
@@ -23,3 +27,11 @@ export const editList = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorH
 export const getbillno = appRx.get(API_GET_BILLNO, errorCatcher, errorHandle, filter)
 // 列表删除
 export const deleteTrageInfo = appRx.post(API_POST_DELETETRANEINFO, errorCatcher, errorHandle, filter)
+// 出入库记录
+export const getrecord = appRx.get(API_GET_RECORD, errorCatcher, errorHandle, filter)
+// 查看当天出/入数量
+export const 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/contractManagement/futuresSalesContractEdit.vue

@@ -181,7 +181,7 @@
 
       </ws-info-table>
 
-      <div class="wenzi">
+      <div>
         <h3>货物信息</h3>
       </div>
       <!--货物信息-->
@@ -253,10 +253,9 @@
             @change="handleChange1" style="width:200%" /> -->
           <el-button @click="mapInputClick('source')" class="address-btn">{{ newSelectedOptions }} </el-button>
         </ws-form-item>
-
       </ws-info-table>
 
-      <div class="wenzi">
+      <div>
         <h3>流程信息</h3>
       </div>
       <!--流程信息-->
@@ -299,7 +298,7 @@
         </ws-form-item>
       </ws-info-table>
 
-      <div class="wenzi">
+      <div>
         <h3>备注信息</h3>
       </div>
       <!--备注信息-->

src/views/contractManagement/salesContractExamine.vue

@@ -640,7 +640,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .el-form-item {

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -6,7 +6,7 @@
        <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
     </div>
     <div class="header-top">
-      <div>单位：公斤、元</div>
+      <div>单位：公斤/元</div>
       <div>No.</div>
     </div>
     <div class="header-top">

src/views/houseSelfCollect/paymentManagement.vue

@@ -186,8 +186,6 @@
     <!--客户信息-->
     <el-dialog width="50%" title="客户信息" :visible.sync="customerInfo" :append-to-body="true" :close="customerclose">
       <el-form class="customer">
-
-
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>身份证正面</h4>
@@ -508,7 +506,6 @@ import download from '../../components/WsDownload/download'
           this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
           this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
         })
-        
       },
       customerclose(e) {
         console.log(e)

src/views/statisticalReport/huoyunList.vue

@@ -206,7 +206,7 @@
       <el-form :model="form">
         <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
           <template>
-            <span>{{ amountNotPayable }}</span>
+            <span>{{ alreadyInvoice }}</span>
           </template>
         </el-form-item>
         <el-form-item label="本次付款金额" :label-width="formLabelWidth">
@@ -433,8 +433,6 @@ export default {
       dialogFormVisible7: false,
       dialogFormVisible8: false,
       dialogFormVisible11: false,
-      dialogVisible: false,
-
       form: {
         transactionPrice: '',
         transactionsNumber: '',
@@ -631,14 +629,12 @@ export default {
           } else {
             this.driverPayeeList[i].radio = '2'
           }
-          console.log(this.driverPayeeList[i].radio)
         }
         this.id = item.id
       }
     },
     //结算
     handlepayment() {
-      // this.dialogFormVisible1 = true
       this.amountNotPayable = 0
       this.money = this.money
       this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
@@ -647,16 +643,16 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
-        for (var i = 0; i < this.modification.length; i++) {
-          if (
-            this.modification[i].status != '已通过' &&
-            this.modification[i].status != '部分付款'
-          ) {
-            this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
-            return
-          }
-          this.amountNotPayable += this.modification[i].amountNotPayable
-        }
+        //for (var i = 0; i < this.modification.length; i++) {
+        //   if (
+        //     this.modification[i].status != '已通过' &&
+        //     this.modification[i].status != '部分付款'
+        //   ) {
+        //     this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
+        //     return
+        //   }
+        //   this.amountNotPayable += this.modification[i].amountNotPayable
+        // }
         this.dialogFormVisible1 = true
       }
     },
@@ -681,7 +677,7 @@ export default {
           this.money < 0 ||
           (String(this.money).indexOf('.') != -1 &&
             String(this.money).length - (String(this.money).indexOf('.') + 1) >
-              2)
+              2) || this.money > 100000000
         ) {
           this.$message({
             message: '付款金额输入错误',
@@ -705,7 +701,7 @@ export default {
           })
           return
         }
-        if (this.money > this.modification[0].amountNotPayable) {
+        if (Number(this.money) > Number(this.alreadyInvoice)) {
           this.$message({
             message: '付款金额不能大于未付金额！',
             type: 'warning',
@@ -739,7 +735,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -809,7 +804,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -849,7 +843,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -1166,11 +1159,16 @@ export default {
               response.records[i].amountIngPayable -
               response.records[i].amountEdPayable
               if(this.processNo){
-                this.amountEdPayable += response.records[i].amountEdPayable // 已付
-                 this.alreadyInvoice += response.records[i].alreadyInvoice//未付
-                this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
+                // this.amountEdPayable += response.records[i].amountEdPayable // 已付
+                //  this.alreadyInvoice += response.records[i].alreadyInvoice//未付
+                 if(response.records[0].paymentScreenshot){
+                    this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
+                  this.paymentScreenshot = response.records[0].paymentScreenshot
+                }
               } 
           }
+            this.amountEdPayable = response.records[0].amountEdPayable // 已付
+             this.alreadyInvoice = response.records[0].amountNotPayable//未付
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
@@ -1194,18 +1192,11 @@ export default {
       console.log(file)
     },
     handlePictureCardPreview(file) {
-      console.log("dmlskgldjg",file)
-      this.paymentScreenshot = file.url
-      for(let i = 0 ; i < this.modification.length ; i++){//选中的条数每条都添加一张付款截图
-        if(this.modification[i].paymentScreenshot){
-           this.modification[i].paymentScreenshot = ","+file.url
+        if(this.paymentScreenshot){
+          this.paymentScreenshot += "," + file.url
         }else{
-           this.modification[i].paymentScreenshot = file.url
+            this.paymentScreenshot =  file.url
         }
-      }
-     
-
-      this.dialogVisible = true
     },
     handleDownload(file) {
       console.log(file)

src/views/statisticalReport/shippingList.vue

@@ -28,37 +28,39 @@
             type="primary"
             v-hasPermission="`report.transportationReport.view`"
             @click="handlepass()"
+            v-if="processNo"
             >通过</ws-button
           >
           <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.view`"
             @click="handlereject()"
+            v-if="processNo"
             >驳回</ws-button
           >
           <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.payment`"
             @click="handlepayment"
+            v-if="processNo"
             >付款</ws-button
           >
-          <ws-button
+          <!-- <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.draw`"
             @click="handleninvoice"
             >开发票</ws-button
-          >
+          > -->
         </el-col>
         <el-col
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="14"
         >
-         <el-select
+          <el-select
             v-model="contractNo"
             placeholder="请选择合同"
             clearable
             filterable
-           
             @change="contractchange"
             maxlength="500"
             type="input"
@@ -76,7 +78,6 @@
             placeholder="请选择运输任务编号"
             clearable
             filterable
-            
             @change="taskNochange"
             maxlength="500"
             type="input"
@@ -85,7 +86,7 @@
             <el-option
               v-for="item in taskNoList"
               :key="item.taskNoKey"
-              :label="item.taskNoValue "
+              :label="item.taskNoValue"
               :value="item.taskNoValue"
             />
           </el-select>
@@ -94,7 +95,6 @@
             placeholder="请选择运输阶段编号"
             clearable
             filterable
-           
             @change="processNochange"
             maxlength="500"
             type="input"
@@ -103,60 +103,84 @@
             <el-option
               v-for="item in processNoList"
               :key="item.processNoKey"
-              :label="item.processNoValue "
+              :label="item.processNoValue"
               :value="item.processNoValue"
             />
           </el-select>
         </el-col>
       </el-row>
-      <!-- v-if="actualFreight && tranPriceIng" -->
-       <div class="freightSet" v-if="processNo">
-        <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
-        <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight ? actualFreight : tranPriceIng}}</span>元</span>
-        <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
+      <div class="freightSet" v-if="processNo">
+        <div style="display: flex; width: 200px; line-height: 30px">
+          预计运费（元）：{{ tranPriceIng }}元
+        </div>
+        <span style="display: flex; line-height: 30px"
+          >实际运费（元）：<el-input
+            type="text"
+            maxlength="70"
+            size="small"
+            v-model="actualFreight"
+            v-show="textShow"
+          /><span v-show="!textShow">{{
+            actualFreight ? actualFreight : tranPriceIng
+          }}</span
+          >元</span
+        >
+        <i
+          @click="actualFreightchange"
+          class="iconfont icon-dui"
+          v-show="textShow"
+          style="margin-top: 10px"
+        ></i>
         <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: 6px"
-              src="../../../public/img/edit.png"
-              @click="textShow = true"
-              alt=""
-               v-show="!textShow"
-            />
-            <span class="span_text">已付：{{amountEdPayable}}元
-                <img
+          width="17"
+          height="18"
+          style="vertical-align: text-top; position: relative; top: 6px"
+          src="../../../public/img/edit.png"
+          @click="textShow = true"
+          alt=""
+          v-show="!textShow"
+        />
+        <span class="span_text"
+          >已付：{{ amountEdPayable }}元
+          <img
             width="18"
             height="20"
             style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png"
             @click="fujian()"
             alt=""
-          />{{paymentScreenshotList.length == 0 ? "暂无附件" : paymentScreenshotList.length}}</span>
-            <span class="span_text">未付：{{alreadyInvoice}}元</span>
-            <span class="span_text">{{priceStatus}}</span>
+          />{{
+            paymentScreenshotList.length == 0
+              ? '暂无附件'
+              : paymentScreenshotList.length
+          }}</span
+        >
+        <span class="span_text">未付：{{ alreadyInvoice }}元</span>
+
+        <span class="span_text">{{ priceStatus }}</span>
       </div>
 
       <el-table
         class="wenzi"
         :data="warehouseList.records"
         style="width: 100%; margin-top: 20px"
-        ref="warehouseList"
+        ref="warehouseList.records"
         border
         @row-click="handleRowClick"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column
+        <!-- <el-table-column
           :selectable="selectInit"
           type="selection"
           width="55"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column
           class="table_td"
           prop="contractNo"
           label="合同编号"
         ></el-table-column>
-         <el-table-column
+        <el-table-column
           class="table_td"
           prop="taskNo"
           label="运输任务"
@@ -180,21 +204,15 @@
           class="table_td"
           prop="loadingWeight"
           label="装车净重（吨）"
-          ></el-table-column
-        >
+        ></el-table-column>
         <el-table-column
           class="table_td"
           prop="unloadingWeight"
           label="卸车净重(吨)"
         >
         </el-table-column>
-        <el-table-column
-          class="table_td"
-          prop="lossWeight"
-          label="损耗(吨)"
-        >
+        <el-table-column class="table_td" prop="lossWeight" label="损耗(吨)">
         </el-table-column>
-    
       </el-table>
 
       <!-- 页数 -->
@@ -217,7 +235,7 @@
       <el-form :model="form">
         <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
           <template>
-            <span>{{ amountNotPayable }}</span>
+            <span>{{ alreadyInvoice }}</span>
           </template>
         </el-form-item>
         <el-form-item label="本次付款金额" :label-width="formLabelWidth">
@@ -311,47 +329,47 @@
     >
       <h3 style="margin-left: 30px">{{ driverPayeeList.payeeName }}的账户</h3>
       <div v-for="(item, index) in driverPayeeList" :key="index">
-      <h4 style="margin-left: 30px">账户-{{index+1}}</h4>
-      <div class="anniu">
-        <el-radio-group @change="bankCard(item,id)" v-model="item.radio">
-        <el-radio label="1">本次收款账户</el-radio>
-      </el-radio-group>
-      </div>
-      <el-form class="customer" :model="form">
-        <el-form-item label="账户类型" :label-width="formLabelWidth">
-          {{ item.accountType }}
-        </el-form-item>
-        <el-form-item label="银行卡号" :label-width="formLabelWidth">
-          {{ item.bankCard }}
-        </el-form-item>
-        <el-form-item label="开户行" :label-width="formLabelWidth">
-          {{ item.bankDeposit }}
-        </el-form-item>
-        <el-form-item label="开户支行" :label-width="formLabelWidth">
-          {{ item.bankDepositBranch }}
-        </el-form-item>
-        <el-form-item
-          label="收款人姓名"
-          :label-width="formLabelWidth"
-          v-if="item.accountTypeFlag == 1"
-        >
-          {{ item.payeeName }}
-        </el-form-item>
-        <el-form-item
-          label="收款人身份证号"
-          :label-width="formLabelWidth"
-          v-if="item.accountTypeFlag == 1"
-        >
-          {{ item.payeeNumberCard }}
-        </el-form-item>
-        <el-form-item
-          v-if="item.accountTypeFlag == 2"
-          label="企业名称"
-          :label-width="formLabelWidth"
-        >
-          {{ item.compName }}
-        </el-form-item>
-      </el-form>
+        <h4 style="margin-left: 30px">账户-{{ index + 1 }}</h4>
+        <div class="anniu">
+          <el-radio-group @change="bankCard(item, id)" v-model="item.radio">
+            <el-radio label="1">本次收款账户</el-radio>
+          </el-radio-group>
+        </div>
+        <el-form class="customer" :model="form">
+          <el-form-item label="账户类型" :label-width="formLabelWidth">
+            {{ item.accountType }}
+          </el-form-item>
+          <el-form-item label="银行卡号" :label-width="formLabelWidth">
+            {{ item.bankCard }}
+          </el-form-item>
+          <el-form-item label="开户行" :label-width="formLabelWidth">
+            {{ item.bankDeposit }}
+          </el-form-item>
+          <el-form-item label="开户支行" :label-width="formLabelWidth">
+            {{ item.bankDepositBranch }}
+          </el-form-item>
+          <el-form-item
+            label="收款人姓名"
+            :label-width="formLabelWidth"
+            v-if="item.accountTypeFlag == 1"
+          >
+            {{ item.payeeName }}
+          </el-form-item>
+          <el-form-item
+            label="收款人身份证号"
+            :label-width="formLabelWidth"
+            v-if="item.accountTypeFlag == 1"
+          >
+            {{ item.payeeNumberCard }}
+          </el-form-item>
+          <el-form-item
+            v-if="item.accountTypeFlag == 2"
+            label="企业名称"
+            :label-width="formLabelWidth"
+          >
+            {{ item.compName }}
+          </el-form-item>
+        </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible8 = false">取 消</el-button>
@@ -386,14 +404,17 @@
       </div>
     </WinseaContentModal>
 
-     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-			@on-cancel="accessoryTFs = false">
-      <div v-for="(item,index) in paymentScreenshotList" :key="index">
-			<!-- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="item" :editable="false"
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="accessoryTFs = false"
+    >
+      <div v-for="(item, index) in paymentScreenshotList" :key="index">
+        <!-- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="item" :editable="false"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
-        <img :src="item" alt="附件" class="img_css">
-        </div>
-		</WinseaContentModal>
+        <img :src="item" alt="附件" class="img_css" />
+      </div>
+    </WinseaContentModal>
   </div>
   <!-- </div> -->
 </template>
@@ -406,7 +427,7 @@ import {
   openinvoicelist,
   getYunShuXiaLa,
   getYunShuNumber,
-  SetYunShuPrice
+  SetYunShuPrice,
 } from '@/model/statisticalReport/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
@@ -469,7 +490,7 @@ export default {
       // 年
       year: '',
       options: [],
-      id:'',
+      id: '',
       pickerOptions: {},
       value2: '',
       deptBudgetTotal: 0,
@@ -480,7 +501,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       driverPayeeList: {
-          radio: '1',
+        radio: '1',
       },
       contractType: 2,
       accessoryTFs: false,
@@ -489,14 +510,14 @@ export default {
       enter: {
         closePositionList: [],
       },
-       taskNoList:[],
-        processNoList:[],
-        taskNo:"",
-         processNo:"",
-         textShow:false,
-         actualFreight:"",
-         processNoId:"",
-      tranPriceIng:"",
+      taskNoList: [],
+      processNoList: [],
+      taskNo: '',
+      processNo: '',
+      textShow: false,
+      actualFreight: '',
+      processNoId: '',
+      tranPriceIng: '',
 
       // 提交类型
       submitType: true,
@@ -544,10 +565,10 @@ export default {
           return time.getTime() > Date.now()
         },
       },
-       amountEdPayable : "",//已付金额
-      alreadyInvoice:"",//未付金额
-      priceStatus:"",//状态
-      paymentScreenshotList:[],//付款截图
+      amountEdPayable: '', //已付金额
+      alreadyInvoice: '', //未付金额
+      priceStatus: '', //状态
+      paymentScreenshotList: [], //付款截图
     }
   },
   activated() {
@@ -555,6 +576,17 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    fujian() {
+      if (this.paymentScreenshotList.length == 0) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      // this.appendixIdss = row.addressUrl
+    },
     cur(status) {
       if (status == 0) {
         this.currect = true
@@ -620,34 +652,34 @@ export default {
     look(item) {
       this.dialogFormVisible8 = true
       if (item.driverPayeeInfoList) {
-        this.driverPayeeList= item.driverPayeeInfoList
-        this.driverPayeeList.payeeName=item.driverPayeeInfoList[0].payeeName
-        for (var i = 0; i < item.driverPayeeInfoList.length; i++){
-          if(item.driverPayeeInfoList[i].bankCard==item.cardNo){
-            this.driverPayeeList[i].radio='1'
-          }
-          else{
-            this.driverPayeeList[i].radio='2'
+        this.driverPayeeList = item.driverPayeeInfoList
+        this.driverPayeeList.payeeName = item.driverPayeeInfoList[0].payeeName
+        for (var i = 0; i < item.driverPayeeInfoList.length; i++) {
+          if (item.driverPayeeInfoList[i].bankCard == item.cardNo) {
+            this.driverPayeeList[i].radio = '1'
+          } else {
+            this.driverPayeeList[i].radio = '2'
           }
-          console.log(this.driverPayeeList[i].radio)
         }
-        this.id=item.id
+        this.id = item.id
       }
     },
     //付款
     handlepayment() {
-      this.amountNotPayable = 0
-      this.money = this.money
-      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      this.amountNotPayable =
+        this.warehouseList.records[0].tranSettlementReportList //未付金额
+      // this.money = this.money
+      this.tranSettlementReportList =
+        this.warehouseList.records[0].tranSettlementReportList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
-      this.paymentDate = this.paymentDate
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择一条要付款的条目')
+      // this.paymentDate = this.paymentDate
+      if (this.warehouseList.records.length == 0) {
+        this.$message.warning('付款的条目为空')
       } else {
-        for (var i = 0; i < this.modification.length; i++) {
+        for (var i = 0; i < this.warehouseList.records.length; i++) {
           if (
-            this.modification[i].status != '已通过' &&
-            this.modification[i].status != '部分付款'
+            this.warehouseList.records[i].status != '已通过' &&
+            this.warehouseList.records[i].status != '部分付款'
           ) {
             this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
             return
@@ -660,7 +692,7 @@ export default {
     submitMoney() {
       this.autoSettlementReport.money = this.money
       this.autoSettlementReport.paymentDate = this.paymentDate
-      if (this.modification.length == 0) {
+      if (this.warehouseList.records.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
         if (
@@ -691,7 +723,7 @@ export default {
           })
           return
         }
-        if (this.money > this.modification[0].amountNotPayable) {
+        if (Number(this.money) > Number(this.alreadyInvoice)) {
           this.$message({
             message: '付款金额不能大于未付金额！',
             type: 'warning',
@@ -704,9 +736,10 @@ export default {
           type: 'warning',
         }).then(() => {
           autopaymoney({
-            tranSettlementReportList: this.modification,
+            tranSettlementReportList: this.warehouseList.records,
             // amountEdPayable: this.modification[0].amountEdPayable,
             // amountNotPayable: this.modification[0].amountNotPayable,
+            tranTypeKey: 3,
             money: this.money,
             paymentDate: this.paymentDate,
             paymentScreenshot: this.paymentScreenshot,
@@ -724,7 +757,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -803,7 +835,8 @@ export default {
     //批量开发票
     handleninvoice() {
       this.amountEdPayable = 0
-      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      this.tranSettlementReportList =
+        this.warehouseList.records[0].tranSettlementReportList
       for (var i = 0; i < this.modification.length; i++) {
         this.amountEdPayable += this.modification[i].amountEdPayable
       }
@@ -878,7 +911,7 @@ export default {
         })
     },
     //设置本次账户
-    bankCard(item,id) {
+    bankCard(item, id) {
       editauto({
         cardNo: item.bankCard,
         id: id,
@@ -943,9 +976,7 @@ export default {
     //装车磅单
     lookloadingImg(row) {
       if (row.loadingImg == null || row.loadingImg == '') {
-        EventBus.$emit(
-          this.$message.warning('暂无磅单信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无磅单信息'))
       } else {
         this.accessoryTFs = true
       }
@@ -954,9 +985,7 @@ export default {
     //卸车磅单
     lookunloadingImg(row) {
       if (row.unloadingImg === null || row.unloadingImg === '') {
-        EventBus.$emit(
-          this.$message.warning('暂无磅单信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无磅单信息'))
       } else {
         this.accesscard = true
       }
@@ -965,9 +994,7 @@ export default {
     //付款截图
     lookpaymentScreenshot(row) {
       if (row.paymentScreenshot == null || row.paymentScreenshot == '') {
-        EventBus.$emit(
-          this.$message.warning('暂无付款截图信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无付款截图信息'))
       } else {
         this.paymentImg = true
       }
@@ -975,7 +1002,7 @@ export default {
     },
     //审核
     audit(item, index, status, status2, reason) {
-      if (index < this.modification.length) {
+      if (index < this.warehouseList.records.length) {
         posthandle({
           taskId: item.taskId,
           approved: status,
@@ -984,24 +1011,24 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(this.modification[index + 1], index + 1, status)
+            this.audit(this.warehouseList.records[index + 1], index + 1, status)
           })
           .catch((req) => {
             this.$message.warning(req.message)
           })
       } else {
-        if (status==true) {
+        if (status == true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (status==false) {
+        } else if (status == false) {
           this.$message.success('驳回成功')
           this.getList()
-          }
+        }
       }
     },
     handlereject(status) {
       var that = this
-      if (this.modification.length == 0) {
+      if (this.warehouseList.records.length == 0) {
         this.$message.warning('请选择要驳回的条目')
       } else {
         this.$confirm(`是否确定驳回？`, {
@@ -1009,7 +1036,7 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          that.audit(this.modification[0], 0, false, true, '已驳回')
+          that.audit(this.warehouseList.records[0], 0, false, true, '已驳回')
         })
       }
     },
@@ -1033,15 +1060,15 @@ export default {
     },
     handlepass() {
       var that = this
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要通过的条目')
+      if (this.warehouseList.records.length == 0) {
+        this.$message.warning('没有要审核的！')
       } else {
         this.$confirm(`是否确定通过？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          that.audit(this.modification[0], 0, true, 2)
+          that.audit(this.warehouseList.records[0], 0, true, 2)
         })
       }
     },
@@ -1052,79 +1079,79 @@ export default {
       this.searchType = status
       this.getList()
     },
-  contractchange(e) {
+    contractchange(e) {
       this.contractNo = e
       this.taskNoList = []
-       this.taskNo = ""
-      this.processNoList= []
-      this.processNo = ""
-       getYunShuNumber({
-       contractNo:this.contractNo,
-       flag:1
+      this.taskNo = ''
+      this.processNoList = []
+      this.processNo = ''
+      getYunShuNumber({
+        contractNo: this.contractNo,
+        flag: 1,
       })
         .toPromise()
         .then((response) => {
-          for(let i = 0 ; i < response.length ; i++){
+          for (let i = 0; i < response.length; i++) {
             this.taskNoList.push({
-              taskNoKey : i,
-              taskNoValue : response[i].taskNo,
-              processNo: response[i].tranProcessInfoList
-          }) 
+              taskNoKey: i,
+              taskNoValue: response[i].taskNo,
+              processNo: response[i].tranProcessInfoList,
+            })
           }
         })
     },
-    taskNochange(e){
+    taskNochange(e) {
       this.taskNo = e
-      this.processNoList= []
-      this.processNo = ""
-      for(let i = 0 ; i < this.taskNoList.length ; i++ ){
-        if(e == this.taskNoList[i].taskNoValue){
-          for(let j = 0 ; j < this.taskNoList.length ; j++){
+      this.processNoList = []
+      this.processNo = ''
+      for (let i = 0; i < this.taskNoList.length; i++) {
+        if (e == this.taskNoList[i].taskNoValue) {
+          for (let j = 0; j < this.taskNoList.length; j++) {
             this.processNoList.push({
-             processNoKey:i,
-             processNoValue:this.taskNoList[i].processNo[j].processNo,
-             actualFreight : this.taskNoList[i].processNo[j].actualFreight,
-             id:this.taskNoList[i].processNo[j].id,
-             tranPriceIng:this.taskNoList[i].processNo[j].tranPrice,
-              priceStatus:this.taskNoList[i].processNo[j].priceStatus
-           })
+              processNoKey: i,
+              processNoValue: this.taskNoList[i].processNo[j].processNo,
+              actualFreight: this.taskNoList[i].processNo[j].actualFreight,
+              id: this.taskNoList[i].processNo[j].id,
+              tranPriceIng: this.taskNoList[i].processNo[j].tranPrice,
+              priceStatus: this.taskNoList[i].processNo[j].priceStatus,
+            })
           }
         }
       }
     },
-    processNochange(e){
+    processNochange(e) {
       this.processNo = e
-      for(let i = 0 ; i < this.processNoList.length ; i++){
-        if(this.processNoList[i].processNoValue == e){
+      for (let i = 0; i < this.processNoList.length; i++) {
+        if (this.processNoList[i].processNoValue == e) {
           this.actualFreight = this.processNoList[i].actualFreight
-          this.processNoId =this.processNoList[i].id
+          this.processNoId = this.processNoList[i].id
           this.tranPriceIng = this.processNoList[i].tranPriceIng
           this.priceStatus = this.processNoList[i].priceStatus
         }
       }
       this.getList()
     },
-     actualFreightchange(){
+    actualFreightchange() {
       // this.actualFreight
       this.$confirm(`是否提交实际总价？`, {
-          cancelButtonText: '取消',
-          confirmButtonText: '确定',
-          type: 'warning',
-        }).then(() => {
-          SetYunShuPrice({
-        actualFreight:this.actualFreight,
-        id:this.processNoId,
-        flag :3
-      })
-        .toPromise()
-        .then((response) => {
-          this.$notify.success({
-                title: '成功',
-                message: '实际运费总价设置成功',
-              })
-         this.textShow = false
-        })
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        SetYunShuPrice({
+          actualFreight: this.actualFreight,
+          id: this.processNoId,
+          flag: 3,
         })
+          .toPromise()
+          .then((response) => {
+            this.$notify.success({
+              title: '成功',
+              message: '实际运费总价设置成功',
+            })
+            this.textShow = false
+          })
+      })
     },
     updated() {
       this.$nextTick(() => {
@@ -1173,35 +1200,41 @@ export default {
         searchType: this.searchType,
         contractNo: this.contractNo,
         manualFlag: this.manualFlag,
-        taskNo:this.taskNo,
-         processNo:this.processNo
+        taskNo: this.taskNo,
+        processNo: this.processNo,
       })
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].settlementWeightchange = false
             response.records[i].deductionAmountchange = false
-            response.records[i].amountNotPayable=response.records[i].amountIngPayable-response.records[i].amountEdPayable
-            if(this.processNo){
-                this.amountEdPayable += response.records[i].amountEdPayable // 已付
-                 this.alreadyInvoice += response.records[i].alreadyInvoice//未付
-                this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
-              } 
+            response.records[i].amountNotPayable =
+              response.records[i].amountIngPayable -
+              response.records[i].amountEdPayable
+            if (this.processNo) {
+              if (response.records[0].paymentScreenshot) {
+                this.paymentScreenshotList =
+                  response.records[0].paymentScreenshot.split(',') //附件地址取运输阶段第一条
+                this.paymentScreenshot = response.records[0].paymentScreenshot
+              }
+            }
           }
+          this.amountEdPayable = response.records[0].amountEdPayable // 已付
+          this.alreadyInvoice = response.records[0].amountNotPayable //未付
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
-           this.contractNoList=[]
+      this.contractNoList = []
       getYunShuXiaLa({
-        flag:1,
+        flag: 1,
       })
         .toPromise()
         .then((response) => {
-          for(let i = 0 ; i < response.length ; i++){
+          for (let i = 0; i < response.length; i++) {
             this.contractNoList.push({
-              constKey : i,
-              contractNo : response[i]
-          }) 
+              constKey: i,
+              contractNo: response[i],
+            })
           }
           this.contractNoList.unshift({ contractNo: '全部合同' })
           this.options = this.contractNoList
@@ -1211,8 +1244,11 @@ export default {
       console.log(file)
     },
     handlePictureCardPreview(file) {
-      this.paymentScreenshot = file.url
-
+      if (this.paymentScreenshot) {
+        this.paymentScreenshot += ',' + file.url
+      } else {
+        this.paymentScreenshot = file.url
+      }
       this.dialogVisible = true
     },
     handleDownload(file) {
@@ -1292,7 +1328,7 @@ export default {
           this.historyList = response
         })
     },
-   
+
     total() {},
   },
 }
@@ -1544,33 +1580,33 @@ hr {
   text-align: center;
   height: 40px;
 }
-/deep/.freightSet .el-input__inner{
- width: 100px;
+/deep/.freightSet .el-input__inner {
+  width: 100px;
 }
-.freightSet{
+.freightSet {
   margin: 10px 0 0 20px;
   display: flex;
-  width:800px;
-  .span_text{
+  width: 800px;
+  .span_text {
     margin-left: 20px;
     line-height: 30px;
   }
 }
-/deep/.freightSet .el-input{
+/deep/.freightSet .el-input {
   width: 44%;
 }
-.findValue{
+.findValue {
   width: 300px;
   margin-left: 5px;
 }
-/deep/.freightSet .el-input{
+/deep/.freightSet .el-input {
   width: 44%;
 }
-.findValue{
+.findValue {
   width: 300px;
   margin-left: 5px;
 }
-.img_css{
+.img_css {
   width: 200px;
   height: 200px;
 }

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -159,45 +159,38 @@
           type="selection"
           width="55"
         ></el-table-column>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column
           class="table_td"
           prop="warehouseName"
-          width="120"
           label="仓库"
         ></el-table-column>
         <el-table-column
           class="table_td"
           prop="carNo"
-          width="120"
           label="车牌号"
         ></el-table-column>
         <el-table-column
           class="table_td"
           prop="warehousingDate"
-          width="100"
           label="入库日期"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="grossWeight"
           label="毛重"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="tare"
           label="皮重"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="deductionWeight"
           label="扣重"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="netWeight"
           label="净重"

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

@@ -13,13 +13,17 @@
 		</el-row>
 		<el-row>
 			<el-col :span="12">
-				<span>鲅鱼圈1号库（102仓位）</span><span>现有储量：1000吨</span>
+      <el-col :span="6">
+				<span>{{deptBudgetList.warehouseName}}（102仓位）</span><span>现有储量：1000吨</span>
+        </el-col>
+        <el-col :span="18">
 				<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
 					start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
 				</el-date-picker>
+        </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>
@@ -27,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>
@@ -43,31 +48,41 @@
       </el-table-column>
         <el-table-column prop="goodsName" label="货名">
         </el-table-column>
-		<el-table-column prop="operatorMajorRoleName" label="毛重（吨）">
+		<el-table-column prop="grossWeight" label="毛重（吨）">
         </el-table-column>
-		<el-table-column prop="operatorMajorRoleName" label="皮重（吨）">
+		<el-table-column prop="tare" label="皮重（吨）">
         </el-table-column>
-		<el-table-column prop="operatorMajorRoleName" label="扣重（吨）">
+		<el-table-column prop="weight" label="扣重（吨）">
+    </el-table-column>
+		<el-table-column prop="netWeight" label="净重（吨）">
         </el-table-column>
-		<el-table-column prop="operatorMajorRoleName" label="净重（吨）">
-        </el-table-column>
-		<el-table-column prop="operatorMajorRoleName" label="类型">
-        </el-table-column>
-		<el-table-column prop="operatorMajorRoleName" label="磅单">
+		<el-table-column prop="inOutType" label="类型">
         </el-table-column>
+		<el-table-column prop="addressUrl" label="磅单">
+      <template scope="scope">
+         <el-button @click='handleLook(1,scope.row)'>查看</el-button>
+       </template>
+    </el-table-column>
 		<el-table-column prop="operatorMajorRoleName" label="结算单">
-        </el-table-column>
-		<el-table-column prop="operatorMajorRoleName" label="出入库日期">
-        </el-table-column>
+      <template scope="scope">
+         <el-button @click='handleLook(2,scope.row)' v-if="scope.row.inOutType=='收购入库'">查看</el-button>
+       </template>
+    </el-table-column>
+		<el-table-column prop="inOutDate" label="出入库日期">
+    </el-table-column>
      </el-table>
 	<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">
@@ -81,57 +96,378 @@
           </el-checkbox-group>
         </div>
       </div>
-      <div class="bottom-btn">
-        <el-button @click="typePrintClick(printType)">确定</el-button>
-        <el-button @click="typePrintCannelClick">取消</el-button>
+    </div>
+    <el-dialog :visible.sync="isCountShow" title="磅单">
+      <div id="printTest" 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>
       </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="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="printBig">打印单据</el-button>
+        </div>
+      </el-dialog> -->
 	</div>
 </template>
 <script>
 	import {
 		getList,
-	
+    getrecord,
+    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: [
 						'打印磅单',
 						'打印结算单',
 					]
 				},
+        currentPage:1,
+        pageSize:10,
+        searchType:'',
+        isCountShow:false,
+        isShowPrint:false,
 				isShowPrintType:false,
 				deptBudgetList:{},
-				pickerOptions:[]
+				pickerOptions:[],
+        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测试库",
+						searchType: this.searchType,
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+        }).toPromise()
+          .then((res) => {
+            for (let i = 0; i < res.records.length; i++) {
+              if(res.records[i].grossWeight){
+                res.records[i].grossWeight*=1000
+              }
+              if(res.records[i].tare){
+                res.records[i].tare*=1000
+              }
+              if(res.records[i].netWeight){
+                res.records[i].netWeight*=1000
+              }
+              if(res.records[i].grossWeight&&res.records[i].tare&&res.records[i].netWeight){
+                  res.records[i].weight=res.records[i].grossWeight-res.records[i].tare-res.records[i].netWeight
+              }else{
+                res.records[i].weight=null
+              }
+            }
+            this.recordList = res.records
+          })
+      },
 			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.tableData=item
+          // 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) => {
+            this.printData=res 
+            this.isShowPrint=true
+          })
+          // this.tableData=item
+        }
+      },
+      getdate() {
+				var date = new Date()
+				var year = date.getFullYear() //获取完整的年份(4位)
+				var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+				var datetime = date.getDate() //获取当前日(1-31)
+				if (mouth < 10) {
+					mouth = '0' + mouth
+				}
+				if (datetime < 10) {
+					datetime = '0' + datetime
+				}
+				return year + '' + mouth + datetime
 			},
 			typePrintCannelClick() {
 				this.isShowPrintType = false
@@ -148,13 +484,13 @@
     padding-right: 10px;
     text-align: right;
   }
-	.title {
+	.bg-left.title {
     position: relative;
   }
 .bg-bottom {
     margin: 15px 0px;
   }
-  .title::before {
+  .bg-left.title::before {
     content: '';
     display: inline-block;
     width: 5px;
@@ -194,5 +530,126 @@
   .print-type-checkbox {
     padding-left: 20px;
   }
+  .page2-content {
+    border: 1px solid #D8DCE6;
+    margin-top: 20px;
+    padding: 10px;
+    box-sizing: border-box;
+    text-align: center;
+    border-radius: 4px;
+    padding-bottom: 20px;
+  }
+  table,
+      table tr th,
+      table tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+        height: 55px;
+      }
+
+      #app {
+        /* height: 98vh;
+        position: relative; */
+      }
+
+      .content {
+        // width: 1000px;
+        // padding: 70px 20px 20px 20px;
+        // font-size: 22px;
+        // position: absolute;
+        // top: 0;
+        // bottom: 0;
+        // left: 0;
+        // right: 0;
+        .title {
+          text-align: center;
+          font-size: 36px;
+          font-weight: 500;
+          margin-bottom: 20px;
+        }
+        img {
+          width: 41px;
+          height: 41px;
+          margin-right: 118px;
+        }
+      }
+
+      .table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        border: 3px solid #333333;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+      .bottom-row1 {
+        display: flex;
+        /* justify-content: space-between; */
+        margin-top: 5px 0;
+      }
+
+      .bottom-row2 {
+        display: flex;
+      }
+
+      
+
+      .config {
+        margin-top: 10px;
+        margin-right: 240px;
+      }
+      .autograph{
+    margin-top: 10px;
+     }
+      .bottom-row3 {
+        margin: 10px 0;
+      }
+
+      .number {
+        text-align: right;
+        margin-bottom: 10px;
+        margin-top: 20px;
+      }
+
+      .small-row {
+        display: flex;
+      }
+
+      .small-content {
+        width: 400px;
+        margin: 0 auto;
+        border: 1px solid #ccc;
+        padding: 20px 20px 160px 20px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 450px;
+      }
+
+      .small-title {
+        text-align: center;
+        font-size: 18px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .small-row {
+        display: flex;
+        justify-content: space-between;
+        margin: 10px;
+      }
 
+      .small-img {
+        margin-right: 0;
+      }
+      .sign{
+        margin-right: 100px;
+      }
 </style>

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -558,6 +558,12 @@
       },
       //提交按钮
       submit() {
+         if (!this.deptBudgetList.tranPrice) {
+          this.$message({
+            message: '请设置运输总价！',
+            type: 'warning',
+          })
+        } else {
         for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
           if (!this.deptBudgetList.tranCarInfoList[i].driver) {
             this.$message({
@@ -681,6 +687,7 @@
           .catch(() => {
             return false
           })
+        }
       },
       handleClose() {
         this.accessoryTFs = false

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -29,7 +29,6 @@
     >
       <div class="small-title" style="font-size: 16px">任务详情</div>
        <ws-info-table>
-
         <ws-form-item label="任务编号" span="1" prop="processNo">
           {{ deptBudgetList.processNo }}
         </ws-form-item>
@@ -393,6 +392,13 @@ export default {
       console.log(data, files, url)
     },
     submit() {
+        if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输总价！',
+          type: 'warning',
+        })
+      }
+      else{
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
         if (!this.deptBudgetList.tranCarInfoList[i].driver) {
           this.$message({
@@ -482,6 +488,7 @@ export default {
         .catch(() => {
           return false
         })
+      }
     },
      //审核
     examine(){

src/views/warehouse/warehouseManagementGross.vue

@@ -637,6 +637,7 @@ export default {
       disabled2: true,
       tranCarInfoList: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
+      secretaryWeigher: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1416,8 +1417,8 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 3
@@ -1940,8 +1941,8 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -552,6 +552,7 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
+      skinInspector: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1372,6 +1373,7 @@ export default {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.dataList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
               this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 3
               this.dataList.grossWeight = (this.dataList.grossWeight/1000).toFixed(2)

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -464,6 +464,7 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
+      secretaryWeigher: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1113,6 +1114,7 @@ export default {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.dataList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName')
               this.dataList.inOutFlag = 1
               this.dataList.statusFlag = 3
               this.dataList.grossWeight /= 1000

src/views/warehouse/warehouseManagementTare.vue

@@ -460,6 +460,7 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
+      skinInspector: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1002,8 +1003,8 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId =  sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
               this.deptBudgetList.inOutFlag = 1
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 1
@@ -1432,6 +1433,7 @@ export default {
                 this.deptBudgetList.deductionAmount *= 1000
                 this.deptBudgetList.deductionWeight /= 1000
             this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+            this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
             this.deptBudgetList.inOutFlag = 1
             this.deptBudgetList.statusFlag = 3
             addstorageputList(this.deptBudgetList)