eoss-mobiles 0.2.13 → 0.2.14

package/lib/utils/axios.js

@@ -19,8 +19,6 @@ var _qs2 = _interopRequireDefault(_qs);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var apiUrl = _util2.default.getStorage('host');
-// import Vue from 'vue';
-
 var http = _axios2.default.create({
   baseURL: apiUrl,
   timeout: 60000,
@@ -113,6 +111,7 @@ http.interceptors.request.use(function (config) {
   return Promise.error(error);
 });
 // 响应拦截器
+
 http.interceptors.response.use(function (response) {
   if (response.status === 200) {
     if (response.data.rCode === 64 || response.data.rCode === 27) {
@@ -121,7 +120,7 @@ http.interceptors.response.use(function (response) {
       return Promise.resolve(response.data);
     }
   } else {
-    return Promise.reject(response);
+    return Promise.reject(response.data);
   }
 }, function (error) {
   if (error && error.response) {

package/lib/utils/util.js

@@ -1211,6 +1211,23 @@ var openAttachment = function openAttachment(data) {
     }
   }
 };
+/**
+ * jsGoPayrollIndexAct
+ * @desc:原生app打开工资条页面
+ * @date 2024年1月11日
+ * @author liufan
+ */
+var jsGoPayrollIndexAct = function jsGoPayrollIndexAct(id) {
+  var u = navigator.userAgent;
+  var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; // android终端
+  var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); // ios终端
+  if (isAndroid) {
+    window.AndroidWebView.jsGoPayrollIndexAct(id);
+  } else if (isiOS) {
+    window.webkit.messageHandlers.jsGoPayrollIndexAct.postMessage(id);
+  }
+};
+
 /**
  * deepClone
  * @desc:深拷贝
@@ -1268,6 +1285,21 @@ var exclAttribute = function exclAttribute(_ref4) {
   }
   return obj;
 };
+/**
+ * 获取UUID
+ * @desc:generateUUID
+ * @author liufan
+ * @date 2024年1月12日
+ **/
+var generateUUID = function generateUUID() {
+  var d = new Date().getTime();
+  var uuid = 'xxxxxxxxxxxxxxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
+  });
+  return uuid;
+};
 exports.default = {
   esEncrypt: esEncrypt,
   esDecode: esDecode,
@@ -1311,5 +1343,7 @@ exports.default = {
   getTypeName: getTypeName,
   replenish: replenish,
   identical: identical,
-  exportXls: exportXls
+  jsGoPayrollIndexAct: jsGoPayrollIndexAct,
+  exportXls: exportXls,
+  generateUUID: generateUUID
 };

package/package.json

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

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

@@ -21,6 +21,8 @@
           :isOpinionRequired="isOpinionRequired"
           :disabled="isBanInputOpinion != 0"
           :baseUrl="baseUrl"
+          :isForceDisplayDefaultOptionForPrefix="isForceDisplayDefaultOptionForPrefix"
+          :nodeDefaultSubmitOpinion="nodeDefaultSubmitOpinion"
           :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
           :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
         ></Opinion>
@@ -295,7 +297,6 @@
                 v-model="nextReadUserSelectList"
                 multiple
                 :objType="objType"
-                required
                 :param="{
                   pid: pid
                 }"
@@ -479,6 +480,7 @@ export default {
       objType: 'enterprise', //树点击对象
       selectType: 'employee', // 树 选择类型
       isNextBox: true, // 是否展开隐藏下步操作
+      isForceDisplayDefaultOptionForPrefix:false,
       isOtherUnit: true, //是否是外单位
       isShowNode: false,
       subProcessInfo: '',
@@ -1281,6 +1283,7 @@ export default {
               // that.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
               that.isBanInputOpinion =
                 nodeInfoMap.nodeExtAttr.isBanInputOpinion;
+              that.isForceDisplayDefaultOptionForPrefix = nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix == 1;
             }
             that.choiceOrgId = choiceOrgId;
             that.choiceDeptId = choiceDeptId;

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

@@ -32,7 +32,7 @@
               />
               <span
                 class="em-flow-opion"
-                v-if="opinionList.length > 0 && isHiddenOftenOpinion"
+                v-if="isHiddenOftenOpinion"
                 @click="showPicker = true"
                 >常用意见 <i class="iconfont icon-em-more"
               /></span>
@@ -88,7 +88,7 @@
         :columns="opinionList"
         valueKey="content"
         @cancel="handleClose"
-        @confirm="onInput"
+        @confirm="onInput($event, true)"
       >
       </van-picker>
     </van-popup>
@@ -139,6 +139,14 @@ export default {
     userId: {
       type: String,
       default: ''
+    },
+    isForceDisplayDefaultOptionForPrefix: {
+      type: Boolean,
+      default: false
+    },
+    nodeDefaultSubmitOpinion: {
+      type: String,
+      default: ''
     }
   },
   // components: {
@@ -147,6 +155,7 @@ export default {
   data() {
     return {
       opinion: '',
+      newOpinion: '',
       fixedDisabled: false,
       showPicker: false,
       esignPath: '',
@@ -159,6 +168,17 @@ export default {
       opinionList: [] //意见列表
     };
   },
+  watch: {
+    isForceDisplayDefaultOptionForPrefix: {
+      handler(val) {
+        if (val) {
+          this.opinion = this.nodeDefaultSubmitOpinion;
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   created() {
     if (this.nodeFixedOpinionSelectList.length > 0) {
       this.opinionList = this.nodeFixedOpinionSelectList;
@@ -202,9 +222,25 @@ export default {
       });
     },
     // 将input的值传递到父组件
-    onInput(val) {
+    onInput(val, isSelect) {
       const { isImageOpinion, file } = this;
       this.opinion = typeof val === 'string' ? val : val.content;
+      if (
+        this.isForceDisplayDefaultOptionForPrefix &&
+        !this.opinion.startsWith(this.nodeDefaultSubmitOpinion) &&
+        !isSelect
+      ) {
+        this.opinion = this.nodeDefaultSubmitOpinion + this.newOpinion;
+      } else if (this.isForceDisplayDefaultOptionForPrefix && !isSelect) {
+        this.newOpinion = this.opinion.replace(
+          this.nodeDefaultSubmitOpinion,
+          ''
+        );
+      }
+      if (this.isForceDisplayDefaultOptionForPrefix && isSelect) {
+        this.newOpinion = this.opinion;
+        this.opinion = this.nodeDefaultSubmitOpinion + this.opinion;
+      }
       this.$emit('onInputOpintion', {
         opinion: this.opinion,
         isImageOpinion,

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

@@ -22,9 +22,9 @@
       <div class="input-box">
         <!-- 下一步所有相关操作-->
         <div>
-          <div @click="isNextBox = !isNextBox" class="shrink-btn">
+          <!-- <div @click="isNextBox = !isNextBox" class="shrink-btn">
             {{ isNextBox ? '收起下一步操作和节点' : '展开下一步操作和节点' }}
-          </div>
+          </div> -->
           <div class="next-box" v-show="isNextBox">
             <!-- 下一步操作 -->
             <div class="item">
@@ -164,7 +164,7 @@ export default {
       isChooseNextNode: 0,
       isOpinionRequired: 0, //办理意见是否必填
       isBanInputOpinion: 0, //是否禁用意见
-      isNextBox: false, // 是否展开隐藏下步操作
+      isNextBox: true, // 是否展开隐藏下步操作
       defaultNotificationType: [], //选中消息数组
       // showAppUser: false, // 办理人遮罩层
       showNextList: false, // 下一步遮罩层

package/packages/flow/src/main.vue

@@ -61,6 +61,12 @@ export default {
   },
   data() {
     return {};
+  },
+  mounted(){
+    for(let i=0;i<10;i++){
+      if(i == 2) return
+      console.log(i)
+    }
   }
 };
 </script>

package/packages/retrial-auth/index.js

@@ -0,0 +1,5 @@
+import EmRetrialAuth from './src/main';
+
+EmRetrialAuth.install = Vue => Vue.component(EmRetrialAuth.name, EmRetrialAuth);
+
+export default EmRetrialAuth;

package/packages/retrial-auth/src/main.vue

@@ -0,0 +1,257 @@
+<template>
+  <div class="em-retrial-auth" v-if="show">
+    <div class="em-retrial-auth-box">
+      验证码将发送至{{
+        active == 'WEB_SMS' ? `手机号：${phoneText}` : `邮箱：${emailText}`
+      }}
+      <em-input
+        style="margin:10px 0px"
+        v-model="formData.verificationCode"
+        center
+        clearable
+        hide-label
+        placeholder="请输入验证码"
+      >
+        <template slot="button">
+          <em-button
+            size="small"
+            type="primary"
+            :disabled="disabled"
+            @click.stop="getCode"
+            >{{ btnText }}</em-button
+          >
+        </template>
+      </em-input>
+      <em-button style="width:100%" type="primary" @click="handleAuth"
+        >提交验证</em-button
+      >
+      <div class="em-retrial-auth-icon-box" v-if="newType.length > 1">
+        <div
+          class="em-retrial-auth-icon-box-item"
+          :class="{ active: active === item }"
+          v-for="item in newType"
+          :key="item"
+          @click="active = item"
+        >
+          <van-icon
+            :name="item === 'WEB_SMS' ? 'phone-o' : 'envelop-o'"
+            color="#fff"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import request from '../../../src/utils/http.js';
+import utils from '../../../src/utils/util';
+import {
+  initRetrialAuth,
+  getRetrialAuthCode,
+  codeRetrialAuth
+} from '../../../src/config/api';
+
+export default {
+  name: 'EmRetrialAuth',
+  props: {
+    reload: {
+      type: String,
+      default: ''
+    },
+    group: {
+      type: String,
+      default: ''
+    },
+    type: {
+      type: [String, Array],
+      default: () => []
+    },
+    url: {
+      type: String,
+      default: ''
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    },
+    method: {
+      type: String,
+      default: 'get'
+    }
+  },
+  data() {
+    return {
+      active: 0,
+      newReload: '',
+      newData: '',
+      show: false,
+      newGroup: '',
+      newType: '',
+      emailText: '',
+      retrialAuthGroupId: utils.generateUUID(),
+      formData: {
+        verificationCode: ''
+      },
+      phoneText: '',
+      btnText: '获取验证码',
+      disabled: false,
+      countdown: 0,
+      submit: false,
+      uuid: null,
+      timer:null
+    };
+  },
+  mounted() {
+    if (this.url) {
+      this.reqUrl();
+    } else {
+      this.newGroup = this.group;
+      this.newReload = this.reload;
+      this.newType = this.type.filter(item => item != 'SCANCODE');
+      if (this.newType.length > 0) {
+        this.active = this.newType[0];
+      }
+    }
+  },
+  methods: {
+    handleAuth() {
+      if (this.submit) {
+        return false;
+      }
+      if (!this.formData.verificationCode) return this.$toast('请输入验证码');
+      this.submit = true;
+      let params = {
+        retrialAuthGroupIds: this.newGroup,
+        targetType: this.active === 'WEB_SMS' ? 'SMS' : 'EMAIL',
+        verificationCode: this.formData.verificationCode
+      };
+      this.$toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
+      request({
+        url: codeRetrialAuth,
+        type: 'post',
+        params: params
+      })
+        .then(res => {
+          let { rCode, msg } = res;
+          this.$toast.clear();
+          if (rCode == 0) {
+            this.$toast('认证成功');
+            this.$emit('success',this.retrialAuthGroupId);
+          } else {
+            this.$toast(msg);
+            this.$emit('error');
+            this.submit = false;
+          }
+        })
+        .catch();
+    },
+    getCode() {
+      if (this.countdown) {
+        return false;
+      }
+      let params = { targetType: this.active === 'WEB_SMS' ? 'SMS' : 'EMAIL' };
+      this.countdown = 60;
+      this.timer = setInterval(() => {
+        if (this.countdown > 0) {
+          this.countdown--;
+          this.disabled = true;
+          this.btnText = '重新获取' + this.countdown + 's';
+        } else {
+          this.btnText = '重新获取';
+          this.disabled = false;
+          this.submit = false;
+          clearInterval(this.timer);
+        }
+      }, 1000);
+      this.$toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
+      request({
+        url: getRetrialAuthCode,
+        type: 'post',
+        params: params
+      })
+        .then(res => {
+          let { rCode, msg } = res;
+          this.$toast.clear();
+          if (rCode == 0) {
+            this.$toast(
+              '验证码已发送至' +
+                (this.active === 'WEB_SMS' ? '手机' : '邮箱') +
+                '，请注意查收！'
+            );
+          } else {
+            this.$toast(msg);
+            this.$emit('error');
+          }
+        })
+        .catch();
+    },
+    init() {
+      request({
+        url: initRetrialAuth
+      })
+        .then(res => {
+          let { rCode, results } = res;
+          this.$toast.clear();
+          if (rCode == 0) {
+            this.uuid = results.uuid;
+            // this.qrImg = results.qrImg;
+            this.emailText = results.emailText;
+            this.phoneText = results.phoneText;
+            // if (this.active === 'SCANCODE') {
+            //   this.handleScanCodeRetrialAuth();
+            // }
+          }
+        })
+        .catch();
+    },
+    reqUrl() {
+      this.$toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
+      request({
+        url: this.url,
+        params: { ...this.params, retrialAuthGroupId: this.retrialAuthGroupId },
+        type: this.method
+      }).then(res => {
+        const { rCode, results, msg } = res;
+        if (rCode == 61) {
+          if (results) {
+            this.newReload = results.reload || results.refresh;
+            this.newGroup = results.retrialAuthGroupIds;
+            this.newType = results.retrialAuthType.filter(
+              item => item != 'SCANCODE'
+            );
+            this.init();
+            if (this.newType.length > 0) {
+              this.active = this.newType[0];
+            }
+          }
+          this.show = true;
+        } else {
+          this.$toast(msg);
+          this.$emit('error');
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style></style>