add some 服务管理

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: "审批中",

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>

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 "";
+      }
     },
   },
 };

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();

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>

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);

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);

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 = "";