用户、角色、部门组件完善、办理查看任务优化

xiangpei

2025-01-09 849934d0e2a3d05c4814edad52b060d93d77725f

用户、角色、部门组件完善、办理查看任务优化

 src/components/Process/panel/TaskConfPanel.vue

@@ -242,12 +242,14 @@
    },
    editDept() {
      this.$nextTick(() => {
        this.deptKey += '1'
        this.$refs.dept.setCheckList(this.delegationDeptSelect)
      })
      this.deptShow = true
    },
    editSingleUser() {
      if (this.delegationUserSelect && this.delegationUserSelect.length > 0) {
        this.singleUserKey += '1'
        this.$nextTick(() => {
          this.$refs.singleUser.setChecked(this.delegationUserSelect[0])
        })
@@ -256,6 +258,7 @@
    },
    editRole() {
      if (this.delegationRoleSelect && this.delegationRoleSelect.length > 0) {
        this.roleKey += '1'
        this.$nextTick(() => {
          this.$refs.role.setChecked(this.delegationRoleSelect)
        })

 src/components/flow/Dept/MyDept.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <el-dialog
      :title="`选择候选部门`"
      :title="title"
      :visible.sync="show"
      width="65%"
      :destroy-on-close="true"
@@ -35,6 +35,11 @@
      required: true,
      type: Boolean
    },
    title: {
      type: String,
      required: false,
      default: '候选部门'
    },
    checkeds: {
      required: true
    }

 src/components/flow/Role/MyRole.vue

@@ -1,11 +1,12 @@
<template>
  <div>
    <el-dialog
      :title="`选择候选角色`"
      :title="title"
      :visible.sync="show"
      width="65%"
      :destroy-on-close="true"
      :close-on-click-modal="false"
      :modal-append-to-body="false"
      :modal="false"
      :before-close="close">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
@@ -14,6 +15,7 @@
            v-model="queryParams.roleName"
            placeholder="请输入角色名称"
            clearable
            @clear="handleQuery"
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
@@ -24,8 +26,8 @@
        </el-form-item>
      </el-form>

      <el-table ref="dataTable"  v-loading="loading"  :data="roleList" @selection-change="handleMultipleRoleSelect">
        <el-table-column type="selection" width="50" align="center" />
      <el-table ref="dataTable" :row-key="getRowKey" v-loading="loading"  :data="roleList" @selection-change="handleMultipleRoleSelect">
        <el-table-column type="selection" width="50" align="center"  :reserve-selection="true"/>
        <el-table-column label="角色编号" prop="roleId"/>
        <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"/>
        <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true"/>
@@ -68,6 +70,11 @@
      required: true,
      default: true
    },
    title: {
      type: String,
      required: false,
      default: '候选角色'
    },
    // 回显数据传值
    selectValues: {
      type: Array,
@@ -79,22 +86,12 @@
    return {
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 角色表格数据
      roleList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
@@ -103,9 +100,6 @@
        roleKey: undefined,
        status: undefined
      },
      // 表单参数
      form: {},
      radioSelected: 0, // 单选框传值
      selectRoleList: [] // 回显数据传值
    };
  },
