diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 55e4e7726..0daccf3aa 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -126,7 +126,7 @@ export default defineComponent({
     }
 
     const clearSearchInput = (field) => {
-      emit('clearSearchInput')
+      emit('clearSearchInput',field)
     }
     expose({
       setValues,
diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index f8b79ab99..a29d5c972 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -17,7 +17,7 @@
       />
     </el-select> -->
   </ElDialog>
-  <div v-else class="custom-hover custom-hover1" @click.stop="showTopSearch = !showTopSearch">
+  <div v-else class="custom-hover custom-hover2" @click.stop="showTopSearch = !showTopSearch">
     <Icon icon="ep:search" color="#ffffff"/>
     <el-select
       filterable
@@ -170,7 +170,7 @@ defineExpose({
 .w-220px {
     width: 220px !important;
 }
-.custom-hover1{
+.custom-hover2:hover{
   background-color: transparent;
 }
 </style>
\ No newline at end of file
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index ca7328fb9..fc153d386 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -77,7 +77,7 @@ export default defineComponent({
             ></LocaleDropdown>
           ) : undefined} */}
           {message.value ? (
-            <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
+            <Message class="custom-hover custom-hover1" color="var(--top-header-text-color)"></Message>
           ) : undefined}
           <UserInfo></UserInfo>
         </div>
@@ -93,4 +93,10 @@ $prefix-cls: #{$namespace}-tool-header;
 .#{$prefix-cls} {
   transition: left var(--transition-time-02);
 }
+.custom-hover1:hover{
+  opacity: 0.5;
+  background-color: transparent;
+  scale: 1.2;
+  transition: all 50ms;
+}
 </style>
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 3521bd443..9e7f89c23 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -51,7 +51,7 @@ const toDocument = () => {
 </script>
 
 <template>
-  <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
+  <ElDropdown class="custom-hover custom-hover1" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
       <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden" style="color:#ffffff">
@@ -76,3 +76,13 @@ const toDocument = () => {
     </template>
   </ElDropdown>
 </template>
+
+<style lang="scss" scoped>
+
+.custom-hover1:hover{
+  opacity: 0.5;
+  background-color: transparent;
+  scale: 1.1;
+  transition: all 50ms;
+}
+</style>
diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index 64bb9c8b3..db7948081 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -26,11 +26,10 @@ export function formatDate(date: Date | number, format?: string): string {
 /**
  * 获取当前的日期+时间
  */
-export function addDay(date: Date | number,addDay:number) {
-  return dayjs(date).add(addDay,'day')
+export function addDay(date: Date | number, addDay: number) {
+  return dayjs(date).add(addDay, 'day')
 }
 
-
 /**
  * 获取当前的日期+时间
  */
@@ -163,6 +162,21 @@ export const dateFormatter = (row, column, cellValue) => {
   }
   return formatDate(cellValue)
 }
+/**
+ * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD HH:mm:ss 格式
+ *
+ * @param row 行数据
+ * @param column 字段
+ * @param cellValue 字段值
+ */
+// @ts-ignore
+export const dateFormatter3 = (row, column, cellValue) => {
+  if (!cellValue) {
+    return
+  }
+  let str = formatDate(cellValue).split(' ')[1]
+  return str
+}
 // 获取时间戳
 export const formatGetTime = (row, column, cellValue) => {
   console.log(cellValue.getTime())
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 46e9ba97b..b4bd4fd9d 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -52,7 +52,7 @@
     :tableData="tableData"
     :apiUpdate="ItemareaApi.updateItemarea"
     :apiCreate="ItemareaApi.createItemarea"
-    :isBusiness="false"
+    :isBusiness="true"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
index df23c425a..045efa49a 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
@@ -1,283 +1,273 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter3 } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 
-import {validateYS} from '@/utils/validator'
+import { validateYS } from '@/utils/validator'
 
 /**
  * @returns {Array} 班次
  */
-export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '代码',
-    field: 'code',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
+export const Shift = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '代码',
+      field: 'code',
+      sort: 'custom',
+      table: {
+        width: 150,
+        fixed: 'left'
+      },
+      isSearch: true
     },
-    isSearch: true,
-  },
-  {
-    label: '名称',
-    field: 'name',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '开始时间',
-    field: 'beginTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    form: {
-      component: 'TimePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'time',
-        dateFormat: 'HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '名称',
+      field: 'name',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-    isSearch: false,
-    search: {
-      show: false,
-      component: 'TimePicker',
-      componentProps: {
-        valueFormat: 'HH:mm:ss',
-        type: 'timeSelect',
+    {
+      label: '开始时间',
+      field: 'beginTime',
+      isTable: true,
+      formatter: dateFormatter3,
+      detail: {
+        dateFormat: 'HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'TimePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'time',
+          dateFormat: 'HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isSearch: false,
+      search: {
+        show: false,
+        component: 'TimePicker',
+        componentProps: {
+          valueFormat: 'HH:mm:ss',
+          type: 'timeSelect'
+        }
       }
-    }
-  },
-  {
-    label: '结束时间',
-    field: 'entTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'HH:mm:ss',
-    },
-    sort: 'custom',
-    table: {
-      width: 180
     },
-    form: {
-      component: 'TimePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'time',
-        dateFormat: 'HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '结束时间',
+      field: 'entTime',
+      isTable: true,
+      formatter: dateFormatter3,
+      detail: {
+        dateFormat: 'HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'TimePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'time',
+          dateFormat: 'HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isSearch: false,
+      search: {
+        show: false,
+        component: 'TimePicker',
+        componentProps: {
+          valueFormat: 'HH:mm:ss',
+          type: 'timeSelect'
+        }
       }
     },
-    isSearch: false,
-    search: {
-      show: false,
-      component: 'TimePicker',
-      componentProps: {
-        valueFormat: 'HH:mm:ss',
-        type: 'timeSelect',
+    {
+      label: '是否跨天',
+      field: 'endAtNextDay',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
-    }
-  },
-  {
-    label: '是否跨天',
-    field: 'endAtNextDay',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      isSearch: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '生效时间',
+      field: 'activeTime',
+      isTable: true,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '生效时间',
-    field: 'activeTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '失效时间',
+      field: 'expireTime',
+      isTable: true,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '失效时间',
-    field: 'expireTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isForm: false,
-    table: {
-      width: 180
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    formatter: dateFormatter,
-    detail: {
-      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    table: {
-      width: 130
-    },
-    isForm: false,
-    isTable: true
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    table: {
-      width: 180
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: false,
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: false,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
+  ])
+)
 
 //表单校验
 export const ShiftRules = reactive({
   code: [
     { required: true, message: '请输入代码', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
-  ],
-  name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  beginTime: [
-    { required: true, message: '请输入开始时间', trigger: 'blur' }
-  ],
-  entTime: [
-    { required: true, message: '请输入结束时间', trigger: 'blur' }
-  ],
-  endAtNextDay: [
-    { required: true, message: '请选择是否跨天', trigger: 'change' }
-  ],
-  available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { validator: validateYS, message: '请输入正确的代码', trigger: 'blur' }
   ],
+  name: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  beginTime: [{ required: true, message: '请输入开始时间', trigger: 'blur' }],
+  entTime: [{ required: true, message: '请输入结束时间', trigger: 'blur' }],
+  endAtNextDay: [{ required: true, message: '请选择是否跨天', trigger: 'change' }],
+  available: [{ required: true, message: '请选择是否可用', trigger: 'change' }]
 })
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 4774927d0..079cff73d 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -83,22 +83,38 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '仓库代码',
-  //   field: 'warehouseCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '库位代码',
-  //   field: 'locationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请时间',
     field: 'requestTime',
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 4247edc61..efda01683 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -55,6 +55,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isDetail:false,
     isTable:false,
     form:{
       componentProps:{
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 4395f9e9d..eaf2b9d63 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -111,38 +111,36 @@ import {
   CountPlanDetail,
   CountPlanDetailRules,
   CountPlanMain,
-  CountPlanMainRules,
+  CountPlanMainRules
 } from './countPlanMain.data'
 import * as CountPlanMainApi from '@/api/wms/countPlanMain'
 import * as CountPlanDetailApi from '@/api/wms/countPlanDetail'
-import {Owner} from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
+import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
 import * as OwnerApi from '@/api/wms/owner'
 
-import {Supplier} from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplierApi from '@/api/wms/supplier'
 
-import {Customer} from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 import * as CustomerApi from '@/api/wms/customer'
 
-import {Itembasic} from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 
-import {Warehouse} from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
 import * as WarehouseApi from '@/api/wms/warehouse'
 
-import {Area} from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
 import * as AreaApi from '@/api/wms/areabasic'
 
-import {
-  Locationgroup
-} from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
+import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
 import * as LocationgroupApi from '@/api/wms/locationgroup'
 
-import {Location} from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import * as LocationApi from '@/api/wms/location'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import BasicFormWmsCount from '@/components/BasicForm/src/BasicFormWmsCount.vue'
 
 // 盘点计划主
@@ -412,11 +410,28 @@ const openForm = async (type: string, row?: any) => {
   ] // 重置明细数据
   row = row ? row : {}
   // row.dimension = 'BY_INEVNEOTY'
-  CountPlanMain.allSchemas.formSchema.forEach((item) => {
-    if (item.field == 'crontab') {
-      item.componentProps.disabled = true
+  // CountPlanMain.allSchemas.formSchema.forEach((item) => {
+  //   if (item.field == 'crontab') {
+  //     item.componentProps.disabled = true
+  //   }
+  // })
+  if (row.type == 'CYCLE') {
+      CountPlanMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'crontab') {
+          item.componentProps.disabled = false
+          item.label = '执行周期'
+        }
+      })
+      CountPlanMainRules.crontab[0].required = true
+    } else {
+      CountPlanMainRules.crontab[0].required = false
+      CountPlanMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'crontab') {
+          item.componentProps.disabled = true
+          item.label = ''
+        }
+      })
     }
-  })
   formRef.value.open(type, row)
 
   // Promise.all([getOwnerAllList(),
@@ -572,7 +587,7 @@ const detailOpenForm = (type, row) => {
           })
           break
       }
-    } else if ( row.type == 'PROJECT') {
+    } else if (row.type == 'PROJECT') {
       formTypeDetail.value = 'InputString'
     }
   }
@@ -635,7 +650,7 @@ const handleAddTable = () => {
 // 删除明细
 const handleDeleteTable = (item, index) => {
   let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
+  if (itemIndex > -1) {
     tableData.value.splice(itemIndex, 1)
   }
 }
@@ -644,6 +659,15 @@ const tableSelectionDelete = (selection) => {
 }
 // 主子数据 提交
 const submitForm = async (formType, data) => {
+  var isHave = CountPlanMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'beginTime' || item.field === 'endTime'
+  })
+  if (isHave) {
+    if (data.beginTime && data.endTime && data.beginTime >= data.endTime) {
+      message.error('开始时间大于结束时间')
+      return
+    }
+  }
   data.subList = tableData.value.map((item) => {
     return {
       type: item.type,
@@ -721,22 +745,34 @@ const selectChange = (field, val) => {
         }
       })
     }
-    formRef.value.formRef.setValues({
-       crontab:''
-    })
-    if (val == 'DYNAMIC') {
-      CountPlanMain.allSchemas.formSchema[3].label = '限值（%）'
-      CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0
-      CountPlanMain.allSchemas.formSchema[3].componentProps.max = 100
-      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false
-    } else if (val == 'LOW' || val == 'RANDOM') {
-      CountPlanMain.allSchemas.formSchema[3].label = '限值'
-      CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0
-      CountPlanMain.allSchemas.formSchema[3].componentProps.max = Infinity
-      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false
-    } else {
-      CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = true
-    }
+    formRef.value.formRef.setValues({
+      crontab: ''
+    })
+    // if (val == 'DYNAMIC') {
+    //   CountPlanMain.allSchemas.formSchema.forEach(item=>{
+    //     if(item.field == 'limitedValue'){
+    //       item.label = '限值（%）'
+    //       item.componentProps.min = 0
+    //       item.componentProps.max = 100
+    //       item.componentProps.disabled = false
+    //     }
+    //   })
+    // } else if (val == 'LOW' || val == 'RANDOM') {
+    //   CountPlanMain.allSchemas.formSchema.forEach(item=>{
+    //     if(item.field == 'limitedValue'){
+    //       item.label = '限值（%）'
+    //       item.componentProps.min = 0
+    //       item.componentProps.max =Infinity
+    //       item.componentProps.disabled = false
+    //     }
+    //   })
+    // } else {
+    //   CountPlanMain.allSchemas.formSchema.forEach(item=>{
+    //     if(item.field == 'limitedValue'){
+    //       item.componentProps.disabled = true
+    //     }
+    //   })
+    // }
   }
 }
 const formTypeDetail = ref('InputString') //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
@@ -823,7 +859,7 @@ const selectChangeDetail = (field, val) => {
         case 'ITEMS_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '物品信息'
               item.componentProps.searchAllSchemas = Itembasic.allSchemas
               item.componentProps.searchPage = ItembasicApi.getItembasicPage
@@ -833,7 +869,7 @@ const selectChangeDetail = (field, val) => {
         case 'WAREHOUSE_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '仓库信息'
               item.componentProps.searchAllSchemas = Warehouse.allSchemas
               item.componentProps.searchPage = WarehouseApi.getWarehousePage
@@ -843,7 +879,7 @@ const selectChangeDetail = (field, val) => {
         case 'AREABASIC_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '库区信息'
               item.componentProps.searchAllSchemas = Area.allSchemas
               item.componentProps.searchPage = AreaApi.getAreaPage
@@ -853,7 +889,7 @@ const selectChangeDetail = (field, val) => {
         case 'LOCATIONGROUP_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '库位组信息'
               item.componentProps.searchAllSchemas = Locationgroup.allSchemas
               item.componentProps.searchPage = LocationgroupApi.getLocationgroupPage
@@ -863,7 +899,7 @@ const selectChangeDetail = (field, val) => {
         case 'LOCATION_CODE':
           CountPlanDetail.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'value') {
-              item.componentProps.isInpuFocusShow = true
+              item.componentProps.isSearchList = true
               item.componentProps.searchTitle = '库位组信息'
               item.componentProps.searchAllSchemas = Location.allSchemas
               item.componentProps.searchPage = LocationApi.getLocationPage
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index ccb01037a..e525d6a90 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -482,6 +482,30 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库位代码',
     field: 'locationCode',
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index b79fd418e..3c7f73c51 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -51,22 +51,22 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:true,
     isForm: true
   },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '出库事务类型',
+  //   field: 'outTransactionType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '入库事务类型',
+  //   field: 'inTransactionType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -164,17 +164,17 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    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',
@@ -267,9 +267,9 @@ export const CountadjustRecordMainRules =reactive({
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
-  interfaceType: [
-    { required: true, message: '请选择接口类型', trigger: 'change' }
-  ],
+  // interfaceType: [
+  //   { required: true, message: '请选择接口类型', trigger: 'change' }
+  // ],
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
@@ -360,6 +360,30 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库位代码',
     field: 'locationCode',
@@ -455,17 +479,17 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    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',
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index a88081343..553b94740 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -518,6 +518,30 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },{
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库位代码',
     field: 'locationCode',
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index 9f35176d5..1eaca15ea 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="containerNumber"
     @success="getList"
     :rules="ContainerMainRequestRules"
     :formAllSchemas="ContainerMainRequest.allSchemas"
@@ -131,11 +133,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField == 'containerNumber') {
-        row['containerNumber'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['fromInventoryStatus'] = val[0]['inventoryStatus']
-        row['toInventoryStatus'] = 'SCRAP'
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['containerNumber'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['toInventoryStatus'] = 'SCRAP'
+          tableData.value.push(newRow)
+        })
     }else if(formField == 'toLocationCode'){
       row['toLocationCode'] = val[0]['code']
     }else {
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index 804623d5e..5516b76cb 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'containerNumber',
     sort: 'custom',
     tableForm: {
+      multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择器具号',
       searchField: 'itemCode',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 28d98d053..29df5e05e 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="packingNumber"
     @success="getList"
     :rules="ScrapRequestMainRules"
     :formAllSchemas="ScrapRequestMain.allSchemas"
@@ -104,6 +106,7 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ScrapRequestMain.allSchemas.tableColumns,...ScrapRequestDetail.allSchemas.tableMainColumns])
 
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -114,16 +117,32 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['packingNumber'] = val[0]['packingNumber']
-      row['batch'] = val[0]['batch']
-      row['fromLocationCode'] = val[0]['locationCode']
-      row['itemCode'] = val[0]['itemCode']
-      row['uom'] = val[0]['uom']
+      // val.forEach(item=>{
+      //   const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+      //   newRow[formField] = item[searchField]
+      //   newRow['packingNumber'] = item['packingNumber']
+      //   newRow['batch'] = item['batch']
+      //   newRow['fromLocationCode'] = item['locationCode']
+      //   newRow['itemCode'] = item['itemCode']
+      //   newRow['uom'] = item['uom']
+      //   tableData.value.push(newRow)
+      // })
       // 查询标准价格
-      let param = {'itemCode':val[0]['itemCode'] as string}
+      let param = {'itemCodes':val.map(item=>item.itemCode).join(',') as string}
       StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => {
-        row['singlePrice'] = res.price
+        val.forEach(item=>{
+          const itemCode = res.find(item1=>item1['itemCode']==item['itemCode'])
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['packingNumber'] = item['packingNumber']
+          newRow['batch'] = item['batch']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['singlePrice'] = itemCode?itemCode['price']:''
+          tableData.value.push(newRow)
+        })
+        // row['singlePrice'] = res.price
       })
     } else {
       const setV = {}
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 0430fe023..4865fc301 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -396,6 +396,9 @@ export const ScrapRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  fromWarehouseCode:[
+    {required: true,message: '请选择从仓库代码',trigger: 'change'  }
+  ]
 })
 
 /**
@@ -480,6 +483,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 1bb24f9f6..df1f3f87a 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -61,6 +61,7 @@
     @submitForm="submitForm"
     @onEnter="onEnter"
     @onChange="onChange"
+    @clearSearchInput="onChange"
   />
 
   <!-- 详情 -->
@@ -117,8 +118,15 @@ const onChange  = async (field,value) => {
     setV['productionLineCode'] = ''
     setV['workStationCode'] = ''
     formRef.value.formRef.setValues(setV)
+  }else if(field== 'productionLineCode'){
+    //生产线
+    const setV = {}
+    setV['workStationCode'] = ''
+    formRef.value.formRef.setValues(setV)
   }
 }
+
+
 const onEnter = async (field,value) => {
   if (field == 'productionLineCode') {
     //生产线
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index b52587d8b..81cccfca0 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStation"
     @success="getList"
     :rules="PreparetoissueMainRules"
     :formAllSchemas="PreparetoissueMain.allSchemas"
@@ -113,8 +115,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['itemCode'] = val[0]['componentItemCode']
         row['uom'] = val[0]['componentUom']
       } else {
-        row[formField] = val[0][searchField]
-        row['toLocationCode'] = val[0]['rawLocationCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          newRow['toLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index ddf2e9d2c..d16192121 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -503,6 +503,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm: {
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 81bc49646..3a703320f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+     :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductionreturnRequestMainRules"
     :formAllSchemas="ProductionreturnRequestMain.allSchemas"
@@ -193,8 +195,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           })
         }
       } else if(formField == 'workStationCode') {
-        row['workStationCode'] = val[0]['code']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
       } else if(formField == 'packUnit') {
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 1901bc019..f4a9739fa 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -105,6 +105,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 76468f55c..06a8d79a5 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="productionLineCode"
     @success="getList"
     :rules="ProductdismantleRequestMainRules"
     :formAllSchemas="ProductdismantleRequestMain.allSchemas"
@@ -269,7 +271,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['bomVersion'] = ''
         row['childList'] = []
       } else {
-        row[formField] = val[0][searchField]
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow[formField] = item[searchField]
+          tableData.value.push(newRow)
+        })
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index c40d77a5f..cdd5e6572 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -474,6 +474,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index ef854e67a..2f6dfc3bf 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 生产计划主
 // 预生产计划
@@ -119,10 +120,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // })
       if(formField=='itemCode'){
         // row[formField] = val[0][searchField]
-        val.forEach(item=>{
+        val.forEach(async item=>{
           if(tableData.value.find(item1=>item1['id'] == item['id'])) return
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow['id'] = item['id']
+          // 查看BOM版本
+          console.log(22,item)
+          const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
           tableData.value.push(newRow)
         })
       } else {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 0afec4008..4d196be98 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 装配计划
 defineOptions({ name: 'ProductionMainAssemble' })
@@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(item=>{
+      val.forEach(async item=>{
         const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
         newRow[formField] = item[searchField]
         newRow['uom'] = item['uom']
+        // 查看BOM版本
+        const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
         tableData.value.push(newRow)
       })
     } else {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 41164cefb..0592934c1 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 装配备件计划
 defineOptions({ name: 'ProductionMainASparePart' })
@@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(item=>{
+      val.forEach(async item=>{
         const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
         newRow[formField] = item[searchField]
         newRow['uom'] = item['uom']
+        // 查看BOM版本
+        const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
         tableData.value.push(newRow)
       })
     } else {
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 6aa22fecd..a4d22853c 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain'
 import * as ProductionDetailApi from '@/api/wms/productionDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as BomApi from "@/api/wms/bom";
 
 // 预生产备件计划
 defineOptions({ name: 'ProductionMainPredictSparePart' })
@@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // }).catch(err =>{
       //   console.log(err);
       // })
-      val.forEach(item=>{
+      val.forEach(async item=>{
         const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
         newRow[formField] = item[searchField]
         newRow['uom'] = item['uom']
+        // 查看BOM版本
+        const param1 =  {
+            productItemCode: item['itemCode'],
+            available: 'TRUE',
+            pageSize: 20,
+            pageNo: 1,
+            sort: '',
+            by: 'ASC',
+          }
+          await BomApi.getBomPage(param1).then(res => {
+            console.log(res)
+            if(res?.list?.length>0){
+              newRow['bomVersion'] = res.list[0].version
+            }
+          }) 
         tableData.value.push(newRow)
       })
     } else {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 8263f8d62..c3a97d551 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -149,6 +149,7 @@ import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import dayjs from 'dayjs'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as BomApi from "@/api/wms/bom";
 // 制品收货申请
 // 预生产收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
@@ -212,6 +213,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
         row[formField] = val[0][searchField]
+        // 查看BOM版本
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       }else if (formField == 'workStationCode') {
         // 明细查询页赋值
         val.forEach(item=>{
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 6296dda1e..a066d3239 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -149,6 +149,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as BomApi from "@/api/wms/bom";
 
 // 装配收货申请
 defineOptions({ name: 'ProductreceiptRequestMainA' })
@@ -213,6 +214,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
         row[formField] = val[0][searchField]
+         // 查看BOM版本
+         const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       }else if (formField == 'workStationCode') {
         // 明细查询页赋值
         val.forEach(item=>{
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index d2be36d10..e9a80a163 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -136,6 +136,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
+import * as BomApi from "@/api/wms/bom";
 import {
   SupplierdeliverRequestPackage
 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
@@ -204,8 +205,21 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
           row['uom'] = res[0]['uom']
         }
         row[formField] = val[0][searchField]
-
-        console.log('获取计量单位',res)
+        // 查看BOM版本
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
+        BomApi.getBomPage(param1).then(res => {
+          console.log(res)
+          if(res?.list?.length>0){
+            row['bomVersion'] = res.list[0].version
+          }
+        })
       }else{
         //添加明细
         val.forEach(item=>{
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index a6ba77156..3bc4b80e4 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductrepairRequestMainRules"
     :formAllSchemas="ProductrepairRequestMain.allSchemas"
@@ -247,8 +249,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       } else if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       } else if(formField == 'workStationCode'){
-        row['fromLocationCode'] = val[0]['rawLocationCode']
-        row['workStationCode'] = val[0]['code']
+        
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          newRow['workStationCode'] =item['code']
+          tableData.value.push(newRow)
+        })
+
       } else if(formField == 'formField'){
         row['workStationCode'] = val[0]['code']
       } else if(formField == 'bomVersion'){
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index bdcb195cd..37114f603 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -553,6 +553,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:5,
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
@@ -917,6 +918,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:17,
     tableForm: {
+      disabled: true,
       type: 'Select'
     }
   },
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index cae64b1f9..af5f92bc1 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -42,8 +42,6 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
-    :isOpenSearchTable="true"
-    fieldTableColumn="workStationCode"
     @success="getList"
     :rules="ProductscrapRequestMainRules"
     :formAllSchemas="ProductscrapRequestMain.allSchemas"
@@ -85,7 +83,6 @@
  <!-- BOM弹窗列表 -->
  <BasicForm
     ref="detailBomRef"
-    
     @success="getList"
     :tableAllSchemas="ProdcutscrapBomScrap.allSchemas"
     :tableFormRules="ProdcutscrapBomScrapRules"
@@ -121,7 +118,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
 
-// 制品报废申请 制品子件报废申请
+// 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -303,13 +300,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       }else if(formField == 'workStationCode'){
-        val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['workStationCode'] = item['code']
-          newRow['fromLocationCode'] = item['rawLocationCode']
-          tableData.value.push(newRow)
-        })
-       
+        row['workStationCode'] = val[0]['code']
+        row['fromLocationCode'] = val[0]['rawLocationCode']
       }else if(formField == 'processCode'){
         row['processCode'] = val[0]['code']
       }else if(formField == 'itemCode'){
@@ -325,22 +317,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           row['singlePrice'] = res.price
         }) 
         // 查看BOM版本
-        console.log(formRef.formModel)
-       const param1 =  {
-        productItemCode: val[0]['itemCode'],
-        available: 'TRUE',
-        pageSize: 20,
-        pageNo: 1,
-        sort: '',
-        by: 'ASC',
-       }
+        const param1 =  {
+          productItemCode: val[0]['itemCode'],
+          available: 'TRUE',
+          pageSize: 20,
+          pageNo: 1,
+          sort: '',
+          by: 'ASC',
+        }
         BomApi.getBomPage(param1).then(res => {
           console.log(res)
           if(res?.list?.length>0){
             row['bomVersion'] = res.list[0].version
           }
-         
-          // row['singlePrice'] = res.price
         }) 
       }else if(formField == 'bomVersion'){
         row['bomVersion'] = val[0]['version']
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index d09d0bc40..de668c94d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -232,8 +232,9 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
   nextTick(async () => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      
       if (formField == 'purchaseReceiptRecordNumber') {
+        row[formField] = val[0][searchField]
         //搜索记录单号--回显数据
         row['supplierCode'] = val[0]['supplierCode']
         row['poNumber'] = val[0]['poNumber']
@@ -271,6 +272,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         row['amount'] = val[0]['amount']
         row['projectCode'] = val[0]['projectCode']
       } else if (formField == 'itemCode') {
+        row[formField] = val[0][searchField]
         row['batch'] = val[0]['toBatch']
         row['containerNumber'] = val[0]['toContainerNumber']
         row['containerNumber'] = val[0]['containerNumber']
@@ -278,6 +280,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         // row['fromLocationCode'] = val[0]['fromLocationCode']
         row['toLocationCode'] = val[0]['toLocationCode']
       } else if (formField == 'fromLocationCode') {
+        row[formField] = val[0][searchField]
         //   let params = {
         //   itemCode: row.itemCode,
         //   batch: row.batch,
@@ -287,7 +290,21 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         // console.log('23423423',aa);
         // row['inventoryBalance'] = aa//库存余额
       } else if (formField == 'packingNumber') {
-        row['inventoryBalance'] = val[0]['qty'] //库存余额
+        // row[formField] = val[0][searchField]
+        val.forEach((item,index)=>{
+          if(index==0){
+            row[formField] = item[searchField]
+            row['inventoryBalance'] = item['qty'] //库存余额
+          }else{
+            let newRow =  {...row}
+            newRow[formField] = item[searchField]
+            row['inventoryBalance'] = item['qty'] //库存余额
+            tableData.value.push(newRow)
+          }
+        })
+        // row['inventoryBalance'] = val[0]['qty'] //库存余额
+      }else{
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 1358415e2..f4a706b9c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -982,6 +982,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
     tableForm:{
+      multiple: true,
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码、批次、从库位代码',