eoss-mobiles 0.2.19 → 0.2.21

package/lib/table.js

@@ -1628,8 +1628,8 @@ 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 (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';
       }
@@ -1637,7 +1637,7 @@ var axios_ajax = function ajax(url) {
       if (!config.headers['content-type'] && !headers['Content-Type']) {
         config.headers['content-type'] = 'application/json;charset=UTF-8';
       }
-      config.data = params;
+      config.params = params.params || params;
     }
 
     if (util["a" /* default */].getStorage('token')) {
@@ -1784,6 +1784,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 +1797,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,8 +35,8 @@ var ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && format) {
-      config.data = _qs2.default.stringify(params);
+    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';
       }
@@ -44,7 +44,7 @@ var ajax = function ajax(url) {
       if (!config.headers['content-type'] && !headers['Content-Type']) {
         config.headers['content-type'] = 'application/json;charset=UTF-8';
       }
-      config.data = params;
+      config.params = params.params || params;
     }
 
     if (_util2.default.getStorage('token')) {
@@ -191,6 +191,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.19",
+  "version": "0.2.21",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/checkbox/src/main.vue

@@ -16,7 +16,8 @@
         v-on="$listeners"
         :disabled="item.disabled"
         :name="item[valueKey]"
-        >{{ item[labelKey] }}
+        >
+        <span v-html="item[labelKey]"></span> 
         <slot
           slot="icon"
           :checked="newValue.indexOf(item[valueKey]) != -1"
@@ -91,7 +92,12 @@ export default {
       type: Boolean,
       default: false
     },
-    baseUrl: String
+    baseUrl: String,
+    allowHtml: {
+      type: Boolean,
+      default: false
+    },
+    
   },
   computed: {
     newValue: {
@@ -107,6 +113,11 @@ export default {
   watch: {
     data: {
       handler(val) {
+        val.map(item => {
+          item[this.labelKey] = this.allowHtml
+            ? item[this.labelKey]
+            : item[this.labelKey].replace(/<[^>]+>/g, '');
+        });
         this.newData = val;
       },
       deep: true,
@@ -128,7 +139,9 @@ export default {
     getSysCode() {
       const { url, method, sysAppCode, param } = this;
       let params = {
-        url: this.baseUrl ? this.baseUrl + (url || findSysCode) : url || findSysCode,
+        url: this.baseUrl
+          ? this.baseUrl + (url || findSysCode)
+          : url || findSysCode,
         type: method,
         params: {
           ccCode: sysAppCode,
@@ -137,15 +150,18 @@ export default {
       };
       request(params)
         .then(res => {
-          const { status, data, message } = res;
-          if (status == 'success') {
-            data.map(item => {
-              item.name = item.shortName;
-              item.value = item.cciValue;
+          const { status, data, message, rCode, results } = res;
+          if (status == 'success' || rCode === 0 || status === true) {
+            [...(data || results)].map(item => {
+              item.name = this.allowHtml
+                ? item[sysAppCode ? 'shortName' : this.labelKey]
+                : item[sysAppCode ? 'shortName' : this.labelKey].replace(
+                    /<[^>]+>/g,
+                    ''
+                  );
+              item.value = item[sysAppCode ? 'cciValue' : this.value];
             });
-            this.newData = data;
-            console.log(this.newData, 'this.newData');
-            if (this.isTable) this.$emit('tableColumns', this.newData);
+            this.newData = data || results;
           } else {
             this.$toast(message);
           }

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/packages/picker/src/main.vue

@@ -10,13 +10,15 @@
       :required="required"
       :label-width="labelWidth"
       :hideLabel="hideLabel"
-      :placeholder="pickerValue
-            ? pickerValue
-            : disabled || readonly
-            ? '暂无数据'
-            : placeholder
-            ? placeholder
-            : `请选择${label}`"
+      :placeholder="
+        pickerValue
+          ? pickerValue
+          : disabled || readonly
+          ? '暂无数据'
+          : placeholder
+          ? placeholder
+          : `请选择${label}`
+      "
       @click="handlePicker"
     />
     <em-input
@@ -308,9 +310,9 @@ export default {
   },
   methods: {
     handleClick(val) {
-      if(this.linkTag){
+      if (this.linkTag) {
         this.$emit('tagClick', val);
-      }else{
+      } else {
         this.showPicker = true;
       }
     },
@@ -455,27 +457,30 @@ export default {
       this.newLoading = true;
       request(params)
         .then(res => {
-          const { status, data, message } = res;
+          const { status, data, message, rCode, results } = res;
           this.listLoading = false;
-          if (status == 'success') {
-            let info = this.resultsName ? data[this.resultsName] : data;
+          if (status == 'success' || rCode === 0|| status === true) {
+            let info = this.resultsName
+              ? data
+                ? data[this.resultsName]
+                : results[this.resultsName]
+              : data
+              ? data
+              : results;
             info.map(x => {
               if (this.isCheck) {
                 x.name =
-                  x[
-                    (this.labelKey != 'name' && this.labelKey) || 'shortName'
-                  ] &&
-                  x[
-                    (this.labelKey != 'name' && this.labelKey) || 'shortName'
-                  ].replace(/<[^>]+>/g, '');
+                  x[sysAppCode ? 'shortName' : this.labelKey] &&
+                  x[sysAppCode ? 'shortName' : this.labelKey].replace(
+                    /<[^>]+>/g,
+                    ''
+                  );
               } else {
-                x.name =
-                  x[(this.labelKey != 'name' && this.labelKey) || 'shortName'];
+                x.name = x[sysAppCode ? 'shortName' : this.labelKey];
               }
-              x.value =
-                x[(this.valueKey != 'value' && this.valueKey) || 'cciValue'];
+              x.value = x[sysAppCode ? 'cciValue' : this.valueKey];
             });
-            if (data.totalCount) {
+            if (data && data.totalCount) {
               this.total = data.totalCount;
               if (data.totalCount === this.newColumns.length) {
                 this.listFinished = true;
@@ -491,7 +496,6 @@ export default {
               this.listFinished = true;
               this.newColumns = info;
             }
-            if (this.isTable) this.$emit('tableColumns', this.newColumns);
             if (this.beforResponse) {
               this.newColumns = this.beforResponse(this.newColumns);
               this.getValue();

package/packages/radio/src/main.vue

@@ -13,7 +13,7 @@
         :disabled="item.disabled"
         :name="item[valueKey]"
       >
-        {{ item[labelKey] }}
+       <span v-html="item[labelKey]"></span> 
         <slot slot="icon" :checked="item[valueKey] == newRadio"></slot>
       </van-radio>
     </van-radio-group>
@@ -88,7 +88,11 @@ export default {
       type: Boolean,
       default: false
     },
-    baseUrl: String
+    baseUrl: String,
+    allowHtml: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     newRadio: {
@@ -104,6 +108,11 @@ export default {
   watch: {
     data: {
       handler(val) {
+        val.map(item => {
+          item[this.labelKey] = this.allowHtml
+            ? item[this.labelKey]
+            : item[this.labelKey].replace(/<[^>]+>/g, '');
+        });
         this.newData = val;
       },
       deep: true,
@@ -139,14 +148,18 @@ export default {
       };
       request(params)
         .then(res => {
-          const { status, data, message } = res;
-          if (status == 'success') {
-            data.map(item => {
-              item.name = item.shortName;
-              item.value = item.cciValue;
+          const { status, data, message, rCode, results } = res;
+          if (status == 'success' || rCode === 0 || status === true) {
+            [...(data || results)].map(item => {
+              item.name =  this.allowHtml
+                ? item[sysAppCode ? 'shortName' : this.labelKey]
+                : item[sysAppCode ? 'shortName' : this.labelKey].replace(
+                    /<[^>]+>/g,
+                    ''
+                  );
+              item.value = item[sysAppCode ? 'cciValue' : this.value];
             });
-            this.newData = data;
-            if (this.isTable) this.$emit('tableColumns', this.newData);
+            this.newData = data || results;
           } else {
             this.$toast(message);
           }