查询追溯-质量查询

src/main/resources/static/app/home/controller/headerCtrl.js

@@ -239,9 +239,9 @@ angular.module('app.system').controller("headerCtrl",
 
 	//跳转到查询追溯原型页
 	$scope.skipLqBugList = function (a) {
-		if(a ==3 ) {
+		/* if(a ==3 ) {
 			console.log('这是查询追溯跳转按钮')
-		}
+		} */
 		$state.go("app.additionalHome.traceability")
 	};
 	 

src/main/resources/static/app/home/views/daibsx copy.html

@@ -1,10 +1,8 @@
 <div class="col-sm-12 home-module" ng-controller="daibsxCtrl" style="margin-top:8px;height:20%">
-
-    <div class="col-center col-center-1" style="height:100%;padding-top: 45.49%;">
-       <div style="position: absolute;top:10px;left:10px;font-size:15px;color:#333;font-weight:500;height:100%;width:100%">
-        <img style="height:80%;width:100%" src="styles/img/home-1/kczl_old.png" alt="">
+    <div class="col-center col-center-5" style="height:100%;padding-top: 45.49%;">
+        <h3 style="position: absolute;top:0px;left:5px;font-size:15px;color:#333;">库存总量</h3>
+        <div style="position: absolute;top:25px;left:8px;font-size:15px;color:#333;font-weight:500;text-align:center;height:83%;width:94%">
+            <img style="height:80%;width:90%" src="styles/img/home-1/01kucunshuliang.png" alt="">
+        </div>
     </div>
-     
-    </div>
-
 </div>

src/main/resources/static/app/layout/layout.tpl.html

@@ -14,7 +14,7 @@
     <demo-states></demo-states>
 
     <!-- RIBBON -->
-    <div id="ribbon">
+    <div id="ribbon" >
 
 				<!--由于不需要刷新功能。所以去除刷新按钮-->
 				<!--<span class="ribbon-button-alignment">-->
@@ -27,6 +27,7 @@
 
         <!-- breadcrumb -->
         <state-breadcrumbs></state-breadcrumbs>
+        <div style=" float:right; min-height: 40px; color:#fff; margin-right:10px;line-height:40px;">当前所在粮库：株洲县禄口中心库</div> 
         <!-- end breadcrumb -->
         
        <!-- <form class="navbar-form navbar-right" ng-show="childSysId==19" style="margin:4px 20px" ng-controller="switchStoreCtrl">

src/main/resources/static/app/layout/partials/header.tpl.html

@@ -84,7 +84,7 @@
 						</div> -->
 						<div has-func="23" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==23]">
 							<!-- <a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')"> -->
-							<a href-void ng-click="skipLqBugList(3)">
+							<a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')">
 								<i class="nav-icon" style='position: relative;top:7px'><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
 								查询追溯</a>
                             <i class="nav-feng-line"></i>

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -1385,6 +1385,7 @@
                             </li>
                         </ul>
                     </li>
+
                     <!--结束-->
                     <!--粮食安全追溯-->
                     <li data-menu-collapse>
@@ -1410,6 +1411,45 @@
                         </ul>
                     </li>
                     <!--结束-->
+                    <!--  -->
+                    <!-- 演示新加页面 -->
+                    <li data-menu-collapse>
+                        <a href="#">
+                            <i class="fa fa-lg fa-fw fa-folder-open"></i>质量查询追溯
+                        </a>
+                        <ul>
+                            <li data-ui-sref-active="active">
+                                <a data-ui-sref="app.synth.warehouseSource1">库内粮食质量溯源</a>
+                            </li>
+                            <li data-ui-sref-active="active">
+                                <a data-ui-sref="app.synth.historyInventory">历史库存质量追溯</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <li data-menu-collapse>
+                        <a has-func="213" href="#">
+                            <i class="fa fa-lg fa-fw fa-folder-open"></i>质量事件管理
+                        </a>
+                        <ul>
+                            <li has-func="210" data-ui-sref-active="active">
+                                <a data-ui-sref="app.archive.synth.qualityEvent">质量事件数据管理</a>
+                            </li>
+                            <li has-func="214" data-ui-sref-active="active">
+                                <a data-ui-sref="app.synth.lifecycle">质量事件追溯分析</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <!-- 成品粮条码管理 -->
+                    <li data-menu-collapse>
+                        <a has-func="213" href="#">
+                            <i class="fa fa-lg fa-fw fa-folder-open"></i>成品粮条码管理
+                        </a>
+                        <ul>
+                            <li has-func="210" data-ui-sref-active="active">
+                                <a data-ui-sref="app.archive.synth.qualityEvent">成品粮条码</a>
+                            </li>
+                        </ul>
+                    </li>
                 </ul>
             </li>
 

src/main/resources/static/app/synth/lifecycle/views/historyInventory-result.html

@@ -0,0 +1,48 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+
+	<!-- widget grid -->
+	<section id="widget-grid" widget-grid>
+
+		<!-- START ROW -->
+		<div class="row">
+
+			<!-- NEW COL START -->
+			<article class="col-sm-12 col-md-12 col-lg-12">
+
+				<!-- Widget ID (each widget will need unique ID)-->
+				<div jarvis-widget id="form-grid-widget"
+					data-widget-colorbutton="false" data-widget-editbutton="false"
+					data-widget-custombutton="false">
+
+					<!-- widget div-->
+					<div>
+
+						<!-- widget content -->
+						<div class="widget-body no-padding">
+							<form id="basicStorehouse-form" name='basicStorehouse-form'
+								class="smart-form ng-pristine ng-valid"
+								ng-submit='basicStorehouse-form.$valid&&save(basicStorehouse)'
+								novalidate="novalidate">
+								<header>
+									<a href-void class="btn btn-default btn-xs" ng-click="returnTop()">
+										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+									</a>
+									<!-- &nbsp;<strong>查看</strong> -->
+								</header>
+								<section>
+									<div>
+										<img src="styles/img/newPage/historyResult-1.png" alt="">
+										<img src="styles/img/newPage/historyResult-2.png" alt="">
+									</div>
+								</section>
+								<footer class="modal-footer text-align-center">
+									<button ng-click="returnTop()" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
+								</footer>
+							</form>
+						</div>
+					</div>
+			</article>
+		</div>
+	</section>
+</div>

src/main/resources/static/app/synth/lifecycle/views/historyInventory.html

@@ -0,0 +1,27 @@
+<div class="container">
+    <div class="row">
+        <div class="col-xs-8 col-xs-offset-2 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4 text-center animated fadeInDown">
+            <p>&nbsp;</p>
+            <p>&nbsp;</p>
+            <p>&nbsp;</p>
+            <div>
+                <h1 class="logo-name">请输入唯一识别码</h1>
+            </div>
+            <h3>粮食专卡编号</h3>
+            <p>&nbsp;</p>
+            <p>&nbsp;</p>
+            <p>&nbsp;</p>
+
+            <form class="m-t" role="form" action="#">
+                <div class="form-group">
+                    <input type="text" ng-model="idCode" class="form-control" placeholder="请输入粮食专卡编号(282839300191)" required="">
+                </div>
+                <button type="submit" class="btn btn-primary btn-block m-b"
+                        data-ui-sref="app.synth.historyResult">查找</button>
+
+                <br/>
+                <br/>
+            </form>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/synth/module.js

@@ -383,4 +383,54 @@ angular.module('app.synth',[ 'ui.router', 'datatables', 'datatables.bootstrap' ]
 				}
 			}
 		})
