eoss-mobiles 0.2.76 → 0.2.78

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

@@ -9,9 +9,7 @@
         :code="processObj.attachedCode"
         :ownId="$route.query.pendingId"
         :esign="esign"
-        :esignLineWidth="
-            $attrs['esign-line-width'] || $attrs['esignLineWidth']
-          "
+        :esignLineWidth="$attrs['esign-line-width'] || $attrs['esignLineWidth']"
         @onInputOpintion="onInputOpintion"
         :placeholder="opinionHandleExplainText"
         :isOpinionRequired="isBanInputOpinion"
@@ -49,7 +47,7 @@ import { taskRejectHtml, toTaskRejectHtml } from '../../../../src/config/api';
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
 import Message from './Message.vue';
-import $ from '../../../../src/utils/util'
+import $ from '../../../../src/utils/util';
 export default {
   name: 'Reject',
   props: {
@@ -70,7 +68,7 @@ export default {
   data() {
     return {
       showMsg: false, // 判断是否显示系统消息
-      opinionHandleExplainText:undefined,
+      opinionHandleExplainText: undefined,
       showOpinion: false, // 常用意见弹框
       form: {
         opinion: undefined, // 审批意见
@@ -142,7 +140,7 @@ export default {
         this.beforeSubmit({ pendingId: this.pendingId, ...this.form });
         return;
       }
-      this.form.mobileKey = $.getStorage('deviceId') || '123'
+      this.form.mobileKey = $.getStorage('deviceId') || '123';
       let formData = new FormData();
       if (this.form.isImageOpinion == 1) {
         formData.append('file', this.file);
@@ -165,8 +163,8 @@ export default {
       request({
         url: _that.baseUrl ? _that.baseUrl + taskRejectHtml : taskRejectHtml,
         type: 'post',
-        params: formData,
-        format:false
+        params: this.form.isImageOpinion == 1 ? formData : this.form,
+        format: false
       }).then(res => {
         if (res.status == 'success') {
           this.$toast('操作成功');
@@ -218,7 +216,8 @@ export default {
           this.nodeDefaultRejectOpinion =
             nodeInfoMap.nodeExtAttr.nodeDefaultRejectOpinion;
           this.isBanInputOpinion = nodeInfoMap.nodeExtAttr.isBanInputOpinion;
-          this.opinionHandleExplainText = nodeInfoMap.nodeExtAttr.opinionHandleExplainText;
+          this.opinionHandleExplainText =
+            nodeInfoMap.nodeExtAttr.opinionHandleExplainText;
           if (!this.isBanInputOpinion) {
             this.isBanInputOpinion = 0;
           }

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

@@ -83,7 +83,7 @@
 <script>
 import Message from './Message.vue';
 import {
-  toStartTaskRead,
+  toStartTaskReadHtml,
   taskReadHtml,
   getHandleInfoHtml,
   toTaskTransferIndex,
@@ -147,7 +147,7 @@ export default {
   computed: {
     params() {
       return {
-        pid: util.getStorage('orgId') || this.orgId
+        pid:this.taskReadType == '分阅'? '' : util.getStorage('orgId') || this.orgId
       };
     },
     newType() {
@@ -287,13 +287,14 @@ export default {
       if (_that.newType != 'taskReadAndEnd') delete params.taskAction;
 
       request({
-        url: _that.baseUrl ? _that.baseUrl + toStartTaskRead : toStartTaskRead,
+        url: _that.baseUrl ? _that.baseUrl + toStartTaskReadHtml : toStartTaskReadHtml,
         params: params
       }).then(res => {
         _that.$toast.clear();
         if (res.status == 'success') {
           this.processObj = res.data;
           this.notificationMsgType = this.isMultiple();
+          // this.taskExamine = res.data.taskExamine
         } else {
           _that.$toast(res.message);
           setTimeout(() => {

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

@@ -501,7 +501,7 @@ export default {
             : this.type == 'takeAdvice'
             ? taskTakeAdvice
             : taskUnionExamine,
-        params: formData,
+        params:isImageOpinion == 1? formData : info,
         headers: { Accept: 'application/json,text/plain' },
         type: 'post',
         format: false

package/src/config/api.js

@@ -55,7 +55,7 @@ export const taskReadHtml = activiti + '/task/taskHandle/taskRead.dhtml';
 // 获取分阅页面信息
 // export const toStartTaskReadHtml = '/api/mecp/v1/mecpItask/toStartTaskReadHtml.json';
 // 获取分阅信息
-export const toStartTaskRead = activiti + mecp + '/bpmBackend/getNodeInfoHtml';
+export const toStartTaskRead = '/bpm/v1/mecpItask/getNodeInfoHtml.json';
 export const toStartTaskReadHtml =
   activiti + mecp + '/bpmBackend/toTaskReadIndex';
 // 获取转办页面数据

package/src/index.js

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

package/src/utils/axios.js

@@ -1,216 +1,216 @@
-import Axios from 'axios';
-import { Toast } from 'eoss-mobile-vant';
-import $ from './util';
-import qs from 'qs';
-let apiUrl = $.getStorage('host');
-
-const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
-  let http = Axios.create({
-    baseURL: apiUrl,
-    timeout: 60000,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-    },
-    withCredentials: false
-  });
-  http.interceptors.request.use(
-    config => {
-      if ((params.params || params) instanceof FormData === false) {
-        if (type === 'post' && !format) {
-          config.data = qs.stringify(params.params || params);
-          if (!config.headers['content-type'] && !headers['Content-Type']) {
-            config.headers['content-type'] =
-              'application/x-www-form-urlencoded;charset=UTF-8';
-          }
-        } else {
-          if (!config.headers['content-type'] && !headers['Content-Type']) {
-            config.headers['content-type'] = 'application/json;charset=UTF-8';
-          }
-          config.params = params.params || params;
-        }
-      }
-      if ($.getStorage('token')) {
-        config.headers.Authorization = $.getStorage('token');
-      }
-      if ($.getStorage('deviceId')) {
-        config.headers.deviceId = $.getStorage('deviceId');
-      }
-
-      let a = '/config/';
-
-      if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
-        config.headers.clientKey = $.getStorage('clientKey') || 'csjk2';
-      }
-      if (config.url.search('api/financePhone/') !== -1) {
-        config.baseURL = 'https://release.cdgzjg.cn/';
-      }
-      if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
-        config.headers = {
-          token: sessionStorage.getItem('token'),
-          oueside_token: sessionStorage.getItem('token'),
-          deviceId: '432a320f99793e39',
-          Authorization: sessionStorage.getItem('token')
-        };
-      }
-      if (config.url.search('/getmyAccount.json') !== -1) {
-        delete config.params.userId;
-      }
-      if (config.url.search('/sso2/authCenter') !== -1) {
-        delete config.headers.clientKey;
-        delete config.headers.deviceId;
-      }
-      if (config.url.search('/appInfo') !== -1) {
-        config.headers.deviceId = $.getStorage('deviceId');
-        delete config.headers.clientKey;
-      }
-      if (
-        config.url.search('getPresetCustomInfo') !== -1 ||
-        config.url.search('registerNew') !== -1
-      ) {
-        config.headers.token = $.getStorage('token');
-      }
-      if (
-        config.url.search('mecp/overtime') !== -1 ||
-        config.url.search('mecp/leave') !== -1 ||
-        config.url.search('contractext') !== -1 ||
-        config.url.search('getSysParam') !== -1
-      ) {
-        delete config.headers.deviceId;
-      }
-      let accessToken = $.getStorage('accessToken');
-      let tenantId = $.getStorage('tenantId');
-      let authorization = $.getStorage('authorization') || $.getStorage('token');
-      let deviceId = $.getStorage('deviceId');
-      if (accessToken) {
-        config.headers['X-Coos-Client-Access-Token'] = accessToken;
-      }
-      if (tenantId) {
-        config.headers['X-Coos-Client-Tenant-Id'] = tenantId;
-      }
-      if (authorization) {
-        config.headers['Authorization'] = authorization;
-      }
-      if (deviceId) {
-        config.headers['deviceId'] = deviceId;
-      }
-      return config;
-    },
-    error => {
-      return Promise.error(error);
-    }
-  );
-  http.interceptors.response.use(
-    response => {
-      if (response.status === 200) {
-        if (response.data.rCode === 64 || response.data.rCode === 27) {
-          $.H5TokenInvalid();
-        } else {
-          return Promise.resolve(response.data);
-        }
-      } else {
-        return Promise.reject(response.data);
-      }
-    },
-    error => {
-      if (error && error.response) {
-        if (error.response.status) {
-          switch (error.response.status) {
-            case 400:
-              error.message = '错误请求';
-              break;
-            case 401:
-              error.message = '未授权，请重新登录';
-              break;
-            case 403:
-              error.message = '登录过期，请重新登录';
-              $.removeStorage('userId');
-              break;
-            case 404:
-              error.message = '网络请求不存在';
-              break;
-            case 405:
-              error.message = '请求方法错误';
-              break;
-            case 408:
-              error.message = '请求超时';
-              break;
-            case 500:
-              error.message = '服务器端出错';
-              break;
-            case 501:
-              error.message = '网络未实现';
-              break;
-            case 502:
-              error.message = '网络错误';
-              break;
-            case 503:
-              error.message = '服务不可用';
-              break;
-            case 504:
-              error.message = '网络超时';
-              break;
-            case 505:
-              error.message = 'http版本不支持该请求';
-              break;
-            default:
-              error.message = `连接错误${error.response.status}`;
-          }
-        } else {
-          error.message = '接口出现问题，无法请求';
-        }
-      }
-      Toast({
-        message: error.message,
-        duration: 1500,
-        forbidClick: true
-      });
-      return Promise.reject(error);
-    }
-  );
-  if (type === 'get' || type === 'GET') {
-    return http.get(url, params, headers, format);
-  } else {
-    return http.post(url, params, headers, format);
-  }
-};
-
-// 响应拦截器
-
-const base = {
-  get: (url, params = {}, headers = {}, format = false) => {
-    if (params.params && url.search('registerNew') === -1) {
-      params.params.userId = params.params.userId
-        ? params.params.userId
-        : $.getStorage('userId');
-    } else if (url.search('registerNew') === -1) {
-      params.userId = params.userId ? params.userId : $.getStorage('userId');
-    }
-    if (url.search('mecpSys/login') !== -1) {
-      delete params.userId;
-    }
-    if (url.search('mecp.invest') !== -1) {
-      if (params.params) {
-        params.params.userId = 'u1b9f3ce4731649e0b665af015d74c19b';
-      } else {
-        params.userId = 'u1b9f3ce4731649e0b665af015d74c19b';
-      }
-    }
-    return ajax(
-      url,
-      {
-        params
-      },
-      headers,
-      format
-    );
-  },
-  post: (url, params, headers, format) => {
-    if (params.params) {
-      params.params.userId = params.params.userId || $.getStorage('userId');
-    } else {
-      params.userId = params.userId || $.getStorage('userId');
-    }
-    return ajax(url, params, headers, format, 'post');
-  }
-};
-export default base;
+import Axios from 'axios';
+import { Toast } from 'eoss-mobile-vant';
+import $ from './util';
+import qs from 'qs';
+let apiUrl = $.getStorage('host');
+
+const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
+  let http = Axios.create({
+    baseURL: apiUrl,
+    timeout: 60000,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+    },
+    withCredentials: false
+  });
+  http.interceptors.request.use(
+    config => {
+      if ((params.params || params) instanceof FormData === false) {
+        if (type === 'post' && !format) {
+          config.data = qs.stringify(params.params || params);
+          if (!config.headers['content-type'] && !headers['Content-Type']) {
+            config.headers['content-type'] =
+              'application/x-www-form-urlencoded;charset=UTF-8';
+          }
+        } else {
+          if (!config.headers['content-type'] && !headers['Content-Type']) {
+            config.headers['content-type'] = 'application/json;charset=UTF-8';
+          }
+          config.params = params.params || params;
+        }
+      }
+      if ($.getStorage('token')) {
+        config.headers.Authorization = $.getStorage('token');
+      }
+      if ($.getStorage('deviceId')) {
+        config.headers.deviceId = $.getStorage('deviceId');
+      }
+
+      let a = '/config/';
+
+      if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
+        config.headers.clientKey = $.getStorage('clientKey') || 'csjk2';
+      }
+      if (config.url.search('api/financePhone/') !== -1) {
+        config.baseURL = 'https://release.cdgzjg.cn/';
+      }
+      if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
+        config.headers = {
+          token: sessionStorage.getItem('token'),
+          oueside_token: sessionStorage.getItem('token'),
+          deviceId: '432a320f99793e39',
+          Authorization: sessionStorage.getItem('token')
+        };
+      }
+      if (config.url.search('/getmyAccount.json') !== -1) {
+        delete config.params.userId;
+      }
+      if (config.url.search('/sso2/authCenter') !== -1) {
+        delete config.headers.clientKey;
+        delete config.headers.deviceId;
+      }
+      if (config.url.search('/appInfo') !== -1) {
+        config.headers.deviceId = $.getStorage('deviceId');
+        delete config.headers.clientKey;
+      }
+      if (
+        config.url.search('getPresetCustomInfo') !== -1 ||
+        config.url.search('registerNew') !== -1
+      ) {
+        config.headers.token = $.getStorage('token');
+      }
+      if (
+        config.url.search('mecp/overtime') !== -1 ||
+        config.url.search('mecp/leave') !== -1 ||
+        config.url.search('contractext') !== -1 ||
+        config.url.search('getSysParam') !== -1
+      ) {
+        delete config.headers.deviceId;
+      }
+      let accessToken = $.getStorage('accessToken');
+      let tenantId = $.getStorage('tenantId');
+      let authorization = $.getStorage('authorization') || $.getStorage('token');
+      let deviceId = $.getStorage('deviceId');
+      if (accessToken) {
+        config.headers['X-Coos-Client-Access-Token'] = accessToken;
+      }
+      if (tenantId) {
+        config.headers['X-Coos-Client-Tenant-Id'] = tenantId;
+      }
+      if (authorization) {
+        config.headers['Authorization'] = authorization;
+      }
+      if (deviceId) {
+        config.headers['deviceId'] = deviceId;
+      }
+      return config;
+    },
+    error => {
+      return Promise.error(error);
+    }
+  );
+  http.interceptors.response.use(
+    response => {
+      if (response.status === 200) {
+        if (response.data.rCode === 64 || response.data.rCode === 27) {
+          $.H5TokenInvalid();
+        } else {
+          return Promise.resolve(response.data);
+        }
+      } else {
+        return Promise.reject(response.data);
+      }
+    },
+    error => {
+      if (error && error.response) {
+        if (error.response.status) {
+          switch (error.response.status) {
+            case 400:
+              error.message = '错误请求';
+              break;
+            case 401:
+              error.message = '未授权，请重新登录';
+              break;
+            case 403:
+              error.message = '登录过期，请重新登录';
+              $.removeStorage('userId');
+              break;
+            case 404:
+              error.message = '网络请求不存在';
+              break;
+            case 405:
+              error.message = '请求方法错误';
+              break;
+            case 408:
+              error.message = '请求超时';
+              break;
+            case 500:
+              error.message = '服务器端出错';
+              break;
+            case 501:
+              error.message = '网络未实现';
+              break;
+            case 502:
+              error.message = '网络错误';
+              break;
+            case 503:
+              error.message = '服务不可用';
+              break;
+            case 504:
+              error.message = '网络超时';
+              break;
+            case 505:
+              error.message = 'http版本不支持该请求';
+              break;
+            default:
+              error.message = `连接错误${error.response.status}`;
+          }
+        } else {
+          error.message = '接口出现问题，无法请求';
+        }
+      }
+      Toast({
+        message: error.message,
+        duration: 1500,
+        forbidClick: true
+      });
+      return Promise.reject(error);
+    }
+  );
+  if (type === 'get' || type === 'GET') {
+    return http.get(url, params, headers, format);
+  } else {
+    return http.post(url, params, headers, format);
+  }
+};
+
+// 响应拦截器
+
+const base = {
+  get: (url, params = {}, headers = {}, format = false) => {
+    if (params.params && url.search('registerNew') === -1) {
+      params.params.userId = params.params.userId
+        ? params.params.userId
+        : $.getStorage('userId');
+    } else if (url.search('registerNew') === -1) {
+      params.userId = params.userId ? params.userId : $.getStorage('userId');
+    }
+    if (url.search('mecpSys/login') !== -1) {
+      delete params.userId;
+    }
+    if (url.search('mecp.invest') !== -1) {
+      if (params.params) {
+        params.params.userId = 'u1b9f3ce4731649e0b665af015d74c19b';
+      } else {
+        params.userId = 'u1b9f3ce4731649e0b665af015d74c19b';
+      }
+    }
+    return ajax(
+      url,
+      {
+        params
+      },
+      headers,
+      format
+    );
+  },
+  post: (url, params, headers, format) => {
+    if (params.params) {
+      params.params.userId = params.params.userId || $.getStorage('userId');
+    } else {
+      params.userId = params.userId || $.getStorage('userId');
+    }
+    return ajax(url, params, headers, format, 'post');
+  }
+};
+export default base;