@@ -118,13 +112,15 @@
  methods: {
    // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
    getRowKey (row) {
      console.log(row.roleId)
      return row.roleId
    },
    setChecked(val) {
      console.log("接收到的数据", val)

      this.selectRoleList = val
      console.log("接收到的数据", this.selectRoleList)
      this.$nextTick(() => {
        val.forEach(check => {
        this.selectRoleList.forEach(check => {
          this.$refs.dataTable.toggleRowSelection(check, true)
        })
      });
@@ -147,7 +143,7 @@
    },
    // 多选框选中数据
    handleMultipleRoleSelect(rows) {
      this.selectRoleList = rows
      this.selectRoleList = [...new Set(rows)]
    },
    /** 搜索按钮操作 */
    handleQuery() {

 src/components/flow/User/MultUser.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <el-dialog
      :title="`选择转办接收人员`"
      :title="title"
      :visible.sync="show"
      width="65%"
      :destroy-on-close="true"
@@ -39,11 +39,12 @@
        <!--用户数据-->
        <el-col :span="18" :xs="24">
          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
            <el-form-item label="用户名称" prop="userName">
            <el-form-item label="用户名称" prop="nickName">
              <el-input
                v-model="queryParams.userName"
                placeholder="请输入用户名称"
                v-model="queryParams.nickName"
                placeholder="请输入用户姓名"
                clearable
                @clear="handleQuery"
                style="width: 150px"
                @keyup.enter.native="handleQuery"
              />
@@ -95,6 +96,11 @@
      required: true,
      type: Boolean
    },
    title: {
      type: String,
      required: false,
      default: '候选人员'
    },
    // 回显数据传值
    selectUserList: {
      type: Array,
@@ -108,24 +114,16 @@
      innerSelected: [], // 选中
      // 遮罩层
      loading: false,
      // 选中数组
      ids: [],
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 用户表格数据
      userList: [],
      // 弹出层标题
      title: "",
      // 部门树选项
      deptOptions: undefined,
      // 是否显示弹出层
      open: false,
      // 部门名称
      deptName: undefined,
      // 表单参数
      form: {},
      defaultProps: {
        children: "children",
        label: "label"
@@ -134,7 +132,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 5,
        userName: undefined,
        nickName: undefined,
        phonenumber: undefined,
        status: undefined,
        deptId: undefined
@@ -162,7 +160,8 @@
    this.getList();
  },
  methods: {
    getRowKeys(row) {
    // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
    getRowKey (row) {
      return row.userId
    },
    setChecked(val) {
@@ -189,10 +188,6 @@
      deptTreeSelect().then(response => {
        this.deptOptions = response.data;
      });
    },
    // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
    getRowKey (row) {
      return row.userId
    },
    // 筛选节点
    filterNode(value, data) {

 src/components/flow/User/SingleUser.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <el-dialog
      :title="`选择转办接收人员`"
      :title="title"
      :visible.sync="show"
      width="65%"
      :destroy-on-close="true"
@@ -38,11 +38,12 @@
        <!--用户数据-->
        <el-col :span="18" :xs="24">
          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
            <el-form-item label="用户名称" prop="userName">
            <el-form-item label="用户姓名" prop="nickName">
              <el-input
                v-model="queryParams.userName"
                placeholder="请输入用户名称"
                v-model="queryParams.nickName"
                placeholder="请输入用户姓名"
                clearable
                @clear="handleQuery"
                style="width: 150px"
                @keyup.enter.native="handleQuery"
              />
@@ -53,7 +54,7 @@
            </el-form-item>
          </el-form>
          <el-table ref="dataTable" v-loading="loading" :row-key="getRowKey" :data="userList" @selection-change="handleUserSelect">
            <el-table-column type="selection" />
            <el-table-column type="selection" :reserve-selection="true"/>
            <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
            <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
            <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
@@ -94,6 +95,11 @@
      required: true,
      type: Boolean
    },
    title: {
      type: String,
      required: false,
      default: '指定人员'
    },
    // 回显数据传值
    selectUser: {
      default: null,
@@ -106,24 +112,16 @@
      innerSelected: null,
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 用户表格数据
      userList: [],
      // 弹出层标题
      title: "",
      // 部门树选项
      deptOptions: undefined,
      // 是否显示弹出层
      open: false,
      // 部门名称
      deptName: undefined,
      // 表单参数
      form: {},
      defaultProps: {
        children: "children",
        label: "label"
@@ -132,7 +130,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 5,
        userName: undefined,
        nickName: undefined,
        phonenumber: undefined,
        status: undefined,
        deptId: undefined
@@ -155,65 +153,21 @@
    deptName(val) {
      this.$refs.tree.filter(val);
    },
    selectUser: {
      deep: true,
      handler(newVal) {
        if (newVal) {
          this.$nextTick(() => {
            this.$refs.dataTable.clearSelection();
            this.userList.forEach(item => {
              if (newVal === item.userId) {
                this.innerSelected = item
                this.$refs.dataTable.toggleRowSelection(item)
              }
            })
          });
        } else {
          this.innerSelected = null;
        }
      },
    },
    userLst: {
      deep: true,
      handler(newVal) {
        if (newVal) {
          this.$nextTick(() => {
            if (this.$refs.dataTable) {
              if (! this.innerSelected) {
                newVal.forEach(item => {
                  if (this.innerSelected.userId === item.userId) {
                    this.innerSelected = item
                    this.$refs.dataTable.toggleRowSelection(item)
                  }
                })
              }
            }
          });
        } else {
          this.innerSelected = null;
        }
      },
    },
  },
  mounted() {
    this.getList();
    this.getDeptTree();
  },
  methods: {
    // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
    getRowKey (row) {
      return row.userId
    },
    setChecked(val) {
      if (val) {
        this.$nextTick(() => {
          this.$refs.dataTable.clearSelection();
          this.userList.forEach(item => {
            if (val.userId === item.userId) {
              this.innerSelected = item
              this.$refs.dataTable.toggleRowSelection(item)
            }
          })
        });
      } else {
        this.innerSelected = null
      }
      this.innerSelected = val
      this.$nextTick(() => {
        this.$refs.dataTable.toggleRowSelection(val, true)
      });
    },
    /** 查询用户列表 */
    getList() {
@@ -230,10 +184,6 @@
      deptTreeSelect().then(response => {
        this.deptOptions = response.data;
      });
    },
    // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
    getRowKey (row) {
      return row.id
    },
    // 筛选节点
    filterNode(value, data) {

 src/views/flowable/task/myProcess/detail/index.vue

@@ -9,17 +9,41 @@
      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
        <!--表单信息-->
        <el-tab-pane label="表单信息" name="1">
          <!--初始化流程加载表单信息-->
          <el-col :span="16" :offset="4">
            <div v-if="formDataList && formDataList.length > 0">
              <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp">
                <div v-if="formDataObj.current" style="margin-bottom: 15px;color: #409eff">当前阶段：<span style="color: red">{{formDataObj.beforeNodeName}}</span></div>
                <div v-else style="margin-bottom: 15px;color: #409eff">前置阶段：<span style="color: #d5904b">{{formDataObj.beforeNodeName}}</span></div>
                <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                  <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
              <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
                <div v-if="formDataObj.current">
                  <div style="margin-bottom: 15px;color: #E6A23C">当前阶段：<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
                  <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                    <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
                  </div>
                  <div v-else>
                    <el-alert
                      title="当前节点未绑定表单"
                      type="info"
                      :closable="false"
                    >
                    </el-alert>
                  </div>
                </div>
                <div v-else>
                <div v-else-if="formDataList.length > 1">
                  <div style="margin-bottom: 15px;color: #E6A23C">前置阶段：<span style="color: #F56C6C">{{formDataObj.beforeNodeName}}</span></div>
                  <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                    <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
                  </div>
                  <div v-else>
                    <el-alert
                      title="前置节点未绑定表单"
                      type="info"
                      :closable="false"
                    >
                    </el-alert>
                  </div>
                </div>
                <div v-if="formDataList.length <= 1">
                  <el-alert
                    title="节点无表单数据"
                    title="不存在前置节点"
                    type="info"
                    :closable="false"
                  >
@@ -27,22 +51,7 @@
                </div>
              </div>
            </div>
            <div v-else>
              <el-alert
                title="当前节点无表单数据"
                type="info"
                :closable="false"
              >
              </el-alert>
              <el-alert
                style="margin-top: 20px"
                title="前置节点无表单数据"
                type="info"
                :closable="false"
              >
              </el-alert>
            </div>
         </el-col>
          </el-col>
        </el-tab-pane>
        <!--流程流转记录-->
        <el-tab-pane label="流转记录" name="2">

 src/views/flowable/task/myProcess/send/index.vue

@@ -10,21 +10,56 @@
        <!--表单信息-->
        <el-tab-pane label="表单信息" name="1">
          <!--初始化流程加载表单信息-->
          <el-col :span="16" :offset="4" v-if="formDataList && formDataList.length > 0">
            <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
<!--     前置节点可驳回         -->
              <div v-if="!formDataObj.current" style="position: absolute; top: 4px; right: 4px">
                <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeDefId)">驳 回</el-button>
          <el-col :span="16" :offset="4">
            <div v-if="formDataList && formDataList.length > 0">
              <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
                <div v-if="formDataObj.current">
                  <!--     当前节点可协同、转办等操作         -->
                  <div style="position: absolute; top: 4px; right: 4px; display: flex;justify-content: center; align-items: center;">
                    <el-button size="small" type="primary" @click="submitForm">确认并提交</el-button>
                    <el-button size="small" type="primary" disabled @click="submitForm">协同办理(功能开发中)</el-button>
                    <el-button size="small" type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">转办</el-button>
                  </div>
                  <div style="margin-bottom: 15px;color: #E6A23C">当前阶段：<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
                  <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                    <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
                  </div>
                  <div v-else>
                    <el-alert
                      title="当前节点未绑定表单"
                      type="info"
                      :closable="false"
                    >
                    </el-alert>
                  </div>
                </div>
                <div v-else-if="formDataList.length > 1">
                  <!--     前置节点可驳回         -->
                  <div style="position: absolute; top: 4px; right: 4px">
                    <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeDefId)">驳 回</el-button>
                  </div>
                  <div style="margin-bottom: 15px;color: #E6A23C">前置阶段：<span style="color: #F56C6C">{{formDataObj.beforeNodeName}}</span></div>
                  <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
                    <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
                  </div>
                  <div v-else>
                    <el-alert
                      title="前置节点未绑定表单"
                      type="info"
                      :closable="false"
                    >
                    </el-alert>
                  </div>
                </div>
                <div v-if="formDataList.length <= 1">
                  <el-alert
                    title="不存在前置节点"
                    type="info"
                    :closable="false"
                  >
                  </el-alert>
                </div>
              </div>
<!--     当前节点可协同、转办等操作         -->
              <div v-else style="position: absolute; top: 4px; right: 4px; display: flex;justify-content: center; align-items: center;">
                <el-button size="small" type="primary" @click="submitForm">确认并提交</el-button>
                <el-button size="small" type="primary" disabled @click="submitForm">协同办理(功能开发中)</el-button>
                <el-button size="small" type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">转办</el-button>
              </div>
              <div v-if="formDataObj.current" style="margin-bottom: 15px;color: #E6A23C">当前阶段：<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
              <div v-else style="margin-bottom: 15px;color: #E6A23C">前置阶段：<span style="color: #F56C6C">{{formDataObj.beforeNodeName}}</span></div>
              <v-form-render  :form-data="formDataObj.formJson" :ref="'form' + index"/>
            </div>
          </el-col>
        </el-tab-pane>
@@ -90,7 +125,7 @@
            </el-select>
          </el-form-item>
          <el-form-item v-if="delegationForm.peopleType === 'DEPT'" label="候选部门" prop="targetId">
            <MyDept ref="dept" :checkeds="delegationDeptSelect" :show="deptShow" @close="closeDept" @submit="getDeptSelect"/>
            <MyDept ref="dept" :checkeds="delegationDeptSelect" :title="`选择转办部门`" :show="deptShow" @close="closeDept" @submit="getDeptSelect" :key="deptKey"/>
            <div style="display: flex;align-items: center">
              <div>
                <el-tag v-for="dept in delegationDeptSelect" :key="dept.id + 'zxc'" type="info" closable @close="removeDept(dept)">{{dept.label}}</el-tag>
@@ -99,7 +134,7 @@
            </div>
          </el-form-item>
          <el-form-item v-if="delegationForm.peopleType === 'FIX_USER'" label="指定人员" prop="targetId">
            <single-user ref="singleUser" :select-user="delegationForm.targetId" :show="singleUserShow" @close="closeSingleUser" @submit="getSingleUserSelect"/>
            <single-user ref="singleUser" :select-user="delegationForm.targetId" :title="`选择转办接收人员(单人)`" :show="singleUserShow" @close="closeSingleUser" @submit="getSingleUserSelect" :key="singleUserKey"/>
            <div style="display: flex;align-items: center">
              <div>
                <el-tag v-for="user in delegationUserSelect" :key="user.userId + 'abc'" type="info" closable @close="removeSingleUser(user)">{{user.nickName}}</el-tag>
@@ -108,7 +143,7 @@
            </div>
          </el-form-item>
          <el-form-item v-if="delegationForm.peopleType === 'USER'" label="候选人员" prop="targetId">
            <mult-user ref="multUser" :select-user="delegationUserSelect" :show="multUserShow" @close="closeMultUser" @submit="getMultUserSelect"/>
            <mult-user ref="multUser" :select-user="delegationUserSelect" :title="`选择转办接收人员(可多人)`" :show="multUserShow" @close="closeMultUser" @submit="getMultUserSelect" :key="multUserKey"/>
            <div style="display: flex;align-items: center">
              <div>
                <el-tag v-for="user in delegationUserSelect" :key="user.userId + 'qwe'" type="info" closable @close="removeMultUser(user)">{{user.nickName}}</el-tag>
@@ -117,7 +152,7 @@
            </div>
          </el-form-item>
          <el-form-item v-if="delegationForm.peopleType === 'ROLE'" label="候选角色" prop="targetId">
            <my-role ref="role" :select-values="delegationRoleSelect" :show="roleShow" @close="closeRole" @submit="getRoleSelect"/>
            <my-role ref="role" :select-values="delegationRoleSelect" :title="`选择转办角色`" :show="roleShow" @close="closeRole" @submit="getRoleSelect" :key="roleKey"/>
            <div style="display: flex;align-items: center">
              <div>
                <el-tag v-for="role in delegationRoleSelect" :key="role.roleId + 'rty'" type="info" closable @close="removeRole(role)">{{role.roleName}}</el-tag>
@@ -160,6 +195,10 @@
  props: {},
  data() {
    return {
      roleKey: 'role',
      deptKey: 'dept',
      multUserKey: 0,
      singleUserKey: 'single',
      projectName: '',
      flowName: '',
      roleShow: false, // 角色组显示
@@ -306,6 +345,7 @@
      }
    },
    editDept() {
      this.deptKey += '1'
      this.$nextTick(() => {
        this.$refs.dept.setCheckList(this.delegationDeptSelect)
      })
@@ -313,6 +353,7 @@
    },
    editSingleUser() {
      if (this.delegationUserSelect && this.delegationUserSelect.length > 0) {
        this.singleUserKey += '1'
        this.$nextTick(() => {
          this.$refs.singleUser.setChecked(this.delegationUserSelect[0])
        })
@@ -321,6 +362,7 @@
    },
    editRole() {
      if (this.delegationRoleSelect && this.delegationRoleSelect.length > 0) {
        this.roleKey += '1'
        this.$nextTick(() => {
          this.$refs.role.setChecked(this.delegationRoleSelect)
        })
@@ -329,6 +371,7 @@
    },
    editMultUser() {
      if (this.delegationForm.targetId) {
        this.multUserKey += 1
        this.$nextTick(() => {
          this.$refs.multUser.setChecked(this.delegationUserSelect)
        })
@@ -343,6 +386,7 @@
        this.delegationDeptSelect = []
      }
      this.deptShow = false
      this.deptKey += 1
    },
    getMultUserSelect(userList) {
      if (userList && userList.length > 0) {
@@ -353,6 +397,7 @@
        this.delegationUserSelect = []
      }
      this.multUserShow = false
      this.multUserKey += 1
    },
    getRoleSelect(roleList) {
      if (roleList && roleList.length > 0) {
@@ -363,6 +408,7 @@
        this.delegationRoleSelect = []
      }
      this.roleShow = false
      this.roleKey += '1'
    },
    getSingleUserSelect(user) {
      if (user) {
@@ -373,18 +419,23 @@
        this.delegationUserSelect = []
      }
      this.singleUserShow = false
      this.singleUserKey += '1'
    },
    closeDept() {
      this.deptShow = false
      this.deptKey += '1'
    },
    closeSingleUser() {
      this.singleUserShow = false
      this.singleUserKey += '1'
    },
    closeRole() {
      this.roleShow = false
      this.roleKey += '1'
    },
    closeMultUser() {
      this.multUserShow = false
      this.multUserKey += 1
    },
    openDelegation(taskName) {
      this.delegationForm.taskName = taskName
@@ -417,14 +468,15 @@
        if (this.formDataList && this.formDataList.length > 0) {
          this.$nextTick(() => {
            this.formDataList.forEach((formDataObj, index) => {
              console.log("表单数据列表", formDataObj.formJson)
              let that = this
              console.log(eval("that.$refs.form" +index)[0])
              eval("that.$refs.form" +index)[0].setFormJson(formDataObj.formJsonObj.formJson);

              eval("that.$refs.form" +index)[0].setFormData(formDataObj.formJsonObj);
              if (formDataObj.formJsonObj) {
                eval("that.$refs.form" +index)[0].setFormJson(formDataObj.formJsonObj.formJson);
                eval("that.$refs.form" +index)[0].setFormData(formDataObj.formJsonObj);
              }
            })
            this.formJson = this.formDataList[0].formJsonObj.formJson
            if (this.formDataList[0].formJsonObj) {
              this.formJson = this.formDataList[0].formJsonObj.formJson
            }
          })

        }