From 69a693873481a3a69ba97c353af9eeec480ef993 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 28 May 2025 11:32:31 +0800
Subject: [PATCH] dev

---
 src/components/inventory/goods/Edit.vue      | 54 ++++++++++----------
 src/components/inventory/purchase/Upload.vue |  6 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue
index 0924fd7..bdca862 100644
--- a/src/components/inventory/goods/Edit.vue
+++ b/src/components/inventory/goods/Edit.vue
@@ -24,7 +24,7 @@
                       </el-form-item>
                     </el-descriptions-item>
                     <el-descriptions-item label="类型" style="display: flex">
-                      <el-form-item label="" prop="cateId" class="form-item">
+                      <el-form-item label="" class="form-item">
                         <el-select v-model="edit_data.cateId" placeholder="请选择" style="width: 70%">
                           <el-option
                               v-for="item in cate_list"
@@ -689,10 +689,33 @@ const openContrastCodeSearch = () => {
 const contrastCodeConfirm = (data: any) => {
   edit_data.value.hilistCode = data.hilistCode
 }
+// 添加表单校验
+const rules = ref({
+  name: [
+    {required: true, message: '商品名称不能为空', trigger: 'blur'},
+  ],
+  cateId: [
+    {required: true, message: '请选择商品类型', trigger: 'change'}
+  ],
+  approvalCode: [
+    {required: true, message: '批准文号不能为空', trigger: 'blur'}
+  ],
+  purchaseUnitPrice: [
+    {type: 'number', message: '必须为数字', trigger: 'blur'},
+  ],
+  producer: [
+    {required: true, message: '生产企业不能为空', trigger: 'blur'}
+  ],
+  makeUp: [
+    {required: true, message: '不能为空', trigger: 'blur'}
+  ],
+  unitPrice: [
+    {type: 'number', message: '不能为空', trigger: 'blur'},
+  ]
+})
 let save = async (isClose: Boolean) => {
   try {
-    const isOk = await formRef.value.validate()
-    if (!isOk) return
+    await formRef.value.validate()
     if (!edit_data.value.purchaseUnitPrice || edit_data.value.purchaseUnitPrice < 1) {
       ElMessage.error('参考进价不能为空或小于1');
       return
@@ -763,30 +786,7 @@ const returnInit = () => {
   })
 
 }
-// 添加表单校验
-const rules = ref({
-  name: [
-    {required: true, message: '商品名称不能为空', trigger: 'blur'},
-  ],
-  cateId: [
-    {required: true, message: '请选择商品类型', trigger: 'change'}
-  ],
-  approvalCode: [
-    {required: true, message: '批准文号不能为空', trigger: 'blur'}
-  ],
-  purchaseUnitPrice: [
-    {type: 'number', message: '必须为数字', trigger: 'blur'},
-  ],
-  producer: [
-    {required: true, message: '生产企业不能为空', trigger: 'blur'}
-  ],
-  makeUp: [
-    {required: true, message: '不能为空', trigger: 'blur'}
-  ],
-  unitPrice: [
-    {type: 'number', message: '不能为空', trigger: 'blur'},
-  ]
-})
+
 // 修改保存逻辑
 const formRef = ref()
 const hilistInfo = ref<any>({})
diff --git a/src/components/inventory/purchase/Upload.vue b/src/components/inventory/purchase/Upload.vue
index 161da1b..a683467 100644
--- a/src/components/inventory/purchase/Upload.vue
+++ b/src/components/inventory/purchase/Upload.vue
@@ -62,7 +62,7 @@ const toExcel = () => {
   }
   post(API.Inventory.Order.ToExcel, {cateIdList: cateIdList}).then((token: any) => {
     loadConfig().then((res: any) => {
-      window.open(res.base_url + "file/download/" + token)
+      window.open(res.base_url + API.Common.File.Download + '/' + token)
     })
 
   })
@@ -130,14 +130,14 @@ const uploadFile = async () => {
   formData.append('file', selectedFile.value);
 
   try {
-    const response = await axios.post(baseUrl.value + 'file/uploadToTemp', formData, {
+    const response = await axios.post(baseUrl.value + API.Common.File.UploadToTemp, formData, {
       headers: {
         'Content-Type': 'multipart/form-data'
       }
     });
     let excelData = await post(API.Inventory.Order.FromExcel, {token: response.data})
     close()
-    emit('initAddOrderData',excelData)
+    emit('initAddOrderData', excelData)
   } catch (error) {
     console.error('上传失败:', error);
   }