eoss-mobiles 0.3.0 → 0.3.2

package/package.json

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

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

@@ -408,8 +408,8 @@
                 @confirm="onConfirmTimeList"
               />
             </van-popup>
-            <!-- <ProcessSetting
-              v-if="isCustomPreset"
+            <ProcessSetting
+              v-if="isCustomPreset && isPreset"
               ref="processSetting"
               :processDefinitionId="taskExamineInfo.processDefinitionId"
               :nodeId="form.nextNodeId"
@@ -418,10 +418,11 @@
               :businessId="taskExamineInfo.businessId"
               :apiBaseUrl="apiBaseUrl"
               :paddingTop="paddingTop"
+              :customPresetHintMessage="customPresetHintMessage"
               :choiceOrgId="choiceOrgId"
               :pOrgId="pOrgId"
               :choiceDeptId="choiceDeptId"
-            /> -->
+            />
             <!-- 催办通知方式 -->
             <div class="item-msg item-msg1" v-if="isLimitedTimeHandling">
               <Message
@@ -511,6 +512,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPreset: {
+      type: Boolean,
+      default: true
+    },
     esign: {
       type: Boolean,
       default: false
@@ -666,6 +671,7 @@ export default {
       isEndUserTask: '',
       tagKey: '',
       pOrgId: '',
+      customPresetHintMessage:'',
       needRetrialAuth: false
     };
   },
@@ -915,18 +921,18 @@ export default {
       if (this.isMainSubProcess && typeof this.form.mainSubId == 'object') {
         this.form.mainSubId = this.form.mainSubId.value;
       }
-      // if (this.isCustomPreset ) {
-      //   if (this.$refs.processSetting.active.length != 0) {
-      //     if(!this.$refs.processSetting.getValue())return
-      //     this.form.customPresetUserJson = this.$refs.processSetting.getValue();
-      //     this.form.isCustomPreset = true;
-      //     this.form.presetUserJson = JSON.stringify([])
-      //   } else {
-      //     delete this.form.customPresetUserJson;
-      //     delete this.form.isCustomPreset;
-      //     delete this.form.presetUserJson;
-      //   }
-      // }
+      if (this.isCustomPreset && this.isPreset) {
+        if (this.$refs.processSetting.active.length != 0) {
+          if(!this.$refs.processSetting.getValue())return
+          this.form.customPresetUserJson = this.$refs.processSetting.getValue();
+          this.form.isCustomPreset = true;
+          this.form.presetUserJson = JSON.stringify([])
+        } else {
+          delete this.form.customPresetUserJson;
+          delete this.form.isCustomPreset;
+          delete this.form.presetUserJson;
+        }
+      }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -1106,7 +1112,8 @@ export default {
         } else {
         }
       }
-      if (this.nodeList) {
+      if (this.nodeList && this.nodeList.length > 0) {
+        console.log(this.nodeList);
         this.form.nextNodeId = this.nodeList[this.nextNodeDefault].nodeId;
         this.form.nextNodeName = this.nodeList[this.nextNodeDefault].nodeName;
         this.$toast.loading({
@@ -1252,6 +1259,7 @@ export default {
                 choiceDeptId,
                 pOrgId,
                 taskExamine,
+                customPresetHintMessage,
                 currentOrgName,
                 notificationMessageReadOnly,
                 readOnlyNotificationType,
@@ -1261,6 +1269,7 @@ export default {
                 isCanPreAddSign
               }
             } = res;
+            that.customPresetHintMessage=customPresetHintMessage
             that.currentOrgName = currentOrgName;
             that.notificationMessageReadOnly =
               notificationMessageReadOnly == 'true';

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

@@ -1,13 +1,12 @@
 <template>
   <div class="em-flow-setting">
     <van-collapse v-model="active">
-      <van-collapse-item title="预设自定义节点信息（折叠不作处理）" name="1">
+      <van-collapse-item :title="customPresetHintMessage || '预设节点信息（折叠不作处理）'" 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}`"
@@ -66,6 +65,10 @@ export default {
       type: String,
       default: ''
     },
+    customPresetHintMessage: {
+      type: String,
+      default: ''
+    },
     pendingId: {
       type: String,
       default: ''
@@ -122,7 +125,10 @@ export default {
       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) {
+        if (
+          newFlowList[i].nextUserSelectList.length == 0 &&
+          newFlowList[i].showSelectUser
+        ) {
           pass = false;
           this.$toast(`请选择节点${i + 1}的办理人`);
           return false;
@@ -130,15 +136,15 @@ export default {
       }
       if (pass) {
         newFlowList.map((x, i) => {
-            PresetData.push({
-            name: typeof x.nodeId == 'object'? x.nodeId.nodeId : x.nodeId,
+          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 +''
+            sequence: i + 1 + ''
           });
         });
       }

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

@@ -80,10 +80,11 @@
               label="办理人"
             />
           </div>
-          <!-- <ProcessSetting
-            v-if="processObj.isCustomPreset"
+          <ProcessSetting
+            v-if="processObj.isCustomPreset && isPreset"
             ref="processSetting"
             :processDefinitionId="processObj.processDefinitionId"
+            :customPresetHintMessage="processObj.customPresetHintMessage"
             :nodeId="form.nextNodeId"
             :taskId="processObj.taskId"
             :pendingId="processObj.pendingId"
@@ -93,7 +94,7 @@
             :choiceOrgId="orgId"
             :pOrgId="orgId"
             :choiceDeptId="depId"
-          /> -->
+          />
           <!-- 通知方式 -->
           <Message
             ref="message"
@@ -159,6 +160,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPreset: {
+      type: Boolean,
+      default: true
+    },
     esign: {
       type: Boolean,
       default: false
@@ -312,16 +317,16 @@ export default {
         userId: this.userId || $.getStorage('userId'),
         mobileKey: $.getStorage('deviceId') || '123'
       };
-      // if (this.processObj.isCustomPreset ) {
-      //   if (this.$refs.processSetting.active.length != 0) {
-      //     if(!this.$refs.processSetting.getValue())return
-      //     info.customPresetUserJson = this.$refs.processSetting.getValue();
-      //     info.isCustomPreset = true;
-      //   } else {
-      //     delete info.customPresetUserJson;
-      //     delete info.isCustomPreset;
-      //   }
-      // }
+      if (this.processObj.isCustomPreset && this.isPreset) {
+        if (this.$refs.processSetting.active.length != 0) {
+          if(!this.$refs.processSetting.getValue())return
+          info.customPresetUserJson = this.$refs.processSetting.getValue();
+          info.isCustomPreset = true;
+        } else {
+          delete info.customPresetUserJson;
+          delete info.isCustomPreset;
+        }
+      }
       if (this.beforeSubmit) {
         this.beforeSubmit(info);
         return;

package/src/index.js

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