From ffe01cb9dac3782f6f5f766a60491c12f5e42f19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 09:58:59 +0800
Subject: [PATCH] art: 设备管理-点检工单-确认意见
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 109 +++++++++++++++++++++++++++++-------------------------
1 files changed, 59 insertions(+), 50 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index a64e3cd..286c387 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -4,36 +4,30 @@
<div class="table-page-search-wrapper" v-if="isDisplayOperation">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="宸ュ崟鍙�">
<a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧ID">
- <a-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="queryParam.equipmentId"></a-input>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁惧缂栧彿">
+ <lx-search-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储" v-model="queryParam.equipmentId"></lx-search-equipment-select>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鐐规鏃ユ湡">
- <j-date placeholder="璇烽�夋嫨鐐规鏃ユ湡" v-model="queryParam.inspectionDate"></j-date>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鐐规鏃堕棿">
- <j-date placeholder="璇烽�夋嫨鐐规鏃堕棿" v-model="queryParam.operateTime"></j-date>
- </a-form-item>
- </a-col>
- </template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁″垝鐐规鏃ユ湡">
+ <a-range-picker v-model="queryParam.inspectionDateRange" @change="onInspectionDateChange" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐐规鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鐐规鐘舵��" dict-code="inspection_status" v-model="queryParam.inspectionStatus" />
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<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>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
+ <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</span>
</a-col>
</a-row>
@@ -140,7 +134,8 @@
</div>
<eam-inspection-order-modal ref="modalForm" @ok="modalFormOk"></eam-inspection-order-modal>
- <EamInspectionOrderModalXq ref="modalFormXq" @ok="modalFormOk"></EamInspectionOrderModalXq>
+
+ <inspection-order-handle ref="modalFormXq" :selectShenpiData="selectInspectionOrderXqData"/>
</a-card>
</template>
@@ -150,15 +145,17 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EamInspectionOrderModal from './modules/EamInspectionOrderModal'
- import EamInspectionOrderModalXq from './modules/EamInspectionOrderModalXq.vue'
import { deleteAction, getAction } from '@api/manage'
+ import InspectionOrderHandle from '../../flowable/workflow/InspectionOrder/InspectionOrderHandle'
+ import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
export default {
name: 'EamInspectionOrderList',
mixins: [JeecgListMixin, mixinDevice],
components: {
+ InspectionOrderHandle,
EamInspectionOrderModal,
- EamInspectionOrderModalXq
+ LxSearchEquipmentSelect,
},
props: {
isDisplayOperation: {
@@ -190,10 +187,15 @@
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentId_dictText'
+ dataIndex: 'equipmentCode'
},
{
- title: '鏍囧噯缂栫爜',
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName'
+ },
+ {
+ title: '鏍囧噯鍚嶇О',
align: 'center',
dataIndex: 'standardId_dictText'
},
@@ -206,7 +208,7 @@
}
},
{
- title: '鐐规杩囨湡鏃堕棿',
+ title: '鐐规杩囨湡鏃ユ湡',
align: 'center',
dataIndex: 'expirationTime',
customRender: function(text) {
@@ -224,35 +226,34 @@
dataIndex: 'inspectionStatus_dictText'
},
{
- title: '鐐规鏃堕棿',
- align: 'center',
- dataIndex: 'operateTime',
- customRender: function(text) {
- return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
- }
- },
- {
title: '鐐规浜�',
align: 'center',
dataIndex: 'operator_dictText'
},
{
+ title: '鐐规鏃堕棿',
+ align: 'center',
+ dataIndex: 'operateTime',
+ },
+ {
title: '鐝粍闀跨‘璁�',
align: 'center',
- dataIndex: 'confirmUser'
+ dataIndex: 'confirmUser_dictText'
},
{
title: '纭鏃堕棿',
align: 'center',
dataIndex: 'confirmTime',
- customRender: function(text) {
- return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
- }
+ },
+ {
+ title: '纭鎰忚',
+ align: 'center',
+ dataIndex: 'confirmComment',
}
],
url: {
list: '/eam/eamInspectionOrder/list',
- cancelInspectionOrder: "/eam/eamInspectionOrder/cancelInspectionOrder",
+ cancelInspectionOrder: '/eam/eamInspectionOrder/cancelInspectionOrder',
deleteBatch: '/eam/eamInspectionOrder/deleteBatch',
exportXlsUrl: '/eam/eamInspectionOrder/exportXls',
importExcelUrl: 'eam/eamInspectionOrder/importExcel',
@@ -260,7 +261,8 @@
cancelOrReceive: 'eam/eamInspectionOrder/cancelOrReceive'
},
dictOptions: {},
- superFieldList: []
+ superFieldList: [],
+ selectInspectionOrderXqData: {}
}
},
created() {
@@ -288,9 +290,12 @@
},
//璇︽儏
handleDetail: function(record) {
- this.$refs.modalFormXq.edit(record)
+ this.selectInspectionOrderXqData = Object.assign({}, record)
+ this.$refs.modalFormXq.visible = true
this.$refs.modalFormXq.title = '璇︽儏'
this.$refs.modalFormXq.disableSubmit = true
+ this.$refs.modalFormXq.getAllApproveData(record)
+ this.$refs.modalFormXq.getBasicInformation({ ...record, dataId: record.id })
},
handleInspection(id) {
if (!this.url.receiveInspectionOrder) {
@@ -314,27 +319,27 @@
}
})
},
- handleOrReceive(id){
+ handleOrReceive(id) {
if (!this.url.cancelInspectionOrder) {
- this.$message.error("璇疯缃畊rl.cancelInspectionOrder!")
+ this.$message.error('璇疯缃畊rl.cancelInspectionOrder!')
return
}
- var that = this;
+ var that = this
getAction(that.url.cancelInspectionOrder, { id: id }).then((res) => {
if (res.success) {
that.$notification.success({
message: '娑堟伅',
description: res.message
- });
- that.loadData();
+ })
+ that.loadData()
} else {
// that.$message.warning(res.message);
that.$notification.warning({
message: '娑堟伅',
description: res.message
- });
+ })
}
- });
+ })
},
batchZf(type) {
if (this.selectedRowKeys.length <= 0) {
@@ -413,7 +418,11 @@
}
})
}
- }
+ },
+ onInspectionDateChange: function(value, dateString) {
+ this.queryParam.inspectionDateBegin = dateString[0]
+ this.queryParam.inspectionDateEnd = dateString[1]
+ },
}
}
</script>
--
Gitblit v1.9.3