+		// 演示原型添加
+		.state('app.synth.warehouseSource1', {
+			url : '/synth/warehouseSource1',
+			data : {
+				title : '以入库为源头追溯列表'
+			},
+			views : {
+				"content@app" : {
+					controller : 'warehouseSourceCtrl',
+					templateUrl : 'app/synth/qualityTrace/views/warehouseSource-list1.html'
+				}
+			}
+		})
+		.state('app.synth.warehouseSource1.view', {
+			url : '/synth/warehouseSource1/view/:fcbgz/:btnType',
+			data : {
+				title : '查看'
+			},
+			views : {
+				"content@app" : {
+					controller : 'warehouseSourceViewCtrl',
+					templateUrl : 'app/synth/qualityTrace/views/warehouseSource-view2.html'
+				}
+			}
+		})
+		// 历史库存质量追溯
+		.state('app.synth.historyInventory', {
+			url: '/synth/historyInventory',//识别码用到
+			data: {
+				title: '历史库存质量追溯'
+			},
+			views: {
+				"content@app": {
+					templateUrl: 'app/synth/lifecycle/views/historyInventory.html'
+				}
+			}
+		})
+		// 历史库存质量追溯 -搜索结果
+		.state('app.synth.historyResult', {
+			url : '/synth/historyResult',
+			data : {
+				title : '查看'
+			},
+			views : {
+				"content@app" : {
+					controller : 'warehouseSourceViewCtrl',
+					templateUrl : 'app/synth/lifecycle/views/historyInventory-result.html'
+				}
+			}
+		})
 });

