收费修改

src/views/finance/charge/index.vue

@@ -19,15 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="对账日期" prop="fAccbilldate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="tableFilter.fAccbilldate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择账单日期"
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="结算单位" prop="fCorpid">
         <el-select
           v-model="tableFilter.fCorpid"
@@ -47,6 +38,19 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="对账日期" prop="fAccbilldate">
+        <el-date-picker
+          type="daterange"
+          size="small"
+          style="width: 300px"
+          v-model="tableFilter.fAccbilldate"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:59:59']"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -311,7 +315,7 @@
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button v-if="approve === true">审批</el-button>
-        <el-button type="info" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
+        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
         <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
         <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -965,6 +969,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false
+      this.approve = false
       this.reset()
     },
     // 表单重置
@@ -994,6 +999,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1
       this.getList()
+      console.log(this.tableFilter)
     },
     /** 导入搜索 */
     importSearch() {