熏蒸整体必录字段校验、药剂入库单价校验调整

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

@@ -124,7 +124,7 @@
                                                     <label class="label" style="margin-top: 50%;text-align: center;">散气情况</label>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气开始时间<span style="color: red;">*</span></label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气开始时间</label>
                                                 </th>
                                                 <th>
                                                     <section>
@@ -135,7 +135,7 @@
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气结束时间<span style="color: red;">*</span></label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气结束时间</label>
                                                 </th>
                                                 <th>
                                                     <section>
@@ -146,7 +146,7 @@
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气日期<span style="color: red;">*</span></label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气日期</label>
                                                 </th>
                                                 <th>
                                                     <section>
@@ -157,13 +157,13 @@
                                                     </section>
                                                 </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;">*</span></label>
                                                 </th>
                                                 <th>
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedDays"
-                                                                   ng-readonly="true" name="perforatedDays">
+                                                                   ng-readonly="true" name="perforatedDays" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -192,24 +192,24 @@
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气结束前磷化氢浓度(ppm)<span style="color: red;">*</span></label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气结束前磷化氢浓度(ppm)</label>
                                                 </th>
                                                 <th>
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedBefore"
-                                                                   ng-readonly="true" name="perforatedBefore" validNumber="true">
+                                                                   ng-readonly="true" name="perforatedBefore" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气结束时磷化氢浓度(ppm)<span style="color: red;">*</span></label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">散气结束时磷化氢浓度(ppm)</label>
                                                 </th>
                                                 <th>
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedEnd"
-                                                                   ng-readonly="true" name="perforatedEnd" validNumber="true">
+                                                                   ng-readonly="true" name="perforatedEnd" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -222,18 +222,18 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.bulkGasType"
-                                                                   ng-readonly="true" name="bulkGasType">
+                                                                   ng-readonly="true" name="bulkGasType" />
                                                         </label>
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">药剂残留率(ppm)<span style="color: red;">*</span></label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">药剂残留率(ppm)</label>
                                                 </th>
                                                 <th>
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.drugResidueRate"
-                                                                   ng-readonly="true" name="drugResidueRate" validNumber="true">
+                                                                   ng-readonly="true" name="drugResidueRate" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -244,7 +244,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.perforatedApprover"
-                                                                   ng-readonly="true" name="perforatedApprover">
+                                                                   ng-readonly="true" name="perforatedApprover" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -407,61 +407,61 @@
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">取样培养温度(℃)<span style="color: red;">*</span></label>
+                                                    <label 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.samplingCultureTemperature"
-                                                                   ng-readonly="isNotEdit" name="samplingCultureTemperature" validNumber="true" required>
+                                                                   ng-readonly="isNotEdit" name="samplingCultureTemperature" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
                                             </tr>
                                             <tr>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">取样培养湿度(%)<span style="color: red;">*</span></label>
+                                                    <label 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.samplingCultureHumidity"
-                                                                   ng-readonly="isNotEdit" name="samplingCultureHumidity" validNumber="true" required>
+                                                                   ng-readonly="isNotEdit" name="samplingCultureHumidity" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">粮堆杀虫效果或杀虫率(%)<span style="color: red;">*</span></label>
+                                                    <label 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.killInsectRate" ng-readonly="isNotEdit"
-                                                                   name="killInsectRate" validNumber="true" required>
+                                                                   name="killInsectRate" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">检查虫笼时间<span style="color: red;">*</span></label>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">检查虫笼时间</label>
                                                 </th>
                                                 <th>
                                                     <section>
                                                         <label class="input">
                                                             <input type="text" class="form-control" ng-model="fumigationAfter.checkInsectCageTime" name="checkInsectCageTime"
-                                                                   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="isNotEdit" required>
+                                                                   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="isNotEdit" />
                                                         </label>
                                                     </section>
                                                 </th>
                                             </tr>
                                             <tr>
                                                 <th>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">虫笼害虫死亡率(%)<span style="color: red;">*</span></label>
+                                                    <label 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.insectCageKillRate" ng-readonly="isNotEdit"
-                                                                   name="insectCageKillRate" validNumber="true" required>
+                                                                   name="insectCageKillRate" validNumber="true" />
                                                         </label>
                                                     </section>
                                                 </th>

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

@@ -77,11 +77,7 @@
                       </tr>
                       <tr>
                         <th>
-                          <label class="label" style="margin-top: 9px; text-align: center">粮食品种<span style="
-                                color: red;
-                                margin-left: 5px;
-                                text-align: center;
-                              ">*</span></label>
+                          <label class="label" style="margin-top: 9px; text-align: center">粮食品种</label>
                         </th>
                         <th>
                           <section>
@@ -239,49 +235,36 @@
                           <label class="label" style="margin-top: 50%; text-align: center">作业过程记录</label>
                         </th>
                         <th>