src/main/resources/static/app/synth/newQuery/controller/grainsyCtrl.js

@@ -0,0 +1,7 @@
+"use strict";
+// 已入库为源头追溯列表
+angular.module('app.synth').controller("grainsyCtrl",function ($scope, $rootScope, $state, $filter, 
+		warehouseService, fcbgzService) {
+
+	
+});

src/main/resources/static/app/synth/newQuery/views/grainsy-list.html

@@ -0,0 +1,121 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+	<!-- widget grid -->
+	<section widget-grid id="widget-grid">
+		<div class="row">
+			<article class="col-sm-12">
+
+				<div jarvis-widget id="standard-datatable-widget"
+					data-widget-color="darken" data-widget-editbutton="false">
+					<header>
+						<span class="widget-icon"> <i class="fa fa-table"></i>
+						</span>
+						<h2>以入库为源头追溯查询列表</h2>
+					</header>
+					<div>
+						<div class="widget-body no-padding">
+							<div id="DataTables_Table_1_wrapper"
+								class="dataTables_wrapper form-inline no-footer">
+								<div class="dt-toolbar">
+									<div class="col-xs-12 col-sm-9">
+										<div class="form-group">
+											<label>
+												仓房名称:
+												<select ng-model="storehouseId"
+													ng-options="storehouse.storehouseId as storehouse.storehouseName for storehouse in store_tank_list"
+													class="form-control input-sm" ng-change="getWareList(storehouseId)">
+														<option value="">--请选择--</option>
+												</select>&emsp;
+											</label>
+											<label>
+												货位名称:
+												<select ng-model="wareId" class="form-control input-sm" 
+													ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
+													<option value="">请选择</option>
+												</select>&emsp;
+											</label>
+											<a class="btn btn-default btn-sm" ng-click="loadData()">
+												<i class="fa fa-search"></i>&nbsp;查&nbsp;询
+											</a>&emsp;
+										</div>
+									</div>
+									<div class="col-sm-3 col-xs-6 hidden-xs">
+										<div class="dataTables_length">
+											<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"
+												ng-options="num as num for num in [1,10,25,50,100]"
+												class="form-control input-sm"></select> 条
+											</label>
+										</div>
+									</div>
+								</div>
+
+								<table class="table table-striped table-bordered table-hover"
+									width="100%">
+									<thead>
+										<tr>
+				                            <th>序号</th>
+				                            <th>粮库名称</th>
+				                            <th>仓房名称</th>
+				                            <th>粮油品种</th>
+				                            <th>库存数量</th>
+				                            <th>收获年度</th>
+				                            <th>入仓时间</th>
+				                            <th>操作</th>
+				                        </tr>
+									</thead>
+
+									<tbody>
+										<tr ng-repeat="fcbgz in pageInfo.list">
+											<td>{{$index+1}}</td>
+											<td>{{fcbgz.lkmc}}</td>
+											<td>{{storehouseObj[fcbgz.ch].storehouseName}}</td>
+											<td>{{dicData[fcbgz.pz]}}</td>
+											<td>{{fcbgz.kcsl}}</td>
+											<td>{{dicData[fcbgz.scnf]}}</td>
+											<td>{{fcbgz.cjsj | date :'yyyy/MM/dd'}}</td>
+											<td>
+											    <a href-void ng-click="view(fcbgz, '1')"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+												<a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
+											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp;
+<!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->
+											</td>
+										</tr>
+									</tbody>
+
+								</table>
+								<div smart-include="app/layout/partials/page.tpl.html"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</article>
+		</div>
+
+	</section>
+
+</div>
+
+<!-- Modal -->
+<div class="modal fade" id="jyxxDetail_Model" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">&times;</button>
+				<h4 class="modal-title" id="myModalLabel">化验详情</h4>
+			</div>
+			<div class="modal-body">
+				<div smart-include="app/synth/qualityTrace/views/jyxxDetail.html"></div>
+			</div>
+			<div class="modal-footer">
+<!-- 				<button ng-click="save()" type="button" class="btn btn-primary">提交</button> -->
+				<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+

