diff --git a/.env.development b/.env.development
index 4da1b6eb0..5e128bc34 100644
--- a/.env.development
+++ b/.env.development
@@ -4,10 +4,10 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-# VITE_BASE_URL='http://localhost:12080'
+VITE_BASE_URL='http://localhost:12080'
 # VITE_BASE_URL='http://192.168.1.49:12080'
 # VITE_BASE_URL='http://192.168.1.254:12080'
-VITE_BASE_URL='http://127.0.0.1:90'
+# VITE_BASE_URL='http://127.0.0.1:90'
 # VITE_BASE_URL='http://dev.ccwin-in.com:28040/api'
 # VITE_BASE_URL='http://192.168.1.254:12080'
 
diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts
index d851c3104..43e70a492 100644
--- a/src/api/wms/countJobMain/index.ts
+++ b/src/api/wms/countJobMain/index.ts
@@ -86,7 +86,10 @@ export const exportCountJobMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/count-job-main/get-import-template' })
 }
-
+// 下载用户导入模板
+export const lineTypeImportTemplate = () => {
+  return request.download({ url: '/wms/count-job-main/get-lineTypeImport-template' })
+}
 // 关闭盘点任务主
 export const closeCountJobMain = (id: number) => {
   return request.put({ url: '/wms/count-job-main/close?id=' + id })
diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts
index d1612bd5e..903e29a00 100644
--- a/src/api/wms/countadjustRequestMain/index.ts
+++ b/src/api/wms/countadjustRequestMain/index.ts
@@ -94,6 +94,6 @@ export const refused = async (id) => {
 }
 
 // 处理盘点申请主 Excel
-export const handle = async (id) => {
-  return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id })
+export const handle = async ({id,remark}) => {
+  return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id + '&remark='+remark })
 }
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index ca36c315d..173a7c2d1 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -541,7 +541,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 250,
+      width: 320,
       fixed: 'right'
     },
   }
@@ -612,7 +612,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品番',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -620,22 +620,13 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品名',
+    label: '物料名称',
     field: 'itemName',
     sort: 'custom',
     table: {
       width: 200
     },
   },
