eoss-mobiles 0.2.85 → 0.2.86

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/lib/checkbox.js +5 -5
  2. package/lib/config/api.js +3 -3
  3. package/lib/eoss-mobile.common.js +36 -29
  4. package/lib/flow-btn.js +5 -5
  5. package/lib/flow-list.js +5 -5
  6. package/lib/flow.js +35 -28
  7. package/lib/index.js +1 -1
  8. package/lib/picker.js +5 -5
  9. package/lib/radio.js +5 -5
  10. package/lib/retrial-auth.js +5 -5
  11. package/lib/selector.js +5 -5
  12. package/lib/table-column.js +5 -5
  13. package/lib/table.js +2 -2
  14. package/lib/utils/axios.js +2 -2
  15. package/package.json +1 -1
  16. package/packages/flow/src/components/Handle.vue +5 -1
  17. package/packages/flow/src/components/StartFlow.vue +10 -6
  18. package/src/config/api.js +3 -3
  19. package/src/index.js +1 -1
  20. package/src/utils/axios.js +4 -3
package/lib/picker.js CHANGED
@@ -1652,11 +1652,11 @@ var registerNew = '/bpm/v1/mecpItask/registerNew.json';
1652
1652
 
1653
1653
  // 获取节点信息(获取节点属性及办理人,发起)
1654
1654
  // export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
1655
- var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfo.json';
1655
+ var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
1656
1656
 
1657
1657
  // 获取发起流程信息
1658
- // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
1659
- var toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1658
+ var toStartFlow = '/bpm/v1/mecpItask/toStartFlowNew.json';
1659
+ // export const toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1660
1660
  // export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlowIndex';
1661
1661
 
1662
1662
  // 驳回(为H5提供接口)
@@ -1926,9 +1926,9 @@ var base = {
1926
1926
  }, headers, format);
1927
1927
  },
1928
1928
  post: function post(url, params, headers, format) {
1929
- if (params.params) {
1929
+ if (params.params && url.search('registerNew') === -1) {
1930
1930
  params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
1931
- } else {
1931
+ } else if (url.search('registerNew') === -1) {
1932
1932
  params.userId = params.userId || util["a" /* default */].getStorage('userId');
1933
1933
  }
1934
1934
  return axios_ajax(url, params, headers, format, 'post');
package/lib/radio.js CHANGED
@@ -1652,11 +1652,11 @@ var registerNew = '/bpm/v1/mecpItask/registerNew.json';
1652
1652
 
1653
1653
  // 获取节点信息(获取节点属性及办理人,发起)
1654
1654
  // export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
1655
- var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfo.json';
1655
+ var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
1656
1656
 
1657
1657
  // 获取发起流程信息
1658
- // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
1659
- var toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1658
+ var toStartFlow = '/bpm/v1/mecpItask/toStartFlowNew.json';
1659
+ // export const toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1660
1660
  // export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlowIndex';
1661
1661
 
1662
1662
  // 驳回(为H5提供接口)
@@ -1926,9 +1926,9 @@ var base = {
1926
1926
  }, headers, format);
1927
1927
  },
1928
1928
  post: function post(url, params, headers, format) {
1929
- if (params.params) {
1929
+ if (params.params && url.search('registerNew') === -1) {
1930
1930
  params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
1931
- } else {
1931
+ } else if (url.search('registerNew') === -1) {
1932
1932
  params.userId = params.userId || util["a" /* default */].getStorage('userId');
1933
1933
  }
1934
1934
  return axios_ajax(url, params, headers, format, 'post');
package/lib/retrial-auth.js CHANGED
@@ -1655,11 +1655,11 @@ var registerNew = '/bpm/v1/mecpItask/registerNew.json';
1655
1655
 
1656
1656
  // 获取节点信息(获取节点属性及办理人,发起)
1657
1657
  // export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
1658
- var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfo.json';
1658
+ var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
1659
1659
 
1660
1660
  // 获取发起流程信息
1661
- // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
1662
- var toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1661
+ var toStartFlow = '/bpm/v1/mecpItask/toStartFlowNew.json';
1662
+ // export const toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1663
1663
  // export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlowIndex';
1664
1664
 
1665
1665
  // 驳回(为H5提供接口)
@@ -1930,9 +1930,9 @@ var base = {
1930
1930
  }, headers, format);
1931
1931
  },