-                          <label class="label" style="margin-top: 9px; text-align: center">初次施药时间<span style="color: red">*</span></label>
+                          <label class="label" style="margin-top: 9px; text-align: center">初次施药时间</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
                               <input type="text" class="form-control" ng-model="fumigationProcess.firstUseDrugTime"
                                 name="firstUseDrugTime" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
-                                ng-disabled="isNotEdit" required />
+                                ng-disabled="isNotEdit" />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label class="label" style="margin-top: 9px; text-align: center">初次单位剂量(g/m³)<span style="color: red">*</span></label>
+                          <label class="label" style="margin-top: 9px; text-align: center">初次单位剂量(g/m³)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
                               <input class="form-control" type="text" ng-model="fumigationProcess.firstUseDrugUnit"
-                                ng-readonly="isNotEdit" name="firstUseDrugUnit" validNumber="true" required />
+                                ng-readonly="isNotEdit" name="firstUseDrugUnit" validNumber="true" />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >初次用药量(kg)<span style="color: red"
-                              >*</span
-                            ></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">初次用药量(kg)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.firstUseDrugCount"
-                                ng-readonly="isNotEdit"
-                                name="firstUseDrugCount"
-                                validNumber="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.firstUseDrugCount" ng-readonly="isNotEdit"
+                                name="firstUseDrugCount" validNumber="true" />
                             </label>
                           </section>
                         </th>
@@ -289,24 +272,13 @@
 
                       <tr>
                         <th>
-                          <label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >环流时间(h)<span style="color: red">*</span></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">环流时间(h)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.circulationUseTime"
-                                ng-readonly="isNotEdit"
-                                name="circulationUseTime"
-                                validNumber="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.circulationUseTime" ng-readonly="isNotEdit"
+                                name="circulationUseTime" validNumber="true" />
                             </label>
                           </section>
                         </th>
@@ -377,23 +349,14 @@
                           </section>
                         </th>
                         <th>
-                          <label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >最后补药量(kg)</label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">最后补药量(kg)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
+                              <input class="form-control" type="text"
                                 ng-model="fumigationProcess.lastSupplementDrugCount"
-                                ng-readonly="isNotEdit"
-                                name="lastSupplementDrugCount"
-                                validNumber="true"
-                              />
+                                ng-readonly="isNotEdit" name="lastSupplementDrugCount" validNumber="true" />
                             </label>
                           </section>
                         </th>
@@ -422,26 +385,13 @@
 
                       <tr>
                         <th>
-                          <label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >总补药量(kg)<span style="color: red"
-                              >*</span
-                            ></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">总补药量(kg)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.totalSupplementDrugCount"
-                                ng-readonly="isNotEdit"
-                                name="totalSupplementDrugCount"
-                                validNumber="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.totalSupplementDrugCount"
+                                ng-readonly="isNotEdit" name="totalSupplementDrugCount" validNumber="true" />
                             </label>
                           </section>
                         </th>
@@ -1018,123 +968,60 @@
                           <label class="label" style="margin-top: 50%; text-align: center" >散气情况</label>
                         </th>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >散气开始时间<span style="color: red"
-                              >*</span
-                            ></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">散气开始时间</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                type="text"
-                                class="form-control"
-                                ng-model="fumigationProcess.bulkStartTime"
-                                name="bulkStartTime"
-                                onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
-                                ng-disabled="isNotEdit"
-                                required
-                              />
+                              <input type="text" class="form-control" ng-model="fumigationProcess.bulkStartTime" name="bulkStartTime"
+                                onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="isNotEdit" />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >散气结束时间<span style="color: red"
-                              >*</span
-                            ></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">散气结束时间</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                type="text"
-                                class="form-control"
-                                ng-model="fumigationProcess.bulkEndTime"
-                                name="bulkEndTime"
-                                onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
-                                ng-disabled="isNotEdit"
-                                required
-                              />
+                              <input type="text" class="form-control" ng-model="fumigationProcess.bulkEndTime" name="bulkEndTime"
+                                onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="isNotEdit" />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >散气日期<span style="color: red">*</span></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">散气日期</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"
-                                required
-                              />
+                              <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" />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label
-                            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;">*</span></label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.perforatedDays"
-                                ng-readonly="isNotEdit"
-                                name="perforatedDays"
-                                validInteger="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.perforatedDays"
+                                ng-readonly="isNotEdit" name="perforatedDays" validInteger="true" required />
                             </label>
                           </section>
                         </th>
                       </tr>
                       <tr>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >密闭时间(天)</label
-                          >
+                          <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.closedTime"
-                                ng-readonly="isNotEdit"
-                                name="closedTime"
-                                validInteger="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.closedTime"
+                                ng-readonly="isNotEdit" name="closedTime" validInteger="true" />
                             </label>
                           </section>
                         </th>
@@ -1161,124 +1048,59 @@
                           </section>
                         </th>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >散气结束前磷化氢浓度(ppm)<span style="color: red"
