@bchr/bchr-front-lib 0.3.129 → 0.3.132

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.
Files changed (7) hide show
  1. package/lib/base/AppFormulaFunctions.js +70 -45
  2. package/lib/base/layout/ui_tpl/form/FormForModify.js +10 -6
  3. package/lib/services/HttpService.js +20 -18
  4. package/package.json +1 -1
  5. package/src/base/AppFormulaFunctions.js +116 -63
  6. package/src/base/layout/ui_tpl/form/FormForModify.js +16 -7
  7. package/src/services/HttpService.js +20 -17
package/lib/base/AppFormulaFunctions.js CHANGED
@@ -4,6 +4,16 @@ var _moment = _interopRequireDefault(require("moment"));
4
4
 
5
5
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
6
6
 
7
+ var workPlace = {
8
+ "TangGu": "1119001",
9
+ "YanJiao": "1119002",
10
+ "XinJiang": "1119003",
11
+ "ShangHai": "1119004",
12
+ "ZhanJiang": "1119005",
13
+ "ShenZhen": "1119006",
14
+ "HaiNan": "1119007",
15
+ "HaiWai": "1119008"
16
+ };
7
17
  window.AppFormulaFunctions = {
8
18
  getCurrentMonthFirstDay: function getCurrentMonthFirstDay() {
9
19
  return (0, _moment["default"])().date(1).format("YYYY-MM-DD");
@@ -51,26 +61,33 @@ window.AppFormulaFunctions = {
51
61
 
52
62
  return null;
53
63
  },
54
- // YH use 生活补贴标准级别
55
- lifeBTLevel: function lifeBTLevel(post_wa_rank_pk, work_place_pk) {
56
- if (!post_wa_rank_pk || !work_place_pk) {
57
- console.log("lifeBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk);
64
+ //生活补贴标准级别
65
+ lifeBTLevel: function lifeBTLevel(execute_wa_grade_pk, work_place_pk) {
66
+ if (!execute_wa_grade_pk || !work_place_pk) {
67
+ console.log("lifeBTLevel param post_wa_rank_pk: " + execute_wa_grade_pk + ",work_place_pk" + work_place_pk);
58
68
  return null;
59
69
  }
60
70
 
61
- post_wa_rank_pk = post_wa_rank_pk + "";
71
+ execute_wa_grade_pk = execute_wa_grade_pk + "";
62
72
  work_place_pk = work_place_pk + "";
63
73
 
64
- if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0") {
74
+ if (execute_wa_grade_pk == "0" || work_place_pk == "0") {
65
75
  return null;
66
- } // M8 和T6以上级别
76
+ } // M8/T6/B2/W2及以上
67
77
 
68
78
 
69
- var postWaRankOfDeptLevelAndUp = ["601801", "601802", "601803", "601804", "601805", "601806", "601807", "601808", "601817", "601818", "601819", "601820", "601821", "601822"];
79
+ var postWaRankOfDeptLevelAndUp = ["6018001003", "6018001004", "6018001005", // M8~M10
80
+ "6018001011", "6018001012", "6018001013", // T6~T8
81
+ "6018001015", "6018001016", "6018001017", "6018001018", "6018001019", "6018001020", "6018001021", "6018001022", "6018001023", // B2~B10
82
+ "6018001025", "6018001026", "6018001027", "6018001028", "6018001029", "6018001030", "6018001031", "6018001032", "6018001033", "6018001034", "6018001035", "6018001036", // W2~W13
83
+ "6018002003", "6018002004", "6018002005", "6018002006", "6018002007", "6018002008", "6018002009", "6018002010", "6018002011", // M8~M16
84
+ "6018002014", "6018002015", "6018002016", "6018002017", "6018002018", "6018002019", "6018002020", "6018002021", "6018002022", // T6~T8
85
+ "6018002024", "6018002025", "6018002026", "6018002027", "6018002028", "6018002029", "6018002030", "6018002031", "6018002032", "6018002033", "6018002034", "6018002035", "6018002036" // W2~W14
86
+ ];
70
87
 
71
- if (work_place_pk == "1119004" || work_place_pk == "1119006") {
88
+ if (work_place_pk == workPlace.ShangHai || work_place_pk == workPlace.ShenZhen) {
72
89
  if (postWaRankOfDeptLevelAndUp.findIndex(function (item) {
73
- return item == post_wa_rank_pk;
90
+ return item == execute_wa_grade_pk;
74
91
  }) !== -1) {
75
92
  // 400
76
93
  return "6043006";
@@ -78,9 +95,9 @@ window.AppFormulaFunctions = {
78
95
  // 320
79
96
  return "6043008";
80
97
  }
81
- } else if (work_place_pk == "1119001" || work_place_pk == "1119002" || work_place_pk == "1119003" || work_place_pk == "1119008") {
98
+ } else if (work_place_pk == workPlace.TangGu || work_place_pk == workPlace.YanJiao || work_place_pk == workPlace.XinJiang || work_place_pk == workPlace.HaiWai) {
82
99
  if (postWaRankOfDeptLevelAndUp.findIndex(function (item) {
83
- return item == post_wa_rank_pk;
100
+ return item == execute_wa_grade_pk;
84
101
  }) !== -1) {
85
102
  // 355
86
103
  return "6043007";
@@ -88,9 +105,9 @@ window.AppFormulaFunctions = {
88
105
  // 284
89
106
  return "6043010";
90
107
  }
91
- } else if (work_place_pk == "1119005" || work_place_pk == "1119007") {
108
+ } else if (work_place_pk == workPlace.ZhanJiang || work_place_pk == workPlace.HaiNan) {
92
109
  if (postWaRankOfDeptLevelAndUp.findIndex(function (item) {
93
- return item == post_wa_rank_pk;
110
+ return item == execute_wa_grade_pk;
94
111
  }) !== -1) {
95
112
  //250
96
113
  return "6043011";
@@ -102,23 +119,23 @@ window.AppFormulaFunctions = {
102
119
 
103
120
  return null;
104
121
  },
105
- // YH use 房补级别
106
- houseBTLevel: function houseBTLevel(post_wa_rank_pk, work_place_pk, person_class_pk) {
107
- if (!post_wa_rank_pk || !work_place_pk || !person_class_pk) {
108
- console.log("houseBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk + ", person_class_pk=" + person_class_pk);
122
+ // 房补级别
123
+ houseBTLevel: function houseBTLevel(execute_wa_grade_pk, work_place_pk, person_class_pk) {
124
+ if (!execute_wa_grade_pk || !work_place_pk || !person_class_pk) {
125
+ console.log("houseBTLevel param execute_wa_grade_pk: " + execute_wa_grade_pk + ",work_place_pk" + work_place_pk + ", person_class_pk=" + person_class_pk);
109
126
  return null;
110
127
  }
111
128
 
112
- post_wa_rank_pk = post_wa_rank_pk + "";
129
+ execute_wa_grade_pk = execute_wa_grade_pk + "";
113
130
  work_place_pk = work_place_pk + "";
114
131
  person_class_pk = person_class_pk + "";
115
132
 
116
- if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0") {
133
+ if (execute_wa_grade_pk == "0" || execute_wa_grade_pk == "0") {
117
134
  return null;
118
- } //100006、100011、101003、101006、103006、103011 总共六类人员类别有房补
135
+ } // 在岗员工-岗位合同制、在岗员工-新劳动合同制、在岗员工-社聘制-直接聘用
119
136
 
120
137
 
121
- var houseBTPersonClassPKs = ["100006", "100011", "101003", "101006", "103006", "103011"];
138
+ var houseBTPersonClassPKs = ["100016", "100011", "100006"];
122
139
 
123
140
  if (houseBTPersonClassPKs.findIndex(function (item) {
124
141
  return item == person_class_pk;
@@ -126,25 +143,31 @@ window.AppFormulaFunctions = {
126
143
  return null;
127
144
  } // 塘沽 燕郊 新疆 上海 湛江 深圳 海南 海外 其他
128
145
  // 1119001 1119002 1119003 1119004 1119005 1119006 1119007 1119008 1119999
129
- // M6 和T4以上级别
146
+ // M6/T4级及以上/W1
130
147
 
131
148
 
132
- var postWaRankOfM6AndT4Up = ["601801", "601802", "601803", "601804", "601805", "601806", "601817", "601818", "601819", "601820"]; // M6—M7和T5-T6/W1以上级别
149
+ var postWaRankOfM6AndT4Up = [// 2021
150
+ "6018001001", "6018001009", "6018001008", "6018001007", "6018001006", "6018001024", // 2019
151
+ "6018002001", "6018002012", "6018002023", // 企劳制
152
+ "6018003012", "6018003013", "6018003014", "6018003015"]; // M8-M7/T6-T5级/W2/B1/B2
133
153
 
134
- var postWaRankOfM7_8AndT5_6 = ["601807", "601808", "601821", "601822", "601831"]; // M9/T7级及以下
135
- // let postWaRankOfM9AndT7Down = [
136
- // "601809", "601810", "601811", "601812", "601813", "601814", "601815", "601816",
137
- // "601823", "601824", "601825", "601826", "601827", "601828", "601829", "601830",
138
- // ];
154
+ var postWaRankOfM7_8AndT5_6 = [// 2021
155
+ "6018001002", "6018001003", "6018001010", "6018001011", "6018001025", "6018001014", "6018001014", // 2019
156
+ "6018002002", "6018002003", "6018002013", "6018002014", "6018002024", // 企劳制
157
+ "6018003016", "6018003017"]; // M9/T7/W3/B3级及以下
139
158
 
140
- if (work_place_pk == "1119004" || work_place_pk == "1119006") {
159
+ var postWaRankOfM9AndT7Down = [// 2021
160
+ "6018001004", "6018001005", "6018001012", "6018001013", "6018001026", "6018001027", "6018001028", "6018001029", "6018001030", "6018001031", "6018001032", "6018001033", "6018001034", "6018001035", "6018001036", "6018001016", "6018001017", "6018001018", "6018001019", "6018001020", "6018001021", "6018001022", "6018001023", // 2019
161
+ "6018002004", "6018002005", "6018002006", "6018002007", "6018002008", "6018002009", "6018002010", "6018002011", "6018002015", "6018002016", "6018002017", "6018002018", "6018002019", "6018002020", "6018002021", "6018002022", "6018002025", "6018002026", "6018002027", "6018002028", "6018002029", "6018002030", "6018002031", "6018002032", "6018002033", "6018002034", "6018002035", "6018002036"];
162
+
163
+ if (work_place_pk == workPlace.ShangHai || work_place_pk == workPlace.ShenZhen) {
141
164
  if (postWaRankOfM6AndT4Up.findIndex(function (item) {
142
- return item == post_wa_rank_pk;
165
+ return item == execute_wa_grade_pk;
143
166
  }) !== -1) {
144
167
  // 1800元/月
145
168
  return "6046007";
146
169
  } else if (postWaRankOfM7_8AndT5_6.findIndex(function (item) {
147
- return item == post_wa_rank_pk;
170
+ return item == execute_wa_grade_pk;
148
171
  }) !== -1) {
149
172
  // 1500元/月
150
173
  return "6046005";
@@ -152,18 +175,18 @@ window.AppFormulaFunctions = {
152
175
  // 1200元/月
153
176
  return "6046003";
154
177
  }
155
- } else if (work_place_pk == "1119003") {
156
- if (person_class_pk == "100006" || person_class_pk == "101003" || person_class_pk == "103006") {
178
+ } else if (work_place_pk == workPlace.XinJiang) {
179
+ if (person_class_pk == "100006") {
157
180
  // 800元/月
158
181
  return "6046001";
159
- } else if (person_class_pk == "1129012") {
182
+ } else if (person_class_pk == "100006") {
160
183
  if (postWaRankOfM6AndT4Up.findIndex(function (item) {
161
- return item == post_wa_rank_pk;
184
+ return item == execute_wa_grade_pk;
162
185
  }) !== -1) {
163
186
  // 1650元/月
164
187
  return "6046006";
165
188
  } else if (postWaRankOfM7_8AndT5_6.findIndex(function (item) {
166
- return item == post_wa_rank_pk;
189
+ return item == execute_wa_grade_pk;
167
190
  }) !== -1) {
168
191
  // 1350元/月
169
192
  return "6046004";
@@ -174,12 +197,12 @@ window.AppFormulaFunctions = {
174
197
  }
175
198
  } else {
176
199
  if (postWaRankOfM6AndT4Up.findIndex(function (item) {
177
- return item == post_wa_rank_pk;
200
+ return item == execute_wa_grade_pk;
178
201
  }) !== -1) {
179
202
  // 1650元/月
180
203
  return "6046006";
181
204
  } else if (postWaRankOfM7_8AndT5_6.findIndex(function (item) {
182
- return item == post_wa_rank_pk;
205
+ return item == execute_wa_grade_pk;
183
206
  }) !== -1) {
184
207
  // 1350元/月
185
208
  return "6046004";
@@ -191,7 +214,7 @@ window.AppFormulaFunctions = {
191
214
 
192
215
  return null;
193
216
  },
194
- // YH use 意外险级别
217
+ // 意外险级别
195
218
  accidentInsLevel: function accidentInsLevel(execute_wa_grade_pk) {
196
219
  if (!execute_wa_grade_pk) {
197
220
  console.log("accidentInsLevel param execute_wa_grade_pk: " + execute_wa_grade_pk);
@@ -205,15 +228,17 @@ window.AppFormulaFunctions = {
205
228
  } // M1
206
229
 
207
230
 
208
- var executeWaGradeLevel1 = ["601801"]; // M2、M3、T1
231
+ var executeWaGradeLevel1 = []; // M2、M3、T1
232
+
233
+ var executeWaGradeLevel2 = ["6018001006"]; // M4~M6、T2~T4、W1
209
234
 
210
- var executeWaGradeLevel2 = ["601802", "601803", "601817"]; // M4-M6、T2-T4
235
+ var executeWaGradeLevel3 = ["6018001001", "6018001007", "6018001008", "6018001009", "6018001024", "6018002001", "6018002012", "6018002023"]; // M7~M8、T5~T6、B1、B2、W2
211
236
 
212
- var executeWaGradeLevel3 = ["601804", "601805", "601806", "601818", "601819", "601820"]; // M7-M8、T5-T6
237
+ var executeWaGradeLevel4 = ["6018001002", "6018001003", "6018001010", "6018001011", "6018001014", "6018001015", "6018001025", "6018002002", "6018002003", "6018002013", "6018002014", "6018002024", "6018003016", "6018003017"]; // M9~M13、T7~T11、W3~W6、B3~B7
213
238
 
214
- var executeWaGradeLevel4 = ["601807", "601808", "601821", "601822"]; // M9-M13、T7-T11、W6及以上
239
+ var executeWaGradeLevel5 = ["6018001004", "6018001005", "6018001012", "6018001013", "6018001026", "6018001027", "6018001028", "6018001029", "6018001016", "6018001017", "6018001018", "6018001019", "6018001020", "6018002004", "6018002005", "6018002006", "6018002007", "6018002008", "6018002015", "6018002016", "6018002017", "6018002018", "6018002019", "6018002025", "6018002026", "6018002027", "6018002028", "6018003018", "6018003019", "6018003020", "6018003021"]; // M14、T12、W7、B8及以下、G
215
240
 
216
- var executeWaGradeLevel5 = ["601809", "601810", "601811", "601812", "601813", "601823", "601824", "601825", "601826", "601827", "601828", "601829", "601831", "601832", "601833", "601834", "601835", "601836"];
241
+ var executeWaGradeLastLevel = [];
217
242
 
218
243
  if (executeWaGradeLevel1.findIndex(function (item) {
219
244
  return item == execute_wa_grade_pk;
package/lib/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -344,7 +344,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
344
344
  display_code = display_code || code;
345
345
  var initialValue = data[code];
346
346
  var displayValue = data[display_code];
347
- var dataType = "any";
348
347
  var component, valuePropName;
349
348
 
350
349
  if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -366,7 +365,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
366
365
 
367
366
  switch (ui_render_type) {
368
367
  case _consts.UI_RENDER_TYPE.INPUT:
369
- dataType = "string";
370
368
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
371
369
  key: form_id + "_" + code,
372
370
  placeholder: "请填写" + name,
@@ -388,7 +386,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
388
386
  break;
389
387
 
390
388
  case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
391
- dataType = "string";
392
389
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_InputPassword["default"], {
393
390
  ui_render_type: 'browse',
394
391
  initValue: displayValue
@@ -402,7 +399,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
402
399
  break;
403
400
 
404
401
  case _consts.UI_RENDER_TYPE.TEXT_AREA:
405
- dataType = "string";
406
402
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input.TextArea, _extends({
407
403
  key: form_id + "_" + code,
408
404
  placeholder: "请填写" + name,
@@ -644,13 +640,11 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
644
640
  rules: [{
645
641
  required: !dataItem.b_readonly && b_required,
646
642
  message: "请填写" + name,
647
- type: dataType,
648
643
  whitespace: true,
649
644
  validator: _this2.validator.bind(_assertThisInitialized(_this2), !dataItem.b_readonly && b_required, ui_render_type)
650
645
  }, {
651
646
  required: false,
652
647
  message: name + "格式不正确",
653
- type: dataType,
654
648
  whitespace: true,
655
649
  validator: _this2.formatValidator.bind(_assertThisInitialized(_this2)),
656
650
  pattern: regexp_pattern
@@ -955,6 +949,16 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
955
949
  return Promise.resolve();
956
950
  } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_NUMBER) {
957
951
  return value != null ? Promise.resolve() : Promise.reject("validate fail");
952
+ } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT || ui_render_type === _consts.UI_RENDER_TYPE.TEXT_AREA || ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD) {
953
+ if (!value) {
954
+ return Promise.reject("validate fail");
955
+ } else {
956
+ if (value.trim().length === 0) {
957
+ return Promise.reject("validate fail");
958
+ } else {
959
+ return Promise.resolve();
960
+ }
961
+ }
958
962
  } else {
959
963
  return !value ? Promise.reject("validate fail") : Promise.resolve();
960
964
  }
package/lib/services/HttpService.js CHANGED
@@ -129,26 +129,27 @@ var HttpService = /*#__PURE__*/function () {
129
129
 
130
130
  if (!rpcMethodName) {
131
131
  rpcMethodName = "";
132
- }
132
+ } // if (!this.__checkJSONObjectSecurity(jsonObject)) {
133
+ //
134
+ // }
133
135
 
134
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
135
- if (jsonObject) {
136
- ajaxOptions.data = jsonObject;
137
- }
138
136
 
139
- if (ajaxOptions.rpcMethodName) {
140
- delete ajaxOptions.rpcMethodName;
141
- }
137
+ if (jsonObject) {
138
+ ajaxOptions.data = jsonObject;
139
+ }
142
140
 
143
- ajaxOptions.type = "post";
144
- ajaxOptions.dataType = "json";
141
+ if (ajaxOptions.rpcMethodName) {
142
+ delete ajaxOptions.rpcMethodName;
143
+ }
145
144
 
146
- if (!ajaxOptions.url) {
147
- ajaxOptions.url = this.requestContextPath + rpcMethodName;
148
- }
145
+ ajaxOptions.type = "post";
146
+ ajaxOptions.dataType = "json";
149
147
 
150
- return _jquery["default"].ajax(ajaxOptions);
148
+ if (!ajaxOptions.url) {
149
+ ajaxOptions.url = this.requestContextPath + rpcMethodName;
151
150
  }
151
+
152
+ return _jquery["default"].ajax(ajaxOptions);
152
153
  }
153
154
  }, {
154
155
  key: "__postForMock",
@@ -264,11 +265,12 @@ var HttpService = /*#__PURE__*/function () {
264
265
 
265
266
  if (_jquery["default"].isPlainObject(ajaxOptions.data)) {
266
267
  jsonObject = ajaxOptions.data;
267
- }
268
+ } // if (!this.__checkJSONObjectSecurity(jsonObject)) {
269
+ //
270
+ // }
268
271
 
269
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
270
- return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
271
- }
272
+
273
+ return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
272
274
  }
273
275
  }, {
274
276
  key: "postJSONAllowHTML",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bchr/bchr-front-lib",
3
- "version": "0.3.129",
3
+ "version": "0.3.132",
4
4
  "description": "bchr front lib",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/base/AppFormulaFunctions.js CHANGED
@@ -1,8 +1,19 @@
1
1
  import moment from "moment";
2
2
 
3
+ const workPlace = {
4
+ "TangGu": "1119001",
5
+ "YanJiao": "1119002",
6
+ "XinJiang": "1119003",
7
+ "ShangHai": "1119004",
8
+ "ZhanJiang": "1119005",
9
+ "ShenZhen": "1119006",
10
+ "HaiNan": "1119007",
11
+ "HaiWai": "1119008",
12
+ }
13
+
3
14
  window.AppFormulaFunctions = {
4
15
  getCurrentMonthFirstDay : function () {
5
- return moment().date(1).format("YYYY-MM-DD");
16
+ return moment().date(1).format("YYYY-MM-DD");
6
17
  },
7
18
 
8
19
  getCurrentDateNextMonthFirstDay : function () {
@@ -12,7 +23,7 @@ window.AppFormulaFunctions = {
12
23
  currentMonthStartDay : function (dateStr) {
13
24
  if (dateStr) {
14
25
  let baseDate = moment(dateStr, "YYYY-MM-DD");
15
- return baseDate.date(1).format("YYYY-MM-DD");
26
+ return baseDate.date(1).format("YYYY-MM-DD");
16
27
  }
17
28
 
18
29
  return null;
@@ -21,7 +32,7 @@ window.AppFormulaFunctions = {
21
32
  nextMonthStartDay : function (dateStr) {
22
33
  if (dateStr) {
23
34
  let baseDate = moment(dateStr, "YYYY-MM-DD");
24
- return baseDate.add(1,'months').date(1).format("YYYY-MM-DD");
35
+ return baseDate.add(1,'months').date(1).format("YYYY-MM-DD");
25
36
  }
26
37
 
27
38
  return null;
@@ -54,45 +65,52 @@ window.AppFormulaFunctions = {
54
65
  return null;
55
66
  },
56
67
 
57
- // YH use 生活补贴标准级别
58
- lifeBTLevel : function (post_wa_rank_pk, work_place_pk) {
59
- if (!post_wa_rank_pk || !work_place_pk) {
60
- console.log("lifeBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk);
68
+ //生活补贴标准级别
69
+ lifeBTLevel : function (execute_wa_grade_pk, work_place_pk) {
70
+ if (!execute_wa_grade_pk || !work_place_pk) {
71
+ console.log("lifeBTLevel param post_wa_rank_pk: " + execute_wa_grade_pk + ",work_place_pk" + work_place_pk);
61
72
  return null;
62
73
  }
63
74
 
64
- post_wa_rank_pk = post_wa_rank_pk + "";
65
- work_place_pk = work_place_pk + "";
75
+ execute_wa_grade_pk = execute_wa_grade_pk + "";
76
+ work_place_pk = work_place_pk + "";
66
77
 
67
- if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0")
78
+ if (execute_wa_grade_pk == "0" || work_place_pk == "0")
68
79
  {
69
80
  return null;
70
81
  }
71
82
 
72
- // M8 和T6以上级别
83
+ // M8/T6/B2/W2及以上
73
84
  let postWaRankOfDeptLevelAndUp = [
74
- "601801", "601802", "601803", "601804", "601805", "601806", "601807", "601808",
75
- "601817", "601818", "601819", "601820", "601821", "601822",
85
+ "6018001003", "6018001004", "6018001005", // M8~M10
86
+ "6018001011", "6018001012", "6018001013", // T6~T8
87
+ "6018001015", "6018001016", "6018001017", "6018001018", "6018001019", "6018001020", "6018001021", "6018001022", "6018001023", // B2~B10
88
+ "6018001025", "6018001026", "6018001027", "6018001028", "6018001029", "6018001030", "6018001031", "6018001032", "6018001033", "6018001034", "6018001035", "6018001036", // W2~W13
89
+
90
+ "6018002003", "6018002004", "6018002005", "6018002006", "6018002007", "6018002008", "6018002009", "6018002010", "6018002011", // M8~M16
91
+ "6018002014", "6018002015", "6018002016", "6018002017", "6018002018", "6018002019", "6018002020", "6018002021", "6018002022", // T6~T8
92
+ "6018002024", "6018002025", "6018002026", "6018002027", "6018002028", "6018002029", "6018002030", "6018002031", "6018002032", "6018002033", "6018002034", "6018002035", "6018002036" // W2~W14
76
93
  ];
77
94
 
78
- if (work_place_pk == "1119004" || work_place_pk == "1119006") {
79
- if (postWaRankOfDeptLevelAndUp.findIndex(item => item == post_wa_rank_pk) !== -1) {
95
+
96
+ if (work_place_pk == workPlace.ShangHai || work_place_pk == workPlace.ShenZhen) {
97
+ if (postWaRankOfDeptLevelAndUp.findIndex(item => item == execute_wa_grade_pk) !== -1) {
80
98
  // 400
81
99
  return "6043006";
82
100
  } else {
83
101
  // 320
84
102
  return "6043008";
85
103
  }
86
- } else if (work_place_pk == "1119001" || work_place_pk == "1119002" || work_place_pk == "1119003" || work_place_pk == "1119008") {
87
- if (postWaRankOfDeptLevelAndUp.findIndex(item => item == post_wa_rank_pk) !== -1) {
104
+ } else if (work_place_pk == workPlace.TangGu || work_place_pk == workPlace.YanJiao || work_place_pk == workPlace.XinJiang || work_place_pk == workPlace.HaiWai) {
105
+ if (postWaRankOfDeptLevelAndUp.findIndex(item => item == execute_wa_grade_pk) !== -1) {
88
106
  // 355
89
107
  return "6043007";
90
108
  } else {
91
109
  // 284
92
110
  return "6043010";
93
111
  }
94
- } else if (work_place_pk == "1119005" || work_place_pk == "1119007") {
95
- if (postWaRankOfDeptLevelAndUp.findIndex(item => item == post_wa_rank_pk) !== -1) {
112
+ } else if (work_place_pk == workPlace.ZhanJiang || work_place_pk == workPlace.HaiNan) {
113
+ if (postWaRankOfDeptLevelAndUp.findIndex(item => item == execute_wa_grade_pk) !== -1) {
96
114
  //250
97
115
  return "6043011";
98
116
  } else {
@@ -104,24 +122,24 @@ window.AppFormulaFunctions = {
104
122
  return null;
105
123
  },
106
124
 
107
- // YH use 房补级别
108
- houseBTLevel : function (post_wa_rank_pk, work_place_pk, person_class_pk) {
109
- if (!post_wa_rank_pk || !work_place_pk || !person_class_pk) {
110
- console.log("houseBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk + ", person_class_pk=" + person_class_pk);
125
+ // 房补级别
126
+ houseBTLevel : function (execute_wa_grade_pk, work_place_pk, person_class_pk) {
127
+ if (!execute_wa_grade_pk || !work_place_pk || !person_class_pk) {
128
+ console.log("houseBTLevel param execute_wa_grade_pk: " + execute_wa_grade_pk + ",work_place_pk" + work_place_pk + ", person_class_pk=" + person_class_pk);
111
129
  return null
112
130
  }
113
131
 
114
- post_wa_rank_pk = post_wa_rank_pk + "";
115
- work_place_pk = work_place_pk + "";
116
- person_class_pk = person_class_pk + "";
132
+ execute_wa_grade_pk = execute_wa_grade_pk + "";
133
+ work_place_pk = work_place_pk + "";
134
+ person_class_pk = person_class_pk + "";
117
135
 
118
- if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0")
136
+ if (execute_wa_grade_pk == "0" || execute_wa_grade_pk == "0")
119
137
  {
120
138
  return null;
121
139
  }
122
140
 
123
- //100006、100011、101003、101006、103006、103011 总共六类人员类别有房补
124
- let houseBTPersonClassPKs = ["100006", "100011", "101003", "101006", "103006", "103011"];
141
+ // 在岗员工-岗位合同制、在岗员工-新劳动合同制、在岗员工-社聘制-直接聘用
142
+ let houseBTPersonClassPKs = ["100016", "100011", "100006", ];
125
143
  if (houseBTPersonClassPKs.findIndex(item => item == person_class_pk) === -1) {
126
144
  return null;
127
145
  }
@@ -129,45 +147,68 @@ window.AppFormulaFunctions = {
129
147
  // 塘沽 燕郊 新疆 上海 湛江 深圳 海南 海外 其他
130
148
  // 1119001 1119002 1119003 1119004 1119005 1119006 1119007 1119008 1119999
131
149
 
132
- // M6 和T4以上级别
150
+ // M6/T4级及以上/W1
133
151
  let postWaRankOfM6AndT4Up = [
134
- "601801", "601802", "601803", "601804", "601805", "601806",
135
- "601817", "601818", "601819", "601820",
152
+ // 2021
153
+ "6018001001",
154
+ "6018001009", "6018001008", "6018001007", "6018001006",
155
+ "6018001024",
156
+ // 2019
157
+ "6018002001",
158
+ "6018002012",
159
+ "6018002023",
160
+ // 企劳制
161
+ "6018003012", "6018003013", "6018003014", "6018003015",
136
162
  ];
137
163
 
138
- // M6—M7和T5-T6/W1以上级别
164
+ // M8-M7/T6-T5级/W2/B1/B2
139
165
  let postWaRankOfM7_8AndT5_6 = [
140
- "601807", "601808",
141
- "601821", "601822",
142
- "601831",
166
+ // 2021
167
+ "6018001002", "6018001003",
168
+ "6018001010", "6018001011",
169
+ "6018001025",
170
+ "6018001014", "6018001014",
171
+ // 2019
172
+ "6018002002", "6018002003",
173
+ "6018002013", "6018002014",
174
+ "6018002024",
175
+ // 企劳制
176
+ "6018003016", "6018003017",
143
177
  ];
144
178
 
145
- // M9/T7级及以下
146
- // let postWaRankOfM9AndT7Down = [
147
- // "601809", "601810", "601811", "601812", "601813", "601814", "601815", "601816",
148
- // "601823", "601824", "601825", "601826", "601827", "601828", "601829", "601830",
149
- // ];
179
+ // M9/T7/W3/B3级及以下
180
+ let postWaRankOfM9AndT7Down = [
181
+ // 2021
182
+ "6018001004", "6018001005",
183
+ "6018001012", "6018001013",
184
+ "6018001026", "6018001027", "6018001028", "6018001029", "6018001030", "6018001031", "6018001032", "6018001033", "6018001034", "6018001035", "6018001036",
185
+ "6018001016", "6018001017", "6018001018", "6018001019", "6018001020", "6018001021", "6018001022", "6018001023",
186
+ // 2019
187
+ "6018002004", "6018002005", "6018002006", "6018002007", "6018002008", "6018002009", "6018002010", "6018002011",
188
+ "6018002015", "6018002016", "6018002017", "6018002018", "6018002019", "6018002020", "6018002021", "6018002022",
189
+ "6018002025", "6018002026", "6018002027", "6018002028", "6018002029", "6018002030", "6018002031", "6018002032", "6018002033", "6018002034", "6018002035", "6018002036",
190
+ ];
150
191
 
151
- if (work_place_pk == "1119004" || work_place_pk == "1119006") {
152
- if (postWaRankOfM6AndT4Up.findIndex(item => item == post_wa_rank_pk) !== -1) {
192
+ if (work_place_pk == workPlace.ShangHai || work_place_pk == workPlace.ShenZhen) {
193
+ if (postWaRankOfM6AndT4Up.findIndex(item => item == execute_wa_grade_pk) !== -1) {
153
194
  // 1800元/月
154
195
  return "6046007";
155
- } else if (postWaRankOfM7_8AndT5_6.findIndex(item => item == post_wa_rank_pk) !== -1) {
196
+ } else if (postWaRankOfM7_8AndT5_6.findIndex(item => item == execute_wa_grade_pk) !== -1) {
156
197
  // 1500元/月
157
- return "6046005";
198
+ return "6046005";
158
199
  } else {
159
200
  // 1200元/月
160
201
  return "6046003";
161
202
  }
162
- } else if (work_place_pk == "1119003") {
163
- if (person_class_pk == "100006" || person_class_pk == "101003" || person_class_pk == "103006") {
203
+ } else if (work_place_pk == workPlace.XinJiang) {
204
+ if (person_class_pk == "100006") {
164
205
  // 800元/月
165
206
  return "6046001"
166
- } else if (person_class_pk == "1129012") {
167
- if (postWaRankOfM6AndT4Up.findIndex(item => item == post_wa_rank_pk) !== -1) {
207
+ } else if (person_class_pk == "100006") {
208
+ if (postWaRankOfM6AndT4Up.findIndex(item => item == execute_wa_grade_pk) !== -1) {
168
209
  // 1650元/月
169
210
  return "6046006";
170
- } else if (postWaRankOfM7_8AndT5_6.findIndex(item => item == post_wa_rank_pk) !== -1) {
211
+ } else if (postWaRankOfM7_8AndT5_6.findIndex(item => item == execute_wa_grade_pk) !== -1) {
171
212
  // 1350元/月
172
213
  return "6046004";
173
214
  } else {
@@ -176,10 +217,10 @@ window.AppFormulaFunctions = {
176
217
  }
177
218
  }
178
219
  } else {
179
- if (postWaRankOfM6AndT4Up.findIndex(item => item == post_wa_rank_pk) !== -1) {
220
+ if (postWaRankOfM6AndT4Up.findIndex(item => item == execute_wa_grade_pk) !== -1) {
180
221
  // 1650元/月
181
222
  return "6046006";
182
- } else if (postWaRankOfM7_8AndT5_6.findIndex(item => item == post_wa_rank_pk) !== -1) {
223
+ } else if (postWaRankOfM7_8AndT5_6.findIndex(item => item == execute_wa_grade_pk) !== -1) {
183
224
  // 1350元/月
184
225
  return "6046004";
185
226
  } else {
@@ -191,7 +232,7 @@ window.AppFormulaFunctions = {
191
232
  return null;
192
233
  },
193
234
 
194
- // YH use 意外险级别
235
+ // 意外险级别
195
236
  accidentInsLevel : function (execute_wa_grade_pk) {
196
237
  if (!execute_wa_grade_pk) {
197
238
  console.log("accidentInsLevel param execute_wa_grade_pk: " + execute_wa_grade_pk)
@@ -205,18 +246,30 @@ window.AppFormulaFunctions = {
205
246
  }
206
247
 
207
248
  // M1
208
- let executeWaGradeLevel1 = ["601801"];
249
+ let executeWaGradeLevel1 = [];
209
250
  // M2、M3、T1
210
- let executeWaGradeLevel2 = ["601802", "601803", "601817"];
211
- // M4-M6、T2-T4
212
- let executeWaGradeLevel3 = ["601804", "601805", "601806", "601818", "601819", "601820"];
213
- // M7-M8、T5-T6
214
- let executeWaGradeLevel4 = ["601807", "601808", "601821", "601822"];
215
- // M9-M13、T7-T11、W6及以上
251
+ let executeWaGradeLevel2 = ["6018001006"];
252
+ // M4~M6、T2~T4、W1
253
+ let executeWaGradeLevel3 = [
254
+ "6018001001", "6018001007", "6018001008", "6018001009", "6018001024",
255
+ "6018002001", "6018002012", "6018002023",
256
+ ];
257
+ // M7~M8、T5~T6、B1、B2、W2
258
+ let executeWaGradeLevel4 = [
259
+ "6018001002", "6018001003", "6018001010", "6018001011", "6018001014", "6018001015", "6018001025",
260
+ "6018002002", "6018002003", "6018002013", "6018002014", "6018002024",
261
+ "6018003016", "6018003017",
262
+ ];
263
+ // M9~M13、T7~T11、W3~W6、B3~B7
216
264
  let executeWaGradeLevel5 = [
217
- "601809", "601810", "601811", "601812", "601813",
218
- "601823", "601824", "601825", "601826", "601827", "601828", "601829",
219
- "601831", "601832", "601833", "601834", "601835", "601836",
265
+ "6018001004", "6018001005", "6018001012", "6018001013", "6018001026", "6018001027", "6018001028", "6018001029", "6018001016", "6018001017", "6018001018", "6018001019", "6018001020",
266
+ "6018002004", "6018002005", "6018002006", "6018002007", "6018002008", "6018002015", "6018002016", "6018002017", "6018002018", "6018002019", "6018002025", "6018002026",
267
+ "6018002027", "6018002028",
268
+ "6018003018", "6018003019", "6018003020", "6018003021",
269
+ ];
270
+ // M14、T12、W7、B8及以下、G
271
+ let executeWaGradeLastLevel = [
272
+
220
273
  ];
221
274
 
222
275
  if (executeWaGradeLevel1.findIndex(item => item == execute_wa_grade_pk) !== -1) {
package/src/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -338,7 +338,6 @@ class FormForModify extends React.Component{
338
338
  display_code = display_code || code;
339
339
  let initialValue = data[code];
340
340
  let displayValue = data[display_code];
341
- let dataType= "any";
342
341
 
343
342
  let component, valuePropName;
344
343
  if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -359,7 +358,6 @@ class FormForModify extends React.Component{
359
358
 
360
359
  switch (ui_render_type) {
361
360
  case UI_RENDER_TYPE.INPUT:
362
- dataType = "string";
363
361
  component = b_readonly ? (
364
362
  <div>
365
363
  <span>{displayValue}</span>
@@ -397,7 +395,6 @@ class FormForModify extends React.Component{
397
395
  );
398
396
  break;
399
397
  case UI_RENDER_TYPE.INPUT_PASSWORD:
400
- dataType = "string";
401
398
  component = b_readonly ? (
402
399
  <div>
403
400
  <InputPassword ui_render_type={'browse'} initValue={displayValue}/>
@@ -416,7 +413,6 @@ class FormForModify extends React.Component{
416
413
  );
417
414
  break;
418
415
  case UI_RENDER_TYPE.TEXT_AREA:
419
- dataType = "string";
420
416
  component = b_readonly ? (
421
417
  <div>
422
418
  <span>{displayValue}</span>
@@ -732,8 +728,8 @@ class FormForModify extends React.Component{
732
728
  name={code}
733
729
  initialValue={initialValue}
734
730
  rules={[
735
- {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), type: dataType, whitespace: true, validator: this.validator.bind(this, (!dataItem.b_readonly && b_required), ui_render_type)},
736
- {required: false, message: (name + "格式不正确"), type: dataType, whitespace: true, validator: this.formatValidator.bind(this), pattern: regexp_pattern}
731
+ {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), whitespace: true, validator: this.validator.bind(this, (!dataItem.b_readonly && b_required), ui_render_type)},
732
+ {required: false, message: (name + "格式不正确"), whitespace: true, validator: this.formatValidator.bind(this), pattern: regexp_pattern}
737
733
  ]}
738
734
  hasFeedback={(!dataItem.b_readonly && b_required)}
739
735
  valuePropName={valuePropName ? valuePropName : "value"}
@@ -762,7 +758,20 @@ class FormForModify extends React.Component{
762
758
  else if (ui_render_type === UI_RENDER_TYPE.INPUT_NUMBER) {
763
759
  return value != null ? Promise.resolve() : Promise.reject("validate fail");
764
760
  }
765
- else {
761
+ else if (ui_render_type === UI_RENDER_TYPE.INPUT
762
+ || ui_render_type === UI_RENDER_TYPE.TEXT_AREA
763
+ || ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD ) {
764
+
765
+ if (!value) {
766
+ return Promise.reject("validate fail");
767
+ } else {
768
+ if(value.trim().length===0) {
769
+ return Promise.reject("validate fail");
770
+ } else {
771
+ return Promise.resolve();
772
+ }
773
+ }
774
+ } else {
766
775
  return !value ? Promise.reject("validate fail") : Promise.resolve();
767
776
  }
768
777
  }
package/src/services/HttpService.js CHANGED
@@ -114,24 +114,25 @@ class HttpService {
114
114
  rpcMethodName = "";
115
115
  }
116
116
 
117
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
118
- if (jsonObject) {
119
- ajaxOptions.data = jsonObject;
120
- }
121
-
122
- if (ajaxOptions.rpcMethodName) {
123
- delete ajaxOptions.rpcMethodName;
124
- }
117
+ // if (!this.__checkJSONObjectSecurity(jsonObject)) {
118
+ //
119
+ // }
120
+ if (jsonObject) {
121
+ ajaxOptions.data = jsonObject;
122
+ }
125
123
 
126
- ajaxOptions.type = "post";
127
- ajaxOptions.dataType = "json";
124
+ if (ajaxOptions.rpcMethodName) {
125
+ delete ajaxOptions.rpcMethodName;
126
+ }
128
127
 
129
- if (!ajaxOptions.url) {
130
- ajaxOptions.url = this.requestContextPath + rpcMethodName;
131
- }
128
+ ajaxOptions.type = "post";
129
+ ajaxOptions.dataType = "json";
132
130
 
133
- return $.ajax(ajaxOptions);
131
+ if (!ajaxOptions.url) {
132
+ ajaxOptions.url = this.requestContextPath + rpcMethodName;
134
133
  }
134
+
135
+ return $.ajax(ajaxOptions);
135
136
  }
136
137
 
137
138
  __postForMock(mockOptions) {
@@ -250,9 +251,11 @@ class HttpService {
250
251
  jsonObject = ajaxOptions.data;
251
252
  }
252
253
 
253
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
254
- return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
255
- }
254
+ // if (!this.__checkJSONObjectSecurity(jsonObject)) {
255
+ //
256
+ // }
257
+
258
+ return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
256
259
  }
257
260
 
258
261
  postJSONAllowHTML(options, jsonObject, mockOptions) {