张延森 2 年 前
コミット
096a028d22

+ 1
- 1
resources/templates/guaranteeAbility/add.html ファイルの表示

@@ -14,7 +14,7 @@
14 14
 		<form id="guaranteeAbilityForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">				
15 15
 			<h1 class="title">常规膳食保障</h1>
16 16
 			<div class="form-group col-xs-12">
17
-				<label class="required" style="font-weight: bold;">单日整体膳食供应能力(人次):<div class="help"><i class="icon icon-question-sign"></i>
17
+				<label class="required col-xs-4" style="font-weight: bold;">单日整体膳食供应能力(人次):<div class="help"><i class="icon icon-info-sign"></i>
18 18
 			    <div class="popover">
19 19
 			      <div class="arrow"></div>
20 20
 			      <h3 class="popover-title">提示信息</h3>

+ 1
- 1
resources/templates/guaranteeAbility/update.html ファイルの表示

@@ -16,7 +16,7 @@
16 16
 		 <input type="hidden" id="oldId" name="oldId" th:value="${guaranteeAbilityObj.oldId}" />
17 17
 			<h1 class="title">常规膳食保障</h1>
18 18
 			<div class="form-group col-xs-12">
19
-				<label class="required" style="font-weight: bold;">单日整体膳食供应能力(人次):<div class="help"><i class="icon icon-question-sign"></i>
19
+				<label class="required col-xs-4" style="font-weight: bold;">单日整体膳食供应能力(人次):<div class="help"><i class="icon icon-question-sign"></i>
20 20
 			    <div class="popover">
21 21
 			      <div class="arrow"></div>
22 22
 			      <h3 class="popover-title">提示信息</h3>

+ 12
- 12
resources/templates/jtaskYear/add.html ファイルの表示

@@ -11,13 +11,13 @@
11 11
 				<h1 class="title">基本信息</h1>
12 12
 				<div class="wd-m">
13 13
 					<div class="form-group col-xs-12" style="float: none;">
14
-						<label class="required col-sm-4">登记年份:<div class="help" data-toggle="tooltip" data-placement="bottom" title="请选择数据时间">
14
+						<label class="required col-sm-4">登记年份:<div class="help">
15 15
 							<i class="icon icon-info-sign"></i>
16
-							<!-- <div class="popover">
16
+							<div class="popover">
17 17
 								<div class="arrow"></div>
18 18
 								<h3 class="popover-title">提示信息</h3>
19 19
 								<div class="popover-content">请选择数据时间</div>
20
-							</div> -->
20
+							</div>
21 21
 						</div></label>
22 22
 						<div class="col-lg-6 col-xs-8">
23 23
 							<select name="taskYear" id="taskYear"  class="form-control required" onchange="changeYear()"
@@ -25,39 +25,39 @@
25 25
 						</div>
26 26
 					</div>
27 27
 					<div class="form-group col-xs-12">
28
-						<label class="required col-sm-4">全年接待过往部队(批次):<div class="help" data-toggle="tooltip" data-placement="bottom" title="请填写全年接待过往部队,单位:批次">
28
+						<label class="required col-sm-4">全年接待过往部队(批次):<div class="help">
29 29
 							<i class="icon icon-info-sign"></i>
30
-							<!-- <div class="popover">
30
+							<div class="popover">
31 31
 								<div class="arrow"></div>
32 32
 								<h3 class="popover-title">提示信息</h3>
33 33
 								<div class="popover-content">请填写全年接待过往部队,单位:批次</div>
34
-							</div> -->
34
+							</div>
35 35
 						</div></label>
36 36
 						<div class="col-lg-6 col-xs-8">
37 37
 							<input id="qnjdgwbd" name="qnjdgwbd" class="form-control required digits" maxlength="9">
38 38
 						</div>
39 39
 					</div>			
40 40
 					<div class="form-group col-xs-12">
41
-						<label class="required col-sm-4">全年接待过往部队饮食饮水(人次):<div class="help" data-toggle="tooltip" data-placement="bottom" title="请填写全年接待过往部队,单位:批次">
41
+						<label class="required col-sm-4">全年接待过往部队饮食饮水(人次):<div class="help">
42 42
 							<i class="icon icon-info-sign"></i>
43
-							<!-- <div class="popover">
43
+							<div class="popover">
44 44
 								<div class="arrow"></div>
45 45
 								<h3 class="popover-title">提示信息</h3>
46 46
 								<div class="popover-content">请填写全年接待过往部队饮食饮水,单位:人次</div>
47
-							</div> -->
47
+							</div>
48 48
 						</div></label>
49 49
 						<div class="col-lg-6 col-xs-8">
50 50
 							<input id="qnjdgwbdyshi" name="qnjdgwbdyshi" class="form-control required digits" maxlength="9">
51 51
 						</div>
52 52
 					</div>
53 53
 					<div class="form-group col-xs-12">
54
-						<label class="required col-sm-4">全年接待过往部队饮水(人次):<div class="help" data-toggle="tooltip" data-placement="bottom" title="请填写全年接待过往部队饮水,单位:人次">
54
+						<label class="required col-sm-4">全年接待过往部队饮水(人次):<div class="help">
55 55
 							<i class="icon icon-info-sign"></i>
