eoss-mobiles 0.3.12 → 0.3.13

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

@@ -110,18 +110,19 @@ export default {
     // 监听默认消息类型
     defaultNotificationType(val) {
       // console.log(val)
-      // if (val) {
-      //   let arr = [];
-      //   this.newList.map((item) => {
-      //     val.map((x) => {
-      //       if (x == item.cciValue) {
-      //         arr.push(x);
-      //       }
-      //     });
-      //   });
-      //   this.form.notificationType = JSON.parse(JSON.stringify(arr));
-      //   // this.$emit('onInputMsg', this.form);
-      // }
+      if (val) {
+        let arr = [];
+        this.newList.map((item) => {
+          val.map((x) => {
+            if (x == item.cciValue) {
+              arr.push(x);
+            }
+          });
+        });
+        this.form.notificationType = JSON.parse(JSON.stringify(arr));
+        this.getNoticeType()
+        // this.$emit('onInputMsg', this.form);
+      }
     }
   },
   methods: {

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

@@ -152,6 +152,10 @@ export default {
     nodeDefaultSubmitOpinion: {
       type: String,
       default: ''
+    },
+    oldOpinion: {
+      type: String,
+      default: ''
     }
   },
   // components: {
@@ -192,9 +196,19 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    oldOpinion: {
+      handler(val) {
+        if (val) {
+          this.opinion = val;
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   created() {
+    
     if (this.nodeFixedOpinionSelectList.length > 0) {
       this.opinionList = this.nodeFixedOpinionSelectList;
       this.fixedDisabled = true;

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

@@ -13,6 +13,7 @@
         :code="processObj.attachedCode"
         :ownId="businessId"
         :esign="esign"
+        :oldOpinion="form.opinion"
         :esignLineWidth="$attrs['esign-line-width'] || $attrs['esignLineWidth']"
         :isFile="false"
         :baseUrl="baseUrl"
@@ -80,6 +81,60 @@
               label="办理人"
             />
           </div>
+          <div class="item" v-if="enableCustomLimitTimeSetting">
+                <!-- <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
+                >
+                  <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 slot="button">
+                    <em-button
+                      size="small"
+                      type="primary"
+                      @click="
+                        () => {
+                          form.customLimitTime = '';
+                          showCustomLimitTimeText = !showCustomLimitTimeText;
+                        }
+                      "
+                      >切换选择框</em-button
+                    >
+                  </template>
+                </em-input>
+              </div>
           <ProcessSetting
             v-if="processObj.isCustomPreset && isPreset"
             ref="processSetting"
@@ -129,6 +184,8 @@
 import {
   toStartFlow,
   getNodeInfo,
+  startReadTransferHandleFlowWithTaskReadEnd,
+  freeStartFlowWithSubmitTask,
   registerNew
 } from '../../../../src/config/api';
 import request from '../../../../src/utils/http.js';
@@ -171,6 +228,26 @@ export default {
     userId: {
       type: String,
       default: ''
+    },
+    isFreeStartFlow: {
+      type: Boolean,
+      default: false
+    },
+    copyHistory: {
+      type: String,
+      default: ''
+    },
+    formType: {
+      type: String,
+      default: 'freeStart'
+    },
+    taskParams: {
+      type: Object,
+      default: () => {}
+    },
+    opinion: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -181,6 +258,7 @@ export default {
       form: {
         nextNodeId: undefined, // 流程节点id
         nextNodeName: undefined, // 流程节点名称
+        customLimitTime: '', //限时天数
         nextUserName: undefined, // 办理人
         nextUserId: undefined, // 办理人id
         nextName: undefined, //下一步
@@ -210,6 +288,8 @@ export default {
       objType: 'enterprise', //办理人树选择objType
       selectType: '', //办理人树选择selectType
       nextUserSelectList: [], //选中人数组
+      enableCustomLimitTimeSetting: false,
+      showCustomLimitTimeText: false,
       flowObj: {} //流程参数信息
     };
   },
@@ -225,11 +305,13 @@ export default {
       // hideTempSave: true,
       businessId: this.businessId
     };
+    if (this.formType == 'freeStart' || this.copyHistory) {
+      this.form.opinion = this.opinion;
+    }
     this.geAllData(obj);
   },
 
   methods: {
-   
     goBack() {
       this.$parent.$emit('close');
       this.$emit('close');
@@ -312,6 +394,7 @@ export default {
           ? ''
           : this.form.notificationType,
         opinion: this.form.opinion,
+        customLimitTime :typeof this.form.customLimitTime === 'object' ? this.form.customLimitTime.cciValue : this.form.customLimitTime,
         nodeId: this.form.nodeId,
         notificationMsg: this.form.notificationMsg,
         loginType: 2, //登录方式
@@ -319,9 +402,12 @@ export default {
         userId: this.userId || $.getStorage('userId'),
         mobileKey: $.getStorage('deviceId') || '123'
       };
+      if(!this.enableCustomLimitTimeSetting){
+        delete info.customLimitTime;
+      }
       if (this.processObj.isCustomPreset && this.isPreset) {
         if (this.$refs.processSetting.active.length != 0) {
-          if(!this.$refs.processSetting.getValue())return
+          if (!this.$refs.processSetting.getValue()) return;
           info.customPresetUserJson = this.$refs.processSetting.getValue();
           info.isCustomPreset = true;
         } else {
@@ -329,6 +415,34 @@ export default {
           delete info.isCustomPreset;
         }
       }
+      if (this.isFreeStartFlow || this.formType === 'readTransfer') {
+        let newParm = {};
+        newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
+        newParm.startFlowParamJson = info;
+        newParm.startFlowParamJson.businessId = this.businessId; //this.businessId
+        newParm.startFlowParamJson = JSON.stringify(newParm.startFlowParamJson);
+        for (let key in this.taskParams) {
+          if (Array.isArray(this.taskParams[key])) {
+            this.taskParams[key] =
+              this.taskParams[key].length > 0
+                ? this.taskParams[key].join(',')
+                : '';
+          }
+        }
+
+        newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
+        if (this.formType == 'readTransfer') {
+          newParm.readTransferHandleStartFlowParamJson = JSON.stringify(info);
+          newParm.taskReadEndParamJson = JSON.stringify(this.taskParams);
+          delete newParm.copyHistory;
+          delete newParm.startFlowParamJson;
+          delete newParm.submitTaskParamJson;
+        }
+        info = newParm;
+      }
+      if(this.formType == 'freeStart' && !this.isFreeStartFlow){
+        info.businessId = this.businessId//this.businessId
+      }
       if (this.beforeSubmit) {
         this.beforeSubmit(info);
         return;
@@ -351,20 +465,37 @@ export default {
       });
       const _that = this;
       request({
-        url: _that.apiBaseUrl ? _that.apiBaseUrl + registerNew : registerNew,
-        type: 'get',
-        params: { params: info }
-        // format: false
+        url:
+          (_that.apiBaseUrl || '') +
+          (_that.isFreeStartFlow
+            ? freeStartFlowWithSubmitTask
+            : _that.formType == 'readTransfer'
+            ? startReadTransferHandleFlowWithTaskReadEnd
+            : registerNew),
+        type: 'post',
+        params:
+          _that.isFreeStartFlow || _that.formType == 'readTransfer'
+            ? info
+            : { params: info },
+        format: false
       }).then((res) => {
         this.$toast.clear();
-        if (res.rCode == 0) {
+        if (res.rCode == 0 || res.status == "success") {
           this.$toast('操作成功');
-          this.$parent.$emit('success');
+          if(_that.formType == 'freeStart' && !_that.isFreeStartFlow){
+            this.$emit('closePop')
+          }else{
+            if(_that.formType == 'freeStart'){
+              _that.$emit('success');
+            }else{
+              _that.$parent.$emit('success');
+            }
+          }
         } else {
           this.$toast(res.msg);
           setTimeout(() => {
-              this.$parent.$emit('error');
-            }, 1000);
+            this.$parent.$emit('error');
+          }, 1000);
         }
       });
     },
@@ -544,6 +675,8 @@ export default {
         this.$toast.clear();
         if (res.rCode == 0) {
           this.peopleObj = res.results.nodeExtr;
+          _that.enableCustomLimitTimeSetting =
+            this.peopleObj.enableCustomLimitTimeSetting == 1;
           if (res.results.nodeExtr.userSelectionType) {
             this.treeType = res.results.nodeExtr.userSelectionType;
             if (res.results.nodeExtr) {

package/packages/picker/src/main.vue

@@ -22,7 +22,10 @@
       @click="handlePicker"
       :disabled="disabled || readonly"
       :right-icon="disabled || readonly ? '' : 'arrow'"
-    />
+    >
+      <template v-for="(index, name) in $slots" :slot="name">
+        <slot :name="name" /> </template
+    ></em-input>
     <em-input
       v-else
       readonly
@@ -37,7 +40,7 @@
       :right-icon="disabled || readonly ? '' : 'arrow'"
     >
       <template slot="input">
-        <div style="width:100%">
+        <div style="width: 100%">
           <slot name="textTop"></slot>
           <div v-if="pickerValue.length > 0">
             <em-tag
@@ -50,7 +53,7 @@
               >{{ r[labelKey] || r.name }}</em-tag
             >
           </div>
-          <div v-else style="color:#c8c9cc">
+          <div v-else style="color: #c8c9cc">
             {{
               (disabled || readonly) && placeholder == undefined
                 ? ' 暂无数据'
@@ -280,7 +283,7 @@ export default {
             val[this.sysAppCode ? 'cciValue' : this.valueKey]
           );
         } else if (!this.objectType && val.length != undefined) {
-          val.map(x => {
+          val.map((x) => {
             if (typeof x === 'object') {
               x = x[this.sysAppCode ? 'cciValue' : this.valueKey];
             }
@@ -351,7 +354,7 @@ export default {
       }
     } else if (this.isCheck) {
       let data = this.value;
-      data.map(item => {
+      data.map((item) => {
         this.checkList.push(item[this.valueKey] || item.value || item);
       });
     }
@@ -362,7 +365,7 @@ export default {
 
       if (this.columns.length > 0) {
         this.newColumns = this.columns.filter(
-          x => x[this.labelKey].indexOf(this.keyWord) != -1
+          (x) => x[this.labelKey].indexOf(this.keyWord) != -1
         );
         if (!this.keyWord) {
           this.newColumns = this.columns;
@@ -401,7 +404,7 @@ export default {
     deleteList(val, res) {
       if (this.disabled || this.readonly) return;
       this.pickerValue.splice(val, 1);
-      this.checkList = this.checkList.filter(x => x != res.value);
+      this.checkList = this.checkList.filter((x) => x != res.value);
       this.$emit('input', this.pickerValue);
 
       this.$emit('tagDelete', this.pickerValue);
@@ -413,8 +416,8 @@ export default {
       if (isConfirm) {
         if (this.isCheck) {
           let data = [];
-          this.newColumns.filter(x => {
-            this.checkList.find(y => {
+          this.newColumns.filter((x) => {
+            this.checkList.find((y) => {
               if (x.value === y) {
                 data.push(x);
               }
@@ -427,7 +430,7 @@ export default {
       } else {
         if (this.isCheck) {
           this.checkList = [];
-          this.pickerValue.map(x => {
+          this.pickerValue.map((x) => {
             this.checkList.push(x.value);
           });
         }
@@ -440,8 +443,8 @@ export default {
       if (this.isCheck) {
         let val = [];
         if (this.newColumns && this.newColumns.length > 0) {
-          this.newColumns.filter(x => {
-            this.value.find(y => {
+          this.newColumns.filter((x) => {
+            this.value.find((y) => {
               if (x[this.valueKey] == y || x[this.valueKey] == y.value) {
                 val.push(x);
               }
@@ -470,7 +473,7 @@ export default {
             this.newDefaultIndex = index;
           } else {
             let list = [];
-            this.value.map(item => {
+            this.value.map((item) => {
               if (item[this.labelKey] || item[this.newValueKey]) {
                 list.push(item[this.labelKey] || item[this.newValueKey]);
               } else if (typeof item === 'string') {
@@ -524,7 +527,7 @@ export default {
       }
       this.newLoading = true;
       request(params)
-        .then(res => {
+        .then((res) => {
           const { status, data, message, rCode, results } = res;
           this.listLoading = false;
           if (status == 'success' || rCode === 0 || status === true) {
@@ -535,7 +538,7 @@ export default {
               : data
               ? data
               : results;
-            info.map(x => {
+            info.map((x) => {
               if (this.isCheck) {
                 x.name =
                   x[sysAppCode ? 'shortName' : this.labelKey] &&
@@ -575,7 +578,7 @@ export default {
           }
           this.newLoading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.$toast(err.message);
         });
     },

package/src/config/api.js

@@ -29,7 +29,8 @@ export const taskHandleHtmlImg =
   pending + '/task/taskHandle/taskHandleWithHandwrittenOpinion.dhtml';
 // 发起流程
 // export const registerNew = '/api/v1/mecpItask/registerNew.json';
-export const registerNew = '/bpm/v1/mecpItask/registerNew.json';
+// export const registerNew = '/bpm/v1/mecpItask/registerNew.json';
+export const registerNew = '/bpm/task/taskHandle/startFlow.dhtml';
 
 // 获取节点信息(获取节点属性及办理人,发起)
 // export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
@@ -113,3 +114,9 @@ export const getSysParam = '/api/v1/mecpSys/getSysParam.json';
 export const getFreeStartFlowParams = '/bpm/bpmBackend/getFreeStartFlowParams';
 // 获取发起流程列表
 export const getProcessDefList = '/bpm/v1/mecpItask/getProcessDefList.json';
+// 阅转办提交流程
+export const startReadTransferHandleFlowWithTaskReadEnd =
+  '/bpm/bpmBackend/startReadTransferHandleFlowWithTaskReadEnd';
+// 自由发起流程提交
+export const freeStartFlowWithSubmitTask =
+  '/bpm/bpmBackend/freeStartFlowWithSubmitTask';

package/src/index.js

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