...

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

@@ -926,12 +926,12 @@ angular.module('app.storage')
                 var rksj = new Date($scope.qualitycheck.inputTime.replace( /\-/g, "\/"));
                 var qysj = new Date($scope.qualitycheck.chooseTime.replace( /\-/g, "\/"));
                 var jysj = new Date($scope.qualitycheck.checkTime.replace( /\-/g, "\/"));
-                if (rksj!= "" && jysj!= "" && rksj >= jysj) {
-                    alert( "入库日期应该早于检验日期！");
+                if (rksj!= "" && qysj!= "" && rksj > qysj) {
+                    alert( "入库日期应该早于扦样时间！");
                     return false;
                 }
 
-                if (qysj!= "" && jysj!= "" && qysj >= jysj) {
+                if (qysj!= "" && jysj!= "" && qysj > jysj) {
                     alert( "扦样日期应该早于检验日期！");
                     return false;
                 }
@@ -943,7 +943,9 @@ angular.module('app.storage')
                     }
                 });
                 var qfrq = new Date($scope.qualitycheck.qfrq.replace( /\-/g, "\/"));
-                if (qfrq!= "" && jysj!= "" && qfrq <= jysj) {
+                var n_jysj = $scope.qualitycheck.checkTime.substr(0,10);
+                var new_jysj = new Date(n_jysj.replace( /\-/g, "\/"));
+                if (qfrq!= "" && new_jysj!= "" && qfrq < new_jysj) {
                     alert( "签发日期不得早于检验时间！");
                     return false;
                 }

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

@@ -95,7 +95,7 @@
                                             <label class="label">备注(其它药剂名称等)</label>
                                             <label class="input">
                                                 <input class="form-control" type="text" ng-model="drugInfo.remark" name="remark"
-                                                       ng-readonly="isNotEdit" placeholder="其它药剂或试剂名称" maxlength="200" />
+                                                       ng-readonly="isNotEdit" placeholder="其它药剂或试剂名称" maxlength="100" />
                                             </label>
                                         </section>
                                     </div>

src/main/resources/static/app/storage/grainCard/controller/checkFoodSituationListCtrl.js

@@ -13,6 +13,10 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                         $scope.GrainCardByIdObj.grainRights = "市粮食局";
                     } else if ($scope.GrainCardByIdObj.grainRights == "03") {
                         $scope.GrainCardByIdObj.grainRights = "区发改委";
+                    } else if ($scope.GrainCardByIdObj.grainRights == "04") {
+                        $scope.GrainCardByIdObj.grainRights = "市储备公司";
+                    } else if ($scope.GrainCardByIdObj.grainRights == "05") {
+                        $scope.GrainCardByIdObj.grainRights = "区购销公司";
                     } else {
                         $scope.GrainCardByIdObj.grainRights = $rootScope.orgInfo.orgName;
                     }

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

@@ -186,6 +186,8 @@
                                                             <option value="01">市粮食局</option>
                                                             <option value="02">{{orgInfo.orgName}}</option>
                                                             <option value="03">区发改委</option>
+                                                            <option value="04">市储备公司</option>
+															<option value="05">区购销公司</option>
                                                         </select><i></i>
                                                     </label>
                                                 </section>

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

@@ -166,6 +166,8 @@
                                                             <option value="01">市粮食局</option>
                                                             <option value="02">{{orgInfo.orgName}}</option>
                                                             <option value="03">区发改委</option>
+                                                            <option value="04">市储备公司</option>
+															<option value="05">区购销公司</option>
                                                         </select><i></i>
                                                     </label>
                                                 </section>