.

src/main/resources/static/app/storage/controller/qualitycheckAssayCtrl.js

@@ -333,6 +333,7 @@ angular.module('app.storage')
                 $scope.qualitycheck.subType = data.qualitycheck.subType;
                 $scope.qualitycheck.houseId = data.qualitycheck.houseId.toString();
                 $scope.qualitycheck.warehouseId = parseInt(data.qualitycheck.warehouseId);
+                $scope.qualitycheck.ypdj = parseInt(data.qualitycheck.ypdj);
                 $scope.qualitycheck.wareHouseName = data.wareHouseName;//用于验收，春秋的回显
                 $scope.qualitycheck.inspectionStandardBasis = parseInt($scope.qualitycheck.inspectionStandardBasis);
                 //$scope.qualitycheck.inputTime = $scope.qualitycheck.inputTime.substr(0,10);

src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -357,6 +357,7 @@ angular.module('app.storage')
                 $scope.qualitycheck = data.qualitycheck;
                 $scope.qualitycheck.houseId = data.qualitycheck.houseId.toString();
                 $scope.qualitycheck.warehouseId = parseInt(data.qualitycheck.warehouseId);
+                $scope.qualitycheck.ypdj = parseInt(data.qualitycheck.ypdj);
                 $scope.qualitycheck.wareHouseName = data.wareHouseName;//用于验收，春秋的回显
                 $scope.qualitycheck.inspectionStandardBasis = parseInt($scope.qualitycheck.inspectionStandardBasis);
                 //$scope.qualitycheck.inputTime = $scope.qualitycheck.inputTime.substr(0,10);
@@ -1435,7 +1436,7 @@ angular.module('app.storage')
         // 上传.
         $scope.uploader = new FileUploader({
             //url : APP_CONFIG.basicUrl + '/fileUpload/updateFileBusiness',
-            url : APP_CONFIG.businessUrl + '/depot/business/file/uploadFile',
+            url : APP_CONFIG.basicUrl + '/depot/basic/file/uploadFile',
             autoUpload : true, // 将文件添加到队列后自动上传.
             formData : [{type : 'qualityCj', userId:$rootScope.userInfo.userId,orgId:$rootScope.orgInfo.orgId}], // 与文件一起发送的数据
             removeAfterUpload : true, // 从队列上传后删除文件

src/main/resources/static/app/storage/grainCard/views/addQualityInspection.html

@@ -113,7 +113,7 @@
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
-                                                <td class="text-center">{{dicData[quailckCard.level]}}</td>
+                                                <td class="text-center">{{dicData[quailckCard.ypdj]}}</td>
                                                 <td class="text-center">{{quailckCard.qualitycheckInspection.unitWeight}}</td>
                                                 <td class="text-center">{{quailckCard.water}}</td>
                                                 <td class="text-center">{{quailckCard.qualitycheckInspection.impurityTotal}}</td>
@@ -260,7 +260,7 @@
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
-                                                <td class="text-center">{{dicData[quailckCard.level]}}</td>
+                                                <td class="text-center">{{dicData[quailckCard.ypdj]}}</td>
                                                 <td class="text-center">{{quailckCard.qualitycheckInspection.unitWeight}}</td>
                                                 <td class="text-center">{{quailckCard.water}}</td>
                                                 <td class="text-center">{{quailckCard.qualitycheckInspection.impurityTotal}}</td>

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

@@ -74,7 +74,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">轮换协议编号</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.spareOne}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">等级</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.level]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.ypdj]}}</td>
                                                 <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-center">保管员</td>
                                             </tr>
                                             <tr>
@@ -183,7 +183,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">轮换协议编号</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.spareOne}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">等级</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.level]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.ypdj]}}</td>
                                                 <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-center">保管员</td>
                                             </tr>
                                             <tr>
@@ -578,7 +578,7 @@
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.level]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.ypdj]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">
                                                     {{quailckCard.qualitycheckInspection.unitWeight}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.water}}</td>
@@ -705,7 +705,7 @@
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">
-                                                    <div style="width:20px;word-wrap:break-word;margin: auto;">{{dicData[quailckCard.level]}}</div>
+                                                    <div style="width:20px;word-wrap:break-word;margin: auto;">{{dicData[quailckCard.ypdj]}}</div>
                                                 </td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.qualitycheckInspection.unitWeight}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.water}}</td>
@@ -809,7 +809,7 @@
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;" >{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.level]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.ypdj]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.goodpart}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.qualitycheckInspection.immatureGrainRate}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.water}}</td>
@@ -913,7 +913,7 @@
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.level]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.ypdj]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.huskedRation}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.fullGoodRation}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.water}}</td>
@@ -968,7 +968,7 @@
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
-                                                <td class="text-center" colspan="3">{{dicData[quailckCard.level]}}</td>
+                                                <td class="text-center" colspan="3">{{dicData[quailckCard.ypdj]}}</td>
                                                 <td class="text-center" colspan="3">{{quailckCard.colorsmell}}</td>
                                                 <td class="text-center" colspan="3">{{quailckCard.qualitycheckInspection.waterVolatiles}}</td>
                                                 <td class="text-center" colspan="3">{{quailckCard.qualitycheckInspection.insolubleImpurity}}</td>

