Kaynağa Gözat

Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

maopixin 2 yıl önce
ebeveyn
işleme
b7ef0df3dc

+ 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>

+ 8 - 5
src/main/resources/static/app/business/facility/views/add-facility-get.html

@@ -24,13 +24,14 @@
24 24
                                                     ng-disabled="isNotEdit" 
25 25
                                                     ng-readonly="isNotEdit"
26 26
                                                     ng-change="useKeepChange()"
27
+													required
27 28
                                                 >
28 29
 													<option value="">--请选择--</option>
29 30
                                                 </select> 
30 31
                                             </label>
31 32
                                         </section>
32 33
                                         <section class="col col-3">
33
-											<label class="label">设施分类:<span style="color: red;">*</span></label>
34
+											<label class="label">设施分类:</label>
34 35
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
35 36
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
36 37
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -52,7 +53,7 @@
52 53
 									</div>
53 54
 									<div class="row">
54 55
 										<section class="col col-3">
55
-											<label class="label">故障日期:</label>
56
+											<label class="label">故障日期:<span style="color: red;">*</span></label>
56 57
 											<label class="input">
57 58
 												<input 
58 59
                                                     id="repairInfo_gzrq" 
@@ -62,11 +63,12 @@
62 63
                                                     ng-disabled="isNotEdit" 
63 64
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
64 65
                                                     placeholder="故障日期:"
66
+													required
65 67
                                                 >
66 68
 											</label>
67 69
 										</section>
68 70
                                         <section class="col col-3">
69
-											<label class="label">维修开始日期:</label>
71
+											<label class="label">维修开始日期:<span style="color: red;">*</span></label>
70 72
 											<label class="input">
71 73
 												<input 
72 74
                                                     id="repairInfo_wxksrq" 
@@ -76,6 +78,7 @@
76 78
                                                     ng-disabled="isNotEdit" 
77 79
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
78 80
                                                     placeholder="维修开始日期"
81
+													required
79 82
                                                 >
80 83
 											</label>
81 84
 										</section>
@@ -94,9 +97,9 @@
94 97
 											</label>
95 98
 										</section>
96 99
 										<section class="col col-3">
97
-											<label class="label">维修负责人: </label>
100
+											<label class="label">维修负责人: <span style="color: red;">*</span></label>
98 101
 											<label class="input">
99
-												<input type="text" ng-model="repairInfo.wxfzr" name="wxfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="维修负责人">
102
+												<input required type="text" ng-model="repairInfo.wxfzr" name="wxfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="维修负责人">
100 103
 											</label>
101 104
 										</section>
102 105
                                     </div>

+ 8 - 5
src/main/resources/static/app/business/facility/views/add-facility-keep.html

@@ -24,13 +24,14 @@
24 24
                                                     ng-disabled="isNotEdit" 
25 25
                                                     ng-readonly="isNotEdit"
26 26
                                                     ng-change="useKeepChange()"
27
+                                                    required
27 28
                                                 >
28 29
 													<option value="">--请选择--</option>
29 30
                                                 </select> 
30 31
                                             </label>
31 32
                                         </section>
32 33
                                         <section class="col col-3">
33
-											<label class="label">设施分类:<span style="color: red;">*</span></label>
34
+											<label class="label">设施分类:</label>
34 35
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
35 36
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
36 37
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -52,7 +53,7 @@
52 53
 									</div>
53 54
 									<div class="row">
54 55
                                         <section class="col col-3">
55
-											<label class="label">保养开始日期:</label>
56
+											<label class="label">保养开始日期:<span style="color: red;">*</span></label>
56 57
 											<label class="input">
57 58
 												<input 
58 59
                                                     id="keepInfo_byksrq" 
@@ -62,11 +63,12 @@
62 63
                                                     ng-disabled="isNotEdit" 
63 64
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
64 65
                                                     placeholder="保养开始日期"
66
+                                                    required
65 67
                                                 >
66 68
 											</label>
67 69
 										</section>
68 70
 										<section class="col col-3">
69
-											<label class="label">保养结束日期:</label>
71
+											<label class="label">保养结束日期:<span style="color: red;">*</span></label>
70 72
 											<label class="input">
