fmui-base 2.2.82 → 2.2.84

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.84: 选人组件baseCorpId取值问题修复
+- 2.2.83: 批示意见增加签名印章功能
 - 2.2.82: 流程提交推送到统一待办我的文件
 - 2.2.81: 流程办理下一环节是指定办理人未未匹配到人员时，提交后，提醒：“未找到办理人员，不允许提交”
 - 2.2.80: 流程扫码发起后关闭表单

package/lib/form/form.js

@@ -65,6 +65,10 @@ var _CalendarField = require('saltui/lib/CalendarField');
 
 var _CalendarField2 = _interopRequireDefault(_CalendarField);
 
+var _Slot = require('saltui/lib/Slot');
+
+var _Slot2 = _interopRequireDefault(_Slot);
+
 var _AngleRight = require('salt-icon/lib/AngleRight');
 
 var _AngleRight2 = _interopRequireDefault(_AngleRight);
@@ -118,8 +122,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-// import Slot from 'saltui/lib/Slot';
-
 // import SelectFileNo from '../select-fileno/pageHome';
 // import SelectSerialNumber from '../select-serialnumber/pageHome';
 //import 'babel-polyfill';
@@ -205,6 +207,8 @@ var PageHome = function (_React$Component) {
       spyj: props.defaultValue,
       isRemoveCommentFormHtml: isRemoveCommentFormHtml,
       commentInitList: [],
+      signatureList: [],
+      chooseSignature: [],
       isCaUser: isCaUser,
       caFirm: caFirm
     };
@@ -1110,6 +1114,9 @@ var PageHome = function (_React$Component) {
           var dateStr = this.dateFormat(value, dateFormat, dateFormatShow);
           value = dateStr;
         }
+        if (fuzhiFields && fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1 && form.defaultValue && form.defaultValue != null) {
+          value = form.defaultValue;
+        }
       } else if (itemType == 'datetimeStep') {
         //时间
         var dateFormat = form.dateFormat;
@@ -1488,7 +1495,7 @@ var PageHome = function (_React$Component) {
           itemParam = FlowCommon.dealwithCommonFormParam(itemParam, this);
           itemType = itemParam.itemType;
         }
-        if (itemType == 'text' || itemType == 'textarea') {
+        if (itemType == 'text' || itemType == 'textarea' || itemType == 'datetime') {
           for (var i = 0; i < data.mainTblData.length; i++) {
             if (itemParam.key == data.mainTblData[i].key) {
               data.mainTblData[i].value = value;
@@ -3429,6 +3436,45 @@ var PageHome = function (_React$Component) {
       // }
 
     }
+  }, {
+    key: 'selectCommentSeal',
+    value: function selectCommentSeal() {
+      var t = this;
+      _db2.default.FlowModuleAPI.getSignature({}).then(function (content) {
+        if (content.length > 0) {
+          var sealColumn = [];
+          content.map(function (item) {
+            sealColumn.push({ text: item.markName, value: item.id });
+          });
+          t.setState({
+            signatureList: [sealColumn]
+          }, function () {
+            t.refs.slotCommentSeal.show();
+          });
+        } else {
+          _Toast2.default.show({
+            content: '暂无签章'
+          });
+        }
+      }).catch(function (error) {
+        _Toast2.default.show({
+          type: 'error',
+          content: error.errorMsg
+        });
+      });
+    }
+  }, {
+    key: 'handleChangeCommentSeal',
+    value: function handleChangeCommentSeal(value) {
+      this.setState({
+        chooseSignature: value
+      });
+    }
+  }, {
+    key: 'handleConfirmCommentSeal',
+    value: function handleConfirmCommentSeal(commentSeal) {
+      this.props.newspyj.sealId = commentSeal[0].value;
+    }
 
     //常用语设置跳转
 
@@ -4100,13 +4146,16 @@ var PageHome = function (_React$Component) {
                       { onClick: this.selectCommonwords.bind(this) },
                       '\u5E38\u7528\u8BED'
                     ),
-                    ' ',
+                    _react2.default.createElement(
+                      'div',
+                      { className: t.props.inscriptionShow && typeof t.props.inscriptionShow != 'undefined' && t.props.inscriptionShow.indexOf('seal') !== -1 ? "" : "t-DN", onClick: this.selectCommentSeal.bind(this) },
+                      '\u7B7E\u540D\u5370\u7AE0'
+                    ),
                     _react2.default.createElement(
                       'div',
                       { className: t.props.commentAttitude == '1' || t.props.commentAttitude == '2' ? "" : "t-DN", onClick: this.selectAttitude.bind(this) },
                       '\u6001\u5EA6'
                     ),
-                    ' ',
                     _react2.default.createElement(
                       'div',
                       { onClick: this.skipToCommonwordsSet.bind(this) },
@@ -4172,7 +4221,15 @@ var PageHome = function (_React$Component) {
                       );
                     }.bind(this)) : ''
                   )
-                )
+                ),
+                _react2.default.createElement(_Slot2.default, {
+                  ref: 'slotCommentSeal',
+                  data: this.state.signatureList,
+                  value: this.state.chooseSignature,
+                  title: '\u9009\u62E9\u7B7E\u540D\u5370\u7AE0',
+                  onConfirm: this.handleConfirmCommentSeal.bind(this),
+                  onChange: this.handleChangeCommentSeal.bind(this)
+                })
               )
             )
           )

