pc 更新 sdy

public/static/inspection.html

@@ -193,17 +193,18 @@
             <div>{{tableData.qualityDate}}</div>
           </div>
           <div class="bottom-row2">
-            <!-- <div class="left">
+            <div class="left">
               <img src="../img/add.png" alt="">
-            </div> -->
+            </div>
             <div class="config">收货单位签名或盖章</div>
             <div class="">客户签名</div>
           </div>
-          <!-- <div class="bottom-row3">扫一扫</div> -->
+          <div class="bottom-row3">扫一扫</div>
         </div>
       </div>
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
+          <div class="numberNo">{{tableData.qualityNo.substring(tableData.qualityNo.length - 3)}}</div>
           <div>粮食质检单</div>
         </div>
         <div class="small-row">
@@ -300,7 +301,7 @@
         <div class="small-row">
           <div>收货单位签名或盖章:</div>
           <div class="sign">客户签名:</div>
-        </div>
+        </div>  
       </div>
     </div>
   </body>
@@ -313,7 +314,8 @@
         tableData: "",
         name: "",
         bigContent: false,
-        smallContent: false
+        smallContent: false,
+        printData :{},
       },
       computed: {},
       methods: {

public/static/weightCheck.html

@@ -102,11 +102,14 @@
       .small-title {
         text-align: center;
         font-size: 18px;
-        display: flex;
+        /* display: flex; */
         justify-content: space-between;
         align-items: center;
       }
-
+       .numberNo{
+          font-size: 26px;
+          margin: auto;
+        }
       .small-row {
         display: flex;
         justify-content: space-between;
@@ -303,7 +306,8 @@
 
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
-          <div>粮食检斤单</div>
+          <div  class="numberNo">{{tableData.number.substring(tableData.number.length - 3)}}</div>
+          <div style="margin: auto;">粮食检斤单</div>
         </div>
         <div class="small-row">
           <div>编号</div>

src/api/V2/houseSelfCollect/index.js

@@ -89,4 +89,5 @@ export const API_POST_EXPORT = '/paymentManagement/export'
 export const API_GET_SHIPPINGINFOFORMATION = '/shippingInformation/selectShippingInformation'
 //确认质检信息
 export const API_POST_INSPECTIONCHECK = '/qualityInspectionManagement/api/editQualityInspection'
-
+//单据二维码
+export const API_GAT_QRCODE = '/weighingManagement/generateQRCodeImage'

src/model/houseSelfCollect/index.js

@@ -46,7 +46,8 @@ import {
   API_POST_INVOICING,
   API_POST_EXPORT,
   API_GET_SHIPPINGINFOFORMATION,
-  API_POST_INSPECTIONCHECK
+  API_POST_INSPECTIONCHECK,
+  API_GAT_QRCODE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -139,4 +140,6 @@ export const export1 = appRx.post(API_POST_EXPORT)
 // 车牌号
 export const getshippinginfo  = appRx.get(API_GET_SHIPPINGINFOFORMATION, errorCatcher, errorHandle, filter)
 // 确认初检信息
-export const postCheck  = appRx.post(API_POST_INSPECTIONCHECK, errorCatcher, errorHandle, filter)
+export const postCheck  = appRx.post(API_POST_INSPECTIONCHECK, errorCatcher, errorHandle, filter)
+// 单据二维码
+export const getQRcode  = appRx.get(API_GAT_QRCODE, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -78,9 +78,9 @@
         <div>{{ printData.qualityDate }}</div>
       </div>
       <div class="bottom-row2">
-        <!-- <div class="left">
-          <img src="../../../../public/img/add.png" alt="" />
-        </div> -->
+        <div class="left">
+          <img :src="printData.qrCodeUrl" alt="" />
+        </div>
         <div class="config">收货单位签名或盖章：</div>
         <div class="">客户签名：</div>
       </div>
@@ -147,8 +147,8 @@
 
     .left {
       img {
-        width: 41px;
-        height: 41px;
+        width: 80px;
+        height: 80px;
         margin-right: 118px;
       }
     }

src/views/houseSelfCollect/inspectInfo.vue

@@ -298,15 +298,19 @@
               type: 'warning',
             })
             .then(() => {
-              postCheck({id:this.id,flag:2})
+              postCheck(this.inspect)
                 .toPromise()
                 .then((response) => {
-                  if(response == "OK"){
+                   postCheck({id:this.id,flag:2})
+                    .toPromise()
+                    .then((response) => {
+                      if(response == "OK"){
                       this.$message.success('提交成功')
                         this.$router.push({path: 'inspectionManagement' })
-                  }else{
-                    this.$message.error('提交失败')
-                  }
+                        }else{
+                          this.$message.error('提交失败')
+                        }
+                    })
                 }).catch(() => {
               return false
             })

src/views/houseSelfCollect/inspectionManagement.vue

@@ -135,6 +135,7 @@
 		getinspectList,
 		getinspectDelete,
 		getinspectLook,
+		getQRcode
 	} from '@/model/houseSelfCollect/index'
 	import inspectInfoPrint from './component/inspectInfoPrint.vue'
 	export default {
@@ -215,6 +216,7 @@
 				})
 			},
 			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
@@ -337,14 +339,23 @@
 					})
 			},
 			print(row) {
+				console.log(row)
 
 				getinspectLook({
 						id: row.id,
 					})
 					.toPromise()
 					.then((response) => {
-						this.isShowPrint = true
-						this.printData = response
+						let printString = row.id+","+1
+							// id :row.id,
+							// scanning:1
+						
+							getQRcode({printString}).toPromise()
+					          .then((res) => {
+								this.isShowPrint = true
+								this.printData = response
+								this.printData.qrCodeUrl = res
+							  })
 						// window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
 					})
 			},