71 73
                                                 <input 
72 74
                                                     id="keepInfo_byjsrq" 
@@ -76,13 +78,14 @@
76 78
                                                     ng-disabled="isNotEdit" 
77 79
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
78 80
                                                     placeholder="保养结束日期"
81
+                                                    required
79 82
                                                 >
80 83
 											</label>
81 84
 										</section>
82 85
 										<section class="col col-3">
83
-											<label class="label">保养负责人: </label>
86
+											<label class="label">保养负责人:<span style="color: red;">*</span> </label>
84 87
 											<label class="input">
85
-												<input type="text" ng-model="keepInfo.byfzr" name="byfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="保养负责人">
88
+												<input type="text" ng-model="keepInfo.byfzr" name="byfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="保养负责人" required>
86 89
 											</label>
87 90
 										</section>
88 91
                                     </div>

+ 5 - 5
src/main/resources/static/app/business/facility/views/add-facility-scrap.html

@@ -24,7 +24,7 @@
24 24
                                             </label>
25 25
                                         </section>
26 26
                                         <section class="col col-3">
27
-											<label class="label"  id="devicename-label">设施类型:<span style="color: red;">*</span></label>
27
+											<label class="label"  id="devicename-label">设施类型:</label>
28 28
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
29 29
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
30 30
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -37,7 +37,7 @@
37 37
 					                            data-default-label="请选择" name="deviceName" 
38 38
 					                            multi-select="false"
39 39
 					                            select-only-leafs="true"
40
-					                            data-callback="selectOnly1Or2(item, selectedItems)" required>
40
+					                            data-callback="selectOnly1Or2(item, selectedItems)">
41 41
 					                        </multi-select-tree>
42 42
 											 <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="devicename-error"></span></em>
43 43
 											</label>
@@ -45,7 +45,7 @@
45 45
 									</div>
46 46
 									<div class="row">
47 47
 										<section class="col col-3">
48
-											<label class="label">设施状态</label>
48
+											<label class="label">设施状态: <span style="color: red;">*</span></label>
49 49
 											<label class="input">
50 50
 												<select required name="unite" ng-model="device.unit" ng-disabled="isNotEdit" ng-readonly="isNotEdit">
51 51
                                                     <option value="">--请选择--</option>
@@ -55,9 +55,9 @@
55 55
 											</label>
56 56
 										</section>
57 57
                                         <section class="col col-3">
58
-											<label class="label">报废日期:</label>
58
+											<label class="label">报废日期:<span style="color: red;">*</span></label>
59 59
 											<label class="input">
60
-												<input type="text" ng-model="device.inputTime" name="inputTime" data-smart-datepicker ng-disabled="isNotEdit"
60
+												<input required type="text" ng-model="device.inputTime" name="inputTime" data-smart-datepicker ng-disabled="isNotEdit"
61 61
 													   placeholder="报废日期">
62 62
 											</label>
63 63
 										</section>

+ 10 - 10
src/main/resources/static/app/business/facility/views/add-facility.html

@@ -20,7 +20,7 @@
20 20
                                             </label>
21 21
                                         </section>
22 22
                                         <section class="col col-3">
23
-											<label class="label"  id="devicename-label">设施分类:<span style="color: red;">*</span></label>
23
+											<label class="label"  id="devicename-label">设施分类:</label>
24 24
 											  <label class="select" id="deviceName-label">
25 25
 											 <multi-select-tree 
26 26
 					                            disabled-tree="isNotEdit"
@@ -29,7 +29,7 @@
29 29
 					                            data-default-label="请选择" name="ssfl" 
30 30
 					                            multi-select="false"
31 31
 					                            select-only-leafs="true"
32
-					                            data-callback="selectOnly1Or2(item, selectedItems)" required>
32
+					                            data-callback="selectOnly1Or2(item, selectedItems)">
33 33
 					                        </multi-select-tree>
34 34
 											 <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="devicename-error"></span></em>
35 35
 											</label>
@@ -49,31 +49,31 @@
49 49
 									</div>
50 50
 									<div class="row">
