From 89221636ad588bf97ebce80bc57b61c5dd6d0cab Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 7 Dec 2023 13:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          |  27 +-
 .../DetailCountPlan/src/DetailCountPlan.vue   | 499 ------------------
 .../{DetailCountPlan => DetailTable}/index.ts |   0
 .../DetailTable/src/DetailTable.vue           |  46 ++
 .../src/TableFormCountPlan.vue                |   8 +-
 .../countManage/count/countPlanMain/index.vue |  55 +-
 6 files changed, 110 insertions(+), 525 deletions(-)
 delete mode 100644 src/components/DetailCountPlan/src/DetailCountPlan.vue
 rename src/components/{DetailCountPlan => DetailTable}/index.ts (100%)
 create mode 100644 src/components/DetailTable/src/DetailTable.vue

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 0eddf4f7d..2655886f1 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -61,7 +61,20 @@
               />
             </template>
           </Table>
-
+          <DetailTable 
+            v-if="!isBasic && fromeWhere == 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :allList="allList"
+        :countScopeType="countScopeType"
+          >
+          <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </DetailTable>
         </ContentWrap>
         <ContentWrap class="w-[27%] ml-16px">
           <!-- 附件组件 -->
@@ -108,6 +121,7 @@ import * as FileApi from '@/api/wms/file'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 
 defineOptions({ name: 'Detail' })
 
