fmui-base 2.2.35 → 2.2.37

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.
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.2.37: 北京ca加签验签修改
7
+ - 2.2.36: 流程增加ca开关
6
8
  - 2.2.35: 流程选人去重问题,时分字段丢失修复
7
9
  - 2.2.34: 北京CA授权后刷新表单页
8
10
  - 2.2.33: 下移动端结束流程,结束原因提示
@@ -97,12 +97,15 @@ var PageHome = function (_React$Component) {
97
97
  key: 'casigin',
98
98
  value: function casigin() {
99
99
  var commentList = this.props.list;
100
- if (commentList) {
100
+ var isCaUser = this.props.isCaUser; //是否是CA加签用户
101
+ var caFirm = this.props.caFirm; //是否是开启CA加签
102
+ if (commentList && caFirm && caFirm != '') {
101
103
  commentList.map(function (item) {
102
104
  var param = {};
103
105
  param.bizSn = item.id;
104
106
  param.relationId = getLoginUserInfo().mobile;
105
107
  param.msg = item.fullMessage;
108
+ param.commentId = item.id;
106
109
  // setTimeout(function(){
107
110
  // $("#"+item.id+"_sucess").show();
108
111
  // },1000)
package/lib/form/form.js CHANGED
@@ -142,6 +142,8 @@ var PageHome = function (_React$Component) {
142
142
  var data = props.data;
143
143
  var status = props.status;
144
144
  var dataType = props.dataType; //数据类型,main:主表,sub:子表,
145
+ var isCaUser = props.isCaUser; //是否是CA加签用户
146
+ var caFirm = props.caFirm; //是否开启CA加签
145
147
  if (!dataType) {
146
148
  dataType = "main";
147
149
  }
@@ -194,7 +196,9 @@ var PageHome = function (_React$Component) {
194
196
  phraseList: [], //常用语列表
195
197
  spyj: props.defaultValue,
196
198
  isRemoveCommentFormHtml: isRemoveCommentFormHtml,
197
- commentInitList: []
199
+ commentInitList: [],
200
+ isCaUser: isCaUser,
201
+ caFirm: caFirm
198
202
  };
199
203
 
200
204
  return _this;
@@ -1551,7 +1555,9 @@ var PageHome = function (_React$Component) {
1551
1555
  }, {
1552
1556
  key: 'casigin',
1553
1557
  value: function casigin(itemParam, data, uniqueName, value) {
1554
- if (value && value != null && value != "" && typeof value != "undefined") {
1558
+ var isCaUser = this.state.isCaUser;
1559
+ var caFirm = this.state.caFirm;
1560
+ if (value && value != null && value != "" && typeof value != "undefined" && caFirm && caFirm != "") {
1555
1561
  var t = this;
1556
1562
  var dataId = data.dataId;
1557
1563
  var param = {};
@@ -3678,7 +3684,7 @@ var PageHome = function (_React$Component) {
3678
3684
  _react2.default.createElement(
3679
3685
  'div',
3680
3686
  { className: 't-PT10 t-FB1' },
3681
- _react2.default.createElement(_List2.default, { list: t.state.itemParam.value }),
3687
+ _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm }),
3682
3688
  _react2.default.createElement(
3683
3689
  'div',
3684
3690
  { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },
package/lib/form/table.js CHANGED
@@ -1850,16 +1850,16 @@ var PageHome = function (_React$Component) {
1850
1850
  return _react2.default.createElement(
1851
1851
  'div',
1852
1852
  { className: "form_" + item2.uniqueName },
1853
- _react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1853
+ _react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1854
1854
  );
1855
1855
  }.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
1856
1856
  'div',
1857
1857
  { className: "subform_" + item.itemCode },
1858
- _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
1858
+ _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
1859
1859
  ) : _react2.default.createElement(
1860
1860
  'div',
1861
1861
  { className: "form_" + item.uniqueName },
1862
- _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1862
+ _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1863
1863
  );
1864
1864
  }.bind(this)) : "" : _react2.default.createElement(
1865
1865
  'div',
@@ -1886,16 +1886,16 @@ var PageHome = function (_React$Component) {
1886
1886
  return _react2.default.createElement(
1887
1887
  'div',
1888
1888
  { className: t.state.active == item.tabCode ? "" : "t-DN" },
1889
- _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1889
+ _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1890
1890
  );
1891
1891
  }.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
1892
1892
  'div',
1893
1893
  { className: t.state.active == item.tabCode ? "" : "t-DN" },
1894
- _react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
1894
+ _react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
1895
1895
  ) : _react2.default.createElement(
1896
1896
  'div',
1897
1897
  { className: t.state.active == item.tabCode ? "" : "t-DN" },
1898
- _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1898
+ _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1899
1899
  );
1900
1900
  }.bind(this))
1901
1901
  )
@@ -1916,7 +1916,7 @@ var PageHome = function (_React$Component) {
1916
1916
  _react2.default.createElement(
1917
1917
  'div',
1918
1918
  { className: 't-PT10 t-FB1' },
1919
- _react2.default.createElement(_List2.default, { list: t.props.commentBackList })
1919
+ _react2.default.createElement(_List2.default, { list: t.props.commentBackList, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm })
1920
1920
  )
1921
1921
  )
1922
1922
  ),
@@ -1939,7 +1939,7 @@ var PageHome = function (_React$Component) {
1939
1939
  _react2.default.createElement(
1940
1940
  'div',
1941
1941
  { className: 't-PT10 t-FB1' },
1942
- t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? _react2.default.createElement(_List2.default, { list: t.props.commentDefaultList }) : "",
1942
+ t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? _react2.default.createElement(_List2.default, { list: t.props.commentDefaultList, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm }) : "",
1943
1943
  _react2.default.createElement(
1944
1944
  'div',
1945
1945
  { className: t.props.commentField == "default" ? 't-PL10 t-PR10' : 't-DN' },
@@ -475,7 +475,7 @@ var PageHome = function (_React$Component) {
475
475
  selectProcessCode: '', //选中的子流程
476
476
  subProcessType: '', //子流程类型 0串行 1并行
477
477
  urgencyList: [], //紧急程度列表
478
- urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'addlotsReturn', ''), _param);
478
+ urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'addlotsReturn', ''), _param);
479
479
  FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
480
480
 
481
481
  //处理特有参数
@@ -1225,6 +1225,10 @@ var PageHome = function (_React$Component) {
1225
1225
  if (content.isCaUser && content.isCaUser != null && content.isCaUser != 'null' && typeof content.isCaUser != 'undefined' && content.isCaUser != '') {
1226
1226
  isCaUser = content.isCaUser;
1227
1227
  }
1228
+ var caFirm = "";
1229
+ if (content.caFirm && content.caFirm != null && content.caFirm != 'null' && typeof content.caFirm != 'undefined' && content.caFirm != '') {
1230
+ caFirm = content.caFirm;
1231
+ }
1228
1232
  var commentBackAlert = [];
1229
1233
  var titleCommentBackAlert = '退回原因';
1230
1234
  if (content.commentCasign == '1') {
@@ -1473,6 +1477,7 @@ var PageHome = function (_React$Component) {
1473
1477
  backInitiatorEndFlow: backInitiatorEndFlow,
1474
1478
  oauthWindowURL: oauthWindowURL,
1475
1479
  isCaUser: isCaUser,
1480
+ caFirm: caFirm,
1476
1481
  addlotsReturn: addlotsReturn
1477
1482
  }, function () {
1478
1483
  t.refs["selectMember_circulate"].initSelectData();
@@ -7640,7 +7645,7 @@ var PageHome = function (_React$Component) {
7640
7645
  _react2.default.createElement(
7641
7646
  _Group2.default.List,
7642
7647
  null,
7643
- this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, onChange: this.change.bind(this) })
7648
+ this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, onChange: this.change.bind(this) })
7644
7649
  )
7645
7650
  )
7646
7651
  )
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.2.35",
3
+ "version": "2.2.37",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",