diff --git a/Web/public/logo_op.png b/Web/public/logo_op.png
new file mode 100644
index 0000000..e1c4a21
Binary files /dev/null and b/Web/public/logo_op.png differ
diff --git a/Web/src/api/common/index.js b/Web/src/api/common/index.js
index 63464bf..be60b8f 100644
--- a/Web/src/api/common/index.js
+++ b/Web/src/api/common/index.js
@@ -1,6 +1,15 @@
 // 公用API
 import request from '@/utils/request'
 
+// 通用post
+export function getCommonPost(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
 // 获取分页
 export function getCommonPaged(urlName,data) {
     return request({
diff --git a/Web/src/api/system/customlog.js b/Web/src/api/system/customlog.js
index c410c91..548c251 100644
--- a/Web/src/api/system/customlog.js
+++ b/Web/src/api/system/customlog.js
@@ -2,12 +2,9 @@ import request from '@/utils/request'
 
 // 下载JSON
 export function getLogJsonList(uid) {
-    return request({
-      url: `/api/customlog/getlogrequestjsonlist`,
-      method: 'get',
-    //   headers:{
-    //     'accept':'*/*'
-    //   },
-      params:{uId:uid},
-    })
-  }
\ No newline at end of file
+  return request({
+    url: `/api/customlog/getlogrequestjsonlist`,
+    method: 'get',
+    params:{uId:uid},
+  })
+}
\ No newline at end of file
diff --git a/Web/src/components/Uploads/importErrorDialog.vue b/Web/src/components/Uploads/importErrorDialog.vue
index 1bb58b3..dbb4908 100644
--- a/Web/src/components/Uploads/importErrorDialog.vue
+++ b/Web/src/components/Uploads/importErrorDialog.vue
@@ -44,7 +44,7 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { reactive } from 'vue'
+import { reactive,defineExpose } from 'vue'
 import * as XLSX from 'xlsx'
 
 const state = reactive({
diff --git a/Web/src/components/Uploads/multipleImgUpload.vue b/Web/src/components/Uploads/multipleImgUpload.vue
index b3d8384..272f3f8 100644
--- a/Web/src/components/Uploads/multipleImgUpload.vue
+++ b/Web/src/components/Uploads/multipleImgUpload.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted,defineExpose } from 'vue'
 import { Plus } from '@element-plus/icons-vue'
 import { getFileUploadPath, getFiles } from '@/api/system/fileApi'
 import { ElMessage } from 'element-plus'
diff --git a/Web/src/components/Uploads/singleImgUpload.vue b/Web/src/components/Uploads/singleImgUpload.vue
index 0e741ba..8efe265 100644
--- a/Web/src/components/Uploads/singleImgUpload.vue
+++ b/Web/src/components/Uploads/singleImgUpload.vue
@@ -12,7 +12,7 @@
   </el-upload>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref,defineExpose } from 'vue'
 import { ElMessage } from 'element-plus'
 import { getFileUploadPath, getFiles } from '@/api/system/fileApi'
 import store from '@/stores'
diff --git a/Web/src/components/apiEditPop/index.vue b/Web/src/components/apiEditPop/index.vue
index a202c51..88bc163 100644
--- a/Web/src/components/apiEditPop/index.vue
+++ b/Web/src/components/apiEditPop/index.vue
@@ -83,7 +83,7 @@
 </template>
 <script setup lang="ts">
 defineOptions({ name: 'apiEditPop' })
-import { reactive, ref, onMounted,nextTick } from 'vue'
+import { reactive, ref, onMounted,nextTick,defineExpose } from 'vue'
 import { ElDialog,ElMessage } from 'element-plus'
 import { getCommonInfoById } from '@/api/common/index'
 import apiTableColumns from '@/utils/common/apiTableColumns'
diff --git a/Web/src/components/ediTtablePage/index.vue b/Web/src/components/ediTtablePage/index.vue
index 86818bd..abd02a4 100644
--- a/Web/src/components/ediTtablePage/index.vue
+++ b/Web/src/components/ediTtablePage/index.vue
@@ -344,16 +344,20 @@
     }
   })
   
