From 6ecce65da54f4dbc1e13a3c8f94deff2e51e97c0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 15 五月 2025 15:41:10 +0800
Subject: [PATCH] art: 设备管理-设备处置 报废 基础代码修改
---
src/views/eam/dispose/EamEquipmentScrapList.vue | 37 ++++++++++--------
src/views/eam/dispose/modules/EamEquipmentScrapModal.vue | 25 +++++++-----
2 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/src/views/eam/dispose/EamEquipmentDisposeList.vue b/src/views/eam/dispose/EamEquipmentScrapList.vue
similarity index 87%
rename from src/views/eam/dispose/EamEquipmentDisposeList.vue
rename to src/views/eam/dispose/EamEquipmentScrapList.vue
index db86104..61fbecf 100644
--- a/src/views/eam/dispose/EamEquipmentDisposeList.vue
+++ b/src/views/eam/dispose/EamEquipmentScrapList.vue
@@ -24,7 +24,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="杞/鎶ュ簾">
- <a-input placeholder="璇疯緭鍏ヨ浆璁�/鎶ュ簾" v-model="queryParam.disposeType"></a-input>
+ <a-input placeholder="璇疯緭鍏ヨ浆璁�/鎶ュ簾" v-model="queryParam.scrapType"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -51,7 +51,7 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('璁惧澶勭疆(杞鎶ュ簾)')">瀵煎嚭</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('璁惧鎶ュ簾(杞)')">瀵煎嚭</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload>
@@ -104,24 +104,24 @@
<!-- table鍖哄煙-end -->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamEquipmentDispose-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentDispose-modal>
+ <eamEquipmentScrap-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentScrap-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
- import EamEquipmentDisposeModal from './modules/EamEquipmentDisposeModal'
+ import EamEquipmentScrapModal from './modules/EamEquipmentScrapModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
- name: "EamEquipmentDisposeList",
+ name: "EamEquipmentScrapList",
mixins:[JeecgListMixin],
components: {
- EamEquipmentDisposeModal
+ EamEquipmentScrapModal
},
data () {
return {
- description: '璁惧澶勭疆(杞鎶ュ簾)绠＄悊椤甸潰',
+ description: '璁惧鎶ュ簾(杞)绠＄悊椤甸潰',
// 琛ㄥご
columns: [
{
@@ -152,7 +152,7 @@
{
title: '杞/鎶ュ簾',
align:"center",
- dataIndex: 'disposeType'
+ dataIndex: 'scrapType'
},
{
title: '鐢宠浜�',
@@ -162,22 +162,27 @@
{
title: '澶勭疆鏃堕棿',
align:"center",
- dataIndex: 'disposeTime'
+ dataIndex: 'scrapTime'
},
{
title: '澶勭疆鐞嗙敱',
align:"center",
- dataIndex: 'disposeReason'
+ dataIndex: 'scrapReason'
},
{
title: '澶勭疆閲戦',
align:"center",
- dataIndex: 'disposeAmount'
+ dataIndex: 'scrapAmount'
},
{
title: '瀹℃牳浜�',
align:"center",
dataIndex: 'approvalUser'
+ },
+ {
+ title: '瀹℃牳鎰忚',
+ align:"center",
+ dataIndex: 'approvalComment'
},
{
title: '瀹℃牳鏃堕棿',
@@ -197,11 +202,11 @@
}
],
url: {
- list: "/eam/eamEquipmentDispose/list",
- delete: "/eam/eamEquipmentDispose/delete",
- deleteBatch: "/eam/eamEquipmentDispose/deleteBatch",
- exportXlsUrl: "eam/eamEquipmentDispose/exportXls",
- importExcelUrl: "eam/eamEquipmentDispose/importExcel",
+ list: "/eam/eamEquipmentScrap/list",
+ delete: "/eam/eamEquipmentScrap/delete",
+ deleteBatch: "/eam/eamEquipmentScrap/deleteBatch",
+ exportXlsUrl: "eam/eamEquipmentScrap/exportXls",
+ importExcelUrl: "eam/eamEquipmentScrap/importExcel",
},
}
},
diff --git a/src/views/eam/dispose/modules/EamEquipmentDisposeModal.vue b/src/views/eam/dispose/modules/EamEquipmentScrapModal.vue
similarity index 86%
rename from src/views/eam/dispose/modules/EamEquipmentDisposeModal.vue
rename to src/views/eam/dispose/modules/EamEquipmentScrapModal.vue
index ca9d651..a7d63d0 100644
--- a/src/views/eam/dispose/modules/EamEquipmentDisposeModal.vue
+++ b/src/views/eam/dispose/modules/EamEquipmentScrapModal.vue
@@ -21,23 +21,26 @@
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧ID">
<a-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="model.equipmentId" />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeType" label="杞/鎶ュ簾">
- <a-input placeholder="璇疯緭鍏ヨ浆璁�/鎶ュ簾" v-model="model.disposeType" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapType" label="杞/鎶ュ簾">
+ <a-input placeholder="璇疯緭鍏ヨ浆璁�/鎶ュ簾" v-model="model.scrapType" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser" label="鐢宠浜�">
<a-input placeholder="璇疯緭鍏ョ敵璇蜂汉" v-model="model.reportUser" />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeTime" label="澶勭疆鏃堕棿">
- <a-input placeholder="璇疯緭鍏ュ缃椂闂�" v-model="model.disposeTime" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapTime" label="澶勭疆鏃堕棿">
+ <a-input placeholder="璇疯緭鍏ュ缃椂闂�" v-model="model.scrapTime" />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeReason" label="澶勭疆鐞嗙敱">
- <a-input placeholder="璇疯緭鍏ュ缃悊鐢�" v-model="model.disposeReason" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapReason" label="澶勭疆鐞嗙敱">
+ <a-input placeholder="璇疯緭鍏ュ缃悊鐢�" v-model="model.scrapReason" />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeAmount" label="澶勭疆閲戦">
- <a-input placeholder="璇疯緭鍏ュ缃噾棰�" v-model="model.disposeAmount" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapAmount" label="澶勭疆閲戦">
+ <a-input placeholder="璇疯緭鍏ュ缃噾棰�" v-model="model.scrapAmount" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalUser" label="瀹℃牳浜�">
<a-input placeholder="璇疯緭鍏ュ鏍镐汉" v-model="model.approvalUser" />
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="瀹℃牳鎰忚">
+ <a-input placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="model.approvalComment" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalTime" label="瀹℃牳鏃堕棿">
<a-input placeholder="璇疯緭鍏ュ鏍告椂闂�" v-model="model.approvalTime" />
@@ -56,7 +59,7 @@
import moment from "moment"
export default {
- name: "EamEquipmentDisposeModal",
+ name: "EamEquipmentScrapModal",
data () {
return {
title:"鎿嶄綔",
@@ -75,8 +78,8 @@
validatorRules:{
},
url: {
- add: "/eam/eamEquipmentDispose/add",
- edit: "/eam/eamEquipmentDispose/edit",
+ add: "/eam/eamEquipmentScrap/add",
+ edit: "/eam/eamEquipmentScrap/edit",
},
}
},
--
Gitblit v1.9.3