From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/DailyInspectionOrderList.vue | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/views/eam/DailyInspectionOrderList.vue b/src/views/eam/DailyInspectionOrderList.vue
index d630e3a..d94dec3 100644
--- a/src/views/eam/DailyInspectionOrderList.vue
+++ b/src/views/eam/DailyInspectionOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="鏃ュ父鐐规宸ュ崟"
+ title="鑷富缁存姢鐐规宸ュ崟"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -129,11 +129,11 @@
slot-scope="text, record"
>
<a-popconfirm
- title="纭畾涓嬪彂宸ュ崟鍚�?"
+ title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
v-has="'dailyInspectionOrder:issue'"
>
- <a v-if="record.status == '1'">涓嬪彂</a>
+ <a v-if="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
v-if="record.status == '1'"
@@ -311,11 +311,7 @@
return parseInt(index) + 1;
}
},
- {
- title: '鐘舵��',
- align: "center",
- dataIndex: 'statusName'
- },
+
{
title: '鐐规宸ュ崟鍙�',
align: "center",
@@ -323,20 +319,25 @@
scopedSlots: { customRender: 'num' }
},
{
- title: '鐐规鏃ユ湡',
+ title: '鐘舵��',
align: "center",
- dataIndex: 'inspectionDate',
- customRender: function (text) {
- return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
- }
+ dataIndex: 'statusName'
},
+ // {
+ // title: '鐐规鏃ユ湡',
+ // align: "center",
+ // dataIndex: 'inspectionDate',
+ // customRender: function (text) {
+ // return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
+ // }
+ // },
{
title: '鐐规鏃堕棿',
align: "center",
dataIndex: 'inspectionTime',
- customRender: function (text) {
- return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
- }
+ // customRender: function (text) {
+ // return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
+ // }
},
{
title: '鎴鏃堕棿',
@@ -344,7 +345,7 @@
dataIndex: 'inspectionDeadline',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
@@ -359,7 +360,7 @@
dataIndex: 'equipmentModel'
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: "center",
dataIndex: 'useDepartName'
},
@@ -368,18 +369,18 @@
align: "center",
dataIndex: 'teamName'
},
- {
- title: '寮�宸ユ潯浠�',
- align: "center",
- dataIndex: 'startWorkCondition',
- customRender: (text) => {
- if (text == '1') {
- return "鏄�";
- } else if (text == '0') {
- return "鍚�";
- }
- },
- },
+ // {
+ // title: '寮�宸ユ潯浠�',
+ // align: "center",
+ // dataIndex: 'startWorkCondition',
+ // customRender: (text) => {
+ // if (text == '1') {
+ // return "鏄�";
+ // } else if (text == '0') {
+ // return "鍚�";
+ // }
+ // },
+ // },
{
title: '鐐规鏍囧噯缂栫爜',
align: "center",
--
Gitblit v1.9.3