src/main/resources/static/app/synth/newQuery/views/grainsy-view.html

@@ -0,0 +1,7 @@
+<div id="content">
+
+	<!-- widget grid -->
+	<section id="widget-grid" widget-grid>
+        <h3>库内粮食质量追溯 -查看</h3>
+	</section>
+</div>

src/main/resources/static/app/synth/qualityTrace/controller/warehouseSourceCtrl.js

@@ -77,6 +77,8 @@ angular.module('app.synth').controller("warehouseSourceCtrl",function ($scope, $
     		$state.go('app.storage.safeproduce.safeCheck.ttplist',{houseId:ch});
     	} else if (btnType == 4) {
     		$state.go("app.supervise.operation.ccZy", {houseId: parseInt(obj.ch)});
+    	} else if (btnType == 123) {// 演示新增
+    		$state.go("app.synth.warehouseSource1.view", {houseId: parseInt(obj.ch)});
     	}
     }
 

src/main/resources/static/app/synth/qualityTrace/views/warehouseSource-list1.html

@@ -0,0 +1,121 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+	<!-- widget grid -->
+	<section widget-grid id="widget-grid">
+		<div class="row">
+			<article class="col-sm-12">
+
+				<div jarvis-widget id="standard-datatable-widget"
+					data-widget-color="darken" data-widget-editbutton="false">
+					<header>
+						<span class="widget-icon"> <i class="fa fa-table"></i>
+						</span>
+						<h2>库内粮食质量溯源</h2>
+					</header>
+					<div>
+						<div class="widget-body no-padding">
+							<div id="DataTables_Table_1_wrapper"
+								class="dataTables_wrapper form-inline no-footer">
+								<div class="dt-toolbar">
+									<div class="col-xs-12 col-sm-9">
+										<div class="form-group">
+											<label>
+												仓房名称:
+												<select ng-model="storehouseId"
+													ng-options="storehouse.storehouseId as storehouse.storehouseName for storehouse in store_tank_list"
+													class="form-control input-sm" ng-change="getWareList(storehouseId)">
+														<option value="">--请选择--</option>
+												</select>&emsp;
+											</label>
+											<label>
+												货位名称:
+												<select ng-model="wareId" class="form-control input-sm" 
+													ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
+													<option value="">请选择</option>
+												</select>&emsp;
+											</label>
+											<a class="btn btn-default btn-sm" ng-click="loadData()">
+												<i class="fa fa-search"></i>&nbsp;查&nbsp;询
+											</a>&emsp;
+										</div>
+									</div>
+									<div class="col-sm-3 col-xs-6 hidden-xs">
+										<div class="dataTables_length">
+											<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"
+												ng-options="num as num for num in [1,10,25,50,100]"
+												class="form-control input-sm"></select> 条
+											</label>
+										</div>
+									</div>
+								</div>
+
+								<table class="table table-striped table-bordered table-hover"
+									width="100%">
+									<thead>
+										<tr>
+				                            <th>序号</th>
+				                            <th>粮库名称</th>
+				                            <th>仓房名称</th>
+				                            <th>粮油品种</th>
+				                            <th>库存数量</th>
+				                            <th>收获年度</th>
+				                            <th>入仓时间</th>
+				                            <th>操作</th>
+				                        </tr>
+									</thead>
+
+									<tbody>
+										<tr ng-repeat="fcbgz in pageInfo.list">
+											<td>{{$index+1}}</td>
+											<td>{{fcbgz.lkmc}}</td>
+											<td>{{storehouseObj[fcbgz.ch].storehouseName}}</td>
+											<td>{{dicData[fcbgz.pz]}}</td>
+											<td>{{fcbgz.kcsl}}</td>
+											<td>{{dicData[fcbgz.scnf]}}</td>
+											<td>{{fcbgz.cjsj | date :'yyyy/MM/dd'}}</td>
+											<td>
+											    <a href-void ng-click="view(fcbgz, '123')"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+												<!-- <a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
+											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp; -->
+<!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->
+											</td>
+										</tr>
+									</tbody>
+
+								</table>
+								<div smart-include="app/layout/partials/page.tpl.html"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</article>
+		</div>
+
+	</section>
+
+</div>
+
+<!-- Modal -->
+<div class="modal fade" id="jyxxDetail_Model" tabindex="-1" role="dialog"
+	aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">&times;</button>
+				<h4 class="modal-title" id="myModalLabel">化验详情</h4>
+			</div>
+			<div class="modal-body">
+				<div smart-include="app/synth/qualityTrace/views/jyxxDetail.html"></div>
+			</div>
+			<div class="modal-footer">
+<!-- 				<button ng-click="save()" type="button" class="btn btn-primary">提交</button> -->
+				<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+

