Merge branch 'master' of http://kpt.kptyun.cn:3000/duanxiaoduan/tmr-admin

src/views/shedProduction/dungScores/historyRecord.vue

@@ -164,7 +164,9 @@ export default {
     },
 
     handleSearch() {
-      if (this.table.getdataListParm.parammaps.changetime == '') {
+      console.log(this.table.getdataListParm.parammaps.changetime)
+
+        if (this.table.getdataListParm.parammaps.changetime == '' || this.table.getdataListParm.parammaps.changetime == null ) {
         this.table.getdataListParm.parammaps.changetime = ''
       } else {
         this.table.getdataListParm.parammaps.changetime = parseTime(this.table.getdataListParm.parammaps.changetime, '{y}-{m}-{d}')

src/views/shedProduction/fecalScreen/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" :clearable="true" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
@@ -169,7 +169,7 @@ export default {
     },
 
     handleSearch() {
-      if (this.table.getdataListParm.parammaps.operatetime == '') {
+      if (this.table.getdataListParm.parammaps.operatetime == '' || this.table.getdataListParm.parammaps.operatetime == null ) {
         this.table.getdataListParm.parammaps.operatetime = ''
       } else {
         this.table.getdataListParm.parammaps.operatetime = parseTime(this.table.getdataListParm.parammaps.operatetime, '{y}-{m}-{d}')

src/views/shedProduction/formulaDryMatter/historyRecord.vue

@@ -208,7 +208,8 @@ export default {
       }
     },
     handleSearch() {
-      if (this.table.getdataListParm.parammaps.changeTime == '') {
+      console.log(this.table.getdataListParm.parammaps.changeTime)
+      if (this.table.getdataListParm.parammaps.changeTime == '' || this.table.getdataListParm.parammaps.changeTime == null ) {
         this.table.getdataListParm.parammaps.changeTime = ''
       } else {
         this.table.getdataListParm.parammaps.changeTime = parseTime(this.table.getdataListParm.parammaps.changeTime, '{y}-{m}-{d}')

src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="true"  placeholder="年/月/日" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
@@ -225,7 +225,7 @@ export default {
       }
     },
     handleSearch() {
-      if (this.table.getdataListParm.parammaps.operatetime == '') {
+      if (this.table.getdataListParm.parammaps.operatetime == '' || this.table.getdataListParm.parammaps.operatetime == null ) {
         this.table.getdataListParm.parammaps.operatetime = ''
       } else {
         this.table.getdataListParm.parammaps.operatetime = parseTime(this.table.getdataListParm.parammaps.operatetime, '{y}-{m}-{d}')

src/views/shedProduction/physicalConditionScore/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日"  :clearable="true"/>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
@@ -164,7 +164,16 @@ export default {
     },
 
     handleSearch() {
-      this.table.getdataListParm.parammaps.changetime = parseTime(this.table.getdataListParm.parammaps.changetime, '{y}-{m}-{d}')
+console.log(this.table.getdataListParm.parammaps.changetime)
+
+        if (this.table.getdataListParm.parammaps.changetime == '' || this.table.getdataListParm.parammaps.changetime == null ) {
+        this.table.getdataListParm.parammaps.changetime = ''
+      } else {
+        this.table.getdataListParm.parammaps.changetime = parseTime(this.table.getdataListParm.parammaps.changetime, '{y}-{m}-{d}')
+      }
+
+      
+      // this.table.getdataListParm.parammaps.changetime = parseTime(this.table.getdataListParm.parammaps.changetime, '{y}-{m}-{d}')
       this.getList()
     },
     handleRefresh() {