src/main/resources/static/app/storage/safe-manage/controller/safeManageCtrl.js

@@ -203,7 +203,7 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 		$("#filePath").val(filePath);
 		$("#type").val("business");
 		$("#originalFileName").val(originalFileName);
-		$("#download-form").attr("action", APP_CONFIG.businessUrl + '/download');
+		$("#download-form").attr("action", APP_CONFIG.basicUrl + '/download');
 		$("#download-form").submit();
     	
 	}
@@ -270,9 +270,7 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 	// 回显预览.
 	
 	$scope.showFile = function(filePath, originalFileName) {
-		var a= "/home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static";
-		var b = a.concat(filePath);
-		window.open(b);
+		window.open(APP_CONFIG.basicUrl+filePath);
 	}
     
 	// -----------------------------------------------   上传下载相关     结束           ------------------------------------------------

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

@@ -241,23 +241,6 @@
 									<header>检验信息</header>
 									<fieldset>
 										<div class="row">
-<!--											<section class="col col-3">-->
-<!--												<label class="select">-->
-<!--													<label class="label">检验类别：<span style="color: red;">*</span></label>-->
-<!--													<label class="select">-->
-<!--														<select name="jylb" ng-disabled="isNotEdit" ng-readonly="isNotEdit" ng-model="qualitycheck.jylb" required>-->
-<!--															<option value="" selected="" disabled="">请选择</option>-->
-<!--															<option value="01">入仓验收</option>-->
-<!--															<option value="02">出仓检验</option>-->
-<!--															<option value="03">3月末普检</option>-->
-<!--															<option value="04">9月末普检</option>-->
-<!--															<option value="05">入仓初检</option>-->
-<!--															<option value="06">月度检查</option>-->
-<!--															<option value="07">3月末库内普查</option>-->
-<!--															<option value="08">9月末库内普查</option>-->
-<!--														</select> <i></i> </label>-->
-<!--												</label>-->
-<!--											</section>-->
 											<section class="col col-3">
 												<label class="label">检验时间：<span style="color: red;">*</span></label>
 												<label class="input">
@@ -272,28 +255,6 @@
 														   placeholder="检验人" checkJyr=true required>
 												</label>
 											</section>
-<!--											<section class="col col-3">-->
-<!--												<label class="select">-->
-<!--													<label class="label">检验结论：<span style="color: red;">*</span></label>-->
-<!--													<label class="select">-->
-<!--														<select name="checkResult" ng-disabled="isNotEdit" ng-readonly="isNotEdit" ng-model="qualitycheck.checkResult" required>-->
-<!--															<option value="">请选择</option>-->
-<!--															<option value="0" selected >合格</option>-->
-<!--															<option value="1">不合格</option>-->
-<!--														</select> <i></i> </label>-->
-<!--												</label>-->
-<!--											</section>-->
-<!--											<section class="col col-3">-->
-<!--												<label class="select">-->
-<!--													<label class="label">储存品质：<span style="color: red;">*</span></label>-->
-<!--													<label class="select">-->
-<!--														<select name="storeQuality" ng-model="qualitycheck.storeQuality" ng-readonly="isNotEdit"  ng-disabled="isNotEdit" required>-->
-<!--															<option value="">请选择</option>-->
-<!--															<option value="0" selected >宜存</option>-->
-<!--															<option value="1">不宜存</option>-->
-<!--														</select> <i></i> </label>-->
-<!--												</label>-->
-<!--											</section>-->
 											<section class="col col-3">
 												<label class="label">检验机构：<span style="color: red;">*</span></label>
 												<label class="input">
@@ -358,13 +319,9 @@
 												<label class="select">
 													<label class="label">样品等级：<span style="color: red;">*</span></label>
 													<label class="select">
-														<select name="ypdj" ng-disabled="isNotEdit" ng-readonly="isNotEdit" ng-model="qualitycheck.ypdj" required>
+														<select name="ypdj" ng-disabled="isNotEdit" ng-readonly="isNotEdit" ng-model="qualitycheck.ypdj"
+														ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
 															<option value="" selected="" disabled="">请选择</option>
-															<option value="01">一级</option>
-															<option value="02">二级</option>
-															<option value="03">三级</option>
-															<option value="04">四级</option>
-															<option value="05">五级</option>
 														</select> <i></i> </label>
 												</label>
 											</section>

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

@@ -349,13 +349,9 @@
 												<label class="select">
 													<label class="label">样品等级：<span style="color: red;">*</span></label>
 													<label class="select">
-														<select name="ypdj" ng-disabled="isNotEdit" ng-readonly="isNotEdit" ng-model="qualitycheck.ypdj" required>
+														<select name="ypdj" ng-disabled="isNotEdit" ng-readonly="isNotEdit" ng-model="qualitycheck.ypdj"
+														ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
 															<option value="" selected="" disabled="">请选择</option>
-															<option value="01">一级</option>
-															<option value="02">二级</option>
-															<option value="03">三级</option>
-															<option value="04">四级</option>
-															<option value="05">五级</option>
 														</select> <i></i> </label>
 												</label>
 											</section>