diff --git a/src/api/wms/bomDismantle/index.ts b/src/api/wms/bomDismantle/index.ts
index 0e98ed159..d014b113f 100644
--- a/src/api/wms/bomDismantle/index.ts
+++ b/src/api/wms/bomDismantle/index.ts
@@ -3,4 +3,9 @@ import request from '@/config/axios'
 // 查询制品返修申请子列表
 export const getBomDismantlePage = async (params) => {
   return await request.get({ url: `/wms/productrepair-request-main/bomPage`, params })
-}
\ No newline at end of file
+}
+
+// 查询制品返修记录子列表
+export const getBomDismantleRecordPage = async (params) => {
+  return await request.get({ url: `/wms/productrepair-record-main/bomPage`, params })
+}
diff --git a/src/api/wms/countRecordMain/index.ts b/src/api/wms/countRecordMain/index.ts
index ae6391533..e4b43a074 100644
--- a/src/api/wms/countRecordMain/index.ts
+++ b/src/api/wms/countRecordMain/index.ts
@@ -62,4 +62,9 @@ export const exportCountRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/count-record-main/get-import-template' })
+}
+
+// 生成盘点调整
+export const generateCountRecordMain = async (id) => {
+  return await request.put({ url: `/wms/count-record-main/generate?id=` + id})
 }
\ No newline at end of file
diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts
index 2f462c421..7c47d57c4 100644
--- a/src/api/wms/countRequestMain/index.ts
+++ b/src/api/wms/countRequestMain/index.ts
@@ -64,31 +64,31 @@ export const importTemplate = () => {
 }
 
 // 关闭盘点申请主 Excel
-export const closeCountRequestMain = async (id) => {
+export const close = async (id) => {
   return await request.put({ url: `/wms/count-request-main/close?id=` + id })
 }
 
 // 重新添加盘点申请主 Excel
-export const reAddCountRequestMain = async (id) => {
+export const reAdd = async (id) => {
   return await request.put({ url: `/wms/count-request-main/reAdd?id=` + id })
 }
 
 // 提交盘点申请主 Excel
-export const submitCountRequestMain = async (id) => {
+export const submit = async (id) => {
   return await request.put({ url: `/wms/count-request-main/submit?id=` + id })
 }
 
 // 审批通过盘点申请主 Excel
-export const agreeCountRequestMain = async (id) => {
+export const agree = async (id) => {
   return await request.put({ url: `/wms/count-request-main/agree?id=` + id })
 }
 
 // 审批驳回盘点申请主 Excel
-export const refusedCountRequestMain = async (id) => {
+export const refused = async (id) => {
   return await request.put({ url: `/wms/count-request-main/refused?id=` + id })
 }
 
 // 处理盘点申请主 Excel
-export const handleCountRequestMain = async (id) => {
+export const handle = async (id) => {
   return await request.put({ url: `/wms/count-request-main/handle?id=` + id })
 }
diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts
index 390c8fe01..57ae5ee0e 100644
--- a/src/api/wms/countadjustRequestMain/index.ts
+++ b/src/api/wms/countadjustRequestMain/index.ts
@@ -60,4 +60,34 @@ export const exportCountadjustRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/countadjust-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭盘点申请主 Excel
+export const close = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/close?id=` + id })
+}
+
+// 重新添加盘点申请主 Excel
+export const reAdd = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/reAdd?id=` + id })
+}
+
+// 提交盘点申请主 Excel
+export const submit = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/submit?id=` + id })
+}
+
+// 审批通过盘点申请主 Excel
+export const agree = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/agree?id=` + id })
+}
+
+// 审批驳回盘点申请主 Excel
+export const refused = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/refused?id=` + id })
+}
+
+// 处理盘点申请主 Excel
+export const handle = async (id) => {
+  return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/productrepairRequestMain/index.ts b/src/api/wms/productrepairRequestMain/index.ts
index 869860143..032fe2afa 100644
--- a/src/api/wms/productrepairRequestMain/index.ts
+++ b/src/api/wms/productrepairRequestMain/index.ts
@@ -63,4 +63,34 @@ export const exportProductrepairRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productrepair-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭-制品返修申请
+export const closeProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/close?id=` + id })
+}
+
+// 重新添加-制品返修申请
+export const reAddProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-制品返修申请
+export const submitProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/submit?id=` + id })
+}
+
+// 审批驳回-制品返修申请
+export const refusedProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/refused?id=` + id })
+}
+
+// 审批通过-制品返修申请
+export const agreeProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/agree?id=` + id })
+}
+
+// 处理-制品返修申请
+export const handleProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/handle?id=` + id })
+}
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 6513ba26d..2019e4db9 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -369,6 +369,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
             }) // 新增
           ]
         }
