diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 17fa7dc..d6af327 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.145'; //正式版本号 + version = '0.0.146'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index fa8c875..77cd772 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -1283,9 +1283,9 @@ export default class PurchaseWHSRM extends BasePage { }); this.detaillistceshi.forEach((item) => { if (item.status == 'N') { - if (item.remark == null || item.remark == '') { - this.isremark = true; - } + // if (item.remark == null || item.remark == '') { + this.isremark = true; + // } } }); // this.detaillistceshi.forEach((item) => { @@ -1318,12 +1318,21 @@ export default class PurchaseWHSRM extends BasePage { } } if (this.selectList.value != 'checkTypeLL') { - if (this.isremark) { - (this.$refs.uToast as any).show({ - title: '不合格描述不能为空', - type: 'default', - }); - return; + // if (this.isremark) { + // (this.$refs.uToast as any).show({ + // title: '不合格描述不能为空', + // type: 'default', + // }); + // return; + // } + if (this.formdata.checkResult == 'N') { + if (this.formdata.remark === null || this.formdata.remark === '') { + (this.$refs.uToast as any).show({ + title: '不合格描述不能为空', + type: 'default', + }); + return; + } } } // if (this.isvalue2) { @@ -1693,7 +1702,7 @@ export default class PurchaseWHSRM extends BasePage { // sqr: this.model.sqrlist[0].userId, }; } - //console.log('9999ggggg',query); + // console.log('9999ggggg', this.detaillistceshi); await this.model.commitCheckTaskList(query); if (this.model.SubmitCode.code == '200') { (this.$refs.uToast as any).show({