51 51
                                         <section class="col col-3">
52
-											<label class="label">竣工年份:</label>
52
+											<label class="label">竣工年份:<span style="color: red;">*</span></label>
53 53
 											<label class="input">
54 54
                                                 <input type="text" name="jgnf" id="facility_jgnf" ng-disabled="isNotEdit" ng-model="facilityInfo.jgnf"
55
-							                		class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" ng-readonly="true">
55
+							                		class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" ng-readonly="true" required>
56 56
 											</label>
57 57
 										</section>
58 58
 										<section class="col col-3">
59
-											<label class="label">安装时间:</label>
59
+											<label class="label">安装时间:<span style="color: red;">*</span></label>
60 60
 											<label class="input">
61 61
 												<input type="text" id="facility_azsj" name="azsj" ng-disabled="isNotEdit"  ng-model="facilityInfo.azsj"
62
-													   placeholder="安装时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
62
+													   placeholder="安装时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
63 63
 											</label>
64 64
 										</section>
65 65
 										<section class="col col-3">
66
-											<label class="label">调试时间: </label>
66
+											<label class="label">调试时间: <span style="color: red;">*</span></label>
67 67
 											<label class="input">
68 68
 												<input type="text" id="facility_tssj" name="tssj" ng-disabled="isNotEdit" ng-model="facilityInfo.tssj"
69
-													   placeholder="调试时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
69
+													   placeholder="调试时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
70 70
 											</label>
71 71
 										</section>
72 72
                                         <section class="col col-3">
73
-											<label class="label">验收时间:</label>
73
+											<label class="label">验收时间:<span style="color: red;">*</span></label>
74 74
 											<label class="input">
75 75
 												<input type="text" id="facility_yssj" name="yssj" ng-disabled="isNotEdit" ng-model="facilityInfo.yssj"
76
-													   placeholder="验收时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
76
+													   placeholder="验收时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
77 77
 											</label>
78 78
 										</section>
79 79
                                     </div>

+ 4 - 7
src/main/resources/static/app/intelligent/aeration/views/aerationJob-edit.html

@@ -359,13 +359,10 @@
359 359
 													<select ng-model="aerationJob.fwszfs" required name="fwszfs"
360 360
 													class="form-control" ng-disabled="isNotEdit">
361 361
 														<option value="">--请选择--</option>
362
-														<option value="1">地槽</option>
363
-														<option value="2">地上笼</option>
364
-														<option value="3">移动式</option>
365
-														<option value="4">箱式</option>
366
-														<option value="5">径向</option>
367
-														<option value="6">维持通风</option>
368
-														<option value="9">其他</option>
362
+														<option value="1">地上槽</option>
363
+														<option value="2">地下槽</option>
364
+														<option value="3">横向</option>
365
+														<option value="4">径向</option>
369 366
 													</select>
370 367
 												</label>
371 368
 											</th>

+ 1 - 1
src/main/resources/static/app/storage/controller/keepAccount/houseKeepAccountCtrl.js

@@ -301,7 +301,7 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
301 301
 	$scope.loadWare();
302 302
 
303 303
 
304
-	// $scope.butType = $stateParams.butType;
304
+	$scope.butType = $stateParams.butType;
305 305
 	$scope.edit = function() {
306 306
 		$scope.fcbgz = angular.fromJson($stateParams.account);
307 307
 		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");

+ 1 - 1
src/main/resources/static/app/storage/controller/keepAccount/keepTotalAccountCtrl.js

@@ -125,7 +125,7 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
125 125
 })