-  // 获取表头
-  function getTableColumns(){
-    state.localTableColumnsName = getLocalTableColumnsName(useRoute().name)
-    if(props.apiType == 'detailApi'){
-      state.localTableColumnsName = getLocalTableColumnsName(props.apiName+'Detail')
+  // 获取表头 noFilter 获取不需要处理字段设置的值
+  function getTableColumns(noFilter){
+    if(noFilter){
+      return props.tableColumns || apiTableColumns[props.apiName]
+    }else{
+      state.localTableColumnsName = getLocalTableColumnsName(useRoute().name)
+      if(props.apiType == 'detailApi'){
+        state.localTableColumnsName = getLocalTableColumnsName(props.apiName+'Detail')
+      }
+      let _local = JSON.parse(localStorage.getItem(state.localTableColumnsName))
+      state.initTableColums = props.tableColumns || apiTableColumns[props.apiName]
+      let _list = _local && _local != null && _local != undefined ? _local : JSON.parse(JSON.stringify(state.initTableColums))
+      return _list
     }
-    let _local = JSON.parse(localStorage.getItem(state.localTableColumnsName))
-    state.initTableColums = props.tableColumns || apiTableColumns[props.apiName]
-    let _list = _local && _local != null && _local != undefined ? _local : JSON.parse(JSON.stringify(state.initTableColums))
-    return _list
     // return props.tableColumns || apiTableColumns[props.apiName]
   }
 
@@ -417,7 +421,7 @@
   function rightOperationHadel(btn,scope) {
     // 通用编辑
     if(btn.name == 'apiUpdate'){
-      let _tableColums = getTableColumns()
+      let _tableColums = props.tableColumns || apiTableColumns[props.apiName]
       let _list = _tableColums.filter(item => !item.noEdit)
       apiEditPopRef.value.open(_list,scope.row)
     }
@@ -594,7 +598,7 @@
     // 新增
     else if (btn == 'create'){
       beforClearEdit().then(() => {
-        let _tableColums = getTableColumns()
+        let _tableColums = props.tableColumns || apiTableColumns[props.apiName]
         let _list = _tableColums.filter(item => !item.noEdit)
         apiEditPopRef.value.open(_list)
       })
diff --git a/Web/src/components/importPop/index.vue b/Web/src/components/importPop/index.vue
index 8204527..ddcb2bf 100644
--- a/Web/src/components/importPop/index.vue
+++ b/Web/src/components/importPop/index.vue
@@ -41,7 +41,7 @@
 </template>
 <script setup lang="ts">
 defineOptions({ name: 'importPop' })
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted,defineExpose } from 'vue'
 import { ElDialog,ElMessage } from 'element-plus'
 import { downloadByData } from '@/utils/download'
 import { getCommonImportTemplate } from '@/api/common/index'
diff --git a/Web/src/layout/components/Sidebar/Logo.vue b/Web/src/layout/components/Sidebar/Logo.vue
index c55da61..90ed21f 100644
--- a/Web/src/layout/components/Sidebar/Logo.vue
+++ b/Web/src/layout/components/Sidebar/Logo.vue
@@ -2,12 +2,12 @@
   <div class="sidebar-logo-container">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo&&showLogo" src="/logoSmall.png">
+        <img v-if="showLogo" src="/logo.png">
         <h1 v-else class="sidebar-title">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo&&showLogo" src="/logo.png" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ title }} </h1>
+        <img v-if="showLogo" src="/logo.png" class="sidebar-logo">
+        <h1 v-else class="sidebar-title">{{ title }} </h1>
       </router-link>
     </transition>
   </div>
@@ -37,7 +37,6 @@ export default {
   data() {
     return {
       title: getPageTitle(),
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
     }
   }
 }
diff --git a/Web/src/layout/components/SidebarColumn/index.vue b/Web/src/layout/components/SidebarColumn/index.vue
index 067c559..c203fb3 100644
--- a/Web/src/layout/components/SidebarColumn/index.vue
+++ b/Web/src/layout/components/SidebarColumn/index.vue
@@ -1,7 +1,7 @@
 <template lang="">
   <el-aside width="70px" class="sidebar-column-container">
     <div class="sidebar-logo-container" v-if="settingsStore.sidebarLogo">
-      <img :src="state.logo" class="sidebar-logo" />
+      <img src="/logo_op.png" class="sidebar-logo" />
     </div>
     <div class="menu-container">
       <ul class="menu-list">
@@ -34,7 +34,6 @@ const emits = defineEmits(['modulesChange'])
 const route = useRoute()
 
 const state = reactive({
-  logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png',
   highlightId: 0,
   modules: []
 })
@@ -83,8 +82,7 @@ function columnModulesChange(modules) {
 }
 
 .sidebar-logo {
-  width: 32px;
-  height: 32px;
+  width: 60px;
 }
 
 .sidebar-logo-container {
diff --git a/Web/src/utils/common/apiServeNames.js b/Web/src/utils/common/apiServeNames.js
index bfcf4c7..92f265a 100644
--- a/Web/src/utils/common/apiServeNames.js
+++ b/Web/src/utils/common/apiServeNames.js
@@ -125,6 +125,62 @@ const apiServeNames = {
         tableName:'SUPPLIER_PRO_OEE_TIME_DETAILS',
         taskName:'OEE时间明细'
     },
+
+
+    // 整车月度生产计划2
+    supplierproplaning:{
+        taskName:'整车月度生产计划2'
+    },
+
+    // M+6月物料需求计划
+    cherysuppliermrpmonth:{
+        taskName:'M+6月物料需求计划'
+    },
+
+    // 日物料需求计划
+    cherysuppliermrpdata:{
+        taskName:'日物料需求计划'
+    },
+
+    // 计划协议
+    cherysuppliersaweek:{
+        taskName:'计划协议'
+    },
+
+    // 采购订单
+    cherysupplierpo:{
+        taskName:'采购订单'
+    },
+
+    // 过焊装未过总装
+    cherysupplierporhschedul:{
+        taskName:'过焊装未过总装'
+    },
+
+    // 过涂装未过总装
+    cherysupplierprotschedul:{
+        taskName:'过涂装未过总装'
+    },
+    
+    // 退货单
+    cherysupplierreturn:{
+        taskName:'退货单'
+    },
+
+    // 奇瑞RDC共享库存
+    supplierinvdata:{
+        taskName:'奇瑞RDC共享库存'
+    },
+
+    // 日MRP状态监控
+    cherysuppliermrp:{
+        taskName:'日MRP状态监控'
+    },
+
+    // 日MRP预警推移
+    cherysuppliermrpwarning:{
+        taskName:'日MRP预警推移'
+    },
 }
 
 export default apiServeNames
diff --git a/Web/src/utils/common/apiTableColumns.js b/Web/src/utils/common/apiTableColumns.js
index af0e7ff..8c18117 100644
--- a/Web/src/utils/common/apiTableColumns.js
+++ b/Web/src/utils/common/apiTableColumns.js
@@ -20,13 +20,13 @@ const apiTableColumns = {
     // 任务列表
     tasksub:[
         {prop:'tableName',title:'表名',align:'left',width:240,disabled:true},
-        {prop:'taskName',title:'任务名称',align:'left',width:160,disabled:true},
+        {prop:'taskName',title:'任务名称',align:'left',width:200,disabled:true},
         {prop:'dataCount',title:'同步总数量',type:'number'},
         {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
         {prop:'subscriber',title:'客户名'},
-        {prop:'failedCount',title:'失败次数',type:'number'},
-        {prop:'failedInfo',title:'失败信息'},
+        {prop:'failedCount',title:'失败条数',type:'number'},
+        {prop:'failedInfo',title:'失败信息',tooltip:true,width:180},
         {prop:'domain',title:'域名'},
         {prop:'site',title:'站点'},
         {prop:'syncedPageCount',title:'更新完成次数',type:'number',width:160},
diff --git a/Web/src/utils/common/index.js b/Web/src/utils/common/index.js
index 9134894..1803f2d 100644
--- a/Web/src/utils/common/index.js
+++ b/Web/src/utils/common/index.js
@@ -45,9 +45,26 @@ export async function downLoadJSONByString(stringData,title){
 // 法根据tableName获取api
 export function getApiByServeName(value,prop='tableName'){
     let _api = null
-    for(let i in apiServeNames){
-        if(apiServeNames[i][prop] == value){
-            _api = i
+    // taskName 特殊处理
+    if(prop == 'taskName'){
+        let _special = {
+            '整车月度生产计划1':'supplierproplaning',
+            'M+6月物料需求计划1':'cherysuppliermrpmonth',
+            'M+6月物料需求计划2':'cherysuppliermrpmonth',
+            '供应商共享库存-上午':'cherysuppliersinvdata',
+            '供应商共享库存-下午':'cherysuppliersinvdata',
+        }
+        for(let i in _special){
+            if(i == value){
+                _api = _special[i]
+            }
+        }
+    }
+    if(!_api){
+        for(let i in apiServeNames){
+            if(apiServeNames[i][prop] == value){
+                _api = i
+            }
         }
     }
     return _api
@@ -55,20 +72,21 @@ export function getApiByServeName(value,prop='tableName'){
 
 // 法根据tableName获取api对应的Coloums
 export function getColoumsByServeName(value,prop='tableName',noEdit){
-    let _api = null
-    for(let i in apiServeNames){
-        if(apiServeNames[i][prop] == value){
-            _api = i
+    let _api = getApiByServeName(value,prop)
+    let __colums = null
+    if(_api){
+        __colums = JSON.parse(JSON.stringify(apiTableColumns[_api]))
+        if(noEdit){
+            __colums.forEach(item => {
+                if(item.type == 'input' || item.type == 'numberInput' ||  item.type == 'datetimeInput'){
+                    item.type = null
+                }
+                if(item.type == 'filterSelect'){
+                    item.type = 'filter'
+                }
+            });
         }
     }
-    let __colums = JSON.parse(JSON.stringify(apiTableColumns[_api]))
-    if(noEdit){
-        __colums.forEach(item => {
-            if(item.type == 'input' || item.type == 'numberInput' || item.type == 'filterSelect' || item.type == 'datetimeInput'){
-                item.type = null
-            }
-        });
-    }
     return __colums
 }
 
diff --git a/Web/src/views/system/autoJob/components/deferredJobDialog.vue b/Web/src/views/system/autoJob/components/deferredJobDialog.vue
index 478b870..4a12b4c 100644
--- a/Web/src/views/system/autoJob/components/deferredJobDialog.vue
+++ b/Web/src/views/system/autoJob/components/deferredJobDialog.vue
@@ -28,7 +28,7 @@
     </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import {  deferredJob } from '@/api/system/autoJobApi'
 import { ElMessage } from 'element-plus'
 
diff --git a/Web/src/views/system/components/orgCascader.vue b/Web/src/views/system/components/orgCascader.vue
index 2ddd3d6..3e93e5a 100644
--- a/Web/src/views/system/components/orgCascader.vue
+++ b/Web/src/views/system/components/orgCascader.vue
@@ -13,7 +13,7 @@
 </template>
 <script setup>
 //机构部门层级选择
-import { ref, onMounted, nextTick } from 'vue'
+import { ref, onMounted, nextTick,defineExpose } from 'vue'
 import { getTreeList } from '@/api/system/orgApi'
 import { waiting } from '@/utils/index'
 
diff --git a/Web/src/views/system/components/orgTree.vue b/Web/src/views/system/components/orgTree.vue
index f217c78..8102dc1 100644
--- a/Web/src/views/system/components/orgTree.vue
+++ b/Web/src/views/system/components/orgTree.vue
@@ -9,7 +9,7 @@
 </template>
 <script setup>
 //机构属性选择
-import { ref, onMounted } from 'vue'
+import { ref, onMounted,defineExpose } from 'vue'
 import { getElTreeList } from '@/api/system/orgApi'
 
 const orgTreeList = ref([])
diff --git a/Web/src/views/system/components/userSelect.vue b/Web/src/views/system/components/userSelect.vue
index e7b734e..38a4956 100644
--- a/Web/src/views/system/components/userSelect.vue
+++ b/Web/src/views/system/components/userSelect.vue
@@ -16,7 +16,7 @@
 </template>
 <script setup>
 //用户选择框
-import { ref } from 'vue'
+import { ref,defineExpose } from 'vue'
 import { getSelectList } from '@/api/system/userApi'
 
 const model = defineModel()
diff --git a/Web/src/views/system/components/userSelectDialog.vue b/Web/src/views/system/components/userSelectDialog.vue
index ea3f298..ad4250d 100644
--- a/Web/src/views/system/components/userSelectDialog.vue
+++ b/Web/src/views/system/components/userSelectDialog.vue
@@ -68,7 +68,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive } from 'vue'
+import { reactive,defineExpose } from 'vue'
 import { getPaged } from '@/api/system/userApi'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import OrgCascader from '@/views/system/components/orgCascader.vue'
diff --git a/Web/src/views/system/dataDict/components/dictDetailDialog.vue b/Web/src/views/system/dataDict/components/dictDetailDialog.vue
index 10642b4..b7c8327 100644
--- a/Web/src/views/system/dataDict/components/dictDetailDialog.vue
+++ b/Web/src/views/system/dataDict/components/dictDetailDialog.vue
@@ -71,7 +71,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import { getPaged, deleteDataDictDetail } from '@/api/system/dataDictDetailApi'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import EditDictDetailDialog from './editDictDetailDialog.vue'
diff --git a/Web/src/views/system/dataDict/components/editDialog.vue b/Web/src/views/system/dataDict/components/editDialog.vue
index ccc4e4d..aaadb4a 100644
--- a/Web/src/views/system/dataDict/components/editDialog.vue
+++ b/Web/src/views/system/dataDict/components/editDialog.vue
@@ -55,7 +55,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import { getMaxSort, addDataDict, updateDataDict, getDataDict } from '@/api/system/dataDictApi'
 import { ElMessage } from 'element-plus'
 
diff --git a/Web/src/views/system/dataDict/components/editDictDetailDialog.vue b/Web/src/views/system/dataDict/components/editDictDetailDialog.vue
index 3998052..c68d8bf 100644
--- a/Web/src/views/system/dataDict/components/editDictDetailDialog.vue
+++ b/Web/src/views/system/dataDict/components/editDictDetailDialog.vue
@@ -55,7 +55,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import { getMaxSort, addDataDictDetail, updateDataDictDetail, getDataDictDetail } from '@/api/system/dataDictDetailApi'
 import { ElMessage } from 'element-plus'
 
diff --git a/Web/src/views/system/login/components/tenantDialog.vue b/Web/src/views/system/login/components/tenantDialog.vue
index b943b80..41de438 100644
--- a/Web/src/views/system/login/components/tenantDialog.vue
+++ b/Web/src/views/system/login/components/tenantDialog.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import { reactive } from 'vue'
+import { reactive,defineExpose } from 'vue'
 import store from '@/stores'
 import { useRouter } from 'vue-router'
 const router = useRouter()
diff --git a/Web/src/views/system/menu/components/editDialog.vue b/Web/src/views/system/menu/components/editDialog.vue
index 1f73b58..0e39d7d 100644
--- a/Web/src/views/system/menu/components/editDialog.vue
+++ b/Web/src/views/system/menu/components/editDialog.vue
@@ -152,7 +152,7 @@
 </template>
 
 <script setup >
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted,defineExpose } from 'vue'
 import { getTreeList, getMaxSort, addMenu,updateMenu, getMenu } from '@/api/system/menuApi'
 import ElIconList from './elIconList.vue'
 import FaIconList from './faIconList.vue'
diff --git a/Web/src/views/system/message/components/editDialog.vue b/Web/src/views/system/message/components/editDialog.vue
index cfc8db5..08e09df 100644
--- a/Web/src/views/system/message/components/editDialog.vue
+++ b/Web/src/views/system/message/components/editDialog.vue
@@ -57,7 +57,7 @@
 </template>
 <script setup>
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
-import { reactive, ref, shallowRef, onBeforeUnmount } from 'vue'
+import { reactive, ref, shallowRef, onBeforeUnmount,defineExpose } from 'vue'
 import { addMessage, updateMessage, getMessage } from '@/api/system/messageApi'
 import { uploadFile } from '@/api/system/fileApi'
 import { ElMessage } from 'element-plus'
diff --git a/Web/src/views/system/message/components/publishDialog.vue b/Web/src/views/system/message/components/publishDialog.vue
index 841bfca..ca0a532 100644
--- a/Web/src/views/system/message/components/publishDialog.vue
+++ b/Web/src/views/system/message/components/publishDialog.vue
@@ -101,7 +101,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import { ElMessage } from 'element-plus'
 import { publishMessage } from '@/api/system/messageApi'
 import EnumSelect from '@/views/system/components/enumSelect.vue'
diff --git a/Web/src/views/system/message/components/viewDialog.vue b/Web/src/views/system/message/components/viewDialog.vue
index 54c0daa..d186f68 100644
--- a/Web/src/views/system/message/components/viewDialog.vue
+++ b/Web/src/views/system/message/components/viewDialog.vue
@@ -37,7 +37,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive } from 'vue'
+import { reactive,defineExpose } from 'vue'
 import { getMessage, setRead } from '@/api/system/messageApi'
 
 const emits = defineEmits(['refresh'])
diff --git a/Web/src/views/system/org/components/editDialog.vue b/Web/src/views/system/org/components/editDialog.vue
index 7906c8c..ff2cab4 100644
--- a/Web/src/views/system/org/components/editDialog.vue
+++ b/Web/src/views/system/org/components/editDialog.vue
@@ -90,7 +90,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import { getMaxSort, addOrg, updateOrg, getOrg } from '@/api/system/orgApi'
 import UserSelect from '@/views/system/components/userSelect.vue'
 import OrgCascader from '@/views/system/components/orgCascader.vue'
diff --git a/Web/src/views/system/position/components/editDialog.vue b/Web/src/views/system/position/components/editDialog.vue
index 1594807..6110421 100644
--- a/Web/src/views/system/position/components/editDialog.vue
+++ b/Web/src/views/system/position/components/editDialog.vue
@@ -48,7 +48,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted,defineExpose } from 'vue'
 import { getMaxSort, addPosition, updatePosition, getPosition } from '@/api/system/positionApi'
 import { getElTreeList } from '@/api/system/menuApi'
 import { ElMessage } from 'element-plus'
diff --git a/Web/src/views/system/role/components/editDataTypeDialog.vue b/Web/src/views/system/role/components/editDataTypeDialog.vue
index 8bd86eb..b7dcd0d 100644
--- a/Web/src/views/system/role/components/editDataTypeDialog.vue
+++ b/Web/src/views/system/role/components/editDataTypeDialog.vue
@@ -37,7 +37,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import { getRole, updateRoleDataType } from '@/api/system/roleApi'
 import OrgTree from '@/views/system/components/orgTree.vue'
 import { ElMessage } from 'element-plus'
diff --git a/Web/src/views/system/role/components/editDialog.vue b/Web/src/views/system/role/components/editDialog.vue
index c94e7ff..40407e2 100644
--- a/Web/src/views/system/role/components/editDialog.vue
+++ b/Web/src/views/system/role/components/editDialog.vue
@@ -72,7 +72,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted,defineExpose } from 'vue'
 import { getMaxSort, addRole, updateRole, getRole } from '@/api/system/roleApi'
 import { getElTreeList } from '@/api/system/menuApi'
 import { ElMessage } from 'element-plus'
diff --git a/Web/src/views/system/taskConifgure/index.vue b/Web/src/views/system/taskConifgure/index.vue
index 108e139..61062cd 100644
--- a/Web/src/views/system/taskConifgure/index.vue
+++ b/Web/src/views/system/taskConifgure/index.vue
@@ -24,10 +24,12 @@ const state = reactive({
   apiName:'taskconifgure',
   searchFilter: {
     tableName: null,
+    taskName:null,
     creationTime:null,
   },
   searchOptions:[
     {type:'input',prop:'tableName',label:'表名'},
+    {type:'input',prop:'taskName',label:'任务名'},
     {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:[],
diff --git a/Web/src/views/system/tenant/components/editDialog.vue b/Web/src/views/system/tenant/components/editDialog.vue
index fabcc92..3015be9 100644
--- a/Web/src/views/system/tenant/components/editDialog.vue
+++ b/Web/src/views/system/tenant/components/editDialog.vue
@@ -68,7 +68,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,defineExpose } from 'vue'
 import { getMaxSort, addTenant } from '@/api/system/tenantApi'
 import { ElMessage } from 'element-plus'
 
diff --git a/Web/src/views/system/user/components/editDialog.vue b/Web/src/views/system/user/components/editDialog.vue
index 4db78bb..6325ee0 100644
--- a/Web/src/views/system/user/components/editDialog.vue
+++ b/Web/src/views/system/user/components/editDialog.vue
@@ -117,7 +117,7 @@
 </template>
 <script setup>
 defineOptions({ name: 'userEditDialog' })
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted,defineExpose } from 'vue'
 import { getSelectList } from '@/api/system/roleApi'
 import { addUser, updateUser, getUser } from '@/api/system/userApi'
 import { ElMessage } from 'element-plus'
diff --git a/Web/src/views/task/logisticsPlanLog/index.vue b/Web/src/views/task/logisticsPlanLog/index.vue
index 02ba617..0264256 100644
--- a/Web/src/views/task/logisticsPlanLog/index.vue
+++ b/Web/src/views/task/logisticsPlanLog/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="taskSubPage" v-loading="state.loading">
+  <div class="logisticsPlanLogPage" v-loading="state.loading">
     <!-- 主表 -->
     <tablePage 
       :apiName="state.apiName"
@@ -10,10 +10,12 @@
       :leftOperationColumnWidth="180"
       :authName="'logisticsPlanLog'"
       :searchFilterOptions="state.searchFilterOptions"
+      :tableCellClassName="tableCellClassName"
     ></tablePage>
 
     <!-- 明细抽屉 -->
     <el-drawer
+      class="logisticsPlanLog_infoDrawerPop"
       v-if="state.drawerShow"
       v-model="state.drawerShow"
       :title="`详情 (${state.infoCurrentRow.taskName} - uId:${state.infoCurrentRow.uId})`"
@@ -22,9 +24,18 @@
       :size="'80%'"
       @close="resetInfo"
     >
-      <div style="height: 100%">
+      <div style="height: 100%;display: flex">
+        <tablePage
+          v-if="state.drawerShow"
+          :specialPageApi='`/api/customlog/getlogreponselist`'
+          :tableColumns="state.infoTableColumns"
+          :specialColumnName="state.infoTableColumnsName"
+          :specialLocalColumnName="state.infoTableColumnsName+'_LPLogDetail'"
+          :searchFilter="state.infoSearchFilter"
+          :hideSearch="true"
+        ></tablePage>
         <!-- 前端分页 -->
-        <elTable
+        <!-- <elTable
           style="height:calc(100% - 50px)"
           :tableData="state.infoTableData"
           :tableColumns="state.infoTableColumns"
@@ -37,7 +48,7 @@
           @pageSizeChange="pageSizeChange"
           @pageCurrentChange="pageCurrentChange"
           :isHideOnlyOne="true"
-        ></elPager>
+        ></elPager> -->
       </div>
     </el-drawer>
   </div>
@@ -51,7 +62,7 @@
   import elTable from '@/components/elTable/index.vue'
   import elPager from '@/components/elPager/index.vue'
   import { getLogJsonList } from '@/api/system/customlog'
-  import { downLoadJSONByString,getColoumsByServeName } from '@/utils/common/index'
+  import { downLoadJSONByString,getColoumsByServeName,getApiByServeName } from '@/utils/common/index'
   import EnumList from '@/utils/common/enumList'
 
   import { useRoute } from 'vue-router'
@@ -78,6 +89,9 @@
     drawerShow:false,
     infoTableData:null,
     infoTableColumns:[],
+    // 查看详情内部colums的名称
+    infoTableColumnsName:null,
+    infoSearchFilter: {},
     columnWidth:null,
     infoType:null,
     infoAllData:null,
@@ -90,49 +104,70 @@
   })
 
   function leftOperationHadel(btn,scope) {
+    // 查看详情（原）
+    // if(btn.name == 'showInfo'){
+    //   state.infoCurrentRow = scope.row
+    //   // 应答格式：直接实体 state.infoType = 1
+    //   let _arr1 = [
+    //     '整车月度生产计划1','整车月度生产计划2','M+6月物料需求计划','日物料需求计划',
+    //     '计划协议','采购订单','过焊装未过总装','过涂装未过总装','排序供货','看板配送单',
+    //     '退货单','奇瑞RDC共享库存','日MRP状态监控','日MRP预警推移'
+    //   ]
+    //   // 应答格式：获取list字段 state.infoType = 2
+    //   let _arr2 = [
+    //     '来料检验数据','排产数据','供应商基础信息','人员资质信息','BOM主数据',
+    //     '过程控制项质量数据','生产过程数据','产品一次合格率','工位一次合格率',
+    //     '缺陷业务数据','物料主数据','附件类数据','工艺装备','工艺','供应商共享库存',
+    //     'M+6月物料需求计划风险确认','日物料需求计划风险确认','采购订单风险确认'
+    //   ]
+    //   state.loading = true
+    //   getLogJsonList(scope.row.uId)
+    //     .then(res=>{
+    //       if(_arr1.indexOf(scope.row.taskName) >= 0){
+    //         state.columnWidth = null
+    //         state.infoType = 1
+    //         state.infoTableData = [JSON.parse(res.message)]
+    //         state.infoTableColumns = [
+    //           {prop:'date',title:'date'},
+    //           {prop:'pageSize',title:'pageSize'},
+    //           {prop:'pageNum',title:'pageNum'},
+    //           {prop:'isForce',title:'isForce'},
+    //         ]
+    //       }
+    //       if(_arr2.indexOf(scope.row.taskName) >= 0){
+    //         state.columnWidth = 120
+    //         state.infoType = 2
+    //         state.infoAllData = JSON.parse(res.message).list
+    //         state.infoPager.total = state.infoAllData.length
+    //         state.infoTableColumns = getColoumsByServeName(scope.row.taskName,'taskName',true)
+    //         initInfoType2Pagedata()
+    //       }
+    //       nextTick(() => {
+    //         state.drawerShow = true
+    //       })
+    //     })
+    //     .finally(() => (state.loading = false))
+    // }
     // 查看详情
     if(btn.name == 'showInfo'){
       state.infoCurrentRow = scope.row
-      // 应答格式：直接实体 state.infoType = 1
-      let _arr1 = [
-        '整车月度生产计划1','整车月度生产计划2','M+6月物料需求计划','日物料需求计划',
-        '计划协议','采购订单','过焊装未过总装','过涂装未过总装','排序供货','看板配送单',
-        '退货单','奇瑞RDC共享库存','日MRP状态监控','日MRP预警推移'
-      ]
-      // 应答格式：获取list字段 state.infoType = 2
-      let _arr2 = [
-        '来料检验数据','排产数据','供应商基础信息','人员资质信息','BOM主数据',
-        '过程控制项质量数据','生产过程数据','产品一次合格率','工位一次合格率',
-        '缺陷业务数据','物料主数据','附件类数据','工艺装备','工艺','供应商共享库存',
-        'M+6月物料需求计划风险确认','日物料需求计划风险确认','采购订单风险确认'
+      state.infoTableColumns = getColoumsByServeName(scope.row.taskName,'taskName',true)
+      state.infoTableColumnsName = getApiByServeName(scope.row.taskName,'taskName')
+      if(!state.infoTableColumnsName){
+        ElMessage.error(`不支持的任务名: ${scope.row.taskName}`)
+        return
+      }
+      state.infoSearchFilter = [
+        {
+          logic: "And",
+          column: 'Uid',
+          action: '==',
+          value: scope.row.uId
+        },
       ]
-      state.loading = true
-      getLogJsonList(scope.row.uId)
-        .then(res=>{
-          if(_arr1.indexOf(scope.row.taskName) >= 0){
-            state.columnWidth = null
-            state.infoType = 1
-            state.infoTableData = [JSON.parse(res.message)]
-            state.infoTableColumns = [
-              {prop:'date',title:'date'},
-              {prop:'pageSize',title:'pageSize'},
-              {prop:'pageNum',title:'pageNum'},
-              {prop:'isForce',title:'isForce'},
-            ]
-          }
-          if(_arr2.indexOf(scope.row.taskName) >= 0){
-            state.columnWidth = 120
-            state.infoType = 2
-            state.infoAllData = JSON.parse(res.message).list
-            state.infoPager.total = state.infoAllData.length
-            state.infoTableColumns = getColoumsByServeName(scope.row.taskName,'taskName',true)
-            initInfoType2Pagedata()
-          }
-          nextTick(() => {
-            state.drawerShow = true
-          })
-        })
-        .finally(() => (state.loading = false))
+      nextTick(() => {
+        state.drawerShow = true
+      })
     }
     // 下载json
     if(btn.name == 'downloadJSON'){
@@ -178,10 +213,17 @@
       total: null,
     }
   }
+
+  
+  // 单元格变色
+  function tableCellClassName(data){
+    if(data.row.type == '错误' && data.column.property == 'type'){return 'table-danger-row'}
+    else{return 'normal-tableRow'}
+  }
   
 </script>
 <style scope lang="scss">
-.taskSubPage{
+.logisticsPlanLogPage{
   height: 100%;
   display: flex;
   width:100%;
@@ -190,4 +232,15 @@
     margin-bottom:0 !important
   }
 }
+
+.logisticsPlanLog_infoDrawerPop {
+  .search-container{
+    position: fixed;
+    right: 71px;
+    top: 0px;
+    box-shadow: none;
+    border: none;
+    height: 60px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/Web/src/views/task/productionQualityLog/index copy.vue b/Web/src/views/task/productionQualityLog/index copy.vue
new file mode 100644
index 0000000..20a0796
--- /dev/null
+++ b/Web/src/views/task/productionQualityLog/index copy.vue	
@@ -0,0 +1,200 @@
+<template>
+  <div class="taskSubPage" v-loading="state.loading">
+    <!-- 主表 -->
+    <tablePage 
+      :apiName="state.apiName"
+      :searchOptions="state.searchOptions"
+      :searchFilter="state.searchFilter"
+      @leftOperationHadel="leftOperationHadel"
+      :leftOperation="state.leftOperation"
+      :leftOperationColumnWidth="180"
+      :authName="'productionQualityLog'"
+      :searchFilterOptions="state.searchFilterOptions"
+      :tableCellClassName="tableCellClassName"
+    ></tablePage>
+
+    <!-- 明细抽屉 -->
+    <el-drawer
+      v-if="state.drawerShow"
+      v-model="state.drawerShow"
+      :title="`详情 (${state.infoCurrentRow.taskName} - uId:${state.infoCurrentRow.uId})`"
+      direction="rtl"
+      destroy-on-close
+      :size="'80%'"
+      @close="resetInfo"
+    >
+      <div style="height: 100%">
+        <!-- 前端分页 -->
+        <elTable
+          style="height:calc(100% - 50px)"
+          :tableData="state.infoTableData"
+          :tableColumns="state.infoTableColumns"
+          :columnWidth="state.columnWidth"
+        ></elTable>
+        <elPager
+          v-if="state.infoType == 2"
+          style="margin-top: 15px;float:right"
+          :pager="state.infoPager"
+          @pageSizeChange="pageSizeChange"
+          @pageCurrentChange="pageCurrentChange"
+          :isHideOnlyOne="true"
+        ></elPager>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+  
+<script setup>
+  defineOptions({ name: 'productionQualityLog' })
+  import { ElMessageBox, ElMessage,ElTable, ElTableColumn } from 'element-plus'
+  import { reactive, ref, onMounted,nextTick  } from 'vue'
+  import tablePage from '@/components/tablePage/index.vue'
+  import elTable from '@/components/elTable/index.vue'
+  import elPager from '@/components/elPager/index.vue'
+  import { getLogJsonList } from '@/api/system/customlog'
+  import { downLoadJSONByString,getColoumsByServeName } from '@/utils/common/index'
+  import EnumList from '@/utils/common/enumList'
+
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
+  
+  const state = reactive({
+    apiName:'customlog',
+    loading:false,
+    searchFilter: {
+      taskName: null,
+      creationTime:null,
+      module:'生产质量'
+    },
+    searchOptions:[
+      {type:'input',prop:'taskName',label:'任务名称'},
+      {type:'datetimerange',prop:'creationTime',label:'创建时间'},
+    ],
+    searchFilterOptions:{ module:{action:'=='} },
+    leftOperation:[
+      {label:'查看详情',name:'showInfo',link:true,type:'primary'},
+      {label:'下载JSON',name:'downloadJSON',link:true,type:'warning'},
+    ],
+    // 查看详情相关数据
+    drawerShow:false,
+    infoTableData:null,
+    infoTableColumns:[],
+    columnWidth:null,
+    infoType:null,
+    infoAllData:null,
+    infoCurrentRow:null,
+    infoPager:{
+      page: 1,
+      pageSize: 20,
+      total: null,
+    },
+  })
+
+  function leftOperationHadel(btn,scope) {
+    // 查看详情
+    if(btn.name == 'showInfo'){
+      state.infoCurrentRow = scope.row
+      // 应答格式：直接实体 state.infoType = 1
+      let _arr1 = [
+        '整车月度生产计划1','整车月度生产计划2','M+6月物料需求计划','日物料需求计划',
+        '计划协议','采购订单','过焊装未过总装','过涂装未过总装','排序供货','看板配送单',
+        '退货单','奇瑞RDC共享库存','日MRP状态监控','日MRP预警推移'
+      ]
+      // 应答格式：获取list字段 state.infoType = 2
+      let _arr2 = [
+        '来料检验数据','排产数据','供应商基础信息','人员资质信息','BOM主数据',
+        '过程控制项质量数据','生产过程数据','产品一次合格率','工位一次合格率',
+        '缺陷业务数据','物料主数据','附件类数据','工艺装备','工艺','供应商共享库存',
+        'M+6月物料需求计划风险确认','日物料需求计划风险确认','采购订单风险确认'
+      ]
+      state.loading = true
+      getLogJsonList(scope.row.uId)
+        .then(res=>{
+          if(_arr1.indexOf(scope.row.taskName) >= 0){
+            state.columnWidth = null
+            state.infoType = 1
+            state.infoTableData = [JSON.parse(res.message)]
+            state.infoTableColumns = [
+              {prop:'date',title:'date'},
+              {prop:'pageSize',title:'pageSize'},
+              {prop:'pageNum',title:'pageNum'},
+              {prop:'isForce',title:'isForce'},
+            ]
+          }
+          if(_arr2.indexOf(scope.row.taskName) >= 0){
+            state.columnWidth = 120
+            state.infoType = 2
+            state.infoAllData = JSON.parse(res.message).list
+            state.infoPager.total = state.infoAllData.length
+            state.infoTableColumns = getColoumsByServeName(scope.row.taskName,'taskName',true)
+            initInfoType2Pagedata()
+          }
+          nextTick(() => {
+            state.drawerShow = true
+          })
+        })
+        .finally(() => (state.loading = false))
+    }
+    // 下载json
+    if(btn.name == 'downloadJSON'){
+      state.loading = true
+      getLogJsonList(scope.row.uId)
+        .then(res=>{
+          downLoadJSONByString(res.message,`${route.meta.title}_uid=${scope.row.uId}.json`)
+        })
+        .finally(() => (state.loading = false))
+    }
+  }
+
+  // InfoType=2的前端分页
+  function initInfoType2Pagedata() {
+    state.infoTableData = state.infoAllData.slice((state.infoPager.page-1) * state.infoPager.pageSize,state.infoPager.page * state.infoPager.pageSize)
+  }
+
+  function pageSizeChange(data) {
+    state.infoPager.pageSize = data
+    state.infoPager.page = 1
+    nextTick(() => {
+      initInfoType2Pagedata()
+    })
+  }
+
+  function pageCurrentChange(data) {
+    state.infoPager.page = data
+    nextTick(() => {
+      initInfoType2Pagedata()
+    })
+  }
+
+  function resetInfo(){
+    state.drawerShow=false
+    state.infoTableData=null
+    state.infoTableColumns=[]
+    state.columnWidth=null
+    state.infoType=null
+    state.infoAllData=null
+    state.infoPager={
+      page: 1,
+      pageSize: 20,
+      total: null,
+    }
+  }
+
+  // 单元格变色
+  function tableCellClassName(data){
+    if(data.row.type == '错误' && data.column.property == 'type'){return 'table-danger-row'}
+    else{return 'normal-tableRow'}
+  }
+  
+</script>
+<style scope lang="scss">
+.taskSubPage{
+  height: 100%;
+  display: flex;
+  width:100%;
+  
+  .el-drawer__header {
+    margin-bottom:0 !important
+  }
+}
+</style>
\ No newline at end of file
diff --git a/Web/src/views/task/productionQualityLog/index.vue b/Web/src/views/task/productionQualityLog/index.vue
index faad782..1f0105f 100644
--- a/Web/src/views/task/productionQualityLog/index.vue
+++ b/Web/src/views/task/productionQualityLog/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="taskSubPage" v-loading="state.loading">
+  <div class="productionQualityLogPage" v-loading="state.loading">
     <!-- 主表 -->
     <tablePage 
       :apiName="state.apiName"
@@ -10,10 +10,12 @@
       :leftOperationColumnWidth="180"
       :authName="'productionQualityLog'"
       :searchFilterOptions="state.searchFilterOptions"
+      :tableCellClassName="tableCellClassName"
     ></tablePage>
 
     <!-- 明细抽屉 -->
     <el-drawer
+      class="productionQualityLog_infoDrawerPop"
       v-if="state.drawerShow"
       v-model="state.drawerShow"
       :title="`详情 (${state.infoCurrentRow.taskName} - uId:${state.infoCurrentRow.uId})`"
@@ -22,22 +24,16 @@
       :size="'80%'"
       @close="resetInfo"
     >
-      <div style="height: 100%">
-        <!-- 前端分页 -->
-        <elTable
-          style="height:calc(100% - 50px)"
-          :tableData="state.infoTableData"
+      <div style="height: 100%;display: flex">
+        <tablePage
+          v-if="state.drawerShow"
+          :specialPageApi='`/api/customlog/getlogreponselist`'
           :tableColumns="state.infoTableColumns"
-          :columnWidth="state.columnWidth"
-        ></elTable>
-        <elPager
-          v-if="state.infoType == 2"
-          style="margin-top: 15px;float:right"
-          :pager="state.infoPager"
-          @pageSizeChange="pageSizeChange"
-          @pageCurrentChange="pageCurrentChange"
-          :isHideOnlyOne="true"
-        ></elPager>
+          :specialColumnName="state.infoTableColumnsName"
+          :specialLocalColumnName="state.infoTableColumnsName+'_PQLogDetail'"
+          :searchFilter="state.infoSearchFilter"
+          :hideSearch="true"
+        ></tablePage>
       </div>
     </el-drawer>
   </div>
@@ -51,7 +47,7 @@
   import elTable from '@/components/elTable/index.vue'
   import elPager from '@/components/elPager/index.vue'
   import { getLogJsonList } from '@/api/system/customlog'
-  import { downLoadJSONByString,getColoumsByServeName } from '@/utils/common/index'
+  import { downLoadJSONByString,getColoumsByServeName,getApiByServeName } from '@/utils/common/index'
   import EnumList from '@/utils/common/enumList'
 
   import { useRoute } from 'vue-router'
@@ -78,6 +74,9 @@
     drawerShow:false,
     infoTableData:null,
     infoTableColumns:[],
+    // 查看详情内部colums的名称
+    infoTableColumnsName:null,
+    infoSearchFilter: {},
     columnWidth:null,
     infoType:null,
     infoAllData:null,
@@ -93,46 +92,23 @@
     // 查看详情
     if(btn.name == 'showInfo'){
       state.infoCurrentRow = scope.row
-      // 应答格式：直接实体 state.infoType = 1
-      let _arr1 = [
-        '整车月度生产计划1','整车月度生产计划2','M+6月物料需求计划','日物料需求计划',
-        '计划协议','采购订单','过焊装未过总装','过涂装未过总装','排序供货','看板配送单',
-        '退货单','奇瑞RDC共享库存','日MRP状态监控','日MRP预警推移'
+      state.infoTableColumns = getColoumsByServeName(scope.row.taskName,'taskName',true)
+      state.infoTableColumnsName = getApiByServeName(scope.row.taskName,'taskName')
+      if(!state.infoTableColumnsName){
+        ElMessage.error(`不支持的任务名: ${scope.row.taskName}`)
+        return
+      }
+      state.infoSearchFilter = [
+        {
+          logic: "And",
+          column: 'Uid',
+          action: '==',
+          value: scope.row.uId
+        },
       ]
-      // 应答格式：获取list字段 state.infoType = 2
-      let _arr2 = [
-        '来料检验数据','排产数据','供应商基础信息','人员资质信息','BOM主数据',
-        '过程控制项质量数据','生产过程数据','产品一次合格率','工位一次合格率',
-        '缺陷业务数据','物料主数据','附件类数据','工艺装备','工艺','供应商共享库存',
-        'M+6月物料需求计划风险确认','日物料需求计划风险确认','采购订单风险确认'
-      ]
-      state.loading = true
-      getLogJsonList(scope.row.uId)
-        .then(res=>{
-          if(_arr1.indexOf(scope.row.taskName) >= 0){
-            state.columnWidth = null
-            state.infoType = 1
-            state.infoTableData = [JSON.parse(res.message)]
-            state.infoTableColumns = [
-              {prop:'date',title:'date'},
-              {prop:'pageSize',title:'pageSize'},
-              {prop:'pageNum',title:'pageNum'},
-              {prop:'isForce',title:'isForce'},
-            ]
-          }
-          if(_arr2.indexOf(scope.row.taskName) >= 0){
-            state.columnWidth = 120
-            state.infoType = 2
-            state.infoAllData = JSON.parse(res.message).list
-            state.infoPager.total = state.infoAllData.length
-            state.infoTableColumns = getColoumsByServeName(scope.row.taskName,'taskName',true)
-            initInfoType2Pagedata()
-          }
-          nextTick(() => {
-            state.drawerShow = true
-          })
-        })
-        .finally(() => (state.loading = false))
+      nextTick(() => {
+        state.drawerShow = true
+      })
     }
     // 下载json
     if(btn.name == 'downloadJSON'){
@@ -178,10 +154,16 @@
       total: null,
     }
   }
+
+  // 单元格变色
+  function tableCellClassName(data){
+    if(data.row.type == '错误' && data.column.property == 'type'){return 'table-danger-row'}
+    else{return 'normal-tableRow'}
+  }
   
 </script>
 <style scope lang="scss">
-.taskSubPage{
+.productionQualityLogPage{
   height: 100%;
   display: flex;
   width:100%;
@@ -190,4 +172,15 @@
     margin-bottom:0 !important
   }
 }
+
+.productionQualityLog_infoDrawerPop {
+  .search-container{
+    position: fixed;
+    right: 71px;
+    top: 0px;
+    box-shadow: none;
+    border: none;
+    height: 60px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/Web/src/views/task/taskSub/index.vue b/Web/src/views/task/taskSub/index.vue
index 958cc65..d6cdc6d 100644
--- a/Web/src/views/task/taskSub/index.vue
+++ b/Web/src/views/task/taskSub/index.vue
@@ -10,23 +10,28 @@
       :leftOperation="state.leftOperation"
       :rightOperation="state.rightOperation"
       @rightOperationHadel="rightOperationHadel"
+      :tableCellClassName="tableCellClassName"
     ></tablePage>
 
     <!-- 明细抽屉 -->
     <el-drawer
+      class="taskSub_infoDrawerPop"
       v-model="state.drawerShow"
-      title="详情"
+      :title="`详情（${state.taskName}）`"
       direction="rtl"
       destroy-on-close
       :size="'80%'"
     >
       <div style="height: 100%;display: flex">
         <tablePage
+          v-if="state.drawerShow"
           :apiName="state.apiName"
           :tableColumns="state.infoTableColumns"
+          :specialColumnName="state.infoTableColumnsName"
+          :specialLocalColumnName="state.infoTableColumnsName+'_taskDetail'"
           :searchFilter="state.infoSearchFilter"
-          :hideSearch="true"
           :apiType="'detailApi'"
+          :hideSearch="true"
         ></tablePage>
       </div>
     </el-drawer>
@@ -38,7 +43,7 @@
   import { ElMessageBox, ElMessage,ElTable, ElTableColumn } from 'element-plus'
   import { reactive, ref, onMounted,nextTick  } from 'vue'
   import tablePage from '@/components/tablePage/index.vue'
-  import { getColoumsByServeName } from '@/utils/common/index'
+  import { getApiByServeName,getColoumsByServeName } from '@/utils/common/index'
   import { getCanceltaskByUid } from '@/api/system/taskSubApi'
   
   const state = reactive({
@@ -55,10 +60,12 @@
       {label:'查看详情',name:'showInfo',link:true,type:'primary'}
     ],
     drawerShow:false,
-    // 查看详情内部table列数据
+    taskName:null,
+    // 查看详情内部colums
     infoTableColumns:null,
-    // 查看详情内部table查询条件
-    infoSearchFilter: [],
+    // 查看详情内部colums的名称
+    infoTableColumnsName:null,
+    infoSearchFilter: {},
     rightOperation:[],
   })
 
@@ -76,15 +83,17 @@
   // 撤销按钮隐藏/显示
   function hideCanceltaskBtn(row){
     let _arr = ['M+6月物料需求计划风险确认','日物料需求计划风险确认','采购订单风险确认']
-    // 任务为风险确认，并且失败次数>0时显示
+    // 任务为风险确认，并且失败条数>0时显示
     return !(_arr.indexOf(row.taskName) >= 0 && row.failedCount > 0)
   }
 
   function leftOperationHadel(btn,scope) {
     // 查看详情
     if(btn.name == 'showInfo'){
+      state.taskName = scope.row.taskName
       state.infoTableColumns = getColoumsByServeName(scope.row.tableName,'tableName',true)
-      if(!state.infoTableColumns){
+      state.infoTableColumnsName = getApiByServeName(scope.row.tableName,'tableName')
+      if(!state.infoTableColumnsName){
         ElMessage.error(`不支持的表名: ${scope.row.tableName}`)
         return
       }
@@ -129,6 +138,12 @@
     }
   }
 
+  // 单元格变色
+  function tableCellClassName(data){
+    if(Number(data.row.failedCount) > 0 && data.column.property == 'failedCount'){return 'table-danger-row'}
+    else{return 'normal-tableRow'}
+  }
+
 
 </script>
 <style scope lang="scss">
@@ -141,4 +156,12 @@
     margin-bottom:0 !important
   }
 }
+.taskSub_infoDrawerPop .search-container{
+  position: fixed;
+  right: 71px;
+  top: 0px;
+  box-shadow: none;
+  border: none;
+  height: 60px;
+}
 </style>
\ No newline at end of file