From 52d772dfea526a4b3d8b6a6f0746884efccbb706 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 11 四月 2025 14:22:09 +0800
Subject: [PATCH] 1、调整全局domianUrl为/jeecg-boot 2、设备台账页面实现查询设备对应点检工单功能 3、工作流我的待办设备维修分类详情弹窗布局及功能逻辑调整 4、工作流我的待办页面表格样式调整
---
src/views/flowable/workflow/FlowTodo.vue | 486 +++++++++++++++++++++++++++---------------------------
1 files changed, 243 insertions(+), 243 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 42b5430..0929e14 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -11,7 +11,8 @@
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="娴佺▼鍒嗙被">
- <j-dict-select-tag placeholder="璇烽�夋嫨娴佺▼鍒嗙被" v-model="queryParam.category" dictCode="flow_type"></j-dict-select-tag>
+ <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">
@@ -26,9 +27,11 @@
</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>
+ <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>
+ <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">
@@ -44,19 +47,24 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-dropdown v-if="selectedRowKeys.length > 0 ">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchHandle"><a-icon type="delete"/>鎵归噺澶勭悊</a-menu-item>
- </a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
- </a-dropdown>
+ <a-dropdown v-if="selectedRowKeys.length > 0 ">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchHandle">
+ <a-icon type="delete"/>
+ 鎵归噺澶勭悊
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
+ <a-icon type="down"/>
+ </a-button>
+ </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>椤�
+ selectedRowKeys.length }}</a>椤�
<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
</div>
@@ -73,26 +81,6 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
- <template slot="htmlSlot" slot-scope="text">
- <div v-html="text"></div>
- </template>
- <template slot="imgSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
- </template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button
- v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
- 涓嬭浇
- </a-button>
- </template>
-
<span slot="action" slot-scope="text, record">
<a @click="handelDetial(record,text)">鏌ョ湅璇︽儏</a>
</span>
@@ -101,234 +89,246 @@
</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" :selectShenpiData="selectRepairOrderData" ></repair-order-approval-modal>
+ <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"
+ :selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
</a-card>
</template>
<script>
-import '@/assets/less/TableExpand.less'
-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 '@/assets/less/TableExpand.less'
+ 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'
-export default {
- name: 'NcDeviceCharactersList',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
- AssignFileStreamHandle,
- JDictSelectTag,
- DispatchFileHandle,
- DispatchFileBachHandleStyle,
- WeekMaintenanceApprovalModal,
- RepairOrderApprovalModal,
- InspectionOrderHandle,
- InspectionOrderHandleBzz,
- },
- data () {
- return {
- description: '宸ヤ綔娴�-鎴戠殑寰呭姙',
- // 琛ㄥご
- columns: [
- {
- title: '搴忓彿',
- dataIndex: '',
- key:'rowIndex',
- width:200,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
+ import { getAction } from '@api/manage'
+
+ export default {
+ name: 'NcDeviceCharactersList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ AssignFileStreamHandle,
+ JDictSelectTag,
+ DispatchFileHandle,
+ DispatchFileBachHandleStyle,
+ WeekMaintenanceApprovalModal,
+ RepairOrderApprovalModal,
+ InspectionOrderHandle,
+ InspectionOrderHandleBzz
+ },
+ data() {
+ return {
+ description: '宸ヤ綔娴�-鎴戠殑寰呭姙',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '搴忓彿',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '娴佺▼鍒嗙被',
+ align: 'center',
+ dataIndex: 'category_dictText',
+ width: 300
+ },
+ {
+ title: '娴佺▼鍚嶇О',
+ align: 'center',
+ dataIndex: 'flowName',
+ width: 200
+ },
+ {
+ title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
+ align: 'center',
+ dataIndex: 'title',
+ width: 500
+ },
+ {
+ title: '涓婁竴姝ュ鐞嗕汉',
+ align: 'center',
+ dataIndex: 'preNodeAssignee_dictText',
+ width: 150
+ },
+ {
+ title: '鍓嶉┍鑺傜偣',
+ align: 'center',
+ dataIndex: 'preNode',
+ width: 200
+ },
+ {
+ title: '褰撳墠鑺傜偣',
+ align: 'center',
+ dataIndex: 'name',
+ width: 200
+ },
+ {
+ title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
+ align: 'center',
+ dataIndex: 'createTime',
+ width: 200
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' },
+ align: 'center',
+ width: 150,
+ fixed: 'right'
}
+ ],
+ url: {
+ list: '/assign/flow/toTaskBySelf',
+ isSameNode: '/assign/flow/isSameNode'
},
- {
- title: '娴佺▼鍒嗙被',
- align: "center",
- dataIndex: 'category_dictText',
- width: 200,
- },
- {
- title: '娴佺▼鍚嶇О',
- align: "center",
- dataIndex: 'flowName',
- width: 200,
- },
- {
- title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
- align: "center",
- dataIndex: 'title',
- width:300
- },
- {
- title: '涓婁竴姝ュ鐞嗕汉',
- align: "center",
- dataIndex: 'preNodeAssignee_dictText',
- width:200
- },
- {
- title: '鍓嶉┍鑺傜偣',
- align: "center",
- dataIndex: 'preNode',
- width:200
- },
- {
- title: '褰撳墠鑺傜偣',
- align: "center",
- dataIndex: 'name',
- width:200
- },
- {
- title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
- align: "center",
- dataIndex: 'createTime',
- width:300
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' },
- align: 'center',
- width: 200,
- fixed: 'right'
+ dictOptions: {},
+ selectShenpiData: {},
+ selectDispatchFileXqData: {},
+ selectInspectionOrderData: {},
+ selectInspectionOrderDataBzz: {},
+ selectBachData: {},
+ selectRepairOrderData: {},
+ //涓氬姟淇℃伅ID
+ dataId: undefined
+ }
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ methods: {
+ handelDetial(item, index) {
+ console.log('鐐瑰嚮浜嗚鎯�')
+ console.log('item----->', item)
+ console.log('index----->', index)
+ let approcesstype = this.splitAprocessType(item.category)
+ console.log('approcesstype--->', approcesstype)
+ switch (approcesstype) {
+ case 'drApproval':
+ this.handDrDetial(item)
+ break
+ case 'ggApproval':
+ this.handDispatchFileDetial(item)
+ break
+ case 'sbdjApproval':
+ this.handInspectionOrder(item)
+ break
+ case 'WEEK_MAINTENANCE':
+ this.handleWeekMaintenance(item)
+ break
+ case 'eam_repair':
+ this.handleRepairOrder(item)
+ break
+ default:
+ alert('娌℃壘鍒拌娴佺▼')
}
- ],
- url: {
- list: '/assign/flow/toTaskBySelf',
- isSameNode: '/assign/flow/isSameNode'
},
- dictOptions:{},
- selectShenpiData: {},
- selectDispatchFileXqData:{},
- selectInspectionOrderData:{},
- selectInspectionOrderDataBzz:{},
- selectBachData:{},
- selectRepairOrderData: {},
- //涓氬姟淇℃伅ID
- dataId: undefined,
- }
- },
- created() {
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- },
- },
- methods: {
- handelDetial(item, index) {
- console.log('鐐瑰嚮浜嗚鎯�')
- console.log('item----->', item)
- console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.category)
- console.log('approcesstype--->', approcesstype)
- switch (approcesstype) {
- case 'drApproval':
- this.handDrDetial(item)
- break
- case 'ggApproval':
- this.handDispatchFileDetial(item)
- break
- case 'sbdjApproval':
- this.handInspectionOrder(item)
- break
- case 'WEEK_MAINTENANCE':
- this.handleWeekMaintenance(item)
- break
- case 'eam_repair':
- this.handleRepairOrder(item)
- break
- default:
- alert('娌℃壘鍒拌娴佺▼')
- }
- },
- splitAprocessType(title) {
- let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
- let result = parts[0]
- return result
- },
- handDrDetial(item) {
- this.selectShenpiData = item
- this.$refs.modalFormApproval.clearTableSource()
- this.$refs.modalFormApproval.getAllApproveData(item)
- },
- searchReset() {
- this.queryParam = {}
- this.loadData(1);
- },
- handDispatchFileDetial(item){
- console.log('item----->', item)
- this.selectDispatchFileXqData = item
- this.$refs.modalFormDispatchFileXq.clearTableSource()
- this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
- },
- handInspectionOrder(item) {
- console.log('item----->', item)
- if (item.taskDefKey ==='Confirmed_completed'){
- this.selectInspectionOrderDataBzz = item
- this.$refs.modalFormInspectionOrderBzz .clearTableSource()
- this.$refs.modalFormInspectionOrderBzz .getAllApproveData(item)
- }else {
- this.selectInspectionOrderData = item
- this.$refs.modalFormInspectionOrder.clearTableSource()
- this.$refs.modalFormInspectionOrder.getAllApproveData(item)
- }
- },
- batchHandle() {
- if (this.selectedRowKeys.length <= 0) {
- this.$notification.warning({
- message: '娑堟伅',
- description: "璇烽�夋嫨涓�鏉¤褰�"
- });
- return;
- } else {
- let ids = "";
- for (var a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ",";
+ splitAprocessType(title) {
+ let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
+ let result = parts[0]
+ return result
+ },
+ handDrDetial(item) {
+ this.selectShenpiData = item
+ this.$refs.modalFormApproval.clearTableSource()
+ this.$refs.modalFormApproval.getAllApproveData(item)
+ },
+ searchReset() {
+ this.queryParam = {}
+ this.loadData(1)
+ },
+ handDispatchFileDetial(item) {
+ console.log('item----->', item)
+ this.selectDispatchFileXqData = item
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ },
+ handInspectionOrder(item) {
+ console.log('item----->', item)
+ if (item.taskDefKey === 'Confirmed_completed') {
+ this.selectInspectionOrderDataBzz = item
+ this.$refs.modalFormInspectionOrderBzz.clearTableSource()
+ this.$refs.modalFormInspectionOrderBzz.getAllApproveData(item)
+ } else {
+ this.selectInspectionOrderData = item
+ this.$refs.modalFormInspectionOrder.clearTableSource()
+ this.$refs.modalFormInspectionOrder.getAllApproveData(item)
}
- getAction(this.url.isSameNode+"?taskIds="+ids).then((res)=>{
- if(res.success){
- let taskDefKey=res.result
- this.selectBachData.taskIds = ids
- this.selectBachData.taskDefKey = taskDefKey
- this.$refs.modalFormDispatchFileBatch.title="鎵归噺澶勭悊";
- this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData)
- this.$refs.modalFormDispatchFileBatch.disableSubmit = false;
- }else{
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- });
+ },
+ batchHandle() {
+ if (this.selectedRowKeys.length <= 0) {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇烽�夋嫨涓�鏉¤褰�'
+ })
+ return
+ } else {
+ let ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
}
- })
+ getAction(this.url.isSameNode + '?taskIds=' + ids).then((res) => {
+ if (res.success) {
+ let taskDefKey = res.result
+ this.selectBachData.taskIds = ids
+ this.selectBachData.taskDefKey = taskDefKey
+ this.$refs.modalFormDispatchFileBatch.title = '鎵归噺澶勭悊'
+ this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData)
+ this.$refs.modalFormDispatchFileBatch.disableSubmit = false
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ }
+ },
+ handleWeekMaintenance(item) {
+ if (item && item.dataId) {
+ this.$refs.weekMaintenanceApprovalModal.handleDetail(item.dataId)
+ this.$refs.weekMaintenanceApprovalModal.title = item.name
+ this.$refs.weekMaintenanceApprovalModal.disableSubmit = false
+ }
+ },
+
+ /**
+ * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙�
+ * @param record
+ */
+ handleRepairOrder(record) {
+ this.selectRepairOrderData = Object.assign({}, record)
+ this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.getAllApproveData(record)
+ this.$refs.repairOrderApprovalModal.getBasicInformation(record)
}
- },
- handleWeekMaintenance(item) {
- if(item && item.dataId) {
- this.$refs.weekMaintenanceApprovalModal.handleDetail(item.dataId)
- this.$refs.weekMaintenanceApprovalModal.title = item.name;
- this.$refs.weekMaintenanceApprovalModal.disableSubmit = false;
- }
- },
- handleRepairOrder(item) {
- this.selectRepairOrderData = item
- this.$refs.repairOrderApprovalModal.clearTableSource()
- this.$refs.repairOrderApprovalModal.getAllApproveData(item)
}
}
-}
</script>
<style scoped>
-@import '~@assets/less/common.less';
+ @import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3