126 126
 .controller("keepTotalAccountEditCtrl", 
127 127
 		function($scope, $rootScope, $state, $stateParams, $filter, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
128
-
128
+	$scope.butType = $stateParams.butType;
129 129
 	// 获取列表日数据
130 130
 	$scope.edit = function() {
131 131
 		$scope.fcbgz = angular.fromJson($stateParams.account);

+ 0 - 209
src/main/resources/static/app/storage/controller/keepAccount/keepVoucherCtrl.js

@@ -1,209 +0,0 @@
1
-"use strict";
2
-
3
-//保管总账
4
-angular.module('app.storage').controller("keepVoucherCtrl", 
5
-		function($scope, $rootScope, $state, $stateParams, $filter, enumService, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
6
-
7
-	// 获取列表数据
8
-	$scope.pageInfo = {pageNum : 1, pageSize : 10};
9
-	$scope.search = {lspz:"", lsxz:"", startDate:"", endDate:""};
10
-	$scope.loadData = function() {
11
-		if($scope.search.lsxz != undefined && $scope.search.lsxz != ""){
12
-			$scope.search.lsxz = $scope.search.lsxz[0].id;
13
-   	 	}
14
-		keepAccountService.getSumAccountPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function(data){
15
-	        $scope.pageInfo = data;
16
-	        $scope.deptName = $rootScope.depotInfo.orgName;
17
-	        //获取记账人和审核人
18
-	        //$scope.getAccountRecord($scope.pageInfo.list);
19
-	    },function(data){
20
-	        console.log(data);
21
-	    });
22
-		//加载打印区域的数据
23
-		keepAccountService.getSumAccountPageInfo(null, null, $scope.search).then(function(data){
24
-	        $scope.pageInfos = data;
25
-	        $scope.printList = data.list;
26
-	        //获取记账人和审核人
27
-	        //$scope.getAccountRecord($scope.printList);
28
-	    },function(data){
29
-	        console.log(data);
30
-	    });
31
-		// 树形下拉框(粮食性质)
32
-        enumService.getTreeListByTypeId($scope.search.lsxz, 1032).then(function(data) {
33
-        	var data_new = $scope.data_add(data);
34
-            $scope.grainAttributeTreeData = data_new;
35
-        },function(data) {
36
-            console.log(data);
37
-        });
38
-	}
39
-	$scope.loadData();
40
-
41
-	$scope.data_add = function(data) {
42
-    	//var data_new = $scope.data_add(data);
43
-		var e = [];
44
-    	if (data.length != 0) {
45
-    		//要插入的json对象串
46
-    		var a = {"id":null,"name":"请选择","children":[]};
47
-    		//将返回的json对象和要插入的json对象串转换为字符串格式
48
-    		var f = angular.toJson(a);
49
-    		var b = angular.toJson(data);
50
-    		//把要插入的json对象串插入返回数据的最前面
51
-    		var c = b.substring(0,1);
52
-    		var d = b.substring(1,b.length);
53
-    		e = c + f + "," + d;
54
-    	}
55
-    	//最后在转换为json对象返回去
56
-    	return angular.fromJson(e);
57
-	}
58
-
59
-	$scope.getAccountRecord = function (pageInfo) {
60
-		if (pageInfo != null || pageInfo.length != 0) {
61
-			var obj;
62
-			var rq;
63
-			for (var i = 0; i < pageInfo.length; i++) {
64
-				obj = pageInfo[0];
65
-				rq = $filter('date')(obj.rq, "yyyy-MM");
66
-				keepAccountService.accountingRecord(obj.ch, obj.hwh, obj.lspz, obj.hwxz, rq, obj.wjh, obj.remark, 1).then(function(data){
67
-					$scope.account = data.obj;
68
-					obj.accountingPerson = $scope.account.accountingPerson;//记账人
69
-					obj.auditor = $scope.account.auditor;//审核人
70
-				},function(data){
71
-					console.log(data);
72
-				});
73
-			}
74
-		}
75
-	}
76
-
77
-	// 翻页
78
-	$scope.goPage = function(pageNum) {
79
-		$scope.pageInfo.pageNum = pageNum;
80
-		$scope.loadData();
81
-	}
82
-
83
-    //页面跳转
84
-    $scope.edit = function(account, butType) {
85
-		var obj_str = angular.toJson(account);
86
-		$scope.fcbgz = angular.fromJson(obj_str);
87
-		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM");
88
-		if (butType != 3) { //记账、审核、查看
89
-			keepAccountService.accountingRecord(null, null, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
90
-				$scope.account = data.obj;
91
-				if (butType == 0) { //记账
92
-					if (data.obj.id != null || data.obj.id != undefined) {
93
-						alert("当前记录已记账!");
94
-						return;
95
-					}
96
-				} else if (butType == 1) { //审核
97
-					if (data.obj.id == null || data.obj.id == undefined) {
98
-						alert("当前记录还尚未记账,请先记账!");
99
-						return;
100
-					} else {
101
-						if (data.obj.auditor != null || data.obj.auditor != undefined) {
102
-							alert("当前记录已审核!");
103
-							return;
104
-						}
105
-					}
106
-				} else if (butType == 2) { //查看
107
-					if (data.obj.id == null || data.obj.id == undefined) {
108
-						alert("当前记录还尚未记账,请先记账!");
109
-						return;
110
-					}
111
-				}
112
-				$state.go('app.storage.account.keepTotalAccount.keepTotalAccountEdit',{account:angular.toJson(account), butType:butType});
113
-			},function(data){
114
-		        console.log(data);
115
-		    });
116
-		} else { //分仓账
117
-			$state.go('app.storage.account.houseKeepAccount',{account:angular.toJson(account), type:butType});
118
-		}
119
-	}
120
-	//打印
121
-	$scope.print = function() {
122
-		$("#print").printArea();
123
-	}
124
-	
125
-})
126
-.controller("keepTotalAccountEditCtrl", 
127
-		function($scope, $rootScope, $state, $stateParams, $filter, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
128
-
129
-	// 获取列表日数据
130
-	$scope.edit = function() {
131
-		$scope.fcbgz = angular.fromJson($stateParams.account);
132
-		$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
133
-		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM");
134
-		keepAccountService.accountingRecord($scope.fcbgz.ch, $scope.fcbgz.hwh, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
135
-			$scope.account = data.obj;
136
-
137
-			if ($stateParams.butType == 0) { //记账
138
-				//初始化数据记账表对象数据
139
-				$scope.account.lspz = $scope.fcbgz.lspz;
140
-				$scope.account.hwxz = $scope.fcbgz.hwxz;
141
-				$scope.account.rq = rq;
142
-				$scope.account.srsl = $scope.fcbgz.srsl;
143
-				$scope.account.zcsl = $scope.fcbgz.zcsl;
144
-				$scope.account.kcsl = $scope.fcbgz.kcsl;
145
-				$scope.account.accountingPerson = $rootScope.userInfo.realName; //记账人
146
-				$scope.account.accountingDate = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
147
-				$scope.account.remark = $scope.fcbgz.remark; //摘要
148
-				$scope.account.wjh = $scope.fcbgz.wjh; //文件号
149
-				//设置状态为记账
150
-				//$scope.accountType = 0;
151
-
152
-				//影藏审核信息
153
-				$scope.auditor_th = true;
154
-			} else if ($stateParams.butType == 1) { //审核
155
-				//设置记账时间格式化和不可编辑
156
-				$scope.account.accountingDate = $filter('date')($scope.account.accountingDate, "yyyy-MM-dd");
157
-				$scope.accounting_isNotEdit = true;
158
-				//显示审核信息
159
-				$scope.auditor_th = false;
160
-				//设置审核人为当前用户,审核时间为当前时间
161
-				$scope.account.auditor = $rootScope.userInfo.realName;
162
-				$scope.account.auditorDate = $filter('date')(new Date(), "yyyy-MM-dd");
163
-			} else if ($stateParams.butType == 2) { //查看
164
-				//设置记账时间格式化和不可编辑
165
-				$scope.account.accountingDate = $filter('date')($scope.account.accountingDate, "yyyy-MM-dd");
166
-				$scope.accounting_isNotEdit = true;
167
-				//显示审核信息
168
-				$scope.auditor_th = false;
169
-				//审核信息设置不可编辑
170
-				$scope.account.auditorDate = $filter('date')($scope.account.auditorDate, "yyyy-MM-dd");
171
-				$scope.auditor_isNotEdit = true;
172
-				//提交按钮影藏
173
-				$scope.isNotEdit = true;
174
-			}
175
-			//初始分仓保管账表对象数据
176
-			$scope.fcbgz.hwxz = $rootScope.dicData[$scope.fcbgz.hwxz];
177
-			$scope.fcbgz.lspz = $rootScope.dicData[$scope.fcbgz.lspz];
178
-			$scope.fcbgz.dj = $rootScope.dicData[$scope.fcbgz.dj];
179
-			$scope.fcbgz.rq = rq;
180
-		},function(data){
181
-	        console.log(data);
182
-	    });
183
-
184
-	}
185
-	$scope.edit();
186
-	
187
-	//提交
188
-	$scope.submit = function() {
189
-		keepAccountService.submit($scope.account, 1, $rootScope.orgInfo.orgId).then(function(data){
190
-			if (data.status = 'success') {
191
-				alert(data.msg);
192
-			} else {
193
-				alert("保存失败!");
194
-			}
195
-			$scope.retList();
196
-		},function(data){
197
-			alert("保存失败!");
198
-	    });
199
-	}
200
-	
201
-	//返回
202
-    $scope.retList = function () {
203
-		if ($rootScope.previousState_name != '') {
204
-        	$rootScope.back();
205
-        } else {
206
-        	$state.go('app.storage.account.keepTotalAccount');
207
-        }
208
-    }
209
-});

