diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index 702543e..cdb7873 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -342,18 +342,24 @@ - - + + - 产线组长签名 + 产线组长签名({{ formdata.cxzz && formdata.cxzz != '' ? 'Y' : 'N' }}) - 机管员签名 + 机管员签名 ({{ formdata.jgy && formdata.jgy != '' ? 'Y' : 'N' }}) - 品管员签名 + 品管员签名 ({{ formdata.pgy && formdata.pgy != '' ? 'Y' : 'N' }}) @@ -801,6 +807,9 @@ export default class PurchaseWHSRM extends BasePage { factoryCode: session.PoolName, workorderCode: this.clickitem.orderNo, }; + this.formdata.cxzz = null; + this.formdata.jgy = null; + this.formdata.pgy = null; //debugger; if (this.selectList.value == 'checkTypeSC' || this.selectList.value == 'checkTypeSCXJ' || this.selectList.value == 'checkTypeCP' || this.selectList.value == 'checkTypeCC') { await model.getdeptFromListPDA(); @@ -931,6 +940,10 @@ export default class PurchaseWHSRM extends BasePage { this.selectZLType.value = dataobj.pgzr; //质量主管 this.detaillistceshi = dataobj.qcCheckTaskDetails; this.detaillistdefects = dataobj.defects; + this.formdata.cxzz = dataobj.cxzz; + this.formdata.jgy = dataobj.jgy; + this.formdata.pgy = dataobj.pgy; + ///this.selectdisqualificationType.value = dataobj.remarkCode; //是否不合格 this.detaillistdefects.forEach((item) => { if (item.noOkQuality == null) { @@ -1910,6 +1923,7 @@ export default class PurchaseWHSRM extends BasePage { }); } closepopup() { + //this.show = false; //是否关闭弹窗 this.SaveDraft(); this.$nextTick(() => { @@ -1984,8 +1998,8 @@ export default class PurchaseWHSRM extends BasePage { // item.sampleQuality = this.sampleQuality; // } }); - - let params = { + let params; + params = { sampleQuality: this.formdata.sampleQuality, updateBy: session.userName, factoryCode: session.PoolName, @@ -2053,6 +2067,11 @@ export default class PurchaseWHSRM extends BasePage { //qc主管 qczg: this.formdata.qcFrom, }; + if (this.selectList.value == 'checkTypeSC') { + params.cxzz = this.formdata.cxzz; + params.jgy = this.formdata.jgy; + params.pgy = this.formdata.pgy; + } try { await model.commitDraft(params); //99999 if (model.commitDraftCode == 200) { @@ -2409,6 +2428,9 @@ export default class PurchaseWHSRM extends BasePage { .button-bar { } + .button-barsing { + font-size: 20px; + } .photoList { display: flex;