diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 753b4b5..f42f220 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.80'; //正式版本号
+ version = '0.0.81'; //正式版本号
//version = '0.0.4'; //测试版本号
//***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本****************
//isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index acd8da6..52f0a30 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -284,6 +284,9 @@
+
+
+
@@ -378,6 +381,7 @@ export default class PurchaseWHSRM extends BasePage {
moren15 = '请选择异常范围';
moren16 = '请选择是否需要主管审核';
moren17 = '请选择质量主管';
+ moren18 = '请选择所属车间';
list: any = [];
locList6: any = [];
show = false;
@@ -437,6 +441,7 @@ export default class PurchaseWHSRM extends BasePage {
selectischeckType: any = {};
selectpgzgList: any = {};
selectZLType: any = {};
+ selectSSCJType: any = {};
sqrlist: any = {};
// remove: any = {};
// async onReady() {
@@ -463,6 +468,7 @@ export default class PurchaseWHSRM extends BasePage {
ZCFList: any = [];
QCZGList: any = [];
CQList: any = [];
+ SSCJlist: any = [];
clickitem: any = '';
formdata: any = {
sampleQuality: null,
@@ -628,6 +634,8 @@ export default class PurchaseWHSRM extends BasePage {
this.pgzgList = model.locList8;
await this.model.getsupplierlistFromListPDA();
this.supplierlist = model.isclistsupplierlist;
+ await this.model.getSSCJlistFromListPDA();
+ this.SSCJlist = model.SSCJlist;
} else {
this.getmaterialFromListPDA();
this.getmaterialTypePDA();
@@ -848,6 +856,10 @@ export default class PurchaseWHSRM extends BasePage {
this.selectabnormalType = e.pickerName;
this.formdata.oaFactoryF = this.selectabnormalType.value;
}
+ async selectSSCJCode(e: any) {
+ this.selectSSCJType = e.pickerName;
+ this.formdata.sccj = this.selectSSCJType.value;
+ }
async selectischeck(e: any) {
this.selectischeckType = e.pickerName;
this.formdata.sfxvzq = this.selectischeckType.value;
@@ -1073,6 +1085,13 @@ export default class PurchaseWHSRM extends BasePage {
});
return;
}
+ if (this.formdata.sccj === null || this.formdata.sccj === '') {
+ (this.$refs.uToast as any).show({
+ title: '请选择所属车间',
+ type: 'default',
+ });
+ return;
+ }
}
}
@@ -1181,6 +1200,7 @@ export default class PurchaseWHSRM extends BasePage {
//质量主管
pgzr: this.formdata.pgzr,
sqr: this.sqrlist.userId,
+ sccj: this.formdata.sccj,
};
} else if (this.selectList.value == 'checkTypeLL') {
//来料
diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts
index 6431fb1..32d673b 100644
--- a/src/pages/quality/Materialinspection/model.ts
+++ b/src/pages/quality/Materialinspection/model.ts
@@ -363,6 +363,23 @@ export class Materialinspection extends VuexModule {
}));
return { isclistsupplierlist };
}
+ SSCJlist: any = [];
+ @MutationAction
+ async getSSCJlistFromListPDA() {
+ const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+ //loginName: session.loginName,
+ params: {
+ dictType: 'oa_sccj',
+ },
+ });
+ //console.log(result);
+ const listSSCJ: [] = result;
+ const SSCJlist = listSSCJ.map((item: any) => ({
+ label: item.ymdTypeName,
+ value: item.ymdType,
+ }));
+ return { SSCJlist };
+ }
}
export default getModule(Materialinspection);