From 3db6d5c4d17ab9942a5c89a167c1f06ca485f355 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 16 七月 2025 21:21:14 +0800 Subject: [PATCH] 二保工单审批调整 --- src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue | 204 ++++++++++++++++++++++---------------------------- 1 files changed, 91 insertions(+), 113 deletions(-) diff --git a/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue b/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue index e246065..47c06d1 100644 --- a/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue +++ b/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue @@ -39,12 +39,12 @@ style="width: 100%" /> </a-form-model-item> </a-col> - <a-col :span="8"> - <a-form-model-item prop="operator" label="淇濆吇浜�"> - <j-search-select-tag v-model="model.operator" placeholder="璇烽�夋嫨淇濆吇浜�" :disabled="!model.equipmentId" - :dictOptions="maintenanceOperatorOptions" /> - </a-form-model-item> - </a-col> +<!-- <a-col :span="8">--> +<!-- <a-form-model-item prop="operator" label="淇濆吇浜�">--> +<!-- <j-search-select-tag v-model="model.operator" placeholder="璇烽�夋嫨淇濆吇浜�" :disabled="!model.equipmentId"--> +<!-- :dictOptions="maintenanceOperatorOptions" />--> +<!-- </a-form-model-item>--> +<!-- </a-col>--> <a-col :span="8"> <a-form-model-item prop="maintenancePeriod" label="淇濆吇鍛ㄦ湡"> <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.maintenancePeriod" disabled /> @@ -71,21 +71,6 @@ :height="300" :dataSource="detail.dataSource" :columns="detail.columns" - style="margin-top: 8px;" /> - </a-tab-pane> - <a-tab-pane key="2" tab="绮惧害鍙傛暟" :forceRender="true"> - <j-vxe-table - ref="editablePrecisionDetailTable" - :rowNumber="true" - :rowSelection="true" - :bordered="true" - :alwaysEdit="true" - :toolbar="false" - :toolbarConfig="precisionDetail.toolbarConfig" - keep-source - :height="300" - :dataSource="precisionDetail.dataSource" - :columns="precisionDetail.columns" style="margin-top: 8px;" /> </a-tab-pane> </a-tabs> @@ -144,8 +129,6 @@ standardDetail: '/eam/eamMaintenanceStandardDetail/queryList', detail: '/eam/thirdMaintenanceOrderDetail/queryList', userSelect: '/eam/user_select/list', - precisionDetail: '/eam/equipmentPrecisionParameters/queryList', - precisionCheckDetail: '/eam/precisionCheckDetail/queryList', }, detail: { loading: false, @@ -206,59 +189,59 @@ btn: ['add', 'remove', 'clearSelection'] } }, - precisionDetail: { - loading: false, - dataSource: [], - columns: [ - { - title: 'ID', - key: 'id', - type: JVXETypes.hidden - }, - { - title: 'orderId', - key: 'orderId', - type: JVXETypes.hidden - }, - { - title: 'equipmentId', - key: 'equipmentId', - type: JVXETypes.hidden - }, - { - title: 'parameterId', - key: 'parameterId', - type: JVXETypes.hidden - }, - { - title: '妫�娴嬮」鐩�', - key: 'parameterId_dictText', - type: JVXETypes.normal, - width: '25%', - align: 'center' - }, - { - title: '鍙傛暟缂栫爜', - key: 'parameterCode_dictText', - type: JVXETypes.normal, - width: '20%', - align: 'center', - }, - { - title: '鍏佸樊鍊�', - key: 'parameterValue', - type: JVXETypes.normal, - width: '30%', - align: 'center', - } - ], - toolbarConfig: { - // prefix 鍓嶇紑锛泂uffix 鍚庣紑 - slot: ['prefix', 'suffix'], - // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳 - btn: ['add', 'remove', 'clearSelection'] - } - } + // precisionDetail: { + // loading: false, + // dataSource: [], + // columns: [ + // { + // title: 'ID', + // key: 'id', + // type: JVXETypes.hidden + // }, + // { + // title: 'orderId', + // key: 'orderId', + // type: JVXETypes.hidden + // }, + // { + // title: 'equipmentId', + // key: 'equipmentId', + // type: JVXETypes.hidden + // }, + // { + // title: 'parameterId', + // key: 'parameterId', + // type: JVXETypes.hidden + // }, + // { + // title: '妫�娴嬮」鐩�', + // key: 'parameterId_dictText', + // type: JVXETypes.normal, + // width: '25%', + // align: 'center' + // }, + // { + // title: '鍙傛暟缂栫爜', + // key: 'parameterCode_dictText', + // type: JVXETypes.normal, + // width: '20%', + // align: 'center', + // }, + // { + // title: '鍏佸樊鍊�', + // key: 'parameterValue', + // type: JVXETypes.normal, + // width: '30%', + // align: 'center', + // } + // ], + // toolbarConfig: { + // // prefix 鍓嶇紑锛泂uffix 鍚庣紑 + // slot: ['prefix', 'suffix'], + // // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳 + // btn: ['add', 'remove', 'clearSelection'] + // } + // } } }, created() { @@ -279,7 +262,7 @@ this.editable = true this.detail.dataSource = [] this.loadDetail(record.id) - this.loadPrecisionDetail(record.id) + // this.loadPrecisionDetail(record.id) }, close() { this.$emit('close') @@ -300,11 +283,6 @@ let removeData = that.$refs.editableDetailTable.getDeleteData() that.model.tableDetailList = [...tableData] that.model.removeDetailList = [...removeData] - - let precisionDetailList = that.$refs.editablePrecisionDetailTable.getTableData() - let removePrecisionDetailList = that.$refs.editablePrecisionDetailTable.getDeleteData() - that.model.precisionDetailList = [...precisionDetailList] - that.model.removePrecisionDetailList = [...removePrecisionDetailList] that.confirmLoading = true let httpurl = '' @@ -415,39 +393,39 @@ if (that.model.operator) delete that.model.operator }) }, - loadPrecisionParameterList(equipmentId) { - this.precisionDetail.dataSource = [] - if (equipmentId) { - this.spinning = true - getAction(this.url.precisionDetail, { equipmentId: equipmentId }) - .then(res => { - if (res.success) { - this.precisionDetail.dataSource = res.result.map(item => ({ - equipmentId: item.equipmentId, - parameterId: item.parameterId, - parameterId_dictText: item.parameterId_dictText, - parameterCode_dictText: item.parameterCode_dictText, - parameterValue: item.parameterValue, - })) - } - }) - .finally(() => { - this.spinning = false - }) - } - }, - loadPrecisionDetail(orderId) { - if (orderId) { - getAction(this.url.precisionCheckDetail, { orderId: orderId }).then(res => { - if (res.success) { - this.precisionDetail.dataSource = [...res.result] - } - }) - } - }, + // loadPrecisionParameterList(equipmentId) { + // this.precisionDetail.dataSource = [] + // if (equipmentId) { + // this.spinning = true + // getAction(this.url.precisionDetail, { equipmentId: equipmentId }) + // .then(res => { + // if (res.success) { + // this.precisionDetail.dataSource = res.result.map(item => ({ + // equipmentId: item.equipmentId, + // parameterId: item.parameterId, + // parameterId_dictText: item.parameterId_dictText, + // parameterCode_dictText: item.parameterCode_dictText, + // parameterValue: item.parameterValue, + // })) + // } + // }) + // .finally(() => { + // this.spinning = false + // }) + // } + // }, + // loadPrecisionDetail(orderId) { + // if (orderId) { + // getAction(this.url.precisionCheckDetail, { orderId: orderId }).then(res => { + // if (res.success) { + // this.precisionDetail.dataSource = [...res.result] + // } + // }) + // } + // }, initParams() { this.detail.dataSource = [] - this.precisionDetail.dataSource = [] + // this.precisionDetail.dataSource = [] this.activeTabKey = '1' }, } -- Gitblit v1.9.3