稻谷登统表脂肪酸开发和成品粮生产年月开发

src/main/resources/static/app/storage/product/controller/productCtrl.js

@@ -99,7 +99,7 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 	$scope.loadDataById = function(id) {
 		productService.edit(id).then(function(data){
 			$scope.productEdit = data;
-			$scope.productEdit.productionDate = $filter('date')(data.productionDate, "yyyy-MM-dd");
+			$scope.productEdit.productionDate = $filter('date')(data.productionDate, "yyyy-MM");
 			$scope.productEdit.recordDate = $filter('date')(data.recordDate, "yyyy-MM-dd");
 			$scope.productEdit.createTime = $filter('date')(data.createTime, "yyyy-MM-dd HH:mm:ss");
 			$scope.productEdit.houseId = Number($scope.productEdit.houseId);
@@ -376,7 +376,8 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 
 				$("input[name='productionDate']").each(function (j, item) {
 					if (item.value != '' && item.value != null && typeof item.value != 'undefined') {
-						$scope.productEdit.productionDate = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+						//item.realValue这个值是专门用的这个属性，
+						$scope.productEdit.productionDate = $filter('date')(item.realValue, "yyyy-MM-dd HH:mm:ss");
 					}
 				});
 				if ($scope.productEdit.storage == 1) {

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

@@ -150,13 +150,13 @@
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">生产日期：</label>
+													<label class="label txt-bg-red">生产年月：<span style="color: red;">*</span></label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<label class="input">
 															<input type="text" name="productionDate" ng-model="productEdit.productionDate"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})">
+																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM'})" required />
 														</label>
 													</label>
 												</th>

src/main/resources/static/app/storage/registrationTable/views/rice-list.html

@@ -77,7 +77,7 @@
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;" rowspan="3">生产年度</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;" rowspan="3">入库日期</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;" rowspan="3">入库数量(t)</th>
-                                        <th data-class="expand" style="text-align:center;vertical-align:middle;" colspan="17">入库质量标准</th>
+                                        <th data-class="expand" style="text-align:center;vertical-align:middle;" colspan="18">入库质量标准</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;" rowspan="3">存储方式</th>
                                     </tr>
                                     <tr>
@@ -91,6 +91,7 @@
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;" colspan="6">不完善粒%</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;" rowspan="2">黄粒米<br>%</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;" rowspan="2">色泽气味</th>
+                                        <th data-class="expand" style="text-align:center;vertical-align:middle;" rowspan="2">脂肪酸值</th>
                                     </tr>
                                     <tr>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">总量</th>
@@ -134,6 +135,7 @@
                                         <td width="3%" style="text-align:center;vertical-align:middle;">{{rice.sml}}</td>
                                         <td width="3%" style="text-align:center;vertical-align:middle;">{{rice.hlm}}</td>
                                         <td width="4%" style="text-align:center;vertical-align:middle;">{{rice.szqw}}</td>
+                                        <td width="4%" style="text-align:center;vertical-align:middle;">{{rice.zfsz}}</td>
                                         <td width="4%" style="text-align:center;vertical-align:middle;">{{rice.ccfs}}</td>
                                     </tr>
                                     </tbody>