diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 4d5dad1..9ff176a 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -552,5 +552,8 @@ export default {
Notcompleted: '物料没有收货完成',
ScrapLocation: '报废位置',
Pleaseoption: '请输入供应商(选填)',
+ Reasoncode: '原因编码',
+ Reasonname: '原因名称',
+ responsiblepersonname: '责任人名称',
},
};
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 28eb08d..11203d5 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -551,5 +551,8 @@ export default {
Notcompleted: 'material has not been received',
ScrapLocation: 'Scrap location',
Pleaseoption: 'Please enter the supplier (optional)',
+ Reasoncode: 'Reason code',
+ Reasonname: 'Reason name',
+ responsiblepersonname: 'Name of responsible person',
},
};
diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts
index 4433beb..8cb40e7 100644
--- a/src/i18n/lang/ru.ts
+++ b/src/i18n/lang/ru.ts
@@ -551,5 +551,8 @@ export default {
Notcompleted: 'Материалы пока не получены',
ScrapLocation: 'участок списания',
Pleaseoption: 'Пожалуйста, введите поставщика (заполните)',
+ Reasoncode: 'Код причины',
+ Reasonname: 'Причина называется',
+ responsiblepersonname: 'Имя ответственного лица',
},
};
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index fd5320c..e33af78 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -171,7 +171,7 @@ export default class LoginPage extends BasePage {
console.log('......', server.serverAddress);
if (server.serverAddress.includes('https://eurmom.haier.net')) {
//修改俄罗斯版本号
- this.Version = '1.1.29';
+ this.Version = '1.1.30';
} else {
this.Version = '1.0.49';
}
diff --git a/src/pages/raw/LineSide/rawWasteJudgment/index.vue b/src/pages/raw/LineSide/rawWasteJudgment/index.vue
index 890e1af..f732e2b 100644
--- a/src/pages/raw/LineSide/rawWasteJudgment/index.vue
+++ b/src/pages/raw/LineSide/rawWasteJudgment/index.vue
@@ -26,13 +26,23 @@
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -114,6 +124,8 @@ export default class productCheckReceipt extends BasePage {
};
value = '';
show = false;
+ reasonList: any = {};
+ ProcessList: any = {};
//选择原库位回调函数
bookTypeChangeold(e: any) {
console.log('???', e);
@@ -143,6 +155,36 @@ export default class productCheckReceipt extends BasePage {
// }
// });
// }
+ async queryreason() {
+ if (this.histroyItem.reason == '' || this.histroyItem.reason.length == 0) {
+ this.customToast(this.$t('message.Pleasedefects') as string);
+ return;
+ }
+ await this.model.checkDicCode(this.histroyItem.reason);
+ if (this.model.code == '1') {
+ uni.showToast({
+ title: this.$t('message.successful') as string,
+ duration: 2000,
+ image: '/static/icons/icon-51.png',
+ });
+ this.reasonList = this.model.resdata;
+ }
+ }
+ async querypersonliable() {
+ if (this.histroyItem.responsibleUser == '' || this.histroyItem.responsibleUser.length == 0) {
+ this.customToast(this.$t('message.PleaseResponsibleArea') as string);
+ return;
+ }
+ await this.model.checkDicCode(this.histroyItem.responsibleUser);
+ if (this.model.code == '1') {
+ uni.showToast({
+ title: this.$t('message.successful') as string,
+ duration: 2000,
+ image: '/static/icons/icon-51.png',
+ });
+ this.ProcessList = this.model.resdata;
+ }
+ }
//扫描条码回车
async query() {
if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
diff --git a/src/pages/raw/LineSide/rawWasteJudgment/model.ts b/src/pages/raw/LineSide/rawWasteJudgment/model.ts
index cb026ba..0ceb11b 100644
--- a/src/pages/raw/LineSide/rawWasteJudgment/model.ts
+++ b/src/pages/raw/LineSide/rawWasteJudgment/model.ts
@@ -35,6 +35,7 @@ export class rawWasteJudgment extends VuexModule {
removeMaterialList: any = [];
dnNo = '';
orderInInfo: OrderInInfo = new OrderInInfo();
+ resdata: any = {};
@MutationAction
async queryLocation() {
const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationRawAndLine, {
@@ -141,6 +142,15 @@ export class rawWasteJudgment extends VuexModule {
});
return kw;
}
+ ////
+ //扫描缺陷，责任区域
+ @MutationAction
+ async checkDicCode(params: any) {
+ const res: any = await http.post(url.warehouse.wholeTransfer.checkDicCode, { dicCode: params, factoryCode: session.factoryCode as string, loginName: session.loginName as string });
+ const resdata = res.data;
+ const code = res.code;
+ return { code, resdata };
+ }
}
export default getModule(rawWasteJudgment);
diff --git a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
index a493c05..d5fed6c 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
@@ -21,7 +21,7 @@
-
+
@@ -88,6 +88,7 @@ export default class rawMaterialInventory extends BasePage {
wl: any = {};
barcode: any = '';
scanreturndata: any = {};
+ isfocus = false;
// 页面初始化
onReady() {
this.empty();
@@ -122,6 +123,10 @@ export default class rawMaterialInventory extends BasePage {
// this.productItem = this.model.InventoryList[0];
// this.wl = this.model.InventoryItemList[0];
}
+ this.isfocus = false;
+ setTimeout(() => {
+ this.isfocus = true;
+ }, 0);
}
//选择其中一条物料
// onchange(e: any) {