2025-10-22

固定载具优化

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)
 
-
-
-

src/views/modules/fixedCarrier/fixedCarrier.vue

@@ -20,12 +20,11 @@
       </el-form-item>
       <el-form-item label="状态">
         <el-select v-model="searchData.status" placeholder="请选择" clearable style="width: 100px">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="空闲" value="1"></el-option>
-          <el-option label="占用" value="2"></el-option>
-          <el-option label="维修" value="3"></el-option>
-          <el-option label="报废" value="4"></el-option>
-          <el-option label="外借" value="5"></el-option>
+          <el-option label="空闲" :value="1"></el-option>
+          <el-option label="占用" :value="2"></el-option>
+          <el-option label="维修" :value="3"></el-option>
+          <el-option label="报废" :value="4"></el-option>
+          <el-option label="外借" :value="5"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label=" ">
@@ -79,7 +78,7 @@
 
     <!-- 新增和修改对话框 -->
     <el-dialog :title="modalTitle" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="487px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form ref="modalForm" :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="BU" prop="bu" :rules="rules.bu">
           <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 150px">
             <el-option
@@ -94,16 +93,17 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="标签条码" prop="carrierNo">
-          <el-input v-model="modalData.carrierNo" :disabled="modalDisableFlag" style="width: 150px"></el-input>
+        <!-- 修改时显示标签条码 -->
+        <el-form-item v-if="modalData.flag === 'update'" label="标签条码" prop="carrierNo">
+          <el-input v-model="modalData.carrierNo" disabled style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="modalData.status" placeholder="请选择" style="width: 120px">
-            <el-option label="空闲" value="空闲"></el-option>
-            <el-option label="占用" value="占用"></el-option>
-            <el-option label="维修" value="维修"></el-option>
-            <el-option label="报废" value="报废"></el-option>
-            <el-option label="外借" value="外借"></el-option>
+            <el-option label="空闲" :value="1"></el-option>
+            <el-option label="占用" :value="2"></el-option>
+            <el-option label="维修" :value="3"></el-option>
+            <el-option label="报废" :value="4"></el-option>
+            <el-option label="外借" :value="5"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -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,