hurx há 23 horas atrás
pai
commit
d23589f39b

+ 6 - 4
src/views/enterprisePurchase/index.vue

@@ -1944,7 +1944,8 @@ const carouselForm = reactive({
   image: '',
   link: '',
   target: '_self',
-  status: 1
+  status: 1,
+  sortOrder: 0
 });
 
 const handleAddCarousel = () => {
@@ -1963,6 +1964,7 @@ const handleEditCarousel = (row) => {
   carouselForm.link = row.link;
   carouselForm.target = row.target;
   carouselForm.status = row.status;
+  carouselForm.sortOrder = row.sortOrder ?? 0;
   dialogVisible.value = true;
 };
 
@@ -1976,7 +1978,7 @@ const submitCarouselForm = async () => {
     link: carouselForm.link,
     target: carouselForm.target,
     status: carouselForm.status,
-    sortOrder: carouselList.value.length
+    sortOrder: dialogType.value === 'add' ? carouselList.value.length : carouselForm.sortOrder
   };
 
   try {
@@ -3352,7 +3354,7 @@ const submitRecommendForm = async () => {
     categoryPath: (recommendForm.categoryValue || []).join(','),
     selectedProductIds: JSON.stringify(selectedProducts),
     status: recommendForm.status,
-    sortOrder: recommendList.value.length
+    sortOrder: recommendEditIndex.value > -1 ? (recommendForm as any).sortOrder ?? recommendList.value.length : recommendList.value.length
   };
 
   try {
@@ -3770,7 +3772,7 @@ const submitQuickEntryForm = async () => {
     tagText: quickEntryForm.tag,
     jumpLink: quickEntryForm.link,
     status: quickEntryForm.status,
-    sortOrder: quickEntryList.value.length
+    sortOrder: quickEntryDialogType.value === 'add' ? quickEntryList.value.length : ((quickEntryForm as any).sortOrder ?? quickEntryList.value.length)
   };
 
   try {

+ 19 - 11
src/views/platform/decoration/floor/index.vue

@@ -146,7 +146,7 @@ import { ref, reactive, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus';
 import { listFloor, getFloor, addFloor, updateFloor, delFloor } from '@/api/system/floor';
-import { listFloorLabel, addFloorLabel, delFloorLabel } from '@/api/system/floorLabel';
+import { listFloorLabel, addFloorLabel, updateFloorLabel, delFloorLabel } from '@/api/system/floorLabel';
 
 // 标签类型
 interface LabelItem {
@@ -334,21 +334,29 @@ const confirmAddLabel = async () => {
 
   if (currentFloorNo.value) {
     try {
-      // 编辑模式下先删除旧标签
       if (isEdit) {
         const oldLabel = form.value.labels[editingLabelIndex.value];
         if (oldLabel?.id) {
-          await delFloorLabel(oldLabel.id);
+          await updateFloorLabel({
+            id: oldLabel.id,
+            floorNo: currentFloorNo.value,
+            labelName: labelForm.value.labelName,
+            labelLink: labelForm.value.labelLink,
+            labelDescribe: labelForm.value.labelDescribe,
+            position: 1,
+            isShow: '1'
+          });
         }
+      } else {
+        await addFloorLabel({
+          floorNo: currentFloorNo.value,
+          labelName: labelForm.value.labelName,
+          labelLink: labelForm.value.labelLink,
+          labelDescribe: labelForm.value.labelDescribe,
+          position: 1,
+          isShow: '1'
+        });
       }
-      await addFloorLabel({
-        floorNo: currentFloorNo.value,
-        labelName: labelForm.value.labelName,
-        labelLink: labelForm.value.labelLink,
-        labelDescribe: labelForm.value.labelDescribe,
-        position: 1,
-        isShow: '1'
-      });
       ElMessage.success(isEdit ? '修改成功' : '添加成功');
       // 重新获取标签列表
       const labelRes = await listFloorLabel({ floorNo: currentFloorNo.value, position: 1, pageSize: 100 });