eoss-mobiles 0.3.86 → 0.3.87

package/lib/selector.js

@@ -2135,7 +2135,7 @@ module.exports = require("sm-crypto");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_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/main.vue?vue&type=template&id=17308961
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=9e5cfe38
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2269,7 +2269,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=17308961
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=9e5cfe38
 
 // 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-tree.vue?vue&type=template&id=1898a068
 var selector_treevue_type_template_id_1898a068_render = function () {
@@ -4922,6 +4922,10 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
     showTree: {
       type: Boolean,
       default: false
+    },
+    isClosePopup: {
+      type: Boolean,
+      default: false
     }
   },
   data: function data() {
@@ -4933,6 +4937,17 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
   },
 
   watch: {
+    isClosePopup: {
+      handler: function handler(val) {
+        if (this.showSelectorTree) {
+          this.showSelectorTree = false;
+          this.$emit('selector-click', this.showSelectorTree);
+        }
+      },
+
+      deep: true,
+      immediate: true
+    },
     value: {
       handler: function handler(val) {
         this.selectList = val;
@@ -4969,6 +4984,7 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
     handleSelector: function handleSelector() {
       if (this.$attrs.disabled || this.$attrs.readonly) return;
       this.showSelectorTree = !this.showSelectorTree;
+      this.$emit('selector-click', this.showSelectorTree);
     },
 
     /**
@@ -4991,6 +5007,7 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
         }
       }
       this.showSelectorTree = false;
+      this.$emit('selector-click', this.showSelectorTree);
     },
 
     /**

package/package.json

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

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

@@ -74,6 +74,7 @@
                   v-model="nextCurrentOrgObjSelect"
                   multiple
                   :isAllCheck="isAllCheck"
+                  @selector-click="handleSelectorClick"
                   :paddingTop="paddingTop"
                   isDepartment
                   :objType="'enterprise'"
@@ -92,6 +93,7 @@
                 <em-selector
                   v-model="nextOtherOrgObjSelect"
                   multiple
+                  @selector-click="handleSelectorClick"
                   :isAllCheck="isAllCheck"
                   :paddingTop="paddingTop"
                   :objType="'enterprise'"
@@ -343,6 +345,9 @@ export default {
   },
   computed: {},
   methods: {
+    handleSelectorClick(val){
+      this.$parent.$emit('selector-click', val);
+    },
     getMessage() {
       let params = {
         url: getNotificationMsg,

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

@@ -47,6 +47,7 @@
             isForceDisplayDefaultOptionForPrefix
           "
           :pendingItemHandleDescription="pendingItemHandleDescription"
+          :oldOpinion="form.opinion"
           :placeholder="
             pendingItemHandleDescription || opinionHandleExplainText
           "
@@ -95,10 +96,12 @@
               multiple
               :isAllCheck="isAllCheck"
               :baseUrl="apiBaseUrl"
+              :isClosePopup="showSelectorPopup"
               :paddingTop="paddingTop"
               :objType="objType"
               v-model="addSignUserSelectList"
               @change="disposeAppUser($event, 'addSignUserSelectList')"
+              @selector-click="handleSelectorClick"
             />
             <em-input v-if="isCanPreAddSign" label="加签模式">
               <template slot="input">
@@ -138,8 +141,10 @@
                 required
                 :paddingTop="paddingTop"
                 multiple
+                :isClosePopup="showSelectorPopup"
                 :baseUrl="apiBaseUrl"
                 :objType="objType"
+                @selector-click="handleSelectorClick"
                 v-model="removeSignUserSelectList"
                 @change="disposeAppUser($event, 'removeSignUserSelectList')"
               />
@@ -206,7 +211,10 @@
                   "
                 >
                   <em-picker
-                    v-if="nextNodeCheckType == 'select' && flowSelectType == 'picker'"
+                    v-if="
+                      nextNodeCheckType == 'select' &&
+                      flowSelectType == 'picker'
+                    "
                     title="下步节点"
                     label="下步节点"
                     required
@@ -219,7 +227,9 @@
                     @confirm="onConfirmNextNode"
                   />
                   <em-input
-                    v-else-if="nextNodeCheckType == 'select' && flowSelectType == 'popup'"
+                    v-else-if="
+                      nextNodeCheckType == 'select' && flowSelectType == 'popup'
+                    "
                     label="下步节点"
                     required
                     :readonly="true"
@@ -227,10 +237,12 @@
                     label-position="top"
                     right-icon="arrow"
                   >
-                <template slot="input">
-                      <div style="width: calc(100% - 40px);">{{ form.nextNodeName }}</div>
+                    <template slot="input">
+                      <div style="width: calc(100% - 40px)">
+                        {{ form.nextNodeName }}
+                      </div>
                     </template>
-                </em-input>
+                  </em-input>
                   <em-input
                     v-else
                     value="下步节点"
@@ -268,7 +280,9 @@
                   v-model="nextUserSelectList"
                   :objType="objType"
                   :isAllCheck="isAllCheck"
+                  :isClosePopup="showSelectorPopup"
                   required
+                  @selector-click="handleSelectorClick"
                   :paddingTop="paddingTop"
                   :nextUserList="nextUserList"
                   :baseUrl="apiBaseUrl"
@@ -312,9 +326,11 @@
                 <em-selector
                   v-model="nextCurrentOrgObjSelect"
                   multiple
+                  :isClosePopup="showSelectorPopup"
                   :isAllCheck="isAllCheck"
                   :paddingTop="paddingTop"
                   isDepartment
+                  @selector-click="handleSelectorClick"
                   :objType="'enterprise'"
                   :tabs="currentOrgSelectorTabs"
                   :param="currentOrgSelectorParams"
@@ -333,7 +349,9 @@
                   v-model="nextOtherOrgObjSelect"
                   multiple
                   :isAllCheck="isAllCheck"
+                  :isClosePopup="showSelectorPopup"
                   :paddingTop="paddingTop"
+                  @selector-click="handleSelectorClick"
                   :objType="'enterprise'"
                   :param="foreignOrgSelectorParams"
                   :tabs="foreignOrgSelectorTabs"
@@ -458,10 +476,12 @@
                   v-model="nextReadUserSelectList"
                   multiple
                   :isAllCheck="isAllCheck"
+                  @selector-click="handleSelectorClick"
                   :objType="objType"
                   :param="{
                     pid: pid
                   }"
+                  :isClosePopup="showSelectorPopup"
                   :paddingTop="paddingTop"
                   :baseUrl="apiBaseUrl"
                   tabs="employee,persongroup"
@@ -606,7 +626,9 @@
       </div>
       <div v-else-if="showFlowBtn" class="btn-list">
         <div class="btn" @click="navigateBack">取消</div>
-        <div class="btn" @click="onSubmit()">{{submitButtonName || '确定'}}</div>
+        <div class="btn" @click="onSubmit()">
+          {{ submitButtonName || '确定' }}
+        </div>
       </div>
     </div>
     <Reject
@@ -637,12 +659,12 @@
       </div>
     </em-popup>
     <em-popup
-    lass="em-flow-popup"
-  v-model="showFlowSelect"
-  position="center"
-  style="width: 80%;"
->
-<div class="em-flow-popup-box" >
+      lass="em-flow-popup"
+      v-model="showFlowSelect"
+      position="center"
+      style="width: 80%"
+    >
+      <div class="em-flow-popup-box">
         <div class="em-flow-popup-box-top">
           <div></div>
           <span>下步节点 </span
@@ -659,7 +681,7 @@
           </div>
         </div>
       </div>
-</em-popup>  
+    </em-popup>
   </div>
 </template>
 
@@ -747,6 +769,19 @@ export default {
     hideMessage: {
       type: Boolean,
       default: false
+    },
+    isClosePopup: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    isClosePopup: {
+      handler(val) {
+        this.showSelectorPopup = !this.showSelectorPopup;
+      },
+      deep: true,
+      immediate: true
     }
   },
   data() {
@@ -757,8 +792,9 @@ export default {
       ],
       showFlowBtn: false,
       endFlow: false,
-      submitButtonName:'',
-      showFlowSelect:false,
+      submitButtonName: '',
+      showSelectorPopup: false,
+      showFlowSelect: false,
       currentOrgSelectorParams: {},
       currentOrgSelectorTabs: 'department,employee',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
@@ -930,7 +966,11 @@ export default {
   created() {
     // 获取用户信息
     // 生成时间数组
-    this.currentOrgSelectorParams={pid:this.orgId,only_filid: true,onlyMyOrg: true}
+    this.currentOrgSelectorParams = {
+      pid: this.orgId,
+      only_filid: true,
+      onlyMyOrg: true
+    };
     this.timeList = new Array();
     for (let i = 0; i < 25; i++) {
       this.timeList.push(i);
@@ -986,9 +1026,13 @@ export default {
     }
   },
   methods: {
-    handleClickFlow(val){
-      console.log(val)
-      if(val.nodeId === this.form.nextNodeId) return this.showFlowSelect = false;
+    handleSelectorClick(val) {
+      this.$parent.$emit('selector-click', val);
+    },
+    handleClickFlow(val) {
+      console.log(val);
+      if (val.nodeId === this.form.nextNodeId)
+        return (this.showFlowSelect = false);
       this.form.nextNodeId = val.nodeId;
       this.form.nextNodeName = val.nodeName;
       this.showFlowSelect = false;
@@ -1709,6 +1753,7 @@ export default {
                 choiceOrgId,
                 choiceDeptId,
                 pOrgId,
+                opinion,
                 taskExamine,
                 customPresetHintMessage,
                 currentOrgName,
@@ -1725,6 +1770,9 @@ export default {
                 isCanPreAddSign
               }
             } = res;
+            if(opinion){
+              that.form.opinion = opinion;
+            }
             if (
               currentOrgSelectorParams &&
               currentOrgSelectorParams.enableCurrentOrgConfig == 'true'
@@ -1775,18 +1823,24 @@ export default {
               });
               that.foreignOrgSelectorTabs =
                 that.foreignOrgSelectorTabs.join(',');
-            }else if(isChoiceOtherOrgDept == 'true'){
-              that.foreignOrgSelectorTabs = 'enterprise,department'
-              that.foreignOrgSelectorParams.pid = 'root'
-              that.foreignOrgSelectorParams.nofilid = 1
-              that.foreignOrgSelectorParams = {...that.foreignOrgSelectorParams, ...that.selectorParams}
-              console.log(that.foreignOrgSelectorParams,1)
-            }else{
-               that.foreignOrgSelectorTabs = 'enterprise'
-              that.foreignOrgSelectorParams.pid = 'root'
-              that.foreignOrgSelectorParams.nofilid = 1
-              that.foreignOrgSelectorParams = {...that.foreignOrgSelectorParams, ...that.selectorParams}
-              console.log(that.foreignOrgSelectorParams,2)
+            } else if (isChoiceOtherOrgDept == 'true') {
+              that.foreignOrgSelectorTabs = 'enterprise,department';
+              that.foreignOrgSelectorParams.pid = 'root';
+              that.foreignOrgSelectorParams.nofilid = 1;
+              that.foreignOrgSelectorParams = {
+                ...that.foreignOrgSelectorParams,
+                ...that.selectorParams
+              };
+              console.log(that.foreignOrgSelectorParams, 1);
+            } else {
+              that.foreignOrgSelectorTabs = 'enterprise';
+              that.foreignOrgSelectorParams.pid = 'root';
+              that.foreignOrgSelectorParams.nofilid = 1;
+              that.foreignOrgSelectorParams = {
+                ...that.foreignOrgSelectorParams,
+                ...that.selectorParams
+              };
+              console.log(that.foreignOrgSelectorParams, 2);
             }
             if (
               taskOperationShiftedNodeList &&
@@ -2022,7 +2076,12 @@ export default {
           const {
             status,
             message,
-            data: { isCanFenyue, taskExamine, taskReadOpinionRequired ,submitButtonName}
+            data: {
+              isCanFenyue,
+              taskExamine,
+              taskReadOpinionRequired,
+              submitButtonName
+            }
           } = res;
           this.showFlowBtn = true;
           if (status === 'success') {
@@ -2031,7 +2090,7 @@ export default {
             this.taskReadOpinionRequired = taskReadOpinionRequired;
             // if (this.nodeName) {
             this.processObj.taskExamine.nodeName = '分阅';
-            this.submitButtonName = submitButtonName
+            this.submitButtonName = submitButtonName;
             // }
           } else {
             this.$toast(message || '系统错误，请联系管理员！');
@@ -2117,7 +2176,7 @@ export default {
           this.nextUserList.map((r) => {
             _this.$set(r, 'checked', false);
           });
-          _that.currentOrgSelectorParams.roleid = _that.deptRoleCode
+          _that.currentOrgSelectorParams.roleid = _that.deptRoleCode;
           this.isHandleExplain =
             res.data.nodeExtAttr.isHandleExplain == 1 ? true : false; //判断是否隐藏办理说明
           this.isCustomUserClick =

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

@@ -24,6 +24,7 @@
             :multiple="!item.isRadio"
             v-show="item.showSelectUser"
             :nextUserList="item.nextUserList"
+            @selector-click="handleSelectorClick"
             v-model="item.nextUserSelectList"
             label="办理人"
             :objType="item.objType"
@@ -128,14 +129,16 @@ export default {
     }
   },
   methods: {
+    handleSelectorClick(val) {
+      this.$parent.$emit('selector-click', val);
+    },
     getValue() {
       let pass = true;
       let PresetData = [];
       let newFlowList = this.flowList.filter(
         (x) =>
           x.nodeId &&
-          (typeof x.nodeId == 'object' ? x.nodeId.nodeId : x.nodeId) !=
-            '-2'
+          (typeof x.nodeId == 'object' ? x.nodeId.nodeId : x.nodeId) != '-2'
       );
       for (let i = 0; i < newFlowList.length; i++) {
         if (