fanxw 2 lat temu
rodzic
commit
e0cba74b66

+ 16 - 0
src/main/resources/static/app/business/jsgl/controller/jsglCtrl.js

@@ -267,6 +267,22 @@ angular.module('app.business')
267 267
     //保存(0:保存,1:提交)
268 268
     $scope.save = function(czlx) {
269 269
     	$scope.jsgl.dataStatus = czlx;
270
+    	var fp_s = $scope.jsgl.fpStart;
271
+    	var fp_e = $scope.jsgl.fpEnd;
272
+    	var fps = $scope.jsgl.fps;
273
+    	if (fp_s == null && fp_e == null && fps == null) {
274
+    		alert("连续发票号和不连续发票号至少要录入一种,不能都为空值!");
275
+    		return;
276
+    	} else {
277
+    		if ((fp_s == null && fp_e != null) || (fp_s != null && fp_e == null)) {
278
+    			alert("连续发票号码不能只录入起始值或只录入终止值!");
279
+    			return;
280
+    		}
281
+    	}
282
+    	if ($scope.jsgl.yhzh == null) {
283
+    		alert("请补全对应客户档案信息!");
284
+    		return;
285
+    	}
270 286
     	if (validator.form()) {
271 287
     		jsglService.saveData($scope.jsgl).then(function(data){
272 288
     			if (data.status == "200") {

+ 10 - 14
src/main/resources/static/app/business/jsgl/view/jsgl-edit.html

@@ -139,17 +139,17 @@
139 139
                                 <fieldset>
140 140
                                     <div class="row">
141 141
                                         <section class="col col-12">
142
-                                            <label class="label">连续发票号码填写<span style="color: red;">*</span></label>
142
+                                            <label class="label">连续发票号码填写</label>
143 143
                                             <label class="input"> 
144 144
                                             	<div>
145 145
                                             	<table border="0">
146 146
                                             	    <tr>
147 147
                                             	        <td>
148
-                                            	             <input type="text" ng-model="jsgl.fpStart" ng-readonly="isNotEdit" required name="fpStart" placeholder="" />
148
+                                            	             <input type="text" ng-model="jsgl.fpStart" ng-readonly="isNotEdit" name="fpStart" placeholder="" />
149 149
                                             	        </td>
150 150
                                             	        <td><span>&nbsp;——&nbsp;</span></td>
151 151
                                             	        <td>
152
-                                            	             <input type="text" ng-model="jsgl.fpEnd" ng-readonly="isNotEdit" required name="fpEnd" />
152
+                                            	             <input type="text" ng-model="jsgl.fpEnd" ng-readonly="isNotEdit" name="fpEnd" />
153 153
                                             	        </td>
154 154
                                             	        <td><span style="color: red;">&nbsp;&nbsp;&nbsp;&nbsp;说明:连续发票号码,请填写第一张和最后一张即可</span></td>
155 155
                                             	    </tr>
@@ -159,11 +159,11 @@
159 159
                                         </section>
160 160
                                     </div>
161 161
                                     <section>
162
-                                        <label class="label">发票号码填写</label>
162
+                                        <label class="label">不连续发票号码填写</label>
163 163
                                         <label class="textarea textarea-resizable"> 
164 164
                                           <textarea
165 165
                                             rows="5" ng-model="jsgl.fps" name="fps" ng-disabled="isNotEdit" class="custom-scroll"
166
-                                            oninput="if(value.length>255) value=value.slice(0,255)" placeholder="多个发票号码填写,请用英文逗号进行间隔。例如:1234567890,123456788,最大255个字符">
166
+                                            placeholder="多个发票号码填写,请用英文逗号进行间隔。例如:1234567890,123456788">
167 167
                                           </textarea>
168 168
                                         </label>
169 169
                                     </section>
@@ -185,22 +185,19 @@
185 185
                                         <section class="col col-4">
186 186
                                             <label class="label">收/付款人<span style="color: red;">*</span></label>
187 187
                                             <label class="input"> 
188
-                                                <input class="form-control" type="text" ng-model="jsgl.sfkr" ng-readonly="true"
189
-                                                name="sfkr" placeholder="" required />
188
+                                                <input class="form-control" type="text" ng-model="jsgl.sfkr" ng-readonly="true" name="sfkr" placeholder="" required />
190 189
                                             </label>
191 190
                                         </section>
192 191
                                         <section class="col col-4">
193 192
                                             <label class="label">开户行名称<span style="color: red;">*</span></label>
194 193
                                             <label class="input"> 
195
-                                                <input class="form-control" type="text" ng-model="dicData[jsgl.khhmc]" ng-readonly="true"
196
-                                                name="khhmc" placeholder="" required />
194
+                                                <input class="form-control" type="text" ng-model="dicData[jsgl.khhmc]" ng-readonly="true" name="khhmc" placeholder="" required />
197 195
                                             </label>
198 196
                                         </section>
199 197
                                         <section class="col col-4">
200 198
                                             <label class="label">开户行号<span style="color: red;">*</span></label>
201 199
                                             <label class="input"> 
202
-                                                <input type="text" ng-model="jsgl.khhh" ng-readonly="true" required
203
-                                                name="khhh" placeholder="" />
200
+                                                <input type="text" ng-model="jsgl.khhh" ng-readonly="true" required name="khhh" placeholder="" />
204 201
                                             </label>
205 202
                                         </section>
206 203
                                     </div>
@@ -208,8 +205,7 @@
208 205
                                         <section class="col col-4">
209 206
                                             <label class="label">银行账号<span style="color: red;">*</span></label>
210 207
                                             <label class="input"> 
211
-                                                <input class="form-control" type="text" ng-model="jsgl.yhzh" ng-readonly="true"
212
-                                                name="yhzh" placeholder="" required />
208
+                                                <input class="form-control" type="text" ng-model="jsgl.yhzh" ng-readonly="true" name="yhzh" placeholder="" required />
213 209
                                             </label>
214 210
                                         </section>
215 211
                                         <section class="col col-4" ng-hide="jslx=='1'">
@@ -227,7 +223,7 @@
227 223
                                     </div>
228 224
                                 </fieldset>
229 225
 
230
-                                <div><!--class="form-actions"-->
226
+                                <div>
231 227
                                     <footer class="text-align-center">
232 228
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
233 229
                                         <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save('1')">提交</button>