wms入库新增页面显示修改

ruoyi-ui/src/views/in/stockIn/add/index_new.vue

@@ -11,18 +11,6 @@
               <el-input v-model="form.erpBill" placeholder="请输入订单号"/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="形态类型" prop="productType"><!--形态类型-->
-              <el-select v-model="form.productType" placeholder="请选择形态类型" >
-                <el-option
-                  v-for="dict in dict.type.product_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="4">
             <el-form-item label="单据类型" prop="inType"><!--单据类型-->
               <el-select v-model="form.inType" placeholder="请选择单据类型" >
@@ -195,6 +183,45 @@
 
     <!-- 选择物料对话框 -->
     <el-dialog title="选择物料" :visible.sync="productSelectVisible" width="1300px" append-to-body>
+      <el-form ref="productForm" :model="queryProductParams" size="small">
+        <el-row>
+          <el-col :span="6" >
+            <el-form-item label="物料名称" prop="productName" label-width="90px">
+              <el-input
+                v-model="queryProductParams.productName"
+                placeholder="请输入物料名称"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="形态类型" prop="spare1" label-width="90px"><!--形态类型-->
+              <el-select v-model="queryProductParams.spare1" placeholder="请选择形态类型">
+                <el-option
+                  v-for="dict in dict.type.product_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6" >
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="getProductList">{{ '搜索' }}
+                <!--搜索--></el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetProductQuery">重置<!--重置--></el-button>
+
+            </el-form-item>
+          </el-col>
+
+
+        </el-row>
+
+
+      </el-form>
+
       <el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
         <el-table-column type="selection" width="55"/>
         <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
@@ -319,7 +346,7 @@
 import {addStockinNew} from "@/api/receive/stockin";
 import {listBasProduct} from "@/api/bas/BasProduct";
 import {listBasSupplier} from "@/api/bas/BasSupplier";
-import { getToken } from "@/utils/auth"
+import {getToken} from "@/utils/auth"
 import {listWarehouse} from "@/api/bas/warehouse"
 
 
@@ -448,6 +475,10 @@ export default {
         this.productLoading = false;
       });
     },
+    resetProductQuery() {
+      this.resetForm("productForm");
+      this.getProductList();
+    },
     /** 获取供应商列表（下拉框选项） */
     getSupplierList() {
       listBasSupplier().then(response => {

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -150,11 +150,11 @@
           <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
         </template>
       </el-table-column>
-      <el-table-column label="形态类型" align="left" prop="spare1"><!--形态类型-->
+<!--      <el-table-column label="形态类型" align="left" prop="spare1">&lt;!&ndash;形态类型&ndash;&gt;
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_type" :value="scope.row.spare1"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
       <el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
       <el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->