feat(组件): 修改bug

src/api/operate/index.ts

@@ -10,6 +10,7 @@ import {
   ResultDetail,
   addCameraParams,
   updateParams,
+  overallDelete,
 } from './model';
 import { Result } from '/#/axios';
 
@@ -35,6 +36,7 @@ enum Api {
   operateSceneList = '/service/manage/scene/list',
   sceneMove = '/service/manage/scene/move',
   sceneDelete = '/service/manage/scene/delete',
+  qjsceneDelete = '/service/manage/overall/delete',
   sceneDownload = '/service/manage/scene/downScene',
   sceneCopy = '/service/manage/scene/copy',
   checkDownLoad = '/service/manage/scene/checkDownLoad',
@@ -339,6 +341,17 @@ export const sceneDelete = (params: sceneControlParams) =>
       ignoreCancelToken: true,
     },
   });
+  
+export const qjsceneDelete = (params: overallDelete) =>
+defHttp.post<Result>({
+  url: Api.qjsceneDelete,
+  params: params,
+  // data: params,
+  headers: {
+    // @ts-ignore
+    ignoreCancelToken: true,
+  },
+});
 export const checkDownLoad = (params: sceneControlParams) =>
   defHttp.get<checkDownLoadResult>({
     url: Api.checkDownLoad,

src/views/account/product/index.vue

@@ -21,7 +21,7 @@
                 ifShow:getTypeCheckPerm('account-productDelete'),
                 popConfirm: {
                   title: '是否删除？',
-                  confirm: handleDelete.bind(null, record),
+                  confirm: handleQjDelete.bind(null, record),
                   placement: 'topLeft',
                 },
               },
@@ -42,13 +42,13 @@
               },
               {
                 label: '下载',
-                disabled:!(record.status == 1 || record.status == -2),
+                disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:getTypeCheckPerm('account-productDownload'),
                 onClick: handleDownload.bind(null, record),
               },
               {
                 label: '重算',
-                disabled: record.status == 0,
+                disabled: record.status == 0|| (record.status == -2 && record.payStatus != 1),
                 ifShow:getTypeCheckPerm('account-productRerun'),
                 popConfirm: {
                   title: '是否重算？',
@@ -57,7 +57,7 @@
               },
               {
                 label: '复制',
-                disabled:!(record.status == 1 || record.status == -2),
+                disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:getTypeCheckPerm('account-productCopy'),
                 onClick: handleCopy.bind(null, record),
               },
@@ -112,6 +112,7 @@
     operateSceneList,
     sceneMove,
     sceneDelete,
+    qjsceneDelete,
     sceneReset,
     sceneDownload,
     checkDownLoad,
@@ -198,36 +199,29 @@
             sceneCopy({ num: record.num })
               .then(() => {
                 message.success({
-                  content: '删除成功',
+                  content: '复制成功',
                 });
               })
-              .catch(() => {
-                message.success({
-                  content: '删除失败',
-                });
-              });
           },
         });
       }
+      async function handleQjDelete(record: Recordable) {
+        qjsceneDelete({ id: record.id })
+          .then(() => {
+            message.success({
+              content: '删除成功',
+            });
+            ViewReload();
+          })
+      }
       async function handleDelete(record: Recordable) {
-        console.log('handleDelete', record);
-        // createConfirm({
-        //   title: '删除',
-        //   content: '确定要删除场景吗？',
-        //   onOk: async () => {
         sceneDelete({ num: record.num })
           .then(() => {
             message.success({
               content: '删除成功',
             });
-
             reload();
           })
-          .catch(() => {
-            message.success({
-              content: '删除失败',
-            });
-          });
       }
       async function handleMove(record: Recordable) {
         openMoveModal(true, {
@@ -282,7 +276,6 @@
             });
             reload();
           })
