详情回滚

src/components/Detail/src/Detail.vue

@@ -1,32 +1,18 @@
 <template>
   <div>
-    <el-drawer
+  <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
-      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
+      <Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical"
-          :data="detailData"
+        :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
-          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">
+    <div class="flex" v-if="current == 0">
       <!-- 详情 -->
       <ContentWrap class="w-[73%]">
         <!-- 列表头部 -->
@@ -39,43 +25,26 @@
           @searchFormClick="searchFormClick"
           :allSchemas="detailAllSchemas"
         />
-          <Descriptions
+        <Descriptions v-if="isBasic" :data="detailData" :schema="allSchemas.detailSchema" :columns="2" />
-            v-if="isBasic"
-            :data="detailData"
-            :schema="allSchemas.detailSchema"
-            :columns="2"
-          />
         <Table 
           v-if="!isBasic"
-            :columns="tableColumnsRef"
+          :columns="detailAllSchemas.tableColumns" 
-            :data="tableObjectRef.tableList"
+          :data="tableObject.tableList" 
-            :loading="tableObjectRef.loading"
+          :loading="tableObject.loading"
-            :pagination="{ total: tableObjectRef.total }"
+          :pagination="{ total: tableObject.total }" 
-            v-model:pageSize="tableObjectRef.pageSize"
+          v-model:pageSize="tableObject.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
+          v-model:currentPage="tableObject.currentPage" >
-          >
           <template #action="{ row }">
-              <ButtonBase
+            <ButtonBase :Butttondata="buttondata" @button-base-click="buttonTableClick($event, row)" />
-                :Butttondata="buttondata"
-                @button-base-click="buttonTableClick($event, row)"
-              />
           </template>
         </Table>
       </ContentWrap>
       <ContentWrap class="w-[27%] ml-16px">
         <!-- 附件组件 -->
-          <Annex
+        <Annex :annexData="annexData" @handleAnnexSuccess="handleAnnexSuccess" @deleteAnnexSuccess="deleteAnnexSuccess" :upData="remarksData.data"/>
-            :annexData="annexData"
-            @handleAnnexSuccess="handleAnnexSuccess"
-            @deleteAnnexSuccess="deleteAnnexSuccess"
-            :upData="remarksData.data"
-          />
         <!-- 备注组件 -->
-          <Remarks
+        <Remarks :remarksData="remarksData"  class="mt-20px"
-            :remarksData="remarksData"
+          @remarksSubmitScuess="remarksSubmitScuess" />
-            class="mt-20px"
-            @remarksSubmitScuess="remarksSubmitScuess"
-          />
         <!-- 变更记录组件 -->
         <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
       </ContentWrap>
@@ -84,7 +53,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="formRef" 
-      @success="submitForm"
+    @success="getList" 
     :rules="detailAllSchemasRules" 
     :formAllSchemas="detailAllSchemas"
     :isBusiness="false"
@@ -178,31 +147,22 @@ const props = defineProps({
     type: Array,
     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) {
+  tabsList.value = [{
-  } else {
-    tabsList.value = [
-      {
     label: '明细',
     prop: 'Detail'
-      }
+  }]
-    ]
-  }
-}
-if (tabsList.value) {
 }
 
 // 附件默认数据
