@lambo-design/workflow-approve 1.0.0-beta.41 → 1.0.0-beta.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.41",
+  "version": "1.0.0-beta.43",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/assignee-box.vue

@@ -1,381 +1,389 @@
-<template>
-  <div>
-    <Modal v-model="modalBoxShow" width="1217" title="选择办理人"  @on-ok="onOk" @on-cancel="onCancel" loading>
-      <div class="org-info">
-        <div class="org-tree">
-          <Tree :data="treeData" :load-data="loadData" @on-select-change="selectChange" > </Tree>
-        </div>
-        <div class="org-detil">
-          <LamboPagingTable ref="selection" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
-                            @on-selection-change="onSelectionChange">
-            <div slot="search">
-              <Form :label-width="80">
-                <FormItem label="账号">
-                  <Input v-model="form.userId" placeholder="按账号搜索" />
-                </FormItem>
-                <FormItem label="姓名">
-                  <Input v-model="form.userName" placeholder="按姓名搜索" />
-                </FormItem>
-                <FormItem label="是否管理员" prop="isAdmin" :labelWidth="100">
-                  <RadioGroup v-model="form.isAdmin">
-                    <Radio label="">全部</Radio>
-                    <Radio label="1">是</Radio>
-                    <Radio label="0">否</Radio>
-                  </RadioGroup>
-                </FormItem>
-                <FormItem>
-                  <Button type="primary" icon="ios-search" @click="doSearch">查询</Button>
-                </FormItem>
-              </Form>
-            </div>
-          </LamboPagingTable>
-
-        </div>
-      </div>
-
-
-    </Modal>
-  </div>
-</template>
-
-<script>
-import ajax from "@lambo-design/shared/utils/ajax";
-import LamboPagingTable from '@lambo-design/paging-table'
-
-export default {
-  name: "UserHelpBox",
-  components: {
-    LamboPagingTable
-  },
-  props: {
-    data: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    //按钮执行完毕回调方法
-    executionCompleted: {
-      type: Function,
-      required: false,
-    },
-    smartFlowServerContext: {
-      type: String,
-      default: '/api/smart-flow-server',
-    },
-    upmsServerContext: {
-      type: String,
-      default: '/api/upms-server',
-    },
-  },
-  data() {
-    return {
-      id: '',
-      helpBoxType: 'transferCurTask',
-      loading: false,
-      organTreeType: '00',
-      permScope: 'all',
-      modalBoxShow: false,
-      dataUrl:'',
-      helpBoxColumns: [
-        {
-          title: "用户ID",
-          key: "userId",
-          sortable: "custom",
-        },
-        {
-          title: "用户姓名",
-          key: "userName",
-        },
-        {
-          title: "部门名称",
-          key: "organName",
-        },
-      ],
-      helpBoxTitle: "用户选择框",
-      targetDomId:"",
-      treeData: [],
-      idSelectedArr: [],
-      currentNode: {},
-      form: {
-        userId: '',
-        userName: '',
-        organId: '',
-        organTitle: '',
-        directChild: false,
-        isAdmin: ''
-      },
-      tableSearchParams: {},
-    };
-  },
- /* created () {
-    this.init()
-  },*/
-  computed: {
-
-    tableColumn () {
-      let columns = []
-      let self = this
-      columns.push({
-        title: '#',
-        key: 'selectId',
-        type: 'selection',
-        align: 'center',
-        width: 55
-      })
-      columns.push({
-        title: '账号',
-        key: 'userId',
-        sortField: 'user_id',
-        sortable: 'custom'
-      })
-      columns.push({
-        title: '姓名',
-        key: 'userName',
-        sortField: 'user_name',
-        sortable: 'custom'
-      })
-      columns.push({
-        title: '部门名称',
-        key: 'organName',
-        sortField: 'organ_name',
-        sortable: 'custom'
-      })
-      columns.push({
-        title: '状态',
-        key: 'status',
-        sortable: 'custom',
-        align: 'center',
-        width: 100,
-        render: function (h, param) {
-          let state = param.row.status
-          if (state === '00') {
-            state = '正常'
-          } else {
-            state = '锁定'
-          }
-          return h('span', state)
-        }
-      })
-
-      return columns
-    }
-  },
-  inject: ['toBeDoneListDoSearch'],
-  methods: {
-    init (organTreeType) {
-      let self = this
-      self.organTreeType = organTreeType
-      self.getRootData(organTreeType)
-    },
-    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id) {
-      this.id = id
-      this.helpBoxType = helpBoxType
-      this.organTreeType = organTreeType
-      if (permScope && permScope !== 'all'){
-        let userPermScope = permScope.substring(permScope.indexOf("U:"))
-        userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
-        if (userPermScope.length > 0) {
-          userPermScope = userPermScope.split(';')
-          this.permScope = userPermScope
-        }
-      }
-      this.getRootData(organTreeType)
-      this.modalBoxShow = !this.modalBoxShow;
-    },
-
-    onOk(){
-      let self = this
-      let idSelectedArr = self.idSelectedArr
-      self.loading = true
-      if (idSelectedArr.length > 1) {
-        self.loading = false
-        self.$Message.info('办理人只能选择一条记录！')
-        this.$emit('update-selected', ''); // 触发事件并传递 userId
-      } else {
-        let idSelectedArr = self.idSelectedArr[0].split(',')
-        if (self.helpBoxType === 'transferCurTask'){
-          let auditResult = {
-            code: self.data.auditResult,
-            name: self.data.auditResultName,
-          }
-          self.data.selectedUserId=idSelectedArr[0];
-          console.log("self.data:",self.data);
-          let url = this.smartFlowServerContext + '/manage/processTodo/audit'
-          ajax.post(url, self.data).then(function (resp) {
-            let result = resp.data
-            if (result.code == '200') {
-              self.loading = false
-              self.$Message.success(result.message);
-              if (self.executionCompleted) {
-                self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
-              }
-              self.toBeDoneListDoSearch();
-            } else {
-              self.loading = false
-              self.$Message.error(result.message)
-              if (self.executionCompleted) {
-                self.executionCompleted(false, null, null, auditResult, self.data.taskId);
-              }
-            }
-          })
-        } else {
-          self.$emit('update-next-node-assignee', idSelectedArr[0], idSelectedArr[1], self.id);
-        }
-      }
-      this.modalBoxShow = false;
-    },
-
-    doSearch: function () {
-      this.tableSearchParams = Object.assign({}, this.form)
-    },
-    onSelectionChange: function (selection) {
-      let self = this
-      self.idSelectedArr = []
-      if (selection.length > 1) {
-        self.$Message.info('只能选择一条记录！')
-        this.$refs.selection.selectAll(false);
-      }
-      for (let item of selection) {
-        self.idSelectedArr.push(item.userId + ',' + item.userName)
-      }
-    },
-    loadData (node, callback) {
-      this.getData(node, function (data) {
-        if (data.length > 0) {
-          callback(data)
-        }
-      })
-    },
-    getRootData (organTreeType) {
-      let self = this
-      let childs = []
-      let params = {
-        treeTypeId: organTreeType
-      }
-      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgRootTree', {params: params}).then(function (resp) {
-        if (resp.data.code === 1) {
-          let data = resp.data.data
-          if (data.length > 0) {
-            data.forEach(item => {
-              let obj = {}
-              obj.type = item.organType
-              obj.id = item.organId
-              obj.orders = item.orders
-              obj.title = item.organName
-              obj.name = item.organName
-              obj.com = item.com
-              obj.code = item.organCode
-              obj.loading = false
-              obj.children = []
-              obj.hasChild = true
-              childs.push(obj)
-            })
-
-            childs[0].selected = true
-            self.selectChange(childs)
-          }
-          self.treeData = childs
-        }
-      })
-    },
-    getData (node, callback) {
-      let self = this
-      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes', {
-        params: {
-          organCode: node.code,
-          orgTreeType: self.organTreeType
-        }
-      }).then(function (resp) {
-        const childs = []
-        if (resp.data.code === 1) {
-          let nodeDatas = resp.data.data
-          if (nodeDatas && nodeDatas.length > 0) {
-            nodeDatas.forEach(item => {
-              let obj = {}
-              obj.type = item.organType
-              obj.id = item.organId
-              obj.orders = item.orders
-              obj.title = item.organName
-              obj.name = item.organName
-              obj.com = item.com
-              obj.parent = node
-              obj.code = item.organCode
-              obj.loading = false
-              obj.children = []
-              obj.hasChild = true
-              childs.push(obj)
-            })
-          } else {
-            self.$set(node, 'hasChild', false)
-            self.$delete(node, 'loading')
-          }
-          if (callback) {
-            callback(childs)
-          }
-        } else {
-          self.$set(node, 'hasChild', false)
-          self.$delete(node, 'loading')
-          if (callback) {
-            callback()
-          }
-        }
-      })
-    },
-    selectChange (node) {
-      let self = this
-      if (node && node.length > 0) {
-        if (self.currentNode !== node[0]) {
-          self.currentNode = node[0]
-
-          self.form.organId = self.currentNode.id
-          self.form.organTitle = self.currentNode.title
-
-          let permScope = self.permScope ? self.permScope : 'all'
-          self.dataUrl =self.smartFlowServerContext+ '/manage/processDesign/getAssigneeList?orgTreeType=' + self.organTreeType + "&permScopeList=" + permScope
-          self.doSearch()
-
-          if (node[0].children.length <= 0) {
-            self.getData(node[0], function (data) {
-              self.$set(node[0], 'children', data)
-            })
-          }
-          self.$set(node[0], 'expand', true)
-        }
-      } else {
-        self.$set(self.currentNode, 'expand', !self.currentNode.expand)
-        self.currentNode.selected = true
-      }
-    },
-
-    onCancel () {
-      if (this.helpBoxType === 'transferCurTask'){
-        this.$emit('update-selected', ''); // 触发事件并传递 userId
-      }
-      this.modalBoxShow = false;
-
-    },
-
-
-  },
-};
-</script>
-
-<style lang="less" scope>
-.org-info{
-  display: flex;
-  .org-tree {
-    width: 265px;
-    min-height: 450px;
-    border-right: 1px solid #dcdee2;
-  }
-
-  .org-detil {
-    flex:1;
-    min-height: 400px;
-    min-width: 800px;
-    padding: 0 10px 10px;
-    margin-left: 10px;
-  }
-}
-</style>
+<template>
+  <div>
+    <Modal v-model="modalBoxShow" width="1217" title="选择办理人"  @on-ok="onOk" @on-cancel="onCancel" loading>
+      <div class="org-info">
+        <div class="org-tree">
+          <div class="tree-content">
+            <Tree :data="treeData" :load-data="loadData" @on-select-change="selectChange"></Tree>
+          </div>
+        </div>
+        <div class="org-detil">
+          <LamboPagingTable ref="selection" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
+                            @on-selection-change="onSelectionChange">
+            <div slot="search">
+              <Form :label-width="80">
+                <FormItem label="账号">
+                  <Input v-model="form.userId" placeholder="按账号搜索" />
+                </FormItem>
+                <FormItem label="姓名">
+                  <Input v-model="form.userName" placeholder="按姓名搜索" />
+                </FormItem>
+                <FormItem label="是否管理员" prop="isAdmin" :labelWidth="100">
+                  <RadioGroup v-model="form.isAdmin">
+                    <Radio label="">全部</Radio>
+                    <Radio label="1">是</Radio>
+                    <Radio label="0">否</Radio>
+                  </RadioGroup>
+                </FormItem>
+                <FormItem>
+                  <Button type="primary" icon="ios-search" @click="doSearch">查询</Button>
+                </FormItem>
+              </Form>
+            </div>
+          </LamboPagingTable>
+
+        </div>
+      </div>
+
+
+    </Modal>
+  </div>
+</template>
+
+<script>
+import ajax from "@lambo-design/shared/utils/ajax";
+import LamboPagingTable from '@lambo-design/paging-table'
+
+export default {
+  name: "UserHelpBox",
+  components: {
+    LamboPagingTable
+  },
+  props: {
+    data: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    //按钮执行完毕回调方法
+    executionCompleted: {
+      type: Function,
+      required: false,
+    },
+    smartFlowServerContext: {
+      type: String,
+      default: '/api/smart-flow-server',
+    },
+    upmsServerContext: {
+      type: String,
+      default: '/api/upms-server',
+    },
+  },
+  data() {
+    return {
+      id: '',
+      helpBoxType: 'transferCurTask',
+      loading: false,
+      organTreeType: '00',
+      permScope: 'all',
+      modalBoxShow: false,
+      dataUrl:'',
+      helpBoxColumns: [
+        {
+          title: "用户ID",
+          key: "userId",
+          sortable: "custom",
+        },
+        {
+          title: "用户姓名",
+          key: "userName",
+        },
+        {
+          title: "部门名称",
+          key: "organName",
+        },
+      ],
+      helpBoxTitle: "用户选择框",
+      targetDomId:"",
+      treeData: [],
+      idSelectedArr: [],
+      currentNode: {},
+      form: {
+        userId: '',
+        userName: '',
+        organId: '',
+        organTitle: '',
+        directChild: false,
+        isAdmin: ''
+      },
+      tableSearchParams: {},
+    };
+  },
+ /* created () {
+    this.init()
+  },*/
+  computed: {
+
+    tableColumn () {
+      let columns = []
+      let self = this
+      columns.push({
+        title: '#',
+        key: 'selectId',
+        type: 'selection',
+        align: 'center',
+        width: 55
+      })
+      columns.push({
+        title: '账号',
+        key: 'userId',
+        sortField: 'user_id',
+        sortable: 'custom'
+      })
+      columns.push({
+        title: '姓名',
+        key: 'userName',
+        sortField: 'user_name',
+        sortable: 'custom'
+      })
+      columns.push({
+        title: '部门名称',
+        key: 'organName',
+        sortField: 'organ_name',
+        sortable: 'custom'
+      })
+      columns.push({
+        title: '状态',
+        key: 'status',
+        sortable: 'custom',
+        align: 'center',
+        width: 100,
+        render: function (h, param) {
+          let state = param.row.status
+          if (state === '00') {
+            state = '正常'
+          } else {
+            state = '锁定'
+          }
+          return h('span', state)
+        }
+      })
+
+      return columns
+    }
+  },
+  inject: ['toBeDoneListDoSearch'],
+  methods: {
+    init (organTreeType) {
+      let self = this
+      self.organTreeType = organTreeType
+      self.getRootData(organTreeType)
+    },
+    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id) {
+      this.id = id
+      this.helpBoxType = helpBoxType
+      this.organTreeType = organTreeType
+      if (permScope && permScope !== 'all'){
+        let userPermScope = permScope.substring(permScope.indexOf("U:"))
+        userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
+        if (userPermScope.length > 0) {
+          userPermScope = userPermScope.split(';')
+          this.permScope = userPermScope
+        }
+      }
+      this.getRootData(organTreeType)
+      this.modalBoxShow = !this.modalBoxShow;
+    },
+
+    onOk(){
+      let self = this
+      let idSelectedArr = self.idSelectedArr
+      self.loading = true
+      if (idSelectedArr.length > 1) {
+        self.loading = false
+        self.$Message.info('办理人只能选择一条记录！')
+        this.$emit('update-selected', ''); // 触发事件并传递 userId
+      } else {
+        let idSelectedArr = self.idSelectedArr[0].split(',')
+        if (self.helpBoxType === 'transferCurTask'){
+          let auditResult = {
+            code: self.data.auditResult,
+            name: self.data.auditResultName,
+          }
+          self.data.selectedUserId=idSelectedArr[0];
+          console.log("self.data:",self.data);
+          let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+          ajax.post(url, self.data).then(function (resp) {
+            let result = resp.data
+            if (result.code == '200') {
+              self.loading = false
+              self.$Message.success(result.message);
+              if (self.executionCompleted) {
+                self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
+              }
+              self.toBeDoneListDoSearch();
+            } else {
+              self.loading = false
+              self.$Message.error(result.message)
+              if (self.executionCompleted) {
+                self.executionCompleted(false, null, null, auditResult, self.data.taskId);
+              }
+            }
+          })
+        } else {
+          self.$emit('update-next-node-assignee', idSelectedArr[0], idSelectedArr[1], self.id);
+        }
+      }
+      this.modalBoxShow = false;
+    },
+
+    doSearch: function () {
+      this.tableSearchParams = Object.assign({}, this.form)
+    },
+    onSelectionChange: function (selection) {
+      let self = this
+      self.idSelectedArr = []
+      if (selection.length > 1) {
+        self.$Message.info('只能选择一条记录！')
+        this.$refs.selection.selectAll(false);
+      }
+      for (let item of selection) {
+        self.idSelectedArr.push(item.userId + ',' + item.userName)
+      }
+    },
+    loadData (node, callback) {
+      this.getData(node, function (data) {
+        if (data.length > 0) {
+          callback(data)
+        }
+      })
+    },
+    getRootData (organTreeType) {
+      let self = this
+      let childs = []
+      let params = {
+        treeTypeId: organTreeType
+      }
+      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgRootTree', {params: params}).then(function (resp) {
+        if (resp.data.code === 1) {
+          let data = resp.data.data
+          if (data.length > 0) {
+            data.forEach(item => {
+              let obj = {}
+              obj.type = item.organType
+              obj.id = item.id
+              obj.organId = item.organId
+              obj.orders = item.orders
+              obj.title = item.organName
+              obj.name = item.organName
+              obj.com = item.com
+              obj.code = item.organCode
+              obj.loading = false
+              obj.children = []
+              obj.hasChild = true
+              childs.push(obj)
+            })
+
+            childs[0].selected = true
+            self.selectChange(childs)
+          }
+          self.treeData = childs
+        }
+      })
+    },
+    getData (node, callback) {
+      let self = this
+      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes', {
+        params: {
+          organCode: node.code,
+          orgTreeType: self.organTreeType
+        }
+      }).then(function (resp) {
+        const childs = []
+        if (resp.data.code === 1) {
+          let nodeDatas = resp.data.data
+          if (nodeDatas && nodeDatas.length > 0) {
+            nodeDatas.forEach(item => {
+              let obj = {}
+              obj.type = item.organType
+              obj.id = item.id
+              obj.organId = item.organId
+              obj.orders = item.orders
+              obj.title = item.organName
+              obj.name = item.organName
+              obj.com = item.com
+              obj.parent = node
+              obj.code = item.organCode
+              obj.loading = false
+              obj.children = []
+              obj.hasChild = true
+              childs.push(obj)
+            })
+          } else {
+            self.$set(node, 'hasChild', false)
+            self.$delete(node, 'loading')
+          }
+          if (callback) {
+            callback(childs)
+          }
+        } else {
+          self.$set(node, 'hasChild', false)
+          self.$delete(node, 'loading')
+          if (callback) {
+            callback()
+          }
+        }
+      })
+    },
+    selectChange (node) {
+      let self = this
+      if (node && node.length > 0) {
+        if (self.currentNode !== node[0]) {
+          self.currentNode = node[0]
+
+          self.form.organId = self.currentNode.organId
+          self.form.organTitle = self.currentNode.title
+
+          let permScope = self.permScope ? self.permScope : 'all'
+          self.dataUrl =self.smartFlowServerContext+ '/manage/processDesign/getAssigneeList?orgTreeType=' + self.organTreeType + "&permScopeList=" + permScope
+          self.doSearch()
+
+          if (node[0].children.length <= 0) {
+            self.getData(node[0], function (data) {
+              self.$set(node[0], 'children', data)
+            })
+          }
+          self.$set(node[0], 'expand', true)
+        }
+      } else {
+        self.$set(self.currentNode, 'expand', !self.currentNode.expand)
+        self.currentNode.selected = true
+      }
+    },
+
+    onCancel () {
+      if (this.helpBoxType === 'transferCurTask'){
+        this.$emit('update-selected', ''); // 触发事件并传递 userId
+      }
+      this.modalBoxShow = false;
+
+    },
+
+
+  },
+};
+</script>
+
+<style lang="less" scope>
+.org-info{
+  display: flex;
+  .org-tree {
+    width: 265px;
+    min-height: 450px;
+    border-right: 1px solid #dcdee2;
+    .tree-content {
+      height: 100%;
+      overflow-y: auto;
+    }
+  }
+
+  .org-detil {
+    flex:1;
+    min-height: 400px;
+    min-width: 800px;
+    padding: 0 10px 10px;
+    margin-left: 10px;
+  }
+}
+</style>

