fmui-base 2.3.48 → 2.3.50

package/README.md

@@ -3,7 +3,9 @@
 ---npm publish
 
 ## 更新日志 
-- 2.3.48：表单组件爱你增加字段关联参数，流程待办或者推送打开已办理或者作废的流程会弹出相应状态的弹框
+- 2.3.50：移动表单支持数据表字段宏值和关联值支持获取用户的性别、政治面貌和民族
+- 2.3.49：加签意见显示加签标识
+- 2.3.48：表单组件增加字段关联参数，流程待办或者推送打开已办理或者作废的流程会弹出相应状态的弹框
 - 2.3.47：表单子表编辑保存时会丢失第一条数据
 - 2.3.46：表单子表支持默认展开或者收起
 - 2.3.45：数据已被他人修改时，刷新表单内容保留批示意见

package/lib/comment_list/List.js

@@ -244,6 +244,28 @@ var PageHome = function (_React$Component) {
       }
       return String(attachId).replace(/\|/g, ',');
     }
+
+    /** 与 PC FormUtils 一致：按 bpm_process_button 按钮名显示，缺省再回退默认文案 */
+
+  }, {
+    key: 'getAddlotsActionLabel',
+    value: function getAddlotsActionLabel(isAddlots) {
+      var codeMap = { '1': 'HELP_ADDLOTS', '2': 'BACK', '3': 'BASE_TRANSFER' };
+      var defaultMap = { '1': '加签', '2': '退回', '3': '转交' };
+      if (!isAddlots || !codeMap[isAddlots]) {
+        return '';
+      }
+      var actionName = defaultMap[isAddlots];
+      var buttons = this.props.finalButtons;
+      if (buttons) {
+        var fromBtn = typeof buttons.get === 'function' ? buttons.get(codeMap[isAddlots]) : buttons[codeMap[isAddlots]];
+        if (fromBtn) {
+          actionName = fromBtn;
+        }
+      }
+      // 意见上若已带解析好的名称则优先（兼容接口/上层预处理）
+      return '（' + actionName + '）';
+    }
   }, {
     key: 'getCommentSign',
     value: function getCommentSign(item) {
@@ -251,17 +273,26 @@ var PageHome = function (_React$Component) {
       var returnHtml;
       if (item.inscriptionShow) {
         var userName = item.userName;
-        //是否加签
-        if (item.isAddlots && item.isAddlots == '1' && userName) {
-          userName = userName + "（加签）";
-        } else if (item.isAddlots && item.isAddlots == '2' && userName) {
-          userName = userName + "（退回）";
+        var addlotsLabel = '';
+        //是否加签/退回/转交：优先用按钮配置名称（如「加签1」），与 PC 落款一致
+        if (item.addlotsActionName) {
+          addlotsLabel = '（' + item.addlotsActionName + '）';
+        } else if (item.isAddlots) {
+          addlotsLabel = t.getAddlotsActionLabel(item.isAddlots);
+        }
+        if (addlotsLabel && userName) {
+          userName = userName + addlotsLabel;
         }
         var userNameHtml = _react2.default.createElement(
           'span',
           { className: 't-PR5 userName' },
           item.replacename && item.replacename != "" ? item.replacename : userName
         );
+        var addlotsOnlyHtml = addlotsLabel ? _react2.default.createElement(
+          'span',
+          { className: 't-PR5 userName' },
+          addlotsLabel
+        ) : null;
 
         var dateHtml = _react2.default.createElement(
           'span',
@@ -288,9 +319,10 @@ var PageHome = function (_React$Component) {
         );
         var sealHtml = item.sealFileId && item.sealFileId !== "" ? _react2.default.createElement('img', { className: 't-PR5', src: t.state.loadImg + item.sealFileId, style: { 'position': 'absolute', 'top': '-35px', 'right': '10px', 'height': '64px', 'opacity': 0.8 } }) : "";
         var inscriptionShowArray = item.inscriptionShow.split(",");
+        var showUserName = inscriptionShowArray.indexOf("userName") >= 0 && (item.inscriptionShow.indexOf("signImg") < 0 || item.inscriptionShow.indexOf("signImg") >= 0 && !hasSignImg);
         var _returnHtml = inscriptionShowArray.map(function (inscriptionItem) {
           if (inscriptionItem) {
-            if (inscriptionItem == "userName" && (item.inscriptionShow.indexOf("signImg") < 0 || item.inscriptionShow.indexOf("signImg") >= 0 && !hasSignImg)) {
+            if (inscriptionItem == "userName" && showUserName) {
               return userNameHtml;
             } else if (inscriptionItem == "date") {
               return dateHtml;
@@ -299,6 +331,15 @@ var PageHome = function (_React$Component) {
             } else if (inscriptionItem == "org") {
               return orgNameHtml;
             } else if (inscriptionItem == "signImg") {
+              // 签名图顶替姓名时，标识跟在签名图后
+              if (hasSignImg && addlotsLabel && !showUserName) {
+                return _react2.default.createElement(
+                  'span',
+                  { key: 'signWithAddlots' },
+                  signPicHtml,
+                  addlotsOnlyHtml
+                );
+              }
               return signPicHtml;
             } else if (inscriptionItem == "taskName") {
               return taskNameHtml;
@@ -307,11 +348,14 @@ var PageHome = function (_React$Component) {
             }
           }
         });
-        var replaceHtml = item.replacename && item.replacename != "" ? "(代" + userName + "办理)" : "";
+        // 落款无姓名且无签名图可挂靠时，单独补标识
+        var needTrailingAddlots = addlotsLabel && !showUserName && !(hasSignImg && item.inscriptionShow.indexOf("signImg") >= 0);
+        var replaceHtml = item.replacename && item.replacename != "" ? "(代" + (item.userName || "") + "办理)" : "";
         return _react2.default.createElement(
           Box,
           { className: 'comment-html', style: { marginLeft: "auto", "text-align": "right", width: '100%', 'position': 'relative' } },
           _returnHtml,
+          needTrailingAddlots ? addlotsOnlyHtml : null,
           replaceHtml
         );
       } else {

package/lib/db/db.js

@@ -855,6 +855,14 @@ context.create('FlowModuleAPI', {
       });
     }
   },
+  batchCheckCaAuth: {
+    mockUrl: 'query/batchValidateForm.json',
+    url: _variables2.default.URLS.batchCheckCaAuth,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    }
+  },
   completeTaskBatch: {
     mockUrl: 'query/getDoneTaskListByProcessId.json',
     url: _variables2.default.URLS.completeTaskBatch,

package/lib/db/variables.js

@@ -97,6 +97,7 @@ exports.default = {
         forceEnd: approveUrlPrefix + 'forceEnd' + '?', //结束流程
         getUndoTaskInfo: approveUrlPrefix + "getUndoTaskInfo" + '?', //获取待办详情
         batchValidateForm: approveUrlPrefix + "batchValidateForm" + '?', //批量校验表单必填
+        batchCheckCaAuth: approveUrlPrefix + "batchCheckCaAuth" + '?', //批量通过前CA授权检测
         completeTaskBatch: approveUrlPrefix + "completeTaskBatch" + '?', //批量办理
         readCompleteTaskBatch: approveUrlPrefix + "readCompleteTaskBatch" + '?', //批量已阅
         getSignature: approveUrlPrefix + "getSignature" + '?', //获取签章

package/lib/form/form.js

@@ -3504,6 +3504,12 @@ var PageHome = function (_React$Component) {
                       mainTblDataItem.value = userInfo.dutyName;
                     } else if (relatepopuservalue == 'relateusercardid') {
                       mainTblDataItem.value = userInfo.cardId;
+                    } else if (relatepopuservalue == 'relateusersex') {
+                      mainTblDataItem.value = userInfo.sexName || '';
+                    } else if (relatepopuservalue == 'relateuserpolitical') {
+                      mainTblDataItem.value = userInfo.politicalOutlookShow || '';
+                    } else if (relatepopuservalue == 'relateusernation') {
+                      mainTblDataItem.value = userInfo.nation || '';
                     }
                     t.props.reloadItemParam(data.mainTblName + "_" + mainTblDataItem.key, mainTblDataItem.value);
                   }
@@ -3526,6 +3532,12 @@ var PageHome = function (_React$Component) {
                           mainTblDataItem.value = userInfo.dutyName;
                         } else if (relatepopuservalue == 'relateusercardid') {
                           mainTblDataItem.value = userInfo.cardId;
+                        } else if (relatepopuservalue == 'relateusersex') {
+                          mainTblDataItem.value = userInfo.sexName || '';
+                        } else if (relatepopuservalue == 'relateuserpolitical') {
+                          mainTblDataItem.value = userInfo.politicalOutlookShow || '';
+                        } else if (relatepopuservalue == 'relateusernation') {
+                          mainTblDataItem.value = userInfo.nation || '';
                         }
                         // 如果当前Form是在子表中（dataType === 'sub'），需要通过SubForm来刷新
                         // SubForm的reloadSubItemParam方法可以刷新子表所有行的字段
@@ -4910,7 +4922,7 @@ var PageHome = function (_React$Component) {
               _react2.default.createElement(
                 'div',
                 { className: 't-PT10 t-FB1' },
-                _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign }),
+                _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, finalButtons: t.props.finalButtons }),
                 _react2.default.createElement(
                   'div',
                   { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },

package/lib/form/table.js

@@ -2607,16 +2607,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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, 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) })
+								_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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons, 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, subColumnCount: t.getSubColumnCount(item), mobileSubTblDefault: t.props.mobileSubTblDefault, 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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, 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(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), mobileSubTblDefault: t.props.mobileSubTblDefault, 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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons, 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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, 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) })
+							_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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons, 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',
@@ -2643,16 +2643,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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, 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) })
+										_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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons, 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, subColumnCount: t.getSubColumnCount(item), mobileSubTblDefault: t.props.mobileSubTblDefault, 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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, 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(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), mobileSubTblDefault: t.props.mobileSubTblDefault, 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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons, 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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, 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) })
+									_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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons, 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))
 						)
