更新

public/static/payprint.html

@@ -441,11 +441,11 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">收货单位</td>
-                  <td class="col" colspan="2">{{printData1[index].compName}}</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
                   <td class="col col-bgc">联系人</td>
-                  <td class="col">{{printData1[index].contacts}}</td>
+                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
                   <td class="col col-bgc">联系电话</td>
-                  <td class="col" colspan="2">{{printData1[index].contactsPhone}}</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">货名</td>

public/static/weightCheck.html

@@ -341,93 +341,93 @@
         </div>
       </div>
       <div v-else>
-        <div class="content" v-if="bigContent">
+        <div class="content" v-if="bigContent" v-for="(_item,index) in tableData">
 
-          <div class="title">{{tableData.compName}}</div>
+          <!-- <div class="title">{{_item.compName}}</div> -->
           <div class="title">入库检斤单</div>
           <div class="left">
-            <img :src="tableData.codeUrl" alt="">
+            <img :src="_item.codeUrl" alt="">
           </div>
-          <div class="number">{{tableData.number}}</div>
+          <div class="number">{{_item.number}}</div>
           <table class="table">
             <tr class="row">
               <td class="col col-bgc">客户姓名</td>
-              <td class="col" colspan="2">{{tableData.customer}}</td>
+              <td class="col" colspan="2">{{_item.customer}}</td>
               <td class="col col-bgc">客户电话</td>
-              <td class="col">{{tableData.customerPhone}}</td>
+              <td class="col">{{_item.customerPhone}}</td>
               <td class="col col-bgc">车牌号</td>
-              <td class="col" colspan="2">{{tableData.carNumber}}</td>
+              <td class="col" colspan="2">{{_item.carNumber}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col" colspan="2">{{_item.compName}}</td>
               <td class="col col-bgc">联系人</td>
-              <td class="col">{{tableData.person}}</td>
+              <td class="col">{{_item.person}}</td>
               <td class="col col-bgc">联系电话</td>
-              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+              <td class="col" colspan="2">{{_item.personPhone}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">货名</td>
-              <td class="col">{{tableData.goodsName}}</td>
+              <td class="col">{{_item.goodsName}}</td>
               <td class="col col-bgc">类型</td>
-              <td class="col">{{tableData.type}}</td>
+              <td class="col">{{_item.type}}</td>
               <td class="col col-bgc">容量（克/升）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
               <td class="col col-bgc">不完善粒（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">等级</td>
-              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+              <td class="col">{{_item.qualityInspectionManagement?_item.qualityInspectionManagement.grade:''}}
               </td>
               <td class="col col-bgc">水分（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.waterContent:''}}</td>
               <td class="col col-bgc">热损伤（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.jiaorenli:''}}</td>
               <td class="col col-bgc">质检时间</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.qualityDate:''}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">杂质（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.impurity:''}}</td>
               <td class="col col-bgc">霉变粒（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.mildewGrain:''}}</td>
               <td class="col col-bgc">扣杂</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
               </td>
               <td class="col " colspan="2"></td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">毛重（公斤）</td>
-              <td class="col">{{tableData.grossWeight}}</td>
+              <td class="col">{{_item.grossWeight}}</td>
               <td class="col col-bgc">皮重（公斤）</td>
-              <td class="col">{{tableData.tare}}</td>
+              <td class="col">{{_item.tare}}</td>
               <td class="col col-bgc">扣重（公斤）</td>
-              <td class="col">{{tableData.buckleMiscellaneous}}</td>
+              <td class="col">{{_item.buckleMiscellaneous}}</td>
               <td class="col col-bgc">净重（公斤）</td>
-              <td class="col">{{tableData.netWeight}}</td>
+              <td class="col">{{_item.netWeight}}</td>
               <td class="col " colspan="2"></td>
 
             </tr>
             <tr class="row">
               <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-              <td class="col" colspan="2">{{tableData.grossDate}}</td>
+              <td class="col" colspan="2">{{_item.grossDate}}</td>
               <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-              <td class="col" colspan="2">{{tableData.tareDate}}</td>
+              <td class="col" colspan="2">{{_item.tareDate}}</td>
             </tr>
           </table>
           <div class="bottom">
             <div class="bottom-row1">
-              <div>毛检：{{tableData.secretaryWeigher}}</div>
-              <div style="margin-left:60px">皮检：{{tableData.skinInspector}}</div>
+              <div>毛检：{{_item.secretaryWeigher}}</div>
+              <div style="margin-left:60px">皮检：{{_item.skinInspector}}</div>
               <!-- <div>{{tableData.qualityDate}}</div> -->
             </div>
             <div class="bottom-row2">
@@ -596,7 +596,7 @@
           }
         } else {
           this.tableData = JSON.parse(_data)
-          console.log(this.tableData)
+          console.log("sssss",this.tableData)
         }
         // sessionStorage.setItem('record_print', JSON.stringify(response))
         // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))

src/views/houseSelfCollect/paymentManagement.vue

@@ -36,6 +36,11 @@
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
+         <el-select class="warehouse_select" v-model="goodsName" placeholder="请选择货名" @change="goodsNameChange"
+          filterable clearable style="margin: 0 10px">
+           <el-option label="全部货名" value="全部货名"></el-option>
+          <el-option v-for="(item,index) in goodnameList" :key="item.id" :label="item.goodsName" :value="index"></el-option>
+        </el-select>
         <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
           filterable clearable style="margin: 0 10px">
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
@@ -361,7 +366,7 @@
     settlementEdit,
     workflowcontent,
     suspendinstance,
-    importWord
+    importWord,
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -467,10 +472,13 @@
         fileList: [],
         appendixIdsAdd: '',
         excelFreightspace: [],
