From bfac3eed63ad42e61e93daac630ac2647d1b0287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Mon, 28 Dec 2020 14:10:03 +0800
Subject: [PATCH] =?UTF-8?q?add=20some=20=E6=9C=8D=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/shop_img_hqlc_chanpin.png     | Bin 0 -> 11633 bytes
 src/components/process-card.vue               |   2 +-
 .../service-list/commodity-cell-new.vue       |  31 +++++++++-------
 .../service-tabs/service-tab-detail.vue       |  32 ++++++++++-------
 src/pages/service_shop/cpDetail.vue           |  34 +++++++++---------
 .../workbench/fwgl/apply_service_detail.vue   |  28 +++++++++++++++
 .../fwgl/approval_service_detail.vue          |   5 +++
 src/pages/workbench/fwgl/serviceDetail.vue    |  29 +++++++--------
 src/pages/workbench/fwzc_fwcs.vue             |  16 ++++++---
 9 files changed, 116 insertions(+), 61 deletions(-)
 create mode 100644 src/assets/imgs/shop_img_hqlc_chanpin.png

diff --git a/src/assets/imgs/shop_img_hqlc_chanpin.png b/src/assets/imgs/shop_img_hqlc_chanpin.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f0aeb9ef00790e5cf78bdb4483171f8ab02ab72
GIT binary patch
literal 11633
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

literal 0
HcmV?d00001

