Merge remote-tracking branch 'origin/master'

@@ -22,6 +22,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "vue": "2.6.10",
+    "vue-json-editor": "^1.4.3",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.2",
     "vue-seamless-scroll": "^1.1.23",

@@ -32,6 +32,16 @@ export function getDjlxInfo (id) {
 }
 
 /* 
+获取登记类型信息-申请业务规则
+*/
+export function getQllxByBsmSqyw (id) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getQllxByBsmSqyw?bsmSqyw=' + id,
+    method: 'post'
+  })
+}
+
+/* 
 读取申请登记业务信息-申请业务规则
 */
 export function getSqdjywDetail (bsmSqyw) {

@@ -74,7 +74,7 @@ export default {
       interfaceMethods: ['webapi','webservice'],
       interfaceTypes: [
           {'label': '工作流服务平台','value':'1'},
-          {'label': '管理平台','value':'2'},
+          {'label': '权限平台','value':'2'},
           {'label': '定时器服务','value':'3'},
           {'label': '其他第三方平台','value':'4'},
       ],

 <template>
   <dialogBox title="调用接口" @submitForm="submitForm" saveButton="调用" width="50%" :isFullscreen="false"
     @closeDialog="closeDialog" v-model="value">
-    <el-descriptions class="margin-top" :column="1" :size="16" border>
+    <el-descriptions class="margin-top" :column="1" size="16" border style="height:700px">
       <el-descriptions-item>
         <template slot="label" style="width:200px">接口代码</template>{{ruleForm.interfaceCode}}
       </el-descriptions-item>
@@ -15,25 +15,39 @@
         <template slot="label">接口方式</template>{{ruleForm.interfaceMethod}}
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label">接口类型</template>{{ruleForm.interfaceType}}
+        <template slot="label">接口类型</template>{{getInterfaceType(ruleForm.interfaceType)}}
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label">接口参数</template><el-input v-model="interfaceParams" type="textarea" :rows="4"></el-input>
+        <template slot="label">接口参数</template>
+        <vue-json-editor
+          v-model="interfaceParams"
+          :showBtns="false"
+          :mode="'code'"
+          @json-change="onJsonChange"
+          @json-save="onJsonSave"
+          @has-error="onError"/>
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label">调用状态</template>{{returnMessage.statusCode}}
+        <template slot="label">调用状态</template>
+        <div style="color:green" v-if="returnMessage">{{returnMessage.statusCode}}</div>
+        <div style="color:red" v-else>ERROR</div>
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label">返回结果</template>{{returnMessage.body}}
+        <div slot="label" style="height:150px">返回结果
+        </div>
+        <div v-if="returnMessage">{{returnMessage.body}}</div>
+        <div v-else>无效的接口CODE，请检查接口配置</div>
       </el-descriptions-item>
     </el-descriptions>
   </dialogBox>
 </template>
 
 <script>
+import vueJsonEditor from 'vue-json-editor'
 import {interfaceRetrieve } from "@/api/jkfw.js"
 export default {
   components: {
+    vueJsonEditor 
   },
   computed: {
   },
@@ -46,25 +60,31 @@ export default {
       interfaceMethods: ['webapi','webservice'],
       interfaceTypes: [
           {'label': '工作流服务平台','value':'1'},
-          {'label': '管理平台','value':'2'},
+          {'label': '权限平台','value':'2'},
           {'label': '定时器服务','value':'3'},
           {'label': '其他第三方平台','value':'4'},
       ],
       ruleForm: {},
-      interfaceParams: '{\n\n}' ,
+      interfaceParams: {} ,
       returnMessage: {},
+      hasJsonFlag: true
     }
   },
   methods: {
     //表单提交
     submitForm () {
+      console.log(this.interfaceParams);
+      console.log(this.hasJsonFlag);
+      if(!this.hasJsonFlag){
+        return;
+      }
       var formdata = new FormData();
       formdata.append("interfaceCode", this.ruleForm.interfaceCode);
-      formdata.append("params", this.interfaceParams);
+      formdata.append("interfaceType", this.ruleForm.interfaceType);
+      formdata.append("params",JSON.stringify(this.interfaceParams));
       interfaceRetrieve(formdata).then(res => {
         if(res.code == 200){
           this.returnMessage = res.result
-          
         }
       })
     },
@@ -75,12 +95,40 @@ export default {
     //关闭弹窗
     closeDialog () {
       this.$emit("input", false);
-      this.interfaceParams = '{\n\n}'
+      this.interfaceParams = {} 
       this.returnMessage = {}
+      this.hasJsonFlag = true
+    },
+    //获取接口类型
+    getInterfaceType(code){
+      let name = ''
+      for (let item of this.interfaceTypes) {
+        if (item.value == code) {
+          name = item.label;
+          break;
         }
       }
+      return name;
+    },
+    onJsonChange(value){
+      this.onJsonSave();
+    },
+    onJsonSave (value) {
+      this.interfaceParams = value
+      this.hasJsonFlag = true
+    },
+    onError(value) {
+      this.hasJsonFlag = false
+    },
+  }
 }
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
+ /deep/ .is-bordered-label{
+  width:100px
+}
+/deep/ .el-descriptions-item__content:nth-last-child(){
+  height: 100px;
+}
 </style>

@@ -49,7 +49,7 @@ class data extends filter {
               case '1':
                 return <div>工作流服务平台</div>
               case '2':
-                return <div>管理平台</div>
+                return <div>权限平台</div>
               case '3':
                 return <div>定时器服务</div>
               case '4':

@@ -379,7 +379,11 @@ export default {
       getDjlxInfo(this.sqqlRule.bsmSqyw).then((res) => {
         let { result } = res;
         this.djlxList = result ? result : [];
+        if(this.djlxList.length>0){
           this.getDetail(this.djlxList[0].bsmSqyw);
+        }else{
+           this.getDetail(this.sqqlRule.bsmSqyw);
+        }       
       });
       //}
     },

@@ -15,9 +15,9 @@
               >
                 <el-option
                   v-for="item in qllxs"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.sxzdz"
+                  :label="item.sxzdmc"
+                  :value="item.sxzdz"
                 >
                 </el-option>
               </el-select>
@@ -93,15 +93,13 @@ import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "./mixin/jump";
 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
+import { getQllxByBsmSqyw } from "@/api/system.js";
 export default {
   mixins: [table, jump],
   props: {
     isJump: { type: Boolean, default: false },
     djywbm: { type: String, default: "" },
-    djqxObj: {
-      type: Object,
-      default: {},
-    },
+    djqxObj: { type: Object, default: {} },
     bsmSqyw: { type: String, default: "" },
   },
   data() {
@@ -114,11 +112,24 @@ export default {
         data: [],
       },
       bdcdysz: [],
+      bsmSqyw: "",
     };
   },
   mounted() {
     sendThis(this);
   },
+  created() {
+    if (this.djqxObj.nodetype === "djlx") {
+      this.bsmSqyw = this.djqxObj.bsmSqyw;
+    } else {
+      this.bsmSqyw = this.djqxObj.parentid;
+    }
+    getQllxByBsmSqyw(this.bsmSqyw).then((res) => {
+      if (res.code === 200) {
+         this.qllxs = res.result ? res.result : [];
+      }
+    });
+  },
   methods: {
     //点击行选中或取消复选框
     handleRowClick(row, column, event) {
@@ -129,12 +140,12 @@ export default {
       this.$emit("closeDialog");
     },
     fetchData() {
-      if(this.djqxObj.nodetype==="djlx"){
+       //this.queryForm.bsmSqyw = this.bsmSqyw;
+      if (this.djqxObj.nodetype === "djlx") {
         this.queryForm.bsmSqyw = this.djqxObj.bsmSqyw;
-      }else{
+      } else {
         this.queryForm.bsmSqyw = this.djqxObj.parentid;
       }
-      console.log(this.queryForm);
       selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
@@ -157,13 +168,13 @@ export default {
         if (res.code == 200) {
           this.$message({
             showClose: true,
-            message: '发起申请成功',
-            type: 'success'
-          })
+            message: "发起申请成功",
+            type: "success",
+          });
           if (!this.isJump) {
-            this.jump(res.result, this.djywbm)
+            this.jump(res.result, this.djywbm);
           } else {
-            this.$emit('updateDialog', true)
+            this.$emit("updateDialog", true);
           }
         } else {
           this.$message.error(res.message);

 <template>
-  <dialogBox title="查询权利信息" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
+  <dialogBox :title="title" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
     <component :is="editItem" @closeDialog="closeDialog" v-bind="$attrs" :isJump="isJump" id="slectBdc"
-      @updateDialog="updateDialog" :djywbm="djywbm" :key="key" />
+      @updateDialog="updateDialog" :djywbm="djywbm" :key="key" :djqxObj="djqxObj"/>
   </dialogBox>
 </template>
 <script>
@@ -10,14 +10,15 @@ export default {
   props: {
     isJump: { type: Boolean, default: false },
     value: { type: Boolean, default: true },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: { type: Object, default: {} }
   },
   data () {
     return {
+      title:"",
       key: 0,
       editItem: '',
-      myValue: this.value,
-      djqxObj:this.$attrs
+      myValue: this.value
     }
   },
   watch: {
@@ -36,6 +37,7 @@ export default {
   },
   methods: {
     loadView (view) {
+      this.title ="申请业务："+this.djqxObj.djywmc;
       return r => require.ensure([], () => r(require(`./components/${view}.vue`)))
     },
     closeDialog () {

@@ -208,11 +208,12 @@ export default {
         item.cselect = false
       })
       this.btnDisabled = true
-      item.cselect = true
+      item.cselect = true;
+       this.djqxObj = item;
       if (item.sffqlc == '1') {
         this.btnDisabled = false
         this.bsmSqyw = item.bsmSqyw
-        this.djywbm = item.djywbm
+        this.djywbm = item.djywbm;
       } else {
         this.getNextNode(item.bsmSqyw, false)
       }