更新 sdy

public/static/inspection.html

@@ -49,11 +49,11 @@
       .bottom-row2 {
         display: flex;
         margin: 10px 0;
-      }
-
+       
+      } 
       img {
-        width: 41px;
-        height: 41px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
 
@@ -194,7 +194,7 @@
           </div>
           <div class="bottom-row2">
             <div class="left">
-              <img src="../img/add.png" alt="">
+              <img :src="tableData.codeUrl " alt="">
             </div>
             <div class="config">收货单位签名或盖章</div>
             <div class="">客户签名</div>

public/static/weightCheck.html

@@ -51,8 +51,8 @@
       }
 
       img {
-        width: 41px;
-        height: 41px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
 
@@ -98,7 +98,7 @@
         margin: auto;
         height: 450px;
       }
-
+      
       .small-title {
         text-align: center;
         font-size: 18px;
@@ -205,13 +205,13 @@
                 <!-- <div>{{tableData.qualityDate}}</div> -->
               </div>
               <div class="bottom-row2">
-                <!-- <div class="left">
-                <img src="../img/add.png" alt="">
-              </div> -->
+                <div class="left">
+                <img :src="item.codeUrl" alt="">
+              </div>
                 <div class="config">收货单位签名或盖章：</div>
                 <div class="autograph">客户签名：</div>
               </div>
-              <!-- <div class="bottom-row3">扫一扫</div> -->
+              <div class="bottom-row3">扫一扫</div>
             </div>
           </div>
         </div>
@@ -293,9 +293,9 @@
               <!-- <div>{{tableData.qualityDate}}</div> -->
             </div>
             <div class="bottom-row2">
-              <!-- <div class="left">
-                <img src="../img/add.png" alt="">
-              </div> -->
+              <div class="left">
+                <img :src="tableData.codeUrl" alt="">
+              </div>
               <div class="config">收货单位签名或盖章：</div>
               <div class="autograph">客户签名：</div>
             </div>

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -79,12 +79,12 @@
       </div>
       <div class="bottom-row2">
         <div class="left">
-          <img :src="printData.qrCodeUrl" alt="" />
+          <img :src="printData.codeUrl" alt="" />
         </div>
         <div class="config">收货单位签名或盖章：</div>
         <div class="">客户签名：</div>
       </div>
-      <!-- <div class="bottom-row3">扫一扫</div> -->
+      <div class="bottom-row3">扫一扫</div>
     </div>
   </div>
 </template>
@@ -147,8 +147,8 @@
 
     .left {
       img {
-        width: 80px;
-        height: 80px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
     }

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -69,13 +69,13 @@
             <!-- <div>{{tableData.qualityDate}}</div> -->
           </div>
           <div class="bottom-row2">
-            <!-- <div class="left">
-              <img src="../../../../public/img/add.png" alt="" />
-            </div> -->
+            <div class="left">
+              <img :src="tableData.codeUrl" alt="" />
+            </div>
             <div class="config">收货单位签名或盖章：</div>
             <div class="autograph">客户签名：</div>
           </div>
-          <!-- <div class="bottom-row3">扫一扫</div> -->
+          <div class="bottom-row3">扫一扫</div>
            <!-- <div class="bottom-row4">
          <el-button type="primary">关闭</el-button>
         <el-button type="primary" @click="printSmall">打印小票</el-button>
@@ -152,8 +152,8 @@ export default{
 
     .left {
       img {
-        width: 41px;
-        height: 41px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
     }

src/views/houseSelfCollect/inspectInfo.vue

@@ -181,7 +181,8 @@
     getCount,
     getDryGrainPrice,
     getshippinginfo,
-    postCheck
+    postCheck,
+    getQRcode
   } from '@/model/houseSelfCollect/index'
   import {
     packList
@@ -417,6 +418,13 @@
                     })
                     .toPromise()
                     .then((response) => {
+                    //  let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+                    //       getQRcode({printString}).toPromise()
+                    //             .then((res) => {
+                            this.isShowPrint = true
+                            this.printData = response
+                            // this.printData.qrCodeUrl = res
+                            // })
                       this.inspect = response
                       if (response.compName == '黑龙江秋收有限公司') {
                				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'

src/views/houseSelfCollect/inspectionManagement.vue

@@ -216,7 +216,6 @@
 				})
 			},
 			warehouseNameChange(e) {
-				console.log(this.warehouseList)
 				for (let i = 0; i < this.warehouseList.length; i++) {
 					if (this.warehouseList[i].value == e) {
 						this.warehouseName = this.warehouseList[i].value
@@ -332,7 +331,6 @@
 					})
 					.toPromise()
 					.then((response) => {
-						console.log(response)
 						this.inspect = response.records
 						
 						this.deptBudgetTotal = response.total
@@ -340,24 +338,20 @@
 					})
 			},
 			print(row) {
-				console.log(row)
-
 				getinspectLook({
 						id: row.id,
 					})
 					.toPromise()
 					.then((response) => {
-						let printString = row.id+","+1
-							getQRcode({printString}).toPromise()
-					          .then((res) => {
-								this.isShowPrint = true
-								this.printData = response
-								this.printData.qrCodeUrl = res
-							  })
+						// let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+						// 	getQRcode({printString}).toPromise()
+					    //       .then((res) => {
 								this.isShowPrint = true
 								this.printData = response
+								// this.printData.qrCodeUrl = res
+							//   })
 						    if (response.compName == '黑龙江秋收有限公司') {
-               				 this.printData.compName = '黑龙江中天昊元贸易有限公司'
+               			    	 this.printData.compName = '黑龙江中天昊元贸易有限公司'
               					}
 						// window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
 					})

src/views/houseSelfCollect/paymentManagement.vue

@@ -871,10 +871,10 @@
               this.warehouseNameKey = this.$route.query.warehouseName
             } else {
               for (let index = 0; index < this.warehouseList.length; index++) {
-
                 if (_wareHouse && _wareHouse.value == this.warehouseList[index].warehouseName) {
                   this.warehouseName = this.warehouseList[index].warehouseName
                   this.warehouseNameKey = this.warehouseList[index].warehouseName
+                  this.getList()
                   return
                 } else {
                   this.warehouseNameKey = this.warehouseList[0].id
@@ -885,11 +885,9 @@
                     this.warehouseName = this.warehouseList[0].warehouseName
                   }
                 }
-
               }
-
             }
-            this.getList()
+              this.getList()
           })
       },
       //上传付款截图

