feat()：修改bug

src/views/city/list.vue

@@ -28,6 +28,13 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column class-name="status-col" label="排序" width="80ß">
+        <template slot-scope="{row}">
+          <el-tag type="success">
+            {{ row.sort }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="Actions" width="190" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleUpdate(scope)">
@@ -45,6 +52,9 @@
         <el-form-item label="城市" prop="name">
           <el-input v-model="temp.name" />
         </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="temp.sort" placeholder="倒序" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
@@ -88,7 +98,8 @@ export default {
       },
       temp: {
         id: undefined,
-        name: ''
+        name: '',
+        sort: 0
       },
       dialogFormVisible: false,
       dialogStatus: '',

src/views/join/list.vue

@@ -46,7 +46,7 @@
       <el-table-column class-name="status-col" label="状态" width="80px">
         <template slot-scope="{row}">
           <el-tag :type="row.status | statusFilter">
-            {{ row.status == '1' ? "已处理" : "未处理" }}
+            {{ row.status | statusFilterTxt }}
           </el-tag>
         </template>
       </el-table-column>
@@ -58,8 +58,8 @@
                 查看
               </el-button>
             </router-link>
-            <el-button type="info" size="mini" icon="el-icon-s-check" :disabled="scope.row.status == '1' ? true : false" @click="handleUpdate(scope)">
-              {{ scope.row.status == '1' ? '已处理' : '处理' }}
+            <el-button type="primary" size="mini" icon="el-icon-s-check" :disabled="(scope.row.status === 1 || scope.row.status === 3)" @click="handleUpdate(scope)">
+              {{ scope.row.status === 1 || scope.row.status === 3 ? '已处理' : '处理' }}
             </el-button>
             <!--<el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px;" @click="handleDelete(scope)">
               删除
@@ -70,11 +70,19 @@
     </el-table>
 
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.pageSize" @pagination="getList" />
-    <el-dialog title="处理备注" :visible.sync="dialogFormVisible">
+    <el-dialog title="处理" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="备注" prop="mark">
+        <el-form-item label="理由" prop="mark">
           <el-input v-model="temp.mark" />
         </el-form-item>
+        <el-form-item label="处理意见" prop="mark">
+          <template>
+            <el-radio-group v-model="temp.status">
+              <el-radio :label="1">同意</el-radio>
+              <el-radio :label="3">拒绝</el-radio>
+            </el-radio-group>
+          </template>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
@@ -101,11 +109,20 @@ export default {
     statusFilter(status) {
       const statusMap = {
         1: 'success',
-        draft: 'info',
+        3: 'info',
         0: 'danger'
       }
       return statusMap[status]
     },
+    statusFilterTxt(status) {
+      const statusMap = {
+        1: '同意',
+        3: '拒绝',
+        0: '未处理',
+        2: '删除'
+      }
+      return statusMap[status]
+    },
     positionFilter(status) {
       const statusMap = {
         'HOME': 'success',
@@ -126,7 +143,8 @@ export default {
       },
       temp: {
         id: undefined,
-        mark: ''
+        mark: '',
+        status: ''
       },
       dialogFormVisible: false
     }