eoss-mobiles 0.3.34 → 0.3.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.34",
+  "version": "0.3.35",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

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

@@ -26,7 +26,7 @@
                 :placeholder="placeholder"
                 v-model="opinion"
                 ref="opinionInp"
-                autofocus
+                :autofocus="pendingItemHandleDescription && showDescription"
                 type="textarea"
                 rows="3"
                 @input="onInput"
@@ -54,7 +54,7 @@
             ref="opinionInp"
             type="textarea"
             rows="3"
-            autofocus
+            :autofocus="pendingItemHandleDescription && showDescription"
             @focus="handleFocus"
             @blur="handleBlur"
             @input="onInput"

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

@@ -52,7 +52,7 @@
                 label="下步节点"
                 required
                 show-toolbar
-                v-model="form.nextNodeName"
+                v-model="form.nextNodeId"
                 label-width="100%"
                 :columns="nodeList"
                 value-key="nodeId"
@@ -75,8 +75,8 @@
                 onlyMyOrg: false
               }"
               :disabled="
-                    !isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1
-                  "
+                !isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1
+              "
               :baseUrl="apiBaseUrl"
               :paddingTop="paddingTop"
               :objType="objType"
@@ -86,59 +86,59 @@
             />
           </div>
           <div class="item" v-if="enableCustomLimitTimeSetting">
-                <!-- <van-field
+            <!-- <van-field
                 value="主办"
                 label="主办"
                 :disabled="true"
                 placeholder="请选择"
               /> -->
-                <em-picker
-                  v-model="form.customLimitTime"
-                  v-if="!showCustomLimitTimeText"
-                  label="限时办理"
-                  title="限时办理"
-                  placeholder="请选择"
-                  sysAppCode="bpm_custom_limit_time"
-                  show-toolbar
+            <em-picker
+              v-model="form.customLimitTime"
+              v-if="!showCustomLimitTimeText"
+              label="限时办理"
+              title="限时办理"
+              placeholder="请选择"
+              sysAppCode="bpm_custom_limit_time"
+              show-toolbar
+            >
+              <template slot="button">
+                <em-button
+                  size="small"
+                  type="primary"
+                  @click="
+                    () => {
+                      form.customLimitTime = '';
+                      showCustomLimitTimeText = !showCustomLimitTimeText;
+                    }
+                  "
+                  >切换文本框</em-button
                 >
-                  <template slot="button">
-                    <em-button
-                      size="small"
-                      type="primary"
-                      @click="
-                        () => {
-                          form.customLimitTime = '';
-                          showCustomLimitTimeText = !showCustomLimitTimeText;
-                        }
-                      "
-                      >切换文本框</em-button
-                    >
-                  </template>
-                </em-picker>
-                <em-input
-                  v-else
-                  v-model="form.customLimitTime"
-                  center
-                  label="限时办理"
-                  clearable
-                  @change="changeCustomLimitTime"
-                  placeholder="请输入限时办理天数"
+              </template>
+            </em-picker>
+            <em-input
+              v-else
+              v-model="form.customLimitTime"
+              center
+              label="限时办理"
+              clearable
+              @change="changeCustomLimitTime"
+              placeholder="请输入限时办理天数"
+            >
+              <template slot="button">
+                <em-button
+                  size="small"
+                  type="primary"
+                  @click="
+                    () => {
+                      form.customLimitTime = '';
+                      showCustomLimitTimeText = !showCustomLimitTimeText;
+                    }
+                  "
+                  >切换选择框</em-button
                 >
-                  <template slot="button">
-                    <em-button
-                      size="small"
-                      type="primary"
-                      @click="
-                        () => {
-                          form.customLimitTime = '';
-                          showCustomLimitTimeText = !showCustomLimitTimeText;
-                        }
-                      "
-                      >切换选择框</em-button
-                    >
-                  </template>
-                </em-input>
-              </div>
+              </template>
+            </em-input>
+          </div>
           <ProcessSetting
             v-if="processObj.isCustomPreset && isPreset"
             ref="processSetting"
