.

src/main/resources/static/app/business/deliveryStorageNotice/views/receiveNotice-edit.html

@@ -64,7 +64,7 @@
 											<label class="label">货位名称：</label>
 											<label class="select">
 												<select ng-model="businessNoticeReceive.wareHouseId" name="wareHouseId" 
-														ng-options="ware.warehouseId as ware.warehouseName for ware in warehouseList"
+														ng-options="ware.warehouseId as ware.warehouseName for ware in wareList"
 														class="form-control" ng-disabled="isNotEdit">
 													<option value="">--请选择--</option>
 												</select>

src/main/resources/static/app/intelligent/fumigation/controller/fumHomeWorkCtrl.js

@@ -141,6 +141,7 @@ angular.module('app.intelligent')
                 $scope.fumigationProcess.xzczry = $scope.fumigation.xzczry;//熏蒸作业人员
                 $scope.fumigationProcess.operationSupervisor = $scope.fumigation.operationSupervisor;//熏蒸作业负责人
                 $scope.fumigationProcess.djcxz = $scope.fumigation.djcxz;//第几次熏蒸
+                $scope.fumigationProcess.perforatedDate = $filter('date')($scope.fumigationProcess.perforatedDate, "yyyy-MM-dd");
 
             },function(data){
                 console.log(data);
@@ -212,6 +213,18 @@ angular.module('app.intelligent')
                 return this.optional(element)|| true;
             }
         },"不能填写无，暂无,空等选项！");
+        
+        // 自定义验证:散气日期
+        $.validator.addMethod("sqrq",function(value,element, params) {
+        	var xzkssj = $filter('date')($scope.fumigation.fumigationStart.substring(0,10), "yyyy-MM-dd");
+        	var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
+        	var sqrq = $filter('date')(value, "yyyy-MM-dd");
+            if(sqrq >= xzjssj || sqrq <= xzkssj){
+                return this.optional(element)|| false;
+            }else{
+                return this.optional(element)|| true;
+            }
+        },"散气日期必须在熏蒸开始时间与结束时间范围内，且不可等于！");
 
         // 返回.
         $scope.retList = function () {
@@ -434,7 +447,7 @@ angular.module('app.intelligent')
                 
                     $scope.fumigationProcess.bulkStartTime = $filter('date')(data.processEdit.bulkStartTime, "yyyy-MM-dd HH:mm:ss");
                     $scope.fumigationProcess.bulkEndTime = $filter('date')(data.processEdit.bulkEndTime, "yyyy-MM-dd HH:mm:ss");
-                    $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit.perforatedDate, "yyyy-MM-dd HH:mm:ss");
+                    $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit.perforatedDate, "yyyy-MM-dd");
                     $scope.fumigationAfter.checkInsectCageTime = $filter('date')(data.afterEdit.checkInsectCageTime, "yyyy-MM-dd HH:mm:ss");
                 }
 
@@ -463,7 +476,7 @@ angular.module('app.intelligent')
                 $scope.fumigationProcess = data.processEdit[0];
                 $scope.fumigationProcess.bulkStartTime = $filter('date')(data.processEdit[0].bulkStartTime, "yyyy-MM-dd HH:mm:ss");
                 $scope.fumigationProcess.bulkEndTime = $filter('date')(data.processEdit[0].bulkEndTime, "yyyy-MM-dd HH:mm:ss");
-                $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit[0].perforatedDate, "yyyy-MM-dd HH:mm:ss");
+                $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit[0].perforatedDate, "yyyy-MM-dd");
             },function(data){
                 console.log(data);
             });
@@ -509,6 +522,18 @@ angular.module('app.intelligent')
                 return this.optional(element)|| true;
             }
         },"不能填写无，暂无,空等选项！");
+        
+        // 自定义验证
+        $.validator.addMethod("czsjzysj",function(value,element, params) {
+        	var sqrq = $filter('date')($scope.fumigationProcess.perforatedDate.substring(0,10), "yyyy-MM-dd");
+        	var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
+        	var czsjzysj = $filter('date')($("input[name='residueCollectionTime']").val(), "yyyy-MM-dd");
+            if(czsjzysj <= sqrq || czsjzysj >= xzjssj){
+                return this.optional(element)|| false;
+            }else{
+                return this.optional(element)|| true;
+            }
+        },"残渣收集作业时间必须大于散气日期！");
 
         // 返回.
         $scope.retList = function () {

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkAfter-edit.html

@@ -248,8 +248,17 @@
                                                         </label>
                                                     </section>
                                                 </th>
-                                                <th></th>
-                                                <th></th>
+                                                <th>
+						                            <label class="label" style="margin-top: 9px; text-align: center">备注</label>
+						                        </th>
+						                        <th>
+						                            <section>
+						                                <label class="input">
+						                                    <input class="form-control" type="text" ng-model="fumigationAfter.remark"
+						                                     ng-readonly="isNotEdit" name="remark" />
+						                                </label>
+						                            </section>
+						                        </th>
                                             </tr>
                                         </table>
 
@@ -259,7 +268,7 @@
                                                     <label class="label" style="margin-top: 9px;text-align: center;">残渣处理</label>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">残渣收集作业时间</label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">残渣收集作业时间<span style="color: red;text-align: center;">*</span></label>
                                                 </th>
                                                 <th>
                                                     <label label class="label" style="margin-top: 9px;text-align: center;">收集作业人数</label>
@@ -286,7 +295,7 @@
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.residueCollectionTime"
                                                                    ng-readonly="isNotEdit" name="residueCollectionTime"
-                                                                   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" />
+                                                                   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" czsjzysj=true required />
                                                         </label>
                                                     </section>
                                                 </th>

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkProcess-edit.html

@@ -990,14 +990,14 @@
                           </section>
                         </th>
                         <th>
-                          <label class="label" style="margin-top: 9px; text-align: center">散气日期</label>
+                          <label class="label" style="margin-top: 9px; text-align: center">散气日期<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
                               <input type="text" class="form-control" ng-model="fumigationProcess.perforatedDate"
-                                name="perforatedDate" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
-                                ng-disabled="isNotEdit" />
+                                name="perforatedDate" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})"
+                                ng-disabled="isNotEdit" sqrq=true required />
                             </label>
                           </section>
                         </th>
@@ -1104,8 +1104,17 @@
                             </label>
                           </section>
                         </th>
-                        <th></th>
-                        <th></th>
+                        <th>
+                          <label class="label" style="margin-top: 9px; text-align: center">备注</label>
+                        </th>
+                        <th>
+                          <section>
+                            <label class="input">
+                              <input class="form-control" type="text" ng-model="fumigationProcess.remark"
+                                ng-readonly="isNotEdit" name="remark" />
+                            </label>
+                          </section>
+                        </th>
                       </tr>
 
                       <!-- 创建信息 -->

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

@@ -98,7 +98,7 @@
                                         <section class="col col-4">
                                             <label class="label">采购来源<span style="color: red;">*</span></label>
                                             <label class="input">
-                                                <input class="form-control" type="text" ng-model="drugStorage.cgly" ng-readonly="isNotEdit" name="cgly" required />
+                                                <input class="form-control" type="text" ng-model="drugStorage.cgly" placeholder="例如：采购平台统一采购、招标采购、单一来源采购等" ng-readonly="isNotEdit" name="cgly" required />
                                             </label>
                                         </section>
                                         <section class="col col-4">