+ 7 - 2
src/main/resources/static/app/storage/controller/safeProduceDangerHandle.js

@@ -4,7 +4,7 @@ angular
4 4
   .module("app.storage")
5 5
   .controller(
6 6
     "safeProduceDangerHandle",
7
-    function ($scope, $state, $rootScope, safeDangerHandleService) {
7
+    function ($scope, $state, $rootScope, safeDangerHandleService, $filter) {
8 8
       $scope.pageInfo = { pageNum: 1, pageSize: 10 };
9 9
       $scope.orgName = $rootScope.depotInfo.orgName;
10 10
       $scope.loadData = function () {
@@ -86,7 +86,8 @@ angular
86 86
       $rootScope,
87 87
       safeDangerHandleService,
88 88
       StorehouseService,
89
-      $stateParams
89
+      $stateParams,
90
+      $filter
90 91
     ) {
91 92
       $scope.orgName = $rootScope.depotInfo.orgName;
92 93
       $scope.insertDanger = {
@@ -129,6 +130,10 @@ angular
129 130
             .queryById($stateParams.id)
130 131
             .then(function (data) {
131 132
               $scope.insertDanger = data.data;
133
+              if($scope.insertDanger.solveTime) {
134
+                $scope.insertDanger.solveTime = $filter('date')($scope.insertDanger.solveTime, "yyyy-MM-dd");
135
+                $scope.insertDanger.solveTime = $scope.insertDanger.solveTime.slice(0, 10);
136
+              }
132 137
             });
133 138
         }
134 139
       };

+ 7 - 7
src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -378,7 +378,7 @@
378 378
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内宽</td>
379 379
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.width}}</td>
380 380
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">建卡日期</td>
381
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
381
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate | date:'yyyy-MM-dd'}}</td>
382 382
                                                 