@@ -259,7 +259,8 @@ export default {
       showOpinion: true,
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
-      isCustomUser:1,
+      defaultNextNode: '',
+      isCustomUser: 1,
       isCurrentNodeForbiddenChangeCandidate: 0,
       form: {
         nextNodeId: undefined, // 流程节点id
@@ -400,7 +401,10 @@ export default {
           ? ''
           : this.form.notificationType,
         opinion: this.form.opinion,
-        customLimitTime :typeof this.form.customLimitTime === 'object' ? this.form.customLimitTime.cciValue : this.form.customLimitTime,
+        customLimitTime:
+          typeof this.form.customLimitTime === 'object'
+            ? this.form.customLimitTime.cciValue
+            : this.form.customLimitTime,
         nodeId: this.form.nodeId,
         notificationMsg: this.form.notificationMsg,
         loginType: 2, //登录方式
@@ -408,7 +412,7 @@ export default {
         userId: this.userId || $.getStorage('userId'),
         mobileKey: $.getStorage('deviceId') || '123'
       };
-      if(!this.enableCustomLimitTimeSetting){
+      if (!this.enableCustomLimitTimeSetting) {
         delete info.customLimitTime;
       }
       if (this.processObj.isCustomPreset && this.isPreset) {
@@ -446,8 +450,8 @@ export default {
         }
         info = newParm;
       }
-      if(this.formType == 'freeStart' && !this.isFreeStartFlow){
-        info.businessId = this.businessId//this.businessId
+      if (this.formType == 'freeStart' && !this.isFreeStartFlow) {
+        info.businessId = this.businessId; //this.businessId
       }
       if (this.beforeSubmit) {
         this.beforeSubmit(info);
@@ -486,15 +490,15 @@ export default {
         format: false
       }).then((res) => {
         this.$toast.clear();
-        if (res.rCode == 0 || res.status == "success") {
+        if (res.rCode == 0 || res.status == 'success') {
           this.$toast('操作成功');
-          if(_that.formType == 'freeStart' && !_that.isFreeStartFlow){
-            this.$emit('closePop')
-          }else{
+          if (_that.formType == 'freeStart' && !_that.isFreeStartFlow) {
+            this.$emit('closePop');
+          } else {
             // if(_that.formType == 'freeStart'){
             //   _that.$emit('success');
             // }else{
-              _that.$parent.$emit('success');
+            _that.$parent.$emit('success');
             // }
           }
         } else {
@@ -563,10 +567,26 @@ export default {
     onConfirmNext(val) {
       this.form.nextName = val.itemName;
       this.nodeList = val.list;
-      this.form.nextNodeId = val.list[0].nodeId;
-      this.form.nextNodeName = val.list[0].nodeName;
-      val.list[0].transactorInfos &&
+      if (
+        this.defaultNextNode &&
+        this.nodeList.filter((x) => x.nodeId == this.defaultNextNode).length > 0
+      ) {
+        let nodeInfo = this.nodeList.filter(
+          (x) => x.nodeId == this.defaultNextNode
+        );
+        this.form.nextNodeId = nodeInfo[0].nodeId;
+        this.form.nextNodeName = nodeInfo[0].nodeName;
+         nodeInfo[0].transactorInfos &&
+        (this.nextUserList = nodeInfo[0].transactorInfos);
+      } else {
+        this.form.nextNodeId = val.list[0].nodeId;
+        this.form.nextNodeName = val.list[0].nodeName;
+         val.list[0].transactorInfos &&
         (this.nextUserList = val.list[0].transactorInfos);
+      }
+
+     
+      this.nextUserSelectList = [];
       this.showNextList = false;
       this.getPeopleObj(this.form.nextNodeId);
     },
@@ -575,6 +595,9 @@ export default {
       this.form.nextNodeId = val.nodeId;
       this.form.nextNodeName = val.nodeName;
       this.showNextNodeList = false;
+      val.transactorInfos &&
+        (this.nextUserList = val.transactorInfos);
+      this.nextUserSelectList = [];
       this.getPeopleObj(this.form.nextNodeId);
     },
     // 办理人选择完回调
@@ -621,7 +644,7 @@ export default {
                 res.results.extendData.readOnlyNotificationType;
             }
             that.isCurrentNodeForbiddenChangeCandidate =
-                res.results.nodeExtr.isCurrentNodeForbiddenChangeCandidate;
+              res.results.nodeExtr.isCurrentNodeForbiddenChangeCandidate;
             that.processObj = res.results;
             that.nextList = res.results.nodeList;
             that.isOpinionRequired = res.results.nodeExtr.isOpinionRequired;
@@ -633,17 +656,40 @@ export default {
               that.isBanInputOpinion = 0;
             }
             that.isChooseNextNode = res.results.nodeExtr.isChooseNextNode;
+            that.defaultNextNode = res.results.nodeExtr.defaultNextNode;
             that.nodeList = res.results.nodeList[0].list;
-            that.form.nextName = that.nextList[0].itemName;
-            that.form.nextNodeId = that.nextList[0].list[0].nodeId;
-            that.form.nextNodeName = that.nextList[0].list[0].nodeName;
-            that.nextList[0].list[0].transactorInfos &&
-              (that.nextUserList = that.nextList[0].list[0].transactorInfos);
-            if (that.nextUserList) {
-              that.nextUserList.map((x) => {
-                x.checked = false;
-              });
+            if (
+              res.results.nodeExtr.defaultNextNode &&
+              that.nextList[0].list.filter(
+                (x) => x.nodeId == res.results.nodeExtr.defaultNextNode
+              ).length > 0
+            ) {
+              let nodeInfo = that.nextList[0].list.filter(
+                (x) => x.nodeId == res.results.nodeExtr.defaultNextNode
+              );
+
+              that.form.nextNodeId = nodeInfo[0].nodeId;
+              that.form.nextNodeName = nodeInfo[0].nodeName;
+              nodeInfo[0].transactorInfos &&
+                (that.nextUserList = nodeInfo[0].transactorInfos);
+              if (that.nextUserList) {
+                that.nextUserList.map((x) => {
+                  x.checked = false;
+                });
+              }
+            } else {
+              that.form.nextNodeId = that.nextList[0].list[0].nodeId;
+              that.form.nextNodeName = that.nextList[0].list[0].nodeName;
+              that.nextList[0].list[0].transactorInfos &&
+                (that.nextUserList = that.nextList[0].list[0].transactorInfos);
+              if (that.nextUserList) {
+                that.nextUserList.map((x) => {
+                  x.checked = false;
+                });
+              }
             }
+            that.form.nextName = that.nextList[0].itemName;
+
             that.form.notificationMsg = res.results.notificationMsg;
             that.form.nodeId = res.results.nodeId;
             let defaultNotificationTypes = [];
@@ -669,21 +715,29 @@ export default {
     // 获取节点信息(获取节点属性及办理人)
     getPeopleObj(res) {
       const _that = this;
+      // this.$toast.loading({
+      //   message: '加载中...',
+      //   forbidClick: true,
+      //   loadingType: 'spinner',
+      //   overlay: true,
+      //   duration: 0
+      // });
       request({
         url: _that.apiBaseUrl ? _that.apiBaseUrl + getNodeInfo : getNodeInfo,
         params: {
           // params: {
-            processDefinitionId: this.flowObj.processDefinitionId,
-            nodeId: res,
-            // taskId: this.processObj.taskId,
-            userId: _that.userId
+          processDefinitionId: this.flowObj.processDefinitionId,
+          nodeId: res,
+          // taskId: this.processObj.taskId,
+          userId: _that.userId
           // }
         }
       }).then((res) => {
         this.$toast.clear();
         if (res.rCode == 0) {
           _that.isCustomUser = res.results.nodeExtr.isCustomUser;
-          this.peopleObj = res.results.nodeExtr;
+          _that.peopleObj = res.results.nodeExtr;
+          // _that.nextUserList = res.results.transactorInfos || [];
           _that.enableCustomLimitTimeSetting =
             this.peopleObj.enableCustomLimitTimeSetting == 1;
           if (res.results.nodeExtr.userSelectionType) {

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

@@ -456,7 +456,6 @@ export default {
           this.selectPersonValue = res.data.selectPersonValue
           this.isMultiple()
         } 
-        console.log(res)
       })
     },
     getProcessObjNew() {

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

@@ -350,7 +350,6 @@ export default {
       });
       //获取流程发起信息后去获取节点信息和办理人信息
       Promise.all([this.getProcessObj(res)]).then(() => {
-        console.log(res, this.form, 'asd');
         this.getPeopleObj(this.form.nextNodeId);
       });
     },
@@ -523,7 +522,6 @@ export default {
     },
     // 确认下一步操作
     onConfirmNext(val) {
-      console.log(val, 'vaaav');
       this.form.nextName = val.itemName;
       this.nodeList = val.list;
       this.form.nextNodeId = val.list[0].nodeId;

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

@@ -489,7 +489,6 @@ export default {
     },
     // 通知消息回调
     onInputMsg(obj) {
-      console.log(obj)
       this.infoList.noticeType = JSON.parse(JSON.stringify(obj.notificationType));
       this.infoList.noticeInfo = obj.notificationMsg;
     },

package/packages/form/src/main.vue

@@ -398,7 +398,7 @@
         >提交</em-button
       >
       <em-button
-        v-else
+        v-show="btnList.length != 0"
         v-for="item in btnList[0].contents"
         :key="item.text"
         v-bind="item"

package/src/index.js

@@ -105,7 +105,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.3.34',
+  version: '0.3.35',
   install,
   Button,
   ButtonGroup,