1932
1932
  post: function post(url, params, headers, format) {
1933
- if (params.params) {
1933
+ if (params.params && url.search('registerNew') === -1) {
1934
1934
  params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
1935
- } else {
1935
+ } else if (url.search('registerNew') === -1) {
1936
1936
  params.userId = params.userId || util["a" /* default */].getStorage('userId');
1937
1937
  }
1938
1938
  return axios_ajax(url, params, headers, format, 'post');
package/lib/selector.js CHANGED
@@ -1652,11 +1652,11 @@ var registerNew = '/bpm/v1/mecpItask/registerNew.json';
1652
1652
 
1653
1653
  // 获取节点信息(获取节点属性及办理人,发起)
1654
1654
  // export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
1655
- var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfo.json';
1655
+ var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
1656
1656
 
1657
1657
  // 获取发起流程信息
1658
- // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
1659
- var toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1658
+ var toStartFlow = '/bpm/v1/mecpItask/toStartFlowNew.json';
1659
+ // export const toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1660
1660
  // export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlowIndex';
1661
1661
 
1662
1662
  // 驳回(为H5提供接口)
@@ -1926,9 +1926,9 @@ var base = {
1926
1926
  }, headers, format);
1927
1927
  },
1928
1928
  post: function post(url, params, headers, format) {
1929
- if (params.params) {
1929
+ if (params.params && url.search('registerNew') === -1) {
1930
1930
  params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
1931
- } else {
1931
+ } else if (url.search('registerNew') === -1) {
1932
1932
  params.userId = params.userId || util["a" /* default */].getStorage('userId');
1933
1933
  }
1934
1934
  return axios_ajax(url, params, headers, format, 'post');
package/lib/table-column.js CHANGED
@@ -1652,11 +1652,11 @@ var registerNew = '/bpm/v1/mecpItask/registerNew.json';
1652
1652
 
1653
1653
  // 获取节点信息(获取节点属性及办理人,发起)
1654
1654
  // export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
1655
- var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfo.json';
1655
+ var getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
1656
1656
 
1657
1657
  // 获取发起流程信息
1658
- // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
1659
- var toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1658
+ var toStartFlow = '/bpm/v1/mecpItask/toStartFlowNew.json';
1659
+ // export const toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
1660
1660
  // export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlowIndex';
1661
1661
 
1662
1662
  // 驳回(为H5提供接口)
@@ -1926,9 +1926,9 @@ var base = {
1926
1926
  }, headers, format);
1927
1927
  },
1928
1928
  post: function post(url, params, headers, format) {
1929
- if (params.params) {
1929
+ if (params.params && url.search('registerNew') === -1) {
1930
1930
  params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
1931
- } else {
1931
+ } else if (url.search('registerNew') === -1) {
1932
1932
  params.userId = params.userId || util["a" /* default */].getStorage('userId');
1933
1933
  }
1934
1934
  return axios_ajax(url, params, headers, format, 'post');
package/lib/table.js CHANGED
@@ -1801,9 +1801,9 @@ var base = {
1801
1801
  }, headers, format);
1802
1802
  },
1803
1803
  post: function post(url, params, headers, format) {
1804
- if (params.params) {
1804
+ if (params.params && url.search('registerNew') === -1) {
1805
1805
  params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
1806
- } else {
1806
+ } else if (url.search('registerNew') === -1) {
1807
1807
  params.userId = params.userId || util["a" /* default */].getStorage('userId');
1808
1808
  }
1809
1809
  return axios_ajax(url, params, headers, format, 'post');
package/lib/utils/axios.js CHANGED
@@ -208,9 +208,9 @@ var base = {
208
208
  }, headers, format);
209
209
  },