src/views/houseSelfCollect/weighingManagement.vue

@@ -388,11 +388,16 @@
             })
             .toPromise()
             .then((response) => {
-              this.dialogData = 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 = '黑龙江中天昊元贸易有限公司'
               }
-              this.isShowPrint = true
             })
             .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/houseSelfCollect/weightCheck.vue

@@ -832,13 +832,17 @@
                     })
                     .toPromise()
                     .then((response) => {
-                      this.inspect = response
-                      if (response.compName == '黑龙江秋收有限公司') {
-               				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'
-              					}
-                      this.inspect.a = '中天'
-                      // this.tableData = response
-                      this.isShowPrint = true
+                      // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+                      //   getQRcode({printString}).toPromise().then((res) => {
+                          this.isShowPrint = true
+                          this.inspect = response
+                          // this.inspect.qrCodeUrl = res
+                           if (response.compName == '黑龙江秋收有限公司') {
+                          this.inspect.compName = '黑龙江中天昊元贸易有限公司'
+                            }
+                          this.inspect.a = '中天'
+                          // })
+                     
                     })
                     .catch((response) => {
                       // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -296,7 +296,7 @@
           size="small"
         ></el-input>
       </el-form-item> -->
-	   <el-form-item label="合计应还（元）" span="1" prop="taskNo">
+	   <el-form-item label="合计应还（元）" span="1" prop="amountDue">
         <el-input
           v-model="deptBudgetList.amountDue"
           placeholder="自动计算，不可编辑"

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -408,7 +408,7 @@ export default {
         })
         .catch((req) => {
           // this.tableData = response.records
-          this.$message.success('提交失败')
+          this.$message.error('提交失败')
         })
         }
     },

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -57,14 +57,14 @@
           <template slot-scope="scope">
             <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
               查看</el-button>
-            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
+            <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待决策人审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
               审核</el-button>
-            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
+            <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待银行审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
               审批</el-button>
             <el-button v-hasPermission=" `tradeServicesManagement.tradeService.return`" size="mini" @click="repaymentBtnClick(scope.row, 2)" v-if="scope.row.status == '待还款'">
               还款</el-button>
-            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.edit`" size="mini" @click="rowEditBtnClick(scope.row)">修改</el-button>
-            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.delete`" size="mini" type="danger" @click="rowDeleteBtnClick(scope.row)">删除</el-button>
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.edit`" size="mini" @click="rowEditBtnClick(scope.row)" v-if="scope.row.status=='已驳回'">修改</el-button>
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.delete`" size="mini" type="danger" @click="rowDeleteBtnClick(scope.row)" v-if="scope.row.status=='已驳回'">删除</el-button>
           </template>
         </el-table-column>
       </el-table>