56
-							<!-- <div class="popover">
56
+							<div class="popover">
57 57
 								<div class="arrow"></div>
58 58
 								<h3 class="popover-title">提示信息</h3>
59 59
 								<div class="popover-content">请填写全年接待过往部队饮水,单位:人次</div>
60
-							</div> -->
60
+							</div>
61 61
 						</div></label>
62 62
 						<div class="col-lg-6 col-xs-8">
63 63
 							<input id="qnjdgwbdyshui" name="qnjdgwbdyshui" class="form-control required digits" maxlength="9">

+ 95
- 91
resources/templates/task/add.html ファイルの表示

@@ -12,97 +12,101 @@
12 12
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
13 13
 	<div class="panel-body">
14 14
 		<form id="taskInfoForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
15
-			<h1 class="title">基本信息</h1>
16
-			<div class="form-group col-xs-12">
17
-				<label class="required col-sm-4">任务编号:<div class="help"><i class="icon icon-question-sign"></i>
18
-			    <div class="popover">
19
-			      <div class="arrow"></div>
20
-			      <h3 class="popover-title">提示信息</h3>
21
-			      <div class="popover-content">任务编号的格式为:日期-属地-三位流水号,如南京军供站2020年3月4日的第二个任务编号就应该为20200304-NJ-002</div>
22
-			    </div>
23
-			  </div></label>
24
-				<div class="col-lg-6 col-xs-8">
25
-					<input id="taskNumber" name="taskNumber" class="form-control required"
26
-						maxlength="50">
27
-				</div>
28
-			</div>
29
-			<div class="form-group col-xs-12">
30
-				<label class="required col-sm-4">任务时间:<div class="help"><i class="icon icon-question-sign"></i>
31
-			    <div class="popover">
32
-			      <div class="arrow"></div>
33
-			      <h3 class="popover-title">提示信息</h3>
34
-			      <div class="popover-content">任务时间为接到任务通知的时间</div>
35
-			    </div>
36
-			  </div></label>
37
-				<div class="col-lg-6 col-xs-8">
38
-					<input id="dataDate" name="dataDate" class="form-control form-date required dateISO" readOnly>
39
-				</div>
40
-			</div>
41
-			
42
-			<div class="form-group col-xs-12">
43
-				<label class="required col-sm-4">供应主体:<div class="help"><i class="icon icon-question-sign"></i>
44
-			    <div class="popover">
45
-			      <div class="arrow"></div>
46
-			      <h3 class="popover-title">提示信息</h3>
47
-			      <div class="popover-content">供应主题安排</div>
48
-			    </div>
49
-			  </div></label>
50
-				<div class="col-lg-6 col-xs-8">
51
-				   <select name="config_supply_main" id="config_supply_main"  class="form-control required" 
52
-						aria-required="true" aria-invalid="false"><option
53
-							value="" selected="">--请选择--</option></select>
54
-				</div>
55
-			</div>
56
-			
57
-			<div class="form-group col-xs-12">
58
-				<label class="required col-sm-4">供应性质:<div class="help"><i class="icon icon-question-sign"></i>
59
-			    <div class="popover">
60
-			      <div class="arrow"></div>
61
-			      <h3 class="popover-title">提示信息</h3>
62
-			      <div class="popover-content">请选择供应性质</div>
63
-			    </div>
64
-			  </div></label>
65
-				<div class="col-lg-6 col-xs-8">
66
-					<select name="config_supply_nature" id="config_supply_nature"  class="form-control required" 
67
-						aria-required="true" aria-invalid="false"><option
68
-							value="" selected="">--请选择--</option></select>
69
-				</div>
70
-			</div>
71
-			
72
-			<div class="form-group col-xs-12">
73
-				<label class="col-sm-4">食材成品是否留样:</label>
74
-				<div class="col-lg-6 col-xs-8">
75
-					<select name="iflyyl" id="iflyyl"  class="form-control " 
76
-						aria-required="true" aria-invalid="false"><option
77
-							value="" selected="">--请选择--</option></select>
78
-				</div>
79
-			</div>
80
-			<div class="form-group col-xs-12">
81
-				<label class="col-sm-4">食材成品是否检疫:</label>
82
-				<div class="col-lg-6 col-xs-8">
83
-					<select name="ifjyyl" id="ifjyyl"  class="form-control " 
84
-						aria-required="true" aria-invalid="false"><option
85
-							value="" selected="">--请选择--</option></select>
86
-				</div>
87
-			</div>			
88
-			<div class="form-group col-xs-12">
89
-				<label class="required col-sm-4">本次任务负责人:<div class="help"><i class="icon icon-question-sign"></i>
90
-			    <div class="popover">
91
-			      <div class="arrow"></div>
92
-			      <h3 class="popover-title">提示信息</h3>
93
-			      <div class="popover-content">请填写本次任务负责人</div>
94
-			    </div>
95
-			  </div></label>
96
-				<div class="col-lg-6 col-xs-8">
97
-					<input id="superintendent" name="superintendent" class="form-control required"
98
-						maxlength="100">
99
-				</div>
100
-			</div>
101
-			<div class="form-group col-xs-12">
102
-				<label class="col-sm-4">留样检疫负责人:</label>
103
-				<div class="col-lg-6 col-xs-8">
104
-					<input id="jyfzr" name="jyfzr" class="form-control "
105
-						maxlength="100">
15
+			<div class="ext-card">
16
+				<h1 class="title">基本信息</h1>
17
+				<div class="wd-m">
18
+					<div class="form-group col-xs-12">
19
+						<label class="required col-sm-4">任务编号:<div class="help"><i class="icon icon-info-sign"></i>
20
+							<div class="popover">
21
+								<div class="arrow"></div>
22
+								<h3 class="popover-title">提示信息</h3>
23
+								<div class="popover-content">任务编号的格式为:日期-属地-三位流水号,如南京军供站2020年3月4日的第二个任务编号就应该为20200304-NJ-002</div>
24
+							</div>
25
+						</div></label>
26
+						<div class="col-lg-6 col-xs-8">
27
+							<input id="taskNumber" name="taskNumber" class="form-control required"
28
+								maxlength="50">
29
+						</div>
30
+					</div>
31
+					<div class="form-group col-xs-12">
32
+						<label class="required col-sm-4">任务时间:<div class="help"><i class="icon icon-info-sign"></i>
33
+							<div class="popover">
34
+								<div class="arrow"></div>
35
+								<h3 class="popover-title">提示信息</h3>
36
+								<div class="popover-content">任务时间为接到任务通知的时间</div>
37
+							</div>
38
+						</div></label>
39
+						<div class="col-lg-6 col-xs-8">
40
+							<input id="dataDate" name="dataDate" class="form-control form-date required dateISO" readOnly>
41
+						</div>
42
+					</div>
43
+					
44
+					<div class="form-group col-xs-12">
45
+						<label class="required col-sm-4">供应主体:<div class="help"><i class="icon icon-info-sign"></i>
46
+							<div class="popover">
47
+								<div class="arrow"></div>
48
+								<h3 class="popover-title">提示信息</h3>
49
+								<div class="popover-content">供应主题安排</div>
50
+							</div>
51
+						</div></label>
52
+						<div class="col-lg-6 col-xs-8">
53
+							 <select name="config_supply_main" id="config_supply_main"  class="form-control required" 
54
+								aria-required="true" aria-invalid="false"><option
55
+									value="" selected="">--请选择--</option></select>
56
+						</div>
57
+					</div>
58
+					
59
+					<div class="form-group col-xs-12">
60
+						<label class="required col-sm-4">供应性质:<div class="help"><i class="icon icon-info-sign"></i>
61
+							<div class="popover">
62
+								<div class="arrow"></div>
63
+								<h3 class="popover-title">提示信息</h3>
64
+								<div class="popover-content">请选择供应性质</div>
65
+							</div>
66
+						</div></label>
67
+						<div class="col-lg-6 col-xs-8">
68
+							<select name="config_supply_nature" id="config_supply_nature"  class="form-control required" 
69
+								aria-required="true" aria-invalid="false"><option
70
+									value="" selected="">--请选择--</option></select>
71
+						</div>
72
+					</div>
73
+					
74
+					<div class="form-group col-xs-12">
75
+						<label class="col-sm-4">食材成品是否留样:</label>
76
+						<div class="col-lg-6 col-xs-8">
77
+							<select name="iflyyl" id="iflyyl"  class="form-control " 
78
+								aria-required="true" aria-invalid="false"><option
79
+									value="" selected="">--请选择--</option></select>
80
+						</div>
81
+					</div>
82
+					<div class="form-group col-xs-12">
83
+						<label class="col-sm-4">食材成品是否检疫:</label>
84
+						<div class="col-lg-6 col-xs-8">
85
+							<select name="ifjyyl" id="ifjyyl"  class="form-control " 
86
+								aria-required="true" aria-invalid="false"><option
87
+									value="" selected="">--请选择--</option></select>
88
+						</div>
89
+					</div>			
90
+					<div class="form-group col-xs-12">
91
+						<label class="required col-sm-4">本次任务负责人:<div class="help"><i class="icon icon-info-sign"></i>
92
+							<div class="popover">
93
+								<div class="arrow"></div>
94
+								<h3 class="popover-title">提示信息</h3>
95
+								<div class="popover-content">请填写本次任务负责人</div>
96
+							</div>
97
+						</div></label>
98
+						<div class="col-lg-6 col-xs-8">
99
+							<input id="superintendent" name="superintendent" class="form-control required"
100
+								maxlength="100">
101
+						</div>
102
+					</div>
103
+					<div class="form-group col-xs-12">
104
+						<label class="col-sm-4">留样检疫负责人:</label>
105
+						<div class="col-lg-6 col-xs-8">
106
+							<input id="jyfzr" name="jyfzr" class="form-control "
107
+								maxlength="100">
108
+						</div>
109
+					</div>
106 110
 				</div>
107 111
 			</div>
108 112
 			<h1 class="title">服务项目</h1>