@@ -188,6 +202,17 @@ const props = defineProps({
     required: false,
     default: ''
   },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  }
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
diff --git a/src/components/DetailCountPlan/src/DetailCountPlan.vue b/src/components/DetailCountPlan/src/DetailCountPlan.vue
deleted file mode 100644
index 80a59f6e2..000000000
--- a/src/components/DetailCountPlan/src/DetailCountPlan.vue
+++ /dev/null
@@ -1,499 +0,0 @@
-<template>
-  <div>
-    <el-drawer
-      v-model="isShowDrawer"
-      title="详情"
-      direction="rtl"
-      size="80%"
-      v-loading="detailLoading"
-    >
-      <template #header>
-        <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
-        </div>
-      </template>
-      <ContentWrap v-if="!isBasic">
-        <Descriptions
-          :data="detailData"
-          labelClassName="label-class-name"
-          label-align="left"
-          direction="vertical"
-          :column="8"
-          :schema="allSchemas.detailSchema"
-          :columns="2"
-          width="200px"
-        />
-      </ContentWrap>
-      <Tabs :tabsList="tabsList" :current="current" @change="change" />
-      <div class="flex">
-        <!-- 详情 -->
-        <ContentWrap class="w-[73%]">
-          <!-- 列表头部 -->
-          <TableHead
-            v-if="!isBasic"
-            :HeadButttondata="HeadButttondata"
-            :masterId="masterParmas.masterId"
-            @button-base-click="buttonBaseClick"
-            :routeName="routeName"
-            @searchFormClick="searchFormClick"
-            :allSchemas="detailAllSchemas"
-          />
-          <Descriptions
-            v-if="isBasic"
-            :data="detailData"
-            :schema="allSchemas.detailSchema"
-            :columns="2"
-          />
-          <Table
-            v-if="!isBasic"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
-          >
-            <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template>
-          </Table>
-        </ContentWrap>
-        <ContentWrap class="w-[27%] ml-16px">
-          <!-- 附件组件 -->
-          <Annex
-            :annexData="annexData"
-            @handleAnnexSuccess="handleAnnexSuccess"
-            @deleteAnnexSuccess="deleteAnnexSuccess"
-            :upData="remarksData.data"
-          />
-          <!-- 备注组件 -->
-          <Remarks
-            :remarksData="remarksData"
-            class="mt-20px"
-            @remarksSubmitScuess="remarksSubmitScuess"
-          />
-          <!-- 变更记录组件 -->
-          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
-        </ContentWrap>
-      </div>
-    </el-drawer>
-    <!-- 表单弹窗：添加/修改 -->
-    <BasicForm
-      ref="formRef"
-      @success="submitForm"
-      :rules="detailAllSchemasRules"
-      :formAllSchemas="detailAllSchemas"
-      :isBusiness="false"
-      :apiUpdate="apiUpdate"
-      :apiCreate="apiCreate"
-      @searchTableSuccess="searchTableSuccess"
-      :detailData="detailData"
-      @submitForm="submitForm"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import Annex from '@/components/Annex/src/Annex.vue'
-import Remarks from '@/components/Remarks/src/Remarks.vue'
-import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
-import Tabs from '@/components/Tabs/src/Tabs.vue'
-import * as RemarkApi from '@/api/wms/remark'
-import * as FileApi from '@/api/wms/file'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-
-defineOptions({ name: 'DetailCountPlan' })
-
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
-
-
-const props = defineProps({
-  // 标签参数
-  tabs: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 是否是基础数据 展现详情顶部表单
-  isBasic: {
-    type: Boolean,
-    required: false,
-    default: false
-  },
-  // 表单，列表 相关信息
-  allSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 明细列表相关信息
-  detailAllSchemas: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  //  明细验证
-  detailAllSchemasRules: {
-    type: Object,
-    required: true,
-    default: null
-  },
-  // 子表新增API
-  apiCreate: {
-    type: Function,
-    required: false,
-    default: null
-  },
-  // 子表编辑API
-  apiUpdate: {
-    type: Function,
-    required: false,
-    default: null
-  },
-  // 子表分页列表API
-  apiPage: {
-    type: Function,
-    required: false,
-    default: null
-  },
-  // 子表删除API
-  apiDelete: {
-    type: Function,
-    required: false,
-    default: null
-  },
-  // 子表新增修改校验
-  detailValidate: {
-    type: Function,
-    required: false,
-    default: null
-  }
-})
-const isShowDrawer = ref(false)
-const detailLoading = ref(false)
-const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
-
-if (props.isBasic == true) {
-  if (tabsList.value && tabsList.value.length > 0) {
-    tabsList.value.unshift({
-      label: '详情',
-      prop: 'Detail'
-    })
-  }
-} else {
-  if (tabsList.value && tabsList.value.length > 0) {
-  } else {
-    tabsList.value = [
-      {
-        label: '明细',
-        prop: 'Detail'
-      }
-    ]
-  }
-}
-if (tabsList.value) {
-}
-
-// 附件默认数据
-const annexData = reactive({
-  annexList: []
-})
-
-// 备注数据
-const remarksData = reactive({
-  remarksList: [],
-  data: {}
-})
-
-// 变更记录默认数据
-const changeRecordData = reactive({
-  changeRecordList: []
-})
-const detailData = ref({}) //详情数据
-// 获取附件列表篇
-const getFileList = async () => {
-  detailLoading.value = true
-  try {
-    annexData.annexList = await FileApi.getFileList(remarksData.data)
-  } finally {
-    detailLoading.value = false
-  }
-}
-/** 添加附件 */
-const handleAnnexSuccess = () => {
-  getFileList()
-  getChangeRecordList()
-}
-// 删除附件成功之后所走的方法
-const deleteAnnexSuccess = async () => {
-  getFileList()
-  getChangeRecordList()
-}
-
-// Tabs当前选择
-const current = ref(0)
-const change = (item, index) => {
-  current.value = index
-  emit('changeTabs', item)
-}
-
-//主表所需的参数
-const masterParmas = ref({
-  masterId: '', //主表id
-  number: '', //主表单据号
-  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
-})
-
-// 列表头部按钮
-const HeadButttondata = ref()
-// 列表-操作按钮
-const buttondata = ref()
-
-/** 打开弹窗 */
-const titleNameRef = ref()
-const titleValueRef = ref()
-const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
-  titleNameRef.value = titleName
-  titleValueRef.value = titleValue
-  remarksData.data = {
-    tableId: row.id,
-    tableName: tableName
-  }
-  // 加载明细列表
-  if (!props.isBasic) {
-    // 设置主表id
-    masterParmas.value.masterId = row.id
-    masterParmas.value.number = row.number
-    masterParmas.value.status = row.status
-    tableObjectRef.value.params = {
-      masterId: row.id
-    }
-    getList()
-  }
-  isShowDrawer.value = true
-  if (row) {
-    detailLoading.value = true
-    try {
-      detailData.value = row
-      getRemarkList()
-      getFileList()
-      getChangeRecordList()
-      // 判断详情新增按钮是否显示
-      if(routeName.value.indexOf('Job') > -1){
-        HeadButttondata.value = [
-          defaultButtons.defaultFilterBtn(null) // 筛选
-        ]
-      }else{
-        HeadButttondata.value = [
-          defaultButtons.defaultAddBtn({
-            hide: isShowMainButton(row, ['1'])
-          }), // 新增
-          defaultButtons.defaultFilterBtn(null) // 筛选
-        ]
-      }
-      // 动态显示操作列按钮
-      buttondata.value = [
-        defaultButtons.mainListEditBtn({
-          hide: isShowMainButton(row, ['1'])
-        }), // 编辑
-        defaultButtons.mainListDeleteBtn({
-          hide: isShowMainButton(row, ['1'])
-        }) // 删除
-      ]
-    } finally {
-      detailLoading.value = false
-    }
-  }
-}
-defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
-
-// 获取备注列表
-const getRemarkList = async () => {
-  detailLoading.value = true
-  try {
-    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
-  } finally {
-    detailLoading.value = false
-  }
-}
-// 备注提交成功之后
-const remarksSubmitScuess = async (remark) => {
-  detailLoading.value = false
-  getRemarkList()
-  getChangeRecordList()
-}
-// 获取变更记录
-const getChangeRecordList = async () => {
-  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
-}
-
-
-const tableObjectRef = ref()
-const tableMethodsRef = ref()
-const detailAllSchemasRef = ref()
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: props.apiPage // 分页接口
-})
-
-tableObjectRef.value = tableObject
-tableMethodsRef.value = tableMethods
-detailAllSchemasRef.value = props.detailAllSchemas
-
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 获得表格的各种操作
-const { getList } = tableMethodsRef.value
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
-    // 新增
-    openForm('create')
-  } else if (val == 'import') {
-    // 导入
-    handleImport()
-  } else if (val == 'export') {
-    // 导出
-    handleExport()
-  } else if (val == 'refresh') {
-    // 刷新
-    getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 字段设置 更新主列表字段
-// const updataTableColumns = (val) => {
-//   detailAllSchemas.tableColumns.value = val
-// }
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  }
-}
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = async (type: string, row?: number) => {
-  formRef.value.open(type, row, masterParmas.value)
-}
-// form 提交
-const submitForm = async (formType, data) => {
-  try {
-    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
-    const rs = await props.detailValidate?props.detailValidate(data):true
-    if (!rs) return
-    if (formType === 'create') {
-      await props.apiCreate(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await props.apiUpdate(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
-  }
-}
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
-}
-// 传递给父类
-const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs'])
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await props.apiDelete(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-// 筛选提交
-const searchFormClick = (searchData) => {
-  const { tableObject, tableMethods } = useTable({
-      getListApi: props.apiPage // 分页接口
-    })
-    tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-      ? searchData.filters
-      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
-  }
-  detailAllSchemasRef.value = props.detailAllSchemas
-    tableObjectRef.value = tableObject
-    tableMethodsRef.value = tableMethods
-  tableObjectRef.value.tableList = []
-    const { getList } = tableMethods
-    getList()
-  // tableObjectRef.value.params = {
-  //   isSearch: true,
-  //   filters: searchData.filters
-  //     ? searchData.filters
-  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
-  // }
-  // getList() // 刷新当前列表
-}
-
-//监视属性
-watch(
-  () =>props.apiPage,
-  () => {
-    const { tableObject, tableMethods } = useTable({
-      getListApi: props.apiPage // 分页接口
-    })
-    tableObject.params.masterId = masterParmas.value.masterId
-    detailAllSchemasRef.value = props.detailAllSchemas
-    tableObjectRef.value = tableObject
-    tableMethodsRef.value = tableMethods
-    const { getList } = tableMethods
-    getList()
-  },
-)
-</script>
-<style lang="scss">
-.el-drawer__body {
-  background: #f5f5f5 !important;
-}
-
-::v-deep(.label-class-name) {
-  color: #dedede;
-}
-</style>
-<style scoped lang="scss"></style>
diff --git a/src/components/DetailCountPlan/index.ts b/src/components/DetailTable/index.ts
similarity index 100%
rename from src/components/DetailCountPlan/index.ts
rename to src/components/DetailTable/index.ts
diff --git a/src/components/DetailTable/src/DetailTable.vue b/src/components/DetailTable/src/DetailTable.vue
new file mode 100644
index 000000000..f6b042e8f
--- /dev/null
+++ b/src/components/DetailTable/src/DetailTable.vue
@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <el-table :data="data" style="width: 100%">
+      <el-table-column
+        :prop="item.field"
+        :label="item.label"
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+      >
+        <slot name="action" v-if="item.field == 'action'"></slot>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'DetailTable' })
+const props = defineProps({
+  columns: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  data: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  }
+})
+// 
+
+</script>
+<style lang="scss">
+</style>
diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
index 12bc0bf5a..b3f9827be 100644
--- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
+++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
@@ -1,7 +1,7 @@
 <!-- 附件组件 -->
 <template>
   <!-- 盘点计划的子表 -->
