入库查询bug，入库重置bug

ruoyi-admin-vue/src/components/Search/PageWrapperSearch.vue

@@ -105,6 +105,11 @@ export default {
     window.removeEventListener('resize', this.handleResize)
   },
   methods: {
+    //  resetFields() {
+    //   if (this.ElFormRef && typeof this.ElFormRef.resetFields === 'function') {
+    //     this.ElFormRef.resetFields()
+    //   }
+    // },
     handleResize() {
       this.screenWidth = document.documentElement.clientWidth
       this.initSize()

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

@@ -118,7 +118,7 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="55" align="center" fixed />
-          <el-table-column label="入库单号" align="center" prop="orderId" />
+          <el-table-column label="入库单号" align="center" prop="orderId" width="200"/>
           <el-table-column label="系统编号" align="center" prop="systemNo" width="200"/>
           <el-table-column label="入库类型" align="center" prop="orderTypeId" :show-overflow-tooltip="true" width="200">
             <template slot-scope="scope">
@@ -394,15 +394,16 @@ import { listInbound, getInbound, delInbound, addInbound, updateInbound } from "
 import { listInbound_items } from "@/api/inventory/inbound_items"
 import { batchAddInventory } from "@/api/inventory/inventory"
 import InboundItems from "@/views/inventory/inbound_items/index.vue"
-// import PageTitle from "@/components/PageTitle" // 引入字典页面的标题组件
-// import PageWrapperSearch from "@/components/PageWrapperSearch" // 引入搜索包装组件
+import PageTitle from "@/components/PageTitle" // 引入字典页面的标题组件
+import PageWrapperSearch from "@/components/Search/PageWrapperSearch" // 引入搜索包装组件
 import MaterialSelector from "@/views/inventory/materials/materialsSeletor.vue";
 
 export default {
   name: "Inbound",
   components: {
     InboundItems,
-
+    PageTitle,
+    PageWrapperSearch,
     MaterialSelector
   },
   data() {
@@ -563,7 +564,7 @@ export default {
         orderStatus: null,
         orderType: null
       }
-      this.resetForm("queryForm")
+      // this.$refs.queryForm.resetFields()
       this.handleQuery()
     },
 
@@ -584,7 +585,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const id = row.id || this.ids
+      const id = row.id
       getInbound(id).then(response => {
         this.form = response.data
         this.orderId = response.data.orderId
@@ -699,8 +700,8 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.orderId || this.ids.length
-      this.$confirm((row.orderId ? '是否确认删除入库单编号为"' + ids + '"的数据项？' : '是否确认删除选中的' + ids + '条入库单'), '提示', {
+      const ids = row.id || this.ids.length
+      this.$confirm((row.orderId ? '是否确认删除入库单编号为"' + row.orderId + '"的数据项？' : '是否确认删除选中的' + ids + '条入库单'), '提示', {
         type: 'warning'
       }).then(() => {
         return delInbound(ids)

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

@@ -410,9 +410,12 @@ export default {
   methods: {
     // 根据字典类型和值，获取对应的listClass（标签样式）
     getDictListClass(dictType, value) {
+      console.log(value)
       const dictList = this.dict.type[dictType] || []
+      console.log(dictList)
       if (!value) return 'info'
-      const dictItem = dictList.find(item => item.value === value)
+      const dictItem = dictList.find(item => item.value === value+"")
+
       // 兼容raw和直接属性两种写法
       return  dictItem?.raw?.listClass || 'info'
     },
@@ -421,7 +424,7 @@ export default {
     getDictLabel(dictType, value) {
       const dictList = this.dict.type[dictType] || []
       if (!value) return ''
-      const dictItem = dictList.find(item => item.value === value)
+      const dictItem = dictList.find(item => item.value === value+"")
       return dictItem?.label || value
     },
 

ruoyi-inventory/src/main/resources/mapper/inventory/InboundOrdersMapper.xml

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectInboundOrdersVo"/>
         <where>  
             <if test="id != null  and Id != ''"> and id = #{Id}</if>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="systemNo != null  and systemNo != ''"> and system_no = #{systemNo}</if>
             <if test="orderTypeId != null  and orderTypeId != ''"> and order_type_id = #{orderTypeId}</if>
             <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>