From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 09:46:44 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop --- src/views/eam/Daily3MaintenanceOrderList.vue | 303 ++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 219 insertions(+), 84 deletions(-) diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue index 8e2d5d9..a93be15 100644 --- a/src/views/eam/Daily3MaintenanceOrderList.vue +++ b/src/views/eam/Daily3MaintenanceOrderList.vue @@ -14,10 +14,10 @@ :md="6" :sm="8" > - <a-form-item label="涓夌骇宸ュ崟缂栫爜"> + <a-form-item label="缁熶竴缂栧彿"> <a-input - placeholder="璇疯緭鍏ヤ笁绾у伐鍗曠紪鐮�" - v-model="queryParam.num" + placeholder="璇疯緭鍏ョ粺涓�缂栧彿" + v-model="queryParam.equipmentNum" ></a-input> </a-form-item> </a-col> @@ -25,22 +25,51 @@ :md="6" :sm="8" > - <span - style="float: left;overflow: hidden;" - class="table-page-search-submitButtons" - > - <a-button - type="primary" - @click="searchQuery" - icon="search" - >鏌ヨ</a-button> - <a-button - type="primary" - @click="searchReset" - icon="reload" - style="margin-left: 8px" - >閲嶇疆</a-button> - </span> + <a-form-item label="淇濆吇宸ュ崟缂栫爜"> + <a-input + placeholder="璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鐮�" + v-model="queryParam.num" + ></a-input> + </a-form-item> + </a-col> + <a-col :span="6"> + <a-form-item label="浣跨敤閮ㄩ棬"> + <j-dict-select-tag + dictCode="sys_depart,depart_name,id" + placeholder="璇疯緭鍏ヤ娇鐢ㄩ儴闂�" + v-model="queryParam.useDepartId" + /> + </a-form-item> + </a-col> + <a-col :span="6"> + <a-form-item label="鐘舵��"> + <j-dict-select-tag + dictCode="daily_maintenance_order_status" + placeholder="璇烽�夋嫨鐘舵��" + v-model="queryParam.status" + /> + </a-form-item> + </a-col> + </a-row> + <a-row :gutter="24"> + <a-col :span="6"> + <a-form-item label="璐d换鐝粍"> + <j-dict-select-tag + dictCode="mom_base_team,name,id,status='1' and del_flag='0'" + placeholder="璇烽�夋嫨璐d换鐝粍" + v-model="queryParam.teamId" + /> + </a-form-item> + </a-col> + <a-col :span="7"> + <a-form-item label="瀹屽伐鏃堕棿"> + <a-range-picker + style="width: 100%;" + format="YYYY-MM-DD HH:mm:ss" + v-model="finishTime" + @change="timeChange" + /> + </a-form-item> </a-col> </a-row> </a-form> @@ -53,28 +82,55 @@ @click="handleAdd" type="primary" icon="plus" - v-has="'dailyMaintenanceOrder:add'" + v-has="'daily3MaintenanceOrder:add'" >鏂板</a-button> <a-button - v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'" + type="primary" + @click="searchQuery" + icon="search" + style="margin-left: 8px" + >鏌ヨ</a-button> + <a-button + type="primary" + @click="searchReset" + icon="reload" + style="margin-left: 8px" + >閲嶇疆</a-button> + <a-button + v-show="selectedRowKeys.length == 1 && selectionRows[0].status === '5' && selectionRows[0].isNotStoveCategoryFlag == false && selectionRows[0].precisionParameters == '1' " @click="handlePrintPrecision(selectionRows[0])" type="primary" style="margin-left: 8px" >绮惧害妫�楠屽崟鎵撳嵃 </a-button> <a-button - v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'" + v-show="selectedRowKeys.length == 1 && selectionRows[0].status === '5'" @click="handlePrintCheck(selectionRows[0])" type="primary" style="margin-left: 8px" >楠屾敹鍗曟墦鍗� </a-button> + <!-- v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'" --> <a-button - v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'" + v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'" @click="handlePrintInfo(selectionRows[0])" type="primary" style="margin-left: 8px" >绉讳氦鍗曟墦鍗� + </a-button> + <a-button + v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '5' && selectionRows[0].isNotStoveCategoryFlag == false && selectionRows[0].precisionParameters != '1'" + @click="handlePrintTechnology(selectionRows[0])" + type="primary" + style="margin-left: 8px" + >鎶�鏈姸鎬侀壌瀹氭墦鍗� + </a-button> + <a-button + v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '5' && selectionRows[0].isNotStoveCategoryFlag == true" + @click="handlePrintStove(selectionRows[0])" + type="primary" + style="margin-left: 8px" + >鐐夌被妫�娴嬫墦鍗� </a-button> <!-- <a-button v-if="selectedRowKeys.length > 0" @@ -111,19 +167,7 @@ </a-dropdown> --> </div> - <!-- table鍖哄煙-begin --> <div> - <!-- <div - class="ant-alert ant-alert-info" - style="margin-bottom: 16px;" - > - <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤� - <a - style="margin-left: 24px" - @click="onClearSelected" - >娓呯┖</a> - </div> --> - <a-table ref="table" size="middle" @@ -147,12 +191,12 @@ <a-popconfirm title="纭畾鎺ユ敹宸ュ崟鍚�?" @confirm="() => handleOrderIssue(record)" - v-has="'dailyMaintenanceOrder:issue'" + v-has="'daily3MaintenanceOrder:issue'" > - <a v-if="record.status == '1'">鎺ユ敹</a> + <a v-show="record.status == '1'">鎺ユ敹</a> </a-popconfirm> <a-divider - v-if="record.status == '1'" + v-show="record.status == '1'" type="vertical" /> <!-- <a @@ -166,12 +210,12 @@ <a-popconfirm title="纭畾鎾ゅ洖宸ュ崟鍚�?" @confirm="() => handleOrderReset(record)" - v-has="'dailyMaintenanceOrder:issue'" + v-has="'daily3MaintenanceOrder:issue'" > - <a v-if="record.status == '2'">鎾ゅ洖</a> + <a v-show="record.status == '2'">鎾ゅ洖</a> </a-popconfirm> <a-divider - v-if="record.status == '2'" + v-show="record.status == '2'" type="vertical" /> <!-- <a-popconfirm @@ -199,9 +243,9 @@ <a-popconfirm title="纭畾棰嗗彇宸ュ崟鍚�?" @confirm="() => handleOrderGet(record)" - v-has="'dailyMaintenanceOrder:get'" + v-has="'daily3MaintenanceOrder:get'" > - <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a> + <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a> </a-popconfirm> <!-- <a v-if="record.status == '2' && record.assignMode == '2' " @@ -222,25 +266,25 @@ type="vertical" />--> <a-divider - v-if="record.status === '2'" + v-show="record.status === '2'" type="vertical" /> <a - v-if="record.status === '3' || record.status === '4' " + v-show="record.status === '3' || record.status === '4' " @click="handleOrderExe(record)" - v-has="'dailyMaintenanceOrder:exe'" + v-has="'daily3MaintenanceOrder:exe'" >鎵ц</a> <a-divider v-if="record.status === '3' || record.status === '4' " type="vertical" /> <a - v-if="record.status === '1'" + v-show="record.status === '1'" @click="handleEdit(record)" - v-has="'dailyMaintenanceOrder:edit'" + v-has="'daily3MaintenanceOrder:edit'" >缂栬緫</a> <a-divider - v-if="record.status === '1'" + v-show="record.status === '1'" type="vertical" /> <!-- <a @@ -251,36 +295,86 @@ v-if="record.status === '5'" type="vertical" /> --> + <!-- 绮惧害妫�楠岃�呮搷浣滅簿搴︽楠屽崟 --> <a - v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')" + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' )" + @click="handlePrecisionCheckOrder(record)" + v-has="'daily3MaintenanceOrder:precisionInspectionUser'" + >绮惧害妫�楠�</a> + <!-- 缁翠慨瀹や富浠绘搷浣滅簿搴︽楠屽崟 --> + <a + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '1' )" + @click="handlePrecisionCheckOrder(record)" + v-has="'daily3MaintenanceOrder:repairDirectorUser'" + >绮惧害妫�楠�</a> + <!-- 璁惧妫�楠屽憳鎿嶄綔绮惧害妫�楠屽崟 --> + <a + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '2' )" + @click="handlePrecisionCheckOrder(record)" + v-has="'daily3MaintenanceOrder:equipmentInspectorUser'" + >绮惧害妫�楠�</a> + <!-- 浣跨敤鍗曚綅鎶�鏈富绠℃搷浣滅簿搴︽楠屽崟 --> + <a + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '3' )" + @click="handlePrecisionCheckOrder(record)" + v-has="'daily3MaintenanceOrder:useUnitDirectorUser'" + >绮惧害妫�楠�</a> + <!-- 璁惧妫�楠屽憳绛惧瓧 鎿嶄綔绮惧害妫�楠屽崟 --> + <a + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '4')" + @click="handlePrecisionCheckOrder(record)" + v-has="'daily3MaintenanceOrder:equipmentInspectorSignUser'" + >绮惧害妫�楠�</a> + <!-- 绮惧害妫�楠屽崟 鏌ョ湅 --> + <a + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '5')" @click="handlePrecisionCheckOrder(record)" >绮惧害妫�楠�</a> + <!--绠$悊鍛樻搷浣滅簿搴︽楠屽崟 --> + <a + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4' )" + @click="handlePrecisionCheckOrder(record)" + v-has="'daily3MaintenanceOrder:admin'" + >绮惧害妫�楠�</a> <a-divider - v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')" + v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' " type="vertical" /> <a - v-if="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" + v-show="record.status === '5' && record.isNotStoveCategoryFlag == true " @click="handleStoveDetection(record)" + v-has="'daily3MaintenanceOrder:StoveCategory'" >鐐夌被妫�娴�</a> + <!-- v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" --> <a-divider - v-if="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" + v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true " type="vertical" /> <a - v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'" + v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true " + @click="handleStoveReport(record)" + v-has="'daily3MaintenanceOrder:StoveCategoryReport'" + >鐐夌被鎶ュ憡</a> + <a-divider + v-show="record.status === '5' && record.isNotStoveCategoryFlag == true " + type="vertical" + /> + <a + v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters != '1'" @click="handleTechnologyStatus(record)" + v-has="'daily3MaintenanceOrder:TechnologyStatus'" >鎶�鏈姸鎬侀壌瀹�</a> <a-divider - v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' " + v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters != '1'" type="vertical" /> <a - v-if="record.status === '5' " + v-show="record.status === '5' " @click="handleMaintenance3Receipt(record)" + v-has="'daily3MaintenanceOrder:Receipt'" >楠屾敹鍗�</a> <a-divider - v-if="record.status === '5' " + v-show="record.status === '5' " type="vertical" /> <a-dropdown> @@ -293,9 +387,9 @@ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" - v-has="'dailyMaintenanceOrder:delete'" + v-has="'daily3MaintenanceOrder:delete'" > - <a v-if="record.status === '1'">鍒犻櫎</a> + <a v-show="record.status === '1'">鍒犻櫎</a> </a-popconfirm> </a-menu-item> </a-menu> @@ -327,10 +421,10 @@ </a-table> </div> - <maintenance-order-modal + <maintenance-order3-modal ref="modalForm" @ok="modalFormOk" - ></maintenance-order-modal> + ></maintenance-order3-modal> <finish-devolution-modal ref="FinishDevolutionModal" @ok="modalFormOk" @@ -347,6 +441,10 @@ ref="StoveCategoryModal" @ok="modalFormOk" ></stove-category-modal> + <stove-category-report-modal + ref="StoveCategoryReportModal" + @ok="modalFormOk" + ></stove-category-report-modal> <maintenance-order-assign-modal ref="MaintenanceOrderAssignModal" @ok="modalFormOk" @@ -359,6 +457,10 @@ ref="EquipmentTechnologyStatusModal" @ok="modalFormOk" ></equipment-technology-status-modal> + <technology-status-authenticate-modal + ref="TechnologyStatusAuthenticateModal" + @ok="modalFormOk" + ></technology-status-authenticate-modal> <maintenance-3-receipt-modal ref="Maintenance3ReceiptModal" @ok="modalFormOk" @@ -371,30 +473,35 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' -import MaintenanceOrderModal from './modules/dailyMaintenanceOrder/MaintenanceOrderModal' +import MaintenanceOrder3Modal from './modules/daily3MaintenanceOrder/MaintenanceOrder3Modal' import FinishDevolutionModal from './modules/dailyMaintenanceOrder/FinishDevolutionModal' import MaintenanceOrderChangeModal from './modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal' import EquipmentPrecisionCheckOrderModal from './modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal' import StoveCategoryModal from './modules/daily3MaintenanceOrder/StoveCategoryModal' +import StoveCategoryReportModal from './modules/daily3MaintenanceOrder/StoveCategoryReportModal' import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal' import DailyMaintenanceOrderExeDrawer from './modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer' import EquipmentTechnologyStatusModal from './modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal' +import TechnologyStatusAuthenticateModal from './modules/daily3MaintenanceOrder/TechnologyStatusAuthenticateModal' import Maintenance3ReceiptModal from './modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue' import { getAction, postAction, requestPut } from '@/api/manage' import JEllipsis from "@/components/jeecg/JEllipsis"; +import moment from 'moment' export default { name: 'DailyMaintenanceOrderList', mixins: [JeecgListMixin, mixinDevice], components: { - MaintenanceOrderModal, + MaintenanceOrder3Modal, FinishDevolutionModal, MaintenanceOrderAssignModal, EquipmentPrecisionCheckOrderModal, DailyMaintenanceOrderExeDrawer, MaintenanceOrderChangeModal, StoveCategoryModal, + StoveCategoryReportModal, EquipmentTechnologyStatusModal, + TechnologyStatusAuthenticateModal, Maintenance3ReceiptModal, JEllipsis }, @@ -402,6 +509,7 @@ return { description: '涓夌骇淇濆吇宸ュ崟', queryParam: { maintenanceType: '3' }, + finishTime: [], // 琛ㄥご columns: [ { @@ -421,6 +529,11 @@ scopedSlots: { customRender: 'num' } }, { + title: '缁熶竴缂栫爜', + align: "center", + dataIndex: 'equipmentNum', + }, + { title: '鐘舵��', align: "center", dataIndex: 'statusName', @@ -438,11 +551,7 @@ // dataIndex: 'assignModeName', // width: 100, // }, - { - title: '缁熶竴缂栫爜', - align: "center", - dataIndex: 'equipmentNum', - }, + { title: '璁惧鍚嶇О', align: "center", @@ -485,12 +594,12 @@ // align: "center", // dataIndex: 'workingHourQuota' // }, - // { - // title: '璁″垝寮�濮嬫椂闂�', - // align: "center", - // dataIndex: 'planStartTime', - // //width: '120px', - // }, + { + title: '璁″垝寮�濮嬫椂闂�', + align: "center", + dataIndex: 'planStartTime', + //width: '120px', + }, // { // title: '璁″垝缁撴潫鏃堕棿', // align: "center", @@ -498,13 +607,13 @@ // //width: '120px', // }, { - title: '瀹為檯寮�濮嬫椂闂�', + title: '鎵ц鏃堕棿', align: "center", dataIndex: 'actualStartTime', //width: '120px', }, { - title: '瀹為檯缁撴潫鏃堕棿', + title: '瀹屽伐鏃堕棿', align: "center", dataIndex: 'actualEndTime', //width: '120px', @@ -514,11 +623,11 @@ // align: "center", // dataIndex: 'actualWorkingHourQuota', // }, - { - title: '鎵ц浜�', - align: "center", - dataIndex: 'maintenanceUserName' - }, + // { + // title: '鎶ュ伐浜�', + // align: "center", + // dataIndex: 'maintenanceUserId' + // }, { title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�', align: "center", @@ -606,6 +715,15 @@ window.open(href, "_blank"); }, + handlePrintTechnology(record) { + let href = `${window._CONFIG['domianURL']}/jmreport/view/932475014657814528?id=` + record.id; //缃戠珯閾炬帴 + window.open(href, "_blank"); + }, + + handlePrintStove(record) { + let href = `${window._CONFIG['domianURL']}/jmreport/view/932491838782910464?id=` + record.id; //缃戠珯閾炬帴 + window.open(href, "_blank"); + }, handleOrderExe(record) { this.$refs.DailyMaintenanceOrderExeDrawer.visible = true @@ -643,15 +761,26 @@ }, handleTechnologyStatus: function (record) { - this.$refs.EquipmentTechnologyStatusModal.edit(record); - this.$refs.EquipmentTechnologyStatusModal.title = "鎶�鏈姸鎬佺紪杈�"; - this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false; + // this.$refs.EquipmentTechnologyStatusModal.edit(record); + // this.$refs.EquipmentTechnologyStatusModal.title = "鎶�鏈姸鎬佺紪杈�"; + // this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false; + this.$refs.TechnologyStatusAuthenticateModal.edit(record); + this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�"; + this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false; + }, handleStoveDetection: function (record) { this.$refs.StoveCategoryModal.edit(record); this.$refs.StoveCategoryModal.title = "娓╁害鍧囧寑鎬ф娴嬫潯浠剁‘璁よ〃"; this.$refs.StoveCategoryModal.disableSubmit = false; + }, + handleStoveReport: function (record) { + this.$refs.StoveCategoryReportModal.add(); + this.$refs.StoveCategoryReportModal.title = "鐐夌被璁惧鎶ュ憡涓婁紶"; + this.$refs.StoveCategoryReportModal.disableSubmit = false; + this.$refs.StoveCategoryReportModal.maintenanceStandardId = record.id + this.$refs.StoveCategoryReportModal.equipmentId = record.equipmentId }, handleOrderChange: function (record) { @@ -734,8 +863,10 @@ }, searchReset() { + this.onClearSelected(); this.queryParam = { maintenanceType: '3' } this.loadData(1); + this.finishTime = [] }, // modalFormOk() { // alert(0) @@ -744,6 +875,10 @@ // //娓呯┖鍒楄〃閫変腑 // this.onClearSelected() // }, + timeChange() { + this.queryParam.finishStartTime = moment(this.finishTime[0]).format("YYYY-MM-DD HH:mm:ss") + this.queryParam.finishEndTime = moment(this.finishTime[1]).format("YYYY-MM-DD HH:mm:ss") + }, //棰勮棰滆壊 tableRowClass(record, index) { -- Gitblit v1.9.3