| src/views/flowable/workflow/FlowTodo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/flowable/workflow/FlowTodo.vue
@@ -371,7 +371,7 @@ title: '流程分类', align: 'center', dataIndex: 'category_dictText', width: 100 width: 200 }, { title: '流程名称', @@ -397,13 +397,13 @@ title: '前驱节点', align: 'center', dataIndex: 'preNode', width: 300 width: 250 }, { title: '当前节点', align: 'center', dataIndex: 'name', width: 300 width: 250 }, { title: '当前节点开始时间', src/views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue
@@ -28,7 +28,7 @@ </a-form-model-item> </a-col> </a-row> <a-row :guitter="24"> <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanDepartId_dictText" label="借入车间"> <a-input v-model="model.leanDepartId_dictText" disabled /> @@ -52,38 +52,46 @@ </a-form-model-item> </a-col> </a-row> <div v-if="approvalDisable"> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 管理员审批 <div v-if="leanOutApprovalDisable"> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 使用车间出厂审批 </a-divider> <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalDealType" label="审批类型"> <j-dict-select-tag type="radio" v-model="model.approvalDealType" dictCode="approved_rejected" placeholder="请选择处理类型" :disabled="disableSubmit || initialAcceptanceDisable" /> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useApprovalDealType" label="审批类型"> <j-dict-select-tag type="radio" v-model="model.useApprovalDealType" dictCode="approved_rejected" placeholder="请选择处理类型" :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_OUT'"/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="确认意见"> <a-textarea placeholder="请输入确认意见" v-model="model.approvalComment" :disabled="disableSubmit || returnDisable" /> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useApprovalComment" label="确认意见"> <a-textarea placeholder="请输入确认意见" v-model="model.useApprovalComment" :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_OUT'"/> </a-form-model-item> </a-col> </a-row> </div> <!-- <div v-if="returnDisable">--> <!-- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 归还信息--> <!-- </a-divider>--> <!-- <a-row :gutter="24">--> <!-- <a-col :span="24">--> <!-- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnComment"--> <!-- label="归还备注">--> <!-- <a-textarea placeholder="请输入归还备注" v-model="model.returnComment"--> <!-- :disabled="disableSubmit || confirmDisable" />--> <!-- </a-form-model-item>--> <!-- </a-col>--> <!-- </a-row>--> <!-- </div>--> <div v-if="leanInApprovalDisable"> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 借用车间出厂审批 </a-divider> <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanOutApprovalDealType" label="审批类型"> <j-dict-select-tag type="radio" v-model="model.leanOutApprovalDealType" dictCode="approved_rejected" placeholder="请选择处理类型" :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_IN'"/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanOutApprovalComment" label="确认意见"> <a-textarea placeholder="请输入确认意见" v-model="model.leanOutApprovalComment" :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_IN'"/> </a-form-model-item> </a-col> </a-row> </div> </a-form-model> </a-spin> </j-modal> @@ -130,18 +138,18 @@ spinning: false, imageSrc: null, validatorRules: { approvalDealType: [ useApprovalDealType: [ { required: true, message: '请选择通过或驳回!' } ], approvalComment: [ leanOutApprovalDealType: [ { required: true, message: '请选择通过或驳回!' } ], useApprovalComment: [ { required: true, message: '请输入审批意见!' } ], returnComment: [ { required: true, message: '请输入归还备注!' } leanOutApprovalComment: [ { required: true, message: '请输入审批意见!' } ], confirmComment: [ { required: true, message: '请输入确认意见!' } ] }, url: { queryById: '/eam/eamEquipmentLeanOut/queryById', @@ -155,17 +163,11 @@ this.loadAllProductionTree() }, computed: { approvalDisable: function() { return ['WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) leanOutApprovalDisable: function() { return ['WAIT_APPROVAL_OUT', 'WAIT_APPROVAL_IN', 'COMPLETE'].includes(this.model.leanStatus) }, returnDisable: function() { return ['WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) }, confirmDisable: function() { return ['WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) }, completionDisable: function() { return ['COMPLETE'].includes(this.model.leanStatus) leanInApprovalDisable: function() { return ['WAIT_APPROVAL_IN', 'COMPLETE'].includes(this.model.leanStatus) } }, methods: { @@ -179,7 +181,7 @@ this.model.userId = item.assignee this.model.instanceId = item.procInstId this.model.values = item.variables this.spinning = false; this.spinning = false }, recordDetail(record) { @@ -224,7 +226,7 @@ close() { this.$emit('close') this.visible = false this.$refs.form.clearValidate() if (this.$refs.form) this.$refs.form.clearValidate() }, loadAllProductionTree() { //加载车间选择树 @@ -232,7 +234,7 @@ if (res.success) { this.treeData = [...res.result] } else { that.$message.warning(res.message) this.$message.warning(res.message) } }) } src/views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue
@@ -28,7 +28,7 @@ </a-form-model-item> </a-col> </a-row> <a-row :guitter="24"> <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanDepartId_dictText" label="借入车间"> <a-input v-model="model.leanDepartId_dictText" disabled /> @@ -52,15 +52,83 @@ </a-form-model-item> </a-col> </a-row> <div v-if="confirmDisable"> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 管理员确认 <div> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 使用车间出厂审批 </a-divider> <a-row :gutter="24"> <a-col :span="24"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmComment" <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="审批类型"> <j-dict-select-tag type="radio" v-model="model.useApprovalDealType" dictCode="approved_rejected" placeholder="请选择处理类型" disabled/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="确认意见"> <a-textarea placeholder="请输入确认意见" v-model="model.useApprovalComment" disabled/> </a-form-model-item> </a-col> </a-row> </div> <div> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 借用车间出厂审批 </a-divider> <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="审批类型"> <j-dict-select-tag type="radio" v-model="model.leanOutApprovalDealType" dictCode="approved_rejected" placeholder="请选择处理类型" disabled/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="确认意见"> <a-textarea placeholder="请输入意见" v-model="model.confirmComment" :disabled="disableSubmit || completionDisable" /> <a-textarea placeholder="请输入确认意见" v-model="model.leanOutApprovalComment" disabled/> </a-form-model-item> </a-col> </a-row> </div> <div v-if="returnConfirmApprovalDisable"> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 借用车间归还确认 </a-divider> <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanOutConfirmDealType" label="审批类型"> <j-dict-select-tag type="radio" v-model="model.leanOutConfirmDealType" dictCode="approved_rejected" placeholder="请选择处理类型" :disabled="disableSubmit||model.leanStatus!=='WAIT_CONFIRM_RETURN'"/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanOutConfirmComment" label="确认意见"> <a-textarea placeholder="请输入意见" v-model="model.leanOutConfirmComment" :disabled="disableSubmit||model.leanStatus!=='WAIT_CONFIRM_RETURN'"/> </a-form-model-item> </a-col> </a-row> </div> <div v-if="borrowConfirmApprovalDisable"> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 使用车间归还确认 </a-divider> <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useConfirmDealType" label="审批类型"> <j-dict-select-tag type="radio" v-model="model.useConfirmDealType" dictCode="approved_rejected" placeholder="请选择处理类型" :disabled="disableSubmit||model.leanStatus!=='WAIT_CONFIRM_BORROW'"/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useConfirmComment" label="确认意见"> <a-textarea placeholder="请输入意见" v-model="model.useConfirmComment" :disabled="disableSubmit||model.leanStatus!=='WAIT_CONFIRM_BORROW'"/> </a-form-model-item> </a-col> </a-row> @@ -111,16 +179,16 @@ spinning: false, imageSrc: null, validatorRules: { approvalDealType: [ leanOutConfirmDealType: [ { required: true, message: '请选择通过或驳回!' } ], approvalComment: [ { required: true, message: '请输入审批意见!' } leanOutConfirmComment: [ { required: true, message: '请输入确认意见!' } ], returnComment: [ { required: true, message: '请输入归还备注!' } useConfirmDealType: [ { required: true, message: '请选择通过或驳回!' } ], confirmComment: [ useConfirmComment: [ { required: true, message: '请输入确认意见!' } ] }, @@ -136,17 +204,11 @@ this.loadAllProductionTree() }, computed: { approvalDisable: function() { return ['WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) returnConfirmApprovalDisable: function() { return ['WAIT_CONFIRM_RETURN', ' WAIT_CONFIRM_BORROW', 'COMPLETE'].includes(this.model.leanStatus) }, returnDisable: function() { borrowConfirmApprovalDisable: function() { return ['WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) }, confirmDisable: function() { return ['WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) }, completionDisable: function() { return ['COMPLETE'].includes(this.model.leanStatus) } }, methods: { @@ -160,7 +222,7 @@ this.model.userId = item.assignee this.model.instanceId = item.procInstId this.model.values = item.variables this.spinning = false; this.spinning = false }, recordDetail(record) {
