From 7076612e28facc2d56abf57d87a9b3798f6a1f1c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 8 Nov 2024 10:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=94=BF=E7=AD=96=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/rule/index.ts                     |  5 +++++
 .../strategy/upShelfStrategy/AddForm.vue      |  8 +++++--
 .../strategy/upShelfStrategy/index.vue        | 22 +++++++++++++------
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/api/wms/rule/index.ts b/src/api/wms/rule/index.ts
index a6fe74970..2fd735970 100644
--- a/src/api/wms/rule/index.ts
+++ b/src/api/wms/rule/index.ts
@@ -56,3 +56,8 @@ export const exportRule = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/rule/get-import-template' })
 }
+// 查询规则详情
+export const getMaxPriority = async (code: number) => {
+  return await request.get({ url: `/wms/rule/getMaxPriority?code=` + code })
+}
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index a648a54d9..82eabc696 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -660,7 +660,6 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 const formStrategyCode = ref('')
 
-
 // 仓库类型
 const warehouseType = ref('WarehouseCode')
 
@@ -1112,7 +1111,7 @@ const changeWarehouse = (e) => {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, strategyCode: string, id?: number) => {
+const open = async (type: string, strategyCode: string, id?: number, priority?: Number) => {
 
   formStrategyCode.value = strategyCode
   dialogVisible.value = true
@@ -1120,6 +1119,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
   formType.value = type
   warehouseType.value = 'WarehouseCode'
   // getFormWarehouseList()
+  
 
   resetForm()
   // 修改时，设置数据
@@ -1196,6 +1196,9 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formLoading.value = false
     }
   } else {
+    if(priority){
+      formData.value.priority = priority
+    }
     Butttondata.value = [
       defaultButtons.formSaveBtn(null), // 保存
       defaultButtons.formCloseBtn(null) // 关闭
@@ -1389,6 +1392,7 @@ const getOverflowLocationCodes = async ()=>{
 
 getOverflowLocationCodes()
 
+
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index 023b5a04c..97ac40a2b 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -110,8 +110,8 @@ const resetQuery = () => {
 
 // 显示弹窗
 const formRef = ref()
-const openForm = (type: string, strategyCode: string, id: number) => {
-  formRef.value.open(type, strategyCode, id)
+const openForm = (type: string, strategyCode: string, id?: number, priority?:number) => {
+  formRef.value.open(type, strategyCode, id, priority)
 }
 
 /** 删除按钮操作 */
@@ -130,9 +130,11 @@ const route = useRoute() // 路由信息
 
 
 // 头部按钮事件 
-const buttonBaseClick = (val, item) => {
+const buttonBaseClick = async (val, item) => {
   if (val == 'add') { // 新增
-    openForm('create', queryParams.strategyCode)
+    await getDefaultPriority()
+
+    openForm('create', queryParams.strategyCode,undefined,defaultPriority.value)
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
@@ -207,13 +209,19 @@ const butttondata = (row) => {
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {
   if (val == 'edit') { // 编辑
-    openForm('update', queryParams.strategyCode, row.id)
+    openForm('update', queryParams.strategyCode, row.id,undefined)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
-
-
+const defaultPriority = ref(0)//默认优先级
+const getDefaultPriority = async ()=>{
+  const res = await RuleApi.getMaxPriority(queryParams.strategyCode)
+  console.log('getMaxPriority',res)
+  if(res){
+    defaultPriority.value = Number(res)
+  }
+}
 /** 初始化 **/
 onMounted( async() => {
   getList()