-  <div class="table">
+  <div class="table1">
     <el-table :data="tableData" stripe style="width: 100%"
       ref="TableBaseComponents_Ref" >
       <el-table-column fixed="left" :width="50" v-slot="{ row, $index }">
@@ -176,6 +176,12 @@ defineExpose({
 
 </script>
 <style scoped lang="scss">
+.table1 {
+  border: 1px solid #dedede;
+  border-radius: 8px;
+  padding: 10px;
+  width: calc(100% - 20px);
+}
 .button {
   > div {
     display: flex;
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index c5363524f..4a233a190 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -80,6 +80,8 @@
     :apiUpdate="CountPlanDetailApi.updateCountPlanDetail"
     :apiPage="CountPlanDetailApi.getCountPlanDetailPage"
     :apiDelete="CountPlanDetailApi.deleteCountPlanDetail"
+    :allList="allList"
+    :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
     :Echo="Echo"
     fromeWhere="countPlan"
   />
@@ -461,13 +463,13 @@ const tableFormChange = async (field, val, row) => {
       row.formType = 'Select'
       switch (row.type) {
         case 'OWNER':
-          row.initOptions = ownerAllList.value
+          row.initOptions = allList.value.ownerAllList
           break
         case 'SUPPLIER':
-          row.initOptions = supplierAllList.value
+          row.initOptions = allList.value.supplierAllList
           break
         case 'CUSTOMER':
-          row.initOptions = customerAllList.value
+          row.initOptions = allList.value.customerAllList
           break
         case 'ABC':
           row.initOptions = getStrDictOptions(DICT_TYPE.ABC_CLASS)
@@ -479,19 +481,19 @@ const tableFormChange = async (field, val, row) => {
           row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
           break
         case 'ITEMS_CODE':
-          row.initOptions = itembasicAllList.value
+          row.initOptions = allList.value.itembasicAllList
           break
         case 'WAREHOUSE_CODE':
-          row.initOptions = warehouseAllList.value
+          row.initOptions = allList.value.warehouseAllList
           break
         case 'AREABASIC_CODE':
-          row.initOptions = areaAllList.value
+          row.initOptions = allList.value.areaAllList
           break
         case 'LOCATIONGROUP_CODE':
-          row.initOptions = locationgroupAllList.value
+          row.initOptions = allList.value.locationgroupAllList
           break
         case 'LOCATION_CODE':
-          row.initOptions = locationAllList.value
+          row.initOptions = allList.value.locationAllList
           break
       }
     } else if (row.type == 'PROJECT') {
@@ -500,14 +502,19 @@ const tableFormChange = async (field, val, row) => {
   }
 }
 
-const ownerAllList = ref()
-const supplierAllList = ref()
-const customerAllList = ref()
-const itembasicAllList = ref()
-const warehouseAllList = ref()
-const areaAllList = ref()
-const locationgroupAllList = ref()
-const locationAllList = ref()
+const allList=ref({
+  ownerAllList:[],
+  supplierAllList:[],
+  customerAllList:[],
+  itembasicAllList:[],
+  warehouseAllList:[],
+  areaAllList:[],
+  locationgroupAllList:[],
+  locationAllList:[],
+  abcList:getStrDictOptions(DICT_TYPE.ABC_CLASS),
+  itemTypeList:getStrDictOptions(DICT_TYPE.ITEM_TYPE),
+  itemGroupList:getStrDictOptions(DICT_TYPE.ITEM_GROUP),
+})
 // 获取货主列表
 const getOwnerAllList = async () => {
   await OwnerApi.getOwnerList().then((res) => {
@@ -515,7 +522,7 @@ const getOwnerAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    ownerAllList.value = res
+    allList.value.ownerAllList = res
   })
 }
 // 获取供应商列表
@@ -525,7 +532,7 @@ const getSupplierAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    supplierAllList.value = res
+    allList.value.supplierAllList = res
   })
 }
 // 获取供应商列表
@@ -535,7 +542,7 @@ const getCustomerAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    customerAllList.value = res
+    allList.value.customerAllList = res
   })
 }
 // 获取物品代码列表
@@ -545,7 +552,7 @@ const getItembasicAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    itembasicAllList.value = res
+    allList.value.itembasicAllList = res
   })
 }
 // 获取仓库列表
@@ -555,7 +562,7 @@ const getWarehouseAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    warehouseAllList.value = res
+    allList.value.warehouseAllList = res
   })
 }
 // 获取库区列表
@@ -565,7 +572,7 @@ const getAreaAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    areaAllList.value = res
+    allList.value.areaAllList = res
   })
 }
 // 获取库位组列表
@@ -575,7 +582,7 @@ const getLocationgroupAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    locationgroupAllList.value = res
+    allList.value.locationgroupAllList = res
   })
 }
 // 获取库位列表
@@ -585,7 +592,7 @@ const getLocationAllList = async () => {
       element.value = element.code
       element.label = element.name
     })
-    locationAllList.value = res
+    allList.value.locationAllList = res
   })
 }
 /** 初始化 **/