第三方质检 强检

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

@@ -1357,7 +1357,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 },
                 views: {
                     "content@app": {
-                        controller: 'qualitycheckTerraceCtrl',
+                        controller: 'sptDsfzjCtrl',
                         templateUrl: 'app/storage/views/qualitycheck/qualitycheck-acceptcheck-list.html'
                     }
                 }
@@ -1369,11 +1369,23 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 },
                 views: {
                     "content@app": {
-                        controller: 'qualitycheckTerraceViewCtrl as datatables',
+                        controller: 'sptDsfzjViewCtrl as datatables',
                         templateUrl: 'app/storage/views/qualitycheck/qualitycheck-acceptcheck-edit.html'
                     }
                 }
             })
+            .state('app.storage.qualitycheck.acksptedit', {
+                url: '/qualitycheck/acksptedit/:id/:isNotEdit',
+                data: {
+                    title: '详情'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'sptDsfzjViewCtrl as datatables',
+                        templateUrl: 'app/storage/views/qualitycheck/qualitycheck-acceptcheckspt-edit.html'
+                    }
+                }
+            })
             //----------------第三方检查开始---------------//
 
             //----------------春秋普查信息开始---------------//
@@ -1384,11 +1396,24 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 },
                 views: {
                     "content@app": {
-                        controller: 'qualitycheckTerraceCtrl',
+                        controller: 'sptDsfzjCtrl',
                         templateUrl: 'app/storage/views/qualitycheck/qualitycheck-acceptcheck-list.html'
                     }
                 }
             })
+            
+             .state('app.storage.qualitycheck.sprsptedit', {
+                url: '/qualitycheck/sprsptedit/:id/:isNotEdit',
+                data: {
+                    title: '详情'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'sptDsfzjViewCtrl as datatables',
+                        templateUrl: 'app/storage/views/qualitycheck/qualitycheck-acceptcheckspt-edit.html'
+                    }
+                }
+            })
 
             //----------------春秋普查信息结束---------------//
 

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-acceptcheck-list.html

@@ -18,17 +18,21 @@
 								<div class="col-xs-12 col-sm-9">
 									<div class="form-group">
 										<label> 仓房/油罐名称:&emsp;
-											<select ng-model="search.storehouseId" class="form-control input-sm"
-													ng-options="store.storehouseId as store.storehouseName for store in store_tank_list"
-													ng-change="loadWare()">
-												<option value="">请选择</option>
-											</select>&emsp;
+											<input ng-model="search.cfmc" class="form-control input-sm"/>
+											&emsp;
 										</label>
-										<label> 货位名称:&emsp;
-											<select ng-model="search.warehouseId" class="form-control input-sm"
-													ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
-												<option value="">请选择</option>
-											</select>&emsp;
+										<label> 委托品种:&emsp;
+											<input ng-model="search.pzmc" class="form-control input-sm"/>
+											&emsp;
+										</label>
+										<label> 委托书编号:&emsp;
+											<input ng-model="search.wtsbh" class="form-control input-sm"/>
+											&emsp;
+										</label>
+										<label>
+											委托时间:&emsp;<input style="width: 100px;" class="form-control" type="text" ng-model="wtkssj" id="wtkssj" name="wtkssj" onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'wtjssj\')}'})">
+											--&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-model="wtjssj" id="wtjssj" name="wtjssj" onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'wtkssj\')}'})">
+										&emsp;
 										</label>
 										<a class="btn btn-default btn-sm" ng-click="loadData()">
 											<i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
@@ -62,15 +66,15 @@
 
 							<tbody>
 							<tr ng-repeat="qualitycheck in pageInfo.list">
-								<th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
+								<th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th> 
+								<td>{{qualitycheck.entrustNum}}</td>
 								<td>{{qualitycheck.houseName}}</td>
-								<td>{{qualitycheck.warehouseName}}</td>
-								<td>{{qualitycheck.jclx}}</td>
-								<td>{{qualitycheck.jydw}}</td>
-								<td>{{qualitycheck.pz}}</td>
-								<td>{{qualitycheck.jyr}}</td>
+								<td>{{qualitycheck.subTypeDetailedName}}</td>
+								<td>{{qualitycheck.entrustApplyTypeName}}</td>
+								<td>{{qualitycheck.entrustDate}}</td>
+								<td>{{qualitycheck.finishDate}}</td>
                         		<td>