src/main/resources/static/app/synth/qualityTrace/views/warehouseSource-view2.html

@@ -0,0 +1,48 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+
+	<!-- widget grid -->
+	<section id="widget-grid" widget-grid>
+
+		<!-- START ROW -->
+		<div class="row">
+
+			<!-- NEW COL START -->
+			<article class="col-sm-12 col-md-12 col-lg-12">
+
+				<!-- Widget ID (each widget will need unique ID)-->
+				<div jarvis-widget id="form-grid-widget"
+					data-widget-colorbutton="false" data-widget-editbutton="false"
+					data-widget-custombutton="false">
+
+					<!-- widget div-->
+					<div>
+
+						<!-- widget content -->
+						<div class="widget-body no-padding">
+							<form id="basicStorehouse-form" name='basicStorehouse-form'
+								class="smart-form ng-pristine ng-valid"
+								ng-submit='basicStorehouse-form.$valid&&save(basicStorehouse)'
+								novalidate="novalidate">
+								<header>
+									<a href-void class="btn btn-default btn-xs" ng-click="returnTop()">
+										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+									</a>
+									&nbsp;<strong>查看</strong>
+								</header>
+								<section>
+									<div>
+										<img src="styles/img/newPage/kuneiview-1.png" alt="">
+										<img src="styles/img/newPage/kuneiview-2.png" alt="">
+									</div>
+								</section>
+								<footer class="modal-footer text-align-center">
+									<button ng-click="returnTop()" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
+								</footer>
+							</form>
+						</div>
+					</div>
+			</article>
+		</div>
+	</section>
+</div>