-          .catch(() => {});
       }
 
       function getTypeCheckPerm(val){
@@ -293,6 +286,7 @@
         registerTableViewKankan,
         registerTable,
         handleDelete,
+        handleQjDelete,
         handleCopy,
         handleMove,
         handleDownload,

src/views/customer/scene.vue

@@ -29,14 +29,14 @@
               },
               {
                 label: '下载',
-                disabled:!(record.status == 1 || record.status == -2),
+                disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:getTypeCheckPerm('customer-scenes-download') && tableType != 3,
                 //icon: 'carbon:download',
                 onClick: handleDownload.bind(null, record),
               },
               {
                 label: '重算',
-                disabled: record.status == 0,
+                disabled: record.status == 0|| (record.status == -2 && record.payStatus != 1),
                 ifShow:getTypeCheckPerm('customer-scenes-recalculate') && tableType != 3,
                 //icon: 'bx:reset',
                 popConfirm: {
@@ -46,7 +46,7 @@
               },
               {
                 label: '复制',
-                disabled:!(record.status == 1 || record.status == -2),
+                disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:getTypeCheckPerm('customer-scenes-copy'),
                 //icon: 'akar-icons:copy',
                 onClick: handleCopy.bind(null, record),
@@ -336,15 +336,10 @@
               .then((res) => {
                 if(res){
                 message.success({
-                  content: '删除成功',
+                  content: '复制成功',
                 });
                 }
               })
-              .catch(() => {
-                message.success({
-                  content: '删除失败',
-                });
-              });
           },
         });
       }
@@ -401,6 +396,11 @@
                 }
                 timer.value = setInterval(() => {
                   downloadProcess({ num: record.num }).then((res) => {
+                    if(res.status == '1003'){
+                      createMessage.error('下载失败');
+                      afterClose();
+                      return
+                    }
                     if (res.percent >= 100) {
                       canDownload.value = false;
                       afterClose();
@@ -429,7 +429,6 @@
             });
             reload();
           })
-          .catch(() => {});
       }
       function back() {
         router.push('/customer/index');

src/views/productOperation/cameraScene.vue

@@ -30,13 +30,13 @@
               {
                 label: '下载',
                 ifShow:getTypeCheckPerm('scenes-download') && tableType != 3,
-                disabled:!(record.status == 1 || record.status == -2),
+                disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 //icon: 'carbon:download',
                 onClick: handleDownload.bind(null, record),
               },
               {
                 label: '重算',
-                disabled: record.status == 0,
+                disabled: record.status == 0 || (record.status == -2 && record.payStatus != 1),
                 ifShow:getTypeCheckPerm('scenes-recalculate') && tableType != 3,
                 popConfirm: {
                   title: '是否重算？',
@@ -45,7 +45,7 @@
               },
               {
                 label: '复制',
-                disabled:!(record.status == 1 || record.status == -2),
+                disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:getTypeCheckPerm('scenes-copy') && tableType != 3,
                 onClick: handleCopy.bind(null, record),
               },
@@ -333,11 +333,6 @@
                   content: '复制成功',
                 });
               })
-              .catch(() => {
-                message.success({
-                  content: '复制失败',
-                });
-              });
           },
         });
       }
@@ -355,11 +350,6 @@
 
             reload();
           })
-          .catch(() => {
-            message.success({
-              content: '删除失败',
-            });
-          });
         //   },
         // });
       }
@@ -400,6 +390,11 @@
                 }
                 timer.value = setInterval(() => {
                   downloadProcess({ num: record.num }).then((res) => {
+                    if(res.status == '1003'){
+                      createMessage.error('下载失败');
+                      afterClose();
+                      return
+                    }
                     if (res.percent >= 100) {
                       canDownload.value = false;
                       afterClose();
@@ -429,7 +424,6 @@
             });
             reload();
           })
-          .catch(() => {});
       }
       function getTypeCheckPerm(val){
         let myType = tableType.value

src/views/productOperation/sxz.vue

@@ -220,11 +220,6 @@
 
             reload();
           })
-          .catch(() => {
-            message.success({
-              content: '删除失败',
-            });
-          });
       }
       async function handleMove(record: Recordable) {
         sceneMove({ snCode: record.snCode, num: record.num })
@@ -233,11 +228,6 @@
               content: '迁移成功',
             });
           })
-          .catch(() => {
-            message.success({
-              content: '迁移失败',
-            });
-          });
       }
       function handleDownload(record: Recordable) {
         console.log('handleDownload', record);

src/views/productOperation/viewKankan.vue

@@ -190,11 +190,6 @@
 
             reload();
           })
-          .catch(() => {
-            message.success({
-              content: '删除失败',
-            });
-          });
       }
       async function handleMove(record: Recordable) {
         sceneMove({ snCode: record.snCode, num: record.num })
@@ -203,11 +198,6 @@
               content: '迁移成功',
             });
           })
-          .catch(() => {
-            message.success({
-              content: '迁移失败',
-            });
-          });
       }
       function handleDownload(record: Recordable) {
         console.log('handleDownload', record);