sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

lijuncheng0816
zhang_li 3 months ago
parent
6e1ba14992
commit
b21fbc2f76
2 changed files with 53 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/manifest.json
  2. 99
      src/pages/pointPutawayJob/index.vue

6
src/manifest.json
View File

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

99
src/pages/pointPutawayJob/index.vue
View File

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

Write Preview
Loading…
Cancel
Save