From 616458206a9f9f146554188ec55b9a35cc1f9a81 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 10 九月 2025 19:12:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/order/order/orderList.vue | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 9e37593..1c93b0d 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -18,11 +18,20 @@
style="width: 160px"
/>
</Form-item>
- <Form-item label="浼氬憳鍚嶇О" prop="buyerName">
+<!-- <Form-item label="浼氬憳鍚嶇О" prop="buyerName">-->
+<!-- <Input-->
+<!-- type="text"-->
+<!-- v-model="searchForm.buyerName"-->
+<!-- placeholder="璇疯緭鍏ヤ細鍛樺悕绉�"-->
+<!-- clearable-->
+<!-- style="width: 160px"-->
+<!-- />-->
+<!-- </Form-item>-->
+ <Form-item label="浼氬憳鏄电О" prop="nickName">
<Input
type="text"
- v-model="searchForm.buyerName"
- placeholder="璇疯緭鍏ヤ細鍛樺悕绉�"
+ v-model="searchForm.nickName"
+ placeholder="璇疯緭鍏ヤ細鍛樻樀绉�"
clearable
style="width: 160px"
/>
@@ -190,7 +199,25 @@
<Modal width="1200px" v-model="picModelFlag">
<ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
</Modal>
-
+ <Modal
+ v-model="showGeneralQrCode"
+ title="浜岀淮鐮�"
+ width="800"
+ :mask-closable="false"
+ :loading="codeLoading"
+ >
+ <vue-qr
+ :text="QRCodeUrl"
+ :margin="0"
+ colorDark="#000"
+ colorLight="#fff"
+ :size="150"
+ ></vue-qr>
+ <div slot="footer">
+ <Button type="text" @click="closeGeneralQrCode">鍏抽棴</Button>
+ <!-- <Button type="primary" @click="generalQrCode">纭</Button>-->
+ </div>
+ </Modal>
<multipleMap ref="map" @callback="selectedRegion" />
</Card>
</div>
@@ -203,12 +230,14 @@
import JsonExcel from "vue-json-excel";
import * as API_Member from "@/api/member.js";
import { getTags } from "@/api/tag.js";
+import vueQr from "vue-qr";
export default {
name: "orderList",
components: {
"download-excel": JsonExcel,
ossManage,
multipleMap,
+ "vue-qr": vueQr,
},
data() {
return {
@@ -258,6 +287,7 @@
orderType: "",
orderSn: "",
buyerName: "",
+ nickName:"",
orderStatus: "",
},
selectDate: null,
@@ -395,6 +425,7 @@
key: "action",
align: "center",
width: 150,
+ fixed:"right",
render: (h, params) => {
const buttons = [];
@@ -433,6 +464,24 @@
)
);
}
+ // 鏍规嵁璁㈠崟鐘舵�佷负'PAID'鏃舵樉绀洪澶栨搷浣滄寜閽�
+ if (params.row.deliverStatus === 'UNDELIVERED') {
+ buttons.push(
+ h(
+ "Button",
+ {
+ props: { type: "primary", size: "small" },
+ style: { marginRight: "5px" },
+ on: {
+ click: () => {
+ this.handlerEditorQrcode(params.row);
+ },
+ },
+ },
+ "淇敼鍦板潃浜岀淮鐮�"
+ )
+ );
+ }
return h('div', buttons);
},
@@ -468,9 +517,26 @@
options: [],
titleColor:'#333', // 榛樿鏍囬棰滆壊
submitDisabled:false,
+ QRCodeUrl:'',
+ showGeneralQrCode:false,
+ codeLoading:false,
};
},
methods: {
+ closeGeneralQrCode(){
+ this.showGeneralQrCode = false;
+ },
+ handlerEditorQrcode(row){
+ this.QRCodeUrl = '';
+ this.showGeneralQrCode = true
+ this.codeLoading = true;
+
+ //鑾峰緱鍟嗗搧瀵瑰簲鐨勭涓�涓猻kuid
+ this.codeLoading = false;
+ this.QRCodeUrl = this.QRcodeBaseUrl+ '/scanpage/editOrderAddress'+'?orderSn='+row.sn
+ console.log(this.QRCodeUrl);
+
+ },
// 閫変腑鐨勫浘鐗�
callbackSelected(val) {
console.log(val)
@@ -641,21 +707,22 @@
deliverOrder(order) {
console.log('------------->鑾峰彇璁㈠崟淇℃伅',order);
console.log('璁㈠崟sn缂栧彿',order.sn);
- // 杩欓噷鍙互璋冪敤鐩稿叧鐨凙PI杩涜鍙戣揣鎿嶄綔
+ // 璋冪敤鍙戣揣API
API_Order.sendMessage(order.sn).then((res) => {
console.log('-------------->',res);
if (res.success) {
this.$Message.success('鏇存柊鐘舵�佹垚鍔�');
- this.getDataList(); // 鍒锋柊鍒楄〃
+ // 寤惰繜5绉掑埛鏂板垪琛╩q娑堟伅鏄紓姝ョ殑鏃犳硶瀹炴椂鍚屾闇�瑕佹墽琛屽欢杩熷埛鏂�
+ setTimeout(() => {
+ this.getDataList();
+ }, 5000);
} else {
this.$Message.error('鏇存柊鐘舵�佸け璐�');
}
+ }).catch((error) => {
+ console.error('鏇存柊鐘舵�佸け璐�:', error);
+ this.$Message.error('鏇存柊鐘舵�佸け璐ワ紝璇烽噸璇�');
});
-
- // 鏆傛椂妯℃嫙鎿嶄綔
- this.$Message.success(`璁㈠崟 ${order.sn} 鏇存柊鐘舵�佹垚鍔燂紒`);
- // 鍒锋柊鍒楄〃鏁版嵁
- this.getDataList();
},
// 瀵煎嚭璁㈠崟
async exportOrder() {
--
Gitblit v1.8.0