Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -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",

@@ -230,3 +230,16 @@ export function selectJsydQlxx (data) {
         data
     })
 }
+
+/**
+ * 业务办理-选择权利信息-根据条件进行列表查询
+ * @param data
+ * @returns {*}
+ */
+export function selectFwsyq (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectFwsyq',
+    method: 'post',
+    data
+  })
+}

@@ -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':

@@ -186,7 +186,7 @@
 </template>
 <script>
 import InformationTable from "@/views/workflow/components/InformationTable";
-import {Init, saveGZBatchData} from "@/api/fwsyqFlow.js";
+import {Init, saveBatchData} from "@/api/fwsyqFlow.js";
 import { mapGetters } from "vuex";
 export default {
   async created () {
@@ -271,7 +271,7 @@ export default {
     },
 
     onSubmit () {
-      saveGZBatchData(this.ruleForm).then((res) => {
+      saveBatchData(this.ruleForm).then((res) => {
         if (res.code === 200) {
           this.$message({
             showClose: true,

+<template>
+  <!-- 主体权利信息查询 -->
+  <div class="from-clues">
+    <!-- 表单部分 -->
+    <div class="from-clues-header">
+      <el-form :model="queryForm" ref="queryForm" label-width="100px">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="权利类型">
+              <el-select
+                v-model="queryForm.qllx"
+                filterable
+                clearable
+                placeholder="请选择权利类型"
+              >
+                <el-option
+                  v-for="item in qllxs"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="不动产单元号">
+              <el-input
+                placeholder="请输入不动产单元号"
+                v-model="queryForm.bdcdyh"
+                clearable
+                class="width200px"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="不动产权证号">
+              <el-input
+                placeholder="请输入不动产权证号"
+                v-model="queryForm.bdcqzh"
+                clearable
+                class="width200px"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2" class="btnColRight">
+            <el-form-item>
+              <el-button type="primary" @click="fetchData()">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="from-clues-content">
+      <lb-table
+        ref="table"
+        @row-click="handleRowClick"
+        :page-size="pageData.pageSize"
+        :heightNum="400"
+        :current-page.sync="pageData.currentPage"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        @selection-change="handleSelectionChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
+      </lb-table>
+    </div>
+    <div class="submit_button">
+      <el-button @click="closeDialog">取消</el-button>
+      <el-button type="primary" plain @click="submitForm">发起申请</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { datas, sendThis } from "../javascript/selectFwsyq.js";
+import { defaultParameters } from "../javascript/publicDefaultPar.js";
+import table from "@/utils/mixin/table";
+import jump from "./mixin/jump";
+import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
+export default {
+  mixins: [table, jump],
+  props: {
+    isJump: { type: Boolean, default: false },
+    djywbm: { type: String, default: "" },
+    djqxObj: {
+      type: Object,
+      default: {},
+    },
+    bsmSqyw: { type: String, default: "" },
+  },
+  data() {
+    return {
+      queryForm: defaultParameters.defaultParameters(),
+      qllxs: [],
+      tableData: {
+        total: 0,
+        columns: datas.columns(),
+        data: [],
+      },
+      bdcdysz: [],
+    };
+  },
+  mounted() {
+    sendThis(this);
+  },
+  methods: {
+    //点击行选中或取消复选框
+    handleRowClick(row, column, event) {
+      //通过ref绑定后这里使用$refs.table来操作bom元素
+      this.$refs.table.toggleRowSelection(row);
+    },
+    closeDialog() {
+      this.$emit("closeDialog");
+    },
+    fetchData() {
+      if(this.djqxObj.nodetype==="djlx"){
+        this.queryForm.bsmSqyw = this.djqxObj.bsmSqyw;
+      }else{
+        this.queryForm.bsmSqyw = this.djqxObj.parentid;
+      }
+      console.log(this.queryForm);
+      selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
+        if (res.code === 200) {
+          let { total, records } = res.result;
+          this.tableData.total = total;
+          this.tableData.data = records;
+        }
+      });
+    },
+    submitForm() {
+      if (this.bdcdysz.length == 0) {
+        this.$message.error("请至少选择一条数据");
+        return;
+      }
+      startBusinessFlow({
+        bsmSqyw: this.bsmSqyw,
+        bdcdysz: this.bdcdysz,
+        djqxbm: this.djqxObj?.djqxbm,
+        djqxmc: this.djqxObj?.djqxmc,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            showClose: true,
+            message: '发起申请成功',
+            type: 'success'
+          })
+          if (!this.isJump) {
+            this.jump(res.result, this.djywbm)
+          } else {
+            this.$emit('updateDialog', true)
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    handleSelectionChange(val) {
+      val.forEach((item, index) => {
+        item.bsmSsql = item.bsmQlxx;
+        item.ybdcqzsh = item.bdcqzh;
+      });
+      this.bdcdysz = val;
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
+@import "~@/styles/public.scss";
+</style>

+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        type: 'selection',
+        label: '全选'
+      },
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "status",
+        label: "状态",
+      },
+      {
+        prop: "qllxmc",
+        label: "权利类型",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+      },
+      {
+        prop: "bdcqzh",
+        label: "不动产权证号",
+      },
+      {
+        prop: "fwxz",
+        label: "房屋性质",
+      },
+      {
+        prop: "fwjgmc",
+        label: "房屋结构",
+      },
+      {
+        prop: "qlrmc",
+        label: "权利人",
+      },
+      {
+        prop: "zjh",
+        label: "证件号",
+      },
+      {
+        prop: "mj",
+        label: "面积",
+      },
+      {
+        prop: "showTdyt",
+        label: "用途",
+      },
+      {
+        prop: "zdmj",
+        label: "宗地面积",
+      },
+      {
+        prop: "zl",
+        label: "坐落",
+      }
+    ]
+  }
+
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

@@ -22,6 +22,11 @@ export function queueDjywmc(djywbm) {
         case "A08100":
             vm = "fwsyq";
             break;
+        case "A04200":
+        case "A04300":
+        case "A04400":
+            vm="selectFwsyq";
+            break;
         case "A23100"://农用地使用权(首次登记)
         case "A09100"://土地经营权（首次登记）
             vm = "nydsyq100";