From 30de9d677b3bc4954802980f847c79505d12658e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 20 七月 2023 18:26:10 +0800
Subject: [PATCH] 服务管理模块接口联调
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 41 ++++++++++++--------
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 12 ++---
src/views/sales/refundForm/AddRefundFormDialog.vue | 10 ++--
src/api/serviceManage/serviceFeeManage.js | 33 ++++++++++++++++
4 files changed, 67 insertions(+), 29 deletions(-)
diff --git a/src/api/serviceManage/serviceFeeManage.js b/src/api/serviceManage/serviceFeeManage.js
new file mode 100644
index 0000000..2d3667f
--- /dev/null
+++ b/src/api/serviceManage/serviceFeeManage.js
@@ -0,0 +1,33 @@
+import request from "@/common/untils/request.js"
+
+// 鏈嶅姟鏀惰垂绠＄悊鍒楄〃
+export function getServiceFeeManageList() {
+ return request({
+ url: "/api/serviceFeeManage/list",
+ method: "get"
+ })
+}
+// 娣诲姞鏈嶅姟鏀惰垂绠＄悊
+export function getAddServiceFeeManage(data) {
+ return request({
+ url: "/api/serviceFeeManage/add",
+ method: "post",
+ data
+ })
+}
+// 鍒犻櫎鏈嶅姟鏀惰垂绠＄悊
+export function getDelServiceFeeManage(data) {
+ return request({
+ url: "/api/serviceFeeManage/delete",
+ method: "delete",
+ data
+ })
+}
+// 鏇存柊鏈嶅姟鏀惰垂绠＄悊
+export function getUpdateServiceFeeManage(data) {
+ return request({
+ url: "/api/serviceFeeManage/update",
+ method: "put",
+ data
+ })
+}
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index f600c21..9e3503a 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -35,7 +35,7 @@
<el-input v-model="editConfig.infomation.number"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
<el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
<el-option
@@ -47,7 +47,7 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
@@ -56,7 +56,7 @@
size="mini"
style="width: 63%"
>
- <el-option v-for="item in memberOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -222,7 +222,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -356,7 +356,7 @@
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
salesRefund: {
accountId: data.accountId || 0,
- clientId: data.clientId || 0,
+ clientId: parseInt(data.clientId) || 0,
isInvoice: data.isInvoice || 0,
memberId: data.memberId || 0,
number: data.number || "",
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 0e780e3..2ce0cd5 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -44,7 +44,7 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
<el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
<el-option
@@ -56,7 +56,7 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="绛剧害鏃ユ湡" prop="signTime">
<el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡">
@@ -71,7 +71,7 @@
size="mini"
style="width: 63%"
>
- <el-option v-for="item in memberOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -134,7 +134,7 @@
</div>
<!-- 鏉℃涓庢潯浠� -->
<div class="basic-info-title">鏉℃涓庢潯浠�</div>
- <div class="address-view">
+ <div class="basic-info-view">
<el-row>
<el-col :span="24">
<el-form-item label="鏉℃涓庢潯浠�" prop="termsTreaty">
@@ -149,7 +149,7 @@
</div>
<!-- 澶囨敞淇℃伅 -->
<div class="basic-info-title">澶囨敞淇℃伅</div>
- <div class="address-view">
+ <div class="basic-info-view">
<el-row>
<el-col :span="24">
<el-form-item label="澶囨敞" prop="notes">
@@ -254,7 +254,7 @@
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -377,11 +377,11 @@
salesDetails: {
address: data.address || "",
addressee: data.addressee || "",
- clientId: data.id || 0,
+ clientId: parseInt(data.clientId) || 0,
conditions: data.conditions || "",
- deliveryDate: data.id || "",
- memberId: data.id || 0,
- number: data.deliveryDate || "",
+ deliveryDate: data.deliveryDate || "",
+ memberId: data.memberId || 0,
+ number: data.number || "",
phone: data.phone || "",
products: [
{
@@ -395,10 +395,10 @@
}
],
remark: data.remark || "",
- saleChanceId: data.id || 0,
- saleType: data.id || 0,
+ saleChanceId: data.saleChanceId || 0,
+ saleType: data.saleType || 0,
signTime: data.signTime || "",
- wechatOrderStatus: data.id || 0
+ wechatOrderStatus: data.wechatOrderStatus || 0
}
}
return params
@@ -454,10 +454,17 @@
font-size: 18px;
}
}
- }
- .address-view {
- margin-top: 10px;
- padding-right: 40px;
+ .common-select {
+ display: flex;
+ .common-select-sel {
+ width: 270px;
+ }
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ }
}
.annex-view {
display: flex;
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 44c5b3c..e7276ba 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -35,7 +35,7 @@
<el-input v-model="editConfig.infomation.number"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
<el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
<el-option
@@ -47,7 +47,7 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="閫�鍏ヤ粨搴�" prop="repository">
<el-select v-model="editConfig.infomation.repository" size="mini" style="width: 63%">
@@ -69,7 +69,7 @@
size="mini"
style="width: 63%"
>
- <el-option v-for="item in memberOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -98,9 +98,7 @@
<el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn" @click="editDropdownBox">
- <i class="el-icon-setting"></i>
- </div>
+ <div class="common-select-btn"><i class="el-icon-setting"></i></div>
</div>
</el-form-item>
</el-col>
@@ -165,7 +163,7 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
--
Gitblit v1.8.0