package/lib/form/table.js

@@ -49,6 +49,10 @@ var _Boxs = require('saltui/lib/Boxs');
 
 var _Boxs2 = _interopRequireDefault(_Boxs);
 
+var _Slot = require('saltui/lib/Slot');
+
+var _Slot2 = _interopRequireDefault(_Slot);
+
 var _upload = require('../upload/upload');
 
 var _upload2 = _interopRequireDefault(_upload);
@@ -238,7 +242,9 @@ var PageHome = function (_React$Component) {
 			spyj: defaultValue,
 			formRelaFieldMaps: formRelaFieldMapsNew,
 			linkFields: linkFieldsNew,
-			commentInitList: []
+			commentInitList: [],
+			signatureList: [],
+			chooseSignature: []
 		};
 
 		var module = props.module && props.module != "undefined" ? props.module : "approve";
@@ -1819,6 +1825,35 @@ var PageHome = function (_React$Component) {
 			// }
 
 		}
+	}, {
+		key: 'selectCommentSeal',
+		value: function selectCommentSeal() {
+			var t = this;
+			//获取签章
+			_db2.default.FlowModuleAPI.getSignature({}).then(function (content) {
+				if (content.length > 0) {
+					// SaltUI Slot 要求 data 为「多列」结构：每列一项为数组；单列须包一层，否则 Pane 内 item.find 会报错
+					var sealColumn = [];
+					content.map(function (item) {
+						sealColumn.push({ text: item.markName, value: item.id });
+					});
+					t.setState({
+						signatureList: [sealColumn]
+					}, function () {
+						t.refs.slotCommentSeal.show();
+					});
+				} else {
+					_Toast2.default.show({
+						content: '暂无签章'
+					});
+				}
+			}).catch(function (error) {
+				_Toast2.default.show({
+					type: 'error',
+					content: error.errorMsg
+				});
+			});
+		}
 
 		//选择态度
 
@@ -1896,6 +1931,20 @@ var PageHome = function (_React$Component) {
 			});
 			this.props.newspyj.content = spyj + commonwords[0].text;
 		}
+	}, {
+		key: 'handleChangeCommentSeal',
+		value: function handleChangeCommentSeal(value) {
+			// 改变了选中项
+			this.setState({
+				chooseSignature: value
+			});
+		}
+	}, {
+		key: 'handleConfirmCommentSeal',
+		value: function handleConfirmCommentSeal(commentSeal) {
+			var spyj = this.state.spyj;
+			this.props.newspyj.sealId = commentSeal[0].value;
+		}
 
 		//处理关联字段
 		// dealwithFormRelaFieldMaps(formRelaFieldMaps){
@@ -1928,16 +1977,16 @@ var PageHome = function (_React$Component) {
 							return _react2.default.createElement(
 								'div',
 								{ className: "form_" + item2.uniqueName },
-								_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) })
+								_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, inscriptionShow: t.props.inscriptionShow, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 							);
 						}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 							'div',
 							{ className: "subform_" + item.itemCode },
-							_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) })
+							_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, inscriptionShow: t.props.inscriptionShow, onChange: this.change.bind(this) })
 						) : _react2.default.createElement(
 							'div',
 							{ className: "form_" + item.uniqueName },
-							_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) })
+							_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, inscriptionShow: t.props.inscriptionShow, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 						);
 					}.bind(this)) : "" : _react2.default.createElement(
 						'div',
@@ -1964,16 +2013,16 @@ var PageHome = function (_React$Component) {
 									return _react2.default.createElement(
 										'div',
 										{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-										_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) })
+										_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, inscriptionShow: t.props.inscriptionShow, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 									);
 								}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_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) })
