@zscreate/form-component 1.1.364 → 1.1.365

package/dist/form-component.umd.js

@@ -157684,7 +157684,7 @@ function toString(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.364"};
+module.exports = {"i8":"1.1.365"};
 
 /***/ })
 
@@ -161315,8 +161315,8 @@ var sider_panelvue_type_template_id_8040a504_render = function () {var _vm=this;
 var sider_panelvue_type_template_id_8040a504_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/select_type.vue?vue&type=template&id=695b5299&
-var select_typevue_type_template_id_695b5299_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":"配置人员类型","width":800,"destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('div',{staticClass:"table-page-search-wrapper"},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{directives:[{name:"show",rawName:"v-show",value:(_vm.defaultKey !== 'CandidateFormUsers' && _vm.defaultKey !== 'Script' ),expression:"defaultKey !== 'CandidateFormUsers' && defaultKey !== 'Script' "}],attrs:{"gutter":24}},[(_vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-tree-select',{staticStyle:{"width":"240px"},attrs:{"dropdown-style":{ maxHeight: '400px', overflow: 'auto' },"placeholder":"请选择部门","tree-data":_vm.treeData,"allow-clear":""},on:{"change":_vm.treechange},model:{value:(_vm.query.depId),callback:function ($$v) {_vm.$set(_vm.query, "depId", $$v)},expression:"query.depId"}})],1)],1):_vm._e(),(_vm.defaultKey === 'relationMatrix')?[_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"请输入标签"},model:{value:(_vm.m_tagQuery.tagName),callback:function ($$v) {_vm.$set(_vm.m_tagQuery, "tagName", $$v)},expression:"m_tagQuery.tagName"}})],1)],1)]:_vm._e(),(_vm.showuser && _vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-select',{staticStyle:{"width":"173px"},attrs:{"placeholder":"请选择角色"},on:{"change":_vm.handleChange},model:{value:(_vm.query.roleId),callback:function ($$v) {_vm.$set(_vm.query, "roleId", $$v)},expression:"query.roleId"}},_vm._l((_vm.userlist),function(item){return _c('a-select-option',{key:item.id,attrs:{"value":item.id}},[_vm._v(" "+_vm._s(item.roleName)+" ")])}),1)],1)],1):_vm._e(),_c('a-col',{directives:[{name:"show",rawName:"v-show",value:(_vm.showname),expression:"showname"}],attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":this.defaultKey == 'CandidateGroups' ? '请输入名称' : '请输入姓名'},model:{value:(_vm.query.realname),callback:function ($$v) {_vm.$set(_vm.query, "realname", $$v)},expression:"query.realname"}})],1)],1),_c('a-col',{attrs:{"md":4,"sm":8}},[_c('span',{staticClass:"table-page-search-submitButtons",staticStyle:{"float":"left","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.handlesearch}},[_vm._v("查询")])],1)])],2)],1)],1),_c('a-tabs',{attrs:{"activeKey":_vm.defaultKey},on:{"change":_vm.changeTabs}},[_c('a-tab-pane',{key:"Assingee",attrs:{"tab":"个人"}},[_c('a-table',{attrs:{"rowSelection":{
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/select_type.vue?vue&type=template&id=7da53fb8&
+var select_typevue_type_template_id_7da53fb8_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":"配置人员类型","width":800,"destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('div',{staticClass:"table-page-search-wrapper"},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{directives:[{name:"show",rawName:"v-show",value:(_vm.defaultKey !== 'CandidateFormUsers' && _vm.defaultKey !== 'Script' ),expression:"defaultKey !== 'CandidateFormUsers' && defaultKey !== 'Script' "}],attrs:{"gutter":24}},[(_vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-tree-select',{staticStyle:{"width":"240px"},attrs:{"dropdown-style":{ maxHeight: '400px', overflow: 'auto' },"placeholder":"请选择部门","tree-data":_vm.treeData,"allow-clear":""},on:{"change":_vm.treechange},model:{value:(_vm.query.depId),callback:function ($$v) {_vm.$set(_vm.query, "depId", $$v)},expression:"query.depId"}})],1)],1):_vm._e(),(_vm.defaultKey === 'relationMatrix')?[_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"请输入标签"},model:{value:(_vm.m_tagQuery.tagName),callback:function ($$v) {_vm.$set(_vm.m_tagQuery, "tagName", $$v)},expression:"m_tagQuery.tagName"}})],1)],1)]:_vm._e(),(_vm.showuser && _vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-select',{staticStyle:{"width":"173px"},attrs:{"placeholder":"请选择角色"},on:{"change":_vm.handleChange},model:{value:(_vm.query.roleId),callback:function ($$v) {_vm.$set(_vm.query, "roleId", $$v)},expression:"query.roleId"}},_vm._l((_vm.userlist),function(item){return _c('a-select-option',{key:item.id,attrs:{"value":item.id}},[_vm._v(" "+_vm._s(item.roleName)+" ")])}),1)],1)],1):_vm._e(),_c('a-col',{directives:[{name:"show",rawName:"v-show",value:(_vm.showname),expression:"showname"}],attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":this.defaultKey == 'CandidateGroups' ? '请输入名称' : '请输入姓名'},model:{value:(_vm.query.realname),callback:function ($$v) {_vm.$set(_vm.query, "realname", $$v)},expression:"query.realname"}})],1)],1),_c('a-col',{attrs:{"md":4,"sm":8}},[_c('span',{staticClass:"table-page-search-submitButtons",staticStyle:{"float":"left","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.handlesearch}},[_vm._v("查询")])],1)])],2)],1)],1),_c('a-tabs',{attrs:{"activeKey":_vm.defaultKey},on:{"change":_vm.changeTabs}},[_c('a-tab-pane',{key:"Assingee",attrs:{"tab":"个人"}},[_c('a-table',{attrs:{"rowSelection":{
             type: 'radio',
             selectedRowKeys: _vm.formData.assingeeValue,
             onChange: _vm.onSelectPersion,
@@ -161327,7 +161327,7 @@ var select_typevue_type_template_id_695b5299_render = function () {var _vm=this;
             onChange: _vm.onSelectPersionWait,
             onSelect: _vm.onSelectUsers,
             onSelectAll: _vm.onSelectAll,
-          },"columns":_vm.columns,"dataSource":_vm.data,"pagination":_vm.ipagination,"size":"small","rowKey":"id"},on:{"change":_vm.handleTableChange}})],1),_c('a-tab-pane',{key:"CandidateGroups",attrs:{"tab":"候选组"}},[_c('a-table',{attrs:{"rowSelection":{
+          },"columns":_vm.columns,"dataSource":_vm.data1,"pagination":_vm.ipagination1,"size":"small","rowKey":"id"},on:{"change":_vm.handleTableChange1}})],1),_c('a-tab-pane',{key:"CandidateGroups",attrs:{"tab":"候选组"}},[_c('a-table',{attrs:{"rowSelection":{
             type: 'checkbox',
             selectedRowKeys: _vm.formData.candidateGroupsValue,
             onChange: _vm.onSelectGroup,
@@ -161346,7 +161346,7 @@ var select_typevue_type_template_id_695b5299_render = function () {var _vm=this;
             onSelect: _vm.onSelectUsers,
             onSelectAll: _vm.onSelectAll
           },"columns":_vm.tagColumns,"dataSource":_vm.tagData,"pagination":_vm.tagIpagination,"size":"small","rowKey":"id"},on:{"change":_vm.handleTagDataTableChange}})],1),_c('a-tab-pane',{key:"Script",attrs:{"tab":"脚本"}},[_c('a-textarea',{attrs:{"placeholder":"请输入脚本任务","rows":4},model:{value:(_vm.formData.scriptValue),callback:function ($$v) {_vm.$set(_vm.formData, "scriptValue", $$v)},expression:"formData.scriptValue"}})],1)],1)],1)],1)}