-									<a  href-void ng-click="showViewAck(qualitycheck.zljcid)"><i class="fa fa-info-circle"></i>查看</a>
+									 <a  href-void ng-click="showViewAck(qualitycheck.fid,type)"><i class="fa fa-info-circle"></i>查看</a>
                         		</td>
                         	</tr>
                         </tbody>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-acceptcheckspt-edit.html

@@ -0,0 +1,457 @@
+
+<div id="content">
+	<section id="widget-grid" widget-grid>
+		<div class="row">
+			<article class="col-sm-12 col-md-12 col-lg-12">
+				<div jarvis-widget id="form-grid-widget" data-widget-colorbutton="false" data-widget-editbutton="false"
+					 data-widget-custombutton="false">
+					<div>
+						<div class="widget-body no-padding">
+
+							<form id="qualitycheck-form" class="smart-form" data-validator-option="validateOptions" novalidate="novalidate">
+								<button type="submit" class="bv-hidden-submit" style="display: none; width: 0px; height: 0px;"></button>
+								<header>
+									<a href-void class="btn btn-default btn-xs" ng-click="back()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
+								</header>
+								<div>
+									<header>基础信息</header>
+									<fieldset>
+										<div class="row">
+											<section class="col col-3">
+												<label class="label">检测机构：</label>
+												<label class="input">
+													<input type="text" ng-disabled="true" ng-value="qualitycheck.chooseOrgName" >
+												</label>
+											</section>
+
+											<section class="col col-3">
+												<label class="label">产品名称:</label>
+												<label class="input">
+													<input type="text" ng-disabled="true" ng-value="qualitycheck.subTypeDetailedName" >
+												</label>
+											</section>
+
+											<section class="col col-3">
+												<label class="label">抽样基数:</label>
+													<label class="input">
+													 <input type="text" ng-disabled="true" ng-value="qualitycheck.sampleBasicNum" >
+												    </label>
+											</section>
+
+											<section class="col col-3">
+													<label class="label">抽样数量:</label>
+													<label class="input">
+														<input type="text" ng-disabled="true" ng-value="qualitycheck.sampleNum" >
+													</label>
+											</section>
+										</div>
+									
+										<div class="row">
+											<section class="col col-3">
+												 <label class="label">抽样地点:</label>
+												 <label class="input">
+													<input type="text" ng-model="qualitycheck.sampleAddress"  ng-readonly="true">
+												</label>
+											</section>
+
+											<section class="col col-3">
+												<label class="label">抽样日期:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.chooseDate"  ng-readonly="true">
+												</label>
+											</section>
+
+											<section class="col col-3">
+												<label class="label">抽样编号:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.chooseNumber"  ng-readonly="true">
+												</label>
+											</section>
+
+											<section class="col col-3">
+												<label class="label">入库日期:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.inputDate" ng-disabled="true" >
+												</label>
+											</section>
+										</div>
+									
+										<div class="row">
+											<section class="col col-3">
+												<label class="label">样品送达日期:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.deliveryDate" ng-disabled="true">
+												</label>
+											</section>
+											<section class="col col-3">
+												<label class="label">检验日期:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.inspectDate" ng-disabled="true">
+												</label>
+											</section>
+											<section class="col col-3">
+												<label class="label">签发日期:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.issueDate" ng-disabled="true">
+												</label>
+											</section>
+											<section class="col col-3">
+												<label class="label">检验结论:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.conclusion" ng-disabled="true">
+												</label>
+											</section>
+										</div>
+									
+										<div class="row">
+											<section class="col col-3">
+												<label class="label">备注:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.remark" ng-disabled="true">
+												</label>
+											</section>
+										</div>
+									</fieldset>
+
+									<fieldset>
+									
+											<div class="col-xs-15 col-sm-15" ng-show="xiaomai">
+												<table class="table table-striped  table-bordered table-hover" width="100%" style="text-align:center;">
+												<thead>
+													<tr>
+														<th rowspan="3" style="vertical-align: middle;">样品</th>
+														<th colspan="7" style="text-align:center;">常规质量指标</th>
+														<th colspan="5" style="text-align:center;">储存品质指标</th>
+														<th colspan="3" style="text-align:center;">食品安全指标</th>
+													</tr>
+													<tr>
+														<th rowspan="2" style="vertical-align: middle;">等级</th>
+														<th rowspan="2" style="vertical-align: middle;">容重/g/L</th>
+														<th rowspan="2" style="vertical-align: middle;">不完善粒/%</th>
+														<th colspan="2" style="text-align:center;">杂质/%</th>
+														<th rowspan="2" style="vertical-align: middle;">水分/%</th>
+														<th rowspan="2" style="vertical-align: middle;">色泽气味</th>
+														
+														<th rowspan="2" style="vertical-align: middle;">硬度指数%</th>
+														<th rowspan="2" style="vertical-align: middle;">面筋吸水量/%</th>
+														<th rowspan="2" style="vertical-align: middle;">品尝评分值/分</th>
+														<th rowspan="2" style="vertical-align: middle;">色泽气味</th>
+														<th rowspan="2" style="vertical-align: middle;">判定是否宜存</th>
+														
+														<th rowspan="2" style="vertical-align: middle;">铅、镉、 总汞、总砷限量指标(mg/kg)</th>
+														<th rowspan="2" style="vertical-align: middle;">脱氧雪腐镰刀菌烯醇、玉米赤霉烯酮限量指标（μg/kg)</th>
+														<th rowspan="2" style="vertical-align: middle;">敌敌畏、辛硫磷、马拉硫磷限量指标(mg/kg)</th>
+													</tr>
+													<tr>
+														<th>总量</th>
+														<th>其中：矿物质</th>
+													</tr>
+												</thead>
+												<tbody>
+												<tr ng-repeat="detailInfo in qualityInspectionDetailList">
+													<td style="vertical-align: middle;">{{detailInfo.sampleName}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.level}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.unitWeight}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.imperfectGrains}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.impurityTotal}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mineral}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.water}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqColorSmell}}</td>
+													
+													
+													<td style="vertical-align: middle;">{{detailInfo.hardIndex}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.glutenWaterCount}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.eatScore}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.smellTaste}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqJudgeResult}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.mgs_pd_cd_thg_as}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_don_zen}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_ddv}}</td>
+												</tr>
+												</tbody>
+												</table>
+											</div>
+											
+											<div class="col-xs-15 col-sm-15" ng-show="daogu">
+												<table class="table table-striped  table-bordered table-hover" width="100%" style="text-align:center;">
+												<thead>
+													<tr>
+														<th rowspan="2" style="vertical-align: middle;">样品</th>
+														<th colspan="10" style="text-align:center;">常规质量指标</th>
+														<th colspan="4" style="text-align:center;">储存品质指标</th>
+														<th colspan="3" style="text-align:center;">食品安全指标</th>
+													</tr>
+													<tr>
+														<th style="vertical-align: middle;">等级</th>
+														<th style="vertical-align: middle;">出糙率/% </th>
+														<th style="vertical-align: middle;">整精米率/%</th>
+														<th style="vertical-align: middle;">杂质/%</th>
+														<th style="vertical-align: middle;">水分/%</th>
+														<th style="vertical-align: middle;">黄粒米/%</th>
+														<th style="vertical-align: middle;">谷外糙米/%</th>
+														<th style="vertical-align: middle;">互混率/%</th>
+														<th style="vertical-align: middle;">色泽气味</th>
+														<th style="vertical-align: middle;">判定是否达到三等及以上</th>
+														
+														<th style="vertical-align: middle;">脂肪酸值 KOH/干基/mg/100g</th>
+														<th style="vertical-align: middle;">品尝评分值/分</th>
+														<th style="vertical-align: middle;">色泽气味</th>
+														<th style="vertical-align: middle;">判定是否宜存</th>
+														
+														<th style="vertical-align: middle;">铅、镉、 总汞、总砷限量指标(mg/kg)</th>
+														<th style="vertical-align: middle;">脱氧雪腐镰刀菌烯醇、玉米赤霉烯酮限量指标（μg/kg)</th>
+														<th style="vertical-align: middle;">敌敌畏、辛硫磷、马拉硫磷限量指标(mg/kg)</th>
+													</tr>
+												</thead>
+												<tbody>
+												<tr ng-repeat="detailInfo in qualityInspectionDetailList">
+													<td style="vertical-align: middle;">{{detailInfo.sampleName}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.level}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.huskedRation}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.fullGoodRation}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.impurity}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.water}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.yellowPart}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.outHuskedRation}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.intermixingRate}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqColorSmell}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.lv3Above}}</td>
+													
+													
+													
+													<td style="vertical-align: middle;">{{detailInfo.sqFatIndex}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqAcidValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqColorSmell}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqSuitable}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.mgs_pd_cd_thg_as}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_don_zen}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_ddv}}</td>
+												</tr>
+												</tbody>
+												</table>
+											</div>
+								
+								<div class="col-xs-15 col-sm-15" ng-show="cpdadouyou">
+												<table class="table table-striped  table-bordered table-hover" width="100%" style="text-align:center;">
+												<thead>
+													<tr>
+														<th rowspan="2" style="vertical-align: middle;">样品</th>
+														<th colspan="12" style="text-align:center;">常规质量指标</th>
+														<th colspan="3" style="text-align:center;">储存品质指标</th>
+														<th colspan="3" style="text-align:center;">食品安全指标</th>
+													</tr>
+													<tr>
+													    <th style="vertical-align: middle;">等级</th>
+														<th style="vertical-align: middle;">色泽</th>
+														<th style="vertical-align: middle;">透明度（20℃）</th>
+														<th style="vertical-align: middle;">气味 滋味</th>
+														<th style="vertical-align: middle;">水分及挥发物含量/%</th>
+														<th style="vertical-align: middle;">不溶性杂质含量/%</th>
+														<th style="vertical-align: middle;">酸价(KOH)/mg/g</th>
+														<th style="vertical-align: middle;">过氧化值mmol/kg</th>
+														<th style="vertical-align: middle;">冷冻试验（0℃储藏5.5h）</th>
+														<th style="vertical-align: middle;">烟点/℃</th>
+														<th style="vertical-align: middle;">溶剂残留量/mg/kg</th>
+														<th style="vertical-align: middle;">结果判定</th>
+														
+														<th style="vertical-align: middle;">酸价(KOH)/mg/g</th>
+														<th style="vertical-align: middle;">过氧化值meq/kg</th>
+														<th style="vertical-align: middle;">结果判定</th>
+														
+														<th style="vertical-align: middle;">铅、总砷、苯并芘</th>
+														<th style="vertical-align: middle;">黄曲霉毒素B1</th>
+														<th style="vertical-align: middle;"s>辛硫磷、马拉硫磷限量指标(mg/kg)</th>
+													</tr>
+												</thead>
+												<tbody>
+												<tr ng-repeat="detailInfo in qualityInspectionDetailList">
+													<td style="vertical-align: middle;">{{detailInfo.sampleName}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.level}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqColorSmell}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.transparency}}</td>													
+													<td style="vertical-align: middle;">{{detailInfo.smellTaste}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.waterVolatiles}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.insolubleImpurity}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqAcidValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqPeroxideValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.freezeTest}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.smokePoint}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.residualSolvent}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqJudgeResult}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.sqAcidValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqPeroxideValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqJudgeResult}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.mgs_pd_cd_thg_as}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_don_zen}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_ddv}}</td>
+												</tr>
+												</tbody>
+												</table>
+											</div>
+											
+											<div class="col-xs-15 col-sm-15" ng-show="dadouyuanyou">
+												<table class="table table-striped  table-bordered table-hover" width="100%" style="text-align:center;">
+												<thead>
+													<tr>
+														<th rowspan="2" style="vertical-align: middle;">样品</th>
+														<th colspan="7" style="text-align:center;">常规质量指标</th>
+														<th colspan="3" style="text-align:center;">储存品质指标</th>
+														<th colspan="3" style="text-align:center;">食品安全指标</th>
+													</tr>
+													<tr>
+													    <th>气味、滋味</th>
+														<th>水分及挥发物含量/%</th>
+														<th>不溶性杂质含量/%</th>
+														<th>酸价(KOH)/mg/g</th>
+														<th>过氧化值mmol/kg</th>
+														<th>溶剂残留量/mg/kg</th>
+														<th>结果判定</th>
+														
+														<th>酸价(KOH)/mg/g</th>
+														<th>过氧化值meq/kg</th>
+														<th>结果判定</th>
+														
+														<th>铅、总砷、苯并芘</th>
+														<th>黄曲霉毒素B1</th>
+														<th>辛硫磷、马拉硫磷限量指标(mg/kg)</th>
+													</tr>
+												</thead>
+												<tbody>
+												<tr ng-repeat="detailInfo in qualityInspectionDetailList">
+													<td style="vertical-align: middle;">{{detailInfo.sampleName}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqColorSmell}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.waterVolatiles}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.insolubleImpurity}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqAcidValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqPeroxideValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.residualSolvent}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.sqJudgeResult}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.sqAcidValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqPeroxideValue}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqJudgeResult}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.mgs_pd_cd_thg_as}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_don_zen}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_ddv}}</td>
+												</tr>
+												</tbody>
+												</table>
+											</div>
+											<div class="col-xs-15 col-sm-15" ng-show="xiaomaif">
+												<table class="table table-striped  table-bordered table-hover" width="100%" style="text-align:center;">
+												<thead>
+													<tr>
+														<th rowspan="2" style="vertical-align: middle;">样品</th>
+														<th colspan="11" style="text-align:center;">常规质量指标</th>
+														<th colspan="3" style="text-align:center;">食品安全指标</th>
+													</tr>
+													<tr>
+														<th>等级</th>
+														<th>加工精度 </th>
+														<th>灰分(以干物计）/ %</th>
+														<th>脂肪酸值(以湿基计）</th>
+														<th>含砂量  /%</th>
+														<th>磁性金属物 /g/kg</th>
+														<th>水分/%</th>
+														<th>色泽、气味</th>
+														<th>外观形态</th>
+														<th>湿面筋含量</th>
+														<th>结果判定</th>
+														
+														
+														<th>铅、镉、 总汞、总砷限量指标(mg/kg)</th>
+														<th>脱氧雪腐镰刀菌烯醇、玉米赤霉烯酮限量指标（μg/kg)</th>
+														<th>敌敌畏、辛硫磷、马拉硫磷限量指标(mg/kg)</th>
+													</tr>
+												</thead>
+												<tbody>
+												<tr ng-repeat="detailInfo in qualityInspectionDetailList">
+													<td style="vertical-align: middle;">{{detailInfo.sampleName}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.level}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.machiningAccuracy}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.ashContent}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqFatIndex}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.siltContent}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.magneticMetal}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.water}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqColorSmell}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.appearanceForm}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.gluten}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqJudgeResult}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.mgs_pd_cd_thg_as}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_don_zen}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_ddv}}</td>
+												</tr>
+												</tbody>
+												</table>
+											</div>
+											<div class="col-xs-15 col-sm-15" ng-show="dami">
+												<table class="table table-striped  table-bordered table-hover" width="100%" style="text-align:center;">
+												<thead>
+													<tr>
+														<th rowspan="3" style="vertical-align: middle;">样品</th>
+														<th colspan="8" style="text-align:center;">常规质量指标</th>
+														<th colspan="3" style="text-align:center;">食品安全指标</th>
+													</tr>
+													<tr>
+														<th rowspan="2" style="vertical-align: middle;">等级</th>
+														<th colspan="2" style="text-align:center;">碎米 </th>
+														<th colspan="2" style="text-align:center;">杂质/ %</th>
+														<th rowspan="2" style="vertical-align: middle;">黄粒米/%</th>
+														<th rowspan="2" style="vertical-align: middle;">互混率/%</th>
+														<th rowspan="2" style="vertical-align: middle;">色泽、气味</th>
+														
+														<th rowspan="2" style="vertical-align: middle;">铅、镉、 总汞、总砷限量指标(mg/kg)</th>
+														<th rowspan="2" style="vertical-align: middle;">脱氧雪腐镰刀菌烯醇、玉米赤霉烯酮限量指标（μg/kg)</th>
+														<th rowspan="2" style="vertical-align: middle;">敌敌畏、辛硫磷、马拉硫磷限量指标(mg/kg)</th>
+													</tr>
+													<tr>
+														<th style="text-align:center;">总量/%</th>
+														<th style="text-align:center;">小碎米含量/%</th>
+														<th style="text-align:center;">总量/%</th>
+														<th style="text-align:center;">无机杂质含量/%</th>
+													</tr>
+												</thead>
+												<tbody>
+												<tr ng-repeat="detailInfo in qualityInspectionDetailList">
+													<td style="vertical-align: middle;">{{detailInfo.sampleName}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.level}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.brokenRiceTotal}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.brokenRiceSmall}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.impurityTotal}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.impurityInorganic}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.yellowPart}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.intermixingRate}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.cqColorSmell}}</td>
+													
+													<td style="vertical-align: middle;">{{detailInfo.mgs_pd_cd_thg_as}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_don_zen}}</td>
+													<td style="vertical-align: middle;">{{detailInfo.mgs_ddv}}</td>
+												</tr>
+												</tbody>
+												</table>
+											</div>
+									</fieldset>
+								</div>
+									<footer class="modal-footer text-align-center">
+										<div class="row">
+											<div class="col-md-12">
+												<a class="btn btn-default" href-void="" href="#" ng-click="back()">取消</a>
+											</div>
+										</div>
+									</footer>
+							</form>
+						</div>
+					</div>
+				</div>
+			</article>
+		</div>
+	</section>
+</div>
+	

