111

public/static/payprint.html

@@ -427,9 +427,9 @@
               <div style="height: 120px;">
 
                 <div class="title">入库检斤单</div>
-                <div class="leftimg">
+               <!-- <div class="leftimg">
                   <img :src="printData1[index].weighingManagement.codeUrl" alt="">
-                </div>
+                </div> -->
                 <div class="number1">{{printData1[index].weighingManagement.number}}</div>
               </div>
 
@@ -444,11 +444,11 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">收货单位</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                  <td class="col" colspan="2">{{printData1[index].compName}}</td>
                   <td class="col col-bgc">联系人</td>
-                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                  <td class="col">{{printData1[index].contacts}}</td>
                   <td class="col col-bgc">联系电话</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                  <td class="col" colspan="2">{{printData1[index].contactsPhone}}</td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">货名</td>
@@ -761,9 +761,9 @@
           <div>
 
             <div class="title">入库检斤单</div>
-            <div class="leftimg">
+            <!-- <div class="leftimg">
               <img :src="tableData.codeUrl" alt="">
-            </div>
+            </div> -->
             <div class="number1">{{tableData.number}}</div>
           </div>
           <table class="table">
@@ -777,11 +777,11 @@
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col" colspan="2">{{printData.compName}}</td>
               <td class="col col-bgc">联系人</td>
-              <td class="col">{{tableData.person}}</td>
+              <td class="col">{{printData.contacts}}</td>
               <td class="col col-bgc">联系电话</td>
-              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+              <td class="col" colspan="2">{{tableData.contactsPhone}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">货名</td>

src/views/houseSelfCollect/paymentManagement.vue

@@ -36,10 +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 in goodnameList" :key="item.id" :label="item.goodsName" :value="item.goodsName" ></el-option>
+        <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 in goodnameList" :key="item.id" :label="item.goodsName" :value="item.goodsName">
+          </el-option>
         </el-select>
         <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
           filterable clearable style="margin: 0 10px">
@@ -472,8 +473,8 @@
         fileList: [],
         appendixIdsAdd: '',
         excelFreightspace: [],
-        goodnameList:[],
-        goodsName:'全部',
+        goodnameList: [],
+        goodsName: '全部',
       }
     },
     mounted() {
@@ -496,7 +497,7 @@
       })
     },
     methods: {
-      goodsNameChange(){
+      goodsNameChange() {
         this.getList()
       },
       importClick(file, fileList) {
@@ -573,7 +574,7 @@
               obj.tare = v.皮重
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价
-              obj.qualityDate = _this.formatDate(v.日期,'-')
+              obj.qualityDate = _this.formatDate(v.日期, '-')
               obj.deductionAmount = v.扣款
               _this.excelFreightspace.push(obj)
             })
@@ -608,10 +609,11 @@
         const old = numb - 1;
         const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
         const time = new Date(1900, 0, old, 0, 0, t)
-        const year = time.getFullYear() ;
-        const month = time.getMonth() + 1 ;
-        const date = time.getDate() ;
-        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date)+' 00:00:00'
+        const year = time.getFullYear();
+        const month = time.getMonth() + 1;
+        const date = time.getDate();
+        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
+          ' 00:00:00'
       },
       invoicingClose() {
         this.invoicingshow = false
@@ -800,16 +802,16 @@
             if (response.length > 0) {
               var arr = []
               for (let i = 0; i < response.length; i++) {
-                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/','')
+                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/', '')
                 arr.push({
                   fileUrl: response[i],
                   renameFileName: _name,
                 })
               }
               this.filesToRar(arr, '开票XML文件')
-            }else{
-               this.$message.error('暂无数据')
-               return
+            } else {
+              this.$message.error('暂无数据')
+              return
             }
           })
           .catch(() => {})
@@ -1082,12 +1084,12 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择要通过的条目')
         } else {
-			for(let i =0;i<this.modification.length;i++){
-			  if(!this.modification[i].taskId){
-			     this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
-			     return
-			  }
-			}
+          for (let i = 0; i < this.modification.length; i++) {
+            if (!this.modification[i].taskId) {
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
+              return
+            }
+          }
           this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',
@@ -1200,6 +1202,15 @@
         if (this.printType == 1) {
           localStorage.setItem('cwprint', true)
           // 财务批量打印数据
+          for (let i = 0; i < this.selectPrintList.length; i++) {
+            if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
+              this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
+              this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
+            } else {
+              this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
+              this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
+            }
+          }
           localStorage.setItem(
             'selectPrint_selectPrintList',
             JSON.stringify(this.selectPrintList)
@@ -1208,6 +1219,9 @@
             'selectPrint_selectCustomerList',
             JSON.stringify(this.selectCustomerList)
           )
+       
+
+
         } else if (this.printType == 0) {
           localStorage.setItem('cwprint', true)
           _list1 = JSON.stringify(this.printData)
@@ -1227,11 +1241,12 @@
         )
       },
       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))
+        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))
             }
           }
         }
@@ -1261,7 +1276,7 @@
             managementType: 1,
             invoicing: this.invoicing,
             compId: localStorage.getItem('ws-pf_compId'),
-            goodsName:this.goodsName == '全部'?'':this.goodsName
+            goodsName: this.goodsName == '全部' ? '' : this.goodsName
           })
           .toPromise()
           .then((response) => {
@@ -1419,12 +1434,12 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择要驳回的条目')
         } else {
-			for(let i =0;i<this.modification.length;i++){
-			  if(!this.modification[i].taskId){
-				  this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
-				 return
-			  }
-			}
+          for (let i = 0; i < this.modification.length; i++) {
+            if (!this.modification[i].taskId) {
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
+              return
+            }
+          }
           this.$confirm('是否确定驳回？', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
@@ -1518,12 +1533,12 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择要通过的条目')
         } else {
-			for(let i =0;i<this.modification.length;i++){
-			  if(!this.modification[i].taskId){
-			     this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
-			     return
-			  }
-			}
+          for (let i = 0; i < this.modification.length; i++) {
+            if (!this.modification[i].taskId) {
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
+              return
+            }
+          }
           this.$confirm('是否确定通过？', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',