From 905dc07073a1a36a7243942dd72fb2a14185b5c4 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 8 Dec 2023 09:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AF=A6=E6=83=85=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          | 19 +++-
 .../DetailTable/src/DetailTable.vue           | 12 ++-
 .../countManage/count/countPlanMain/index.vue | 91 +++++++++++++++----
 3 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index d39b6d795..dea1e0a86 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -67,6 +67,7 @@
             :data="tableObjectRef.tableList"
             :allList="allList"
             :countScopeType="countScopeType"
+            :key="updateKey"
           >
           <template #action="{ row }">
               <ButtonBase
@@ -138,7 +139,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
-
+const updateKey = ref(0);
 
 const props = defineProps({
   // 标签参数
@@ -447,6 +448,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') {
     // 编辑
     openForm('update', row)
+    emit('detailOpenForm', row)
   } else if (val == 'delete') {
     // 删除
     handleDelete(row.id)
@@ -455,6 +457,10 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
+  console.log(row)
+  if(props.fromeWhere=='countPlan'){
+    
+  }
   formRef.value.open(type, row, masterParmas.value)
 }
 // form 提交
@@ -472,7 +478,8 @@ const submitForm = async (formType, data) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+   await getList()
+   updateKey.value += 1;
   } finally {
     formRef.value.formLoading = false
   }
@@ -483,7 +490,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   emit('searchTableSuccessDetail', formField, searchField, val, formRef)
 }
 // 传递给父类
-const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs','selectChangeDetail'])
+const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs','selectChangeDetail','detailOpenForm'])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -494,10 +501,11 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
+    updateKey.value += 1;
   } catch {}
 }
 // 筛选提交
