订单号 : {{ clickitem.orderNo }}
@@ -197,6 +202,7 @@ import { session } from '@/store/modules/session';
export default class PurchaseWHSRM extends BasePage {
model = model;
moren = '请选择检验节点';
+ moren2 = '请选择批次号';
list: any = [];
show = false;
showselect = false;
@@ -300,6 +306,7 @@ export default class PurchaseWHSRM extends BasePage {
isshow1 = false;
isshow2 = false;
isshow3 = false;
+ incomeBatchNo: any = {};
//收货按钮
tagClick(index) {
this.tagslist.splice(index, 1);
@@ -343,8 +350,23 @@ export default class PurchaseWHSRM extends BasePage {
this.nodelist = this.model.orderNoItemList;
}
async onPass(item) {
- console.log('1234567', item);
+ console.log('1234567', item, this.selectList);
this.clickitem = item;
+ let query1 = {
+ factoryCode: session.PoolName,
+ workorderCode: this.clickitem.orderNo,
+ };
+ await this.model.getBatchList(query1);
+ let labelname = this.selectList.label;
+ if (labelname == '过程检验') {
+ this.isshow3 = true;
+ if (item.incomeBatchNo) {
+ this.incomeBatchNo.value = item.incomeBatchNo;
+ }
+ } else {
+ this.isshow3 = false;
+ }
+
let belongTo = item.recordId;
let query = {
factoryCode: session.PoolName,
@@ -383,6 +405,9 @@ export default class PurchaseWHSRM extends BasePage {
// };
// await this.model.getpalletLocation(params); //参数：成型区2，烘房3
}
+ async selectProductlocCode1(e: any) {
+ this.incomeBatchNo = e.pickerName;
+ }
focus(item, value, index) {
console.log(item, value, index);
if (this.detaillistceshi[index].actualValue) {
@@ -470,7 +495,19 @@ export default class PurchaseWHSRM extends BasePage {
});
return;
}
-
+ let incomeBatchNo = '';
+ if (this.isshow3) {
+ if (this.incomeBatchNo.value == '' || this.incomeBatchNo.value == undefined) {
+ (this.$refs.uToast as any).show({
+ title: '批次号不能为空',
+ type: 'default',
+ });
+ return;
+ }
+ incomeBatchNo = this.incomeBatchNo.value;
+ } else {
+ incomeBatchNo = this.clickitem.incomeBatchNo;
+ }
let query = {
sampleQuality: this.formdata.sampleQuality,
updateBy: session.userName,
@@ -480,22 +517,23 @@ export default class PurchaseWHSRM extends BasePage {
orderCode: this.clickitem.orderNo,
qcCheckTaskDetails: this.detaillistceshi,
defects: this.detaillistdefects,
+ incomeBatchNo: incomeBatchNo,
};
console.log(query);
- await this.model.commitCheckTaskList(query);
- if (this.model.SubmitCode.code == '200') {
- (this.$refs.uToast as any).show({
- title: '成功',
- type: 'default',
- });
- this.show = false;
- this.getlist();
- } else {
- (this.$refs.uToast as any).show({
- title: '失败',
- type: 'default',
- });
- }
+ // await this.model.commitCheckTaskList(query);
+ // if (this.model.SubmitCode.code == '200') {
+ // (this.$refs.uToast as any).show({
+ // title: '成功',
+ // type: 'default',
+ // });
+ // this.show = false;
+ // this.getlist();
+ // } else {
+ // (this.$refs.uToast as any).show({
+ // title: '失败',
+ // type: 'default',
+ // });
+ // }
//await this.model.OnSubmit(this.form3.barCodewl);
}
confirmselect(e) {
diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts
index a190f23..cb90030 100644
--- a/src/pages/quality/Materialinspection/model.ts
+++ b/src/pages/quality/Materialinspection/model.ts
@@ -55,6 +55,18 @@ export class Materialinspection extends VuexModule {
const SubmitCode: [] = result;
return { SubmitCode };
}
+ locList: any = [];
+ @MutationAction
+ async getBatchList(params: any) {
+ const result: any = await http.post(url.lanjuquality.Materialinspection.getBatchList, params);
+ console.log(result);
+ const DictListoild: [] = result;
+ const locList = DictListoild.map((item: any) => ({
+ label: item.batchCode,
+ value: item.batchCode,
+ }));
+ return { locList };
+ }
}
export default getModule(Materialinspection);
diff --git a/src/pages/quality/Records/index.vue b/src/pages/quality/Records/index.vue
index 3ba79d7..a5201ed 100644
--- a/src/pages/quality/Records/index.vue
+++ b/src/pages/quality/Records/index.vue
@@ -37,6 +37,10 @@
物料名称:
{{ item.materialName }}
+
+ 检验时间:
+ {{ item.checkTime }}
+
收货数量:
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index e8c29ed..18e4757 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
model = model;
src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
today = dayjs().format('YYYY-MM-DD dddd');
- version = '0.0.23';
+ version = '0.0.24';
checkversion: any = {};
sessiondata: any = '';
onLoad() {