210
210
  post: function post(url, params, headers, format) {
211
- if (params.params) {
211
+ if (params.params && url.search('registerNew') === -1) {
212
212
  params.params.userId = params.params.userId || _util2.default.getStorage('userId');
213
- } else {
213
+ } else if (url.search('registerNew') === -1) {
214
214
  params.userId = params.userId || _util2.default.getStorage('userId');
215
215
  }
216
216
  return ajax(url, params, headers, format, 'post');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-mobiles",
3
- "version": "0.2.85",
3
+ "version": "0.2.86",
4
4
  "description": "eoss内部移动端业务组件",
5
5
  "main": "lib/eoss-mobile.common.js",
6
6
  "files": [
package/packages/flow/src/components/Handle.vue CHANGED
@@ -529,6 +529,7 @@ export default {
529
529
  isNodeShowProcess: false, //是否展示主办
530
530
  isHiddenOftenOpinion: undefined, //是否隐藏常用意见
531
531
  isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
532
+ taskReadOpinionRequired: undefined,
532
533
  form: {
533
534
  addSignMode: 'postAddSign',
534
535
  opinion: undefined, // 审批意见
@@ -736,6 +737,8 @@ export default {
736
737
  processDefinitionId,
737
738
  pendingId
738
739
  } = this.taskExamineInfo;
740
+ if (this.taskReadOpinionRequired == 'true' && !this.form.opinion)
741
+ return this.$toast('分阅阅结必须输入意见!');
739
742
  let params = {
740
743
  businessId,
741
744
  appId,
@@ -1409,11 +1412,12 @@ export default {
1409
1412
  const {
1410
1413
  status,
1411
1414
  message,
1412
- data: { isCanFenyue, taskExamine }
1415
+ data: { isCanFenyue, taskExamine, taskReadOpinionRequired }
1413
1416
  } = res;
1414
1417
  if (status === 'success') {
1415
1418
  this.taskExamineInfo = taskExamine;
1416
1419
  this.isCanFenyue = isCanFenyue;
1420
+ this.taskReadOpinionRequired = taskReadOpinionRequired;
1417
1421
  // if (this.nodeName) {
1418
1422
  this.processObj.taskExamine.nodeName = '分阅';
1419
1423
  // }
package/packages/flow/src/components/StartFlow.vue CHANGED
@@ -293,7 +293,7 @@ export default {
293
293
  isImageOpinion: this.form.isImageOpinion,
294
294
  userId: this.userId || $.getStorage('userId'),
295
295
  mobileKey:$.getStorage('deviceId') || '123',
296
- };
296
+ }
297
297
  if (this.beforeSubmit) {
298
298
  this.beforeSubmit(info);
299
299
  return;
@@ -317,9 +317,9 @@ export default {
317
317
  const _that = this;
318
318
  request({
319
319
  url: _that.apiBaseUrl ? _that.apiBaseUrl + registerNew : registerNew,
320
- type: 'post',
321
- params: info,
322
- format: false
320
+ type: 'get',
321
+ params: {params:info},
322
+ // format: false
323
323
  }).then(res => {
324
324
  this.$toast.clear();
325
325
  if (res.rCode == 0) {
@@ -419,7 +419,9 @@ export default {
419
419
  return new Promise(function(resolve, reiect) {
420
420
  request({
421
421
  url: that.apiBaseUrl ? that.apiBaseUrl + toStartFlow : toStartFlow,
422
- params: { ...res, userId: that.userId || $.getStorage('userId') }
422
+ params: { params:{
423
+ ...res, userId: that.userId || $.getStorage('userId')
424
+ } }
423
425
  }).then(res => {
424
426
  if (res.rCode == 0) {
425
427
  res.results.nodeExtr.submitTipsMsg &&
@@ -484,10 +486,12 @@ export default {
484
486
  request({
485
487
  url: _that.apiBaseUrl ? _that.apiBaseUrl + getNodeInfo : getNodeInfo,
486
488
  params: {
487
- processDefinitionId: this.flowObj.processDefinitionId,
489
+ params:{
490
+ processDefinitionId: this.flowObj.processDefinitionId,
488
491
  nodeId: res,
489
492
  taskId: this.processObj.taskId,
490
493
  userId: _that.userId
494
+ }
491
495
  }
492
496
  }).then(res => {
493
497
  this.$toast.clear();
package/src/config/api.js CHANGED
@@ -34,11 +34,11 @@ export const registerNew = '/bpm/v1/mecpItask/registerNew.json';
34
34
 
35
35
  // 获取节点信息(获取节点属性及办理人,发起)
36
36
  // export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
37
- export const getNodeInfo = '/bpm/v1/mecpItask/getNodeInfo.json';
37
+ export const getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
38
38
 
39
39
  // 获取发起流程信息
40
- // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
41
- export const toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
40
+ export const toStartFlow = '/bpm/v1/mecpItask/toStartFlowNew.json';
41
+ // export const toStartFlow = '/bpm/v1/mecpItask/toStartFlow.json';
42
42
  // export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlowIndex';
43
43
 
44
44
  // 驳回(为H5提供接口)
package/src/index.js CHANGED
@@ -105,7 +105,7 @@ if (typeof window !== 'undefined' && window.Vue) {
105
105
  }
106
106
 
107
107
  export default {
108
- version: '0.2.85',
108
+ version: '0.2.86',
109
109
  install,
110
110
  Button,
111
111
  ButtonGroup,
package/src/utils/axios.js CHANGED
@@ -79,7 +79,8 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
79
79
  }
80
80
  let accessToken = $.getStorage('accessToken');
81
81
  let tenantId = $.getStorage('tenantId');
82
- let authorization = $.getStorage('authorization') || $.getStorage('token');
82
+ let authorization =
83
+ $.getStorage('authorization') || $.getStorage('token');
83
84
  let deviceId = $.getStorage('deviceId');
84
85
  if (accessToken) {
85
86
  config.headers['X-Coos-Client-Access-Token'] = accessToken;
@@ -205,9 +206,9 @@ const base = {
205
206
  );
206
207
  },
207
208
  post: (url, params, headers, format) => {
208
- if (params.params) {
209
+ if (params.params && url.search('registerNew') === -1) {
209
210
  params.params.userId = params.params.userId || $.getStorage('userId');
210
- } else {
211
+ } else if (url.search('registerNew') === -1) {
211
212
  params.userId = params.userId || $.getStorage('userId');
212
213
  }
213
214
  return ajax(url, params, headers, format, 'post');