From 5f8d0059352a10f07ae836e7af305214805131cd Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 14:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=A7=88=20?=
 =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E4=BF=9D=E5=AD=98=20=20=E5=B8=B8?=
 =?UTF-8?q?=E8=A7=81=E9=97=AE=E9=A2=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/Algorithm.vue    | 21 +++++++++++++++++--
 .../views/capacityOnTheShelf/Application.vue  | 20 ++++++++++++++++--
 .../capacityOnTheShelf/BusinessComponent.vue  | 19 +++++++++++++++--
 .../DevelopmentComponents.vue                 | 19 +++++++++++++++--
 .../capacityOnTheShelf/LayerServices.vue      | 20 ++++++++++++++++--
 .../components/PutOnTheShelf.vue              |  6 +++++-
 6 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index df8d2d41..b0b418cd 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 20:04:47
+ * @LastEditTime: 2022-07-26 14:35:45
  * @Description: 算法上架
 -->
 <template>
@@ -74,6 +74,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -161,7 +162,23 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '计费方式'
+          ).length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果计费标准信息或常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index a2de4f76..eba834bd 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 17:30:32
+ * @LastEditTime: 2022-07-26 14:35:22
  * @Description: 应用上架
 -->
 <template>
@@ -59,6 +59,7 @@
         :configure="glzj"
         @next="next()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -127,7 +128,22 @@
       >
         上一步
       </button>
-      <button v-show="showView === '部署与应用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与应用' &&
+          bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '常见问题'
+          ).length > 0
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与应用'" @click="preview()">
         预览
       </button>
       <button v-show="showView === '基本信息'" @click="next()">下一步</button>
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 0b3df2fe..4ac1e145 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:39:35
+ * @LastEditTime: 2022-07-26 14:36:31
  * @Description: 业务组件
 -->
 <template>
@@ -73,6 +73,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -132,7 +133,21 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter((val) => val.note1 !== '').length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index 5bae9427..1572dc75 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:17
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:39:42
+ * @LastEditTime: 2022-07-26 14:37:17
  * @Description: 开发组件
 -->
 <template>
@@ -72,6 +72,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -131,7 +132,21 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter((val) => val.note1 !== '').length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index f364398e..0038a0e0 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:17
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:39:47
+ * @LastEditTime: 2022-07-26 14:37:38
  * @Description: 图层服务
 -->
 <template>
@@ -69,6 +69,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -103,7 +104,22 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '计费方式'
+          ).length > 0
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index bb8c58a2..d72a1111 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 18:51:52
+ * @LastEditTime: 2022-07-26 14:33:42
  * @Description: 上架
 -->
 <template>
@@ -797,6 +797,8 @@
           emit('next')
         } else if (type == '提交') {
           emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
         }
       }
     } else {
@@ -813,6 +815,8 @@
           emit('next')
         } else if (type == '提交') {
           emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
         }
       }
     }