fmui-base 2.0.97 → 2.0.99
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
|
@@ -1163,10 +1163,18 @@ var PageHome = function (_React$Component) {
|
|
|
1163
1163
|
content: content,
|
|
1164
1164
|
onConfirm: function onConfirm() {
|
|
1165
1165
|
db.FlowModuleAPI.completeTaskBatch(param).then(function (content) {
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
|
|
1166
|
+
if (content.skipCount == "0" || content.skipCount == 0) {
|
|
1167
|
+
_Toast2.default.show({
|
|
1168
|
+
type: 'success',
|
|
1169
|
+
content: '批量办理' + content.successCount + '条成功,' + content.skipCount + '条失败'
|
|
1170
|
+
});
|
|
1171
|
+
} else {
|
|
1172
|
+
_Toast2.default.show({
|
|
1173
|
+
type: 'success',
|
|
1174
|
+
content: '批量办理' + content.successCount + '条成功,' + content.skipCount + '条失败,失败原因:审批设置不支持,后继活动或者审批人需要手动选择'
|
|
1175
|
+
});
|
|
1176
|
+
}
|
|
1177
|
+
|
|
1170
1178
|
var returnData = content.successList;
|
|
1171
1179
|
if (typeof returnData != 'undefined' && returnData != null) {
|
|
1172
1180
|
for (var i = 0; i < returnData.length; i++) {
|
|
@@ -1244,7 +1252,7 @@ var PageHome = function (_React$Component) {
|
|
|
1244
1252
|
if (typeof error.errorMsg == 'undefined') {
|
|
1245
1253
|
_Toast2.default.show({
|
|
1246
1254
|
type: 'error',
|
|
1247
|
-
content: '
|
|
1255
|
+
content: '流程设置有误，请联系管理员'
|
|
1248
1256
|
});
|
|
1249
1257
|
} else {
|
|
1250
1258
|
var message = error.errorMsg;
|
|
@@ -1684,6 +1684,36 @@ var PageHome = function (_React$Component) {
|
|
|
1684
1684
|
if (!s.test(value)) {
|
|
1685
1685
|
return saveItem[j].itemTitle + ':' + tips;
|
|
1686
1686
|
}
|
|
1687
|
+
} else if (regular.indexOf('compare') != -1) {
|
|
1688
|
+
var regularArr = regular.split('|');
|
|
1689
|
+
if (regularArr.length == 3) {
|
|
1690
|
+
var compareMark = regularArr[1];
|
|
1691
|
+
var otherUniqueName = regularArr[2];
|
|
1692
|
+
var otherValue = 0;
|
|
1693
|
+
var thisValue = 0;
|
|
1694
|
+
for (var f = 0; f < mainTblData.length; f++) {
|
|
1695
|
+
if (mainTblData[f].uniqueName == otherUniqueName) {
|
|
1696
|
+
|
|
1697
|
+
if (value != '') {
|
|
1698
|
+
if (mainTblData[i].itemType == 'datetime') {
|
|
1699
|
+
thisValue = new Date(value).getTime();
|
|
1700
|
+
} else {
|
|
1701
|
+
thisValue = value;
|
|
1702
|
+
}
|
|
1703
|
+
}
|
|
1704
|
+
if (mainTblData[f].value != '') {
|
|
1705
|
+
if (mainTblData[f].itemType == 'datetime') {
|
|
1706
|
+
otherValue = new Date(mainTblData[f].value).getTime();
|
|
1707
|
+
} else {
|
|
1708
|
+
otherValue = mainTblData[f].value;
|
|
1709
|
+
}
|
|
1710
|
+
}
|
|
1711
|
+
}
|
|
1712
|
+
}
|
|
1713
|
+
if (eval(thisValue + compareMark + otherValue)) {
|
|
1714
|
+
return saveItem[j].itemTitle + ':' + tips;
|
|
1715
|
+
}
|
|
1716
|
+
}
|
|
1687
1717
|
} else {
|
|
1688
1718
|
var extRegex = /^(.+?)(\d+)-(\d+)$/; //判断是否为 *1-2或n1-2等默认属性的形式
|
|
1689
1719
|
var mac = regular.match(extRegex),
|