src/main/resources/static/app/supervise/controller/sptCtrl.js

@@ -250,4 +250,73 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function($scope, $ro
     };
     
 })
+
+.controller("sptDsfzjCtrl", function($scope, $rootScope, $state, $stateParams, APP_CONFIG, sptService) {
+
+    // 获取列表数据
+    $scope.search = {pageType:1, cfmc:null, pzmc:null, wtsbh:null};
+    $scope.pageInfo = {pageNum : 1, pageSize : 10};
+    $scope.type = $stateParams.type;
+    $scope.loadData = function() {
+    	$scope.kdmc = $rootScope.orgInfo.orgName;
+    	$scope.search.startTime = $("#wtkssj").val();
+    	$scope.search.endTime = $("#wtjssj").val();
+    	if($scope.pageInfo === 'undefined'){
+    		$scope.pageInfo = {pageNum : 1, pageSize : 10};
+    	}
+		sptService.getDsfzjListPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.kdmc, $scope.search.pageType, 
+				$scope.search.cfmc, $scope.search.pzmc,$scope.search.startTime, $scope.search.endTime,$scope.search.wtsbh).then(function (data) {
+			if (data.code == 200) {
+        		$scope.pageInfo = data.data;
+        	}
+		}, function (data) {
+			console.log(data);
+		});
+    };
+    
+    $scope.loadData();
+
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    };
+
+   // 查看页面
+    $scope.showViewAck = function(id,type) {
+    	if(type == 1){//第三方
+    	    $state.go('app.storage.qualitycheck.acksptedit',{id:id,isNotEdit:true});
+    	}else if(type == 2){//强检
+    	    $state.go('app.storage.qualitycheck.sprsptedit',{id:id,isNotEdit:true});
+    	}
+    }
+})
+
+.controller("sptDsfzjViewCtrl", function($scope, $rootScope, $state, $stateParams, APP_CONFIG, sptService) {
+
+	$scope.loadDataById = function(id) {
+		sptService.loadDataById(id).then(function(data){
+            $scope.qualitycheck = data.data;
+            $scope.qualityInspectionDetailList = data.data.qualityInspectionDetailList;
+            if($scope.qualitycheck.subTypeDetailedName.includes("小麦")){
+            	$scope.xiaomai = true;
+            }else if($scope.qualitycheck.subTypeDetailedName.includes("稻谷")){
+            	$scope.daogu = true;
+            }else if($scope.qualitycheck.subTypeDetailedName.includes("成品大豆油")){
+            	$scope.cpdadouyou = true;
+            }else if($scope.qualitycheck.subTypeDetailedName.includes("大豆原油")){
+            	$scope.dadouyuanyou = true;
+            }else if($scope.qualitycheck.subTypeDetailedName.includes("小麦粉")){
+            	$scope.xiaomaif = true;
+            }else if($scope.qualitycheck.subTypeDetailedName.includes("大米")){
+            	$scope.dami = true;
+            }
+        },function(data){
+        });
+    }
+	
+	if($stateParams.id != null){
+		$scope.loadDataById($stateParams.id);
+	}
+})
 ;