+         //盘点计划详情筛选
+         if (props.fromeWhere == 'putawayRequest') {
+          HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
       }
 
       // 动态显示操作列按钮
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 4067be582..ed92c4c18 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -56,7 +56,7 @@ const props = defineProps({
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
   upData: propTypes.object.def(),
-  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue
index 490bae618..15f997966 100644
--- a/src/components/XButton/src/ButtonBase.vue
+++ b/src/components/XButton/src/ButtonBase.vue
@@ -5,6 +5,7 @@
       :type="item.type"
       :color="item.color"
       :link="item.link ? item.link : false"
+      :disabled="item.disabled"
       v-hasPermi="[item.hasPermi] || []"
       v-if="item.name != 'set'"
       @click="buttonBaseClick(item.name, item, $event)"
@@ -32,6 +33,7 @@
           v-show="!item.hide"
           :type="item.type"
           :color="item.color"
+          :disabled="item.disabled"
           :link="item.link ? item.link : false"
           v-hasPermi="[item.hasPermi] || []"
           @click="buttonBaseClick(item.name, item, $event)"
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 9f62970ac..2930263de 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -687,10 +687,23 @@ export function mainPutawayRequestBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-生成盘点调整申请
+export function mainCountAdjustRequesttBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成盘点调整申请',
+    name: 'countAdjustRequest',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {
       type:option && option.type ? option.type : specific.type,
+      disabled:option && option.disabled ? option.disabled : specific.disabled,
       plain:option && option.plain ? option.plain : specific.plain,
       icon:option && option.icon ? option.icon : specific.icon,
       label:option && option.label ? option.label : specific.label,
diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue
index 2306a3972..245f43334 100644
--- a/src/views/infra/apiAccessLog/index.vue
+++ b/src/views/infra/apiAccessLog/index.vue
@@ -153,7 +153,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ApiAccessLogApi.exportApiAccessLog(queryParams)
-    download.excel(data, 'API 访问日志.xls')
+    download.excel(data, 'API 访问日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue
index 4e6c41e4d..683675545 100644
--- a/src/views/infra/apiErrorLog/index.vue
+++ b/src/views/infra/apiErrorLog/index.vue
@@ -235,7 +235,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ApiErrorLogApi.exportApiErrorLog(queryParams)
-    download.excel(data, '异常日志.xls')
+    download.excel(data, '异常日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue
index 82554cbe8..85b4fc991 100644
--- a/src/views/infra/config/index.vue
+++ b/src/views/infra/config/index.vue
@@ -155,7 +155,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ConfigApi.exportConfig(queryParams)
-    download.excel(data, '参数配置.xls')
+    download.excel(data, '参数配置.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue
index 20b6220cc..d662abc17 100644
--- a/src/views/infra/job/index.vue
+++ b/src/views/infra/job/index.vue
@@ -155,7 +155,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await JobApi.exportJob(queryParams)
-    download.excel(data, '定时任务.xls')
+    download.excel(data, '定时任务.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/infra/job/logger/index.vue b/src/views/infra/job/logger/index.vue
index afeb3c641..a9fb08f97 100644
--- a/src/views/infra/job/logger/index.vue
+++ b/src/views/infra/job/logger/index.vue
@@ -182,7 +182,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await JobLogApi.exportJobLog(queryParams)
-    download.excel(data, '定时任务执行日志.xls')
+    download.excel(data, '定时任务执行日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/dict/data/index.vue b/src/views/system/dict/data/index.vue
index 2811f06aa..f07f1ae6a 100644
--- a/src/views/system/dict/data/index.vue
+++ b/src/views/system/dict/data/index.vue
@@ -194,7 +194,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DictDataApi.exportDictData(queryParams)
-    download.excel(data, '字典数据.xls')
+    download.excel(data, '字典数据.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index a89733519..f9a257af4 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -161,7 +161,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DictTypeApi.exportDictType(queryParams)
-    download.excel(data, '字典类型.xls')
+    download.excel(data, '字典类型.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue
index ade9c8fd2..dac5240a0 100644
--- a/src/views/system/errorCode/index.vue
+++ b/src/views/system/errorCode/index.vue
@@ -157,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ErrorCodeApi.excelErrorCode(queryParams)
-    download.excel(data, '错误码.xls')
+    download.excel(data, '错误码.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
index 9071915ef..997fcef9d 100644
--- a/src/views/system/loginlog/index.vue
+++ b/src/views/system/loginlog/index.vue
@@ -126,7 +126,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await LoginLogApi.exportLoginLog(queryParams)
-    download.excel(data, '登录日志.xls')
+    download.excel(data, '登录日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index 09800d92a..3bfd3d20e 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -145,7 +145,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OperateLogApi.exportOperateLog(queryParams)
-    download.excel(data, '操作日志.xls')
+    download.excel(data, '操作日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 59b454233..6c2ae14ce 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -143,7 +143,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PostApi.exportPost(queryParams)
-    download.excel(data, '岗位列表.xls')
+    download.excel(data, '岗位列表.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 93dae9676..9a58903d9 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -250,7 +250,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RoleApi.exportRole(queryParams)
-    download.excel(data, '角色列表.xls')
+    download.excel(data, '角色列表.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue
index ce2a0b426..e01a3be2a 100644
--- a/src/views/system/sensitiveWord/index.vue
+++ b/src/views/system/sensitiveWord/index.vue
@@ -175,7 +175,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SensitiveWordApi.exportSensitiveWord(queryParams)
-    download.excel(data, '敏感词.xls')
+    download.excel(data, '敏感词.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/serialNumber/index.vue b/src/views/system/serialNumber/index.vue
index 2e7361408..0806906d5 100644
--- a/src/views/system/serialNumber/index.vue
+++ b/src/views/system/serialNumber/index.vue
@@ -168,7 +168,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SerialNumberApi.exportSerialNumber(queryParams)
-    download.excel(data, '流水号规则.xls')
+    download.excel(data, '流水号规则.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue
index 99be8508b..bc7c3ff60 100644
--- a/src/views/system/sms/log/index.vue
+++ b/src/views/system/sms/log/index.vue
@@ -171,7 +171,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SmsLogApi.exportSmsLog(queryParams)
-    download.excel(data, '短信日志.xls')
+    download.excel(data, '短信日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue
index 9bd0f9dd4..b9e478c60 100644
--- a/src/views/system/sms/template/index.vue
+++ b/src/views/system/sms/template/index.vue
@@ -197,7 +197,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SmsTemplateApi.exportSmsTemplate(queryParams)
-    download.excel(data, '短信模板.xls')
+    download.excel(data, '短信模板.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 5de1ccc8f..e2650dbe4 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -177,7 +177,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TenantApi.exportTenant(queryParams)
-    download.excel(data, '租户列表.xls')
+    download.excel(data, '租户列表.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/user/UserImportForm.vue b/src/views/system/user/UserImportForm.vue
index 51b1702f9..b391087a9 100644
--- a/src/views/system/user/UserImportForm.vue
+++ b/src/views/system/user/UserImportForm.vue
@@ -130,6 +130,6 @@ const importTemplate = async () => {
   console.log(await UserApi.importUserTemplate());
   
   const res = await UserApi.importUserTemplate()
-  download.excel(res, '用户导入模版.xls')
+  download.excel(res, '用户导入模版.xlsx')
 }
 </script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4d2d7e2d4..632aa0442 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await UserApi.exportUser(queryParams)
-    download.excel(data, '用户数据.xls')
+    download.excel(data, '用户数据.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
index c75936594..bf430e928 100644
--- a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
@@ -191,7 +191,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(setSearchParams)
-    download.excel(data, '条码实体基类.xls')
+    download.excel(data, '条码实体基类.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -206,7 +206,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '条码实体基类导入模版.xls'
+  templateTitle: '条码实体基类导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
index f2d9086a7..0aefc1529 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -229,6 +229,22 @@ const options = reactive({
     { value: 3, label: '供应商3' }
   ]
 })
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 // 获取供应商列表的参数
 const querySupplierParams = ref({
   type: ''
@@ -265,6 +281,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -277,6 +304,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  }else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -288,6 +320,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   let list = Object.values(formData.value.configuration)
   let onlyOne = list.filter((item) => {
     return item == 'TRUE'
@@ -350,22 +386,7 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-// 按钮事件
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
+
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
index 233b7c802..b21d506b1 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -228,7 +228,22 @@ const options = reactive({
   itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }],
 
 })
-
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 // 获取供应商列表
 const getFormSupplierList = async () => {
   options.supplierList = await getSupplierList();
@@ -270,6 +285,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -285,6 +311,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -297,7 +328,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
-
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -355,22 +389,6 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
 // 添加规则配置
 const handleAddTable = (item) => {
   item.push({
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index a5f66f647..edd0b931d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -413,6 +413,22 @@ const options = reactive({
   // 排列方式
   sortOptions: [{ value: 'ASC', label: '从小到大' }, { value: 'DESC', label: '从大到小' }],
 })
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 
 // 获取供应商列表
 const getFormSupplierList = async () => {
@@ -492,6 +508,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -521,6 +548,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -532,6 +564,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -624,24 +660,6 @@ const resetForm = () => {
     }
   }
 }
-
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
index 836ab71e7..9b4bb0bf6 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -334,6 +334,23 @@ const options = reactive({
 const querySupplierParams = ref({
   type: ''
 })
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
 // 获取供应商列表
 const getFormSupplierList = async () => {
   options.supplierList = await getSupplierList(querySupplierParams.value)
@@ -385,6 +402,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -397,6 +425,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -409,6 +442,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   if(formData.value.configuration.InspectType != 'SAMPLING'){
@@ -478,23 +515,6 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-// 按钮事件
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
 // 添加抽查规则
 const handleAddTable = (item) => {
   item.push({
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
index 1e3e63b16..e7afafe61 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
@@ -243,7 +243,22 @@ const options = reactive({
   //仓库列表
   warehouseList: [],
 })
-
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 // 获取供应商列表
 const getFormSupplierList = async () => {
   options.supplierList = await getSupplierList();
@@ -315,6 +330,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -341,6 +367,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -352,6 +383,11 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -410,23 +446,6 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index bbb48edd5..22ca2a53a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -241,6 +241,22 @@ const options = reactive({
     { value: 3, label: '供应商3' }
   ]
 })
+// 弹窗按钮
+const Butttondata =ref( [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 // 获取供应商列表的参数
 const querySupplierParams = ref({
   type: ''
@@ -277,6 +293,18 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+        console.log(Butttondata)
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -289,6 +317,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  }else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -300,6 +333,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   let list = Object.values(formData.value.configuration)
   let onlyOne = list.filter((item) => {
     return item == 'TRUE'
@@ -366,22 +403,7 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-// 按钮事件
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
+
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
index d23465971..27ef5c960 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -232,6 +232,22 @@ const options = reactive({
   overflowWarehouseList: []
 })
 
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 // 选择物品类型/物品分组/abc类/物品/项目
 const changeItemsType = () => {
   formData.value.condition[0].Value = ''
@@ -294,6 +310,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -314,6 +341,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  }else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -325,6 +357,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -383,22 +419,6 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-// 按钮事件
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
 
 const validatorNum = (rule: any, value: any, callback: any) => {
   if (value && formData.value.configuration.MaxQty != -1) {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index c8a5091ba..017944417 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -370,7 +370,22 @@ const options = reactive({
   // 溢流库位列表
   overflowWarehouseList: []
 })
-
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 // 选择物品类型/物品分组/abc类/物品/项目
 const changeItemsType = () => {
   formData.value.condition[0].Value = ''
@@ -433,6 +448,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -453,6 +479,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  }else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -464,6 +495,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -526,22 +561,6 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-// 按钮事件
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index 13f4101c4..bf3fc14c6 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -1,16 +1,27 @@
 
-<!-- 供应商送货策略弹出层 -->
+<!-- 采购计划策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px;">
-    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
-      <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
         <!-- 规则 -->
         <div class="item">
           <div class="title">规则</div>
           <el-row>
             <el-col :span="24">
               <el-form-item label="代码" prop="strategyCode">
-                <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -41,36 +52,95 @@
           <el-row>
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 供应商类型 -->
-              <el-form-item v-if="item.ParamCode == 'SupplierType'" label="供应商类型" class="flex-top err-120">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierTypeRangeOptions"
-                    :key="cur.value" />
+              <el-form-item
+                v-if="item.ParamCode == 'SupplierType'"
+                label="供应商类型"
+                class="flex-top err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierTypeRangeOptions"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择供应商类型" style="flex: 1;" clearable
-                  @change="changeSupplierType">
-                  <el-option v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" :key="dict.value"
-                    :label="dict.label" :value="dict.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商类型"
+                  style="flex: 1"
+                  clearable
+                  @change="changeSupplierType"
+                >
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 供应商 -->
-              <el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" class="err-120">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.supplierRangeOptions"
-                    :key="cur.value" />
+              <el-form-item
+                v-else-if="item.ParamCode == 'SupplierCode'"
+                label="供应商"
+                class="err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.supplierRangeOptions"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择供应商" style="flex: 1;" clearable>
-                  <el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择供应商"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.id"
+                    :label="cur.name"
+                    :value="cur.id"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 星期几 -->
-              <el-form-item v-else-if="item.ParamCode == 'Weekday'" label="星期几" class="flex-top err-120">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.weekRangeOptions"
-                    :key="cur.value" />
+              <el-form-item
+                v-else-if="item.ParamCode == 'Weekday'"
+                label="星期几"
+                class="flex-top err-120"
+              >
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.weekRangeOptions"
+                    :key="cur.value"
+                  />
                 </el-select>
                 <div class="checkbox">
                   <el-checkbox-group v-model="item.Value">
-                    <el-checkbox :label="cur.label" v-for="cur in options.weekOptions" :key="cur.value" />
+                    <el-checkbox
+                      :label="cur.label"
+                      v-for="cur in options.weekOptions"
+                      :key="cur.value"
+                    />
                   </el-checkbox-group>
                 </div>
               </el-form-item>
@@ -84,33 +154,80 @@
             <!-- 开始时间 -->
             <el-col :span="24">
               <!-- 开始时间 -->
-              <el-form-item  label="开始时间" prop="BeginTime">
-                <el-time-select v-model="formData.configuration.BeginTime" start="00:00" end="23:59" step="00:15" placeholder="请选择开始时间"
-                  style="width: 100%;" />
+              <el-form-item label="开始时间" prop="BeginTime">
+                <el-time-select
+                  v-model="formData.configuration.BeginTime"
+                  start="00:00"
+                  end="23:59"
+                  step="00:15"
+                  placeholder="请选择开始时间"
+                  style="width: 100%"
+                />
               </el-form-item>
               <!-- 结束时间 -->
-              <el-form-item  label="结束时间" prop="EndTime">
-                <el-time-select v-model="formData.configuration.EndTime" start="00:00" end="23:59" step="00:15" placeholder="请选择结束时间"
-                  style="width: 100%;" />
+              <el-form-item label="结束时间" prop="EndTime">
+                <el-time-select
+                  v-model="formData.configuration.EndTime"
+                  start="00:00"
+                  end="23:59"
+                  step="00:15"
+                  placeholder="请选择结束时间"
+                  style="width: 100%"
+                />
               </el-form-item>
               <!-- 仓库 -->
               <el-form-item label="仓库" prop="WarehouseCode">
-                <el-select v-model="formData.configuration.WarehouseCode"
-                  :placeholder="`请选择${formData.configuration.WarehouseCode == 'WarehouseCode' ? '仓库' : formData.configuration.WarehouseCode== 'AreaCode' ? '库区' : formData.configuration.WarehouseCode == 'LocationGroupCode' ? '库位组' : formData.configuration.WarehouseCode == 'LocationCode' ? '库位' : ''}`"
-                  clearable>
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.WarehouseCode"
+                  :placeholder="`请选择${
+                    formData.configuration.WarehouseCode == 'WarehouseCode'
+                      ? '仓库'
+                      : formData.configuration.WarehouseCode == 'AreaCode'
+                      ? '库区'
+                      : formData.configuration.WarehouseCode == 'LocationGroupCode'
+                      ? '库位组'
+                      : formData.configuration.WarehouseCode == 'LocationCode'
+                      ? '库位'
+                      : ''
+                  }`"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 月台 -->
-              <el-form-item  label="月台" prop="DockCode" >
-                <el-select v-model="formData.configuration.DockCode" placeholder="请选择月台" clearable>
-                  <el-option v-for="cur in options.dockList" :key="cur.code" :label="cur.name" :value="cur.code" />
+              <el-form-item label="月台" prop="DockCode">
+                <el-select
+                  v-model="formData.configuration.DockCode"
+                  placeholder="请选择月台"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.dockList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 在途库位 -->
-              <el-form-item label="在途库位" prop="OnTheWayLocationCode" >
-                <el-select v-model="formData.configuration.OnTheWayLocationCode" placeholder="请选择在途库位" clearable>
-                  <el-option v-for="cur in options.locationList" :key="cur.code" :label="cur.name" :value="cur.code" />
+              <el-form-item label="在途库位" prop="OnTheWayLocationCode">
+                <el-select
+                  v-model="formData.configuration.OnTheWayLocationCode"
+                  placeholder="请选择在途库位"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.locationList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -134,8 +251,6 @@ import { getDockList } from '@/api/wms/dock'
 import { getLocationList } from '@/api/wms/location'
 import * as RuleApi from '@/api/wms/rule'
 
-
-
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -149,31 +264,31 @@ const formStrategyCode = ref('')
 // form表单数据
 const formData = ref({
   id: '',
-  strategyCode: formStrategyCode.value,//策略代码id
-  name: '',//名称
-  description: '',//描述
-  priority: '',//优先级
-  status: true,//状态
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
   //规则条件集合
   condition: [
     // 供应商类型
-    { ParamCode: 'SupplierType', Operator: "==", Value: "" },
+    { ParamCode: 'SupplierType', Operator: '==', Value: '' },
     // 供应商
-    { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
     // 星期几
-    { ParamCode: 'Weekday', Operator: "IN", Value: [] }
+    { ParamCode: 'Weekday', Operator: 'IN', Value: [] }
   ],
   configuration: {
     // 开始时间
-    BeginTime:"",
+    BeginTime: '',
     // 结束时间
-    EndTime:"",
+    EndTime: '',
     // 仓库代码
-    WarehouseCode:"",
+    WarehouseCode: '',
     // 月台代码
-    DockCode:"",
+    DockCode: '',
     // 在途库位代码
-    OnTheWayLocationCode:"",
+    OnTheWayLocationCode: ''
   }
 })
 
@@ -182,7 +297,7 @@ const rules = ref({
   strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
   description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 
 // 所有的范围类型
@@ -196,11 +311,11 @@ const rangeOptions = [
   { value: 'IN', label: '包含' },
   { value: 'NOT IN', label: '不包含' },
   { value: 'NULL', label: '为空' },
-  { value: 'NOT NULL', label: '不为空' },
+  { value: 'NOT NULL', label: '不为空' }
 ]
 const formatRangeOptions = (...rest) => {
   // 交集
-  let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
   return result
 }
 // 下拉框列表集合
@@ -216,21 +331,47 @@ const options = reactive({
   // 星期几范围下拉框列表
   weekRangeOptions: formatRangeOptions('IN', 'NOT IN'),
   //星期几列表
-  weekOptions: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
+  weekOptions: [
+    { value: 1, label: '星期一' },
+    { value: 2, label: '星期二' },
+    { value: 3, label: '星期三' },
+    { value: 4, label: '星期四' },
+    { value: 5, label: '星期五' },
+    { value: 6, label: '星期六' },
+    { value: 7, label: '星期日' }
+  ],
   //仓库列表
   warehouseList: [],
   //月台列表
   dockList: [],
   //在途库位列表
-  locationList: [],
+  locationList: []
 })
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
 // 获取供应商列表的参数
 const querySupplierParams = ref({
   type: ''
 })
+
 // 获取供应商列表
 const getFormSupplierList = async () => {
-  options.supplierList = await getSupplierList(querySupplierParams.value);
+  options.supplierList = await getSupplierList(querySupplierParams.value)
 }
 
 // 选择供应商类型
@@ -242,16 +383,15 @@ const changeSupplierType = (e) => {
 
 // 获取仓库列表
 const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList();
+  options.warehouseList = await getWarehouseList()
 }
 // 获取月台列表
 const getFormDockList = async () => {
-  options.dockList = await getDockList();
-
+  options.dockList = await getDockList()
 }
 // 获取库位列表
 const getFormLocationList = async () => {
-  options.locationList = await getLocationList({ type: 'TRANSPORT' });
+  options.locationList = await getLocationList({ type: 'TRANSPORT' })
 }
 
 getFormSupplierList()
@@ -269,6 +409,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
+
     try {
       let data = await RuleApi.getRule(id)
       formData.value.id = data.id
@@ -277,19 +418,33 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
       if (data.configuration) {
-        formData.value.configuration =  JSON.parse(data.configuration)
+        formData.value.configuration = JSON.parse(data.configuration)
       }
-
       querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
       getFormSupplierList()
-
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -301,16 +456,21 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
     let data = {
       id: formData.value.id,
-      strategyCode: formData.value.strategyCode,//策略代码
-      name: formData.value.name,//名称
-      description: formData.value.description,//描述
-      priority: formData.value.priority,//优先级
-      status: formData.value.status ? 0 : 1,//状态
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
       condition: JSON.stringify(formData.value.condition),
       configuration: JSON.stringify(formData.value.configuration)
@@ -334,52 +494,34 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: '',
-    strategyCode: formStrategyCode.value,//策略代码
-    name: '',//名称
-    description: '',//描述
-    priority: '',//优先级
-    status: true,//状态
+    strategyCode: formStrategyCode.value, //策略代码
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
     //规则条件集合
     condition: [
       // 供应商类型
-      { ParamCode: 'SupplierType', Operator: "==", Value: "" },
+      { ParamCode: 'SupplierType', Operator: '==', Value: '' },
       // 供应商
-      { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
       // 星期几
-      { ParamCode: 'Weekday', Operator: "IN", Value: [] }
+      { ParamCode: 'Weekday', Operator: 'IN', Value: [] }
     ],
     configuration: {
-    // 开始时间
-    BeginTime:"",
-    // 结束时间
-    EndTime:"",
-    // 仓库代码
-    WarehouseCode:"",
-    // 月台代码
-    DockCode:"",
-    // 在途库位代码
-    OnTheWayLocationCode:"",
-  }
-  }
-}
-
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
+      // 开始时间
+      BeginTime: '',
+      // 结束时间
+      EndTime: '',
+      // 仓库代码
+      WarehouseCode: '',
+      // 月台代码
+      DockCode: '',
+      // 在途库位代码
+      OnTheWayLocationCode: ''
+    }
   }
 }
-
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index b9480d824..4508c9f67 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -1,5 +1,5 @@
 
-<!-- 供应商送货策略 -->
+<!-- 采购计划策略 -->
 <template>
   <!-- 搜索工作栏 -->
   <ContentWrap>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index bd2b34118..69523dbcd 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -35,7 +35,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="优先级" prop="priority">
-                <el-input-number v-model="formData.priority" :min="0" />
+                <el-input-number v-model="formData.priority"  :min="0" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -629,7 +629,22 @@ const options = reactive({
   //仓库列表
   warehouseList: []
 })
-
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 // 获取供应商列表
 const getFormSupplierList = async () => {
   options.supplierList = await getSupplierList()
@@ -708,6 +723,18 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+        console.log(Butttondata)
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -749,6 +776,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -760,6 +792,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -844,22 +880,6 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-// 按钮事件
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
index 2eab58c52..b2b6a754f 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
@@ -183,6 +183,22 @@ const options = reactive({
   // 物品类型列表
   itemTypeOptions: [{ value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }],
 })
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 
 // 选择物品类型/物品分组/abc类/物品/项目
 const changeItemsType = () => {
@@ -206,6 +222,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -216,6 +243,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -227,6 +259,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -279,22 +315,6 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
 
 const validatorNum = (rule: any, value: any, callback: any) => {
   if (value && formData.value.configuration[0].Value != -1) {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index 2b3ecd7ae..4758eb542 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -324,6 +324,22 @@ const options = reactive({
   // 溢流库位列表
   overflowWarehouseList: []
 })
+// 弹窗按钮
+const Butttondata = ref([
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+])
+// 按钮事件
+const buttonBaseClick = (val, item) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
 
 // 获取仓库列表
 const getFormWarehouseList = async () => {
@@ -382,6 +398,17 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.description = data.description
       formData.value.priority = data.priority
       formData.value.status = data.status == 0 ? true : false
+      if (formData.value.priority == 0) {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      } else {
+        Butttondata.value = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+      }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
@@ -402,6 +429,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else {
+    Butttondata.value = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -413,6 +445,10 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  if(formData.value.priority == 0){
+    message.error('优先级不可以为0')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -490,22 +526,7 @@ const resetForm = () => {
   }
 }
 
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-// 按钮事件
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
+
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index bb25e78bd..aa11f150a 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -518,16 +518,16 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 120,
-      fixed: 'right'
-    },
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
 ]))
 
 //表单校验
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index aa814f623..361bee941 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -91,14 +91,14 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '盘点范围列表',
-    field: 'scopeList',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '盘点范围列表',
+  //   field: 'scopeList',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '快照盘点',
     field: 'isSnapshot',
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 25130598a..f4c2d91b2 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -272,30 +272,64 @@ const butttondata = (row) => {
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') {
-    // 关闭
-    console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainReAdd') {
-    // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
-  } else if (val == 'mainSubmit') {
-    // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
-  } else if (val == 'mainTurnDown') {
-    // 驳回
-    console.log('列表-操作按钮事件-驳回')
-  } else if (val == 'mainApprove') {
-    // 审批通过
-    console.log('列表-操作按钮事件-审批通过')
-  } else if (val == 'edit') {
-    // 编辑
+  if (val == 'mainPlanOpe') { // 打开
+    CountPlanMainApi.open(row.id).then(() => {
+      message.success(t('打开成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainPlanClo') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    CountPlanMainApi.close(row.id).then(() => {
+      message.success(t('关闭成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainPlanSub') { // 提交审批
+    await message.confirm(t('common.confirmSubmit'))
+    await CountPlanMainApi.submit(row.id)
+    message.success(t('提交审批成功'))
+    await getList()
+  } else if (val == 'mainPlanTur') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    CountPlanMainApi.reject(row.id).then(() => {
+      message.success(t('驳回成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainPlanApp') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    CountPlanMainApi.agree(row.id).then(() => {
+      message.success(t('审批已通过'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainPlanPub') { // 发布
+    await message.confirm('确认要发布吗？')
+    CountPlanMainApi.publish(row.id).then(() => {
+      message.success(t('发布成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainPlanRes') { // 重置
+    await message.confirm('确认要重置吗？')
+    CountPlanMainApi.resetting(row.id).then(() => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') {
-    // 删除
+  } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
-
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index edd5f9e38..2bc04a40b 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -247,6 +247,16 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index cc1144865..61aa7c346 100644
--- a/src/views/wms/countManage/count/countRecordMain/index.vue
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -120,11 +120,23 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-  return []
+  return [
+    defaultButtons.mainCountAdjustRequesttBtn({
+      hasPermi: 'wms:count-record-main:generate'
+    }), // 生成盘点调整申请
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if(val == 'countAdjustRequest'){
+    CountRecordMainApi.generateCountRecordMain(row.id).then(()=>{
+      message.success(t('生成成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index 923ec3a24..5b84e06d6 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -148,8 +148,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:count-request-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:count-request-main:import'}), // 导入
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:count-request-main:create'}), // 新增——需要手动修改下权限
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:count-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:count-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -205,19 +205,57 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
-    handleClose(row.id)
+    await message.confirm('确认要关闭吗？')
+    CountRequestMainApi.close(row.id).then(() => {
+      message.success(t('关闭成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainReAdd') { // 重新添加
-    handleReAdd(row.id)
+    await message.confirm('确认要重新添加吗？')
+    CountRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('添加成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainSubmit') { // 提交审批
-    handleSubmit(row.id)
+    await message.confirm('确认要提交审批吗？')
+    CountRequestMainApi.submit(row.id).then(() => {
+      message.success(t('提交审批成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainTurnDown') { // 驳回
-    handleRefused(row.id)
+    await message.confirm('确认要驳回吗？')
+    CountRequestMainApi.refused(row.id).then(() => {
+      message.success(t('驳回成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainApprove') { // 审批通过
-    handleAgree(row.id)
+    await message.confirm('确认要审批通过吗？')
+    CountRequestMainApi.agree(row.id).then(() => {
+      message.success(t('审批已通过'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
-  } else if (val == 'edit') { // 编辑
+    await message.confirm('确认要处理吗？')
+    CountRequestMainApi.handle(row.id).then(() => {
+      message.success(t('处理成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
     openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
   }
 }
 
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 857ce78dd..f952089db 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -134,8 +134,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:countadjust-request-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:countadjust-request-main:import'}), // 导入
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:countadjust-request-main:create'}), // 新增——需要手动修改下权限
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:countadjust-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:countadjust-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -178,37 +178,73 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:countadjust-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:countadjust-request-main:delete'}), // 删除
+    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.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:delete'}), // 删除
     ]
 }
-
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    await message.confirm('确认要关闭吗？')
+    CountadjustRequestMainApi.close(row.id).then(() => {
+      message.success(t('关闭成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
+    await message.confirm('确认要重新添加吗？')
+    CountadjustRequestMainApi.reAdd(row.id).then(() => {
+      message.success(t('添加成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainSubmit') { // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
+    await message.confirm('确认要提交审批吗？')
+    CountadjustRequestMainApi.submit(row.id).then(() => {
+      message.success(t('提交审批成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainTurnDown') { // 驳回
-    console.log('列表-操作按钮事件-驳回')
+    await message.confirm('确认要驳回吗？')
+    CountadjustRequestMainApi.refused(row.id).then(() => {
+      message.success(t('驳回成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
   } else if (val == 'mainApprove') { // 审批通过
-    console.log('列表-操作按钮事件-审批通过')
-  } else if (val == 'edit') { // 编辑
+    await message.confirm('确认要审批通过吗？')
+    CountadjustRequestMainApi.agree(row.id).then(() => {
+      message.success(t('审批已通过'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    CountadjustRequestMainApi.handle(row.id).then(() => {
+      message.success(t('处理成功'))
+      getList()
+    }).catch(err => {
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
 
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
@@ -317,6 +353,5 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await CountadjustRequestMainApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
index 931ca768a..01f01d1d5 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
@@ -47,6 +47,7 @@
     :tableAllSchemas="ProductrepairRecordDetail.allSchemas"
     :tableFormRules="ProductrepairRecordDetailRules"
     :isBusiness="true"
+    @buttonOperationClick="buttonOperationClick"
   />
 
   <!-- 详情 -->
@@ -57,15 +58,42 @@
     :detailAllSchemas="ProductrepairRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductrepairRecordDetailRules"
     :apiPage="ProductrepairRecordDetailApi.getProductrepairRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
+
+
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+    <TableForm
+      ref="tableFormRef"
+      class="w-[100%]"
+      :tableFields="BomDismantle.allSchemas.tableColumns"
+      :tableData="detatableDataBom.tableList"
+      :isShowButton="false"
+      :isShowReduceButton="false"
+    />
+    <template #footer>
+      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
+    </template>
+  </Dialog>
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductrepairRecordMain,ProductrepairRecordMainRules,ProductrepairRecordDetail,ProductrepairRecordDetailRules } from './productrepairRecordMain.data'
+import { ProductrepairRecordMain,ProductrepairRecordMainRules,ProductrepairRecordDetail,ProductrepairRecordDetailRules, BomDismantle } from './productrepairRecordMain.data'
 import * as ProductrepairRecordMainApi from '@/api/wms/productrepairRecordMain'
 import * as ProductrepairRecordDetailApi from '@/api/wms/productrepairRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BomDismantleApi from "@/api/wms/bomDismantle";
+import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
 
 // 制品返修记录主
 defineOptions({ name: 'ProductrepairRecordMain' })
@@ -78,6 +106,87 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductrepairRecordMain.allSchemas.tableColumns)
 
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const tableListBom = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BomDismantleApi.getBomDismantleRecordPage
+})
+
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 新增 tableform 按钮
+const buttonOperationClick = async (row, label, index)=> {
+  if (row.itemCode == '') {
+    message.warning('请选择物品代码！')
+    return
+  }
+  detatableDataBom.params.itemCode = row.itemCode
+  DialogTitle.value = '物品代码:【' + row.itemCode + '】 Bom 信息'
+  bomModelVisible.value = true
+  await getDetailListBom()
+  detatableDataBom.tableList.map(item => {
+    item.rowId = index
+    if(tableData.value[index].childList) {
+      tableData.value[index].childList.forEach(itemChild => {
+        if (itemChild.itemCode == item.itemCode) {
+          item.qty = itemChild.qty
+        }
+      })
+    }
+  })
+}
+
+/** bom 列表 表单 按钮 */
+const ButttondataBom = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+]
+// bom 列表 表单 按钮
+const buttonBaseClickBom = (val) => {
+  // 保存
+  if (val == 'save') {
+    // 根据 填写的数量 为基准 不填写数量的忽略
+    tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0))
+    tableData.value.forEach((item, index) => {
+      if(tableListBom.value[0].rowId == index) {
+        item.childList = tableListBom.value
+      }
+    })
+    console.log(157, tableData.value)
+    bomModelVisible.value = false
+  }
+  // 关闭
+  else if (val == 'close') {
+    bomModelVisible.value = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+      masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 905155fc5..ffe9b6d18 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
 
 /**
  * @returns {Array} 制品返修记录主表
@@ -581,6 +583,69 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  },
 ]))
 
 //表单校验
@@ -624,4 +689,231 @@ export const ProductrepairRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
+
+/**
+ * @returns {Array} bom 拆解
+ */
+export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行标记',
+    field: 'rowId',
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+    table: {
+      show: false
+    }
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index dd0ee4951..d4ebf28aa 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -69,6 +69,8 @@
     :apiPage="ProductrepairRequestDetailApi.getProductrepairRequestDetailaPage"
     :apiDelete="ProductrepairRequestDetailApi.deleteProductrepairRequestDetaila"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
 
   <!-- bom列表 -->
@@ -117,6 +119,18 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductrepairRequestMain.allSchemas.tableColumns)
 
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
 // Bom 窗口
 const DialogTitle = ref('Bom信息')
 const bomModelVisible = ref(false)
@@ -171,7 +185,6 @@ const buttonOperationClick = async (row, label, index)=> {
   })
 }
 
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -190,6 +203,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['uom'] = val[0]['uom']
         row['inventoryStatus'] = val[0]['inventoryStatus']
         row['fromLocationCode'] = val[0]['locationCode']
+      } else if(formField == 'productionLineCode'){
+        row['productionLineCode'] = val[0]['code']
+      } else if(formField == 'workStationCode'){
+        row['workStationCode'] = val[0]['code']
+      } else if(formField == 'formField'){
+        row['workStationCode'] = val[0]['code']
       } else {
         row[formField] = val[0][searchField]
       }
@@ -226,7 +245,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productrepair-request-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:productrepair-request-main:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:productrepair-request-main:import'}), // 导入 暂时不做主子子表结构
   defaultButtons.defaultExportBtn({hasPermi:'wms:productrepair-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -284,14 +303,22 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -299,6 +326,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await ProductrepairRequestMainApi.closeProductrepairRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await ProductrepairRequestMainApi.reAddProductrepairRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await ProductrepairRequestMainApi.submitProductrepairRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await ProductrepairRequestMainApi.refusedProductrepairRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await ProductrepairRequestMainApi.agreeProductrepairRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await ProductrepairRequestMainApi.handleProductrepairRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
@@ -404,7 +491,19 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+       itemCode: row.itemCode,
+       bomVersion: row.bomVersion,
+       masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 32cd9f2cc..b24f260ed 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -36,6 +36,8 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -830,6 +832,51 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
   {
     label: '操作',
     field: 'action',
@@ -1056,34 +1103,6 @@ export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
   }
 ]))
 
-//表单校验
-export const ConsumereRequestDetailbRules = reactive({
-  inventoryStatus: [
-    { required: true, message: '请选择库存状态', trigger: 'change' }
-  ],
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
-  fromLocationCode: [
-    { required: true, message: '请选择从库位代码', trigger: 'change' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  itemCode: [
-    { required: true, message: '请选择物品代码', trigger: 'change' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
-})
-
 
 /**
  * @returns {Array} bom 拆解
@@ -1096,6 +1115,9 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     tableForm:{
       disabled: true
+    },
+    table: {
+      show: false
     }
   },
   {
@@ -1124,4 +1146,186 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
-]))
\ No newline at end of file
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
index 185cda2e2..e97dd0f17 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -219,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams)
-    download.excel(data, '检验任务主.xls')
+    download.excel(data, '检验任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index b01941ee7..89faa5418 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -144,7 +144,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams)
-    download.excel(data, '检验记录主.xls')
+    download.excel(data, '检验记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index 3d81e720b..e47062cfe 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -307,7 +307,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams)
-    download.excel(data, '检验申请主.xls')
+    download.excel(data, '检验申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index a187bd907..114061bd4 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -350,7 +350,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xls'
+  templateTitle: '采购收货申请主导入模版.xlsx'
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 8e4e1899b..2f93489e8 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -219,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams)
-    download.excel(data, '采购退货任务主.xls')
+    download.excel(data, '采购退货任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 042310b1c..e4fca8ac9 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams)
-    download.excel(data, '采购退货记录主.xls')
+    download.excel(data, '采购退货记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 4beac21ea..9d473aab7 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -219,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams)
-    download.excel(data, '上架任务主.xls')
+    download.excel(data, '上架任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index d467266f7..8bed0a9c2 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams)
-    download.excel(data, '上架记录主.xls')
+    download.excel(data, '上架记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 1c9116028..cd36991e3 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -68,6 +68,7 @@
     :apiPage="PutawayRequestDetailApi.getPutawayRequestDetailPage"
     :apiDelete="PutawayRequestDetailApi.deletePutawayRequestDetail"
     :Echo="Echo"
+    fromeWhere="putawayRequest"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
@@ -311,7 +312,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams)
-    download.excel(data, '上架申请主.xls')
+    download.excel(data, '上架申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -364,7 +365,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '上架申请主导入模版.xls'
+  templateTitle: '上架申请主导入模版.xlsx'
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 051ccd69a..6deeaa543 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -37,26 +37,6 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 上架申请主表
  */
 export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '到货检验记录单号',
-    field: 'inspectRecordNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到货检验记录单号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '到货检验信息', // 查询弹窗标题
-        searchAllSchemas: InspectRequestMain.allSchemas, // 查询弹窗所需类
-        searchPage: InspectRequestMainApi.getInspectRequestMainPage // 查询弹窗所需分页方法
-      }
-    }
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -756,6 +736,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false ,
+    isTable: false ,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 6b8f42654..1e32e2031 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -245,7 +245,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DemandforecastingMainApi.exportDemandforecastingMain(setSearchParams)
-    download.excel(data, '要货预测主.xls')
+    download.excel(data, '要货预测主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -298,7 +298,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '要货预测主导入模版.xls'
+  templateTitle: '要货预测主导入模版.xlsx'
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index aa6d75e96..3828f181e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -273,7 +273,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await PurchaseMainApi.exportPurchaseMain(setSearchParams)
-      download.excel(data, '采购订单主.xls')
+      download.excel(data, '采购订单主.xlsx')
     } catch {
     } finally {
       exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index f836cb410..2bd8b58e6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -76,21 +76,27 @@
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(async () => {
       if (type == 'tableForm') {
-         
         // 明细查询页赋值
         row[formField] = val[0][searchField]
         row['itemCode'] = val[0]['code']
         row['poNumber'] = val[0]['number']
         row['poLine'] = val[0]['lineNumber']
+
         await PurchaseDetailApi.getPurchaseDetailPage({
           number: row['poNumber'],
-          poLine: row['lineNumber'],
+          available: 'TRUE',
+          // poLine: row['lineNumber'],
         }).then(res => {
-          if (res.list.length == 1) {
-            row['itemCode'] = res.list[0].itemCode
-            row['poLine'] = res.list[0].lineNumber
-            row['uom'] = res.list[0].uom
-          }
+          // if (formField == 'poLine') {
+          //   row['itemCode'] = res.list[0].itemCode
+          //   row['uom'] = res.list[0].uom
+          // }
+          if (res) tableData.value = res.list;
+          tableData.value.forEach(item => {
+            item.poNumber = item.number
+            item.poLine = item.lineNumber
+            item.planQty =item.orderQty-item.plannedQty
+          })
         })
       } else {
         const setV = {}
@@ -112,7 +118,7 @@
         lineNumber: setV['poLine'],
       }).then(res => {
         if (res.list.length == 1) {
-         // 叶佳兴
+          // 叶佳兴
           setV['itemCode'] = res.list[0].itemCode
         }
       })
@@ -317,7 +323,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
-      download.excel(data, '要货计划主.xls')
+      download.excel(data, '要货计划主.xlsx')
     } catch {
     } finally {
       exportLoading.value = false
@@ -403,7 +409,7 @@
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '要货计划主导入模版.xls'
+    templateTitle: '要货计划主导入模版.xlsx'
   })
 
   // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 13224b5e5..586b1d603 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -279,8 +279,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         value: 2,
         isMainValue: false
       }
-      
-      
       ]
     },
     form: {
@@ -478,9 +476,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       type: 'Select',
-      default: 'TRUE',
       inactiveValue: 'FALSE',
-      activeValue: 'TRUE'
+      disabled: true
     },
     form: {
       component: 'Switch',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 2c86695d9..6e2a6aa2a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -144,7 +144,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(setSearchParams)
-    download.excel(data, '供应商发货记录主.xls')
+    download.excel(data, '供应商发货记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index f2d892e51..91f14629f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -391,57 +391,136 @@ export const SupplierdeliverRecordMainRules = reactive({
  * @returns {Array} 供应商发货记录子表
  */
 export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '从包装号',
+  //   field: 'fromPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到包装号',
+  //   field: 'toPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从批次',
+  //   field: 'fromBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到批次',
+  //   field: 'toBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '标包数量',
+    field: 'stdPackQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '替代批次',
-    field: 'altBatch',
+    label: '标包单位',
+    field: 'stdPackUnit',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从器具号',
-    field: 'fromContainerNumber',
+    label: '供应商计量数量',
+    field: 'supplierQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -507,66 +586,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '标包数量',
-    field: 'stdPackQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -631,14 +651,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+ 
   {
     label: '物品名称',
     field: 'itemName',
@@ -671,17 +684,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
+  
   {
     label: '计量单位',
     field: 'uom',
@@ -803,4 +806,4 @@ export const SupplierdeliverRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index cb4ea2e11..0c850f78d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -109,9 +109,14 @@
        
        if(formField=='ppNumber'){
          // 获取子表数据 getBomDisassemble
-        PurchasePlanDetailApi.getPurchasePlanDetailList({
          number: val[0]['number']}).then(res => {
            if (res) tableData.value = res;
            tableData.value.forEach(item=>{
              item.batch = item.toBatch
-              item.qty = 1
-            })
          }).catch(err => {
            console.log(err)
          })
+       PurchasePlanDetailApi.getPurchasePlanDetailList({
+         number: val[0]['number']}).then(res => {
+           if (res) tableData.value = res;
+           tableData.value.forEach(item=>{
+             item.batch = item.toBatch
+             item.qty = 1
+           })
+         }).catch(err => {
            console.log(err)
          })
        }
         formRef.setValues(setV)
       }
@@ -341,7 +346,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams)
-      download.excel(data, '供应商发货申请主.xls')
+      download.excel(data, '供应商发货申请主.xlsx')
     } catch {
     } finally {
       exportLoading.value = false
@@ -520,7 +525,7 @@
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '供应商发货申请主导入模版.xls'
+    templateTitle: '供应商发货申请主导入模版.xlsx'
   })
 
   // 导入成功之后
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index f33c2960d..aafbe5238 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -7,19 +7,13 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead 
-    :HeadButttondata="HeadButttondata" 
-    @button-base-click="buttonBaseClick" 
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="PurchaseclaimRequestMain.allSchemas" 
-  />
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="PurchaseclaimRequestMain.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList"
-      :loading="tableObject.loading" :pagination="{
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort">
@@ -34,317 +28,324 @@
     </Table>
   </ContentWrap>
 
-   <!-- 表单弹窗：添加/修改 -->
-    <BasicForm 
-      ref="formRef" 
-      @success="getList" 
-      :rules="PurchaseclaimRequestMainRules" 
-      :formAllSchemas="PurchaseclaimRequestMain.allSchemas" 
-      :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
-      :tableFormRules="PurchaseclaimRequestDetailRules"
-      :tableData="tableData"
-      :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
-      :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain"
-      :isBusiness="true"
-      @handleAddTable="handleAddTable"
-      @handleDeleteTable="handleDeleteTable"
-      @searchTableSuccess="searchTableSuccess"
-      @submitForm="submitForm"
-    />
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="formRef" @success="getList" :rules="PurchaseclaimRequestMainRules"
+    :formAllSchemas="PurchaseclaimRequestMain.allSchemas" :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
+    :tableFormRules="PurchaseclaimRequestDetailRules" :tableData="tableData"
+    :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
+    :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true"
+    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" />
 
   <!-- 详情 -->
-  <Detail 
-    ref="detailRef" 
-    :isBasic="false" 
-    :allSchemas="PurchaseclaimRequestMain.allSchemas"
-    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas"
-    :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseclaimRequestMain.allSchemas"
+    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
     :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
     :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
     :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
     :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  <ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
-import { getAccessToken } from '@/utils/auth'
-import download from '@/utils/download'
-import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
-import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
-import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue' 
+  import { getAccessToken } from '@/utils/auth'
+  import download from '@/utils/download'
+  import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
+  import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
+  import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
 
-// 供应商索赔申请
-defineOptions({ name: 'PurchaseclaimRequestMain' })
+  // 供应商索赔申请
+  defineOptions({ name: 'PurchaseclaimRequestMain' })
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
 
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(PurchaseclaimRequestMain.allSchemas.tableColumns)
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(PurchaseclaimRequestMain.allSchemas.tableColumns)
 
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-  nextTick(() => {
-    if (type == 'tableForm') {
-      // 子表查询页赋值
-      row[formField] = val[0][searchField]
-      row['poLine'] = val[0]['poLine']
-      row['batch'] = val[0]['toBatch']
-      row['altBatch'] = val[0]['altBatch']
-      row['itemCode'] = val[0]['itemCode']
-      row['itemName'] = val[0]['itemName']
-      row['itemDesc1'] = val[0]['itemDesc1']
-      row['itemDesc2'] = val[0]['itemDesc2']
-      row['projectCode'] = val[0]['projectCode']
-      row['qty'] = val[0]['qty']
-      row['uom'] = val[0]['uom']
-    } else {
-      // 主表查询页赋值
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    
+    nextTick(() => {
+      if (type == 'tableForm') {
+        
+        // 子表查询页赋值
+        row[formField] = val[0][searchField]
+        row['poLine'] = val[0]['poLine']
+        row['batch'] = val[0]['toBatch']
+        row['altBatch'] = val[0]['altBatch']
+        row['itemCode'] = val[0]['itemCode']
+        row['itemName'] = val[0]['itemName']
+        row['itemDesc1'] = val[0]['itemDesc1']
+        row['itemDesc2'] = val[0]['itemDesc2']
+        row['projectCode'] = val[0]['projectCode']
+        row['qty'] = val[0]['qty']
+        row['uom'] = val[0]['uom']
+      } else {
+        // 主表查询页赋值
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        
+        if(formField=='asnNumber'){
+          // 获取子表数据 getBomDisassemble
+         PurchasePlanDetailApi.getPurchasePlanDetailList({
+           number: val[0]['asnNumber']}).then(res => {
+             if (res) tableData.value = res;
+             tableData.value.forEach(item=>{
+               item.batch = item.toBatch
+               item.qty = 1
+             })
+           }).catch(err => {
+             console.log(err)
+           })
+        }
+        
+        
+        
+        
+        
+        setV['ppNumber'] = val[0]['ppNumber']
+        setV['supplierCode'] = val[0]['supplierCode']
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    console.log(456)
+    nextTick(() => {
+      
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['ppNumber'] = val[0]['ppNumber']
-      setV['supplierCode'] = val[0]['supplierCode']
+      setV['poLine'] = val[0]['poLine']
+      setV['batch'] = val[0]['toBatch']
+      setV['altBatch'] = val[0]['altBatch']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['itemName'] = val[0]['itemName']
+      setV['itemDesc1'] = val[0]['itemDesc1']
+      setV['itemDesc2'] = val[0]['itemDesc2']
+      setV['projectCode'] = val[0]['projectCode']
+      setV['qty'] = val[0]['qty']
+      setV['uom'] = val[0]['uom']
       formRef.setValues(setV)
-    }
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    setV['poLine'] = val[0]['poLine']
-    setV['batch'] = val[0]['toBatch']
-    setV['altBatch'] = val[0]['altBatch']
-    setV['itemCode'] = val[0]['itemCode']
-    setV['itemName'] = val[0]['itemName']
-    setV['itemDesc1'] = val[0]['itemDesc1']
-    setV['itemDesc2'] = val[0]['itemDesc2']
-    setV['projectCode'] = val[0]['projectCode']
-    setV['qty'] = val[0]['qty']
-    setV['uom'] = val[0]['uom']
-    formRef.setValues(setV)
-  })
-}
+    })
+  }
 
-const exportLoading = ref(false) // 导出的加载中
-const { tableObject, tableMethods } = useTable({
-  getListApi: PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage // 分页接口
-})
+  const exportLoading = ref(false) // 导出的加载中
+  const { tableObject, tableMethods } = useTable({
+    getListApi: PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage // 分页接口
+  })
 
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchaseclaim-request-main:create' }), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchaseclaim-request-main:import' }), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchaseclaim-request-main:export' }), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchaseclaim-request-main:create' }), // 新增
+    defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchaseclaim-request-main:import' }), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchaseclaim-request-main:export' }), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
 
-// 头部按钮事件 
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
-    getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮 
-    console.log('其他按钮', item)
+  // 头部按钮事件 
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      getList()
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮 
+      console.log('其他按钮', item)
+    }
   }
-}
 
-// 列表-操作按钮
-const buttondata = (row) => {
-  return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
-    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-    defaultButtons.mainListEditBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑
-    defaultButtons.mainListDeleteBtn({ hide:isShowMainButton(row,['1']),hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
-    defaultButtons.mainListPointBtn(null), // 打印
-  ]
-}
+  // 列表-操作按钮
+  const buttondata = (row) => {
+    return [
+      defaultButtons.mainListCloseBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4', '6']) }), // 关闭
+      defaultButtons.mainListReAddBtn({ hide: isShowMainButton(row, ['4', '5']) }), // 重新添加
+      defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
+      defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回
+      defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑
+      defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
+      defaultButtons.mainListPointBtn(null), // 打印
+    ]
+  }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
   }
-}
 
-// 列表-操作按钮事件 
-const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
-  } else if (val == 'mainSubmit') { // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
-  } else if (val == 'mainTurnDown') { // 驳回
-    console.log('列表-操作按钮事件-驳回')
-  } else if (val == 'mainApprove') { // 审批通过
-    console.log('列表-操作按钮事件-审批通过')
-  } else if (val == 'edit') { // 编辑
-    // const res = await ItempackagingApi.getItempackaging(row.id)
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  } else if (val == 'point') { // 打印
-    handlePoint(row.id)
+  // 列表-操作按钮事件 
+  const buttonTableClick = async (val, row) => {
+    if (val == 'mainClose') { // 关闭
+      console.log('列表-操作按钮事件-关闭')
+    } else if (val == 'mainReAdd') { // 重新添加
+      console.log('列表-操作按钮事件-重新添加')
+    } else if (val == 'mainSubmit') { // 提交审批
+      console.log('列表-操作按钮事件-提交审批')
+    } else if (val == 'mainTurnDown') { // 驳回
+      console.log('列表-操作按钮事件-驳回')
+    } else if (val == 'mainApprove') { // 审批通过
+      console.log('列表-操作按钮事件-审批通过')
+    } else if (val == 'edit') { // 编辑
+      // const res = await ItempackagingApi.getItempackaging(row.id)
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    } else if (val == 'point') { // 打印
+      handlePoint(row.id)
+    }
   }
-}
 
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm =async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  //  if (row?.id) {
-  //   const data= await PurchaseclaimRequestMainApi.getPurchaseclaimRequestMain(row.id)
-  //   tableData.value = data.subList
-  // }
-  formRef.value.open(type, row)
-}
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    //  if (row?.id) {
+    //   const data= await PurchaseclaimRequestMainApi.getPurchaseclaimRequestMain(row.id)
+    //   tableData.value = data.subList
+    // }
+    formRef.value.open(type, row)
+  }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
-}
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue)
+  }
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await PurchaseclaimRequestMainApi.deletePurchaseclaimRequestMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch { }
-}
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await PurchaseclaimRequestMainApi.deletePurchaseclaimRequestMain(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
 
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(setSearchParams)
-    download.excel(data, '采购索赔申请主.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
+  /** 导出按钮操作 */
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(setSearchParams)
+      download.excel(data, '采购索赔申请主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
   }
-}
 
-const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/882550592342003712?token=' + getAccessToken())
-console.log(src)
-// 打印
-const handlePoint = async (id) => {
- window.open(src.value+'&id='+id)
-}
-/**
-  * tableForm方法
-*/
-const tableFormKeys = {}
-PurchaseclaimRequestDetail.allSchemas.tableFormColumns.forEach(item => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
+  const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+  const src = ref(BASE_URL + '/jmreport/view/882550592342003712?token=' + getAccessToken())
+  console.log(src)
+  // 打印
+  const handlePoint = async (id) => {
+    window.open(src.value + '&id=' + id)
+  }
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  PurchaseclaimRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
 
-// 添加明细
-const handleAddTable = () => {
-  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-}
-// 删除明细
-const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
-}
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
 
-// 主子数据 提交
-const submitForm = async (formType, data) => {
-  data.subList = tableData.value // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain(data)
-      message.success(t('common.updateSuccess'))
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
     }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
-
   }
 
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '采购索赔申请信息导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '采购索赔申请信息导入模版.xlsx'
+  })
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
   }
-  getList() // 刷新当前列表
-}
 
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await PurchaseclaimRequestMainApi.importTemplate()
-})
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await PurchaseclaimRequestMainApi.importTemplate()
+  })
 </script>