Browse Source

检验单回退到没有提示的版本

lijuncheng0816
zhang_li 4 months ago
parent
commit
b21fbc2f76
  1. 6
      src/manifest.json
  2. 99
      src/pages/pointPutawayJob/index.vue

6
src/manifest.json

@ -1,10 +1,10 @@
{
"name" : "wms",
"package" : "uni.UNI43932FE",
"appid" : "__UNI__C9CF4BF",
"appid" : "__UNI__F36DDCF",
"description" : "",
"versionName" : "1.0.60",
"versionCode" : 60,
"versionName" : "1.0.62",
"versionCode" : 62,
"transformPx" : false,
/* 5+App */
"app-plus" : {

99
src/pages/pointPutawayJob/index.vue

@ -41,9 +41,9 @@
<td>抽检数量</td>
<td>{{item.sampleQty}}</td>
</tr>
<tr v-if="!item.haveInspectionRequest">
<!-- <tr v-if="!item.haveInspectionRequest">
<td colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
</tr>
</tr> -->
</tbody>
</table>
</view>
@ -207,7 +207,46 @@
this.readFile(htmlFileUrl1, (htmlContent) => {
this.newHtmlContent1 = htmlContent
this.data1.inspectDTOList.forEach(item => {
if(!item.haveInspectionRequest){
// if(!item.haveInspectionRequest){
// str += `
// <div class="box" style="page-break-before:always;"><br />
// <div class="relative" >
// <div class="q">Q</div>
// <table border='1'>
// <thead>
// <tr class='top1'>
// <th>:</th>
// <th colspan='3'>${item.itemCode}</th>
// </tr>
// </thead>
// <tbody>
// <tr>
// <td></td>
// <td>${item.itemName}</td>
// <td></td>
// <td>${this.data1.asnNumber}</td>
// </tr>
// <tr>
// <td></td>
// <td>${item.supplierCode}</td>
// <td></td>
// <td>${item.supplierBatch}</td>
// </tr>
// <tr>
// <td></td>
// <td>${item.quantityQty}</td>
// <td></td>
// <td>${item.sampleQty}</td>
// </tr>
// <tr>
// <td colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;"></td>
// </tr>
// </tbody>
// </table>
// </div>
// </div>
// `
// }else{
str += `
<div class="box" style="page-break-before:always;"><br />
<div class="relative" >
@ -238,51 +277,12 @@
<td>抽检数量</td>
<td>${item.sampleQty}</td>
</tr>
<tr>
<td colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
</tr>
</tbody>
</table>
</div>
</div>
`
}else{
str += `
<div class="box" style="page-break-before:always;"><br />
<div class="relative" >
<div class="q">Q</div>
<table border='1'>
<thead>
<tr class='top1'>
<th>物料代码:</th>
<th colspan='3'>${item.itemCode}</th>
</tr>
</thead>
<tbody>
<tr>
<td>物料名称</td>
<td>${item.itemName}</td>
<td>发货单号</td>
<td>${this.data1.asnNumber}</td>
</tr>
<tr>
<td>供应商</td>
<td>${item.supplierCode}</td>
<td>供应商批次</td>
<td>${item.supplierBatch}</td>
</tr>
<tr>
<td>到货数量</td>
<td>${item.quantityQty}</td>
<td>抽检数量</td>
<td>${item.sampleQty}</td>
</tr>
</tbody>
</table>
</div>
</div>
`
}
// }
})
this.newHtmlContent1 = this.newHtmlContent1.replace(
@ -372,13 +372,14 @@
this.tabIndex =2
}
this.getTableInspectDTOList()
}).catch(error=>{
this.$refs.comMessage.showMessage(error, res => {
if (res) {
}
});
})
// .catch(error=>{
// this.$refs.comMessage.showMessage(error, res => {
// if (res) {
// }
// });
// })
}
this.getPointPutawayJobHtml()

Loading…
Cancel
Save