src/main/resources/static/app/supervise/service/sptService.js

@@ -278,4 +278,56 @@ angular.module('app.supervise').service("sptService", function($http, $q, APP_CO
         });
         return d.promise;
     }
+    
+    
+    /**
+     * 获取第三方质检数据
+     * $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.kdmc, $scope.search.pageType, 
+				$scope.search.cfmc, $scope.search.pzmc,$scope.search.startTime, $scope.search.endTime
+				
+				Integer pageNum, Integer pageSize, Integer pageType, String kqmc, 
+			String cfmc, String pzmc, String wtsbh, String wtkssj, String wtjssj
+     */
+    this.getDsfzjListPageInfo = function(pageNum, pageSize, kqmc, pageType, cfmc,pzmc, startTime, endTime,wtsbh) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/spt/getDsfzjList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                pageType : pageType,
+                kqmc : kqmc,
+                cfmc : cfmc,
+                pzmc : pzmc,
+                wtkssj : startTime,
+                wtjssj : endTime,
+                wtsbh : wtsbh
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+    
+    
+ // 根据id加载数据
+    this.loadDataById = function(id) {
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.depotStorageUrl + '/spt/getDsfzjById',
+            params: {
+                fid : id
+            }
+        }).then(function successCallback(response) {
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+        });
+        return d.promise;
+    }
 });