From 913f86badcc805bac79b9f2350f52eafcba86291 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期二, 26 三月 2024 10:15:12 +0800 Subject: [PATCH] 1、调整单柱图x轴标题显示方式由每隔一个显示改为全显示(保证水平完整放置需旋转标题) 2、新增从分厂级看板返回公司级看板功能 3、按照新需求完成客户工段主管层进入后页面所有布局30% --- src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue index 627783b..fe0f077 100644 --- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue +++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue @@ -197,8 +197,7 @@ <a-input v-model="model.sparePart" /> </a-form-item> </a-col> - </a-row> - <a-row :gutter="24"> + <a-col :span="12"> <a-form-item :labelCol="{ span: 8 }" @@ -213,7 +212,10 @@ /> </a-form-item> </a-col> - <a-col :span="12"> + </a-row> + <a-row :gutter="24"> + + <!-- <a-col :span="12"> <a-form-item :labelCol="{ span: 8 }" :wrapperCol="{ span: 4 }" @@ -225,6 +227,35 @@ @change="handle5Switch(model.meetProcessRequire)" :checked="model.meetProcessRequire == '1'" /> + </a-form-item> + </a-col> --> + <a-col :span="12"> + <a-form-item + style="font-size: large;font-style: normal;font-size: 15px;" + :labelCol="{ span: 8 }" + :wrapperCol="{ span: 12 }" + label="鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰" + > + <j-dict-select-tag + style="font-size: large;font-style: normal;font-size: 15px;width: 100%" + allow-clear + :triggerChange="true" + dictCode="meet_process_require" + v-model="model.meetProcessRequire" + /> + + </a-form-item> + </a-col> + <a-col + v-if="model.meetProcessRequire =='3'" + :span="12" + > + <a-form-item + :labelCol="{ span: 8 }" + :wrapperCol="{ span: 12 }" + label="鑷畾涔夎鏄庯細" + > + <a-input v-model="model.meetProcessRequireRemark" /> </a-form-item> </a-col> </a-row> @@ -377,6 +408,7 @@ dataSource: [], model: {}, departs: [], + labelCol: { xs: { span: 24 }, sm: { span: 6 }, @@ -488,6 +520,7 @@ if (res.success) { this.dataSource = res.result[0].precisionInspectionDetails this.model = Object.assign(this.model, res.result[0]); + this.model = Object.assign({}, this.model); } }) }, -- Gitblit v1.9.3