From ebf2058274599ff00ef0654fc5046d627e17002a Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 22 五月 2025 17:49:54 +0800
Subject: [PATCH] 工具管理-工具出库申请流程我的已办页面
---
src/views/flowable/workflow/FlowCompleted.vue | 22 ++++++++++-
src/views/flowable/workflow/FlowTodo.vue | 1
src/views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue | 50 +++++++-----------------
3 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index bbeb956..48bacaf 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -67,6 +67,8 @@
<week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"/>
<repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/>
+
+ <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData"/>
</a-card>
</template>
@@ -81,6 +83,7 @@
import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
import WeekMaintenanceApprovalModal from './weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
+ import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -91,7 +94,8 @@
RepairOrderApprovalModal,
WeekMaintenanceApprovalModal,
InspectionOrderHandle,
- JDictSelectTag
+ JDictSelectTag,
+ OutBoundOrderHandle
},
data() {
return {
@@ -161,7 +165,8 @@
selectDispatchFileXqData:{},
selectWeekMaintenanceData: {},
selectInspectionOrderXqData: {},
- selectRepairOrderData: {}
+ selectRepairOrderData: {},
+ selectOutBoundOrderData: {}
}
},
created() {
@@ -193,6 +198,9 @@
break
case 'eam_repair':
this.handleRepairOrder(item)
+ break
+ case 'toolOutStorageApproval':
+ this.handleToolOutStorageApproval(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -264,6 +272,16 @@
processInstanceId: procInsId
})
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
+ },
+
+ handleToolOutStorageApproval(item) {
+ this.selectOutBoundOrderData = Object.assign({}, item)
+ item.procInstId = item.procInsId
+ item.processInstanceId = item.procInsId
+ this.selectOutBoundOrderData.assignee_dictText = item.todoUsers_dictText
+ this.$refs.outBoundOrderHandle.auditVisible = false
+ this.$refs.outBoundOrderHandle.clearTableSource()
+ this.$refs.outBoundOrderHandle.getAllApproveData(item)
}
}
}
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 4a2f84c..c895811 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -441,6 +441,7 @@
handleToolOutStorageApproval(item) {
if (item && item.dataId) {
this.selectOutBoundOrderData = Object.assign({}, item)
+ this.$refs.outBoundOrderHandle.auditVisible = true
this.$refs.outBoundOrderHandle.clearTableSource()
this.$refs.outBoundOrderHandle.getAllApproveData(item)
}
diff --git a/src/views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue b/src/views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue
index 4fb9b29..d84210a 100644
--- a/src/views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue
+++ b/src/views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue
@@ -17,7 +17,7 @@
<br>
<br>
<a-tag color="blue">
- 澶勭悊浜� {{ selectShenpiData.assignee }}
+ 澶勭悊浜� {{ selectShenpiData.assignee_dictText }}
</a-tag>
<a-tag color="blue">
鍒涘缓鏃堕棿 {{ selectShenpiData.createTime }}
@@ -37,7 +37,7 @@
<a-spin :spinning="spinning">
<a-tabs default-active-key='1' @change='callback'>
<a-tab-pane key='1' tab='鐢宠鍩烘湰淇℃伅'>
- <a-form-model ref='form' :model='tableRowRecord' :rules='validatorRules'>
+ <a-form-model ref='form' :model='tableRowRecord'>
<a-row>
<a-col :span='span'>
<a-form-model-item label='鍑哄簱鍗曠紪鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='outNum'>
@@ -53,7 +53,7 @@
<a-row>
<a-col :span='span'>
<a-form-model-item label='鍑哄簱鏃堕棿' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='outboundTime'>
- <j-date :disabled="coldisabled" :show-time="true" dateFormat="YYYY-MM-DD HH:mm" v-model="tableRowRecord.outboundTime"/>
+ <j-date :disabled="coldisabled" v-model="tableRowRecord.outboundTime" :show-time="true" dateFormat="YYYY-MM-DD HH:mm" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span='span'>
@@ -65,7 +65,7 @@
<a-row>
<a-col :span='span'>
<a-form-model-item label='缁忔墜浜�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='handler'>
- <j-select-user-by-dep :disabled='coldisabled' v-model="tableRowRecord.handler" :store="'id'" :text="'realname'" :multi="false"/>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.handler_dictText'></a-input>
</a-form-model-item>
</a-col>
<a-col :span='span'>
@@ -107,7 +107,7 @@
</a-spin>
</a-form>
</div>
- <div>
+ <div v-if="auditVisible">
<hr class="shallow-hr">
<br>
<b>瀹℃壒璇︽儏</b>
@@ -126,12 +126,15 @@
</a-col>
<a-col :span="24" class="btxx">
<a-form-item label="瀹℃壒鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag type='list' v-model='assignFileStream.status' dictCode='dnc_assign_stream_status' placeholder="璇烽�夋嫨瀹℃壒鐘舵��" />
+ <a-select v-model='assignFileStream.status' placeholder="璇烽�夋嫨瀹℃壒缁撴灉">
+ <a-select-option value="3">閫氳繃</a-select-option>
+ <a-select-option value="4">椹冲洖</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :span="24" class="btxx">
<a-form-model-item label="瀹℃壒鎰忚" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-textarea v-model="assignFileStream.approveContent" rows="4" placeholder="璇疯緭鍏ュ鎵规剰瑙�"/>
+ <a-textarea v-model="assignFileStream.approvalOpinion" rows="4" placeholder="璇疯緭鍏ュ鎵规剰瑙�"/>
</a-form-model-item >
</a-col>
</a-row>
@@ -176,9 +179,9 @@
hitaskDataSource:[],
dataSource: [],
bomForm: {},
- approveContent:"",
imageSrc: null,
drawerVisible: true,
+ auditVisible: true,
loading: false,
labelCol: {
xs: { span: 24 },
@@ -278,26 +281,6 @@
}
],
validatorRules: {
- version: {
- rules: [
- { required: true, message: '璇疯緭鍏ユ枃妗ｇ増鏈�!'},
- ]
- },
- applyUser: {
- rules: [
- { required: true, message: '璇烽�夋嫨鐢宠浜�!'},
- ]
- },
- approveContent: {
- rules: [
- { required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!'},
- ]
- },
- docName: {
- rules: [
- { required: true, message: '璇疯緭鍏ユ枃妗ｅ悕绉�!'},
- ]
- },
status: {
rules: [
{ required: true, message: '璇烽�夋嫨瀹℃壒鐘舵��!'},
@@ -313,10 +296,9 @@
url: {
queryOutBoundOrder: '/tms/outboundOrder/queryById',
queryOutBoundDetailList: '/tms/outboundOrder/listOutboundDetailByMainId',
- queryBomDataById: '/nc/activit/selectVoById',
diagramView: '/assign/flow/diagramView',
queryHisTaskList:'/assign/flow/queryHisTaskList',
- approve:"/nc/activit/assign/file/approve",
+ approve:"/tms/outboundOrder/approval",
},
dictOptions: {},
superFieldList: [],
@@ -364,7 +346,7 @@
this.$message.warning('璇烽�夋嫨瀹℃壒鐘舵�侊紒')
return false;
}
- if (!that.assignFileStream.approveContent==null || that.assignFileStream.approveContent===undefined) {
+ if (!that.assignFileStream.approvalOpinion==null || that.assignFileStream.approvalOpinion===undefined) {
this.$message.warning('璇疯緭鍏ュ鎵规剰瑙侊紒')
return false;
}
@@ -376,9 +358,8 @@
let method = 'post';
let flowTaskVo = {}
flowTaskVo.status=that.assignFileStream.status;
- flowTaskVo.approveContent =that.assignFileStream.approveContent;
- flowTaskVo.comment =that.assignFileStream.approveContent;
- flowTaskVo.secretLevel = that.assignFileStream.secretLevel;
+ flowTaskVo.approvalOpinion =that.assignFileStream.approvalOpinion;
+ flowTaskVo.comment =that.assignFileStream.approvalOpinion;
flowTaskVo.dataId = this.selectShenpiData.dataId
flowTaskVo.taskId = this.selectShenpiData.id
flowTaskVo.userId = this.selectShenpiData.assignee
@@ -386,7 +367,6 @@
flowTaskVo.targetKey = this.selectShenpiData.taskDefKey
flowTaskVo.values = this.selectShenpiData.variables
flowTaskVo.assignee = this.selectShenpiData.assignee
- flowTaskVo.secretLevel = that.assignFileStream.secretLevel;
console.log("琛ㄥ崟鎻愪氦鏁版嵁",flowTaskVo)
httpAction(url,flowTaskVo,method).then((res)=>{
if(res.success){
--
Gitblit v1.9.3