From 958233d0bb26417d5b51e68ecc1cfb9410fcdccc Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期二, 21 十一月 2023 20:30:02 +0800 Subject: [PATCH] ABC评分签审 --- src/views/eam/Daily3MaintenanceOrderList.vue | 143 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 96 insertions(+), 47 deletions(-) diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue index 777c289..8e2d5d9 100644 --- a/src/views/eam/Daily3MaintenanceOrderList.vue +++ b/src/views/eam/Daily3MaintenanceOrderList.vue @@ -1,7 +1,7 @@ <template> <a-card :bordered="false" - title="涓夌骇淇濆吇宸ュ崟" + title="涓夌骇淇濆吇" > <!-- 鏌ヨ鍖哄煙 --> <div class="table-page-search-wrapper"> @@ -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" @@ -145,11 +145,11 @@ slot-scope="text, record" > <a-popconfirm - title="纭畾涓嬪彂宸ュ崟鍚�?" + title="纭畾鎺ユ敹宸ュ崟鍚�?" @confirm="() => handleOrderIssue(record)" v-has="'dailyMaintenanceOrder:issue'" > - <a v-if="record.status == '1'">涓嬪彂</a> + <a v-if="record.status == '1'">鎺ユ敹</a> </a-popconfirm> <a-divider v-if="record.status == '1'" @@ -174,7 +174,7 @@ v-if="record.status == '2'" type="vertical" /> - <a-popconfirm + <!-- <a-popconfirm title="纭畾鎭㈠宸ュ崟鍚�?" @confirm="() => handleOrderRecover(record)" v-has="'dailyMaintenanceOrder:recover'" @@ -184,8 +184,8 @@ <a-divider v-if="record.status == '7'" type="vertical" - /> - <a-popconfirm + /> --> + <!-- <a-popconfirm title="纭畾浣滃簾宸ュ崟鍚�?" @confirm="() => handleOrderCancel(record)" v-has="'dailyMaintenanceOrder:recover'" @@ -195,7 +195,7 @@ <a-divider v-if="record.status == '2'" type="vertical" - /> + /> --> <a-popconfirm title="纭畾棰嗗彇宸ュ崟鍚�?" @confirm="() => handleOrderGet(record)" @@ -203,7 +203,7 @@ > <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a> </a-popconfirm> - <a + <!-- <a v-if="record.status == '2' && record.assignMode == '2' " @click="handleAssignOrder(record)" v-has="'dailyMaintenanceOrder:assign'" @@ -212,17 +212,17 @@ v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null " @click="handleAssignOrder(record)" v-has="'dailyMaintenanceOrder:assign'" - >鏀规淳</a> + >鏀规淳</a> --> <!-- <a v-if="record.status == '3'" @click="handleAssignOrder(record)" >鏀规淳</a> --> - <a-divider + <!-- <a-divider v-if="record.status == '2'" type="vertical" - /> + />--> <a-divider - v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null " + v-if="record.status === '2'" type="vertical" /> <a @@ -275,6 +275,14 @@ v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' " type="vertical" /> + <a + v-if="record.status === '5' " + @click="handleMaintenance3Receipt(record)" + >楠屾敹鍗�</a> + <a-divider + v-if="record.status === '5' " + type="vertical" + /> <a-dropdown> <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a> <a-menu slot="overlay"> @@ -304,6 +312,16 @@ @click="handleOrderExe(record)" >{{record.num}}</a> <span v-else>{{record.num}}</span> + </span> + + <span + slot="notPassReason" + slot-scope="text" + > + <j-ellipsis + :value="text" + :length="15" + /> </span> </a-table> @@ -341,6 +359,10 @@ ref="EquipmentTechnologyStatusModal" @ok="modalFormOk" ></equipment-technology-status-modal> + <maintenance-3-receipt-modal + ref="Maintenance3ReceiptModal" + @ok="modalFormOk" + ></maintenance-3-receipt-modal> </a-card> </template> @@ -357,7 +379,9 @@ import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal' import DailyMaintenanceOrderExeDrawer from './modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer' 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', @@ -370,7 +394,9 @@ DailyMaintenanceOrderExeDrawer, MaintenanceOrderChangeModal, StoveCategoryModal, - EquipmentTechnologyStatusModal + EquipmentTechnologyStatusModal, + Maintenance3ReceiptModal, + JEllipsis }, data() { return { @@ -397,20 +423,23 @@ { title: '鐘舵��', align: "center", - dataIndex: 'statusName' + dataIndex: 'statusName', + width: 100, }, { title: '淇濆吇鍛ㄦ湡', align: "center", dataIndex: 'maintenanceCycleName', + width: 100, }, + // { + // title: '娲惧伐鏂瑰紡', + // align: "center", + // dataIndex: 'assignModeName', + // width: 100, + // }, { - title: '娲惧伐鏂瑰紡', - align: "center", - dataIndex: 'assignModeName' - }, - { - title: '璁惧缂栫爜', + title: '缁熶竴缂栫爜', align: "center", dataIndex: 'equipmentNum', }, @@ -425,10 +454,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: '浣跨敤閮ㄩ棬', @@ -440,23 +480,23 @@ align: "center", dataIndex: 'teamName' }, - { - title: '宸ユ椂瀹氶', - align: "center", - dataIndex: 'workingHourQuota' - }, - { - title: '璁″垝寮�濮嬫椂闂�', - align: "center", - dataIndex: 'planStartTime', - //width: '120px', - }, - { - title: '璁″垝缁撴潫鏃堕棿', - align: "center", - dataIndex: 'planEndTime', - //width: '120px', - }, + // { + // title: '宸ユ椂瀹氶', + // align: "center", + // dataIndex: 'workingHourQuota' + // }, + // { + // title: '璁″垝寮�濮嬫椂闂�', + // align: "center", + // dataIndex: 'planStartTime', + // //width: '120px', + // }, + // { + // title: '璁″垝缁撴潫鏃堕棿', + // align: "center", + // dataIndex: 'planEndTime', + // //width: '120px', + // }, { title: '瀹為檯寮�濮嬫椂闂�', align: "center", @@ -469,11 +509,11 @@ dataIndex: 'actualEndTime', //width: '120px', }, - { - title: '瀹為檯鐢ㄦ椂', - align: "center", - dataIndex: 'actualWorkingHourQuota', - }, + // { + // title: '瀹為檯鐢ㄦ椂', + // align: "center", + // dataIndex: 'actualWorkingHourQuota', + // }, { title: '鎵ц浜�', align: "center", @@ -569,7 +609,7 @@ handleOrderExe(record) { this.$refs.DailyMaintenanceOrderExeDrawer.visible = true - this.$refs.DailyMaintenanceOrderExeDrawer.title = '鏃ュ父淇濆吇宸ュ崟鎵ц' + this.$refs.DailyMaintenanceOrderExeDrawer.title = '涓夌骇淇濆吇宸ュ崟鎵ц' this.$refs.DailyMaintenanceOrderExeDrawer.handleShow(record) if (record.status === '3') { this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸� @@ -620,7 +660,11 @@ this.$refs.MaintenanceOrderChangeModal.disableSubmit = false; }, - + handleMaintenance3Receipt: function (record) { + this.$refs.Maintenance3ReceiptModal.edit(record); + this.$refs.Maintenance3ReceiptModal.title = "鐢熶骇璁惧涓夌骇淇濆吇楠屾敹鍗�"; + this.$refs.Maintenance3ReceiptModal.disableSubmit = false; + }, handleOrderIssue(record) { const that = this; @@ -688,6 +732,11 @@ this.$refs.MaintenanceOrderAssignModal.title = '宸ュ崟鏀规淳' this.$refs.MaintenanceOrderAssignModal.disableSubmit = false }, + + searchReset() { + this.queryParam = { maintenanceType: '3' } + this.loadData(1); + }, // modalFormOk() { // alert(0) // // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃 -- Gitblit v1.9.3