package/src/components/candidate-groups-box.vue

@@ -410,7 +410,8 @@ export default {
               data.forEach(item => {
                 let obj = {}
                 obj.type = item.organType
-                obj.id = item.organId
+                obj.id = item.id
+                obj.organId = item.organId
                 obj.orders = item.orders
                 obj.title = item.organName
                 obj.name = item.organName
@@ -449,7 +450,8 @@ export default {
               data.forEach(item => {
                 let obj = {}
                 obj.type = item.organType
-                obj.id = item.organId
+                obj.id = item.id
+                obj.organId = item.organId
                 obj.orders = item.orders
                 obj.title = item.organName
                 obj.name = item.organName
@@ -498,7 +500,8 @@ export default {
                           if (item.organCode === permScopeTwo[i]) {
                             let obj = {}
                             obj.type = item.organType
-                            obj.id = item.organId
+                            obj.id = item.id
+                            obj.organId = item.organId
                             obj.orders = item.orders
                             obj.title = item.organName
                             obj.name = item.organName
@@ -573,11 +576,12 @@ export default {
                                 if (item.organCode == organCode) {
                                   let obj = {}
                                   obj.type = item.organType
-                                  obj.id = item.organId
+                                  obj.id = item.id
+                                  obj.organId = item.organId
                                   obj.orders = item.orders
                                   obj.title = item.organName
                                   obj.name = item.organName
-                                  obj.com = resp.data.data.organId
+                                  obj.com = item.organId
                                   obj.code = item.organCode
                                   obj.loading = false
                                   obj.checked = false
@@ -727,11 +731,12 @@ export default {
                               if (item.organCode == organCode) {
                                 let obj = {}
                                 obj.type = item.organType
-                                obj.id = item.organId
+                                obj.id = item.id
+                                obj.organId = item.organId
                                 obj.orders = item.orders
                                 obj.title = item.organName
                                 obj.name = item.organName
-                                obj.com = resp.data.data.organId
+                                obj.com = item.organId
                                 obj.code = item.organCode
                                 obj.loading = false
                                 obj.checked = false
@@ -1035,6 +1040,7 @@ export default {
               })
               obj.type = item.organType;
               obj.id = item.id
+              obj.organId = item.organId
               obj.orders = item.orders
               obj.title = item.organName + typeName
               obj.name = item.organName
@@ -1237,7 +1243,8 @@ export default {
               }
               // obj.disableCheckbox = true
               obj.type = item.organType;
-              obj.id = item.organCode
+              obj.id = item.id
+              obj.organId = item.organId
               obj.title = item.organName + typeName
               obj.name = item.organName
               obj.com = item.organId
@@ -1317,6 +1324,7 @@ export default {
               // obj.disableCheckbox = true
               obj.type = item.organType;
               obj.id = item.id
+              obj.organId = item.organId
               obj.title = item.organName + typeName
               obj.name = item.organName
               obj.com = item.organId
@@ -1370,14 +1378,14 @@ export default {
 
           ajax.get(self.upmsServerContext + "/manage/user/getList", {
             params: {
-              organId: itemCom.id,
+              organId: itemCom.organId,
               orgTreeType: self.organTreeType,
               limit: "1000",
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == "成功") {
-              let nodeUser = resp.data.data
+            if (resp.data.message == "成功" || resp.data.code == 1 || resp.data.code == 200) {
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
               nodeUser.forEach(item => {
                 if (!userIdSet.has(item.userId)) {
                   userIdSet.add(item.userId)
@@ -1399,14 +1407,14 @@ export default {
 
           ajax.get(self.upmsServerContext + "/manage/user/getList", {
             params: {
-              organId: itemCom.id,
+              organId: itemCom.organId,
               orgTreeType: self.organTreeType,
               limit: "1000",
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == "成功") {
-              let nodeUser = resp.data.data
+            if (resp.data.message == "成功" || resp.data.code == 1 || resp.data.code == 200) {
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data
               nodeUser.forEach(item => {
                 if (!userIdSet.has(item.userId) && userPermScope.includes(item.userId)) {
                   userIdSet.add(item.userId)

package/src/components/countersigners-box.vue

@@ -1,10 +1,14 @@
 <template>
   <div style="min-height: 300px;">
     <div style="min-height:5em;border: 1px dotted #a4a4a4;">
-      <Tag v-for="(item,index) in countersignersTagsData" :key="item.id" closable @on-close="closeTags(index,item)"
-           size="large">
-        {{ item.split(':')[1].split(',')[0] }}
-      </Tag>
+      <template v-if="countersignersTagsData.length > 0">
+        <Tag v-for="(item, index) in countersignersTagsData" :key="item.id" closable @on-close="closeTags(index, item)" size="large">
+          {{ item.split(':')[1].split(',')[0] }}
+        </Tag>
+      </template>
+      <template v-else>
+        <p style="padding: 10px;color: #989898">暂无会签人</p>
+      </template>
     </div>
     <div class="cont">
       <div
@@ -268,7 +272,8 @@ export default {
               data.forEach(item => {
                 let obj = {}
                 obj.type = item.organType
-                obj.id = item.organId
+                obj.id = item.id
+                obj.organId = item.organId
                 obj.orders = item.orders
                 obj.title = item.organName
                 obj.name = item.organName
@@ -307,7 +312,8 @@ export default {
               data.forEach(item => {
                 let obj = {}
                 obj.type = item.organType
-                obj.id = item.organId
+                obj.id = item.id
+                obj.organId = item.organId
                 obj.orders = item.orders
                 obj.title = item.organName
                 obj.name = item.organName
@@ -362,11 +368,12 @@ export default {
                             if (item.organCode == organCode) {
                               let obj = {}
                               obj.type = item.organType
-                              obj.id = item.organId
+                              obj.id = item.id
                               obj.orders = item.orders
                               obj.title = item.organName
                               obj.name = item.organName
-                              obj.com = resp.data.data.organId
+                              obj.com = item.organId
+                              obj.organId = item.organId
                               obj.code = item.organCode
                               obj.loading = false
                               obj.checked = false
@@ -517,10 +524,11 @@ export default {
               }
               // obj.disableCheckbox = true
               obj.type = item.organType
-              obj.id = item.organCode
+              obj.id = item.id
               obj.title = item.organName + typeName
               obj.name = item.organName
               obj.com = item.organId
+              obj.organId = item.organId
               obj.code = item.organCode
               obj.loading = false
               obj.children = []
@@ -562,14 +570,14 @@ export default {
 
           ajax.get(self.upmsServerContext + '/manage/user/getList', {
             params: {
-              organId: itemCom.id,
+              organId: itemCom.organId,
               orgTreeType: self.organTreeType,
               limit: '1000',
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == '成功') {
-              let nodeUser = resp.data.data
+            if (resp.data.message == "成功" || resp.data.code == 1 || resp.data.code == 200) {
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
               nodeUser.forEach(item => {
                 if (!userIdSet.has(item.userId)) {
                   userIdSet.add(item.userId)
@@ -588,17 +596,16 @@ export default {
       } else {
         let userIdSet = new Set()
         data.forEach(itemCom => {
-
           ajax.get(self.upmsServerContext + '/manage/user/getList', {
             params: {
-              organId: itemCom.id,
+              organId: itemCom.organId,
               orgTreeType: self.organTreeType,
               limit: '1000',
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == '成功') {
-              let nodeUser = resp.data.data
+            if (resp.data.message == "成功" || resp.data.code == 1 || resp.data.code == 200) {
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
               nodeUser.forEach(item => {
                 if (!userIdSet.has(item.userId) && userPermScope.includes(item.userId)) {
                   userIdSet.add(item.userId)

package/src/portrait.vue

@@ -245,8 +245,9 @@
                      @on-focus="candidateGroupsReadingRangeClick(item)"
                      @on-click="candidateGroupsReadingRangeClick(item)"/>
             </FormItem>
-            <FormItem label="候选人员："  v-if="item.isMultiInstance && item.actionType === 'CAND'">
+            <FormItem label="候选人员：" prop="candidateGroups" v-if="item.isMultiInstance && item.actionType === 'CAND'">
             </FormItem>
+
             <countersingersBox style="margin-bottom: 10px" v-model="item.candidateNames" v-if="item.isMultiInstance && item.actionType === 'CAND'"
                                :item="item" :permScope="permScope" @update-cand-groups="updateCandGroups"  :upms-server-context="upmsServerContext" :smart-flow-server-context="smartFlowServerContext"/>
           </div>