-  {
-    label: '背番',
-    field: 'itemDesc1',
-    sort: 'custom',
-    hiddenSearchHigh:true,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '批次',
     field: 'batch',
@@ -694,7 +685,15 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '描述',
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 694748be6..cb744daa7 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBaseMore
+        <ButtonBase
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -66,7 +66,7 @@
     ref="detailRef"
     :isBasic="false"
     :allSchemas="CountJobMain.allSchemas"
-    :detailAllSchemas="countJobDetailTableColumns.allSchemas"
+    :detailAllSchemas="countJobDetailTableColumns"
     :detailAllSchemasRules="CountJobDetailRules"
     :searchTableParams="searchTableParams"
     :apiPage="CountJobDetailApi.getCountJobDetailPage"
@@ -75,7 +75,8 @@
   <!-- 导入 -->
   <ImportDetailForm
     ref="importFormRef"
-    url="/wms/count-job-main/import"
+    :dialogTitle="importTitle"
+    :url="importUrl"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
     :updateIsDisable="true"
@@ -88,7 +89,6 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { cloneDeep } from 'lodash-es'
 import {
   CountJobMain,
   CountJobMainRules,
@@ -102,6 +102,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {lineTypeImportTemplate} from "@/api/wms/countJobMain";
 const { loadStart, loadDone } = usePageLoading()
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
@@ -238,6 +239,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
+    {
+      label: '线边盘点',
+      name: 'lineTypeImport',
+      hide: !(row.status==2&&row.lineType==true),
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:lineTypeImport
+    },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',
@@ -251,7 +261,8 @@ const butttondata = (row, $index) => {
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
-
+const importTitle = ref('导入')
+const importUrl = ref('/wms/count-job-main/import')
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') {
@@ -285,6 +296,17 @@ const buttonTableClick = async (val, row) => {
     handleExportCountJob(row.id, row.number)
   } else if (val == 'importCountJob') {
     // 导入
+    importUrl.value = "/wms/count-job-main/import"
+    importTitle.value = '导入'
+    importTemplateData.value.templateTitle = "盘点任务导入模板.xlsx"
+    importTemplateData.value.templateUrl = await CountJobMainApi.importTemplate()
+    handleImport(row.id)
+  } else if (val == 'lineTypeImport') {
+    // 线边盘点
+    importUrl.value = "/wms/count-job-main/lineTypeImport"
+    importTitle.value = '线边盘点'
+    importTemplateData.value.templateTitle = "线边盘点任务导入模板.xlsx"
+    importTemplateData.value.templateUrl = await CountJobMainApi.lineTypeImportTemplate()
     handleImport(row.id)
   } else if (val == 'done') {
     // 完成
@@ -320,7 +342,7 @@ const handleDone = async (id: number) => {
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
-const countJobDetailTableColumns =  cloneDeep(CountJobDetail)
+const countJobDetailTableColumns = ref({})
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   const departmentCode = wsCache
     .get(CACHE_KEY.DEPT)
@@ -340,9 +362,9 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   //   )
   // }w
   if (row.isOpenCount == "FALSE") {
-    countJobDetailTableColumns.allSchemas.tableColumns = CountJobDetail.allSchemas.tableColumns.filter(item=>item.field != 'qty')
+    countJobDetailTableColumns.value.tableColumns = CountJobDetail.allSchemas.tableColumns.filter(item=>item.field != 'qty')
   }else{
-    countJobDetailTableColumns.allSchemas.tableColumns = CountJobDetail.allSchemas.tableColumns.filter(item=>item.field)
+    countJobDetailTableColumns.value.tableColumns = CountJobDetail.allSchemas.tableColumns.filter(item=>item.field)
   }
 
   detailRef.value.openDetail(row, titleName, titleValue, 'jobCountMain')
@@ -388,7 +410,7 @@ const handleImport = (id: string) => {
 }
 
 // 导入附件弹窗所需的参数
-const importTemplateData = reactive({
+const importTemplateData = ref({
   templateUrl: '',
   templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
@@ -410,6 +432,5 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await CountJobMainApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 2309bd1e0..29b55c41a 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -257,7 +257,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false
+    isTable: true
   },
   {
     label: '创建者',
@@ -456,7 +456,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isForm: false,
   },{
-    label: '品番忽略名单',
+    label: '物料忽略名单',
     field: 'ignoreListOfItem',
     sort: 'custom',
     table: {
@@ -467,9 +467,9 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         multiple:true,//是否可以多选
-        searchListPlaceholder: '请选择品番忽略名单', // 输入框占位文本
+        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '品番信息', // 查询弹窗标题
+        searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
       }
@@ -530,7 +530,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 250,
+      width: 300,
       fixed: 'right'
     },
   }
@@ -618,7 +618,7 @@ export const CountPlanMainRules = reactive({
 //     }
 //   },
 //   {
-//     label: '品番',
+//     label: '物料代码',
 //     field: 'itemCode',
 //     sort: 'custom',
 //     table: {
@@ -799,7 +799,7 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
       searchListPlaceholder: '请选择盘点范围类型',
       searchField: 'type',
       multiple:true,//是否可以多选
-      searchTitle: '品番信息',
+      searchTitle: '物料信息',
       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
       searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
       verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
@@ -825,7 +825,7 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
         multiple:true,//是否可以多选
         searchListPlaceholder: '请选择盘点范围类型', // 输入框占位文本
         searchField: 'type', // 查询弹窗赋值字段
-        searchTitle: '品番信息', // 查询弹窗标题
+        searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
       }
@@ -857,7 +857,7 @@ export const CountPlanDetailRules = reactive({
  */
 export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '品番忽略名单',
+    label: '物料忽略名单',
     field: 'ignoreListOfItem',
     sort: 'custom',
     table: {
@@ -868,9 +868,9 @@ export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         multiple:true,//是否可以多选
-        searchListPlaceholder: '请选择品番忽略名单', // 输入框占位文本
+        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '品番信息', // 查询弹窗标题
+        searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
         verificationPage: ItembasicApi.getItemListByCodes,
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 504a08f36..78d3af8d5 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBaseMore
+        <ButtonBase
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -168,7 +168,7 @@ const updataTableColumns = (val) => {
 const searchTableParams = ref([
   {
     formField: 'productItemCode',
-    searchTableTitle: '品番信息',
+    searchTableTitle: '物料信息',
     searchTableAllSchemas: Itembasic.allSchemas,
     searchTablePage: ItembasicApi.getItembasicPage
   }
@@ -1203,7 +1203,7 @@ const getCustomerAllList = async (row, update_countPlanAllList = false) => {
     countPlanAllList.value = allList.value.customerAllList
   }
 }
-// 获取品番列表
+// 获取物料代码列表
 const getItembasicAllList = async (row, update_countPlanAllList = false) => {
   let getLoading = null
   let res = null
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 80b584c15..e8649797e 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -184,14 +184,14 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '部门',
-  //   field: 'departmentCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '明盘',
     field: 'isOpenCount',
@@ -370,7 +370,7 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品番',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -378,22 +378,13 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品名',
+    label: '物料名称',
     field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  {
-    label: '背番',
-    field: 'itemDesc1',
-    sort: 'custom',
-    hiddenSearchHigh:true,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '批次',
     field: 'batch',
@@ -455,7 +446,15 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '描述',
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -542,6 +541,23 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '备注',
     field: 'remark',
@@ -643,7 +659,7 @@ export const CountRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择品番', trigger: 'change' }
+    { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index 34c4ae0db..a3a7ae8f5 100644
--- a/src/views/wms/countManage/count/countRecordMain/index.vue
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index e68425b7b..4d5aa8a54 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -183,6 +183,30 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -322,7 +346,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 250,
+      width: 300,
       fixed: 'right'
     },
   }
@@ -390,7 +414,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品番',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -398,7 +422,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品名',
+    label: '物料名称',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -408,10 +432,9 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '背番',
+    label: '物料描述1',
     field: 'itemDesc1',
     sort: 'custom',
-    hiddenSearchHigh:true,
     table: {
       width: 150
     },
@@ -419,7 +442,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '描述',
+    label: '物料描述2',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -533,6 +556,24 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index b785e34a2..9c4a60078 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBaseMore
+        <ButtonBase
         :Butttondata="butttondata(row,$index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index f77c44782..554eda0b0 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -156,14 +156,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '部门',
-  //   field: 'departmentCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '接口类型',
   //   field: 'interfaceType',
@@ -175,14 +175,6 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -248,6 +240,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
 ]))
 
 //表单校验
@@ -314,7 +314,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品番',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -322,7 +322,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品名',
+    label: '物料名称',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -330,16 +330,15 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '背番',
+    label: '物料描述1',
     field: 'itemDesc1',
     sort: 'custom',
-    hiddenSearchHigh:true,
     table: {
       width: 150
     },
   },
   {
-    label: '描述',
+    label: '物料描述2',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -457,6 +456,49 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',
@@ -525,7 +567,7 @@ export const CountadjustRecordDetailRules =reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择品番', trigger: 'change' }
+    { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
index 939537a21..0dae8fcac 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 2e0425e8a..ef8cbceb1 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -171,6 +171,30 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -310,7 +334,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 250,
+      width: 300,
       fixed: 'right'
     },
   }
@@ -368,7 +392,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品番',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -376,7 +400,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '品名',
+    label: '物料名称',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -386,10 +410,9 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '背番',
+    label: '物料描述1',
     field: 'itemDesc1',
     sort: 'custom',
-    hiddenSearchHigh:true,
     table: {
       width: 150
     },
@@ -397,7 +420,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '描述',
+    label: '物料描述2',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -550,6 +573,24 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '备注',
     field: 'remark',
@@ -596,7 +637,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false ,
-    isTable:false,
+    isTable:true,
     table: {
       width: 150,
       fixed: 'right'
@@ -635,6 +676,27 @@ export const CountadjustRequestDetailRules = reactive({
   //   { required: true, message: '请输入单据号', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请选择品番', trigger: 'change' }
+    { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
 })
+
+export const CountadjustHandle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false,
+    form: {
+      component: 'Input',
+      componentProps:{
+        type: 'textarea'
+      }
+    },
+  },
+]))
+
+export const CountadjustHandleRules = reactive({
+  // remark:  [
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
+})
\ No newline at end of file
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index b8ac83533..562e6723a 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -71,10 +71,23 @@
     :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
     fromeWhere="countadjustRequest"
     :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowAddStatusArray="['1','2','3','4','6','7']"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
+  <!-- 处理填写备注窗口 finance_mainPlanSub -->
+  <BasicForm
+    ref="handleFormRef"
+    :rules="CountadjustHandleRules"
+    :formAllSchemas="CountadjustHandle.allSchemas"
+    :isBusiness="false"
+    :footButttondata="undefined"
+    @success="submitFormHandle"
+  />
+
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/countadjust-request-main/import" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@@ -83,7 +96,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules } from './countadjustRequestMain.data'
+import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules,CountadjustHandle,CountadjustHandleRules } from './countadjustRequestMain.data'
 import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain'
 import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -193,11 +206,11 @@ const butttondata = (row,$index) => {
 
     return [
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
+    // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
     ]
 }
 // 列表-操作按钮事件
@@ -258,27 +271,29 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainHandle') { // 处理
-    await message.confirm('确认要处理吗？')
-    let getLoading = ElLoading.service({
-      lock: true,
-      text: 'loading...',
-      background: 'rgba(0, 0, 0, 0.7)'
-    })
-
-    CountadjustRequestMainApi.handle(row.id).then(() => {
-      message.success(t('处理成功'))
-      getLoading?.close()
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      getLoading?.close()
-      console.log(err)
-    })
+    handleRow.value = row
+    handleFormRef.value.open('update', row, null, '盘点调整申请-处理', '盘点调整申请-处理')
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
+const handleRow = ref({})
+const handleFormRef = ref()
+const submitFormHandle = async (formType, data) => {
+  handleFormRef.value.formLoading = true
+  try {
+    await CountadjustRequestMainApi.handle({id:handleRow?.value?.id,remark:data.remark})
+    message.success(t('处理成功'))
+    buttonBaseClick('refresh',null)
+    handleFormRef.value.dialogVisible = false
+
+  } finally {
+    handleFormRef.value.formLoading = false
+
+  }
+}
 
 
 /** 添加/修改操作 */