From 9adf602ffdd1cf101520a166a50346d40b077c2e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 四月 2025 10:33:10 +0800
Subject: [PATCH] art: 设备管理-周保-我的待办 处理
---
src/views/flowable/workflow/FlowTodo.vue | 13 ++--
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue | 118 +++++++++++++--------------------------
2 files changed, 45 insertions(+), 86 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 510cacd..2febc49 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -105,7 +105,7 @@
<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" :maintenanceId="dataId"></week-maintenance-approval-modal>
+ <week-maintenance-approval-modal ref = "weekMaintenanceApprovalModal" ></week-maintenance-approval-modal>
</a-card>
</template>
@@ -211,8 +211,6 @@
selectInspectionOrderData:{},
selectInspectionOrderDataBzz:{},
selectBachData:{},
- //涓氬姟淇℃伅ID
- dataId: undefined,
}
},
created() {
@@ -308,10 +306,11 @@
}
},
handleWeekMaintenance(item) {
- this.dataId = item.dataId;
- this.$refs.weekMaintenanceApprovalModal.add()
- this.$refs.weekMaintenanceApprovalModal.title = item.preNode;
- this.$refs.weekMaintenanceApprovalModal.disableSubmit = false;
+ if(item && item.dataId) {
+ this.$refs.weekMaintenanceApprovalModal.handleDetail(item.dataId)
+ this.$refs.weekMaintenanceApprovalModal.title = item.name;
+ this.$refs.weekMaintenanceApprovalModal.disableSubmit = false;
+ }
}
}
}
diff --git a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
index 220a1e6..aed2480 100644
--- a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
@@ -11,7 +11,7 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 璁惧鍩虹淇℃伅
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 淇濆吇鍩虹淇℃伅
</a-divider>
<a-row :gutter="24">
<a-col :span="8">
@@ -23,7 +23,7 @@
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧缂栫爜">
<maintenance-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储" v-model="model.equipmentId"
:maintenanceCategory="maintenanceCategory"
- @autocompleteForm="autocompleteForm" :disabled="editable"></maintenance-equipment-select>
+ @autocompleteForm="autocompleteForm" disabled></maintenance-equipment-select>
</a-form-model-item>
</a-col>
<a-col :span="8">
@@ -35,13 +35,13 @@
<a-row :gutter="24">
<a-col :span="8">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenanceDate" label="淇濆吇鏃ユ湡">
- <a-date-picker placeholder="璇烽�夋嫨璁″垝淇濆吇鏃ユ湡" v-model="model.maintenanceDate" format="YYYY-MM-DD"
+ <a-date-picker placeholder="璇烽�夋嫨璁″垝淇濆吇鏃ユ湡" v-model="model.maintenanceDate" format="YYYY-MM-DD" disabled
style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator" label="淇濆吇浜�">
- <j-search-select-tag v-model="model.operator" placeholder="璇烽�夋嫨淇濆吇浜�"
+ <j-search-select-tag v-model="model.operator" placeholder="璇烽�夋嫨淇濆吇浜�" disabled
:dictOptions="maintenanceOperatorOptions" />
</a-form-model-item>
</a-col>
@@ -53,9 +53,12 @@
</a-row>
<a-row :gutter="24">
<a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="澶囨敞">
- <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" />
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" disabled />
</a-form-model-item>
</a-row>
+
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 淇濆吇椤逛俊鎭�
+ </a-divider>
<a-row :gutter="24">
<j-vxe-table
ref="editableDetailTable"
@@ -72,6 +75,12 @@
:columns="detail.columns"
style="margin-top: 8px;" />
</a-row>
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 鐝粍闀跨‘璁や俊鎭�
+ </a-divider>
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 鍒濋獙鏀朵俊鎭�
+ </a-divider>
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 缁堥獙鏀朵俊鎭�
+ </a-divider>
</a-form-model>
</a-spin>
</j-modal>
@@ -84,15 +93,8 @@
import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect'
export default {
- name: 'EamWeekMaintenanceOrderModal',
+ name: 'WeekMaintenanceApprovalModal',
mixins: [JVxeTableModelMixin],
- props: {
- maintenanceId: {
- type: String,
- default: '',
- required: true,
- }
- },
components: {
MaintenanceEquipmentSelect
},
@@ -100,6 +102,12 @@
return {
title: '鎿嶄綔',
visible: false,
+ //鐘舵�佹帶鍒�
+ //淇濆吇涓� 涓嶅彲缂栬緫
+ underMaintenanceDisable : false,
+ confirmDisable : false,
+ initialAcceptanceDisable : false,
+ finalAcceptanceDisable : false,
editable: false,
model: {},
maintenanceCategory: 'WEEK_MAINTENANCE',
@@ -124,10 +132,9 @@
validatorRules: {
},
url: {
- add: '/eam/weekMaintenanceOrder/add',
- edit: '/eam/weekMaintenanceOrder/edit',
- standardDetail: '/eam/eamMaintenanceStandardDetail/queryList',
+ queryById: '/eam/weekMaintenanceOrder/queryById',
detail: '/eam/weekMaintenanceOrderDetail/queryList',
+ approval : '/eam/weekMaintenanceOrder/approval',
userSelect: '/eam/user_select/list',
},
detail: {
@@ -147,46 +154,37 @@
{
title: '搴忓彿',
key: 'itemCode',
- type: JVXETypes.inputNumber,
+ type: JVXETypes.normal,
width: '10%',
align: 'center',
- validateRules: [
- { required: true, unique: true, message: '搴忓彿涓嶈兘閲嶅' }
- ]
},
{
title: '淇濆吇椤�',
key: 'itemName',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
width: '20%',
align: 'center',
- validateRules: [
- { required: true, message: '淇濆吇椤逛笉鑳戒负绌猴紒' }
- ]
},
{
title: '瀛愪繚鍏婚」',
key: 'subItemName',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
width: '25%',
align: 'center'
},
{
title: '淇濆吇瑕佹眰',
key: 'itemDemand',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
width: '30%',
align: 'center',
- validateRules: [
- { required: true, message: '淇濆吇瑕佹眰涓嶈兘涓虹┖锛�' }
- ]
}
],
toolbarConfig: {
// prefix 鍓嶇紑锛泂uffix 鍚庣紑
slot: ['prefix', 'suffix'],
// add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
- btn: ['add', 'remove', 'clearSelection']
+ btn: ['clearSelection']
}
}
}
@@ -194,20 +192,14 @@
created() {
},
methods: {
- add() {
- //鍒濆鍖栭粯璁ゅ��
- this.model = {}
- this.visible = true
- this.editable = false
+ async handleDetail(dataId) {
+ this.loading = true;
+ this.visible = true;
this.detail.dataSource = []
- this.loadMaintenanceOperatorList();
- },
- edit(record) {
- this.model = Object.assign({}, record)
- this.visible = true
- this.editable = true
- this.detail.dataSource = []
- this.loadDetail(record.id)
+ let res = await getAction(this.url.queryById, {id: dataId});
+ this.model = Object.assign({}, res.result);
+ await this.loadDetail(dataId);
+ this.loading = false;
},
close() {
this.$emit('close')
@@ -225,20 +217,12 @@
this.$refs.form.validate(valid => {
if (valid) {
let tableData = that.$refs.editableDetailTable.getTableData()
- let removeData = that.$refs.editableDetailTable.getDeleteData()
that.model.tableDetailList = [...tableData]
- that.model.removeDetailList = [...removeData]
that.confirmLoading = true
- let httpurl = ''
- let method = ''
- if (!this.model.id) {
- httpurl += this.url.add
- method = 'post'
- } else {
- httpurl += this.url.edit
- method = 'put'
- }
+ let httpurl = this.url.approval
+ let method = 'put'
+
httpAction(httpurl, this.model, method).then((res) => {
if (res.success) {
that.$message.success(res.message)
@@ -259,16 +243,6 @@
this.close()
},
autocompleteForm(selectObj) {
- //鏍囧噯鍚嶇О锛屼繚鍏诲懆鏈熶笉鍒锋柊瑙ｅ喅鍔炴硶
- //鍔炴硶涓� validatorRules equipmentId 杩樻槸鏈夐棶棰�
- // const newObj = {
- // standardName: selectObj.standardName,
- // maintenancePeriod: selectObj.maintenancePeriod,
- // standardId : selectObj.id,
- // equipmentId: selectObj.equipmentId,
- // };
- // this.model = Object.assign({}, newObj, this.model)
- //鍔炴硶浜�
this.$set(this.model, 'standardName', selectObj.standardName)
this.$set(this.model, 'maintenancePeriod', selectObj.maintenancePeriod)
this.$set(this.model, 'standardId', selectObj.id)
@@ -277,22 +251,8 @@
if (!this.model.id) {
this.loadStandardDetail(selectObj.id)
}
+ debugger
this.loadMaintenanceOperatorList(this.model.equipmentId);
- },
- //鍔犺浇璇︽儏鏁版嵁
- loadStandardDetail(standardId) {
- if (standardId) {
- getAction(this.url.standardDetail, { standardId: standardId }).then(res => {
- if (res.success) {
- this.detail.dataSource = res.result.map(item => ({
- itemCode: item.itemCode,
- itemName: item.itemName,
- subItemName: item.subItemName,
- itemDemand: item.itemDemand
- }))
- }
- })
- }
},
//鏍囧噯閫夋嫨鍙樺寲
loadDetail(orderId) {
--
Gitblit v1.9.3