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

---
 src/api/wms/countPlanDetail/index.ts          |  8 ++-
 src/components/Detail/src/Detail.vue          | 64 +++++++++++--------
 .../count/countPlanMain/countPlanMain.data.ts |  2 +-
 3 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/api/wms/countPlanDetail/index.ts b/src/api/wms/countPlanDetail/index.ts
index 216547972..5c4300bb7 100644
--- a/src/api/wms/countPlanDetail/index.ts
+++ b/src/api/wms/countPlanDetail/index.ts
@@ -17,7 +17,13 @@ export interface CountPlanDetailVO {
 
 // 查询盘点计划子列表
 export const getCountPlanDetailPage = async (params) => {
-  return await request.get({ url: `/wms/count-plan-detail/page`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-plan-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-plan-detail/page`, params })
+  }
 }
 
 // 查询盘点计划子详情
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index dea1e0a86..ce5ca2ba3 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -61,7 +61,7 @@
               />
             </template>
           </Table>
-          <DetailTable 
+          <DetailTable
             v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
             :columns="detailAllSchemasRef.tableColumns"
             :data="tableObjectRef.tableList"
@@ -69,7 +69,7 @@
             :countScopeType="countScopeType"
             :key="updateKey"
           >
-          <template #action="{ row }">
+            <template #action="{ row }">
               <ButtonBase
                 :Butttondata="buttondata"
                 @button-base-click="buttonTableClick($event, row)"
@@ -131,7 +131,6 @@ import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 
 defineOptions({ name: 'Detail' })
 
-
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -139,7 +138,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 updateKey = ref(0)
 
 const props = defineProps({
   // 标签参数
@@ -231,7 +230,7 @@ const props = defineProps({
     type: Array,
     required: false,
     default: null
-  },
+  }
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
@@ -343,18 +342,27 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
       getFileList()
       getChangeRecordList()
       // 判断详情新增按钮是否显示
-      if(routeName.value.indexOf('Job') > -1){
+      if (routeName.value.indexOf('Job') > -1) {
         HeadButttondata.value = [
           defaultButtons.defaultFilterBtn(null) // 筛选
         ]
-      }else{
+      } else {
         HeadButttondata.value = [
           defaultButtons.defaultAddBtn({
             hide: isShowMainButton(row, ['1'])
           }), // 新增
           defaultButtons.defaultFilterBtn(null) // 筛选
         ]
+        //盘点计划详情筛选
+        if (props.fromeWhere == 'countPlan') {
+          HeadButttondata.value = [
+            defaultButtons.defaultAddBtn({
+              hide: isShowMainButton(row, ['1'])
+            }) // 新增
+          ]
+        }
       }
+
       // 动态显示操作列按钮
       buttondata.value = [
         defaultButtons.mainListEditBtn({
@@ -391,7 +399,6 @@ const getChangeRecordList = async () => {
   changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
 }
 
-
 const tableObjectRef = ref()
 const tableMethodsRef = ref()
 const detailAllSchemasRef = ref()
@@ -457,17 +464,13 @@ 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 提交
 const submitForm = async (formType, data) => {
   try {
     // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
-    const rs = await props.detailValidate?props.detailValidate(data):true
+    const rs = (await props.detailValidate) ? props.detailValidate(data) : true
     if (!rs) return
     if (formType === 'create') {
       await props.apiCreate(data)
@@ -478,8 +481,8 @@ const submitForm = async (formType, data) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-   await getList()
-   updateKey.value += 1;
+    await getList()
+    updateKey.value += 1
   } finally {
     formRef.value.formLoading = false
   }
@@ -490,7 +493,12 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   emit('searchTableSuccessDetail', formField, searchField, val, formRef)
 }
 // 传递给父类
-const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs','selectChangeDetail','detailOpenForm'])
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm'
+])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -501,27 +509,27 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-    updateKey.value += 1;
+    updateKey.value += 1
   } catch {}
 }
 // 筛选提交
-const searchFormClick =async (searchData) => {
+const searchFormClick = async (searchData) => {
   const { tableObject, tableMethods } = useTable({
-      getListApi: props.apiPage // 分页接口
-    })
-    tableObject.params = {
+    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 = tableObject
+  tableMethodsRef.value = tableMethods
   tableObjectRef.value.tableList = []
-    const { getList } = tableMethods
-    await getList()
-    updateKey.value += 1;
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
   // tableObjectRef.value.params = {
   //   isSearch: true,
   //   filters: searchData.filters
@@ -536,7 +544,7 @@ const selectChangeDetail = (field, val) => {
 }
 //监视属性
 watch(
-  () =>props.apiPage,
+  () => props.apiPage,
   () => {
     const { tableObject, tableMethods } = useTable({
       getListApi: props.apiPage // 分页接口
@@ -547,7 +555,7 @@ watch(
     tableMethodsRef.value = tableMethods
     const { getList } = tableMethods
     getList()
-  },
+  }
 )
 </script>
 <style lang="scss">
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 22be31675..aa814f623 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -649,7 +649,7 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
     },
     tableForm: {
       width: '300',
-    }
+    },
   },
   {
     label: '操作',