城市创建调整

src/api/city.js

@@ -38,7 +38,7 @@ export function updateCity(data) {
   })
 }
 
-export function deleteTopic(data) {
+export function deleteCity(data) {
   return request({
     url: '/city/delete',
     method: 'post',

src/views/config/city.vue

@@ -1,127 +1,63 @@
 <template>
   <div class="app-container">
-    <!-- 查询和其他操作
+    <!-- 查询和其他操作-->
     <div class="filter-container">
-      <el-input v-model="listQuery.title" clearable class="filter-item" style="width: 200px;" placeholder="请输入专题标题" />
-      <el-input v-model="listQuery.subtitle" clearable class="filter-item" style="width: 200px;" placeholder="请输入专题子标题" />
-      <el-select v-model="listQuery.sort" class="filter-item" placeholder="请选择排序字段">
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      <el-input v-model="listQuery.cityName" clearable class="filter-item" style="width: 200px;" placeholder="请输入城市" />
+
+      <el-select v-model="listQuery.cityLevel" class="filter-item" placeholder="请选择等级" clearable>
+        <el-option v-for="(value, key) in levels" :key="key" :label="value" :value="key" />
       </el-select>
-      <el-button v-permission="['GET /admin/city/list']" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
-      <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
-    </div>-->
+      <el-button v-permission="['GET /admin/city/list']" class="filter-item" type="primary" icon="el-icon-search"
+        @click="handleFilter">查找</el-button>
+      <!-- <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button> -->
+    </div>
 
     <!--<div class="operator-container"> -->
     <div class="filter-container">
-      <el-button
-        v-permission="['POST /admin/city/create']"
-        class="filter-item"
-        type="primary"
-        icon="el-icon-edit"
-        @click="handleCreate"
-        >添加</el-button
-      >
+      <el-button v-permission="['POST /admin/city/create']" class="filter-item" type="primary" icon="el-icon-edit"
+        @click="handleCreate">添加</el-button>
       <!--<el-button v-permission="['GET /admin/city/batch-delete']" class="filter-item" type="danger" icon="el-icon-delete" @click="handleBatchDelete">批量删除</el-button>-->
     </div>
 
     <!-- 查询结果 -->
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      element-loading-text="正在查询中。。。"
-      border
-      fit
-      highlight-current-row
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="listLoading" :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row
+      @selection-change="handleSelectionChange">
       <!--<el-table-column type="selection" width="55" />-->
+      <el-table-column align="center" label="省份" prop="province" />
+      <el-table-column align="center" label="城市" prop="cityName" />
+      <el-table-column align="center" label="城市等级" prop="cityLevel" />
+      <el-table-column align="center" label="城市位置" prop="cityCenter" />
+      <el-table-column align="center" label="创建时间" prop="createTime" /> 
 
-      <el-table-column align="center" label="业务城市" prop="cityName" />
-
-      <el-table-column align="center" label="位置编码" prop="areaId" />
-
-      <el-table-column align="center" label="默认门店" prop="defaultShopName" />
-
-      <el-table-column align="center" label="分站地址" prop="cityAddress" />
-
-      <el-table-column
-        align="center"
-        label="操作"
-        min-width="100"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column align="center" label="操作" min-width="100" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            v-permission="['POST /admin/city/update']"
-            type="primary"
-            size="mini"
-            @click="handleUpdate(scope.row)"
-            >编辑</el-button
-          >
-          <!-- <el-button v-permission="['POST /admin/city/delete']" type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>-->
+          <el-button v-permission="['POST /admin/city/update']" type="primary" size="mini"
+            @click="handleUpdate(scope.row)">编辑</el-button>
+          <el-button v-permission="['POST /admin/city/delete']" type="danger" size="mini" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.limit"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit"
+      @pagination="getList" />
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form
-        ref="dataForm"
-        :rules="rules"
-        :model="dataForm"
-        status-icon
-        label-position="left"
-        label-width="100px"
-        style="width: 500px; margin-left:50px;"
-      >
-        <el-form-item label="业务城市" prop="cityName">
-          <el-input v-model="dataForm.cityName" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="位置编码" prop="areaId">
-          <el-input
-            v-model="dataForm.areaId"
-            type="number"
-            placeholder="请输入城市编码"
-          />
-        </el-form-item>
-        <el-form-item label="分站地址" prop="cityAddress">
-          <el-input
-            v-model="dataForm.cityAddress"
-            placeholder="请输入分站地址"
-          />
+      <el-form ref="dataForm" :rules="rules" :model="dataForm" status-icon label-position="left" label-width="100px"
+        style="width: 300px; margin-left:50px;">
+        <el-form-item label="城市名称" prop="cityName">
+          <el-input :readonly="dialogStatus == 'update'" v-model="dataForm.cityName" placeholder="请输入城市名称" />
         </el-form-item>
-        <el-form-item label="默认门店" prop="shops">
-          <el-select
-            v-model="dataForm.defaultShopId"
-            style="width:100%"
-            placeholder="默认哪个门店"
-            clearable
-          >
-            <el-option
-              v-for="item in shops"
-              :key="item.id"
-              :label="item.shopName"
-              :value="item.id"
-            />
+        <el-form-item label="城市级别" prop="cityLevel">
+          <el-select v-model="dataForm.cityLevel" class="filter-item" placeholder="请选择等级" clearable>
+            <el-option v-for="(value, key) in levels" :key="key" :label="value" :value="key" />
           </el-select>
         </el-form-item>
+        
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取消</el-button>
-        <el-button
-          v-if="dialogStatus == 'create'"
-          type="primary"
-          @click="createData"
-          >确定</el-button
-        >
+        <el-button v-if="dialogStatus == 'create'" type="primary" @click="createData">确定</el-button>
         <el-button v-else type="primary" @click="updateData">确定</el-button>
       </div>
     </el-dialog>
@@ -136,6 +72,7 @@
 .el-table th.gutter {
   display: table-cell !important;
 }
+
 .el-dialog {
   width: 800px;
 }
@@ -159,6 +96,7 @@ export default {
   components: { BackToTop, Pagination },
   data() {
     return {
+      levels: { "A": "A.直辖市", "B": "B.一线城市", "C": "C.地级市" },
       list: [],
       total: 0,
       listLoading: true,
@@ -166,14 +104,14 @@ export default {
         page: 1,
         limit: 20,
         sort: "create_time",
-        order: "desc"
+        order: "desc",
+        cityName: '',
+        cityLevel: ''
       },
       dataForm: {
         id: undefined,
-        cityName: "",
-        areaId: undefined,
-        cityAddress: undefined,
-        defaultShopId: ""
+        cityName: "", 
+        cityLevel: ""
       },
       shops: [],
       dialogFormVisible: false,
@@ -183,7 +121,8 @@ export default {
         create: "创建"
       },
       rules: {
-        cityName: [{ required: true, message: "名称不能为空", trigger: "blur" }]
+        cityName: [{ required: true, message: "城市名称不能为空", trigger: "blur" }],
+        cityLevel:[{ required: true, message: "城市级别不能为空", trigger: "blur" }]
       },
       options: [
         {
@@ -307,7 +246,7 @@ export default {
         .then(response => {
           this.$notify.success({
             title: "成功",
-            message: "停用城市成功"
+            message: "删除城市成功"
           });
           const index = this.list.indexOf(row);
           this.list.splice(index, 1);
@@ -332,7 +271,7 @@ export default {
         return;
       }
       const ids = [];
-      _.forEach(this.multipleSelection, function(item) {
+      _.forEach(this.multipleSelection, function (item) {
         ids.push(item.id);
       });
       batchDeleteTopic({ ids: ids })
@@ -349,34 +288,7 @@ export default {
             message: response.data.errmsg
           });
         });
-    },
-    handleDownload() {
-      this.downloadLoading = true;
-      import("@/vendor/Export2Excel").then(excel => {
-        const tHeader = [
-          "专题ID",
-          "专题标题",
-          "专题子标题",
-          "专题内容",
-          "专题图片",
-          "商品低价",
-          "阅读量",
-          "专题商品"
-        ];
-        const filterVal = [
-          "id",
-          "title",
-          "subtitle",
-          "content",
-          "picUrl",
-          "price",
-          "readCount",
-          "goods"
-        ];
-        excel.export_json_to_excel2(tHeader, this.list, filterVal, "专题信息");
-        this.downloadLoading = false;
-      });
-    }
+    }, 
   }
 };
 </script>