383 383
                                                 <!--小麦及混合小麦3164,玉米3165,大豆2777,稻谷3166-->
384 384
 
@@ -423,9 +423,9 @@
423 423
                                             </tr>
424 424
                                             <tr>
425 425
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">状态</td>
426
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封</td>
426
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封</td>
427 427
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">存储类型</td>
428
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.storeType == 1 ? "直储" : "代储"}}</td>
428
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
429 429
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">收储地点</td>
430 430
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">库内</td>
431 431
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">计价数量</td>
@@ -435,11 +435,11 @@
435 435
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
436 436
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.slice(0, 4)}}</td>
437 437
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
438
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.looseGrainVolume}}</td>
438
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
439 439
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">包存粮包数</td>
440
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainPacks}}</td>
440
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainPacks}}</td>
441 441
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
442
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
442
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
443 443
                                             </tr>
444 444
                                             <!-- <tr>
445 445
                                                 
@@ -461,7 +461,7 @@
461 461
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计仓容</td>
462 462
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.designCapacity}}</td>
463 463
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">备注</td>
464
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{grainCardView.remark}}</td>
464
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{GrainCardByIdObj.remark}}</td>
465 465
                                             </tr>
466 466
                                            
467 467
                                             <table class="table table-striped table-bordered table-hover"

