suwenjiang преди 1 седмица
родител
ревизия
c5845c0a37
променени са 2 файла, в които са добавени 16 реда и са изтрити 24 реда
  1. 4 5
      src/views/staff/list.vue
  2. 12 19
      src/views/table/index.vue

+ 4 - 5
src/views/staff/list.vue

@@ -7,7 +7,6 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      
     >
       <el-form-item :label="$t('employee.employeeCategory')" prop="category">
         <el-select
@@ -48,8 +47,8 @@
           clearable
           style="width: 240px"
         >
-          <el-option :key="A" :label="$t('employee.enabled')" :value="A" />
-          <el-option :key="N" :label="$t('employee.disabled')" :value="N" />
+          <el-option key="A" :label="$t('employee.enabled')" value="A" />
+          <el-option key="N" :label="$t('employee.disabled')" value="N" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -138,7 +137,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-hasPermi="['staff:list']"
+            v-hasPermi="['staff:edit']"
             @click="handleUpdate(scope.row)"
           >
             {{ $t('employee.modify') }}
@@ -172,7 +171,7 @@
       width="700px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" >
+      <el-form ref="form" :model="form" :rules="rules">
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('employee.employeeCategory')" prop="category">

+ 12 - 19
src/views/table/index.vue

@@ -7,7 +7,6 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      
     >
       <el-form-item :label="$t('tableManagement.tableCode')" prop="tableNumber">
         <el-input
@@ -28,12 +27,12 @@
           <el-option
             :key="$t('tableManagement.enabledKey')"
             :label="$t('tableManagement.enabled')"
-            :value="A"
+            :value="0"
           />
           <el-option
             :key="$t('tableManagement.disabledKey')"
             :label="$t('tableManagement.disabled')"
-            :value="N"
+            :value="1"
           />
         </el-select>
       </el-form-item>
@@ -152,7 +151,7 @@
       width="800px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" >
+      <el-form ref="form" :model="form" :rules="rules">
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('tableManagement.tableEncoding')" prop="tableNumber">
@@ -443,21 +442,15 @@ export default {
     handleDelete(row) {
       const code = row.tableNumber || this.id
       const confirmMsg = this.$t('tableManagement.confirmDeleteTableCode', { tableCode: code })
-      this.$modal
-        .confirm(confirmMsg)
-        .then(async () => {
-          try {
-            await deleteTableInfo(row.id)
-            this.$modal.msgSuccess(this.$t('tableManagement.deleteSuccess'))
-            this.getList()
-          } catch (error) {
-            console.log('error', error)
-          }
-
-        })
-        
-
-
+      this.$modal.confirm(confirmMsg).then(async () => {
+        try {
+          await deleteTableInfo(row.id)
+          this.$modal.msgSuccess(this.$t('tableManagement.deleteSuccess'))
+          this.getList()
+        } catch (error) {
+          console.log('error', error)
+        }
+      })
     }
   }
 }