wans

src/views/sb/info/modules/BaseForm.vue

@@ -278,7 +278,7 @@
             </a-col>
             <a-col :lg="12" :md="24" :sm="24">
               <a-form-item label="检定周期" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
-                <a-input style="width: 100%" suffix="月" :formatter="BaseTool.Amount.formatter" :parser="BaseTool.Amount.parser" v-decorator="['checkPeriod']" />
+                <a-input style="width: 100%" suffix="月" :formatter="BaseTool.Amount.formatter" :parser="BaseTool.Amount.parser" v-decorator="['checkPeriod', { rules: [{required: isSelfRequired, message: '检定周期不能为空'}]}]" />
               </a-form-item>
             </a-col>
             <a-col :lg="12" :md="24" :sm="24">

src/views/sb/info/modules/BaseFormMeasure.vue

@@ -25,14 +25,14 @@
             <tr>
               <th width="100px">序号</th>
               <!-- <th width="150px">是否在库</th> -->
-              <th width="150px">设备名称</th>
+              <!-- <th width="150px">设备名称</th>
               <th width="150px">型号</th>
-              <th width="150px">出厂编号</th>
+              <th width="150px">出厂编号</th> -->
               <!-- <th width="150px">是否是子设备</th>-->
               <!-- <th width="150px">设备位置</th> -->
               <!-- <th width="350px">选择父设备</th> -->
               <th width="150px">设备位号</th>
-              <!-- <th width="150px">检定周期</th> -->
+              <th width="150px">检定周期</th>
               <th width="150px">检定日期</th>
               <th width="150px">下次检定日期</th>
               <th width="150px">检定单号</th>
@@ -48,9 +48,9 @@
                 <a-icon slot="checkedChildren" type="check" />
                 <a-icon slot="unCheckedChildren" type="close" />
               </a-switch></td> -->
-              <td>{{ item.sbName }}</td>
+              <!-- <td>{{ item.sbName }}</td>
               <td>{{ item.sbModel }}</td>
-              <td><div> {{ item.zzh }}</div></td>
+              <td><div> {{ item.zzh }}</div></td> -->
               <!--              <td>
                 <a-switch v-model="item.isChild" >
                   <a-icon slot="checkedChildren" type="check" />
@@ -93,7 +93,9 @@
                   <a-button v-if="item.isChild === 1" type="primary" @click="handleSbNoSelect(item.sbParentId,i)">选择</a-button>
                 </div> -->
               </td>
-              <!-- <td><a-input v-model="item.checkPeriod" suffix="月" /></td> -->
+              <td> {{ item.checkPeriod }}
+                <!-- <a-input v-model="item.checkPeriod" suffix="月" /> -->
+              </td>
               <td>
                 <a-date-picker
                   placeholder="日期"
@@ -102,13 +104,13 @@
                   v-model="item.lastDate" />
                 <a-button type="primary" @click="handlePace(item.lastDate,'lastDate')">同步</a-button>
               </td>
-              <!-- <td>{{ validity(item.lastDate,item.checkPeriod) }}</td> -->
-              <td>  <a-date-picker
+              <td>{{ validity(item.lastDate,item.checkPeriod,item) }}</td>
+              <!-- <td>  <a-date-picker
                       placeholder="日期"
                       style="width: 150px"
                       :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
                       v-model="item.youXiaoDate" />
-                <a-button type="primary" @click="handlePace(item.youXiaoDate,'youXiaoDate')">同步</a-button></td>
+                <a-button type="primary" @click="handlePace(item.youXiaoDate,'youXiaoDate')">同步</a-button></td> -->
 
               <td><a-input style="width: 150px" v-model="item.no" /><a-button type="primary" @click="handlePace(item.no,'no')">同步</a-button></td>
               <td><a-input style="width: 150px" v-model="item.requirement" /><a-button type="primary" @click="handlePace(item.requirement,'requirement')">同步</a-button></td>
@@ -223,7 +225,7 @@ export default {
 
   },
   methods: {
-    validity (lastDate, checkPeriod) {
+    validity (lastDate, checkPeriod, record) {
       if (lastDate === '') return ''
       lastDate = this.BaseTool.Date.formatter(lastDate, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN).split('-')
       lastDate[1] = (parseInt(lastDate[1]) + parseInt(checkPeriod)) % 12
@@ -231,6 +233,7 @@ export default {
       if (lastDate[1] === 0) {
         lastDate[1] = 12
       }
+      record.youXiaoDate = lastDate.join('-')
       return lastDate.join('-')
     },
     base (record, type) {
@@ -241,7 +244,7 @@ export default {
         const data = {
           sbName: item.name,
           sbModel: item.model,
-          // checkPeriod: item.checkPeriod || 0,
+          checkPeriod: item.checkPeriod || 0,
           isChild: item.isChild,
           parentSbName: item.parentSbName,
           sbParentId: item.parentId,
@@ -404,7 +407,7 @@ export default {
           const data = {
             sbName: item.name,
             sbModel: item.model,
-            // checkPeriod: item.checkPeriod || 0,
+            checkPeriod: item.checkPeriod || 0,
             isChild: item.isChild,
             parentSbName: item.parentSbName,
             sbParentId: item.parentId,