+ 77 - 9
src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html

@@ -27,7 +27,7 @@
27 27
                                     <table class="table table-striped table-bordered table-hover" width="100%">
28 28
                                         <tr>
29 29
                                             <th width='10%'>
30
-                                                <label class="label" style="margin-top: 9px;text-align: center;">仓房名称<span style="color: red;">*</span></label>
30
+                                                <label class="label" style="margin-top: 9px;text-align: center;">仓房名称:<span style="color: red;">*</span></label>
31 31
                                             </th>
32 32
                                             <th width='20%'>
33 33
                                                 <section>
@@ -43,7 +43,7 @@
43 43
                                                 </section>
44 44
                                             </th>
45 45
                                             <th width='10%'>
46
-                                                <label class="label" style="margin-top: 9px;text-align: center;">货位名称<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
46
+                                                <label class="label" style="margin-top: 9px;text-align: center;">货位名称:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
47 47
                                             </th>
48 48
                                             <th width='20%'>
49 49
                                                 <section>
@@ -59,7 +59,7 @@
59 59
                                                 </section>
60 60
                                             </th>
61 61
                                             <th width='10%'>
62
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种<span style="color: red;">*</span></label>
62
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种:<span style="color: red;">*</span></label>
63 63
                                             </th>
64 64
                                             <th width='20%'>
65 65
                                                 <section>
@@ -72,7 +72,7 @@
72 72
                                         </tr>
73 73
                                         <tr>
74 74
                                             <th>
75
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期<span style="color: red;">*</span></label>
75
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期:<span style="color: red;">*</span></label>
76 76
                                             </th>
77 77
                                             <th>
78 78
                                                 <section>
@@ -84,7 +84,7 @@
84 84
                                                 </section>
85 85
                                             </th>
86 86
                                             <th>
87
-                                                <label class="label" style="margin-top: 9px;text-align: center;">类型<span style="color: red;">*</span></label>
87
+                                                <label class="label" style="margin-top: 9px;text-align: center;">类型:<span style="color: red;">*</span></label>
88 88
                                             </th>
89 89
                                             <th width='20%'>
90 90
                                                 <section>
@@ -99,7 +99,7 @@
99 99
                                                 </section>
100 100
                                             </th>
101 101
                                             <th style="border-bottom-width:1px">
102
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)</label>
102
+                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨):</label>
103 103
                                             </th>
104 104
                                             <th style="border-bottom-width:1px">
105 105
                                                 <section>
@@ -110,9 +110,51 @@
110 110
                                                 </section>
111 111
                                             </th>
112 112
                                         </tr>
113
+
114
+
115
+                                        <tr>
116
+                                            <th>
117
+                                                <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
118
+                                            </th>
119
+                                            <th>
120
+                                                <section>
121
+                                                    <label class="input">
122
+                                                        <input type="text" ng-model="grainCard.looseGrainVolume"
123
+                                                               name="looseGrainVolume" class="form-control">
124
+                                                    </label>
125
+                                                </section>
126
+                                            </th>
127
+                                            <th>
128
+                                                <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
129
+                                            </th>
130
+                                            <th>
131
+                                                <section>
132
+                                                    <label class="select">
133
+                                                        <select ng-model="grainCard.storeType" name="storeType">
134
+                                                            <option value="">--请选择--</option>
135
+                                                            <option value="1">直储</option>
136
+                                                            <option value="2">代储</option>
137
+                                                        </select><i></i>
138
+                                                    </label>
139
+                                                </section>
140
+                                            </th>
141
+                                            <th style="border-bottom-width:1px">
142
+                                                <label class="label" style="margin-top: 9px;text-align: center;">包存粮包数:</label>
143
+                                            </th>
144
+                                            <th style="border-bottom-width:1px">
145
+                                                <section>
146
+                                                    <label class="input">
147
+                                                        <input type="text" ng-model="grainCard.grainPacks"
148
+                                                               name="grainPacks" class="form-control">
149
+                                                    </label>
150
+                                                </section>
151
+                                            </th>
152
+                                        </tr>
153
+
154
+                                        
113 155
                                         <tr>
