Browse Source

fix:修改图片,修改下载名称

Mcal 1 week ago
parent
commit
f764bd83be

+ 1 - 1
src/api/table.js

@@ -46,7 +46,7 @@ export function getTableInfo(tableId) {
 export function updateTableStatus(id, status) {
   const data = {
     id,
-    status
+    tableStatus:status
   }
   return request({
     url: 'backendApi/table_info/updateStatus',

+ 5 - 0
src/locales/en.json

@@ -80,7 +80,12 @@
   "store.list.storeStatus": "Status",
   "store.list.addStore": "Add Store",
   "store.list.belongTo": "Belong To",
+  "export":{
+    "orderList": "Order List"
+  },
   "orderList": {
+    
+    "serviceFee": "Service fee",
     "orderNumber": "Order Number",
     "pleaseEnterOrderNumber": "Please enter the order number",
     "tableCode": "Table Code",

+ 4 - 1
src/locales/ru.json

@@ -77,8 +77,11 @@
     "today.revenue": "Сегодняшний доход",
     "welcome": "Добро пожаловать",
     "greeting": "Привет, {name}!",
-
+    "export":{
+      "orderList": "Список заказов"
+    },
     "orderList":{
+    "serviceFee": "Сбор за услуги",
         "orderNumber": "Номер заказа",
         "pleaseEnterOrderNumber": "Пожалуйста, введите номер заказа",
         "tableCode": "Код стола",

+ 5 - 1
src/locales/sr.json

@@ -135,8 +135,12 @@
     "incomeTrendChart": "Grafikon trenda prihoda",
     "memberStatistics": "Statistika članova"
   },
-
+  "export":{
+    "orderList": "Lista narudžbina"
+  },
   "orderList":{
+    "serviceFee": "Naknada za usluge",
+
      "orderNumber": "Broj narudžbine",
       "pleaseEnterOrderNumber": "Unesite broj narudžbine",
       "tableCode": "Kod stola",

+ 4 - 0
src/locales/zh.json

@@ -75,7 +75,11 @@
 
   "welcome": "欢迎",
   "greeting": "你好, {name}!",
+  "export":{
+    "orderList": "订单列表"
+  },
   "orderList": {
+    "serviceFee": "服务费",
     "orderNumber": "订单号",
     "pleaseEnterOrderNumber": "请输入订单号",
     "tableCode": "桌码",

+ 2 - 2
src/utils/request.js

@@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { tansParams } from "@/utils/fuint";
 import cache from '@/plugins/cache'
-
+import i18n from '../i18n'
 // 是否显示重新登录
 export let isRelogin = { show: false };
 
@@ -165,7 +165,7 @@ export async function download(baseURL, params) {
       // 创建一个 a 标签
       const a = document.createElement('a');
       a.href = url;
-      a.download = 'download.xls';
+      a.download = i18n.t('export.orderList')+'.xls';
       a.click();
 
       // 释放临时的 URL 对象

+ 7 - 0
src/views/order/index.vue

@@ -172,6 +172,13 @@
           <span v-else>0.00</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('orderList.serviceFee')" align="center" prop="amount">
+        <template slot-scope="scope">
+          <span v-if="scope.row.serviceFee">{{ scope.row.serviceFee.toFixed(2) }}</span>
+          <span v-else>0.00</span>
+        </template>
+      </el-table-column>
+      
       <!-- <el-table-column label="支付状态" align="center" width="80" prop="payStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.payStatus == 'B'" class="status-active">{{ getName(payStatusList, scope.row.payStatus) }}</span>

+ 2 - 1
src/views/store/list.vue

@@ -183,6 +183,7 @@
                         <el-upload
                             :action="uploadAction"
                             list-type="picture-card"
+                            accept="image/*"
                             :class="{ hide: hideUpload }"
                             :file-list="uploadFiles"
                             :auto-upload="true"
@@ -806,7 +807,7 @@ export default {
           .catch(() => {});
     },
     handleUploadSuccess(file) {
-      this.form.logo = file.data.fileName
+      this.form.logo = file.data.url
     },
     handleUploadLicenseSuccess(file) {
       this.form.license = file.data.fileName

+ 0 - 0
test.js