fmui-base 2.3.1 → 2.3.2
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 +1 -0
- package/lib/process_info/processInfo.js +13 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -129,6 +129,14 @@ var ButtonGroup = _Button2.default.ButtonGroup,
|
|
|
129
129
|
TextButton = _Button2.default.TextButton;
|
|
130
130
|
//import UserInfo from '../approval-details/UserInfo';
|
|
131
131
|
|
|
132
|
+
/** 转交批示意见系统设置是否必填；无 getSysSettingByMark 方法时视为不必填 */
|
|
133
|
+
function isSysTransferCommentRequired() {
|
|
134
|
+
if (typeof getSysSettingByMark !== 'function') {
|
|
135
|
+
return false;
|
|
136
|
+
}
|
|
137
|
+
return getSysSettingByMark('approveTransferComment') == '1';
|
|
138
|
+
}
|
|
139
|
+
|
|
132
140
|
var isCaReload = false;
|
|
133
141
|
window.addEventListener('pageshow', function () {
|
|
134
142
|
console.log("isCaReload===" + isCaReload);
|
|
@@ -2175,7 +2183,11 @@ var PageHome = function (_React$Component) {
|
|
|
2175
2183
|
}
|
|
2176
2184
|
} else if (hasCommentField == '1' && defaultComValue == '') {
|
|
2177
2185
|
|
|
2178
|
-
|
|
2186
|
+
var commentRequired = commentIsNull == '1' || commentIsNotNull == '1';
|
|
2187
|
+
if (operate == 3) {
|
|
2188
|
+
commentRequired = commentRequired && isSysTransferCommentRequired();
|
|
2189
|
+
}
|
|
2190
|
+
if (commentRequired) {
|
|
2179
2191
|
//不可为空
|
|
2180
2192
|
var documentId = t.state.newspyj.documentId;
|
|
2181
2193
|
if (t.state.commentField == 'default') {
|