Browse Source

修改问题

master
niexiting 9 months ago
parent
commit
fb19a55ca2
  1. 4
      src/mycomponents/recommend/recommend.vue
  2. 12
      src/pages/inspect/job/inspectDetail.vue
  3. 12
      src/pages/inspect/job/inspectFullDetail.vue
  4. 15
      src/pages/inspect/job/inspectResult.vue
  5. 4
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  6. 4
      src/pages/purchaseReceipt/job/receiptDetail.vue

4
src/mycomponents/recommend/recommend.vue

@ -3,8 +3,8 @@
<view class="uni-flex uni-row space-between" style="align-items: center"> <view class="uni-flex uni-row space-between" style="align-items: center">
<!-- uni-inline-item 暂时拿掉--> <!-- uni-inline-item 暂时拿掉-->
<view style="word-break: break-all;"> <view style="word-break: break-all;">
<container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber"> <!-- <container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber">
</container> </container> -->
<pack v-if="isShowPack && detail.packingNumber!=null" :packingCode="detail.packingNumber"></pack> <pack v-if="isShowPack && detail.packingNumber!=null" :packingCode="detail.packingNumber"></pack>
<batch v-if="isShowBatch && detail.batch!=null" :batch="detail.batch"></batch> <batch v-if="isShowBatch && detail.batch!=null" :batch="detail.batch"></batch>
<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode"> <location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">

12
src/pages/inspect/job/inspectDetail.vue

@ -374,12 +374,12 @@
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录<br>" + res.data) this.showCommitSuccessMessage("提交成功<br>生成到货检验记录<br>" + res.data)
createPutAwayRequest(res.data).then(putawayres => { // createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data) // this.showCommitSuccessMessage("<br>" + putawayres.data)
}).catch(error => { // }).catch(error => {
uni.hideLoading(); // uni.hideLoading();
this.showErrorMessage(error); // this.showErrorMessage(error);
}) // })
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

12
src/pages/inspect/job/inspectFullDetail.vue

@ -394,12 +394,12 @@
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data) this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
// //
createPutAwayRequest(res.data).then(putawayres => { // createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data) // this.showCommitSuccessMessage("<br>" + putawayres.data)
}).catch(error => { // }).catch(error => {
uni.hideLoading(); // uni.hideLoading();
this.showErrorMessage(error); // this.showErrorMessage(error);
}) // })
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

15
src/pages/inspect/job/inspectResult.vue

@ -546,12 +546,15 @@
hint = "提交成功<br>生成到货检验任务<br>" + res.data hint = "提交成功<br>生成到货检验任务<br>" + res.data
} else { } else {
hint = "提交成功<br>生成到货检验记录<br>" + res.data hint = "提交成功<br>生成到货检验记录<br>" + res.data
createPutAwayRequest(res.data).then(putawayres => { //
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data) // if (this.jobContent.nextAction == "ALL_OK") {
}).catch(error => { // createPutAwayRequest(res.data).then(putawayres => {
uni.hideLoading(); // this.showCommitSuccessMessage("<br>" + putawayres.data)
this.showErrorMessage(error); // }).catch(error => {
}) // uni.hideLoading();
// this.showErrorMessage(error);
// })
// }
} }
this.showCommitSuccessMessage(hint) this.showCommitSuccessMessage(hint)
} else { } else {

4
src/pages/productionReceipt/job/productionReceiptDetail.vue

@ -247,8 +247,8 @@
try { try {
var supplierCode = result.label.supplierCode; var supplierCode = result.label.supplierCode;
if (supplierCode == '' || supplierCode == undefined) { if (supplierCode == '' || supplierCode == undefined) {
this.showErrorMessage("标签中未解析到供应商信息,请重新扫描") // this.showErrorMessage(",")
return; // return;
} }
var packingNumber = result.balance.packingNumber; var packingNumber = result.balance.packingNumber;
var batch = result.balance.batch; var batch = result.balance.batch;

4
src/pages/purchaseReceipt/job/receiptDetail.vue

@ -188,8 +188,8 @@
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
// that.jobContent.toLocationTypeList = that.toLocationTypeList; // that.jobContent.toLocationTypeList = that.toLocationTypeList;
that.subList = res.data.subList; that.subList = res.data.subList;
that.subList[0].containerNumber = "CN-00000001"; // that.subList[0].containerNumber = "CN-00000001";
that.subList[1].containerNumber = "CN-00000001"; // that.subList[1].containerNumber = "CN-00000001";
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)

Loading…
Cancel
Save