From c91a5f86e7007a9d6d3dcbdc6dc68bebcad236e4 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 10 May 2023 16:57:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8E=9F=E6=96=99=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rawproduct/rawProductIn/index.vue         | 92 ++++++++++++-------
 1 file changed, 60 insertions(+), 32 deletions(-)

diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue
index fd1bb874..418d275b 100644
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue
@@ -12,27 +12,18 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="模糊查询">
-            <el-input
-              v-model="query.bill_code"
-              size="mini"
-              clearable
-              placeholder="单据号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
 
-          <el-form-item label="生产车间">
+          <el-form-item label="仓库">
             <el-select
-              v-model="query.product_code"
+              v-model="query.stor_id"
               clearable
               size="mini"
-              placeholder="全部"
+              placeholder="仓库"
               class="filter-item"
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.product_area"
+                v-for="item in dict.IO_BILL_STATUS"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -40,7 +31,45 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="创建时间">
+          <el-form-item label="单据类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="单据类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据日期">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -70,40 +99,39 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="业务类型">
-            <el-select
-              v-model="query.bill_type"
-              clearable
-              filterable
+          <el-form-item label="入库单号">
+            <el-input
+              v-model="query.bill_code"
               size="mini"
-              placeholder="业务类型"
+              clearable
+              placeholder="入库单号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="车间">
+            <el-select
+              v-model="query.workshop_id"
+              clearable
+              size="mini"
+              placeholder="全部"
               class="filter-item"
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_IN_TYPE"
+                v-for="item in dict.product_area"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
+
           <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          :disabled="dis_flag"
-          icon="el-icon-position"
-          size="mini"
-          @click="divOpen"
-        >
-          分配
-        </el-button>
         <el-button
           slot="right"
           class="filter-item"