+									_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, inscriptionShow: t.props.inscriptionShow, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								) : _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_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) })
+									_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, inscriptionShow: t.props.inscriptionShow, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 								);
 							}.bind(this))
 						)
@@ -2029,13 +2078,16 @@ var PageHome = function (_React$Component) {
 										{ onClick: this.selectCommonwords.bind(this) },
 										'\u5E38\u7528\u8BED'
 									),
-									' ',
+									_react2.default.createElement(
+										'div',
+										{ className: t.props.inscriptionShow && typeof t.props.inscriptionShow != 'undefined' && t.props.inscriptionShow.indexOf('seal') !== -1 ? "" : "t-DN", onClick: this.selectCommentSeal.bind(this) },
+										'\u7B7E\u540D\u5370\u7AE0'
+									),
 									_react2.default.createElement(
 										'div',
 										{ className: t.props.commentAttitude == '1' || t.props.commentAttitude == '2' ? "" : "t-DN", onClick: this.selectAttitude.bind(this) },
 										'\u6001\u5EA6'
 									),
-									' ',
 									_react2.default.createElement(
 										'div',
 										{ onClick: this.skipToCommonwordsSet.bind(this) },
@@ -2103,7 +2155,15 @@ var PageHome = function (_React$Component) {
 											);
 										}.bind(this)) : ''
 									)
-								)
+								),
+								_react2.default.createElement(_Slot2.default, {
+									ref: 'slotCommentSeal',
+									data: this.state.signatureList,
+									value: this.state.chooseSignature,
+									title: '\u9009\u62E9\u7B7E\u540D\u5370\u7AE0',
+									onConfirm: this.handleConfirmCommentSeal.bind(this),
+									onChange: this.handleChangeCommentSeal.bind(this)
+								})
 							)
 						)
 					)

package/lib/process_info/processInfo.js

@@ -150,6 +150,7 @@ var shortMessageList = [];
 var readShortMessageList = [];
 var newComment = '';
 var commentAttachId = '';
+var commentSealId = '';
 var remindStyle = '';
 var FlowCommon = void 0;
 var _thirdMenuType = void 0;
