新增计量期增加必填判断

app/controller/measure_controller.js

@@ -107,6 +107,9 @@ module.exports = app => {
                 }
                 const date = ctx.request.body.date;
                 const period = ctx.request.body.period;
+                if (!date || !period) {
+                    throw '请选择计量年月和开始-截止日期';
+                }
                 const newStage = await ctx.service.stage.addStage(ctx.tender.id, date, period);
                 if (!newStage) {
                     throw '新增计量期失败，请重试';

app/public/js/measure_stage.js

@@ -87,6 +87,14 @@ $('a[data-target="#sp-list" ]').on('click', function () {
 });
 
 function checkValidForm() {
+    if ($('#add-qi input[name="date"]').val() === '') {
+        toastr.error('请选择计量年月');
+        return false;
+    }
+    if ($('#add-qi input[name="period"]').val() === '') {
+        toastr.error('请选择开始-截止日期');
+        return false;
+    }
     $('#add-stage-btn').attr('disabled', true);
     $('#hide-all').show();
     return true;

app/view/measure/stage_modal.ejs

@@ -13,12 +13,12 @@
                     <input class="form-control form-control-sm" value="第 <%- stages.length + 1 %> 期" type="text" readonly="">
                 </div>
                 <div class="form-group">
-                    <label>计量年月</label>
-                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text" name="date" autocomplete="off">
+                    <label>计量年月<b class="text-danger">*</b></label>
+                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" readonly placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text" name="date" autocomplete="off">
                 </div>
                 <div class="form-group">
-                    <label>开始-截止日期</label>
-                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text" name="period" autocomplete="off">
+                    <label>开始-截止日期<b class="text-danger">*</b></label>
+                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" readonly placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text" name="period" autocomplete="off">
                 </div>
             </div>
             <div class="modal-footer">
@@ -116,7 +116,7 @@
 <!--设置-->
 <div class="modal fade" id="edit" data-backdrop="static">
     <div class="modal-dialog" role="document">
-        <form class="modal-content" action="<%- preUrl + '/measure/save' %>" method="post">
+        <form class="modal-content" action="<%- preUrl + '/measure/save' %>" method="post" onsubmit="return checkForm();">
             <div class="modal-header">
                 <h5 class="modal-title">期编辑</h5>
             </div>
@@ -126,12 +126,12 @@
                     <input class="form-control form-control-sm" value="第 <%- stages[0].order %> 期" type="text" readonly="" name="name">
                 </div>
                 <div class="form-group">
-                    <label>计量年月</label>
-                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" id="edit-date" name="date" placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text">
+                    <label>计量年月<b class="text-danger">*</b></label>
+                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" readonly id="edit-date" name="date" placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text">
                 </div>
                 <div class="form-group">
-                    <label>开始-截止日期</label>
-                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" id="edit-period" name="period" placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text">
+                    <label>开始-截止日期<b class="text-danger">*</b></label>
+                    <input class="datepicker-here form-control form-control-sm" autocomplete="off" readonly id="edit-period" name="period" placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text">
                 </div>
             </div>
             <div class="modal-footer">
@@ -162,6 +162,17 @@
     if (period.length > 0) {
         editPeriod.selectDate(period);
     }
+
+    function checkForm () {
+        if ($('#edit-date').val() == '') {
+            toastr.error('请选择计量年月');
+            return false;
+        }
+        if ($('#edit-period').val() == '') {
+            toastr.error('请选择开始-截止日期');
+            return false;
+        }
+    }
     <% } %>
     $('.datepicker-here').datepicker({
         autoClose: true,