diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 0b1d510..8e8a056 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///********版本号修改区域**********
- version = '0.0.110'; //正式版本号
+ version = '0.0.111'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/Raw/ArrivalRegistration/index.vue b/src/pages/wms/Raw/ArrivalRegistration/index.vue
index 4d7af09..c18b79e 100644
--- a/src/pages/wms/Raw/ArrivalRegistration/index.vue
+++ b/src/pages/wms/Raw/ArrivalRegistration/index.vue
@@ -18,19 +18,15 @@
提单
-
-
-
+
+
-
-
-
+
+
+
+
-
@@ -40,26 +36,14 @@
{{ item.orderStatus == 0 ? '未收货' : item.orderStatus == 1 ? '正在收货' : '收货完成' }}
-
- 送货单号:
- {{ item.userDefined5 }}
-
-
- 行项目:
- {{ item.userDefined3 }}
+
+ 采购单:
+ {{ item.procureCode }}
物料编码:
{{ item.handlematerialCode }}
-
- 物料描述:
- {{ item.materialDesc }}
-
-
- 工厂号:
- {{ item.siteCode }}
-
应收/已收:
{{ item.planNumber }}/{{ item.realityNumber }}
@@ -71,48 +55,6 @@
-
-
@@ -125,52 +67,6 @@
-
@@ -237,10 +133,11 @@ export default class ArrivalRegistration extends BasePage {
waCodeTypeList: any = {};
moren = '选择仓库';
moren1 = '选择库区';
-
+ reducelist: any = [];
bimWl: any = {};
selectway = true;
showshow = true;
+ proobj: any = {};
// remove: any = {};
// async onReady() {
// await this.model.queryLocation();
@@ -299,6 +196,14 @@ export default class ArrivalRegistration extends BasePage {
// url: this.page.wms.ReceivePODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)),
// });
// }
+ uniqueArray(arr) {
+ return arr.reduce((accumulator, current) => {
+ if (!accumulator.some((item) => item.materialCode === current.materialCode)) {
+ accumulator.push(current);
+ }
+ return accumulator;
+ }, []);
+ }
//查询货单关联采购单信息
async query() {
console.log(session);
@@ -319,24 +224,36 @@ export default class ArrivalRegistration extends BasePage {
};
await this.model.PurchaseOrderPda(query);
let prodlist = model.orderNoItemList;
- this.prodlist = prodlist.map((item) => {
- let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
- return {
- ...item,
- handlematerialCode: newmaterialCode,
- };
+ this.reducelist = this.uniqueArray(prodlist);
+ this.reducelist.forEach((item) => {
+ item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/));
+ item.label = item.materialDesc;
});
- //this.list = [];
- if (this.prodlist.length) {
- this.prodobj = this.prodlist[0];
- //this.list.push(this.materilist[0]);
- this.procureCode = this.prodobj.procureCode;
- } else {
- this.prodobj = {} as OptionType;
- }
+ console.log('this.reducelist', this.reducelist);
+ this.bimWl = this.reducelist[0];
this.querybyprod();
- //this.ProcureOrderAlready();
- //this.list = model.orderNoItemList;
+ // this.oldprodlist = prodlist.map((item) => {
+ // let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
+ // return {
+ // ...item,
+ // handlematerialCode: newmaterialCode,
+ // realityaddNumber: item.realityNumber,
+ // };
+ // });
+ // this.list = this.oldprodlist.filter((item) => {
+ // return item.handlematerialCode == this.bimWl.value;
+ // });
+ }
+ selectProductCodeType(e) {
+ console.log(e);
+ this.bimWl = e.pickerName;
+ this.querybyprod();
+ }
+ selectprodCodeType(e) {
+ this.proobj = e.pickerName;
+ this.list = this.materilist.filter((item) => {
+ return item.procureCode == this.proobj.value;
+ });
}
async querybyprod() {
@@ -350,9 +267,9 @@ export default class ArrivalRegistration extends BasePage {
// }
this.aimWl = {} as OptionType;
let query = {
- materialCode: this.aimWl.value ? this.aimWl.value : '',
+ materialCode: this.bimWl.materialCode,
userDefined5: this.userDefined5,
- procureCode: this.prodobj.procureCode,
+ //procureCode: this.prodobj.procureCode,
//this.materialCode,
factoryCode: session.FactoryCode,
@@ -364,56 +281,15 @@ export default class ArrivalRegistration extends BasePage {
return {
...item,
handlematerialCode: newmaterialCode,
+ label: item.procureCode,
+ value: item.procureCode,
};
});
this.list = [];
- if (this.prodlist.length) {
- this.aimWl = this.materilist[0];
- this.list.push(this.materilist[0]);
- this.procureCode = this.list[0].procureCode;
- } else {
- this.prodobj = {} as OptionType;
- }
- //this.ProcureOrderAlready();
- //this.list = model.orderNoItemList;
+ this.prodobj = this.materilist[0];
+ this.list.push(this.materilist[0]);
}
- // async querydelivery() {
- // console.log(session);
- // if (this.userDefined5 == '' || this.userDefined5.length == 0) {
- // (this.$refs.uToast as any).show({
- // title: '请输入送货单号',
- // type: 'default',
- // });
- // return;
- // }
- // this.aimWl = {} as OptionType;
- // let query = {
- // userDefined5: this.userDefined5,
- // procureCode: this.procureCode,
- // materialCode: this.aimWl.value ? this.aimWl.value : '',
- // //this.materialCode,
- // factoryCode: session.FactoryCode,
- // };
- // await this.model.PurchaseOrderPda(query);
- // let materilist = model.orderNoItemList;
- // this.materilist = materilist.map((item) => {
- // let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
- // return {
- // ...item,
- // handlematerialCode: newmaterialCode,
- // };
- // });
- // this.list = [];
- // if (this.materilist.length) {
- // this.aimWl = this.materilist[0];
- // this.list.push(this.materilist[0]);
- // } else {
- // this.aimWl = {} as OptionType;
- // }
- // this.ProcureOrderAlready();
- // //this.list = model.orderNoItemList;
- // }
//送货单提单
async tidandelivery() {
if (this.userDefined5 == '' || this.userDefined5.length == 0) {
@@ -483,15 +359,7 @@ export default class ArrivalRegistration extends BasePage {
this.procureCode = this.prodobj.procureCode;
this.querybyprod();
}
- bookTypeChange(e: any) {
- this.aimWl = e.pickerName;
- this.list = [];
- this.list.push(e.pickerName);
- this.procureCode = this.list[0].procureCode;
- //
- //this.queryinformation();
- //this.getlist();
- }
+
bookTypeChangeway(e) {
//this.showshow = true;
this.bimWl.value = e.pickerName.value;
@@ -513,6 +381,7 @@ export default class ArrivalRegistration extends BasePage {
this.singshow = true;
this.operationNumber = model.singobj.operationNumber;
this.nooperationNumber = model.singobj.planNumber - model.singobj.operationNumber;
+ this.czNumber = this.list[0].planNumber;
}
}
//到货登记确定提交
diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue
index 6606fd1..2b141ac 100644
--- a/src/pages/wms/Raw/ReceiveSRM/index.vue
+++ b/src/pages/wms/Raw/ReceiveSRM/index.vue
@@ -189,6 +189,7 @@ export default class receiveSRM extends BasePage {
moren1 = '选择库区';
reducelist: any = [];
oldprodlist: any = [];
+ zancunmatcode: any = {};
waylist = [
// {
// value: '0',
@@ -280,11 +281,11 @@ export default class receiveSRM extends BasePage {
let prodlist = model.orderNoItemList;
this.reducelist = this.uniqueArray(prodlist);
this.reducelist.forEach((item) => {
- item.value = item.materialCode;
+ item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/));
item.label = item.materialDesc;
});
console.log('this.reducelist', this.reducelist);
- this.bimWl = this.reducelist[0];
+ this.bimWl = Object.keys(this.zancunmatcode).length ? this.zancunmatcode : this.reducelist[0];
this.oldprodlist = prodlist.map((item) => {
let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
return {
@@ -294,7 +295,7 @@ export default class receiveSRM extends BasePage {
};
});
this.list = this.oldprodlist.filter((item) => {
- return item.materialCode == this.bimWl.value;
+ return item.handlematerialCode == this.bimWl.value;
});
this.receivedlist = [];
}
@@ -303,7 +304,7 @@ export default class receiveSRM extends BasePage {
this.bimWl = e.pickerName;
this.receivedlist = [];
this.list = this.oldprodlist.filter((item) => {
- return item.materialCode == this.bimWl.value;
+ return item.handlematerialCode == this.bimWl.value;
});
}
//送货单提单
@@ -433,7 +434,8 @@ export default class receiveSRM extends BasePage {
duration: 6000,
});
this.receiptNoCode = '';
- this.receivedlist = [];
+ this.zancunmatcode = this.bimWl;
+ //this.receivedlist = [];
this.list = [];
this.Idcard = '';
this.areaCode = '';