@@ -475,7 +476,7 @@ var PageHome = function (_React$Component) {
             selectProcessCode: '', //选中的子流程
             subProcessType: '', //子流程类型 0串行  1并行
             urgencyList: [], //紧急程度列表
-            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'addlotsReturn', ''), _param);
+            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'addlotsReturn', ''), _defineProperty(_param, 'inscriptionShow', ''), _param);
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -495,6 +496,7 @@ var PageHome = function (_React$Component) {
         param.processData = '1';
         param.processDataList = [];
         param.commentAttachId = ''; //批示意见附件 
+        param.sealId = ''; //签章id
         _this.state = param;
         var t = _this;
         var key = "";
@@ -826,6 +828,7 @@ var PageHome = function (_React$Component) {
                     var urgency = '50';
                     var urgentSelectList = {};
                     var backInitiatorEndFlow = '0';
+                    var inscriptionShow = ''; //批示意见落款设置
                     var addlotsReturn = ''; //加签自动返回 串签时生效，0否，1是
                     if (content.readScopeId && typeof content.readScopeId != "undefined") {
                         readScopeId = content.readScopeId;
@@ -864,6 +867,9 @@ var PageHome = function (_React$Component) {
                     if (content.backInitiatorEndFlow && typeof content.backInitiatorEndFlow != "undefined") {
                         backInitiatorEndFlow = content.backInitiatorEndFlow;
                     }
+                    if (content.inscriptionShow && typeof content.inscriptionShow != "undefined") {
+                        inscriptionShow = content.inscriptionShow;
+                    }
                     if (content.urgencyList && typeof content.urgencyList != "undefined") {
                         urgencyList = content.urgencyList;
                         if (urgencyList.length > 0) {
@@ -1489,7 +1495,8 @@ var PageHome = function (_React$Component) {
                         signDataId: signDataId,
                         isCaUser: isCaUser,
                         caFirm: caFirm,
-                        addlotsReturn: addlotsReturn
+                        addlotsReturn: addlotsReturn,
+                        inscriptionShow: inscriptionShow
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -2122,6 +2129,9 @@ var PageHome = function (_React$Component) {
             if (t.state.newspyj.attachId && t.state.newspyj.attachId != '') {
                 commentAttachId = t.state.newspyj.attachId;
             }
+            if (t.state.newspyj.sealId && t.state.newspyj.sealId != '') {
+                commentSealId = t.state.newspyj.sealId;
+            }
             if (typeof newComment == "undefined" || newComment == '') {
                 newComment = t.state.defaultValue;
             }
@@ -2136,6 +2146,11 @@ var PageHome = function (_React$Component) {
                     commentAttachId: commentAttachId
                 });
             }
+            if (commentSealId && commentSealId != '') {
+                t.setState({
+                    commentSealId: commentSealId
+                });
+            }
             if (operate == 1 || operate == 10 || operate == 3) {
                 if (newComment && newComment != '') {
                     if (newComment.length > 2000) {
@@ -2515,6 +2530,7 @@ var PageHome = function (_React$Component) {
                                     param.comment = newComment;
                                     param.hasCommentField = t.state.hasCommentField;
                                     param.attachId = t.state.commentAttachId;
+                                    param.sealId = t.state.sealId;
                                     param.commentId = t.state.commentId;
                                     t.sendFlow(param);
                                 });
@@ -3995,6 +4011,7 @@ var PageHome = function (_React$Component) {
                     module: t.state.module,
                     comment: newComment,
                     attachId: this.state.commentAttachId,
+                    sealId: this.state.commentSealId,
                     commentId: t.state.commentId,
                     hasCommentField: t.state.hasCommentField,
                     dataId: dataId,
@@ -4096,6 +4113,7 @@ var PageHome = function (_React$Component) {
                     commentId: this.state.commentId,
                     hasCommentField: t.state.hasCommentField,
                     attachId: this.state.commentAttachId,
+                    sealId: this.state.commentSealId,
                     dataId: this.state.dataId,
                     lock: this.state.lock,
                     sendShortMessage: sendShortMessage,
@@ -4595,7 +4613,7 @@ var PageHome = function (_React$Component) {
                 formData: JSON.stringify(editFormData),
                 formType: "4",
                 editType: editType
-            }, _defineProperty(_param2, 'module', t.state.module), _defineProperty(_param2, 'comment', newComment), _defineProperty(_param2, 'commentType', 'text'), _defineProperty(_param2, 'commentId', t.state.commentId), _defineProperty(_param2, 'attachId', t.state.commentAttachId), _defineProperty(_param2, 'permissionCode', t.state.permissionCode), _defineProperty(_param2, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param2, 'dataId', dataId), _param2);
+            }, _defineProperty(_param2, 'module', t.state.module), _defineProperty(_param2, 'comment', newComment), _defineProperty(_param2, 'commentType', 'text'), _defineProperty(_param2, 'commentId', t.state.commentId), _defineProperty(_param2, 'attachId', t.state.commentAttachId), _defineProperty(_param2, 'sealId', t.state.commentSealId), _defineProperty(_param2, 'permissionCode', t.state.permissionCode), _defineProperty(_param2, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param2, 'dataId', dataId), _param2);
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -5599,6 +5617,7 @@ var PageHome = function (_React$Component) {
                 comment: newComment,
                 commentId: t.state.commentId,
                 attachId: t.state.commentAttachId,
+                sealId: t.state.commentSealId,
                 module: t.state.module,
                 permissionCode: t.state.permissionCode,
                 participantMode: t.state.participantMode,
@@ -6231,7 +6250,8 @@ var PageHome = function (_React$Component) {
                 shortMessage: shortMessage,
                 comment: t.state.spyj,
                 commentId: t.state.commentId,
-                attachId: t.state.commentAttachId
+                attachId: t.state.commentAttachId,
+                sealId: t.state.commentSealId
             };
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
@@ -7752,7 +7772,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            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) })
+                                            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, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )

package/lib/selectMember/select.js

@@ -115,7 +115,7 @@ var Page = function (_React$Component) {
     var context = getLoginUserInfo().context;
     var orgHiddenId = getLoginUserInfo().orgId;
     // var orgHiddenId = document.getElementById('orgHiddenId').value;
-    var baseCorpId = getLoginUserInfo().baseCorpId == null ? "0" : getLoginUserInfo().baseCorpId;
+    var baseCorpId = getLoginUserInfo().baseCorpId == null ? getLoginUserInfo().baseCorpIdNew == null ? "0" : getLoginUserInfo().baseCorpIdNew : getLoginUserInfo().baseCorpId;
     var chooseCode = "";
 
     var popCode = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.2.82",
+  "version": "2.2.84",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",