From d2547913ef2e150d8bb18bc8f7423515c7ed71d0 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 四月 2025 14:04:29 +0800
Subject: [PATCH] 1、调整设备台账铭牌二维码大小 2、待机停机页面功能开发
---
src/views/flowable/workflow/FlowTodo.vue | 110 +++++++++++++++++++++----------------------------------
1 files changed, 42 insertions(+), 68 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 0fd379a..8f8957a 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -9,35 +9,47 @@
<div class="table-page-search-wrapper">
<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="6" :md="8" :sm="24">
<a-form-item label="娴佺▼鍒嗙被">
<j-dict-select-tag placeholder="璇烽�夋嫨娴佺▼鍒嗙被" v-model="queryParam.category"
dictCode="flow_type"></j-dict-select-tag>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="4" :lg="6" :md="8" :sm="24">
<a-form-item label="娴佺▼鍚嶇О">
<a-input placeholder="璇疯緭鍏ユ祦绋嬪悕绉�" v-model="queryParam.flowName"></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="4" :lg="6" :md="8" :sm="24">
+ <a-form-item label="褰撳墠鑺傜偣">
+ <a-input placeholder="璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�" v-model="queryParam.name"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="6" :md="8" :sm="24">
<a-form-item label="绠�瑕佹弿杩�">
<a-input placeholder="璇疯緭鍏ョ畝瑕佹弿杩�" v-model="queryParam.title"></a-input>
</a-form-item>
</a-col>
- <a-col :xl="10" :lg="11" :md="12" :sm="24">
- <a-form-item label="褰撳墠鎿嶄綔鏃堕棿">
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" class="query-group-cust"
- v-model="queryParam.startTime"></j-date>
- <span class="query-group-split-cust"></span>
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" class="query-group-cust"
- v-model="queryParam.endTime"></j-date>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <template v-if="toggleSearchStatus">
+ <a-col :xl="8" :lg="8" :md="12" :sm="24">
+ <a-form-item label="浠诲姟鏃堕棿鑼冨洿">
+ <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" class="query-group-cust"
+ v-model="queryParam.startTime"></j-date>
+ <span class="query-group-split-cust"></span>
+ <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" class="query-group-cust"
+ v-model="queryParam.endTime"></j-date>
+ </a-form-item>
+ </a-col>
+ </template>
+
+ <a-col :xl="4" :lg="6" :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-button @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>
</span>
</a-col>
</a-row>
@@ -82,23 +94,17 @@
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a @click="handelDetail(record,text)">鏌ョ湅璇︽儏</a>
+ <a @click="handelDetail(record,text)">鎵ц/瀹℃壒</a>
</span>
</a-table>
</div>
- <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle>
- <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"
- @searchReset="searchReset"></DispatchFileHandle>
- <DispatchFileBachHandleStyle ref="modalFormDispatchFileBatch" @searchReset="searchReset"
- @ok="modalFormOk"></DispatchFileBachHandleStyle>
<InspectionOrderHandle ref="modalFormInspectionOrder" :selectShenpiData="selectInspectionOrderData"
@searchReset="searchReset"></InspectionOrderHandle>
- <InspectionOrderHandleBzz ref="modalFormInspectionOrderBzz" :selectShenpiData="selectInspectionOrderDataBzz"
- @searchReset="searchReset"></InspectionOrderHandleBzz>
- <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal"></week-maintenance-approval-modal>
- <repair-order-approval-modal ref="repairOrderApprovalModal"
+ <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"
+ @searchReset="searchReset"></week-maintenance-approval-modal>
+ <repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
:selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
</a-card>
</template>
@@ -109,13 +115,9 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
- import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue'
- import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
- import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal'
import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'
- import InspectionOrderHandleBzz from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue'
import { getAction } from '@api/manage'
@@ -123,14 +125,10 @@
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- AssignFileStreamHandle,
JDictSelectTag,
- DispatchFileHandle,
- DispatchFileBachHandleStyle,
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
- InspectionOrderHandle,
- InspectionOrderHandleBzz
+ InspectionOrderHandle
},
data() {
return {
@@ -151,7 +149,6 @@
title: '娴佺▼鍒嗙被',
align: 'center',
dataIndex: 'category_dictText',
- width: 300
},
{
title: '娴佺▼鍚嶇О',
@@ -205,10 +202,8 @@
isSameNode: '/assign/flow/isSameNode'
},
dictOptions: {},
- selectShenpiData: {},
- selectDispatchFileXqData: {},
selectInspectionOrderData: {},
- selectInspectionOrderDataBzz: {},
+ selectWeekMaintenanceData: {},
selectBachData: {},
selectRepairOrderData: {},
//涓氬姟淇℃伅ID
@@ -233,12 +228,6 @@
let processType = this.splitAprocessType(item.category)
console.log('processType--->', processType)
switch (processType) {
- case 'drApproval':
- this.handDrDetail(item)
- break
- case 'ggApproval':
- this.handDispatchFileDetail(item)
- break
case 'sbdjApproval':
this.handInspectionOrder(item)
break
@@ -257,34 +246,16 @@
let result = parts[0]
return result
},
- handDrDetail(record) {
- this.selectShenpiData = Object.assign({}, record)
- this.$refs.modalFormApproval.visible = true
- this.$refs.modalFormApproval.getAllApproveData(record)
- },
- searchReset() {
- this.queryParam = {}
- this.loadData(1)
- },
- handDispatchFileDetail(item) {
- console.log('item----->', item)
- this.selectDispatchFileXqData = item
- this.$refs.modalFormDispatchFileXq.clearTableSource()
- this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
- },
+
handInspectionOrder(record) {
console.log('record----->', record)
- const tableRecord = Object.assign({}, record)
- if (record.taskDefKey === 'Confirmed_completed') {
- this.selectInspectionOrderDataBzz = tableRecord
- this.$refs.modalFormInspectionOrderBzz.getAllApproveData(record)
- } else {
- this.selectInspectionOrderData = tableRecord
- this.$refs.modalFormInspectionOrder.visible = true
- this.$refs.modalFormInspectionOrder.getAllApproveData(record)
- this.$refs.modalFormInspectionOrder.getBasicInformation(record)
- }
+ this.selectInspectionOrderData = Object.assign({}, record)
+ this.$refs.modalFormInspectionOrder.visible = true
+ this.$refs.modalFormInspectionOrder.title = record.name
+ this.$refs.modalFormInspectionOrder.getAllApproveData(record)
+ this.$refs.modalFormInspectionOrder.getBasicInformation(record)
},
+
batchHandle() {
if (this.selectedRowKeys.length <= 0) {
this.$notification.warning({
@@ -314,8 +285,10 @@
})
}
},
+
handleWeekMaintenance(item) {
if (item && item.dataId) {
+ this.selectWeekMaintenanceData = Object.assign({}, item)
this.$refs.weekMaintenanceApprovalModal.handleDetail(item)
this.$refs.weekMaintenanceApprovalModal.title = item.name
this.$refs.weekMaintenanceApprovalModal.disableSubmit = false
@@ -329,6 +302,7 @@
handleRepairOrder(record) {
this.selectRepairOrderData = Object.assign({}, record)
this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.title = record.name
this.$refs.repairOrderApprovalModal.getAllApproveData(record)
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
}
--
Gitblit v1.9.3