From f303499ea96dc9402f470d9c64aadd5945a7b638 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 03 六月 2024 11:17:28 +0800
Subject: [PATCH] OEE报表页面表格列属性ellipsis开启后内容若超出盒子宽度则出现与表头错位现象，而无法实现ellipsis开启后内容超出单元格则省略功能，现采取增加列宽度方式且关闭ellipsis属性功能方法解决问题
---
src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index 991fb92..cca34ff 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -37,7 +37,7 @@
>
<!-- <a-input-search
:disabled="disableSubmit"
- placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
enter-button
@search="onDepartList()"
:read-only="true"
@@ -108,21 +108,21 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬Id"
+ label="浣跨敤閮ㄩ棬Id"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ璞￠儴闂╥d'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
v-decorator="['useId', validatorRules.useId ]"
/>
</a-form-item>
@@ -131,17 +131,15 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="娲惧伐鏂瑰紡"
+ label="绠＄悊鍒跺害"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-dict-select-tag
+ <a-input
allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨娲惧伐鏂瑰紡'"
- :triggerChange="true"
- dictCode="assign_mode"
- v-decorator="['assignMode', validatorRules.assignMode]"
+ :disabled="false"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ鐞嗗埗搴�'"
+ v-decorator="['disUda1', validatorRules.disUda1 ]"
/>
</a-form-item>
</a-col>
@@ -226,7 +224,7 @@
style="width: 100%"
:disabled="false"
/>
- <j-image-upload
+ <!-- <j-image-upload
:value="text"
v-if="col.dataIndex == 'photo'"
:isMultiple="false"
@@ -234,7 +232,7 @@
placeholder="璇蜂笂浼犲浘鐗�"
@change="(e)=>handleChange(e, record.key, col, index)"
>
- </j-image-upload>
+ </j-image-upload> -->
<a-input
:value="text"
v-if="col.dataIndex == 'location'"
@@ -326,7 +324,7 @@
dataIndex: 'name'
},
{
- title: '妫�娴嬫爣鍑�',
+ title: '瀹屾垚鏁版嵁/瑕佹眰',
align: 'center',
dataIndex: 'detectionStandard'
},
@@ -350,22 +348,21 @@
align: 'center',
dataIndex: 'inspectionCycleId',
scopedSlots: { customRender: 'inspectionCycleId' },
- width: 170,
},
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- width: 170,
- },
- {
- title: '閮ㄤ綅',
- align: 'center',
- dataIndex: 'location',
- scopedSlots: { customRender: 'location' },
- width: 170,
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // width: 170,
+ // },
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location',
+ // scopedSlots: { customRender: 'location' },
+ // width: 170,
+ // },
{
title: '鎿嶄綔',
align: 'center',
@@ -418,6 +415,11 @@
historyVersion: {
rules: [
{ required: true, message: '璇疯緭鍏ュ巻鍙茬増鏈�!' },
+ ]
+ },
+ disUda1: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ョ鐞嗗埗搴�!' },
]
},
},
@@ -475,7 +477,7 @@
edit(record) {
let that = this;
that.getInspectionCycle()
- that.initOptions();
+ // that.initOptions();
that.dataSource = [];
that.form.resetFields();
that.model = Object.assign({}, record);
@@ -485,7 +487,7 @@
that.dataSource = temp;
}
that.$nextTick(() => {
- that.form.setFieldsValue(pick(that.model, 'num', 'equipmentId', 'equipmentName', 'useDepartName', 'useId', 'teamName', 'assignMode', 'version', 'remark'));
+ that.form.setFieldsValue(pick(that.model, 'num', 'equipmentId', 'equipmentName', 'useDepartName', 'disUda1', 'useId', 'teamName', 'assignMode', 'version', 'remark'));
});
if (record.id) {
that.codeDisable = true;
@@ -536,7 +538,7 @@
onDepartList() {
this.$refs.DepartList.list();
- this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬";
+ this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬";
},
sendDepartRecord(data) {
this.dataSource = [];
@@ -563,10 +565,12 @@
let obj;
if (!this.model.id) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.add, formData);
} else {
if (this.isRevise) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.revise, formData);
} else {
obj = requestPut(this.url.edit, formData, { id: this.model.id });
--
Gitblit v1.9.3