Browse Source

fix: 仓房信息表

XuPengHui 2 years ago
parent
commit
be20d2b458

+ 5 - 5
src/main/resources/static/app/basic/storehouse/controller/StorehouseCtrl.js

@@ -607,11 +607,11 @@ angular.module('app.basic')
607 607
 	];
608 608
 	// 挡粮门型式
609 609
 	$scope.dlmxsList = [
610
-		{ id: 1, value: "“一字型”挡粮板" },
611
-		{ id: 2, value: "“三角形”挡粮门" },
612
-		{ id: 3, value: "“弧形”挡粮门" },
613
-		{ id: 4, value: "围包" },
614
-		{ id: 5, value: "其它型式" },
610
+		{ id: "1", value: "“一字型”挡粮板" },
611
+		{ id: "2", value: "“三角形”挡粮门" },
612
+		{ id: "3", value: "“弧形”挡粮门" },
613
+		{ id: "4", value: "围包" },
614
+		{ id: "5", value: "其它型式" },
615 615
 	];
616 616
 	//添加货位弹出窗口
617 617
 	$scope.editRow = function(warehouse, btnType) {

+ 32 - 8
src/main/resources/static/app/basic/storehouse/views/Storehouse-edit.html

@@ -43,7 +43,8 @@
43 43
 													<input type="text" ng-model="basicStorehouse.depotName" name="depotName" ng-readonly="true">
44 44
 												</label>
45 45
 												<label class="select" ng-hide="basicStorehouse.libraryType == 0">
46
-													<select ng-model="basicStorehouse.depotId" required ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit"
46
+													<select ng-model="basicStorehouse.depotId" required 
47
+													 ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit"
47 48
 															ng-options="depot.depotId as depot.depotName for depot in depotList" id="depotId"
48 49
 															class="form-control">
49 50
 														<option value="">--请选择--</option>
@@ -77,7 +78,10 @@
77 78
 											</th>
78 79
 											<th>
79 80
 												<label class="input">
80
-													<input type="text" ng-model="basicStorehouse.dutystoreman" required ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit" />
81
+													<input type="text" ng-model="basicStorehouse.dutystoreman" required 
82
+													name="dutystoreman"
83
+													ng-disabled="isNotEdit" />
84
+													<!-- ng-disabled="basicStorehouse.libraryType == 0 || isNotEdit" -->
81 85
 												</label>
82 86
 											</th>
83 87
 											<th>
@@ -497,6 +501,7 @@
497 501
 												<label class="select">
498 502
 													<select ng-model="basicStorehouse.ywfhfbfdss" ng-disabled="isNotEdit"
499 503
 														ng-options="enum.id as enum.value for enum in falseEnum" required
504
+														name="ywfhfbfdss"
500 505
 														class="form-control">
501 506
 													</select>
502 507
 												</label>
@@ -508,6 +513,7 @@
508 513
 												<label class="select">
509 514
 													<select ng-model="basicStorehouse.nfszcc" ng-disabled="isNotEdit" required
510 515
 														ng-options="enum.id as enum.value for enum in falseEnum"
516
+														name="nfszcc"
511 517
 														class="form-control">
512 518
 													</select>
513 519
 												</label>
@@ -519,6 +525,7 @@
519 525
 												<label class="select">
520 526
 													<select ng-model="basicStorehouse.ywfsfqfczz" ng-disabled="isNotEdit"
521 527
 														ng-options="enum.id as enum.value for enum in falseEnum" required
528
+														name="ywfsfqfczz"
522 529
 														class="form-control">
523 530
 													</select>
524 531
 												</label>
@@ -554,6 +561,7 @@
554 561
 												<label class="select">
555 562
 													<select ng-model="basicStorehouse.ywjxtfss" ng-disabled="isNotEdit"
556 563
 														ng-options="enum.id as enum.value for enum in falseEnum" required
564
+														name="ywjxtfss"
557 565
 														class="form-control">
558 566
 													</select>
559 567
 												</label>
@@ -565,6 +573,7 @@
565 573
 												<label class="select">
566 574
 													<select ng-model="basicStorehouse.nfhlxzsc" ng-disabled="isNotEdit"
567 575
 														ng-options="enum.id as enum.value for enum in falseEnum" required
576
+														name="nfhlxzsc"
568 577
 														class="form-control">
569 578
 													</select>
570 579
 												</label>
@@ -576,6 +585,7 @@
576 585
 												<label class="select">
577 586
 													<select ng-model="basicStorehouse.nffddyqtcl" ng-disabled="isNotEdit"
578 587
 														ng-options="enum.id as enum.value for enum in falseEnum" required
588
+														name="nffddyqtcl"
579 589
 														class="form-control">
580 590
 													</select>
581 591
 												</label>
@@ -600,6 +610,7 @@
600 610
 												<label class="select">
601 611
 													<select ng-model="basicStorehouse.clgx" ng-disabled="isNotEdit"
602 612
 														ng-options="enum.id as enum.value for enum in clgxList" required
613
+														name="clgx"
603 614
 														class="form-control">
604 615
 														<option value="">--请选择--</option>
605 616
 													</select>
@@ -612,6 +623,7 @@
612 623
 												<label class="select">
613 624
 													<select ng-model="basicStorehouse.nfgrbw" ng-disabled="isNotEdit"
614 625
 														ng-options="enum.id as enum.value for enum in falseEnum" required
626
+														name="nfgrbw"
615 627
 														class="form-control">
616 628
 													</select>
617 629
 												</label>
@@ -622,7 +634,9 @@
622 634
 											<th>
623 635
 												<label class="select">
624 636
 													<select ng-model="basicStorehouse.grxn" ng-disabled="isNotEdit"
625
-														ng-options="enum.id as enum.value for enum in grxnList" required
637
+														ng-options="enum.id as enum.value for enum in grxnList" 
638
+														name="grxn"
639
+														required
626 640
 														class="form-control">
627 641
 														<option value="">--请选择--</option>
628 642
 													</select>
@@ -636,8 +650,10 @@
636 650
 											</th>
637 651
 											<th>
638 652
 												<label class="select">
639
-													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
640
-														ng-options="enum.id as enum.value for enum in jgclList" required
653
+													<select ng-model="basicStorehouse.qmx" ng-disabled="isNotEdit"
654
+														ng-options="enum.id as enum.value for enum in jgclList" 
655
+														name="qmx"
656
+														required
641 657
 														class="form-control">
642 658
 														<option value="">--请选择--</option>
643 659
 													</select>
@@ -650,6 +666,7 @@
650 666
 												<label class="select">
651 667
 													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
652 668
 														ng-options="enum.id as enum.value for enum in qmxList" required
669
+														name="jgcl"
653 670
 														class="form-control">
654 671
 														<option value="">--请选择--</option>
655 672
 													</select>
@@ -661,7 +678,8 @@
661 678
 											<th>
662 679
 												<label class="select">
663 680
 													<select ng-model="basicStorehouse.lqjs" ng-disabled="isNotEdit"
664
-														ng-options="enum.id as enum.value for enum in lqjsList" required
681
+														ng-options="enum.id as enum.value for enum in lqjsList" 
682
+														name="lqjs"
665 683
 														class="form-control">
666 684
 														<option value="">--请选择--</option>
667 685
 													</select>
@@ -673,7 +691,8 @@
673 691
 											<th>
674 692
 												<label class="select">
675 693
 													<select ng-model="basicStorehouse.tfxtxs" ng-disabled="isNotEdit"
676
-														ng-options="enum.id as enum.value for enum in lqjsList" required
694
+														ng-options="enum.id as enum.value for enum in tfxtxsList" required
695
+														name="tfxtxs"
677 696
 														class="form-control">
678 697
 														<option value="">--请选择--</option>
679 698
 													</select>
@@ -686,8 +705,9 @@
686 705
 											</th>
687 706
 											<th>
688 707
 												<label class="select">
689
-													<select ng-model="basicStorehouse.tfxtxs" ng-disabled="isNotEdit"
708
+													<select ng-model="basicStorehouse.tfjs" ng-disabled="isNotEdit"
690 709
 														ng-options="enum.id as enum.value for enum in tfjsList" required
710
+														name="tfjs"
691 711
 														class="form-control">
692 712
 														<option value="">--请选择--</option>
693 713
 													</select>
@@ -700,6 +720,7 @@
700 720
 												<label class="select">
701 721
 													<select ng-model="basicStorehouse.scjs" ng-disabled="isNotEdit"
702 722
 														ng-options="enum.id as enum.value for enum in scjsList" required
723
+														name="scjs"
703 724
 														class="form-control">
704 725
 														<option value="">--请选择--</option>
705 726
 													</select>
@@ -712,6 +733,7 @@
712 733
 												<label class="select">
713 734
 													<select ng-model="basicStorehouse.kwjs" ng-disabled="isNotEdit"
714 735
 														ng-options="enum.id as enum.value for enum in kwjsList" required
736
+														name="kwjs"
715 737
 														class="form-control">
716 738
 														<option value="">--请选择--</option>
717 739
 													</select>
@@ -724,6 +746,7 @@
724 746
 												<label class="select">
725 747
 													<select ng-model="basicStorehouse.sfyjxxxhgz" ng-disabled="isNotEdit"
726 748
 														ng-options="enum.id as enum.value for enum in falseEnum2" required
749
+														name="sfyjxxxhgz"
727 750
 														class="form-control">
728 751
 														<option value="">--请选择--</option>
729 752
 													</select>
@@ -738,6 +761,7 @@
738 761
 												<label class="select">
739 762
 													<select ng-model="basicStorehouse.dlmxs" ng-disabled="isNotEdit"
740 763
 														ng-options="enum.id as enum.value for enum in dlmxsList" required
764
+														name="dlmxs"
741 765
 														class="form-control">
742 766
 														<option value="">--请选择--</option>
743 767
 													</select>