From 76ae1cb964715cef4dc566092b9b17e8e5e51656 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 25 十月 2023 17:04:52 +0800
Subject: [PATCH] 验收单修改
---
src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue | 19 ++++++++++---------
src/views/eam/Daily3MaintenanceOrderList.vue | 31 +++++++++++++++++++++++++++----
2 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index b50a6ac..994a4fa 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -127,7 +127,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{ x: 'calc(2800px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(3500px + 50%)', y: 900 }"
bordered
rowKey="id"
:columns="columns"
@@ -314,6 +314,16 @@
<span v-else>{{record.num}}</span>
</span>
+ <span
+ slot="notPassReason"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="15"
+ />
+ </span>
+
</a-table>
</div>
@@ -371,6 +381,7 @@
import EquipmentTechnologyStatusModal from './modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal'
import Maintenance3ReceiptModal from './modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue'
import { getAction, postAction, requestPut } from '@/api/manage'
+import JEllipsis from "@/components/jeecg/JEllipsis";
export default {
name: 'DailyMaintenanceOrderList',
@@ -384,7 +395,8 @@
MaintenanceOrderChangeModal,
StoveCategoryModal,
EquipmentTechnologyStatusModal,
- Maintenance3ReceiptModal
+ Maintenance3ReceiptModal,
+ JEllipsis
},
data() {
return {
@@ -439,10 +451,21 @@
dataIndex: 'equipmentModel',
},
{
- title: '淇濆吇鏍囧噯缂栫爜',
+ title: '楠屾敹鐘舵��',
align: "center",
- dataIndex: 'maintenanceStandardNum',
+ dataIndex: 'checkStatusName',
},
+ {
+ title: '鏈�氳繃鍘熷洜',
+ align: "center",
+ dataIndex: 'notPassReason',
+ scopedSlots: { customRender: 'notPassReason' }
+ },
+ // {
+ // title: '淇濆吇鏍囧噯缂栫爜',
+ // align: "center",
+ // dataIndex: 'maintenanceStandardNum',
+ // },
{
title: '浣跨敤閮ㄩ棬',
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
index 43b0850..e314bed 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
@@ -109,8 +109,8 @@
</div>
</template>
</a-table>
- <!-- <div :style="{height: '140px',width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
- <a-row :gutter="24">
+ <div :style="{height: '140px',width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
:labelCol="labelCol"
@@ -119,25 +119,26 @@
>
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
:labelCol="{span:3}"
:wrapperCol="{span:21}"
- label="澶囨敞"
+ label="楠屾敹鏈�氳繃鍘熷洜"
>
<a-textarea
allow-clear
+ :rows='5'
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ娉�'"
- v-decorator="['remark', {}]"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ラ獙鏀舵湭閫氳繃鍘熷洜'"
+ v-decorator="['notPassReason', {}]"
/>
-
+
</a-form-item>
</a-col>
</a-row>
- </div> -->
+ </div>
</a-form>
</a-spin>
@@ -285,7 +286,7 @@
this.visible = true;
this.getMaintenance3Receipt()
that.$nextTick(() => {
- // that.form.setFieldsValue(pick(that.model, 'num', 'teamId', 'remark'));
+ that.form.setFieldsValue(pick(that.model, 'notPassReason'));
});
},
--
Gitblit v1.9.3