入库类型合并为订单类型

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

@@ -108,8 +108,8 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="入库类型" prop="orderTypeId">
-          <el-select v-model="queryParams.orderTypeId" placeholder="请选择入库类型" clearable>
+        <el-form-item label="订单类型" prop="orderTypeId">
+          <el-select v-model="queryParams.orderTypeId" placeholder="请选择订单类型" clearable>
             <el-option
               v-for="dict in dict.type.inbound_type"
               :key="dict.value"
@@ -146,7 +146,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="订单类型" prop="orderType">
+        <!-- <el-form-item label="订单类型" prop="orderType">
           <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable>
             <el-option
               v-for="dict in dict.type.order_type"
@@ -155,7 +155,7 @@
               :value="dict.value"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </page-wrapper-search>
 
       <!-- 表格区域 -->
@@ -171,7 +171,7 @@
           <el-table-column label="批次号" align="center" prop="batchId" min-width="200"/>
           <el-table-column label="系统编号" align="center" prop="systemNo" min-width="200"/>
           <el-table-column label="货主" align="center" prop="ownerName" min-width="200"/>
-          <el-table-column label="入库类型" align="center" prop="orderTypeId" show-overflow-tooltip min-width="200">
+          <el-table-column label="订单类型" align="center" prop="orderTypeId" show-overflow-tooltip min-width="200">
             <template slot-scope="scope">
               <el-tag
                 :type="getDictTagClass('inbound_type', scope.row.orderTypeId)"
@@ -181,7 +181,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="订单类型" align="center" prop="orderType" show-overflow-tooltip min-width="200">
+          <!-- <el-table-column label="订单类型" align="center" prop="orderType" show-overflow-tooltip min-width="200">
             <template slot-scope="scope">
               <el-tag
                 :type="getDictTagClass('order_type', scope.row.orderType)"
@@ -190,7 +190,7 @@
                 {{ getDictLabel('order_type', scope.row.orderType) }}
               </el-tag>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="入库单状态" align="center" prop="orderStatus" min-width="200">
             <template slot-scope="scope">
               <el-tag 
@@ -279,8 +279,8 @@
             <el-form-item label="批次号" prop="batchId">
               <el-input v-model="form.batchId" placeholder="请输入批次号" />
             </el-form-item>
-            <el-form-item label="入库类型" prop="orderTypeId">
-              <el-select v-model="form.orderTypeId" placeholder="请选择入库类型" clearable>
+            <el-form-item label="订单类型" prop="orderTypeId">
+              <el-select v-model="form.orderTypeId" placeholder="请选择订单类型" clearable>
                 <el-option
                   v-for="dict in dict.type.inbound_type"
                   :key="dict.value"
@@ -289,15 +289,6 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="入库日期" prop="inboundDate">
-              <el-date-picker
-                clearable
-                v-model="form.inboundDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择入库日期"
-              />
-            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="系统编号" prop="systemNo">
@@ -321,7 +312,16 @@
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item label="订单类型" prop="orderType">
+              <el-form-item label="入库日期" prop="inboundDate">
+              <el-date-picker
+                clearable
+                v-model="form.inboundDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择入库日期"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="订单类型" prop="orderType">
               <el-select v-model="form.orderType" placeholder="请选择订单类型" clearable>
                 <el-option
                   v-for="dict in dict.type.order_type"
@@ -330,7 +330,7 @@
                   :value="dict.value"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
 
@@ -386,12 +386,12 @@
           <el-descriptions-item label="系统编号">{{ detailForm.systemNo || '-' }}</el-descriptions-item>
           <el-descriptions-item label="批次号">{{ detailForm.batchId || '-' }}</el-descriptions-item>
           <el-descriptions-item label="货主">{{ detailForm.ownerName || detailForm.ownerId || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="入库类型">
+          <el-descriptions-item label="订单类型">
             {{ getDictLabel('inbound_type', detailForm.orderTypeId) }}
           </el-descriptions-item>
-          <el-descriptions-item label="订单类型">
+          <!-- <el-descriptions-item label="订单类型">
             {{ getDictLabel('order_type', detailForm.orderType) }}
-          </el-descriptions-item>
+          </el-descriptions-item> -->
           <el-descriptions-item label="入库日期">{{ detailForm.inboundDate || '-' }}</el-descriptions-item>
           <el-descriptions-item label="备注" :span="2">
             <div class="remark-text">{{ detailForm.remark || '-' }}</div>
@@ -582,7 +582,7 @@ export default {
       // 表单校验规则
       rules: {
         orderId: [{ required: true, message: "入库单号不能为空", trigger: "blur" }],
-        orderTypeId: [{ required: true, message: "入库类型不能为空", trigger: "blur" }],
+        orderTypeId: [{ required: true, message: "订单类型不能为空", trigger: "blur" }],
         systemNo: [{ required: true, message: "系统编号不能为空", trigger: "blur" }],
         batchId: [{ required: true, message: "批次号不能为空", trigger: "blur" }],
         ownerId: [{ required: true, message: "货主不能为空", trigger: "change" }]