-                              >*</span
-                            ></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">散气结束前磷化氢浓度(ppm)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.perforatedBefore"
-                                ng-readonly="isNotEdit"
-                                name="perforatedBefore"
-                                validNumber="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.perforatedBefore"
+                                ng-readonly="isNotEdit" name="perforatedBefore" validNumber="true" />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >散气结束时磷化氢浓度(ppm)<span style="color: red"
-                              >*</span
-                            ></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">散气结束时磷化氢浓度(ppm)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.perforatedEnd"
-                                ng-readonly="isNotEdit"
-                                name="perforatedEnd"
-                                validNumber="true"
-                                required
-                              />
+                              <input class="form-control" type="text"
+                                ng-model="fumigationProcess.perforatedEnd" ng-readonly="isNotEdit" name="perforatedEnd" validNumber="true" />
                             </label>
                           </section>
                         </th>
                       </tr>
                       <tr>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >散气方法<span style="color: red">*</span></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">散气方法<span style="color: red">*</span></label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.bulkGasType"
-                                ng-readonly="isNotEdit"
-                                name="bulkGasType"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.bulkGasType"
+                                     ng-readonly="isNotEdit" name="bulkGasType" required />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >药剂残留率(ppm)<span style="color: red"
-                              >*</span
-                            ></label
-                          >
+                          <label class="label" style="margin-top: 9px; text-align: center">药剂残留率(ppm)</label>
                         </th>
                         <th>
                           <section>
                             <label class="input">
-                              <input
-                                class="form-control"
-                                type="text"
-                                ng-model="fumigationProcess.drugResidueRate"
-                                ng-readonly="isNotEdit"
-                                name="drugResidueRate"
-                                validNumber="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.drugResidueRate"
+                                ng-readonly="isNotEdit" name="drugResidueRate" validNumber="true" />
                             </label>
                           </section>
                         </th>
                         <th>
-                          <label
-                            label
-                            class="label"
-                            style="margin-top: 9px; text-align: center"
-                            >批准人</label
-                          >
+                          <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.perforatedApprover"
-                                ng-readonly="isNotEdit"
-                                name="perforatedApprover"
-                                setState="true"
-                                required
-                              />
+                              <input class="form-control" type="text" ng-model="fumigationProcess.perforatedApprover"
+                                ng-readonly="isNotEdit" name="perforatedApprover" setState="true" />
                             </label>
                           </section>
                         </th>

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -1830,12 +1830,12 @@
                             <!--<li has-func="" data-ui-sref-active="active">-->
                             <!--<a data-ui-sref="app.intelligent.basicgraindistributionset">粮情传感器分布设置</a>-->
                             <!--</li>-->
-                            <li has-func="377" data-ui-sref-active="active">
-                                <a data-ui-sref="app.intelligent.basicData.basicThresholdSetList">报警阀值设置</a>
-                            </li>
-                            <li has-func="378" data-ui-sref-active="active">
-                                <a data-ui-sref="app.intelligent.basicData.StationSet">通讯设置</a>
-                            </li>
+<!--                            <li has-func="377" data-ui-sref-active="active">-->
+<!--                                <a data-ui-sref="app.intelligent.basicData.basicThresholdSetList">报警阀值设置</a>-->
+<!--                            </li>-->
+<!--                            <li has-func="378" data-ui-sref-active="active">-->
+<!--                                <a data-ui-sref="app.intelligent.basicData.StationSet">通讯设置</a>-->
+<!--                            </li>-->
                             <li has-func="379" data-ui-sref-active="active">
                                 <a data-ui-sref="app.intelligent.basicData.stationType">站点类型</a>
                             </li>

src/main/resources/static/app/storage/drug/drugStorage/controller/drugStorageSaveCtrl.js

@@ -57,6 +57,11 @@ angular.module('app.storage').controller("drugStorageSaveCtrl", function ($scope
         return this.optional(element) || (checkNumber.test(value));
     }, "请输入正确的不为0的数字整数！");
 
+    $.validator.addMethod("validNumberD",function(value,element, params) {
+        var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的数字类型，最多两位小数！");
+
 
     // 获取药品信息列表.
     $scope.getDrugInfoList = function () {

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

@@ -134,7 +134,7 @@
                                             <label class="label">入库单价</label>
                                             <label class="input"> 
                                                 <input class="form-control" type="text" ng-model="drugStorage.storagePrice" ng-readonly="isNotEdit" name="storagePrice"
-                                                ng-change="countMoneyQuantity()" validNumber="true">
+                                                ng-change="countMoneyQuantity()" validNumberD="true">
                                             </label>
                                         </section>
                                         <section class="col col-4">

src/main/resources/static/gulpfile.js

@@ -78,6 +78,7 @@ gulp.task('connect', function() {
             return [
                 createProxyMiddleware('/proxy', {
                     target: 'http://172.16.0.16:9025',//代理的目标地址
+                    secure: false,//这是签名认证，http和HTTPS区分的参数设置
                     changeOrigin: true,//
                     pathRewrite: {//路径重写规则 
                         '/proxy': ''