@@ -2673,7 +2673,7 @@ var PageHome = function (_React$Component) {
 						_react2.default.createElement(
 							'div',
 							{ className: 't-PT10 t-FB1' },
-							_react2.default.createElement(_List2.default, { list: t.props.commentBackList, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign })
+							_react2.default.createElement(_List2.default, { list: t.props.commentBackList, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons })
 						)
 					)
 				),
@@ -2696,7 +2696,7 @@ var PageHome = function (_React$Component) {
 						_react2.default.createElement(
 							'div',
 							{ className: 't-PT10 t-FB1' },
-							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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign }) : "",
+							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, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, finalButtons: t.props.finalButtons }) : "",
 							_react2.default.createElement(
 								'div',
 								{ className: t.props.commentField == "default" ? 't-PL10 t-PR10' : 't-DN' },

package/lib/form_info/formInfo.js

@@ -5377,7 +5377,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, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, 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, onChange: this.change.bind(this) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, 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, finalButtons: t.state.finalButtons, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )

package/lib/process_info/processInfo.js

@@ -355,6 +355,8 @@ var PageHome = function (_React$Component) {
             }
             finalButtons.set('BASE_SUMBIT', '通过');
             finalButtons.set('PAGE_SAVE', '保存草稿');
+            // 触发重渲染，批示意见落款可按按钮名称显示（如「加签1」）
+            _this.setState({ finalButtons: finalButtons });
         }).catch(function (error) {
             console.error(error);
         });