-const searchFormClick = (searchData) => {
+const searchFormClick =async (searchData) => {
   const { tableObject, tableMethods } = useTable({
       getListApi: props.apiPage // 分页接口
     })
@@ -512,7 +520,8 @@ const searchFormClick = (searchData) => {
     tableMethodsRef.value = tableMethods
   tableObjectRef.value.tableList = []
     const { getList } = tableMethods
-    getList()
+    await getList()
+    updateKey.value += 1;
   // tableObjectRef.value.params = {
   //   isSearch: true,
   //   filters: searchData.filters
diff --git a/src/components/DetailTable/src/DetailTable.vue b/src/components/DetailTable/src/DetailTable.vue
index 2b1216e75..b09facbf3 100644
--- a/src/components/DetailTable/src/DetailTable.vue
+++ b/src/components/DetailTable/src/DetailTable.vue
@@ -14,7 +14,10 @@
         </template>
       </el-table-column>
       <el-table-column prop="" label="操作" align="center">
-        <slot name="action" v-if="columns[2].field == 'action'"></slot> 
+        <template #default="scope">
+         
+        <slot name="action" :row="scope.row" v-if="columns[2].field == 'action'"></slot> 
+        </template>
       </el-table-column>
     </el-table>
   </div>
@@ -23,6 +26,11 @@
 <script lang="ts" setup>
 defineOptions({ name: 'DetailTable' })
 const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: null
+  },
   columns: {
     type: Array,
     required: true,
@@ -33,7 +41,7 @@ const props = defineProps({
     required: true,
     default: null
   },
-  // 获取接口列表集合
+  // 获取盘点计划接口列表集合
   allList: {
     type: Object,
     required: true,
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 927714111..25130598a 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -87,6 +87,7 @@
     fromeWhere="countPlan"
     :formTypeDetail="formTypeDetail"
     :countPlanAllList="countPlanAllList"
+    @detailOpenForm="detailOpenForm"
   />
 
   <!-- 导入 -->
@@ -329,6 +330,63 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   getLocationAllList()
   detailRef.value.openDetail(row, titleName, titleValue)
 }
+// 详情打开的编辑的时候设置盘点范围值列表
+const detailOpenForm = (row) => {
+  console.log(row)
+
+  if (
+    row.type == 'OWNER' ||
+    row.type == 'SUPPLIER' ||
+    row.type == 'CUSTOMER' ||
+    row.type == 'ABC' ||
+    row.type == 'ITEMS_TYPE' ||
+    row.type == 'ITEMS_GROUP' ||
+    row.type == 'ITEMS_CODE' ||
+    row.type == 'WAREHOUSE_CODE' ||
+    row.type == 'AREABASIC_CODE' ||
+    row.type == 'LOCATIONGROUP_CODE' ||
+    row.type == 'LOCATION_CODE'
+  ) {
+    formTypeDetail.value = 'Select'
+    switch (row.type) {
+      case 'OWNER':
+        countPlanAllList.value = allList.value.ownerAllList
+        break
+      case 'SUPPLIER':
+        countPlanAllList.value = allList.value.supplierAllList
+        break
+      case 'CUSTOMER':
+        countPlanAllList.value = allList.value.customerAllList
+        break
+      case 'ABC':
+        countPlanAllList.value = getStrDictOptions(DICT_TYPE.ABC_CLASS)
+        break
+      case 'ITEMS_TYPE':
+        countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
+        break
+      case 'ITEMS_GROUP':
+        countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+        break
+      case 'ITEMS_CODE':
+        countPlanAllList.value = allList.value.itembasicAllList
+        break
+      case 'WAREHOUSE_CODE':
+        countPlanAllList.value = allList.value.warehouseAllList
+        break
+      case 'AREABASIC_CODE':
+        countPlanAllList.value = allList.value.areaAllList
+        break
+      case 'LOCATIONGROUP_CODE':
+        countPlanAllList.value = allList.value.locationgroupAllList
+        break
+      case 'LOCATION_CODE':
+        countPlanAllList.value = allList.value.locationAllList
+        break
+    }
+  } else if (val == 'PROJECT') {
+    formTypeDetail.value = 'InputString'
+  }
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -454,11 +512,10 @@ const selectChange = (field, val) => {
     }
   }
 }
-const formTypeDetail = ref('InputString')//盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
-const countPlanAllList = ref([])//盘点详情子表新增的时候判断盘点范围值的下拉列表
+const formTypeDetail = ref('InputString') //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+const countPlanAllList = ref([]) //盘点详情子表新增的时候判断盘点范围值的下拉列表
 // 详情新增的时候选择盘点范围类型的时候针对限值的操作
-const selectChangeDetail= (field, val) => {
-  console.log('888',CountPlanDetail.allSchemas.formSchema)
+const selectChangeDetail = (field, val) => {
   if (field == 'type') {
     // CountPlanDetail.allSchemas.formSchema[1].value = ''
     if (
@@ -472,42 +529,42 @@ const selectChangeDetail= (field, val) => {
       val == 'WAREHOUSE_CODE' ||
       val == 'AREABASIC_CODE' ||
       val == 'LOCATIONGROUP_CODE' ||
-      val== 'LOCATION_CODE'
+      val == 'LOCATION_CODE'
     ) {
       formTypeDetail.value = 'Select'
       switch (val) {
         case 'OWNER':
-        countPlanAllList.value = allList.value.ownerAllList
+          countPlanAllList.value = allList.value.ownerAllList
           break
         case 'SUPPLIER':
-        countPlanAllList.value= allList.value.supplierAllList
+          countPlanAllList.value = allList.value.supplierAllList
           break
         case 'CUSTOMER':
-        countPlanAllList.value = allList.value.customerAllList
+          countPlanAllList.value = allList.value.customerAllList
           break
         case 'ABC':
-        countPlanAllList.value = getStrDictOptions(DICT_TYPE.ABC_CLASS)
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ABC_CLASS)
           break
         case 'ITEMS_TYPE':
-        countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_TYPE)
           break
         case 'ITEMS_GROUP':
-        countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
+          countPlanAllList.value = getStrDictOptions(DICT_TYPE.ITEM_GROUP)
           break
         case 'ITEMS_CODE':
-        countPlanAllList.value = allList.value.itembasicAllList
+          countPlanAllList.value = allList.value.itembasicAllList
           break
         case 'WAREHOUSE_CODE':
-        countPlanAllList.value = allList.value.warehouseAllList
+          countPlanAllList.value = allList.value.warehouseAllList
           break
         case 'AREABASIC_CODE':
-        countPlanAllList.value = allList.value.areaAllList
+          countPlanAllList.value = allList.value.areaAllList
           break
         case 'LOCATIONGROUP_CODE':
-        countPlanAllList.value = allList.value.locationgroupAllList
+          countPlanAllList.value = allList.value.locationgroupAllList
           break
         case 'LOCATION_CODE':
-        countPlanAllList.value= allList.value.locationAllList
+          countPlanAllList.value = allList.value.locationAllList
           break
       }
     } else if (val == 'PROJECT') {
@@ -634,7 +691,7 @@ const getItembasicAllList = async () => {
 // 获取仓库列表
 const getWarehouseAllList = async () => {
   await WarehouseApi.getWarehouseList({ available: 'TRUE' }).then((res) => {
-    allList.value.warehouseAllList  = res.map((element) => {
+    allList.value.warehouseAllList = res.map((element) => {
       return {
         value: element.code,
         label: element.name