114 156
                                             <th>
115
-                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度</label>
157
+                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度:</label>
116 158
                                             </th>
117 159
                                             <th style="border-bottom-width:1px">
118 160
                                                 <section>
@@ -123,7 +165,7 @@
123 165
                                                 </section>
124 166
                                             </th>
125 167
                                             <th>
126
-                                                <label class="label" style="margin-top: 9px;text-align: center;">轮换协议编号</label>
168
+                                                <label class="label" style="margin-top: 9px;text-align: center;white-space: nowrap;">轮换协议编号:</label>
127 169
                                             </th>
128 170
                                             <th style="border-bottom-width:1px">
129 171
                                                 <section>
@@ -133,7 +175,33 @@
133 175
                                                     </label>
134 176
                                                 </section>
135 177
                                             </th>
136
-                                            <th colspan="2"></th>
178
+                                            <th>
179
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
180
+                                            </th>
181
+                                            <th style="border-bottom-width:1px">
182
+                                                <section>
183
+                                                    <label class="select">
184
+                                                        <select ng-model="grainCard.grainRights" name="grainRights" required>
185
+                                                            <option value="">--请选择--</option>
186
+                                                            <option value="1">市粮食局</option>
187
+                                                            <option value="2">{{orgInfo.orgName}}</option>
188
+                                                        </select><i></i>
189
+                                                    </label>
190
+                                                </section>
191
+                                            </th>
192
+                                        </tr>
193
+                                        <tr>
194
+                                            <th>
195
+                                                <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
196
+                                            </th>
197
+                                            <th style="border-bottom-width:1px" colspan="5">
198
+                                                <section>
199
+                                                    <label class="input">
200
+                                                        <input type="text" ng-model="grainCard.remark"
201
+                                                               name="remark" class="form-control">
202
+                                                    </label>
203
+                                                </section>
204
+                                            </th>
137 205
                                         </tr>
138 206
                                     </table>
139 207
                                     <div>

+ 15 - 12
src/main/resources/static/app/storage/views/safeproduce/safeDangerHandle-edit.html

@@ -51,7 +51,7 @@
51 51
                     </section>
52 52
                     <section class="form-group col col-3">
53 53
                       <label class="label"
54
-                        >整改时限<span style="color: red">*</span></label
54
+                        >整改时限</label
55 55
                       >
56 56
                       <label class="select">
57 57
                         <input
@@ -159,18 +159,16 @@
159 159
                   </div>
160 160
                   <div class="row">
161 161
                     <section class="col col-12" style="width: 100%">
162
-                      <label class="label"
163
-                        >隐患整改验收信息<span style="color: red"
164
-                          >*</span
165
-                        ></label
166
-                      >
162
+                      <label class="label">隐患整改信息<span style="color: red"
163
+                        >*</span
164
+                      ></label>
167 165
                       <label class="input">
168 166
                         <input
167
+                          required
169 168
                           type="text"
170
-                          ng-model="insertDanger.riskSolve"
169
+                          ng-model="insertDanger.solveCheckInfo"
171 170
                           ng-disabled="isNotEdit"
172
-                          required
173
-                          name="riskSolve"
171
+                          name="solveCheckInfo"
174 172
                         />
175 173
                       </label>
176 174
                     </section>
@@ -193,13 +191,18 @@
193 191
                   </div>
194 192
                   <div class="row">
195 193
                     <section class="col col-12" style="width: 100%">
196
-                      <label class="label">整改验收信息</label>
194
+                      <label class="label"
195
+                        >隐患整改验收信息<span style="color: red"
196
+                          >*</span
197
+                        ></label
198
+                      >
197 199
                       <label class="input">
198 200
                         <input
199 201
                           type="text"
200
-                          ng-model="insertDanger.solveCheckInfo"
202
+                          ng-model="insertDanger.riskSolve"
201 203
                           ng-disabled="isNotEdit"
202
-                          name="solveCheckInfo"
204
+                          required
205
+                          name="riskSolve"
203 206
                         />
204 207
                       </label>
205 208
                     </section>