From bc0a45cec47c63667cd0fef7ecd845d335a7c679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Tue, 20 May 2025 18:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basics/flatWarehouse/wareHouse/drawer.vue | 22 ++++++++-
 .../basics/flatWarehouse/wareHouse/index.vue  | 46 ++++++++++++++-----
 2 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/views/basics/flatWarehouse/wareHouse/drawer.vue b/src/views/basics/flatWarehouse/wareHouse/drawer.vue
index cd467f6..4f03336 100644
--- a/src/views/basics/flatWarehouse/wareHouse/drawer.vue
+++ b/src/views/basics/flatWarehouse/wareHouse/drawer.vue
@@ -1,6 +1,15 @@
 <template>
   <el-drawer :title="dialog.title" v-model="dialog.visible" @close="cancel">
     <el-form ref="drawerRef" :model="formData" :rules="rules" label-position="top">
+      <el-form-item label="是否自动备货" prop="zdbhFlag">
+        <el-select filterable v-model="formData.zdbhFlag" size="small">
+          <el-option
+            v-for="item in state.zdbhFlagList"
+            :key="item.key"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否货位管理" prop="useLocation">
         <el-select filterable v-model="formData.useLocation" size="small">
           <el-option
@@ -18,6 +27,9 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
+        <el-form-item label="仓管员" prop="locationUser">
+          <el-Input v-model="formData.locationUser"></el-Input>
+        </el-form-item>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -49,13 +61,19 @@ const state = reactive({
     { key: 'y', label: '是', value: 'Y' },
     { key: 'n', label: '否', value: 'N' }
   ],
+  zdbhFlagList: [
+    { key: 'y', label: '是', value: 'Y' },
+    { key: 'n', label: '否', value: 'N' }
+  ],
   formData: {
     erpFactoryName: '',
     erpLocationName: '',
     // 是否货位管理
     useLocation: '',
     // 是否熟化
-    isOven: ''
+    isOven: '',
+    locationUser: '',
+    zdbhFlag: ''
   },
   rules: {
     useLocation: [{ required: true, message: "是否货位管理", trigger: "blur" }],
@@ -96,6 +114,8 @@ const showModal = (row: any) => {
   state.formData.erpLocationName = row.ERPLOCATIONNAME
   state.formData.useLocation = row.USE_LOCATION
   state.formData.isOven = row.IS_OVEN
+  state.formData.locationUser = row.LOCATION_USER
+  state.formData.zdbhFlag = row.ZDBHFLAG
 }
 defineExpose({ showModal })
 </script>
diff --git a/src/views/basics/flatWarehouse/wareHouse/index.vue b/src/views/basics/flatWarehouse/wareHouse/index.vue
index a2796a9..2d4508a 100644
--- a/src/views/basics/flatWarehouse/wareHouse/index.vue
+++ b/src/views/basics/flatWarehouse/wareHouse/index.vue
@@ -14,6 +14,14 @@
     <el-row class="page-search" justify="space-between" align="middle">
       <el-form ref="queryFormRef" :model="state.queryParams.params" :inline="true" @submit.native.prevent>
         <el-row :gutter="20">
+          <el-col :span="6">
+              <el-form-item label="组织" prop="ERPFACTORY">
+                <el-select v-model="queryParams.params.ERPFACTORY" placeholder="下拉选择">
+                    <el-option v-for="item in state.ERPFACTORYList" :key="item.ERPFACTORY" :label="item.DESCRIPTION"
+                      :value="item.ERPFACTORY" />
+                </el-select>
+              </el-form-item>
+          </el-col>
           <el-col :span="6" class="col_height">
             <el-form-item label="仓库编码" prop="MATERIALSPECNAME">
               <el-Input v-model="state.queryParams.params.ERPLOCATIONNAME" placeholder="仓库编码"
@@ -26,6 +34,17 @@
                 clearable />
             </el-form-item>
           </el-col>
+          <el-col :span="6" class="col_height">
+            <el-form-item label="仓库类型" prop="TYPE">
+              <!-- <el-Input v-model="state.queryParams.params.TYPE" placeholder="仓库类型"
+                clearable /> -->
+                <el-select v-model="state.queryParams.params.TYPE" placeholder="仓库类型" clearable>
+                  <el-option value="" label="全部"></el-option>
+                  <el-option value="1" label="良品"></el-option>
+                  <el-option value="2" label="不良品"></el-option>
+                </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6" class="col_height">
             <el-form-item label="是否货位管理" prop="DESCRIPTION">
               <el-select v-model="queryParams.params.USE_LOCATION" placeholder="是否货位管理" style="width: 240px"
@@ -35,15 +54,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="col_height">
-            <el-form-item label="是否恒温恒湿" prop="DESCRIPTION">
-              <el-select v-model="queryParams.params.CONST_TEMP" placeholder="是否恒温恒湿" style="width: 240px"
-                default-first-option>
-                <el-option v-for="item in formDataRefData.TEMPList" :key="item.value" :label="item.label"
-                  :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="6" class="col_height" >
             <el-form-item label="是否自动备货" prop="DESCRIPTION">
               <el-select v-model="queryParams.params.ZDBHFLAG" placeholder="是否自动备货" style="width: 240px"
@@ -111,7 +121,8 @@ import { reactive, ref, onMounted, toRefs, getCurrentInstance, nextTick } from "
 import { ElForm, ElMessageBox, ElTable } from "element-plus";
 import { getQueryList, getQueryPageList, BpelEvent } from '@/api/common';
 import { bTableHeight } from "../../../../composables/calcTableHeight";
-import Drawer from '@/views/basics/flatWarehouse/wareHouse/drawer.vue'
+import Drawer from '@/views/basics/flatWarehouse/wareHouse/drawer.vue';
+import { getORG } from '@/api/auth';
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(190);
 const refModal = ref()
 const queryFormRef = ref(ElForm);
@@ -147,6 +158,7 @@ const formDataRefData = ref({
 const state = reactive({
   loadings : false,
   disableds : false,
+  ERPFACTORYList: [],
   rsa: '',
   DBProcessType: 'save',
   queryParams: {
@@ -160,6 +172,8 @@ const state = reactive({
       SITENAME: 'SDK',
       DESCRIPTION: '',
       ZDBHFLAG : '',
+      ERPFACTORY: '',
+      TYPE: ''
     },
     pageNum: 1,
     pageSize: 10
@@ -256,9 +270,10 @@ onMounted(() => {
     { header: "组织(CN)", field: "ORGNAME", hide: false },
     { header: "仓库", field: "ERPLOCATIONNAME", hide: false },
     { header: "仓库(CN)", field: "DESCRIPTION", hide: false },
+    { header: "仓库类型", field: "TYPE", hide: false },
     // { header: "启用状态", field: "IN_USE", hide: false },
     // { header: "委外标志", field: "IS_OEM", hide: false },
-    { header: "是否恒温仓", field: "CONST_TEMP", hide: false },
+    { header: "是否恒温仓", field: "CONST_TEMP", hide: true },
     { header: "是否货位管理", field: "USE_LOCATION", hide: false },
     { header: "是否自动备货", field: "ZDBHFLAG", hide: false },
     { header: "是否熟化", field: "IS_OVEN", hide: false },
@@ -268,6 +283,7 @@ onMounted(() => {
   // 初始化时调用 handleQuery  
   handleQuery();
   updateTableHeight();
+  hangERPFactoryQuery();
   window.addEventListener('resize', handleResize);
 });
 const queryInfo = () =>  {
@@ -329,6 +345,14 @@ const saveInfo = () => {
 const exiteInfo = () => {
   formDataRef.value.resetFields()
 }
+function hangERPFactoryQuery() {
+    getORG({ orgNo: null}).then((res: any) => {
+        state.ERPFACTORYList = res.resultObj
+        console.log(state.ERPFACTORYList);
+        
+    })
+
+}
 </script>
 
 <style scoped>