@@ -1435,7 +1437,10 @@ var PageHome = function (_React$Component) {
                             //当批示意见类型是无，且批示意见内容为空时过滤掉
                             continue;
                         }
-                        if (commentField == commentList[_i].field && commentList[_i].taskId == param.taskId) {
+                        // 抢占加签/转交自动返回后，被加签人意见与加签人待办共用同一 taskId。
+                        // 必须同时校验办理人，否则会把他人意见回填进当前编辑框并挤出历史列表。
+                        var commentOwnerId = commentList[_i].userId || commentList[_i].createdBy || '';
+                        if (commentField == commentList[_i].field && commentList[_i].taskId == param.taskId && commentOwnerId && commentOwnerId == param.userId) {
                             newspyj = commentList[_i];
                             commentId = commentList[_i].id;
                             defaultValue = commentList[_i].content;
@@ -8840,7 +8845,7 @@ var PageHome = function (_React$Component) {
                         _react2.default.createElement(
                             'div',
                             { style: { "text-align": "left" } },
-                            _react2.default.createElement(_List2.default, { list: t.state.commentBackAlert })
+                            _react2.default.createElement(_List2.default, { list: t.state.commentBackAlert, finalButtons: t.state.finalButtons })
                         )
                     ) : "",
                     _react2.default.createElement(
@@ -8891,7 +8896,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { key: 'approveFormTable_' + this.state.formTableKey, ref: 'approveFormTable', 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, subColumnCount: t.state.subColumnCount, mobileSubTblDefault: t.state.mobileSubTblDefault, 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, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { key: 'approveFormTable_' + this.state.formTableKey, ref: 'approveFormTable', 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, subColumnCount: t.state.subColumnCount, mobileSubTblDefault: t.state.mobileSubTblDefault, 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, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, finalButtons: t.state.finalButtons, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )

package/lib/tblform/FlowCommentPane.js

@@ -94,7 +94,8 @@ var FlowCommentPane = function (_BaseTable) {
                 isCaUser: t.props.isCaUser,
                 caFirm: t.props.caFirm,
                 caESignatureName: t.props.caESignatureName,
-                caFormSign: t.props.caFormSign
+                caFormSign: t.props.caFormSign,
+                finalButtons: t.props.finalButtons
               })
             )
           )
@@ -123,7 +124,8 @@ var FlowCommentPane = function (_BaseTable) {
                 isCaUser: t.props.isCaUser,
                 caFirm: t.props.caFirm,
                 caESignatureName: t.props.caESignatureName,
-                caFormSign: t.props.caFormSign
+                caFormSign: t.props.caFormSign,
+                finalButtons: t.props.finalButtons
               }) : '',
               _react2.default.createElement(
                 'div',

package/package.json

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