diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 7fe30ebb5..aea6be615 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -134,7 +134,17 @@ export default { }, res => { if (res.ok) { this.fit = res.data.fit.records + this.fit.forEach(item => { + if(item.standardItem){ + item.standNumber = item.standardItem + } + }) this.unfit = res.data.unfit.records + this.unfit.forEach(item => { + if(item.standardItem){ + item.standNumber = item.standardItem + } + }) } else { this.$message.warning(res.message) } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 1f4c883f5..c3646474c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -593,7 +593,7 @@ style="width: 100%" border ref="table" - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectThree" @@ -796,7 +796,7 @@ export default { ListModel: false, //选择清单抽屉状态 standModel: false, // 选择标准抽屉状态 active: "1", - signFlag: "1", //是否会签 1为会签 2为不会签 + signFlag: "", //是否会签 1为会签 2为不会签 listType: "country", //选择的清单类型 isSubmit: false, saveLoading: false, @@ -818,7 +818,7 @@ export default { model: "", // 上传模板 modelName: "", standId: "", //选择的清单的id - signFlag: "1", //是否会签 1为会签 2为不会签 + signFlag: "", //是否会签 1为会签 2为不会签 inforlist: " ", //用来存放标准列表的标准id dataList: [{ code: "", //标准号 @@ -865,6 +865,7 @@ export default { this.fileInfoList.push(itemId) this.getFileInfo(); }); + this.signFlag = mes.form.signFlag this.listForm = mes.form; this.dataList = mes.form.dataList; this.roleForm = mes.roleForm; @@ -938,9 +939,9 @@ export default { //判断当前是否会签 selectSign(type) { if (type === "1") { - this.listForm.signFlag = 1; + this.listForm.signFlag = '1'; } else if (type == "2") { - this.listForm.signFlag = 2; + this.listForm.signFlag = '2'; } }, queryDetailsData() { @@ -1595,5 +1596,9 @@ export default { .demo-drawer-content { margin-top: 10px; } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 903eaaa07..77990f427 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -101,25 +101,19 @@ + - -