yb 10 месяцев назад
Родитель
Сommit
06fc685ca6

+ 7 - 0
src/api/mall/order/storeOrder/index.ts

@@ -77,6 +77,13 @@ export const updateStoreOrder = async (data: StoreOrderVO) => {
   return await request.put({ url: `/order/store-order/update`, data })
 }
 
+
+// 修改订单
+export const printStoreOrder = async (data: StoreOrderVO) => {
+  return await request.put({ url: `/order/store-order/print`, data })
+}
+
+
 // 删除订单
 export const deleteStoreOrder = async (id: number) => {
   return await request.delete({ url: `/order/store-order/delete?id=` + id })

+ 0 - 1
src/locales/zh-CN.ts

@@ -1188,7 +1188,6 @@ export default {
     commissionAmount: '佣金金额',
     consecutiveSignInDays: '连续签到天数',
     loginIp: '登录ip',
-    level: '等级',
     promotionId: '推广id',
     purchaseCount: '购买次数',
     subordinateCount: '下级人数',

+ 2 - 2
src/views/mall/order/storeOrder/OrderDetail.vue

@@ -33,13 +33,13 @@
                     }}</span>
                     <span style="color: #5ac725">({{ item.isOrder == 0 ? t('mall.mealNotServed') : t('mall.mealServed') }})</span>
                   <el-divider />
-                  <div class="flex align-center" v-for="(good,index2) in item.appDeskOrderGoodsVos" :key="index2">
+                  <!-- <div class="flex align-center" v-for="(good,index2) in item.appDeskOrderGoodsVos" :key="index2">
                     <div><el-image :src="convertImageUrl(good.image)" style="width: 70px;height: 70px;" /></div>
                     <div class="flex  flex-1 flex-column ml-2 font-size-sm">
                         <div class="flex justify-between"><span class="font-weight-bolder">{{good.title}}</span><span style="color: #f56c6c;">{{good.spec}}</span></div>
                         <div class="flex justify-between mt-1"><span>¥{{good.price}}</span><span>x{{good.number}}</span></div>
                     </div>
-                  </div>
+                  </div> -->
                   <div style="">
                     <span style="color: #9acafc; font-weight: bold">{{
                       item.uidType == 'user' ? t('mall.userOrdering') : t('mall.staffOrderingOnBehalf')

+ 25 - 2
src/views/mall/order/storeOrder/OrderSend.vue

@@ -15,7 +15,8 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">{{ t('mall.print') }}</el-button>
+      <el-button @click="submitFormOrder" type="success" :disabled="formLoading">确认订单(测试)</el-button>
+      <el-button @click="submitFormPrint" type="primary" :disabled="formLoading">{{ t('mall.print') }}</el-button>
       <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
     </template>
   </Dialog>
@@ -110,7 +111,8 @@ defineExpose({ open }) // 提供 open 方法,用于打开弹窗
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
-const submitForm = async () => {
+
+const submitFormOrder = async () => {
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()
@@ -131,6 +133,27 @@ const submitForm = async () => {
   }
 }
 
+const submitFormPrint = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StoreOrderApi.StoreOrderVO
+    data.updateType = 'orderSend'
+    await StoreOrderApi.printStoreOrder(data)
+    message.success(t('common.updateSuccess'))
+
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {

+ 0 - 1
src/views/mall/order/storeOrder/index.vue

@@ -277,7 +277,6 @@ import StoreOrderRefund from './StoreOrderRefund.vue'
 import OrderDetail from './OrderDetail.vue'
 import OrderRecord from './OrderRecord.vue'
 import type { TabsPaneContext } from 'element-plus'
-import { convertImageUrl } from '@/utils/image-helper'
 import MailLogDetail from '@/views/system/mail/log/MailLogDetail.vue'
 import { convertImageUrl } from '@/utils/image-helper' // 导入图片URL处理工具