+        goodnameList:[],
+        goodsName:"全部",
       }
     },
     activated() {
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+      
       this.getPassYearFormatDate()
       this.getWarehouse()
       // this.getList()
@@ -482,6 +490,10 @@
       })
     },
     methods: {
+      goodsNameChange(e){
+        this.goodsName = this.goodnameList[e].constValue
+        this.getList()
+      },
       importClick(file, fileList) {
         this.fileTemp = file.raw
         let fileName = file.raw.name
@@ -1203,6 +1215,14 @@
         )
       },
       getList() {
+        for(let _temp = 0 ; _temp < this.warehouseList.length ; _temp++){
+          if(this.warehouseName == this.warehouseList[_temp].warehouseName){
+            for(let _num = 0 ; _num < this.warehouseList[_temp].goodsNameInfos.length;_num++){
+                const res = new Map()
+                this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr)=> !res.has(arr.goodsName)&&res.set(arr.goodsName,1))
+            }
+          }
+        }
         this.payments = {
           amountNotPayable: 0,
           paymentDate: '',
@@ -1229,6 +1249,7 @@
             managementType: 1,
             invoicing: this.invoicing,
             compId: localStorage.getItem('ws-pf_compId'),
+            goodsName:this.goodsName == '全部'?"":this.goodsName
           })
           .toPromise()
           .then((response) => {

src/views/houseSelfCollect/weighingManagement.vue

@@ -127,10 +127,10 @@
       <div class="print-type-content">
         <div class="print-type-title">请选择打印纸张类型</div>
         <div class="print-type-checkbox">
-          <el-radio-group v-model="radio">
+          <!-- <el-radio-group v-model="radio">
             <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
             <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
-          </el-radio-group>
+          </el-radio-group> -->
         </div>
 
         <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
@@ -255,6 +255,7 @@
         dialogData: {
           qualityInspectionManagement: {},
         },
+        dialogDataList:[],
         purchasePriceList: [],
         allowEdit: '0',
         disabled: false,
@@ -268,7 +269,9 @@
         excelPrintData: [],
         isExcelPrint: false,
         selectEW: false,
-        printSeparately: false
+        printSeparately: false,
+        onePrint:false,//单个打印标识
+        idPrint:"",
       }
     },
     computed: {
@@ -495,12 +498,46 @@
           localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
         } else {
-
-          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
+          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList))
         }
       },
       async typePrintClick(type) {
-        if (this.isExcelPrint) {
+        if(this.onePrint){//判断是否是单个打印
+           getPrint({
+              id: this.idPrint
+            })
+            .toPromise()
+            .then((response) => {
+              this.dialogDataList = []//点击确认时先清空要打印的数组
+              this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }
+              
+              if (this.checked) {
+                this.dialogDataList.push( this.dialogData)
+                var _datas = JSON.stringify(this.dialogData) 
+                _datas = JSON.parse(_datas)
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else if(this.ddchecked){
+                _datas = this.dialogData
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else{
+              this.dialogData.companyName = this.companyName
+                this.dialogDataList.push( this.dialogData)
+             }
+              this.printBig("", this.radio)
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+
+        }else{
+          if (this.isExcelPrint) {
           this.printBig(2, this.radio)
           this.isExcelPrint = false
 
@@ -528,35 +565,21 @@
               .catch((response) => {})
           }
         }
-
-
+        }
       },
       typePrintCannelClick() {
+        this.onePrint = false//单个打印标识
+        this.dialogDataList = []//打个打印取消时数组至空
         this.isShowPrintType = false
       },
       print(row, type, pageType) {
+      //打印
         if (type == 1) {
           this.isShowPrintType = true
         } else {
-          getPrint({
-              id: row.id
-            })
-            .toPromise()
-            .then((response) => {
-              // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid
-              // getQRcode({printString}).toPromise()
-              //       .then((res) => {//二维码
-              this.isShowPrint = true
-              this.dialogData = response
-              // this.printData.qrCodeUrl = res
-              // })
-              if (response.compName == '黑龙江秋收有限公司') {
-                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
-              }
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
+          this.idPrint = row.id
+           this.isShowPrintType = true
+           this.onePrint = true //单个打印标识
         }
 
       },

src/views/profitable/contractOtherMoney.vue

@@ -58,22 +58,25 @@
           </el-table-column>
           <el-table-column prop="payee" label="请款人/收款人" min-width="100"></el-table-column>
           <el-table-column prop="paymentDate" label="支付日期"></el-table-column>
+          <el-table-column prop="createDate" label="录入日期" min-width="130"></el-table-column>
           <el-table-column prop="status" label="状态" min-width="81">
             <template slot-scope="scope">
               <span style="margin-right:10px">{{scope.row.status}}</span><i class="el-icon-tickets icon_css"
                 v-show="scope.row.reexType == '支出'" @click="showAudit(scope.row)"></i>
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="400">
-            <template slot-scope="scope">
-              <el-button @click="audit(1,scope.row)" v-if="scope.row.reexType == '支出' && scope.row.taskId">审核
+          <el-table-column label="操作" min-width="340">
+            <template slot-scope="scope" >
+              <div v-if="scope.row.reexType =='支出'">
+                <el-button @click="audit(1,scope.row)" v-if="scope.row.taskId">审核
               </el-button>
-              <el-button @click="audit(2,scope.row)"
+              <el-button @click="audit(2,scope.row)" v-if="scope.row.status != '已付款'"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.status`">付款</el-button>
               <el-button @click="audit(5,scope.row)"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.edit`">编辑</el-button>
               <el-button @click="delData(scope.row)"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.delete`">删除</el-button>
+              </div>
             </template>
           </el-table-column>
         </el-table>