From c07ee4c26da26e758c9e6c58530479c0f4cbacef Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 22 Oct 2025 11:03:29 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-22=20=E5=9B=BA=E5=AE=9A=E8=BD=BD?=
=?UTF-8?q?=E5=85=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/fixedCarrier/fixedCarrier.js | 3 --
.../modules/fixedCarrier/fixedCarrier.vue | 50 +++++++++++--------
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/api/fixedCarrier/fixedCarrier.js b/src/api/fixedCarrier/fixedCarrier.js
index 3fe4ca4..aaf055c 100644
--- a/src/api/fixedCarrier/fixedCarrier.js
+++ b/src/api/fixedCarrier/fixedCarrier.js
@@ -35,6 +35,3 @@ export const fixedCarrierDelete = data => createAPI('fixedCarrier/delete', 'POST
*/
export const getSiteAndBuByUserName = data => createAPI('/pms/qc/getSiteAndBuByUserName', 'POST', data)
-
-
-
diff --git a/src/views/modules/fixedCarrier/fixedCarrier.vue b/src/views/modules/fixedCarrier/fixedCarrier.vue
index 9de89bb..77908f2 100644
--- a/src/views/modules/fixedCarrier/fixedCarrier.vue
+++ b/src/views/modules/fixedCarrier/fixedCarrier.vue
@@ -20,12 +20,11 @@
-
-
-
-
-
-
+
+
+
+
+
@@ -79,7 +78,7 @@
-
+
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -216,11 +216,6 @@ export default {
message: ' ',
trigger: ['blur','change']
}],
- carrierNo: [{
- required: true,
- message: ' ',
- trigger: ['blur','change']
- }],
carrierTypeCode: [{
required: true,
message: ' ',
@@ -266,7 +261,18 @@ export default {
this.searchData.limit = this.pageSize
fixedCarrierSearch(this.searchData).then(({data}) => {
if (data && data.code === 0) {
- this.dataList = data.page.list
+ this.dataList = data.page.list.map(item => {
+ // 状态描述转换
+ const statusMap = {
+ 1: '空闲',
+ 2: '占用',
+ 3: '维修',
+ 4: '报废',
+ 5: '外借'
+ }
+ item.statusDesc = statusMap[item.status] || ''
+ return item
+ })
this.totalPage = data.page.totalCount
} else {
this.dataList = []
@@ -300,7 +306,7 @@ export default {
bu: this.userBuList[0].buNo,
site: '',
buNo: '',
- carrierNo: '',
+ carrierNo: '', // 新增时不需要设置，由后端生成
carrierTypeCode: '',
carrierTypeName: '',
assetNo: '',
@@ -309,7 +315,7 @@ export default {
maxWeight: null,
expectedLifeCycles: null,
expectedLifeDays: null,
- status: '空闲',
+ status: 1,
currentLocation: '',
purchaseDate: '',
createBy: this.$store.state.user.name,