eoss-mobiles 0.3.37 → 0.3.39

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

@@ -0,0 +1,559 @@
+<template>
+  <div class="process-handle">
+
+    <div
+      style="display: flex; flex-direction: column; height: 100%"
+    >
+      <div class="process-content">
+        <!-- 当前节点 -->
+        <div class="present-node">
+          <div class="label">当前节点:</div>
+          <div>{{itemName }}</div>
+        </div>
+        <!-- 意见 -->
+        <Opinion
+          :esign="esign"
+          :esignLineWidth="
+            $attrs['esign-line-width'] || $attrs['esignLineWidth']
+          "
+          @onInputOpintion="onInputOpintion"
+          :baseUrl="baseUrl"
+          :isForceDisplayDefaultOptionForPrefix="
+            isForceDisplayDefaultOptionForPrefix
+          "
+          :pendingItemHandleDescription="pendingItemHandleDescription"
+          :placeholder="
+            pendingItemHandleDescription || opinionHandleExplainText
+          "
+          :nodeDefaultSubmitOpinion="nodeDefaultSubmitOpinion"
+          :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
+          :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
+        ></Opinion>
+        <!-- 审核内容 -->
+        <div class="special-box input-box" v-if="typeCode != 'fenyue'">
+      
+          <div >
+            
+            <!-- 下一步所有相关操作-->
+            <div
+            
+            >
+              <div class="next-box" >
+                <!-- 下步节点 -->
+                <div
+                  class="item"
+                  v-if="
+                    nodeList && nodeList.length > 0"
+                >
+                  <em-picker
+                    v-if="nextNodeCheckType == 'select'"
+                    title="下步节点"
+                    label="下步节点"
+                    required
+                    show-toolbar
+                    v-model="form.nextNodeName"
+                    label-width="100%"
+                    :columns="nodeList"
+                    value-key="nodeId"
+                    label-key="nodeName"
+                  />
+                  <em-input
+                    v-else
+                    value="下步节点"
+                    label="下步节点"
+                    required
+                    class="em-flow-next-steps"
+                    :disabled="true"
+                    label-position="top"
+                  >
+                    <template slot="input">
+                      <em-radio-group
+                        v-model="form.nextNodeId"
+                        :data="nodeList"
+                        value-key="nodeId"
+                        label-key="nodeName"
+                        direction="horizontal"
+                      />
+                    </template>
+                  </em-input>
+                </div>
+              </div>
+              <!-- 本单位-->
+              <!-- v-if="isHideCurrentOrg" -->
+              <div class="item" >
+                <em-selector
+                  v-model="nextCurrentOrgObjSelect"
+                  multiple
+                  :isAllCheck="isAllCheck"
+                  :paddingTop="paddingTop"
+                  isDepartment
+                  :objType="'enterprise'"
+                  tabs="employee,persongroup"
+                  :param="currentOrgSelectorParams"
+                  :disableds="currentOrgDisabledObjId"
+                  :baseUrl="apiBaseUrl"
+                  :isOtherUnit="false"
+                  :label="'本单位'"
+                  @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
+                />
+              </div>
+              <!-- 外单位 -->
+              <!-- v-if="isHideOtherOrg" -->
+              <div class="item">
+                <em-selector
+                  v-model="nextOtherOrgObjSelect"
+                  multiple
+                  :isAllCheck="isAllCheck"
+                  :paddingTop="paddingTop"
+                  :objType="'enterprise'"
+                  :param="foreignOrgSelectorParams"
+                  tabs="enterprise,filgroup"
+                  :baseUrl="apiBaseUrl"
+                  :disableds="otherOrgDisabledObjId"
+                  :isOtherUnit="true"
+                  :label="'外单位'"
+                  @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
+                />
+              </div>
+            </div>
+           
+            <!-- 通知方式 -->
+            <div class="item-msg item-msg2">
+              <Message
+                ref="message"
+                :code="'notification_type'"
+                :baseUrl="baseUrl"
+                :defaultNotificationType="defaultNotificationType"
+                :defaultNotificationMsg="form.notificationMsg"
+                @onInputMsg="onInputMsg"
+              ></Message>
+            </div>
+          </div>
+        </div>
+      </div>
+    
+      <div class="btn-list">
+        <div class="btn" @click="navigateBack">取消</div>
+        <div class="btn" @click="onSubmit()">确定</div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {
+  directStartTaskCircularRead,
+  getNotificationMsg,
+} from '../../../../src/config/api.js';
+import request from '../../../../src/utils/http.js';
+import Opinion from './Opinion.vue';
+import Message from './Message.vue';
+export default {
+  name: 'Handle',
+  inheritAttrs: false,
+  components: {
+    Opinion,
+    Message,
+  },
+  props: {
+    businessId: String, 
+    identityIds: String, //用户id
+    beforeSubmit: Function,
+    orgId: String, //单位id
+    depId: String, //部门id
+    baseUrl: String,
+    apiBaseUrl: String,
+    typeCode: String,
+    type: String,
+    paddingTop: {
+      type: [String, Number],
+      default: 0
+    },
+    defId:{
+        type: String,
+        default: ''
+    },
+    isAllCheck: {
+      type: Boolean,
+      default: false
+    },
+    isPreset: {
+      type: Boolean,
+      default: false
+    },
+    esign: {
+      type: Boolean,
+      default: false
+    },
+    userId: {
+      type: String,
+      default: ''
+    },
+    itemName:{
+        type: String,
+        default: '拟稿'
+    },
+    nextNodeCheckType:{
+        type: String,
+        default: ''
+    },
+    title:{
+        type: String,
+        default: ''              
+    }
+  },
+  data() {
+    return {
+      AddSignList: [
+        { name: '前置加签', value: 'preAddSign' },
+        { name: '后置加签', value: 'postAddSign' }
+      ],
+      currentOrgSelectorParams: {  },
+      currentOrgSelectorTabs: 'employee, persongroup',
+      foreignOrgSelectorTabs: 'enterprise,filgroupobj',
+      foreignOrgSelectorParams: {  roleid: '' },
+      otherOrgDisabledObjId: [],
+      currentNodeEnableItemHandleDescription: false,
+      pendingItemHandleDescription: '',
+      taskOperationShiftedNodeList: null,
+      oldNextOperate: '',
+      processFormType: 'freeStart',
+      currentOrgDisabledObjId: [],
+      nextNodeDefault: 0,
+      showDefList: false,
+      deptRoleCode: '',
+      readOnlyNotificationType: '',
+      notificationMessageReadOnly: false,
+      freeStartFlowParams: {}, //自由发起流程参数
+      taskParams: {},
+      isCanPreAddSign: false,
+      showAppUnit: false, // 弹窗单位
+      handleFlow: true,
+      freeValid: true,
+      showFreeStart: false,
+      freeStartInfo: {},
+      isReject: false,
+      opinionHandleExplainText: undefined,
+      isCurrentNodeForbiddenChangeCandidate: 0,
+      nodeFixedOpinionSelectList: [],
+      isChooseNextNode: 1, //是否展示下步操作
+      pid: 'root', //树选中pid
+      objType: 'enterprise', //树点击对象
+      selectType: 'employee', // 树 选择类型
+      isNextBox: true, // 是否展开隐藏下步操作
+      isForceDisplayDefaultOptionForPrefix: false,
+      isOtherUnit: true, //是否是外单位
+      isShowNode: false,
+      subProcessInfo: '',
+      isNodeShowProcess: false, //是否展示主办
+      isHiddenOftenOpinion: undefined, //是否隐藏常用意见
+      isAddSignList: [
+        { name: '是', value: '1' },
+        { name: '否', value: '2' }
+      ],
+      taskReadOpinionRequired: undefined,
+      form: {
+        opinion: undefined, // 审批意见
+        nextCurrentOrgObj: undefined, // 	本单位对象
+        nextCurrentOrgObjSerialId: undefined, //本单位办理对象序列id
+        nextOtherOrgObj: undefined, //外单位对象
+        nextOtherOrgObjSerialId: undefined, //外单位办理对象序列id
+        notificationMsg: undefined, //通知消息
+        nextNodeName:3,
+        nextNodeId:3
+      },
+      isCanFenyue: '0',
+      
+      nextCurrentOrgObjSelect: [], // 选中本单位
+      nextOtherOrgObjSelect: [], //选中外单位
+      nextReadUserSelectList: [], //分阅选择数组
+      nodeList: [{nodeId:3,nodeName:'传阅'}], // 流程节点列表
+     
+      opinionList: [], // 意见列表
+     
+      userInfo: {}, // 用户信息
+      isCanAddSign: false, //是否显示加签
+      isCanRemoveSign: false, //是否显示减签
+      isSpecial: true, //判断审核内容是否显示（是否是正常的办理页面）
+      taskOperations: [], //下一步操作
+      countersignaturetypeCode: false, //用来判断处理方式是否显示
+      countersignaturetypeText: undefined, // 处理方式
+      isCustomPreset: false, // 是否允许预设节点
+      isHideCurrentOrg: false, //是否隐藏本单位(承办)
+      isHideOtherOrg: false, //是否隐藏外单位(承办)
+      isHandleExplain: false, // 是否允许办理说明
+      isTaskread: false, //是否分阅
+      defaultNotificationType: undefined, ///默认选中通知类型
+      selectUnitType: 'department', //单位树选择类型
+      isHiddenNextStepInfo: false, //是否隐藏下一步节点信息和接收人信息
+      presetEdit: true, //预设是否允许编辑
+      isLimitedTimeHandling: false, //是否支持发起子流程限时办理
+      userSelectionType: undefined, //处理人选择方式
+      orgSelectionType: undefined, //办理机构选择方式
+      notificationType: undefined, // 通知方式
+      nodeType: undefined, // 节点类型(普通节点0,承办节点1,会签节点2,阅办节点3)
+      deptRoleCode: undefined, //本单位角色
+      orgRoleCode: undefined, //外单位角色
+      appointNotUserIds: undefined, //业务指定非处理人
+      handleRoleId: undefined, //办理角色(一般选择范围是部门/单位使用)
+      nextRole: undefined, //下步节点默认角色
+      filterCandinateIds: undefined, //节点过滤办理人
+      selectorDefShowDeptId: undefined, //选择器默认展示部门
+      isRadio: true, //下步办理人是否单选
+      otherOrgName: undefined, //外单位名字
+      currentOrgName: undefined, //本单位名字
+      isMainSubProcess: false, // 判断是否子-主流程
+      isNextUser: false, // 判断是否显示下步办理人
+      isDealObject: false, //判断是否显示办理对象
+      isDealRole: false, //判断是否显示办理角色
+      nextUserflag: false,
+      isSubmitButtonShowAgreeAndDisagree: 0, //是否展示同意和不同意按钮
+      isCustomUserClick: false, //下步办理人选择是否可以点击
+      timeListLable: undefined, //用来判断是哪里点开的时间遮罩层
+      nodeDefaultSubmitOpinion: undefined, //默认提交意见
+      isCustomUser: 0, //是否可选中办理人
+      choiceOrgId: '',
+      choiceDeptId: '',
+      taskExamineInfo: {},
+      nodeInfoMapInfo: {},
+      flowDefList: [],
+      file: '',
+      isEndUserTask: '',
+      tagKey: '',
+      pOrgId: '',
+      customPresetHintMessage: '',
+      enableCustomLimitTimeSetting: false,
+      showCustomLimitTimeText: false,
+      needRetrialAuth: false,
+      defaultNextNode: ''
+    };
+  },
+  created() {
+    this.getMessage()
+    this.currentOrgSelectorParams.employee ={pid: this.orgId}
+    this.foreignOrgSelectorParams.filgroup ={pid: 'root',myUserid:this.userId}
+  },
+  computed: {
+  },
+  methods: {
+    getMessage(){
+        let params = {
+            url:getNotificationMsg,
+            params:{
+              processDefinitionId:this.defId,
+              businessId:this.businessId,
+              openMode:'samepage'
+            }
+        }
+        request(params).then((res) => { 
+            if(res.rCode == 0 || res.status == "success"){
+                this.form.notificationMsg = res.message.replace('{title}',this.title || '')
+            }
+        });
+    },
+     navigateBack() {
+      this.$parent.$emit('close');
+    },
+     // 通知消息回调
+    onInputMsg(obj) {
+      this.form.notificationType = obj.notificationType.join(',');
+      this.form.notificationMsg = obj.notificationMsg;
+    },
+onSubmit() { 
+    let params = {
+        url:directStartTaskCircularRead,
+        params:{
+           businessId:this.businessId,
+            processDefinitionId:this.defId,
+            notificationMsg:this.form.notificationMsg,
+            notificationType:this.form.notificationType,
+            opinion:this.form.opinion,
+            nextOtherOrgObj:this.form.nextOtherOrgObj,
+            nextCurrentOrgObj:this.form.nextCurrentOrgObj,
+        },
+        type:'post'
+    }
+     this.$toast.loading({
+        message: '提交中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
+    request(params).then(res => { 
+          this.$toast.clear();
+          if (res.rCode == 0 || res.status == 'success') {
+            this.$toast.success('提交成功');
+            this.$parent.$emit('success');
+          } else {
+            this.$toast(res.message || '系统错误，请联系管理员！');
+            setTimeout(() => {
+              this.$parent.$emit('error');
+            }, 1000);
+          }
+    })
+    },
+    // 删除
+    delteList(label, i) {
+      if (label === 'nextUserSelectList') {
+        let _this = this;
+        let id = _this.nextUserSelectList[i].showid;
+        this.nextUserList.find((i) => {
+          if (i.userId === id) {
+            _this.$set(i, 'checked', false);
+          }
+        });
+        this[label].splice(i, 1);
+      } else {
+        this[label].splice(i, 1);
+      }
+    },
+    // 选择办理人
+    onClickPeople(id) {
+      this.showAppUser = true;
+      this.selectList = this[id];
+      this.$nextTick(function () {
+        this.$refs.selectTree.getContent(id);
+      });
+    },
+    // 选择单位
+    onClickOrg(id) {
+      this.isOtherUnit = id === 'nextCurrentOrgObjSelect' ? false : true;
+      this.selectUnitType =
+        id === 'nextCurrentOrgObjSelect' ? 'department,employee' : 'department';
+      this.showAppUnit = true;
+      this.$nextTick(function () {
+        this.$refs.selectTreeUnit.getContent(id);
+      });
+    },
+
+
+    // 意见回调
+    onInputOpintion(val) {
+      const { opinion, isImageOpinion, file } = val;
+      this.form.opinion = opinion;
+      this.form.isImageOpinion = isImageOpinion;
+      this.file = file;
+    },
+    // 办理人选择完回调
+    disposeAppUser(res, type) {
+      this[type] = res.list;
+      let label = '';
+      if (type) {
+        label = type.substring(0, type.lastIndexOf('SelectList'));
+      } else {
+        label = res.label.substring(0, res.label.lastIndexOf('SelectList'));
+      }
+
+      let idStr = '';
+      if (res.list) {
+        res.list.map((r, i) => {
+          idStr = idStr + r.showid + (i === res.list.length - 1 ? '' : ',');
+        });
+      } else {
+        res.map((r, i) => {
+          idStr = idStr + r.showid + (i === res.length - 1 ? '' : ',');
+        });
+      }
+      this.form[label + 'Id'] = idStr;
+    },
+    // 单位选择完回调
+    disposeAppUnit(res, type) {
+      let label = type.substring(0, type.lastIndexOf('Select'));
+      let idStr = '';
+      let types = '';
+      let SerialId = [];
+      this.form[label + 'Name'] = '';
+      let obj = {};
+      res.list.map((r, i) => {
+        if (!types || types.indexOf(r.mixType) == -1) {
+          idStr = !types
+            ? r.mixType +
+              '-' +
+              r.showid +
+              (i === res.list.length - 1 ? '' : ',')
+            : idStr +
+              '|' +
+              r.mixType +
+              '-' +
+              r.showid +
+              (i === res.list.length - 1 ? '' : ',');
+          types = types ? types + ',' + r.mixType : r.mixType;
+        } else {
+          idStr = idStr + r.showid + (i === res.list.length - 1 ? '' : ',');
+        }
+        SerialId.push(r.showid);
+        if (obj[r.mixType]) {
+          obj[r.mixType].push(r.showname);
+        } else {
+          obj[r.mixType] = [r.showname];
+        }
+      });
+      this.form[label] = idStr;
+      for (let key in obj) {
+        if (
+          key === 'enterprise' &&
+          this.form[label + 'Name'].indexOf('[企业]') == -1
+        ) {
+          this.form[label + 'Name'] = this.form[label + 'Name']
+            ? this.form[label + 'Name'] + '|' + '[企业]-' + obj[key].join(',')
+            : '' + '[企业]-' + obj[key].join(',');
+        }
+        if (
+          key === 'department' &&
+          this.form[label + 'Name'].indexOf('[部门]') == -1
+        ) {
+          this.form[label + 'Name'] = this.form[label + 'Name']
+            ? this.form[label + 'Name'] + '|' + '[部门]-' + obj[key].join(',')
+            : '' + '[部门]-' + obj[key].join(',');
+        }
+        if (
+          key === 'employee' &&
+          this.form[label + 'Name'].indexOf('[部门员工]') == -1
+        ) {
+          this.form[label + 'Name'] = this.form[label + 'Name']
+            ? this.form[label + 'Name'] +
+              '|' +
+              '[部门员工]-' +
+              obj[key].join(',')
+            : '' + '[部门员工]-' + obj[key].join(',');
+        }
+      }
+      // this.form[label + 'Name'] = obj.enterprise?;
+      this.form[label + 'SerialId'] = SerialId.join(',');
+      this.form[label + 'Json'] = JSON.stringify(res.list);
+    },
+  
+
+ 
+    // 修改默认办理人
+    changeDefPeople(def, all) {
+      this.nextUserSelectList = [];
+      if ((def == 1 && all == 1) || (def == 0 && all == 1)) {
+        let ids = '';
+        this.nextUserList.map((r, i) => {
+          r.showid = r.userId;
+          r.showname = r.username;
+          this.$set(r, 'checked', true);
+          this.nextUserSelectList.push(r);
+          ids += r.userId + (i === this.nextUserList.length - 1 ? '' : ',');
+        });
+        this.form.nextUserId = ids;
+      } else if (
+        def == 1 &&
+        (!all || all == 0) &&
+        this.nextUserList.length > 0
+      ) {
+        this.nextUserList[0].showid = this.nextUserList[0].userId;
+        this.nextUserList[0].showname = this.nextUserList[0].username;
+        this.$set(this.nextUserList[0], 'checked', true);
+        this.nextUserSelectList.push(this.nextUserList[0]);
+        this.form.nextUserId = this.nextUserSelectList[0].userId;
+      }
+    },
+  }
+};
+</script>
+
+<style></style>

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

@@ -540,6 +540,7 @@
                 :code="'notification_type'"
                 onlyShowType
                 :baseUrl="baseUrl"
+                :pendingId="pendingId"
                 @onInputMsg="onInputMsgUrge"
                 :required="true"
               ></Message>
@@ -553,6 +554,7 @@
                 :baseUrl="baseUrl"
                 :readOnlyNotificationType="readOnlyNotificationType"
                 :notificationMessageReadOnly="notificationMessageReadOnly"
+                :pendingId="pendingId"
                 :defaultNotificationType="defaultNotificationType"
                 :defaultNotificationMsg="form.notificationMsg"
                 @onInputMsg="onInputMsg"
@@ -665,10 +667,10 @@ export default {
         { name: '前置加签', value: 'preAddSign' },
         { name: '后置加签', value: 'postAddSign' }
       ],
-      currentOrgSelectorParams: { pid: 'root' },
+      currentOrgSelectorParams: {  },
       currentOrgSelectorTabs: 'employee, persongroup',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
-      foreignOrgSelectorParams: { pid: 'root', roleid: '' },
+      foreignOrgSelectorParams: {  roleid: '' },
       otherOrgDisabledObjId: [],
       currentNodeEnableItemHandleDescription: false,
       pendingItemHandleDescription: '',
@@ -1139,7 +1141,7 @@ export default {
         return;
       }
       if (this.form.isLimitedTime === '1' && this.form.advanceNoticeHour) {
-        this.$toast('请选择提通知时间');
+        this.$toast('请选择通知时间');
         return;
       }
       if (this.form.isLimitedTime === '1' && this.form.advanceNoticeType) {
@@ -1615,11 +1617,14 @@ export default {
               let foreignOrgparams =
                 currentOrgSelectorParams.foreignOrgRange.split(',');
               that.foreignOrgSelectorTabs.map((x, i) => {
+                console.log(x,'aaaaa')
                 that.foreignOrgSelectorParams[x] = {
                   pid:
                     foreignOrgparams[i] == 'my'
                       ? choiceOrgId
-                      : foreignOrgparams[i]
+                      :foreignOrgparams[i] == 'other'? 'root' : foreignOrgparams[i],
+                  nofilid:foreignOrgparams[i] == 'other'?1 : 0,
+                //  myUserid:x == 'filgroup'? $.getStorage('userId') : ''
                 };
               });
               that.foreignOrgSelectorTabs = that.foreignOrgSelectorTabs.join(',')

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="flow-message">
+  <div class="flow-message" v-show="newList.length>0">
     <em-input :label="label" readonly :required="required">
       <template slot="input">
         <div class="template-input-two" style="width: 100%">
@@ -87,6 +87,10 @@ export default {
     userId: {
       type: String,
       default: ''
+    },
+    pendingId:{
+      type: String,
+      default: ''
     }
   },
   mounted() {
@@ -147,6 +151,8 @@ export default {
         this.form.notificationType = JSON.parse(JSON.stringify(arr));
         this.showCheck = this.showCheckType
         // this.$emit('onInputMsg', this.form);
+      }else{
+        this.showCheck = this.showCheckType
       }
       
     },
@@ -155,7 +161,8 @@ export default {
         url: this.baseUrl ? this.baseUrl + findSysCode : findSysCode,
         type: 'get',
         params: {
-          ccCode: this.code
+          ccCode: this.code,
+          pendingId:this.pendingId
         }
       };
       request(params)

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

@@ -235,6 +235,12 @@ export default {
           })
           .then(() => {
             this.opinion = this.pendingItemHandleDescription;
+             const { isImageOpinion, file } = this;
+            this.$emit('onInputOpintion', {
+              opinion: this.opinion,
+              isImageOpinion,
+              file
+            });
             this.$refs.opinionInp[0].$children[0].focus();
           })
           .catch(() => {

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

@@ -34,6 +34,7 @@
           :defaultNotificationType="defaultNotificationType"
           :defaultNotificationMsg="form.notificationMsg"
           @onInputMsg="onInputMsg"
+          :pendingId="pendingId"
           :type="type"
         ></Message>
       </div>
@@ -259,7 +260,7 @@ export default {
         } else {
           this.$toast(message);
           setTimeout(() => {
-            this.goBack;
+            this.goBack();
           }, 1000);
         }
       });

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

@@ -85,6 +85,7 @@
             :defaultNotificationType="defaultNotificationType"
             :baseUrl="baseUrl"
             :showMsg="true"
+            :pendingId="pendingId"
             @onInputMsg="onInputMsg"
           ></Message>
         </div>

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

@@ -84,6 +84,7 @@
           :notificationMessageReadOnly="notificationMessageReadOnly"
           :defaultNotificationType="infoList.noticeType"
           :defaultNotificationMsg="infoList.noticeInfo"
+          :pendingId="pendingId"
           @onInputMsg="onInputMsg"
         ></Message>
       </div>