From 53c269711fcb59f48fd2acd7e825bebfd31d09e5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 四月 2025 16:33:10 +0800
Subject: [PATCH] 点检工单修改，修改指派设备问题
---
src/views/flowable/workflow/FlowCompleted.vue | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index 2afd4c8..ba2a883 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -10,16 +10,10 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="娴佺▼鍚嶇О">
- <a-input placeholder="璇疯緭鍏ユ祦绋嬪悕绉�" v-model="queryParam.deviceNo"></a-input>
+ <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>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="娴佺▼鍒嗙被">
- <j-dict-select-tag v-model="queryParam.departId" placeholder="璇烽�夋嫨娴佺▼鍒嗙被" dictCode="sys_department,depart_name,depart_id"/>
- </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>
@@ -27,12 +21,10 @@
<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>
- </template>
<a-col :xl="6" :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>
</span>
</a-col>
</a-row>
@@ -83,7 +75,11 @@
</a-table>
</div>
- <FlowNcZpi ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowNcZpi>
+ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+
+ <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
+
+ <InspectionOrderXq ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"></InspectionOrderXq>
</a-card>
</template>
@@ -94,13 +90,17 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
-import FlowNcZpi from '@views/flowable/workflow/FlowNcZpi.vue'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
+import InspectionOrderXq from '@views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue'
export default {
name: 'NcDeviceCharactersList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- FlowNcZpi,
+ InspectionOrderXq,
+ DispatchFileXq,
+ AssignFileStreamXq: AssignFileStreamXq,
JDictSelectTag,
},
data () {
@@ -117,6 +117,12 @@
customRender:function (t,r,index) {
return parseInt(index)+1;
}
+ },
+ {
+ title: '娴佺▼鍒嗙被',
+ align: "center",
+ dataIndex: 'category_dictText',
+ width: 200,
},
{
title: '娴佺▼鍚嶇О',
@@ -145,7 +151,7 @@
{
title: '鎿嶄綔鏃堕棿',
align: "center",
- dataIndex: 'createTime',
+ dataIndex: 'finishTime',
width:300
},
{
@@ -158,10 +164,12 @@
}
],
url: {
- list: "/nc/assign/flow/finishedList",
+ list: "/assign/flow/finishedList",
},
dictOptions:{},
selectShenpiData: {},
+ selectDispatchFileXqData:{},
+ selectInspectionOrderXqData:{}
}
},
created() {
@@ -176,14 +184,20 @@
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.description)
+ let approcesstype = this.splitAprocessType(item.category)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
- case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
+ case 'drApproval':
this.handDrDetial(item)
break
+ case 'ggApproval':
+ this.handDispatchFileDetial(item)
+ break
+ case 'sbdjApproval':
+ this.handInspectionOrder(item)
+ break
default:
- alert('娌℃壘鍒拌瀹℃壒')
+ alert('娌℃壘鍒拌娴佺▼')
}
},
splitAprocessType(title) {
@@ -196,6 +210,26 @@
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
+ handDispatchFileDetial(item){
+ console.log('item----->', item)
+ this.selectDispatchFileXqData = item
+ this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectDispatchFileXqData.procInstId=item.procInsId
+ this.selectDispatchFileXqData.processInstanceId=item.procInsId
+ this.selectDispatchFileXqData.title=item.description
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ },
+ handInspectionOrder(item) {
+ console.log('item----->', item)
+ this.selectInspectionOrderXqData = item
+ this.selectInspectionOrderXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectInspectionOrderXqData.procInstId=item.procInsId
+ this.selectInspectionOrderXqData.processInstanceId=item.procInsId
+ this.selectInspectionOrderXqData.title=item.description
+ this.$refs.modalFormInspectionOrderXq.clearTableSource()
+ this.$refs.modalFormInspectionOrderXq.getAllApproveData(item)
+ }
}
}
</script>
--
Gitblit v1.9.3