fix:1.桌号的接口重新对接和修改。

src/api/table.js

@@ -1,18 +1,32 @@
 import request from '@/utils/request'
 
 // 分页查询桌码列表
+// export function getTableList(query) {
+//   return request({
+//     url: 'backendApi/table/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
 export function getTableList(query) {
   return request({
-    url: 'backendApi/table/list',
+    url: 'backendApi/table_info/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询桌码信息
+// export function getTableInfo(tableId) {
+//   return request({
+//     url: 'backendApi/table/info/' + tableId,
+//     method: 'get'
+//   })
+// }
+// 查询桌码信息
 export function getTableInfo(tableId) {
   return request({
-    url: 'backendApi/table/info/' + tableId,
+    url: 'backendApi/table_info/info/' + tableId,
     method: 'get'
   })
 }
@@ -65,3 +79,11 @@ export function addTableInfo(data) {
     data: data
   })
 }
+// 删除桌码信息
+export function deleteTableInfo(data) {
+  return request({
+    url: '/backendApi/table_info/delete/' + data,
+    method: 'post',
+    data: data
+  })
+}

src/views/table/index.vue

@@ -9,19 +9,19 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item :label="$t('tableManagement.tableCode')" prop="code">
+      <el-form-item :label="$t('tableManagement.tableCode')" prop="tableNumber">
         <el-input
-          v-model="queryParams.code"
+          v-model="queryParams.tableNumber"
           :placeholder="$t('tableManagement.pleaseEnterTableCode')"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('tableManagement.status')" prop="status">
+      <el-form-item :label="$t('tableManagement.tableStatus')" prop="tableStatus">
         <el-select
-          v-model="queryParams.status"
-          :placeholder="$t('tableManagement.status')"
+          v-model="queryParams.tableStatus"
+          :placeholder="$t('tableManagement.tableStatus')"
           clearable
           style="width: 240px"
         >
@@ -70,12 +70,18 @@
           <span>{{ showIdLastFour(scope.row.id) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('tableManagement.tableEncoding')" align="center" prop="code" />
-      <el-table-column :label="$t('tableManagement.belongingStore')" align="center" prop="store">
+      <el-table-column
+        :label="$t('tableManagement.tableEncoding')"
+        align="center"
+        prop="tableNumber"
+      />
+      <el-table-column
+        :label="$t('tableManagement.belongingStore')"
+        align="center"
+        prop="storeName"
+      >
         <template slot-scope="scope">
-          <span v-if="scope.row.storeId && scope.row.storeId > 0">
-            <span>{{ getName(storeList, scope.row.storeId) }}</span>
-          </span>
+          <span v-if="scope.row.storeName">{{ scope.row.storeName }}</span>
           <span v-else>{{ $t('tableManagement.publicOwnership') }}</span>
         </template>
       </el-table-column>
@@ -91,12 +97,12 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('tableManagement.status')" align="center" prop="status">
+      <el-table-column :label="$t('tableManagement.status')" align="center" prop="tableStatus">
         <template slot-scope="scope">
           <el-switch
-            v-model="scope.row.status"
-            active-value="A"
-            inactive-value="N"
+            v-model="scope.row.tableStatus"
+            :active-value="0"
+            :inactive-value="1"
             v-hasPermi="['table:index']"
             @change="handleStatusChange(scope.row)"
           ></el-switch>
@@ -149,16 +155,16 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('tableManagement.tableEncoding')" prop="code">
+            <el-form-item :label="$t('tableManagement.tableEncoding')" prop="tableNumber">
               <el-input
-                v-model="form.code"
+                v-model="form.tableNumber"
                 :placeholder="$t('tableManagement.pleaseEnterTableEncoding')"
                 maxlength="30"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('tableManagement.belongingStore')" prop="storeId">
               <el-select
@@ -170,13 +176,13 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
-                  :disabled="item.status !== 'A'"
+                  :disabled="item.tableStatus !== 'A'"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('tableManagement.remarkInfo')">
               <el-input
@@ -187,31 +193,23 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('tableManagement.sort')" prop="sort">
               <el-input-number v-model="form.sort" :min="0" />
               <div class="form-tips">{{ $t('tableManagement.sortTip') }}</div>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('tableManagement.status')">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  :key="$t('tableManagement.enabledKey')"
-                  :label="$t('tableManagement.enabledLabel')"
-                  :value="0"
-                >
+              <el-radio-group v-model="form.tableStatus">
+                <el-radio :key="0" :label="0" :value="0">
                   {{ $t('tableManagement.enabled') }}
                 </el-radio>
-                <el-radio
-                  :key="$t('tableManagement.disabledKey')"
-                  :label="$t('tableManagement.disabledLabel')"
-                  :value="1"
-                >
+                <el-radio :key="1" :label="1" :value="1">
                   {{ $t('tableManagement.disabled') }}
                 </el-radio>
               </el-radio-group>
@@ -237,9 +235,9 @@ import {
   getTableList,
   updateTableStatus,
   getTableInfo,
-  saveTable,
   saveTableUpdate,
-  addTableInfo
+  addTableInfo,
+  deleteTableInfo
 } from '@/api/table'
 export default {
   name: 'TableIndex',
@@ -271,20 +269,20 @@ export default {
       // 默认排序
       defaultSort: { prop: 'id', order: 'descending' },
       // 表单参数
-      form: { id: '', code: '', storeId: '', sort: '', maxPeople: 0, status: 'A' },
+      form: { id: '', tableNumber: '', storeId: '', sort: '', maxPeople: 0, tableStatus: 0 },
       // 店铺列表
       storeList: [],
-      imagePath: '',
+
       // 查询参数
       queryParams: {
         page: 1,
         pageSize: 10,
-        code: '',
-        status: ''
+        tableNumber: '',
+        tableStatus: ''
       },
       // 表单校验
       rules: {
-        code: [
+        tableNumber: [
           {
             required: true,
             message: this.$t('tableManagement.tableCodeRequired'),
@@ -315,10 +313,12 @@ export default {
     getList() {
       this.loading = true
       getTableList(this.queryParams).then((response) => {
-        this.list = response.data.paginationResponse.content
-        this.total = response.data.paginationResponse.totalElements
-        this.storeList = response.data.storeList
-        this.imagePath = response.data.imagePath
+        console.log(response, 'response')
+
+        this.list = response.data
+        this.total = response.total
+        // this.storeList = response.data.storeList
+
         this.loading = false
       })
     },
@@ -336,22 +336,24 @@ export default {
     // 状态修改
     handleStatusChange(row) {
       let text =
-        row.status === 'A' ? this.$t('tableManagement.enable') : this.$t('tableManagement.disable')
+        row.tableStatus === 0
+          ? this.$t('tableManagement.enable')
+          : this.$t('tableManagement.disable')
       const confirmMsg = this.$t('tableManagement.confirmChangeTableStatus', {
         action: text,
-        tableCode: row.code
+        tableCode: row.tableNumber
       })
       this.$modal
         .confirm(confirmMsg)
         .then(() => {
-          return updateTableStatus(row.id, row.status)
+          return updateTableStatus(row.id, row.tableStatus)
         })
         .then(() => {
           const successMsg = this.$t('tableManagement.statusChangeSuccess', { action: text })
           this.$modal.msgSuccess(successMsg)
         })
         .catch(() => {
-          row.status = row.status === 'N' ? 'A' : 'N'
+          row.tableStatus = row.tableStatus === 1 ? 0 : 1
         })
     },
     // 多选框选中数据
@@ -375,12 +377,12 @@ export default {
     reset() {
       this.form = {
         id: '',
-        code: '',
+        tableNumber: '',
         description: '',
         storeId: '',
         maxPeople: 0,
         sort: 0,
-        status: 0
+        tableStatus: 0
       }
       this.resetForm('form')
     },
@@ -393,16 +395,23 @@ export default {
     submitForm: function () {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          console.log(this.form, 'addTableInfo')
+          let data = {}
+          data.categoryId = 0
+          data.tableNumber = this.form.tableNumber
+          data.capacity = this.form.maxPeople
+          data.tableStatus = this.form.tableStatus
+          data.categoryId = 0
+          data.categoryName = '1'
 
           if (this.form.id) {
-            saveTableUpdate(this.form).then((response) => {
+            data.id = this.form.id
+            saveTableUpdate(data).then((response) => {
               this.$modal.msgSuccess(this.$t('tableManagement.modifySuccess'))
               this.open = false
               this.getList()
             })
           } else {
-            addTableInfo(this.form).then((response) => {
+            addTableInfo(data).then((response) => {
               this.$modal.msgSuccess(this.$t('tableManagement.addSuccess'))
               this.open = false
               this.getList()
@@ -425,19 +434,19 @@ export default {
       this.reset()
       const id = row.id || this.ids
       getTableInfo(id).then((response) => {
-        this.form = response.data.tableInfo
+        this.form = response.data
         this.open = true
         this.title = this.$t('tableManagement.editTableCode')
       })
     },
     // 删除按钮操作
     handleDelete(row) {
-      const code = row.code || this.id
+      const code = row.tableNumber || this.id
       const confirmMsg = this.$t('tableManagement.confirmDeleteTableCode', { tableCode: code })
       this.$modal
         .confirm(confirmMsg)
         .then(() => {
-          return updateTableStatus(row.id, 'D')
+          deleteTableInfo(row.id)
         })
         .then(() => {
           this.getList()