diff --git a/src/components/process-card.vue b/src/components/process-card.vue
index 1bcac67..451c959 100644
--- a/src/components/process-card.vue
+++ b/src/components/process-card.vue
@@ -34,7 +34,7 @@ export default {
 
     },
     created() {
-        if(this.data.length<=1&&this.data[this.data.length-1].result=='审批通过'){
+        if(this.data.length<=1&&this.data[this.data.length-1]&&this.data[this.data.length-1].result=='审批通过'){
             this.data.push({
                 title: "二级审批",
                 result: "审批中",
diff --git a/src/components/service-list/commodity-cell-new.vue b/src/components/service-list/commodity-cell-new.vue
index 8933102..325f017 100644
--- a/src/components/service-list/commodity-cell-new.vue
+++ b/src/components/service-list/commodity-cell-new.vue
@@ -57,6 +57,7 @@
         <el-col
           :span="14"
           class="com_other1"
+          v-if="cellData.data_service_type1 != 36"
           :title="`服务类型：${cellData.data_service_type1_name}  ${cellData.data_service_type2_name}  ${cellData.data_service_type3_name}`"
         >
           <span class="name_title">服务类型：</span>
@@ -68,9 +69,9 @@
         <el-col
           :span="10"
           class="com_other1"
-          :title="`服务领域：${cellData.sectors_name}`"
+          :title="`${cellData.data_service_type1 != 36 ? '服务领域：' : '产品领域：'}${cellData.sectors_name}`"
         >
-          <span class="name_title">服务领域：</span>
+          <span class="name_title">{{ cellData.data_service_type1 != 36 ? '服务领域：' : '产品领域：' }}</span>
           {{ cellData.sectors_name }}
         </el-col>
         <el-col
@@ -87,9 +88,8 @@
           :span="24"
           v-if="urlFilter == '36'"
           class="com_other1"
-          :title="`产品标签：${getTags}`"
+          :title="`${getTags(cellData.tags)}`"
         >
-          <span class="name_title">产品标签：</span>
           <span
             class="card_tag"
             v-for="(item, tag_index) in cellData.tags"
@@ -114,13 +114,7 @@ export default {
   },
   data: () => ({ helper: helper }),
   computed: {
-    getTags() {
-      let str = "";
-      this.cellData.tags.forEach((item) => {
-        str += item + "  ";
-      });
-      return str;
-    },
+    
   },
   watch: {},
   methods: {
@@ -129,6 +123,14 @@ export default {
         this.$router.push(this.url + "/" + parame);
       }
     },
+    getTags(arr) {
+      if (arr && arr.length != 0) {
+        let str = arr.join(" / ");
+        return str;
+      } else {
+        return "";
+      }
+    },
   },
   mounted() {},
 };
@@ -278,8 +280,13 @@ export default {
   overflow: hidden;
 }
 .card_tag {
+  display: inline-block;
   color: #515fe7;
-  margin-right: 8px;
+  margin-right: 16px;
+  border: solid 1px #b4c0f5;
+  background-color: #eeeffd;
+	border-radius: 4px;
+  padding: 2px 6px;
 }
 </style>
 <style>
diff --git a/src/components/service-tabs/service-tab-detail.vue b/src/components/service-tabs/service-tab-detail.vue
index 10efbc9..5b726b0 100644
--- a/src/components/service-tabs/service-tab-detail.vue
+++ b/src/components/service-tabs/service-tab-detail.vue
@@ -19,6 +19,12 @@
           :src="require('@/assets/imgs/shop_img_hqlc_yingyong.png')"
         />
       </div>
+      <div class="step_div" v-else-if="item.type == 'step_cp'">
+        <img
+          class="step_img"
+          :src="require('@/assets/imgs/shop_img_hqlc_chanpin.png')"
+        />
+      </div>
       <p
         v-else-if="item.type == 'text'"
         class="detail-text"
@@ -70,18 +76,17 @@
           <tr>
             <td>产品领域：{{ item.value.cp_area }}</td>
             <td>
-              发布时间：{{ helper.dateStringTransform(item.value.fb_time) }}
+              更新时间：{{ helper.dateStringTransform(item.value.fb_time) }}
             </td>
           </tr>
           <tr>
-            <td>所属业务系统：<a :href="item.value.org_url" target="blank">{{ item.value.org }}</a></td>
+            <td>
+              所属业务系统：<a :href="item.value.org_url" target="blank">{{
+                item.value.org
+              }}</a>
+            </td>
             <td class="tags" :title="`产品标签：${getTags(item.value.tags)}`">
-              产品标签：<span
-                class="tag_sp"
-                v-for="(item, tag_index) in item.value.tags"
-                :key="`tag_${tag_index}`"
-                >{{ item }}</span
-              >
+              产品标签：{{ getTags(item.value.tags) }}
             </td>
           </tr>
         </table>
@@ -154,11 +159,12 @@ export default {
   computed: {},
   methods: {
     getTags(arr) {
-      let str = "";
-      arr.forEach((item) => {
-        str += item + "  ";
-      });
-      return str;
+      if (arr.length != 0) {
+        let str = arr.join(" / ");
+        return str;
+      } else {
+        return "";
+      }
     },
   },
 };
diff --git a/src/pages/service_shop/cpDetail.vue b/src/pages/service_shop/cpDetail.vue
index 0585df7..b952480 100644
--- a/src/pages/service_shop/cpDetail.vue
+++ b/src/pages/service_shop/cpDetail.vue
@@ -3,8 +3,8 @@
     <div class="apass_breadcrumb">
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
-        <el-breadcrumb-item to="/shop/data_service_list/5">
-          数据服务
+        <el-breadcrumb-item to="/shop/products_list/36">
+          产品资源
         </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>
@@ -85,7 +85,7 @@ export default {
           this.detailData = [
             {
               name: "获取流程",
-              type: "step",
+              type: "step_cp",
               value: ["产品申请", "信息填写", "审核确认", "获取资源"],
             },
             {
@@ -93,7 +93,7 @@ export default {
               type: "cp-list",
               value: {
                 cp_area: datas.sectors_name,
-                fb_time: datas.create_time,
+                fb_time: datas.update_date,
                 org: datas.system_name,
                 org_url: datas.domain_name,
                 tags: datas.tags,
@@ -153,19 +153,19 @@ export default {
       return tabledata;
     },
     getMd(url) {
-      this.$http
-        .get(url, {
-          params: {
-            serviceId: this.id,
-          },
-        })
-        .then(response => {
-          this.detailData[2].value = response.data;
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    }
+      if (url == "") {
+        this.detailData[2].value = "无";
+      } else {
+        this.$http
+          .get(url)
+          .then((response) => {
+            this.detailData[2].value = response.data;
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
+      }
+    },
   },
   mounted() {
     this.init();
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index 4b1df11..f9aa8d0 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -134,6 +134,15 @@
               :data="use_approval_arr"
               slot="approval"
             ></process-card>
+            <mavon-editor
+              slot="cp_md"
+              v-model="cp_arr[6].item"
+              :boxShadow="false"
+              :toolbarsFlag="false"
+              :subfield="false"
+              defaultOpen="preview"
+              :editable="false"
+            />
           </info-list>
         </div>
       </div>
@@ -613,6 +622,7 @@ export default {
           title: "产品详情：",
           type: "solt",
           solt_name: "cp_md",
+          item: "",
         },
       ],
       servicead_arr: [
@@ -957,8 +967,11 @@ export default {
             this.service_arr[0] = "产品基本信息";
             this.service_arr[1] = "";
             this.service_arr[2] = "申请审批信息";
+            console.log("123");
             this.getMd(data.doc_file);
+            console.log("123");
           }
+          console.log("123");
           this.$set(
             this.servicead_arr[0],
             "info",
@@ -1055,6 +1068,7 @@ export default {
           if (data.data_service_type1_name != "数据服务") {
             this.servicead_arr = this.servicead_arr.slice(0, 4);
           }
+          console.log(data.service_apply_info);
           if (data.service_apply_info.approval_process) {
             data.service_apply_info.approval_process.forEach((e) => {
               this.use_approval_arr.push({
@@ -1100,6 +1114,20 @@ export default {
         })
         .catch(function (response) {});
     },
+    getMd(url) {
+      if (url == "") {
+        this.cp_arr[6].item = "无";
+      } else {
+        this.$http
+          .get(url)
+          .then((response) => {
+            this.cp_arr[6].item = response.data;
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
+      }
+    },
   },
 };
 </script>
diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue
index 7743db0..169a962 100644
--- a/src/pages/workbench/fwgl/approval_service_detail.vue
+++ b/src/pages/workbench/fwgl/approval_service_detail.vue
@@ -484,6 +484,11 @@ export default {
             "info",
             data.service_apply_info.total_money + "金币"
           );
+          // console.log(data)
+          if (data.data_service_type1 == 36) {
+            this.list_arr.splice(6, 2);
+            this.service_arr = ["产品申请信息", "产品审批"]
+          }
           this.id = data.service_apply_info.id;
           if (data.service_apply_info.approval_status !== 0) {
             this.servicead_arr[this.now_user].splice(1, 1);
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 39d6b36..b2c5b02 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -1232,9 +1232,10 @@ export default {
           title: "产品详情：",
           type: "solt",
           solt_name: "cp_md",
+          item: "",
         },
       ],
-      data_service_type1: ""
+      data_service_type1: "",
     };
   },
   computed: {
@@ -1596,7 +1597,7 @@ export default {
               this.service_arr[2][2] = "";
               this.service_arr[2][3] = "产品规格";
               this.service_arr[2][4] = "产品交易记录";
-              this.getMd(data.doc_file)
+              this.getMd(data.doc_file);
             }
             // console.log(this.service_arr)
             // 接口详情信息
@@ -1667,18 +1668,18 @@ export default {
         .catch(function (response) {});
     },
     getMd(url) {
-      this.$http
-        .get(url, {
-          params: {
-            serviceId: this.id,
-          },
-        })
-        .then(response => {
-          this.cp_arr[6].item = response.data;
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
+      if (url == "") {
+        this.cp_arr[6].item = "无";
+      } else {
+        this.$http
+          .get(url)
+          .then((response) => {
+            this.cp_arr[6].item = response.data;
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
+      }
     },
     now_size_data(val) {
       console.log(val);
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 8d6f762..83fe83a 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -1171,9 +1171,7 @@ export default {
         area: [
           { required: true, message: "请选择产品领域", trigger: "change" },
         ],
-        bq: [
-          { required: true, message: "请添加产品标签", trigger: "blur" },
-        ],
+        bq: [{ required: true, message: "请添加产品标签", trigger: "blur" }],
         bb: [
           { required: true, message: "请输入版本号", trigger: "change" },
           {
@@ -2333,7 +2331,17 @@ export default {
     },
     watchKeyboardWhite() {
       let self = this;
-      if (self.newIpWhite != "") {
+      if (self.newIpWhite == "") {
+        this.$message({
+          message: "无法添加空标签",
+          type: "error",
+        });
+      } else if (self.newIpWhite.length > 7) {
+        this.$message({
+          message: "添加的标签请小于七个字",
+          type: "error",
+        });
+      } else {
         self.form_cp.bq.push(self.newIpWhite);
         self.whiteAddShow = false;
         self.newIpWhite = "";
-- 
2.26.0