From 9289a4fbacafcc7a80385fc3a3167f383d5cf991 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 一月 2026 18:00:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/salesManagement/orderManagement/index.vue | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/views/salesManagement/orderManagement/index.vue b/src/views/salesManagement/orderManagement/index.vue
index 54148b9..8bd157d 100644
--- a/src/views/salesManagement/orderManagement/index.vue
+++ b/src/views/salesManagement/orderManagement/index.vue
@@ -89,7 +89,7 @@
</el-card>
<!-- 鏂板/缂栬緫瀵硅瘽妗� -->
- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="700px">
+ <FormDialog v-model="dialogVisible" :title="dialogTitle" :width="'700px'" @close="dialogVisible = false" @confirm="handleSubmit" @cancel="dialogVisible = false">
<el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
@@ -104,9 +104,9 @@
<el-col :span="12">
<el-form-item label="涓氬姟鍛�" prop="salesperson">
<el-select v-model="form.salesperson" placeholder="璇烽�夋嫨涓氬姟鍛�" style="width: 100%">
- <el-option label="寮犱笁" value="寮犱笁"></el-option>
- <el-option label="鏉庡洓" value="鏉庡洓"></el-option>
- <el-option label="鐜嬩簲" value="鐜嬩簲"></el-option>
+ <el-option label="闄堝織寮�" value="闄堝織寮�"></el-option>
+ <el-option label="鍒橀泤濠�" value="鍒橀泤濠�"></el-option>
+ <el-option label="鐜嬪缓鍥�" value="鐜嬪缓鍥�"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -169,7 +169,7 @@
</el-dialog>
<!-- 璁㈠崟瀹℃牳瀵硅瘽妗� -->
- <el-dialog v-model="reviewDialogVisible" title="璁㈠崟瀹℃牳" width="500px">
+ <FormDialog v-model="reviewDialogVisible" title="璁㈠崟瀹℃牳" :width="'500px'" @close="reviewDialogVisible = false" @confirm="saveReview" @cancel="reviewDialogVisible = false">
<el-form label-width="100px">
<el-form-item label="璁㈠崟鍙�">
<span>{{ currentOrder.orderNo }}</span>
@@ -199,7 +199,7 @@
</el-dialog>
<!-- 璁㈠崟杞崟瀵硅瘽妗� -->
- <el-dialog v-model="transferDialogVisible" title="璁㈠崟杞崟" width="500px">
+ <FormDialog v-model="transferDialogVisible" title="璁㈠崟杞崟" :width="'500px'" @close="transferDialogVisible = false" @confirm="saveTransfer" @cancel="transferDialogVisible = false">
<el-form label-width="100px">
<el-form-item label="璁㈠崟鍙�">
<span>{{ currentOrder.orderNo }}</span>
@@ -209,22 +209,16 @@
</el-form-item>
<el-form-item label="杞崟缁�" prop="newSalesperson">
<el-select v-model="newSalesperson" placeholder="璇烽�夋嫨鏂颁笟鍔″憳" style="width: 100%">
- <el-option label="寮犱笁" value="寮犱笁"></el-option>
- <el-option label="鏉庡洓" value="鏉庡洓"></el-option>
- <el-option label="鐜嬩簲" value="鐜嬩簲"></el-option>
+ <el-option label="闄堝織寮�" value="闄堝織寮�"></el-option>
+ <el-option label="鍒橀泤濠�" value="鍒橀泤濠�"></el-option>
+ <el-option label="鐜嬪缓鍥�" value="鐜嬪缓鍥�"></el-option>
</el-select>
</el-form-item>
<el-form-item label="杞崟鍘熷洜" prop="transferReason">
<el-input type="textarea" v-model="transferReason" rows="3" placeholder="璇疯緭鍏ヨ浆鍗曞師鍥�"></el-input>
</el-form-item>
</el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button @click="transferDialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="saveTransfer">纭� 瀹�</el-button>
- </div>
- </template>
- </el-dialog>
+ </FormDialog>
</div>
</template>
@@ -233,6 +227,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus, Search } from '@element-plus/icons-vue'
import Pagination from '@/components/PIMTable/Pagination.vue'
+import FormDialog from '@/components/Dialog/FormDialog.vue'
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
@@ -247,7 +242,7 @@
id: 1,
orderNo: 'ORD202312001',
customer: '涓婃捣绉戞妧鏈夐檺鍏徃',
- salesperson: '寮犱笁',
+ salesperson: '闄堝織寮�',
orderDate: '2023-12-01',
amount: 50000.00,
paymentMethod: '鍏ㄦ鍒颁粯',
@@ -258,7 +253,7 @@
id: 2,
orderNo: 'ORD202312002',
customer: '娣卞湷鐢靛瓙鏈夐檺鍏徃',
- salesperson: '鏉庡洓',
+ salesperson: '鍒橀泤濠�',
orderDate: '2023-12-02',
amount: 35000.00,
paymentMethod: '鍒嗘湡浠樻',
@@ -269,7 +264,7 @@
id: 3,
orderNo: 'ORD202312003',
customer: '鍖椾含璐告槗鍏徃',
- salesperson: '鐜嬩簲',
+ salesperson: '鐜嬪缓鍥�',
orderDate: '2023-12-03',
amount: 28000.00,
paymentMethod: '鏈堢粨',
--
Gitblit v1.9.3