From de0746e694cffb16f18f3f1a2cfb0835efffc1ba Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Wed, 17 Jun 2020 18:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/organizationdetail.vue       |  12 +-
 .../organization/organizationedit.vue         |  28 ++++-
 src/pages/authority/role/addroles.vue         |   4 +
 .../workbench/fwgl/apply_service_detail.vue   |   4 +
 .../fwgl/approval_service_detail.vue          |  36 +++---
 src/pages/workbench/fwgl/serviceDetail.vue    |  36 +++++-
 src/pages/workbench/fwgl/serviceEdit.vue      | 108 +++++++-----------
 src/pages/workbench/yygl/app_edit.vue         |   5 +
 8 files changed, 142 insertions(+), 91 deletions(-)

diff --git a/src/pages/authority/organization/organizationdetail.vue b/src/pages/authority/organization/organizationdetail.vue
index 02277d8..f3fd852 100644
--- a/src/pages/authority/organization/organizationdetail.vue
+++ b/src/pages/authority/organization/organizationdetail.vue
@@ -121,6 +121,10 @@ export default {
         )
         .then((response) => {
           console.log(response);
+          if(!response.data.success){
+            this.$message.error(response.data.errMsg)
+            return
+          }
           let data = response.data.data;
           this.service_header_arr = {
             name: data.department_name,
@@ -145,7 +149,9 @@ export default {
             fixedurl: "/authority/organization/edit/" + this.$route.params.id,
           };
         })
-        .catch((response) => {});
+        .catch((response) => {
+          this.$message.error('请求失败')
+        });
     },
     get_list() {
       this.$http
@@ -154,6 +160,10 @@ export default {
         )
         .then((response) => {
           // console.log(response);
+          if(!response.data.success){
+            this.$message.error(response.data.errMsg)
+            return
+          }
           let data = response.data.data;
           this.listTotal = response.data.total;
           this.datas = data;
diff --git a/src/pages/authority/organization/organizationedit.vue b/src/pages/authority/organization/organizationedit.vue
index 85430d3..20b8937 100644
--- a/src/pages/authority/organization/organizationedit.vue
+++ b/src/pages/authority/organization/organizationedit.vue
@@ -179,6 +179,10 @@ export default {
         )
         .then((response) => {
           console.log(response);
+          if(!response.data.success){
+              this.$message.error(response.data.errMsg)
+              return
+            }
           let data = response.data.data;
           this.form = {
             name: data.department_name,
@@ -205,10 +209,16 @@ export default {
         .put("/apaas/backmgt/department", temp)
         .then((response) => {
           console.log(response);
+          if(!response.data.success){
+              this.$message.error(response.data.errMsg)
+              return
+            }
           this.$message.success("保存成功");
           this.$router.back(-1);
         })
-        .catch((response) => {});
+        .catch((response) => {
+          this.$message.success("保存失败");
+        });
     },
     backPage() {
       this.$router.back(-1);
@@ -224,17 +234,27 @@ export default {
         .post("/apaas/backmgt/department", temp)
         .then((response) => {
           console.log(response);
+          if(!response.data.success){
+              this.$message.error(response.data.errMsg)
+              return
+            }
           this.$message.success("保存成功");
           this.$router.back(-1);
         })
-        .catch((response) => {});
+        .catch((response) => {
+          this.$message.success("保存失败");
+        });
     },
     getOriginArr() {
       this.$http
-        .get("/static/serviceedit.json")
+        .get("/apaas/backmgt/department/list")
         .then((response) => {
+          if(!response.data.success){
+              this.$message.error(response.data.errMsg)
+              return
+            }
           let data = response.data.data;
-          this.origin_arr = data.origin_arr;
+          this.origin_arr = data
         })
         .catch(function(response) {});
     },
diff --git a/src/pages/authority/role/addroles.vue b/src/pages/authority/role/addroles.vue
index ed87886..2b4e021 100644
--- a/src/pages/authority/role/addroles.vue
+++ b/src/pages/authority/role/addroles.vue
@@ -281,6 +281,10 @@ export default {
         .get(`/apaas/backmgt/role/id/${this.$route.params.id}`)
         .then((response) => {
           console.log(response);
+          if(!response.data.success){
+              this.$message.error(response.data.errMsg)
+              return
+            }
           let data = response.data.data;
           this.form = {
             name: data.role_name,
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index 607b8e5..0a40ae1 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -335,6 +335,10 @@ export default {
             this.$http
             .get(`/apaas/service/v3/service/apply/service?apply_id=${this.$route.params.id}`)
             .then((response) => {
+                if(!response.data.success){
+                    this.$message.error(response.data.errMsg)
+                    return
+                }
                 console.log(response.data.data);
                 let data = response.data.data;
                 this.$set(this.service_header_arr, "name", data.name);
diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue
index 270d129..1e4a469 100644
--- a/src/pages/workbench/fwgl/approval_service_detail.vue
+++ b/src/pages/workbench/fwgl/approval_service_detail.vue
@@ -102,23 +102,23 @@ export default {
           [
                 {
                     title:'一级审批',
-                    result:'审批通过',
+                    result:'',
                     arr:[
                         {
                             title:'审批时间：',
-                            info:'2020-02-28 15:23:45'
+                            info:''
                         },
                         { 
                             title:'审批单位：',
-                            info:'某某某城管局'
+                            info:''
                         },
                         {
                             title:'审批人：',
-                            info:'张先生'
+                            info:''
                         },
                         {
                             title:'审批意见：',
-                            info:'同意'
+                            info:''
                         },
                     ]
                 },       
@@ -212,32 +212,32 @@ export default {
       list_arr: [
         {
           title: "申请单位：",
-          info: "北京比格大数据有限公司"
+          info: ""
         },
         {
           title: "申请人：",
-          info: "李子维"
+          info: ""
         },
         {
           title: "申请人联系电话：",
-          info: "18342803360"
+          info: ""
         },
         {
           title: "场景描述：",
-          info: "申请贵州省行政区划地图服务用于贵州省疫情监控决策指挥系统。"
+          info: ""
         },
         {
           title: "调用业务系统：",
-          info: "决策指挥系统"
+          info: ""
         },
         {
           title: "业务系统域名：",
-          info: "https://apaas.wodcloud.com/"
+          info: ""
         },
         {
           title: "申请文件：",
-          info: "xxxx文件名称.txt",
-          url:'www.baidu.com',
+          info: "",
+          url:'',
           type: "down"
         },
         {
@@ -248,11 +248,11 @@ export default {
         },
         {
           title: "申请时长：",
-          info: "1年"
+          info: ""
         },
         {
           title: "申请规格：",
-          info: "访问次数：20/日，访问量：100/日"
+          info: ""
         }
       ]
     };
@@ -324,6 +324,10 @@ export default {
           .get(`/apaas/service/v3/service/approval/applied?apply_id=${this.$route.params.id}`)
           .then((response) => {
             console.log(response.data.data);
+            if(!response.data.success){
+              this.$message.error(response.data.errMsg)
+              return
+            }
             let data = response.data.data;
             this.$set(this.service_header_arr, "name", data.name);
             this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name);
@@ -366,7 +370,7 @@ export default {
             this.zd_table_arr = data.service_apply_info.res_fields?JSON.parse(data.service_apply_info.res_fields):[]
           })
           .catch(function(response) {
-
+            this.$message.error('请求失败')
           });
       },
   }
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 27579ab..13448c6 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -134,14 +134,14 @@
             </p>
             <el-button
               v-if="now_user == 1 && sizeset_flag"
-              :type="buy_style == 1 ? 'primary' : ''"
-              @click="buy_style = 1"
+              :type="buy_style.indexOf(1) !== -1 ? 'primary' : ''"
+              @click="change_buy(1)"
               >按月购买</el-button
             >
             <el-button
               v-if="now_user == 1 && sizeset_flag"
-              :type="buy_style == 2 ? 'primary' : ''"
-              @click="buy_style = 2"
+              :type="buy_style.indexOf(2) !== -1 ? 'primary' : ''"
+              @click="change_buy(2)"
               >按年购买</el-button
             >
             <div class="savebtn" v-if="now_user == 1 && sizeset_flag">
@@ -181,7 +181,7 @@ export default {
   data() {
     return {
       now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
-      buy_style: 1,
+      buy_style: [1],
       responseParamUrl: "",
       codeExampleUrl: "",
       yx_state: {
@@ -579,6 +579,13 @@ export default {
   },
   mounted() {},
   methods: {
+    change_buy(val){
+      if(this.buy_style.indexOf(val)!==-1){
+        this.buy_style.splice(this.buy_style.indexOf(val),1)
+      }else{
+        this.buy_style.push(val)
+      }
+    },
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
@@ -675,6 +682,11 @@ export default {
             this.service_size_data = data.request_spcs_info;
             this.size_arr_down = data.request_spcs_info;
             this.buy_type = data.request_spcs_info[0].type;
+            if(this.buy_type == 3){
+              this.buy_style = [1,2]
+            }else{
+              this.buy_style = [this.buy_type]
+            }
           } else {
             this.$message({
               message: response.data.errMsg,
@@ -699,6 +711,11 @@ export default {
           console.log(data);
           this.service_size_data = data.data;
           this.buy_type = data.data[0].type;
+          if(this.buy_type == 3){
+              this.buy_style = [1,2]
+            }else{
+              this.buy_style = [this.buy_type]
+            }
         })
         .catch(function(response) {});
     },
@@ -709,7 +726,14 @@ export default {
           if (e.flag) {
             e.id = 0;
           }
-          e.type = this.buy_style;
+          if(this.buy_style.length==0){
+            this.$message.error('请选择申请时长')
+            return
+          }else if(this.buy_style.length==2){
+            e.type = 3
+          }else{
+            e.type = this.buy_style[0]
+          }
           delete e.undefined;
           delete e.flag;
           temp.push(e);
diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue
index b1e0123..5bcb018 100644
--- a/src/pages/workbench/fwgl/serviceEdit.vue
+++ b/src/pages/workbench/fwgl/serviceEdit.vue
@@ -27,9 +27,9 @@
           <el-select v-model="form.area" placeholder="请选择">
             <el-option
               v-for="item in area_arr"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -43,9 +43,9 @@
           <el-select v-model="form.origin" placeholder="请选择">
             <el-option
               v-for="item in origin_arr"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              :key="item.department_id"
+              :label="item.department_name"
+              :value="item.department_id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -90,9 +90,9 @@
           </el-radio-group>
         </el-form-item>
         
-        <el-form-item>
+        <el-form-item class="apass_button">
           <el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button>
-          <el-button class="right">取消</el-button>
+          <el-button class="right" @click="calcle">取消</el-button>
         </el-form-item>
       </el-form>
 
@@ -109,18 +109,18 @@
             <p class="formtitle">是否开启：</p>
             <div class="openbgc" @click="openstart" :style="!open?{backgroundImage:'url('+require('@/assets/imgs/btn_off_hov.png')+')'}:{}"></div>
             <p class="formtitle">最大连接数：</p>
-            <el-input v-model="maxline" placeholder="请输入内容"></el-input>       
+            <el-input :disabled="!open" v-model="maxline" placeholder="请输入内容"></el-input>       
           </div>       
 
           <div v-if="now_safe==1">
             <p class="formtitle">是否开启：</p>
             <div class="openbgc" @click="openstart1" :style="!open1?{backgroundImage:'url('+require('@/assets/imgs/btn_off_hov.png')+')'}:{}"></div>
             <p class="formtitle">最大连接数：</p>
-            <el-input v-model="maxline1" placeholder="请输入内容"></el-input>     
+            <el-input :disabled="!open1" v-model="maxline1" placeholder="请输入内容"></el-input>     
             <div class="limitsd">
               <p class="formtitle">有效时间：</p>
-              <el-input v-model="usetime1" placeholder="请输入内容"></el-input> 
-              <el-select class="timeslect" v-model="timevalue" placeholder="请选择">
+              <el-input  :disabled="!open1" v-model="usetime1" placeholder="请输入内容"></el-input> 
+              <el-select  :disabled="!open1" class="timeslect" v-model="timevalue" placeholder="请选择">
                 <el-option
                   v-for="item in timeoptions"
                   :key="item.value"
@@ -197,52 +197,7 @@ export default {
           },
         ],
         safe_arr:['熔断管理','速率限制','TLS加密','敏感字段追踪'],
-        area_arr:[
-          {
-            label:'经济建设',
-            value:0,
-          },
-          {
-            label:'城市管理',
-            value:1,
-          },
-          {
-            label:'城市建设',
-            value:2,
-          },
-          {
-            label:'道路交通',
-            value:3,
-          },
-          {
-            label:'环境资源',
-            value:4,
-          },
-          {
-            label:'民生服务',
-            value:5,
-          },
-          {
-            label:'空间地理',
-            value:6,
-          },
-          {
-            label:'文化休闲',
-            value:7,
-          },
-          {
-            label:'社会团体',
-            value:8,
-          },
-          {
-            label:'教育机构',
-            value:9,
-          },
-          {
-            label:'其他',
-            value:10,
-          },
-        ],
+        area_arr:[],
         origin_arr:[],
         rules:{
           name:[
@@ -262,7 +217,16 @@ export default {
         }
     };
   },
-  watch: {},
+  watch: {
+    open(){
+      this.maxline = ''
+    },
+    open1(){
+      this.maxline1 = ''
+      this.usetime1 = ''
+      this.timevalue = ''
+    },
+  },
   computed: {
     ...mapGetters([
       'level',
@@ -278,6 +242,7 @@ export default {
     }
     this.getOriginArr()
     this.getServiceInfo()
+    this.get_service_arae()
   },
   mounted() {},
   methods: {
@@ -297,10 +262,21 @@ export default {
     },
     getOriginArr(){
       this.$http
-            .get('/static/serviceedit.json')
+            .get('/apaas/backmgt/department/list')
+            .then(response => {
+                let data = response.data.data
+                this.origin_arr = data
+            })
+            .catch(function(response) {
+                
+            });
+    },
+    get_service_arae(){
+      this.$http
+            .get('/apaas/service/v3/service/manager/servarea')
             .then(response => {
                 let data = response.data.data
-                this.origin_arr = data.origin_arr
+                this.area_arr = data
             })
             .catch(function(response) {
                 
@@ -315,7 +291,7 @@ export default {
           this.imgList = []
           this.$set(this.form,'name',data.name)
           this.$set(this.form,'desc',data.descript)
-          this.$set(this.form,'area',data.sectors-1)
+          this.$set(this.form,'area',data.sectors)
           this.$set(this.form,'origin',data.organization)
           this.$set(this.form,'code',data.encode_method)
           this.$set(this.form,'people',data.register_user_info?data.register_user_info.user_name:data.register_user_info)
@@ -337,7 +313,7 @@ export default {
       var temp = {
         id:parseInt(this.$route.params.id),
         "name": this.form.name,
-        "sectors": this.form.area+1,
+        "sectors": this.form.area,
         "organization": this.form.origin,
         "cover": this.form.fileList,
         "openness": this.form.resource,
@@ -356,6 +332,10 @@ export default {
         .put("/apaas/service/v3/service/manager",temp)
         .then((response) => {
          console.log(response);
+         if(!response.data.success){
+              this.$message.error(response.data.errMsg)
+              return
+          }
          this.$message.success('保存成功')
          this.getServiceInfo()
         })
@@ -364,7 +344,7 @@ export default {
         });
     },
     calcle(){
-      console.log('1111');
+      this.$router.back(-1)
     },
     saveInfo(){
       this.onSubmit('form')
diff --git a/src/pages/workbench/yygl/app_edit.vue b/src/pages/workbench/yygl/app_edit.vue
index 26d743f..91c422f 100644
--- a/src/pages/workbench/yygl/app_edit.vue
+++ b/src/pages/workbench/yygl/app_edit.vue
@@ -244,6 +244,11 @@ export default {
             .post('/apaas/hubApi/market/app',formData)
             .then(response => {
                 console.log(response);
+              if(!response.data.success){
+                this.$message.error(response.data.errMsg)
+              return
+              }
+              this.$message.success('操作成功')
             })
             .catch(function(response) {
                 
-- 
2.26.0