Ver código fonte

散粮入库结算

hanqingsong 1 ano atrás
pai
commit
4be1afc07e

+ 3 - 12
src/main/resources/static/app/business/jsgl/controller/jsglCtrl.js

@@ -405,7 +405,7 @@ angular.module('app.business')
405 405
 		params.orgId = $scope.jsgl.orgId;
406 406
         var uibModalInstance = $uibModal.open({
407 407
             size:'lg',
408
-            templateUrl: 'app/business/jsgl/view/tzd-zj-model.html',
408
+            templateUrl: 'app/business/jsgl/views/tzd-zj-model.html',
409 409
             controller: 'tzdZjCtrl',
410 410
             resolve: {
411 411
                 // items是一个回调函数
@@ -596,15 +596,6 @@ angular.module('app.business')
596 596
     	        console.log(data);
597 597
     	    });
598 598
     	}
599
-    }
599
+    };
600 600
 
601
-    //添加一组客户信息
602
-    $scope.addRow = function(zid) {
603
-    	var i = $scope.jsgl.jsglKhxxList.length;
604
-		if (null == $scope.jsgl.jsglKhxxList[i-1].type) {
605
-			alert("请先录入空行!");
606
-			return;
607
-		}
608
-		$scope.jsgl.jsglKhxxList.push({orgId: $rootScope.orgInfo.orgId, zid:zid});
609
-    }
610
-})
601
+});

+ 41 - 56
src/main/resources/static/app/business/jsgl/views/jsgl-sl-edit.html

@@ -179,63 +179,48 @@
179 179
                                     </section>
180 180
                                     </div>
181 181
                                 </fieldset>
182
-                                <header>
183
-                                    <strong>收/付款信息</strong>&nbsp;&nbsp; 
184
-                                    <a class="btn btn-primary btn-circle" ng-click="addRow(jsgl.id)" ng-hide="isNotEdit">新增</a>
185
-                                </header>
182
+                                <header><strong>收/付款信息</strong></header>
186 183
                                 <fieldset>
187
-                                  	<div ng-repeat="khxx in jsgl.jsglKhxxList">
188
-	                                    <div class="row">
189
-	                                        <section class="col col-3">
190
-	                                            <label class="label">收/付款人<span style="color: red;">*</span></label>
191
-	                                            <label class="input"> 
192
-	                                                <input class="form-control" type="text" ng-model="khxx.sfkr" name="sfkr{{$index}}" ng-disabled="isNotEdit" 
193
-	                                                ng-click="getCustomer()" placeholder="请选择客户" required />
194
-	                                            </label>
195
-	                                        </section>
196
-	                                        <section class="col col-3">
197
-	                                            <label class="label">开户行名称<span style="color: red;">*</span></label>
198
-	                                            <label class="input"> 
199
-	                                                <input class="form-control" type="text" ng-model="dicData[khxx.khhmc]" ng-readonly="true" name="khhmc{{$index}}" placeholder="" ng-required="isCustomerEdit" />
200
-	                                            </label>
201
-	                                        </section>
202
-	                                        <section class="col col-3">
203
-	                                            <label class="label">开户行号<span style="color: red;">*</span></label>
204
-	                                            <label class="input"> 
205
-	                                                <input type="text" ng-model="khxx.khhh" ng-readonly="true" ng-required="isCustomerEdit" name="khhh{{$index}}" placeholder="" />
206
-	                                            </label>
207
-	                                        </section>
208
-	                                        <section class="col col-3">
209
-	                                            <label class="label">银行账号<span style="color: red;">*</span></label>
210
-	                                            <label class="input"> 
211
-	                                                <input class="form-control" type="text" ng-model="khxx.yhzh" ng-readonly="true" name="yhzh{{$index}}" placeholder="" ng-required="isCustomerEdit" />
212
-	                                            </label>
213
-	                                        </section>
214
-	                                    </div>
215
-	                                    <div class="row">
216
-	                                        <section class="col col-3" ng-hide="jslx=='1'">
217
-	                                            <label class="label">收款人身份证号</label>
218
-	                                            <label class="input"> 
219
-	                                                <input class="form-control" type="text" ng-model="khxx.skrsfzh" ng-readonly="true" name="skrsfzh{{$index}}" placeholder="" />
220
-	                                            </label>
221
-	                                        </section>
222
-	                                        <section class="col col-3" ng-hide="jslx=='1'">
223
-	                                            <label class="label">付款单位<span style="color: red;">*</span></label>
224
-	                                            <label class="input"> 
225
-	                                                <input type="text" ng-model="khxx.fkdw" name="fkdw{{$index}}" ng-readonly="isNotEdit" required placeholder="" />
226
-	                                            </label>
227
-	                                        </section>
228
-	                                        <section class="col col-3">
229
-												<label class="label"> </label>
230
-												<label class="input"></label>
231
-											</section>
232
-	                                        <section class="col col-3">
233
-												<label class="label"> </label>
234
-												<label class="input">
235
-													<a ng-hide="isNotEdit" class="btn btn-primary btn-circle" ng-click="delRow(keeper.id,2,zyjszc)">删除</a>
236
-												</label>
237
-											</section>
238
-	                                    </div>
184
+                                    <div class="row">
185
+                                        <section class="col col-4">
186
+                                            <label class="label">收/付款人<span style="color: red;">*</span></label>
187
+                                            <label class="input">
188
+                                                <input class="form-control" type="text" ng-model="jsgl.sfkr" name="sfkr" ng-disabled="isNotEdit"
189
+                                                       ng-click="getCustomer()" placeholder="请选择客户" required />
190
+                                            </label>
191
+                                        </section>
192
+                                        <section class="col col-4">
193
+                                            <label class="label">开户行名称<span style="color: red;">*</span></label>
194
+                                            <label class="input">
195
+                                                <input class="form-control" type="text" ng-model="dicData[jsgl.khhmc]" ng-readonly="true" name="khhmc" placeholder="" ng-required="isCustomerEdit" />
196
+                                            </label>
197
+                                        </section>
198
+                                        <section class="col col-4">
199
+                                            <label class="label">开户行号<span style="color: red;">*</span></label>
200
+                                            <label class="input">
201
+                                                <input type="text" ng-model="jsgl.khhh" ng-readonly="true" ng-required="isCustomerEdit" name="khhh" placeholder="" />
202
+                                            </label>
203
+                                        </section>
204
+                                    </div>
205
+                                    <div class="row">
206
+                                        <section class="col col-4">
207
+                                            <label class="label">银行账号<span style="color: red;">*</span></label>
208
+                                            <label class="input">
209
+                                                <input class="form-control" type="text" ng-model="jsgl.yhzh" ng-readonly="true" name="yhzh" placeholder="" ng-required="isCustomerEdit" />
210
+                                            </label>
211
+                                        </section>
212
+                                        <section class="col col-4" ng-hide="jslx=='1'">
213
+                                            <label class="label">收款人身份证号</label>
214
+                                            <label class="input">
215
+                                                <input class="form-control" type="text" ng-model="jsgl.skrsfzh" ng-readonly="true" name="skrsfzh" placeholder="" />
216
+                                            </label>
217
+                                        </section>
218
+                                        <section class="col col-4" ng-hide="jslx=='1'">
219
+                                            <label class="label">付款单位<span style="color: red;">*</span></label>
220
+                                            <label class="input">
221
+                                                <input type="text" ng-model="jsgl.fkdw" name="fkdw" ng-readonly="isNotEdit" required placeholder="" />
222
+                                            </label>
223
+                                        </section>
239 224
                                     </div>
240 225
                                 </fieldset>
241 226