入库页字典配置

ruoyi-admin-vue/src/views/inventory/inbound/details.vue

@@ -247,7 +247,7 @@ import WarehouseSelector from "@/views/compononents/WarehouseSelector.vue"
 import LocationSelector from "@/views/compononents/LocationSelector.vue"
 
 export default {
-  name: "Inbound",
+  name: "InboundDetails",
   dicts: ['label_color'],
   filters: {
     dictFilter(value, dictType) {
@@ -351,7 +351,7 @@ export default {
     }
   },
   mounted(){
-    console.log("标签颜色字典数据：", this.dict.type.label_color);
+    // console.log("标签颜色字典数据：", this.dict.type.label_color);
   },
   created() {
     this.getList()
@@ -377,7 +377,7 @@ export default {
     /** 查询入库列表 */
     getList() {
       this.loading = true
-      console.log(this.queryParams)
+     
       inbound_details(this.queryParams).then(response => {
         this.inboundList = response.rows
         this.total = response.total
@@ -464,7 +464,6 @@ export default {
       this.queryLocationName = null
       this.queryParams.locationId = null
       this.handleQuery()
-      console.log('selected warehouse', warehouse);
     },
     /** 清空仓库选择 */
     clearQueryWarehouse() {
@@ -578,7 +577,6 @@ export default {
         // 捕获取消确认/接口失败的异常
         if (error !== 'cancel') {
           this.$message.error('确认入库失败：' + (error.msg || '网络异常'));
-          console.log(error)
         }
       }
     },

ruoyi-admin-vue/src/views/inventory/inbound/index.vue

@@ -88,10 +88,10 @@
         <el-form-item label="入库类型" prop="orderTypeId">
           <el-select v-model="queryParams.orderTypeId" placeholder="请选择入库类型" clearable>
             <el-option
-              v-for="item in inBoundTypeOptions"
-              :key="item.orderTypeId"
-              :label="item.orderTypeName"
-              :value="item.orderTypeId"
+              v-for="dict in dict.type.inbound_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             />
           </el-select>
         </el-form-item>
@@ -117,20 +117,20 @@
         <el-form-item label="入库单状态" prop="orderStatus">
           <el-select v-model="queryParams.orderStatus" placeholder="请选择入库单状态" clearable>
             <el-option
-              v-for="item in inBoundStatusOptions"
-              :key="item.orderStatus"
-              :label="item.orderStatusName"
-              :value="item.orderStatus"
+              v-for="dict in dict.type.inbound_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             />
           </el-select>
         </el-form-item>
         <el-form-item label="订单类型" prop="orderType">
           <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable>
             <el-option
-              v-for="item in orderTypeOptions"
-              :key="item.orderType"
-              :label="item.orderTypeName"
-              :value="item.orderType"
+              v-for="dict in dict.type.order_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             />
           </el-select>
         </el-form-item>
@@ -151,16 +151,20 @@
           <el-table-column label="货主" align="center" prop="ownerName" width="200"/>
           <el-table-column label="入库类型" align="center" prop="orderTypeId" :show-overflow-tooltip="true" width="200">
             <template slot-scope="scope">
-              <el-tag type="success" size="small">
-                {{ getInBoundTypeName(scope.row.orderTypeId) }}
+              <el-tag 
+              :type="getDictListClass('inbound_type',scope.row.orderTypeId)"
+              size="small">
+                {{ getDictLabel('inbound_type',scope.row.orderTypeId) }}
               </el-tag>
             </template>
           </el-table-column>
 
           <el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="200">
             <template slot-scope="scope">
-              <el-tag type="success" size="small">
-                {{ getOrderTypeName(scope.row.orderType) }}
+              <el-tag 
+              :type="getDictListClass('order_type',scope.row.orderTypeId)"
+              size="small">
+                {{ getDictLabel('order_type',scope.row.orderTypeId) }}
               </el-tag>
             </template>
           </el-table-column>
@@ -168,8 +172,8 @@
           <el-table-column label="入库单状态" align="center" prop="orderStatus" width="200">
             <!-- 状态显示 -->
             <template slot-scope="scope">
-              <el-tag :type="getStatusType(scope.row.orderStatus)" size="small" width="200">
-                {{ getStatusName(scope.row.orderStatus) }}
+              <el-tag :type="getDictListClass('inbound_status',scope.row.orderStatus+'')" size="small" width="200">
+                {{ getDictLabel('inbound_status',scope.row.orderStatus+"") }}
               </el-tag>
             </template>
           </el-table-column>
@@ -248,10 +252,10 @@
             <el-form-item label="入库类型" prop="orderTypeId">
               <el-select v-model="form.orderTypeId" placeholder="请选择入库类型" clearable>
                 <el-option
-                  v-for="item in inBoundTypeOptions"
-                  :key="item.orderTypeId"
-                  :label="item.orderTypeName"
-                  :value="item.orderTypeId"
+                  v-for="dict in dict.type.inbound_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
                 />
               </el-select>
             </el-form-item>
@@ -291,18 +295,18 @@
             <el-form-item label="订单类型" prop="orderType">
               <el-select v-model="form.orderType" placeholder="请选择订单类型" clearable>
                 <el-option
-                  v-for="item in orderTypeOptions"
-                  :key="item.orderType"
-                  :label="item.orderTypeName"
-                  :value="item.orderType"
+                  v-for="dict in dict.type.order_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
                 />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-divider content-position="center">入库其他信息</el-divider>
-        <el-row :gutter="24">
+        <!-- <el-divider content-position="center">入库其他信息</el-divider> -->
+        <!-- <el-row :gutter="24">
           <el-col :span="12">
             <div class="form-col">
               <el-form-item label="计划量" prop="totalPlannedQuantity">
@@ -311,9 +315,9 @@
               <el-form-item label="总件数" prop="totalPackages">
                 <el-input v-model="form.totalPackages" placeholder="请输入总件数" />
               </el-form-item>
-              <!-- <el-form-item label="仓库ID" prop="warehouseId">
+              <el-form-item label="仓库ID" prop="warehouseId">
                 <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
-              </el-form-item> -->
+              </el-form-item>
             </div>
           </el-col>
 
@@ -325,7 +329,7 @@
               <el-input v-model="form.opUserName" placeholder="请输入负责人" />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -380,16 +384,16 @@
           <el-descriptions-item label="批次ID">{{ detailForm.batchId || '-' }}</el-descriptions-item>
           <el-descriptions-item label="货主">{{ detailForm.ownerName || detailForm.ownerId || '-' }}</el-descriptions-item>
           <el-descriptions-item label="入库类型">
-            {{ getInBoundTypeName(detailForm.orderTypeId) }}
+            {{ getDictLabel('inbound_type',detailForm.orderTypeId) }}
           </el-descriptions-item>
           <el-descriptions-item label="订单类型">
-            {{ getOrderTypeName(detailForm.orderType) }}
+            {{ getDictLabel('order_type',detailForm.orderType) }}
           </el-descriptions-item>
           <el-descriptions-item label="入库日期">{{ detailForm.inboundDate || '-' }}</el-descriptions-item>
           <el-descriptions-item label="负责人">{{ detailForm.opUserName || '-' }}</el-descriptions-item>
           <el-descriptions-item label="计划量">{{ detailForm.totalPlannedQuantity || '-' }}</el-descriptions-item>
           <el-descriptions-item label="实际量">{{ detailForm.totalActualQuantity || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="总件数">{{ detailForm.totalPackages || '-' }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="总件数">{{ detailForm.totalPackages || '-' }}</el-descriptions-item> -->
           <!-- <el-descriptions-item label="仓库ID">{{ detailForm.warehouseId || '-' }}</el-descriptions-item> -->
           <el-descriptions-item label="备注" :span="2">
             <div class="remark-text">{{ detailForm.remark || '-' }}</div>
@@ -475,6 +479,7 @@ import LocationSelector from "@/views/compononents/LocationSelector.vue"
 
 export default {
   name: "Inbound",
+  dicts: ['inbound_type','order_type','inbound_status'],
   components: {
     InboundItems,
     PageTitle,
@@ -487,19 +492,11 @@ export default {
   },
   data() {
     return {
-      inBoundTypeOptions: [
-        { orderTypeId: '1', orderTypeName: '入库类型1' },
-        { orderTypeId: '2', orderTypeName: '入库类型2' }
-      ],
       inBoundStatusOptions: [
         { orderStatus: 1, orderStatusName: '草稿', type: 'info' },
         { orderStatus: 2, orderStatusName: '已完成', type: 'success' },
         { orderStatus: 3, orderStatusName: '已取消', type: 'danger' }
       ],
-      orderTypeOptions: [
-        { orderType: '1', orderTypeName: '订单类型1' },
-        { orderType: '2', orderTypeName: '订单类型2' }
-      ],
       // 货主选择相关（对齐退库组件）
       queryOwnerName: null,
       ownerSelectorVisible: false,
@@ -606,6 +603,9 @@ export default {
       }
     }
   },
+  mounted() {
+    console.log("dict:",this.dict)
+  },
   created() {
     this.getList()
   },
@@ -631,10 +631,19 @@ export default {
       const item = this.inBoundStatusOptions.find(item => item.orderStatus === status)
       return item ? item.orderStatusName : status
     },
-    getInBoundTypeName(typeId) {
-      if (!typeId) return '未知类型'
-      const item = this.inBoundTypeOptions.find(item => item.orderTypeId === typeId)
-      return item ? item.orderTypeName : '未知类型'
+    getDictLabel(dictType, value) {
+      // 1. 空值/字典不存在时返回默认值
+      if (!value || !this.dict?.type?.[dictType]) return '-';
+      // 2. 从字典数组中匹配 value 对应的 label
+      const dictItem = this.dict.type[dictType].find(item => item.value === value);
+      return dictItem?.label || '-';
+    },
+    getDictListClass(dictType, value){
+      // 1. 空值/字典不存在时返回默认值
+      if (!value || !this.dict?.type?.[dictType]) return '-';
+      // 2. 从字典数组中匹配 value 对应的 label
+      const dictItem = this.dict.type[dictType].find(item => item.value === value);
+      return dictItem?.raw?.listClass || '';
     },
     getOrderTypeName(type) {
       if (!type) return '未知类型'
@@ -948,7 +957,6 @@ export default {
             inboundOrderId: this.form.id || null
           }))
         }
-        console.log(submitData)
         if (this.form.id != null) {
           updateInbound(submitData).then(response => {
             this.$message.success("修改成功")
@@ -957,7 +965,6 @@ export default {
           })
         } else {
           addInbound(submitData).then(response => {
-            console.log(submitData)
             this.$message.success("新增成功")
             this.open = false
             this.getList()