@shisyamo4131/air-guard-v2-schemas 2.4.2-dev.87 → 2.4.2-dev.89
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/package.json +1 -1
- package/src/Billing.js +1 -1
- package/src/Customer.js +2 -1
- package/src/Operation.js +1 -1
- package/src/Outsourcer.js +1 -1
- package/src/Site.js +2 -2
- package/src/User.js +1 -1
- package/src/constants/security-type.js +16 -0
- package/src/parts/fieldDefinitions/oneLine.js +19 -2
- package/src/parts/fieldDefinitions/select.js +15 -0
package/package.json
CHANGED
package/src/Billing.js
CHANGED
package/src/Customer.js
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
* @property {string} tel - telephone number
|
|
18
18
|
* @property {string} fax - fax number
|
|
19
19
|
* @property {string} contractStatus - contract status
|
|
20
|
+
* @property {string} cutoffDate - cutoff date for billing
|
|
20
21
|
* @property {number} paymentMonth - payment site in months
|
|
21
22
|
* @property {string} paymentDate - payment site date
|
|
22
23
|
* @property {string} remarks - additional remarks
|
|
@@ -57,7 +58,7 @@ const classProps = {
|
|
|
57
58
|
cutoffDate: defField("cutoffDate", { required: true }),
|
|
58
59
|
paymentMonth: defField("paymentMonth", { required: true }),
|
|
59
60
|
paymentDate: defField("paymentDate", { required: true }),
|
|
60
|
-
remarks: defField("
|
|
61
|
+
remarks: defField("remarks"),
|
|
61
62
|
};
|
|
62
63
|
|
|
63
64
|
/*****************************************************************************
|
package/src/Operation.js
CHANGED
|
@@ -113,7 +113,7 @@ const classProps = {
|
|
|
113
113
|
}),
|
|
114
114
|
qualificationRequired: defField("check", { label: "要資格者" }),
|
|
115
115
|
workDescription: defField("workDescription"),
|
|
116
|
-
remarks: defField("
|
|
116
|
+
remarks: defField("remarks"),
|
|
117
117
|
employees: defField("array", { customClass: OperationDetail }),
|
|
118
118
|
outsourcers: defField("array", {
|
|
119
119
|
customClass: OperationDetail,
|
package/src/Outsourcer.js
CHANGED
|
@@ -13,7 +13,7 @@ const classProps = {
|
|
|
13
13
|
nameKana: defField("nameKana", { required: true }),
|
|
14
14
|
displayName: defField("displayName", { label: "略称", required: true }),
|
|
15
15
|
contractStatus: defField("contractStatus", { required: true }),
|
|
16
|
-
remarks: defField("
|
|
16
|
+
remarks: defField("remarks"),
|
|
17
17
|
};
|
|
18
18
|
|
|
19
19
|
/**
|
package/src/Site.js
CHANGED
|
@@ -53,9 +53,9 @@ const classProps = {
|
|
|
53
53
|
city: defField("city", { required: true }),
|
|
54
54
|
address: defField("address", { required: true }),
|
|
55
55
|
building: defField("building"),
|
|
56
|
+
securityType: defField("securityType", { required: true }),
|
|
56
57
|
location: defField("location"),
|
|
57
|
-
remarks: defField("
|
|
58
|
-
// agreements: defField("array", { label: "取極め", customClass: Agreement }),
|
|
58
|
+
remarks: defField("remarks"),
|
|
59
59
|
agreementsV2: defField("array", {
|
|
60
60
|
label: "取極め",
|
|
61
61
|
customClass: AgreementV2,
|
package/src/User.js
CHANGED
|
@@ -38,7 +38,7 @@ export default class User extends FireModel {
|
|
|
38
38
|
},
|
|
39
39
|
}),
|
|
40
40
|
displayName: defField("displayName", { required: true }),
|
|
41
|
-
employeeId: defField("
|
|
41
|
+
employeeId: defField("employeeId", { hidden: true }),
|
|
42
42
|
roles: defField("roles"),
|
|
43
43
|
disabled: defField("disabled", { hidden: true }),
|
|
44
44
|
companyId: defField("companyId", { hidden: true, required: true }),
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
// prettier-ignore
|
|
2
|
+
export const VALUES = Object.freeze({
|
|
3
|
+
UNSET: { title: "未設定", value: "UNSET" },
|
|
4
|
+
FACILITY: { title: "施設警備", value: "FACILITY" },
|
|
5
|
+
CROWD: { title: "雑踏警備", value: "CROWD" },
|
|
6
|
+
TRAFFIC: { title: "交通誘導", value: "TRAFFIC" },
|
|
7
|
+
OTHER: { title: "その他", value: "OTHER" },
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
export const OPTIONS = [
|
|
11
|
+
{ title: VALUES.UNSET.title, value: VALUES.UNSET.value },
|
|
12
|
+
{ title: VALUES.FACILITY.title, value: VALUES.FACILITY.value },
|
|
13
|
+
{ title: VALUES.CROWD.title, value: VALUES.CROWD.value },
|
|
14
|
+
{ title: VALUES.TRAFFIC.title, value: VALUES.TRAFFIC.value },
|
|
15
|
+
{ title: VALUES.OTHER.title, value: VALUES.OTHER.value },
|
|
16
|
+
];
|
|
@@ -91,7 +91,6 @@ export const oneLineFields = {
|
|
|
91
91
|
name: "air-autocomplete-api",
|
|
92
92
|
attrs: {
|
|
93
93
|
itemValue: "docId",
|
|
94
|
-
itemTitle: "name",
|
|
95
94
|
noFilter: true,
|
|
96
95
|
},
|
|
97
96
|
},
|
|
@@ -175,6 +174,25 @@ export const oneLineFields = {
|
|
|
175
174
|
},
|
|
176
175
|
},
|
|
177
176
|
|
|
177
|
+
/**
|
|
178
|
+
* 従業員ID
|
|
179
|
+
* - アプリ側で `useFetchXxxx` コンポーザブルを使用するため
|
|
180
|
+
* 使用するクラス側で api 関連の設定は不要。
|
|
181
|
+
*/
|
|
182
|
+
employeeId: {
|
|
183
|
+
...generalDefinitions.oneLine,
|
|
184
|
+
label: "従業員",
|
|
185
|
+
// アプリ側で `useFetchXxxx` コンポーザブルを使用するため
|
|
186
|
+
// 使用するクラス側で api 関連の設定は不要。
|
|
187
|
+
component: {
|
|
188
|
+
name: "air-autocomplete-api",
|
|
189
|
+
attrs: {
|
|
190
|
+
itemValue: "docId",
|
|
191
|
+
noFilter: true,
|
|
192
|
+
},
|
|
193
|
+
},
|
|
194
|
+
},
|
|
195
|
+
|
|
178
196
|
/** FAX番号 */
|
|
179
197
|
fax: {
|
|
180
198
|
...generalDefinitions.oneLine,
|
|
@@ -336,7 +354,6 @@ export const oneLineFields = {
|
|
|
336
354
|
name: "air-autocomplete-api",
|
|
337
355
|
attrs: {
|
|
338
356
|
itemValue: "docId",
|
|
339
|
-
itemTitle: "name",
|
|
340
357
|
noFilter: true,
|
|
341
358
|
},
|
|
342
359
|
},
|
|
@@ -44,6 +44,10 @@ import {
|
|
|
44
44
|
VALUES as PAYMENT_MONTH_VALUES,
|
|
45
45
|
OPTIONS as PAYMENT_MONTH_OPTIONS,
|
|
46
46
|
} from "../../constants/payment-month.js";
|
|
47
|
+
import {
|
|
48
|
+
VALUES as SECURITY_TYPE_VALUES,
|
|
49
|
+
OPTIONS as SECURITY_TYPE_OPTIONS,
|
|
50
|
+
} from "../../constants/security-type.js";
|
|
47
51
|
import {
|
|
48
52
|
VALUES as SHIFT_TYPE_VALUES,
|
|
49
53
|
OPTIONS as SHIFT_TYPE_OPTIONS,
|
|
@@ -229,6 +233,17 @@ export const selectFields = {
|
|
|
229
233
|
},
|
|
230
234
|
},
|
|
231
235
|
},
|
|
236
|
+
securityType: {
|
|
237
|
+
...generalDefinitions.select,
|
|
238
|
+
default: SECURITY_TYPE_VALUES.UNSET.value,
|
|
239
|
+
label: "警備種別",
|
|
240
|
+
component: {
|
|
241
|
+
name: generalDefinitions.select.component.name,
|
|
242
|
+
attrs: {
|
|
243
|
+
items: SECURITY_TYPE_OPTIONS,
|
|
244
|
+
},
|
|
245
|
+
},
|
|
246
|
+
},
|
|
232
247
|
shiftType: {
|
|
233
248
|
...generalDefinitions.select,
|
|
234
249
|
default: SHIFT_TYPE_VALUES.DAY.value,
|