eoss-mobiles 0.2.97 → 0.2.99

package/packages/flow/src/components/ProcessSettings.vue

@@ -0,0 +1,319 @@
+<template>
+  <div class="em-flow-setting">
+    <van-collapse v-model="active">
+      <van-collapse-item title="预设自定义节点信息（折叠不作处理）" name="1">
+        <div
+          class="em-flow-setting-item"
+          v-for="(item, index) in flowList"
+          :key="index"
+        >
+          <!-- <em-input v-model="name" :label="`节点${index + 1}`" /> -->
+          <em-picker
+            :title="`节点${index + 1}`"
+            :label="`节点${index + 1}`"
+            show-toolbar
+            v-model="item.nodeId"
+            :columns="item.nodeList"
+            value-key="nodeId"
+            label-key="nodeName"
+            @confirm="onConfirmNextNode($event, index)"
+          />
+          <em-selector
+            :multiple="!item.isRadio"
+            v-show="item.showSelectUser"
+            :nextUserList="item.nextUserList"
+            v-model="item.nextUserSelectList"
+            label="办理人"
+            :objType="item.objType"
+            :param="{
+              pid: item.pid
+            }"
+            :required="item.nodeId != ''"
+            tabs="employee,persongroup"
+            :baseUrl="apiBaseUrl"
+            :paddingTop="paddingTop"
+          />
+          <van-icon
+            name="down"
+            v-show="index + 1 != flowList.length"
+            style="margin-top: 10px"
+          /></div></van-collapse-item
+    ></van-collapse>
+  </div>
+</template>
+
+<script>
+import {
+  getPresetCustomInfo,
+  getNodeInfoHtml
+} from '../../../../src/config/api.js';
+import request from '../../../../src/utils/http.js';
+export default {
+  props: {
+    processDefinitionId: {
+      type: String,
+      default: ''
+    },
+    nodeId: {
+      type: String,
+      default: ''
+    },
+    businessId: {
+      type: String,
+      default: ''
+    },
+    taskId: {
+      type: String,
+      default: ''
+    },
+    pendingId: {
+      type: String,
+      default: ''
+    },
+    apiBaseUrl: {
+      type: String,
+      default: ''
+    },
+    paddingTop: {
+      type: Number,
+      default: 0
+    },
+    choiceOrgId: {
+      type: String,
+      default: ''
+    },
+    pOrgId: {
+      type: String,
+      default: ''
+    },
+    choiceDeptId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      name: '',
+      pid: 'root',
+      objType: 'enterprise',
+      selectType: 'employee',
+      active: ['1'],
+      flowList: [],
+      selectList: [],
+      isRadio: true,
+      nodeList: []
+    };
+  },
+  watch: {
+    nodeId: {
+      handler(val) {
+        if (val) {
+          //   this.getProList(val);
+          this.getNodeInfo(val);
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    getValue() {
+      let pass = true;
+      let PresetData = [];
+      let newFlowList = this.flowList.filter((x) => x.nodeId);
+      for (let i = 0; i < newFlowList.length; i++) {
+        if (newFlowList[i].nextUserSelectList.length == 0 && newFlowList[i].showSelectUser) {
+          pass = false;
+          this.$toast(`请选择节点${i + 1}的办理人`);
+          return false;
+        }
+      }
+      if (pass) {
+        newFlowList.map((x, i) => {
+            PresetData.push({
+            name: typeof x.nodeId == 'object'? x.nodeId.nodeId : x.nodeId,
+            value: x.nextUserSelectList
+              .map((y) => {
+                return y.showid;
+              })
+              .join(','),
+            lastName: i == 0 ? this.nodeId : PresetData[i - 1].name,
+            sequence: i + 1 +''
+          });
+        });
+      }
+      return JSON.stringify(PresetData);
+    },
+    // 根据返回的办理人类型来判断 选择人员树的范围
+    changePidObjtype(val, choiceOrgId, choiceDeptId, pOrgId, obj) {
+      if (val === 1 || val === 2) {
+        obj.pid = choiceOrgId || this.orgId;
+        obj.objType = 'enterprise';
+        obj.selectType = 'employee';
+      } else if (val === 3 || val === 4) {
+        obj.pid = 'root';
+        obj.objType = 'employee';
+      } else if (val === 5 || val === 6) {
+        obj.pid = choiceDeptId || this.depId;
+        obj.objType = 'department';
+      } else if (val === 11 || val === 12) {
+        obj.selectType = 'employee';
+        obj.objType = 'enterprise';
+      } else if (val === 13) {
+        obj.pid = choiceDeptId || this.depId;
+        obj.selectType = 'employee';
+        obj.objType = 'department';
+      } else if (val === 14) {
+        obj.pid = pOrgId || this.orgId;
+        obj.selectType = 'employee';
+      } else if (val === 15 || val === 16) {
+        obj.pid = pOrgId || this.orgId;
+        obj.selectType = 'employee';
+      }
+      // userSelectionType 机构内单选人1,机构内多选人2,所有机构单选人3,所有部门多选人4,本部门单选人5,本部门多选人6,本单位单选部门7,本单位多选部门8,单选单位9,多选单位10,单选机构11,多选机构12,本部门角色13,本单位角色14
+      val == 2 ||
+      val == 4 ||
+      val == 6 ||
+      val == 8 ||
+      val == 10 ||
+      val == 11 ||
+      val == 12
+        ? (obj.isRadio = false)
+        : (obj.isRadio = true); //判断办理人单选多选
+    },
+    // 修改默认办理人
+    changeDefPeople(def, all, data) {
+      data.nextUserSelectList = [];
+      if ((def == 1 && all == 1) || (def == 0 && all == 1)) {
+        let ids = '';
+        data.nextUserList.map((r, i) => {
+          r.showid = r.userId;
+          r.showname = r.username;
+          this.$set(r, 'checked', true);
+          data.nextUserSelectList.push(r);
+          ids += r.userId + (i === data.nextUserList.length - 1 ? '' : ',');
+        });
+        // this.form.nextUserId = ids;
+      } else if (
+        def == 1 &&
+        (!all || all == 0) &&
+        data.nextUserList.length > 0
+      ) {
+        data.nextUserList[0].showid = data.nextUserList[0].userId;
+        data.nextUserList[0].showname = data.nextUserList[0].username;
+        this.$set(data.nextUserList[0], 'checked', true);
+        data.nextUserSelectList.push(data.nextUserList[0]);
+        // this.form.nextUserId = this.nextUserSelectList[0].userId;
+      }
+    },
+    onConfirmNextNode(val, i) {
+      this.flowList = this.flowList.splice(0, i + 1);
+      if (val.nodeId == '-2') {
+        this.flowList[i].nextUserList = [];
+        this.flowList[i].nextUserSelectList = [];
+      } else {
+        this.getNodeInfo(val.nodeId, i);
+      }
+    },
+    getNodeInfo(nodeId, i) {
+      this.$toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
+      request({
+        url: getNodeInfoHtml,
+        params: {
+          processDefinitionId: this.processDefinitionId,
+          nextNodeId: nodeId,
+          businessId: this.businessId,
+          taskId: this.taskId,
+          pendingId: this.pendingId
+        }
+      }).then((res) => {
+        if (res.status == 'success') {
+          //   this.nodeList = res.data.taskNodeMap;
+          let obj = {};
+          if (i != undefined) {
+            res.data.nextUserList.map((res) => {
+              res.checked = false;
+            });
+
+            this.flowList[i].nextUserList = res.data.nextUserList || [];
+            this.flowList[i].nextUserSelectList = res.data.nextUserList || [];
+            this.changeDefPeople(
+              res.data.nodeExtAttr.isDefSelectedObj,
+              res.data.nodeExtAttr.isSelectedAllObj,
+              this.flowList[i]
+            );
+            this.changePidObjtype(
+              res.data.nodeExtAttr.userSelectionType,
+              this.choiceOrgId,
+              this.choiceDeptId,
+              this.pOrgId,
+              this.flowList[i]
+            );
+          } else {
+            obj.nextUserList = res.data.nextUserList || [];
+            obj.nextUserSelectList = res.data.nextUserList || [];
+            this.changeDefPeople(
+              res.data.nodeExtAttr.isDefSelectedObj,
+              res.data.nodeExtAttr.isSelectedAllObj,
+              obj
+            );
+            this.changePidObjtype(
+              res.data.nodeExtAttr.userSelectionType,
+              this.choiceOrgId,
+              this.choiceDeptId,
+              this.pOrgId,
+              obj
+            );
+          }
+          this.getProList(nodeId, obj);
+        }
+      });
+    },
+    getProList(nodeId, obj) {
+      request({
+        url: getPresetCustomInfo,
+        params: {
+          processDefinitionId: this.processDefinitionId,
+          nodeId: nodeId,
+          taskAction: 'withExtendData'
+        }
+      }).then((res) => {
+        this.$toast.clear();
+        if (res.status == 'success') {
+          let arr = [{ nodeId: '-2', nodeName: '请选择' }];
+          let isEnd = false;
+          if (res.data.taskNodeMap) {
+            for (let i in res.data.taskNodeMap || res.data || {}) {
+              let obj = {
+                nodeId: i,
+                nodeName: res.data.taskNodeMap[i]
+              };
+              isEnd = i == 'endEvent';
+              arr.push(obj);
+            }
+          }
+          if (isEnd) {
+            arr = arr.slice(1);
+          }
+          obj = {
+            ...obj,
+            nodeList: arr,
+            nodeId: '',
+            nodeId: isEnd ? arr[0].nodeId : '',
+            showSelectUser: !isEnd
+          };
+          this.flowList.push(obj);
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style></style>

package/packages/flow/src/components/TaskRead.vue

@@ -286,7 +286,6 @@ export default {
       })
         .then((res) => {
           const { status, message, data } = res;
-          this.loading = false;
           if (status === 'success') {
             this.form.notificationMsgType = message.split(',');
             this.defaultNotificationType = message.split(',');
@@ -313,7 +312,6 @@ export default {
           }
         })
         .catch((err) => {
-          this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -365,7 +363,6 @@ export default {
           }
         })
         .catch((err) => {
-          this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$toast(err.message);
           }

package/packages/selector/src/main.vue

@@ -1,169 +1,169 @@
-<template>
-  <div class="em-selector" @click="handleClick">
-    <selector-field
-      v-if="!this.$scopedSlots.input && !this.$slots.input && !showTree"
-      v-bind="$attrs"
-      :input-value="inputValue"
-      :data="selectList"
-      @change="handleChangeSel"
-      @click="handleSelector"
-    />
-    <slot v-else name="input" :click="handleSelector" />
-    <em-selector-tree
-      v-if="(showSelectorTree || showTree) && typeof value !== 'string'"
-      v-bind="$attrs"
-      v-on="$listeners"
-      :showTree="showTree"
-      :showMore="$listeners['left-icon'] == undefined"
-      :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
-      :selectList="selectList"
-      @dispose="handleDispose"
-      @close="handleDispose()"
-    >
-      <template
-        v-if="$scopedSlots['tree-icon']"
-        slot="tree-icon"
-        slot-scope="{ value }"
-      >
-        <slot
-          v-if="$scopedSlots['tree-icon']"
-          name="tree-icon"
-          :value="value"
-        ></slot>
-      </template>
-    </em-selector-tree>
-    <div v-if="typeof value === 'string'">
-      <em-selector-tree
-        v-show="showSelectorTree || showTree"
-        v-bind="$attrs"
-        v-on="$listeners"
-        :showTree="showTree"
-        :showMore="$listeners['left-icon'] == undefined"
-        :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
-        :selectList.sync="selectList"
-        @dispose="handleDispose"
-        @close="handleDispose()"
-      >
-        <template
-          v-if="$scopedSlots['tree-icon']"
-          slot="tree-icon"
-          slot-scope="{ value }"
-        >
-          <slot
-            v-if="$scopedSlots['tree-icon']"
-            name="tree-icon"
-            :value="value"
-          ></slot>
-        </template>
-      </em-selector-tree>
-    </div>
-  </div>
-</template>
-
-<script>
-import EmSelectorTree from './selector-tree.vue';
-import selectorField from './selector-field.vue';
-export default {
-  components: { EmSelectorTree, selectorField },
-  name: 'EmSelector',
-  inheritAttrs: false,
-  props: {
-    value: { type: [Array, String], default: () => [] },
-    showTree: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      showSelectorTree: false,
-      inputValue: ''
-      // newSelectList:[]
-    };
-  },
-  watch: {
-    value: {
-      handler(val) {
-        this.selectList = val;
-        if (this.selectList.length > 0) {
-          this.inputValue = this.selectList[0][
-            this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
-          ];
-        } else {
-          this.inputValue = '';
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  computed: {
-    selectList: {
-      get() {
-        return this.value;
-      },
-      set(val) {
-        this.$emit('input', val);
-      }
-    }
-  },
-  mounted() {
-    // this.selectList = this.value
-    // console.log(this)
-  },
-  methods: {
-    handleClick() {
-      this.$emit('click');
-    },
-    handleSelector() {
-      if (this.$attrs.disabled || this.$attrs.readonly) return;
-      this.showSelectorTree = !this.showSelectorTree;
-    },
-    /**
-     * handleDispose
-     * @desc:确认选人
-     * @date 2023年3月6日
-     * @author liufan
-     * @param {Object} val 选中的人员/单位
-     */
-    handleDispose(val) {
-      this.inputValue = '';
-      if (val) {
-        const { list } = val;
-        this.selectList = list;
-        if (val.list.length > 0) {
-          this.inputValue =
-            list[0][
-              this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
-            ];
-        } else {
-          this.inputValue = '';
-        }
-      }
-      this.showSelectorTree = false;
-    },
-    /**
-     * handleChangeSel
-     * @desc:输入框数据发生变化时
-     * @date 2023年3月6日
-     * @author liufan
-     * @param {Array} val 变化后的选中数据
-     */
-    handleChangeSel(val) {
-      if (val) {
-        const { list } = val;
-        this.selectList = list;
-        if (val.list.length > 0) {
-          this.inputValue =
-            list[0][
-              this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
-            ];
-        } else {
-          this.inputValue = '';
-        }
-      }
-      this.$emit('input', val.list);
-    }
-  }
-};
-</script>
+<template>
+  <div class="em-selector" @click="handleClick">
+    <selector-field
+      v-if="!this.$scopedSlots.input && !this.$slots.input && !showTree"
+      v-bind="$attrs"
+      :input-value="inputValue"
+      :data="selectList"
+      @change="handleChangeSel"
+      @click="handleSelector"
+    />
+    <slot v-else name="input" :click="handleSelector" />
+    <em-selector-tree
+      v-if="(showSelectorTree || showTree) && typeof value !== 'string'"
+      v-bind="$attrs"
+      v-on="$listeners"
+      :showTree="showTree"
+      :showMore="$listeners['left-icon'] == undefined"
+      :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
+      :selectList="selectList"
+      @dispose="handleDispose"
+      @close="handleDispose()"
+    >
+      <template
+        v-if="$scopedSlots['tree-icon']"
+        slot="tree-icon"
+        slot-scope="{ value }"
+      >
+        <slot
+          v-if="$scopedSlots['tree-icon']"
+          name="tree-icon"
+          :value="value"
+        ></slot>
+      </template>
+    </em-selector-tree>
+    <div v-if="typeof value === 'string'">
+      <em-selector-tree
+        v-show="showSelectorTree || showTree"
+        v-bind="$attrs"
+        v-on="$listeners"
+        :showTree="showTree"
+        :showMore="$listeners['left-icon'] == undefined"
+        :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
+        :selectList.sync="selectList"
+        @dispose="handleDispose"
+        @close="handleDispose()"
+      >
+        <template
+          v-if="$scopedSlots['tree-icon']"
+          slot="tree-icon"
+          slot-scope="{ value }"
+        >
+          <slot
+            v-if="$scopedSlots['tree-icon']"
+            name="tree-icon"
+            :value="value"
+          ></slot>
+        </template>
+      </em-selector-tree>
+    </div>
+  </div>
+</template>
+
+<script>
+import EmSelectorTree from './selector-tree.vue';
+import selectorField from './selector-field.vue';
+export default {
+  components: { EmSelectorTree, selectorField },
+  name: 'EmSelector',
+  inheritAttrs: false,
+  props: {
+    value: { type: [Array, String], default: () => [] },
+    showTree: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      showSelectorTree: false,
+      inputValue: ''
+      // newSelectList:[]
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.selectList = val;
+        if (this.selectList.length > 0) {
+          this.inputValue = this.selectList[0][
+            this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
+          ];
+        } else {
+          this.inputValue = '';
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  computed: {
+    selectList: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit('input', val);
+      }
+    }
+  },
+  mounted() {
+    // this.selectList = this.value
+    // console.log(this)
+  },
+  methods: {
+    handleClick() {
+      this.$emit('click');
+    },
+    handleSelector() {
+      if (this.$attrs.disabled || this.$attrs.readonly) return;
+      this.showSelectorTree = !this.showSelectorTree;
+    },
+    /**
+     * handleDispose
+     * @desc:确认选人
+     * @date 2023年3月6日
+     * @author liufan
+     * @param {Object} val 选中的人员/单位
+     */
+    handleDispose(val) {
+      this.inputValue = '';
+      if (val) {
+        const { list } = val;
+        this.selectList = list;
+        if (val.list.length > 0) {
+          this.inputValue =
+            list[0][
+              this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
+            ];
+        } else {
+          this.inputValue = '';
+        }
+      }
+      this.showSelectorTree = false;
+    },
+    /**
+     * handleChangeSel
+     * @desc:输入框数据发生变化时
+     * @date 2023年3月6日
+     * @author liufan
+     * @param {Array} val 变化后的选中数据
+     */
+    handleChangeSel(val) {
+      if (val) {
+        const { list } = val;
+        this.selectList = list;
+        if (val.list.length > 0) {
+          this.inputValue =
+            list[0][
+              this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
+            ];
+        } else {
+          this.inputValue = '';
+        }
+      }
+      this.$emit('input', val.list);
+    }
+  }
+};
+</script>