eoss-mobiles 0.3.32 → 0.3.34

package/lib/selector.js

@@ -4358,8 +4358,8 @@ var selector_tree_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var selector_tree = (selector_tree_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=template&id=338153d2
-var selector_fieldvue_type_template_id_338153d2_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=template&id=986a3612
+var selector_fieldvue_type_template_id_986a3612_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4533,11 +4533,11 @@ var selector_fieldvue_type_template_id_338153d2_render = function () {
     1
   )
 }
-var selector_fieldvue_type_template_id_338153d2_staticRenderFns = []
-selector_fieldvue_type_template_id_338153d2_render._withStripped = true
+var selector_fieldvue_type_template_id_986a3612_staticRenderFns = []
+selector_fieldvue_type_template_id_986a3612_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=338153d2
+// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=986a3612
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=script&lang=js
 //
@@ -4677,7 +4677,7 @@ selector_fieldvue_type_template_id_338153d2_render._withStripped = true
           item.name = item.username || item[_that.labelKey];
           item.value = item.userId || item[_that.valueKey];
         });
-        this.newNextUserList = val;
+        this.newNextUserList = JSON.parse(JSON.stringify(val));
       },
 
       deep: true,
@@ -4703,14 +4703,16 @@ selector_fieldvue_type_template_id_338153d2_render._withStripped = true
       var selectArr = [];
       var _that = this;
       if (this.multiple) {
-        this.data.map(function (item) {
-          !item[_that.valueKey] && (item[_that.valueKey] = item.userId || item.userid);
-          !item[_that.labelKey] && (item[_that.labelKey] = item.username || item.userName);
+        var selectId = this.data.map(function (x) {
+          return x[_that.valueKey];
         });
-        selectArr = this.newNextUserList.filter(function (x) {
-          return x.checked && _this2.multiple;
+        this.newNextUserList.map(function (x) {
+          if (selectId.includes(x[_that.valueKey])) {
+            selectArr.push(x);
+          }
+          x.checked = selectId.includes(x[_that.valueKey]);
         });
-        this.newSelectList = [].concat(this.data, selectArr);
+        this.newSelectList = [].concat(JSON.parse(JSON.stringify(this.data)), JSON.parse(JSON.stringify(selectArr)));
         this.newSelectList = this.arrDistinctByProp(this.newSelectList, _that.valueKey);
       } else {
         this.selectValue = '';
@@ -4733,15 +4735,13 @@ selector_fieldvue_type_template_id_338153d2_render._withStripped = true
     handleChange: function handleChange(val, info) {
       var _this = this;
       _this.openSelect = false;
+      // info.checked = !info.checked 
+      var content = JSON.parse(JSON.stringify(this.newSelectList));
       if (_this.multiple) {
         if (info.checked) {
-          if (this.newSelectList.length > 0 && !this.multiple) {
-            this.newSelectList = info;
-          } else {
-            this.newSelectList.push(info);
-          }
+          content.push(JSON.parse(JSON.stringify(info)));
         } else {
-          this.newSelectList = this.newSelectList.filter(function (obj) {
+          content = content.filter(function (obj) {
             return obj[_this.valueKey] != info[_this.valueKey];
           });
         }
@@ -4749,11 +4749,10 @@ selector_fieldvue_type_template_id_338153d2_render._withStripped = true
         var data = this.newNextUserList.filter(function (x) {
           return x.userId === val || x[_this.valueKey] === val;
         });
-        if (data.length > 0) this.newSelectList = data;
+        if (data.length > 0) content = data;
       }
-
-      this.$parent.$emit('change', { list: _this.newSelectList });
-      this.$emit('change', { list: _this.newSelectList });
+      this.$parent.$emit('change', { list: content });
+      this.$emit('change', { list: content });
     },
 
     /**
@@ -4812,8 +4811,8 @@ selector_fieldvue_type_template_id_338153d2_render._withStripped = true
 
 var selector_field_component = Object(componentNormalizer["a" /* default */])(
   src_selector_fieldvue_type_script_lang_js,
-  selector_fieldvue_type_template_id_338153d2_render,
-  selector_fieldvue_type_template_id_338153d2_staticRenderFns,
+  selector_fieldvue_type_template_id_986a3612_render,
+  selector_fieldvue_type_template_id_986a3612_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

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

@@ -41,7 +41,8 @@
           :isForceDisplayDefaultOptionForPrefix="
             isForceDisplayDefaultOptionForPrefix
           "
-          :placeholder="opinionHandleExplainText"
+          :pendingItemHandleDescription="pendingItemHandleDescription"
+          :placeholder="pendingItemHandleDescription || opinionHandleExplainText"
           :nodeDefaultSubmitOpinion="nodeDefaultSubmitOpinion"
           :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
           :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
@@ -391,10 +392,26 @@
               <!-- 办理说明 -->
               <div class="item" v-if="isHandleExplain">
                 <van-field
+                  v-model="form.handleExplain"
                   value="办理说明"
                   label="办理说明"
-                  :disabled="true"
-                  placeholder="请选择"
+                  placeholder="请输入办理说明"
+                />
+              </div>
+              <div
+                class="item"
+                v-if="
+                  currentNodeEnableItemHandleDescription &&
+                  nodeList.length != 0 &&
+                  isShowNode &&
+                  isNextUser
+                "
+              >
+                <van-field
+                  v-model="form.nextItemHandleDescription"
+                  value="办理说明"
+                  label="办理说明"
+                  placeholder="请输入办理说明"
                 />
               </div>
             </div>
@@ -652,6 +669,10 @@ export default {
         { name: '后置加签', value: 'postAddSign' }
       ],
       otherOrgDisabledObjId: [],
+      currentNodeEnableItemHandleDescription: false,
+      pendingItemHandleDescription: '',
+      taskOperationShiftedNodeList:null,
+      oldNextOperate:'',
       processFormType: 'freeStart',
       currentOrgDisabledObjId: [],
       nextNodeDefault: 0,
@@ -807,7 +828,8 @@ export default {
       customPresetHintMessage: '',
       enableCustomLimitTimeSetting: false,
       showCustomLimitTimeText: false,
-      needRetrialAuth: false
+      needRetrialAuth: false,
+      defaultNextNode: ''
     };
   },
   created() {
@@ -1137,7 +1159,7 @@ export default {
         delete this.form.nextOperate;
         delete this.form.nextNodeId;
       }
-      if (this.form.nextOperate == 9) {
+      if (this.form.nextOperate == 9 || this.oldNextOperate == 9) {
         this.form.isReturnRejectNode = 1;
         this.form.processDefinitionId =
           this.processObj.taskExamine.processDefinitionId;
@@ -1197,9 +1219,10 @@ export default {
       // _that.form.userId = 'u3a0bc559d4cf4f6ea47106ed7e76cae6';
       _that.form.mobileKey = $.getStorage('deviceId') || '123';
       _that.form.nextNodeId =
-        _that.form.nextOperate == 0 || _that.form.nextOperate == 1
+        _that.form.nextOperate == 0 || _that.form.nextOperate == 1 || _that.oldNextOperate === 0 || _that.oldNextOperate === 1
           ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
           : '';
+       _that.form.nextOperate = _that.oldNextOperate !== '' ? _that.oldNextOperate : _that.form.nextOperate;
       if (!_that.isCanPreAddSign || _that.form.isAddSign != '1') {
         delete _that.form.addSignMode;
       }
@@ -1209,6 +1232,9 @@ export default {
       if (!this.isSpecial) {
         delete _that.form.nextUserId;
       }
+      if (!_that.currentNodeEnableItemHandleDescription) {
+        delete _that.form.nextItemHandleDescription;
+      }
       let formData = new FormData();
       if (_that.form.isImageOpinion == 1) {
         formData.append('file', _that.file);
@@ -1365,18 +1391,40 @@ export default {
         } else {
         }
       }
+      if(this.taskOperationShiftedNodeList && !val.isNextNode){
+        this.nodeList = this.nodeList.filter(x => this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1)
+      }
+      if(val.isNextNode){
+        this.oldNextOperate = val.nextOperate
+      }else{
+        this.oldNextOperate = ''
+      }
+      if(val.isNextNode){
+        this.nodeInfos = [];
+        this.form.nextNodeId = val.key;
+        this.form.nextNodeName = val.value;
+         this.$toast.loading({
+          message: '加载中...',
+          forbidClick: true,
+          loadingType: 'spinner',
+          overlay: true,
+          duration: 0
+        });
+        
+        this.getNodeObj(this.form.nextNodeId);
+      }
       if (this.nodeList && this.nodeList.length > 0) {
         let defNode = this.nodeList.filter(
-          (i) => i.nodeId === this.nextNodeDefault
+          (i) => i.nodeId === this.defaultNextNode
         );
         if (defNode.length > 0) {
           this.form.nextNodeId = defNode[0].nodeId;
           this.form.nextNodeName = defNode[0].nodeName;
-        }else{
-           this.form.nextNodeId = this.nodeList[0].nodeId;
+        } else {
+          this.form.nextNodeId = this.nodeList[0].nodeId;
           this.form.nextNodeName = this.nodeList[0].nodeName;
         }
-
+        
         this.$toast.loading({
           message: '加载中...',
           forbidClick: true,
@@ -1384,6 +1432,7 @@ export default {
           overlay: true,
           duration: 0
         });
+        
         if (isDef !== true) this.getNodeObj(this.form.nextNodeId);
       }
 
@@ -1392,7 +1441,6 @@ export default {
 
     // 确认流程节点操作
     onConfirmNextNode(val) {
-      console.log(val, 'cal');
       if (this.nextNodeCheckType === 'select') {
         this.form.nextNodeId = val.nodeId;
         this.form.nextNodeName = val.nodeName;
@@ -1531,11 +1579,21 @@ export default {
                 readOnlyNotificationType,
                 otherOrgName,
                 nextNodeCheckType,
+                pendingItemHandleDescription,
                 defaultNotificationMessage,
                 defaultNotificationType,
+                taskOperationShiftedNodeList,
                 isCanPreAddSign
               }
             } = res;
+            if(taskOperationShiftedNodeList && taskOperationShiftedNodeList.length>0){
+              that.taskOperationShiftedNodeList = []
+              taskOperationShiftedNodeList.map(x =>{
+                that.taskOperationShiftedNodeList.push(x.nodeId) 
+                that.taskOperations.push({key: x.nodeId, value: x.nodeName,isNextNode: true,nextOperate:x.nextOperate,})
+              })
+            }
+            that.pendingItemHandleDescription = pendingItemHandleDescription;
             nextNodeCheckType && (that.nextNodeCheckType = nextNodeCheckType);
             that.customPresetHintMessage = customPresetHintMessage;
             that.currentOrgName = currentOrgName;
@@ -1559,7 +1617,7 @@ export default {
               (that.defaultNotificationType =
                 defaultNotificationType.split(','));
             that.nodeInfoMapInfo = nodeInfoMap;
-            // that.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
+            that.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
             that.opinionHandleExplainText =
               nodeInfoMap.nodeExtAttr.opinionHandleExplainText;
             that.isCanAddSign = res.data.isCanAddSign;
@@ -1572,7 +1630,7 @@ export default {
             }
             that.isSpecial = res.data.isSpecial;
             that.processObj = res.data;
-            that.taskOperations = res.data.taskOperations;
+            that.taskOperations = [...res.data.taskOperations,...that.taskOperations];
             if (that.taskOperations && that.taskOperations.length > 0) {
               let isSelected = false;
               that.taskOperations.map((item) => {
@@ -1622,7 +1680,8 @@ export default {
                           x.nodeId === nodeInfoMap.nodeExtAttr.defaultNextNode
                         ) {
                           info.push(x);
-                          that.nextNodeDefault = nodeInfoMap.nodeExtAttr.defaultNextNode;
+                          that.nextNodeDefault =
+                            nodeInfoMap.nodeExtAttr.defaultNextNode;
                         }
                       });
                       if (info.length == 0 && that.nodeList.length != 0)
@@ -1638,9 +1697,9 @@ export default {
                   if (item.key == 9) {
                     that.isReject = true;
                   }
-                  that.changeNextOperate(item, true);
                 }
               });
+
               if (!isSelected) {
                 that.form.nextOperate = that.taskOperations[0].key;
                 that.form.nextOperateName = that.taskOperations[0].value;
@@ -1650,7 +1709,16 @@ export default {
                   that.form.nextNodeName = that.nodeList[0].nodeName;
                 }
               }
+              that.tagKey = that.form.nextOperate;
             }
+            that.changeNextOperate(
+              {
+                value: that.form.nextOperateName,
+                key: that.form.nextOperate,
+                taskNodeList: that.nodeList
+              },
+              true
+            );
             if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
               that.needRetrialAuth =
                 !!nodeInfoMap.nodeExtAttr.isCurrentNodeSubmitNeedRetrialAuth;
@@ -1765,6 +1833,8 @@ export default {
       }).then((res) => {
         this.$toast.clear();
         if (res.status == 'success') {
+          _that.currentNodeEnableItemHandleDescription =
+            res.data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
           _that.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
           _that.enableCustomLimitTimeSetting =
             res.data.nodeExtAttr.enableCustomLimitTimeSetting == 1;

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

@@ -117,7 +117,6 @@ export default {
     },
     // 监听默认消息类型
     defaultNotificationType(val) {
-      console.log(val)
       if (val) {
         let arr = [];
         this.newList.map((item) => {

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

@@ -10,7 +10,7 @@
             :name="item.type"
           >
             <em-esign
-              style="padding:0px 10px"
+              style="padding: 0px 10px"
               v-show="isImageOpinion === 1"
               @save="handleSave"
               :file-path="esignPath"
@@ -19,15 +19,19 @@
             <div
               v-show="isImageOpinion === 0"
               class="item em-flow-opion-box"
-              style="padding-bottom:20px"
+              style="padding-bottom: 20px"
             >
               <em-input
                 :label="label"
                 :placeholder="placeholder"
                 v-model="opinion"
+                ref="opinionInp"
+                autofocus
                 type="textarea"
                 rows="3"
                 @input="onInput"
+                @focus="handleFocus"
+                @blur="handleBlur"
                 :disabled="disabled || fixedDisabled"
                 :required="isOpinionRequired == 1 ? true : false"
               />
@@ -42,13 +46,17 @@
         </em-tabs>
       </div>
       <div v-else-if="show">
-        <div class="item em-flow-opion-box" style="position: relative;">
+        <div class="item em-flow-opion-box" style="position: relative">
           <em-input
             :label="label"
             :placeholder="placeholder"
             v-model="opinion"
+            ref="opinionInp"
             type="textarea"
             rows="3"
+            autofocus
+            @focus="handleFocus"
+            @blur="handleBlur"
             @input="onInput"
             :disabled="disabled || fixedDisabled"
             :required="isOpinionRequired == 1 ? true : false"
@@ -137,9 +145,9 @@ export default {
       type: Boolean,
       default: false
     },
-    esignLineWidth:{
-      type:[String,Number],
-      default:5
+    esignLineWidth: {
+      type: [String, Number],
+      default: 5
     },
     userId: {
       type: String,
@@ -156,6 +164,10 @@ export default {
     oldOpinion: {
       type: String,
       default: ''
+    },
+    pendingItemHandleDescription: {
+      type: String,
+      default: ''
     }
   },
   // components: {
@@ -167,6 +179,7 @@ export default {
       newOpinion: '',
       fixedDisabled: false,
       showPicker: false,
+      showDescription: true,
       esignPath: '',
       tabs: [
         { id: 0, text: '键盘签批', type: 0 },
@@ -174,19 +187,19 @@ export default {
       ],
       isImageOpinion: 0,
       file: '',
-      show:true,
+      show: true,
       opinionList: [] //意见列表
     };
   },
   watch: {
-    placeholder:{
-      handler(val){
-         this.show = false
-       setTimeout(() => {
-          this.show = true
-        },0)
+    placeholder: {
+      handler(val) {
+        this.show = false;
+        setTimeout(() => {
+          this.show = true;
+        }, 0);
       },
-      immediate:true
+      immediate: true
     },
     isForceDisplayDefaultOptionForPrefix: {
       handler(val) {
@@ -208,7 +221,6 @@ export default {
     }
   },
   created() {
-    
     if (this.nodeFixedOpinionSelectList.length > 0) {
       this.opinionList = this.nodeFixedOpinionSelectList;
       this.fixedDisabled = true;
@@ -217,7 +229,26 @@ export default {
     }
   },
   methods: {
-    
+    handleFocus() {
+      if (this.showDescription && this.pendingItemHandleDescription) {
+        this.$dialog
+          .confirm({
+            message: `确定填入<span style="color:red">${this.pendingItemHandleDescription}</span>说明吗？`
+          })
+          .then(() => {
+            this.opinion = this.pendingItemHandleDescription;
+           this.$refs.opinionInp[0].$children[0].focus();
+          })
+          .catch(() => {
+            // on cancel
+            this.$refs.opinionInp[0].$children[0].focus();
+          });
+      }
+    },
+    handleBlur() {
+      this.showDescription = !this.showDescription
+    },
+
     handleSave(info) {
       const { isImageOpinion } = this;
       this.esignPath = info.data;
@@ -245,7 +276,7 @@ export default {
       request({
         url: _that.baseUrl ? _that.baseUrl + commonOpion : commonOpion,
         params: { userId: _that.userId }
-      }).then(res => {
+      }).then((res) => {
         if (res.status == 'success') {
           this.opinionList = res.data.list;
         }

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

@@ -43,7 +43,8 @@ export default {
   components: { Message },
   props: {
     baseUrl: String,
-    businessId: String
+    businessId: String,
+    appId:{type:String,default:''}
   },
   data() {
     return {
@@ -70,7 +71,8 @@ export default {
           urgeUserIds: selectInfo.map(item=>item.userid).join(','),
           notificationType: Array.isArray(noticeType) ? noticeType.join(',') : noticeType,
           notificationMessage: notificationMsg,
-          businessId: this.businessId
+          businessId: this.businessId,
+          appId:this.appId
         }
       };
    

package/packages/selector/src/selector-field.vue

@@ -132,7 +132,7 @@ export default {
           item.name = item.username || item[_that.labelKey];
           item.value = item.userId || item[_that.valueKey];
         });
-        this.newNextUserList = val;
+        this.newNextUserList = JSON.parse(JSON.stringify(val));
       },
       deep: true,
       immediate: true
@@ -154,16 +154,14 @@ export default {
       let selectArr = [];
       const _that = this;
       if (this.multiple) {
-        this.data.map(item => {
-          !item[_that.valueKey] &&
-            (item[_that.valueKey] = item.userId || item.userid);
-          !item[_that.labelKey] &&
-            (item[_that.labelKey] = item.username || item.userName);
-        });
-        selectArr = this.newNextUserList.filter(
-          x => x.checked && this.multiple
-        );
-        this.newSelectList = [...this.data, ...selectArr];
+        let selectId = this.data.map(x => x[_that.valueKey])
+        this.newNextUserList.map(x => {
+          if(selectId.includes(x[_that.valueKey])){
+            selectArr.push(x)
+          }
+          x.checked = selectId.includes(x[_that.valueKey])
+        })
+        this.newSelectList = [...JSON.parse(JSON.stringify(this.data)), ...JSON.parse(JSON.stringify(selectArr))];
         this.newSelectList = this.arrDistinctByProp(
           this.newSelectList,
           _that.valueKey
@@ -191,15 +189,13 @@ export default {
     handleChange(val, info) {
       const _this = this;
       _this.openSelect = false;
+      // info.checked = !info.checked 
+      let content = JSON.parse(JSON.stringify(this.newSelectList))
       if (_this.multiple) {
         if (info.checked) {
-          if (this.newSelectList.length > 0 && !this.multiple) {
-            this.newSelectList = info;
-          } else {
-            this.newSelectList.push(info);
-          }
+            content.push(JSON.parse(JSON.stringify(info)));
         } else {
-          this.newSelectList = this.newSelectList.filter(obj => {
+          content = content.filter(obj => {
             return obj[_this.valueKey] != info[_this.valueKey];
           });
         }
@@ -207,11 +203,10 @@ export default {
         let data = this.newNextUserList.filter(
           x => x.userId === val || x[_this.valueKey] === val
         );
-        if (data.length > 0) this.newSelectList = data;
+        if (data.length > 0) content = data;
       }
-
-      this.$parent.$emit('change', { list: _this.newSelectList });
-      this.$emit('change', { list: _this.newSelectList });
+      this.$parent.$emit('change', { list: content });
+      this.$emit('change', { list: content });
     },
     /**
      * clickTree

package/src/index.js

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