Browse Source

Merge remote-tracking branch 'origin/master'

wang_xy 1 năm trước cách đây
mục cha
commit
1839aff1f7
1 tập tin đã thay đổi với 1 bổ sung31 xóa
  1. 1 31
      songhua-ui/src/views/ship/index.vue

+ 1 - 31
songhua-ui/src/views/ship/index.vue

@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="游船时间" prop="shipTime">
-        <el-date-picker clearable
-                        v-model="queryParams.shipTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择游船时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -42,28 +34,6 @@
           v-hasPermi="['system:mapping:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:mapping:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:mapping:remove']"
-        >删除</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -180,7 +150,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      listMapping(this.queryParams).then(response => {
+      listMapping(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.mappingList = response.rows;
         this.total = response.total;
         this.loading = false;