检定完善

src/views/check/checkjob/CheckJob.vue

@@ -394,8 +394,8 @@ export default {
     },
     handleOk () {
       this.visible = true
-      this.queryParam.searchStartTime = this.queryParam.searchStartTime ? this.queryParam.searchStartTime.format(this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
-      this.queryParam.searchEndTime = this.queryParam.searchEndTime ? this.queryParam.searchEndTime.format(this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
+      this.queryParam.searchStartTime = this.queryParam.searchStartTime ? this.BaseTool.Date.formatter(this.queryParam.searchStartTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
+      this.queryParam.searchEndTime = this.queryParam.searchEndTime ? this.BaseTool.Date.formatter(this.queryParam.searchEndTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
       this.$refs.table.refresh()
     },
     onSelectChange (selectedRowKeys, selectedRows) {

src/views/sb/measurelog/MeasureLog.vue

@@ -28,7 +28,7 @@
           </a-col>
           <a-col :md="8 || 24" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button type="primary" @click="handleOk">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
             </span>
           </a-col>
@@ -97,7 +97,7 @@
         </template>
       </span>
     </s-table>
-    <base-form ref="baseModal" :check-type="checkType" @ok="handleOk"/>
+    <base-form ref="baseModal" @ok="handleOk"/>
     <detail ref="detailModal"/>
   </a-card>
 </template>
@@ -127,6 +127,8 @@ export default {
     return {
       // 查询参数
       queryParam: {
+        searchStartTime: null,
+        searchEndTime: null
       },
       // 表头
       columns: [
@@ -284,8 +286,8 @@ export default {
       })
     },
     handleOk () {
-      this.queryParam.searchStartTime = this.queryParam.searchStartTime ? this.queryParam.searchStartTime.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
-      this.queryParam.searchEndTime = this.queryParam.searchEndTime ? this.queryParam.searchEndTime.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+      this.queryParam.searchStartTime = this.queryParam.searchStartTime ? this.BaseTool.Date.formatter(this.queryParam.searchStartTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+      this.queryParam.searchEndTime = this.queryParam.searchEndTime ? this.BaseTool.Date.formatter(this.queryParam.searchEndTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
       this.$refs.table.refresh()
     },
     onSelectChange (selectedRowKeys, selectedRows) {

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

@@ -70,6 +70,16 @@
               v-decorator="['nextCheckDate']"/>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="测量编号"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['cardNo']"/>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="检定周期"
@@ -505,6 +515,7 @@ export default {
           'sbNo',
           'checkDate',
           'nextCheckDate',
+          'cardNo',
           'checkPeriod',
           'checkUserId',
           'periodType',
@@ -690,6 +701,7 @@ export default {
           'sbModel': row.model,
           'checkDate': row.checkDate,
           'checkPeriod': row.checkPeriod,
+          'cardNo': row.cardNo,
           'nextCheckDate': row.nextCheckDate
         }))
       })