-var select_typevue_type_template_id_695b5299_staticRenderFns = []
+var select_typevue_type_template_id_7da53fb8_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
@@ -161622,6 +161622,15 @@ const tagColumns = [{
         showQuickJumper: true,
         total: 0
       },
+      ipagination1: {
+        current: 1,
+        pageSize: 10,
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        total: 0
+      },
       ipagination2: {
         current: 1,
         pageSize: 10,
@@ -161687,6 +161696,7 @@ const tagColumns = [{
       cacheSeletedRows: [],
       val: "",
       data: [],
+      data1: [],
       columns,
       grpupColumns,
       formUserColumns,
@@ -161697,10 +161707,15 @@ const tagColumns = [{
       }],
       url: {
         userWithDepart: "/sys/user/userDepartList" // 引入为指定用户查看部门信息需要的url
+      },
+
+      params: {
+        assigneeType: '',
+        //个人Assingee  候选人CandidateUsers  候选组CandidateGroups  表单用户CandidateFormUsers  关系矩阵relationMatrix
+        assigneeVal: ''
       }
     };
   },
-
   methods: {
     clear() {
       this.showname = false;
@@ -161714,6 +161729,7 @@ const tagColumns = [{
       };
     },
     init(key, formId, taskAssignee) {
+      debugger;
       this.defaultKey = key;
       this.clear();
       this.formData = Object.assign(this.formData, {
@@ -161726,9 +161742,17 @@ const tagColumns = [{
           departId: 'applyUserDepart'
         }
       });
+      if (key === 'relationMatrix') {
+        this.params.assigneeType = taskAssignee.assigneeType;
+        this.params.assigneeVal = taskAssignee.assigneeList && taskAssignee.assigneeList.length > 0 ? taskAssignee.assigneeList.map(item => item.tagId).join(',') : '';
+      } else {
+        this.params.assigneeType = taskAssignee.assigneeType;
+        this.params.assigneeVal = taskAssignee.assigneeVal;
+      }
       this.m_tagQuery.tagName = '';
       this.tagQuery.tagName = '';
       this.getpersonal(); //获取人员列表
+      this.getpersonalUser();
       this.getCandidateUsers();
       this.getTagList();
       if (key == "Assingee") {
@@ -161773,7 +161797,8 @@ const tagColumns = [{
         this.setCacheSeletedRows(taskAssignee);
       }
       (0,manage/* getAction */.s7)("/workflow/getFormUserMap", {
-        formId: formId
+        formId: formId,
+        ...this.params
       }).then(res => {
         if (res.success) {
           console.log(this.formData, this.cacheSeletedRows);
@@ -161806,15 +161831,33 @@ const tagColumns = [{
     },
     //获取个人列表
     getpersonal() {
-      QueryCandidatePersonal(this.query).then(res => {
+      console.log(this.params);
+      QueryCandidatePersonal({
+        ...this.query,
+        ...this.params
+      }).then(res => {
         this.data = res.result.records;
         this.ipagination.total = res.result.total;
       });
     },
+    getpersonalUser() {
+      (0,manage/* getAction */.s7)("workflow/queryCandidatePersonalUsers", {
+        ...this.query,
+        ...this.params
+      }).then(res => {
+        if (res.success) {
+          this.data1 = res.result.records;
+          this.ipagination1.total = res.result.total;
+        }
+      });
+    },
     //获取候选组
     getCandidateUsers(idx) {
       this.query2.id = idx;
-      QueryCandidateSet(this.query2).then(res => {
+      QueryCandidateSet({
+        ...this.query2,
+        ...this.params
+      }).then(res => {
         this.groupData = res.result.records;
         this.ipagination2.total = res.result.total;
       });
@@ -161828,7 +161871,7 @@ const tagColumns = [{
       (0,manage/* getAction */.s7)('/zhxymatrix/tags/list', Object.assign({}, this.tagQuery, {
         pageNo,
         pageSize
-      })).then(res => {
+      }, this.params)).then(res => {
         this.tagData = res.result.records;
         this.tagIpagination.current = res.result.current;
         this.tagIpagination.total = res.result.total;
@@ -161846,6 +161889,13 @@ const tagColumns = [{
       this.query.pageSize = pagination.pageSize;
       this.getpersonal();
     },
+    handleTableChange1(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      this.ipagination1 = pagination;
+      this.query.pageNo = pagination.current;
+      this.query.pageSize = pagination.pageSize;
+      this.getpersonalUser();
+    },
     handleTableChange2(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       this.ipagination2 = pagination;
@@ -161886,6 +161936,7 @@ const tagColumns = [{
       this.query.pageNo = 1;
       this.query2.pageNo = 1;
       this.ipagination.current = 1;
+      this.ipagination1.current = 1;
       this.ipagination2.current = 1;
       let params = {
         depId: e
@@ -161897,8 +161948,10 @@ const tagColumns = [{
           this.showuser = true;
         }
       });
-      if (this.defaultKey == "Assingee" || this.defaultKey == "CandidateUsers") {
+      if (this.defaultKey == "Assingee") {
         this.getpersonal();
+      } else if (this.defaultKey == "CandidateUsers") {
+        this.getpersonalUser();
       } else if (this.defaultKey == "CandidateGroups") {
         this.getCandidateUsers(e);
       }
@@ -161915,6 +161968,8 @@ const tagColumns = [{
         this.tagIpagination.current = 1;
         this.tagQuery = Object.assign(this.tagQuery, (0,lodash.cloneDeep)(this.m_tagQuery));
         this.getTagList();
+      } else if (this.defaultKey === 'CandidateUsers') {
+        this.getpersonalUser();
       } else {
         this.getpersonal();
       }
@@ -161966,12 +162021,19 @@ const tagColumns = [{
       this.clear();
       this.cacheSeletedRows = [];
       this.query.tagName = '';
-      if (activeKey == "Assingee" || activeKey == "CandidateUsers") {
+      if (activeKey == "Assingee") {
         this.showname = true;
         this.query.pageNo = 1;
         this.ipagination.current = 1;
         this.query.realname = '';
         this.getpersonal();
+      } else if (activeKey == "CandidateUsers") {
+        this.showname = true;
+        this.query.pageNo = 1;
+        this.ipagination1.current = 1;
+        this.query.realname = '';
+        this.getpersonalUser();
+        // this.showname = false;
       } else if (activeKey == "CandidateGroups") {
         this.getCandidateUsers(this.query.depId);
         // this.showname = false;
@@ -162005,6 +162067,14 @@ const tagColumns = [{
         pageNo: 1,
         pageSize: 10
       };
+      this.query2 = {
+        pageNo: 1,
+        pageSize: 10
+      };
+      this.params = {
+        assigneeType: '',
+        assigneeVal: ''
+      };
       this.ipagination = {
         current: 1,
         pageSize: 10,
@@ -162014,6 +162084,24 @@ const tagColumns = [{
         showQuickJumper: true,
         total: 0
       };
+      this.ipagination1 = {
+        current: 1,
+        pageSize: 10,
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        total: 0
+      };
+      this.ipagination2 = {
+        current: 1,
+        pageSize: 10,
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        total: 0
+      };
     },
     handleOk(e) {
       let currentVal = "";
@@ -162072,8 +162160,8 @@ const tagColumns = [{
 ;
 var select_type_component = (0,componentNormalizer/* default */.Z)(
   flow_select_typevue_type_script_lang_js_,
-  select_typevue_type_template_id_695b5299_render,
-  select_typevue_type_template_id_695b5299_staticRenderFns,
+  select_typevue_type_template_id_7da53fb8_render,
+  select_typevue_type_template_id_7da53fb8_staticRenderFns,
   false,
   null,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.364",
+  "version": "1.1.365",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",