eoss-mobiles 0.2.20 → 0.2.22

package/lib/picker.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = external_qs_default.a.stringify(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';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.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;
       }
-      config.data = params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }
@@ -1896,6 +1897,7 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
     } else {
@@ -1908,6 +1910,7 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
+  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/lib/radio.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = external_qs_default.a.stringify(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';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.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;
       }
-      config.data = params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }
@@ -1896,6 +1897,7 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
     } else {
@@ -1908,6 +1910,7 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
+  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/lib/retrial-auth.js

@@ -1744,18 +1744,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = external_qs_default.a.stringify(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';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.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;
       }
-      config.data = params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }
@@ -1900,6 +1901,7 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
     } else {
@@ -1912,6 +1914,7 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
+  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/lib/selector.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = external_qs_default.a.stringify(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';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.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;
       }
-      config.data = params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }
@@ -1896,6 +1897,7 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
     } else {
@@ -1908,6 +1910,7 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
+  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/lib/table-column.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = external_qs_default.a.stringify(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';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.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;
       }
-      config.data = params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }
@@ -1896,6 +1897,7 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
     } else {
@@ -1908,6 +1910,7 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
+  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/lib/table.js

@@ -1628,18 +1628,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = external_qs_default.a.stringify(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';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.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;
       }
-      config.data = params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }
@@ -1784,6 +1785,7 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
     } else {
@@ -1796,6 +1798,7 @@ var base = {
 // CONCATENATED MODULE: ./src/utils/http.js
 
 var http_request = function request(options) {
+  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/lib/utils/axios.js

@@ -35,18 +35,19 @@ var ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = _qs2.default.stringify(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';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = _qs2.default.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;
       }
-      config.data = params;
     }
-
     if (_util2.default.getStorage('token')) {
       config.headers.Authorization = _util2.default.getStorage('token');
     }
@@ -191,6 +192,7 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || _util2.default.getStorage('userId');
     } else {

package/lib/utils/http.js

@@ -9,6 +9,7 @@ var _axios2 = _interopRequireDefault(_axios);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var request = function request(options) {
+  console.log(options, 'options');
   var fn = void 0;
   switch (options.type) {
     case 'post':

package/package.json

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

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

@@ -259,7 +259,7 @@
               />
             </div>
             <!-- 主办 -->
-            <div class="item" v-if="isMainSubProcess">
+            <div class="item" v-if="isMainSubProcess && isNodeShowProcess">
               <!-- <van-field
                 value="主办"
                 label="主办"
@@ -485,6 +485,7 @@ export default {
       isOtherUnit: true, //是否是外单位
       isShowNode: false,
       subProcessInfo: '',
+      isNodeShowProcess: false, //是否展示主办
       isHiddenOftenOpinion: undefined, //是否隐藏常用意见
       isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
       form: {
@@ -632,7 +633,7 @@ export default {
   },
   computed: {
     subProcessColumns() {
-      if (!this.isMainSubProcess) return [];
+      if (!this.isMainSubProcess || !this.isNodeShowProcess) return [];
       let data = [];
       let obj = { name: '[部门员工]-' };
       this.nextCurrentOrgObjSelect.map(x => {
@@ -724,7 +725,8 @@ export default {
           Accept: 'application/json,text/plain'
         },
         type: 'post',
-        params: formData
+        params: formData,
+        format:false
       })
         .then(res => {
           const { status, message } = res;
@@ -892,7 +894,9 @@ export default {
           ? taskHandleHtmlImg
           : taskHandleHtml,
         type: 'post',
-        params: formData
+        params: formData,
+        format:false
+
       }).then(res => {
         this.$toast.clear();
         if (res.status == 'success') {
@@ -945,6 +949,7 @@ export default {
       this.isNextUser = false;
       this.isShowNode = false;
       this.isMainSubProcess = false;
+      this.isNodeShowProcess = false;
       this.form.nextNodeId = '';
       this.form.isReturnSubmitter = 0;
       this.form.isUndertakeReply = 0;
@@ -1406,6 +1411,9 @@ export default {
           this.countersignaturetypeText = res.data.countersignaturetypeText;
           //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
           if (this.nodeType === 1 || this.nodeType === 2) {
+            this.isMainSubProcess === true
+                  ? (this.isNodeShowProcess = true)
+                  : (this.isNodeShowProcess = false);
             this.isMainSubProcess === true
               ? (this.isMainSubProcess = true)
               : (this.isMainSubProcess = false);
@@ -1418,6 +1426,7 @@ export default {
             this.isHideCurrentOrg = false;
             this.isHideOtherOrg = false;
             this.isMainSubProcess = false;
+            this.isNodeShowProcess = false
             this.isNextUser = true;
             // this.isMainSubProcess === true
             //   ? (this.isMainSubProcess = true)

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

@@ -53,13 +53,13 @@ export default {
     pendingId: String,
     beforeSubmit: Function,
     baseUrl: String,
-     esign: {
+    esign: {
       type: Boolean,
       default: false
     },
-    userId:{
-      type:String,
-      default:''
+    userId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -71,9 +71,9 @@ export default {
         notificationMsg: undefined, //系统消息
         nextNodeId: undefined,
         loginType: 2, //登录方式
-        isImageOpinion:0,
+        isImageOpinion: 0
       },
-      file:'',
+      file: '',
       processObj: {
         taskExamine: { nodeName: undefined },
         nodeInfoMap: { nextUserList: [] }
@@ -114,7 +114,14 @@ export default {
     },
     // 提交流程
     onSubmit() {
-      if ((!this.form.opinion && this.isBanInputOpinion == 0 && this.form.isImageOpinion == 0)|| (!this.file && this.isBanInputOpinion == 0 && this.form.isImageOpinion == 1)) {
+      if (
+        (!this.form.opinion &&
+          this.isBanInputOpinion == 0 &&
+          this.form.isImageOpinion == 0) ||
+        (!this.file &&
+          this.isBanInputOpinion == 0 &&
+          this.form.isImageOpinion == 1)
+      ) {
         this.$toast('请输入审批意见');
         return;
       }
@@ -134,7 +141,7 @@ export default {
         formData.append('file', this.file);
       }
       formData.append('pendingId', this.pendingId);
-      this.form.userId = this.userId
+      this.form.userId = this.userId;
       for (let key in this.form) {
         if (this.form[key] !== '' && this.form[key] !== undefined) {
           formData.append(key, this.form[key]);
@@ -151,7 +158,8 @@ export default {
       request({
         url: _that.baseUrl ? _that.baseUrl + taskRejectHtml : taskRejectHtml,
         type: 'post',
-        params: formData
+        params: formData,
+        format:false
       }).then(res => {
         if (res.status == 'success') {
           this.$toast('操作成功');

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

@@ -309,7 +309,8 @@ export default {
       request({
         url: _that.apiBaseUrl ? _that.apiBaseUrl + registerNew : registerNew,
         type: 'post',
-        params: formData
+        params: formData,
+        format:false
       }).then(res => {
         this.$toast.clear();
         if (res.rCode == 0) {

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

@@ -484,7 +484,9 @@ export default {
             : taskUnionExamine,
         params: formData,
         headers: { Accept: 'application/json,text/plain' },
-        type: 'post'
+        type: 'post',
+        format:false
+
       };
       this.$toast.loading({
         message: '加载中...',

package/src/index.js

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

package/src/utils/axios.js

@@ -15,19 +15,20 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
   });
   http.interceptors.request.use(
     config => {
-      if (type === 'post' && format) {
-        config.data = qs.stringify(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';
+      if ((params.params || params) instanceof FormData === false) {
+        if (type === 'post' && !format) {
+          config.params = 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;
         }
-        config.data = params;
       }
-
       if ($.getStorage('token')) {
         config.headers.Authorization = $.getStorage('token');
       }
@@ -188,6 +189,7 @@ const base = {
     );
   },
   post: (url, params, headers, format) => {
+    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || $.getStorage('userId');
     } else {

package/src/utils/http.js

@@ -1,5 +1,6 @@
 import base from './axios';
 const request = options => {
+  console.log(options, 'options');
   let fn;
   switch (options.type) {
     case 'post':
@@ -19,13 +20,13 @@ const request = options => {
       );
       break;
     case 'get':
-      fn = base.get(options.url, options.params, options.headers = {});
+      fn = base.get(options.url, options.params, (options.headers = {}));
       break;
     case 'GET':
-      fn = base.get(options.url, options.params, options.headers = {});
+      fn = base.get(options.url, options.params, (options.headers = {}));
       break;
     default:
-      fn = base.get(options.url, options.params, options.headers = {});
+      fn = base.get(options.url, options.params, (options.headers = {}));
   }
   return fn;
 };