@@ -234,9 +194,11 @@ const getFileList = async () => {
 const handleAnnexSuccess = () => {
   getFileList()
   getChangeRecordList()
+
 }
 // 删除附件成功之后所走的方法
 const deleteAnnexSuccess = async () => {
+
   getFileList()
   getChangeRecordList()
 }
@@ -245,14 +207,13 @@ const deleteAnnexSuccess = async () => {
 const current = ref(0)
 const change = (item, index) => {
   current.value = index
-  emit('changeTabs', item)
 }
 
 //主表所需的参数
 const masterParmas=ref({
   masterId:'',//主表id
   number: '',//主表单据号
-  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+  status: '',//主表状态 用于控制子表新增编辑按钮显示情况
 })
 
 // 列表头部按钮
@@ -268,7 +229,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
   titleValueRef.value = titleValue
   remarksData.data = {
     tableId: row.id,
-    tableName: tableName
+    tableName: tableName,
   }
   // 加载明细列表
   if(!props.isBasic) {
@@ -276,8 +237,8 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     masterParmas.value.masterId = row.id
     masterParmas.value.number = row.number
     masterParmas.value.status = row.status
-    tableObjectRef.value.params = {
+    tableObject.params = {
-      masterId: row.id
+      masterId: row.id,
     }
     getList()
   } 
@@ -291,19 +252,13 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
       getChangeRecordList()
       // 判断详情新增按钮是否显示
       HeadButttondata.value = [
-        defaultButtons.defaultAddBtn({
+        defaultButtons.defaultAddBtn({hide:isShowMainButton(row,['1','1','PLAN_PURCHASE_READY','1'])}), // 新增
-          hide: isShowMainButton(row, ['1', '1', 'PLAN_PURCHASE_READY', '1'])
+        defaultButtons.defaultFilterBtn(null), // 筛选
-        }), // 新增
-        defaultButtons.defaultFilterBtn(null) // 筛选
       ]
       // 动态显示操作列按钮
       buttondata.value = [
-        defaultButtons.mainListEditBtn({
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1','1','PLAN_PURCHASE_READY','1'])}), // 编辑
-          hide: isShowMainButton(row, ['1', '1', 'PLAN_PURCHASE_READY', '1'])
+        // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1','1','PLAN_PURCHASE_READY','1'])}), // 删除
-        }), // 编辑
-        defaultButtons.mainListDeleteBtn({
-          hide: isShowMainButton(row, ['1', '1', 'PLAN_PURCHASE_READY', '1'])
-        }) // 删除
       ]
     } finally {
       detailLoading.value = false
@@ -332,19 +287,10 @@ const getChangeRecordList = async () => {
   changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
 }
 
-
-const tableObjectRef = ref()
-const tableMethodsRef = ref()
-const tableColumnsRef = ref()
-
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
 })
 
-tableObjectRef.value = tableObject
-tableMethodsRef.value = tableMethods
-tableColumnsRef.value = props.detailAllSchemas.tableColumns
-
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
   if (val.indexOf(row.status) > -1) {
@@ -354,27 +300,22 @@ const isShowMainButton = (row, val) => {
   }
 }
 
+
 // 获得表格的各种操作
-const { getList } = tableMethodsRef.value
+const { getList } = tableMethods
 
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
+  if (val == 'add') { // 新增
-    // 新增
     openForm('create')
-  } else if (val == 'import') {
+  } else if (val == 'import') { // 导入
-    // 导入
     handleImport()
-  } else if (val == 'export') {
+  } else if (val == 'export') { // 导出
-    // 导出
     handleExport()
-  } else if (val == 'refresh') {
+  } else if (val == 'refresh') { // 刷新
-    // 刷新
     getList()
-  } else if (val == 'filtrate') {
+  } else if (val == 'filtrate') { // 筛选
-    // 筛选
+  } else { // 其他按钮 
-  } else {
-    // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -386,11 +327,9 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮事件 
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
+  if (val == 'edit') { // 编辑
-    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') {
+  } else if (val == 'delete') { // 删除
-    // 删除
     handleDelete(row.id)
   }
 }
@@ -422,7 +361,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   emit('searchTableSuccessDetail', formField, searchField, val, formRef)
 }
 // 传递给父类
-const emit = defineEmits(['searchTableSuccessDetail', 'changeTabs'])
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -437,29 +378,12 @@ const handleDelete = async (id: number) => {
 }
 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObjectRef.value.params = {
+  tableObject.params = {
     isSearch: true,
-    filters: searchData.filters
+    filters: searchData.filters?searchData.filters:[{column: "masterId", action: "==", value: masterParmas.value.masterId}]
-      ? searchData.filters
-      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
   }
   getList() // 刷新当前列表
 }
-
-//监视属性
-watch(
-  () => props.apiPage,
-  () => {
-    const { tableObject, tableMethods } = useTable({
-      getListApi: props.apiPage // 分页接口
-    })
-    tableColumnsRef.value = props.detailAllSchemas.tableColumns
-    tableObjectRef.value = tableObject
-    tableMethodsRef.value = tableMethods
-    const { getList } = tableMethods
-    getList()
-  }
-)
 </script>
 <style lang="scss">
 .el-drawer__body {