From 72a6cdb8a55bd4514eb40841d90e98dcd13f112a Mon Sep 17 00:00:00 2001
From: qiaopengfei <2646186879@qq.com>
Date: Tue, 20 Aug 2024 17:15:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=20or=20=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/AfterSalesManagement.js | 8 +
src/api/CommodityManagement.js | 10 +-
src/api/OrderManagement.js | 8 +
src/api/translateSet.js | 40 +++
src/components/buttongroup.vue | 19 +-
src/components/driverForm/index.vue | 147 ++++++--
src/components/table.vue | 5 +-
src/views/AfterSalesManagement/index.vue | 40 ++-
src/views/NewlyBuiltGoods/index.vue | 4 +
src/views/OrderManagement/index.vue | 39 ++-
.../translateSet/components/addDialog.vue | 3 +-
src/views/translateSet/index.vue | 315 ++++++++++++------
12 files changed, 489 insertions(+), 149 deletions(-)
diff --git a/src/api/AfterSalesManagement.js b/src/api/AfterSalesManagement.js
index b2ae61f..4347346 100644
--- a/src/api/AfterSalesManagement.js
+++ b/src/api/AfterSalesManagement.js
@@ -46,4 +46,12 @@ export function after_log(data) {
method: 'get',
data
})
+}
+// 同步订单
+export function manual_after_order(data) {
+ return request({
+ url: `xy_openapi/afterSale/manual_after_order`,
+ method: 'post',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/api/CommodityManagement.js b/src/api/CommodityManagement.js
index 461245f..e64ad72 100644
--- a/src/api/CommodityManagement.js
+++ b/src/api/CommodityManagement.js
@@ -54,4 +54,12 @@ export function commodity_log(data) {
method: 'get',
data
})
-}
\ No newline at end of file
+}
+// 同步订单
+// export function manual_after_order(data) {
+// return request({
+// url: `xy_openapi/afterSale/manual_after_order`,
+// method: 'post',
+// data
+// })
+// }
\ No newline at end of file
diff --git a/src/api/OrderManagement.js b/src/api/OrderManagement.js
index e0e2b6e..8c2b4de 100644
--- a/src/api/OrderManagement.js
+++ b/src/api/OrderManagement.js
@@ -65,3 +65,11 @@ export function order_log(data) {
})
}
+// 同步订单
+export function manual_sync_order(data) {
+ return request({
+ url: 'xy_openapi/api/order_info/manual_sync_order',
+ method: 'post',
+ data
+ })
+}
\ No newline at end of file
diff --git a/src/api/translateSet.js b/src/api/translateSet.js
index 0656695..ff27708 100644
--- a/src/api/translateSet.js
+++ b/src/api/translateSet.js
@@ -39,4 +39,44 @@ export function senderDelete(data) {
data
})
}
+// 修改寄件人
+export function senderUpdate(data) {
+ return request({
+ url: `xy_openapi/sender/update`,
+ method: 'put',
+ data
+ })
+}
+// 获取快递公司
+export function getExpressCompanyList(data) {
+ return request({
+ url: 'xy_openapi/api/order_info/getExpressCompanyList',
+ method: 'get',
+ data
+ })
+}
+// 获取快递产品
+export function getLogisticsProductList(data) {
+ return request({
+ url: `xy_openapi/api/order_info/getLogisticsProductList`,
+ method: 'get',
+ data
+ })
+}
+// 编辑物流
+export function update(data) {
+ return request({
+ url: `xy_openapi/address/update`,
+ method: 'put',
+ data
+ })
+}
+// 删除物流
+export function addressDelete(data) {
+ return request({
+ url: `xy_openapi/address/delete/${data}`,
+ method: 'delete',
+ data
+ })
+}
diff --git a/src/components/buttongroup.vue b/src/components/buttongroup.vue
index e1473ef..87a99ca 100644
--- a/src/components/buttongroup.vue
+++ b/src/components/buttongroup.vue
@@ -1,12 +1,14 @@
- {{ item.name }}
+
+ {{ item.name }}
+
@@ -16,12 +18,11 @@
\ No newline at end of file
diff --git a/src/components/driverForm/index.vue b/src/components/driverForm/index.vue
index 03658b1..d4e377d 100644
--- a/src/components/driverForm/index.vue
+++ b/src/components/driverForm/index.vue
@@ -1,6 +1,6 @@
-
+
- 更改收件人信息
+ 更改收件人信息
-
+
+
+ 确定
+ 取消修改
+
@@ -112,9 +129,16 @@
寄件信息
-
+
- 更改寄件人信息
+ 更改寄件人信息
+
+ 确定
+ 取消修改
+
@@ -227,11 +264,7 @@ const props = defineProps({
default: false,
},
});
-const emit = defineEmits([
- "deliveryConfirm",
- "deliveryCancel",
- "Print",
-]);
+const emit = defineEmits(["deliveryConfirm", "deliveryCancel", "Print"]);
const ruleFormRef = ref(null);
const orderDeliveryDto = reactive({
@@ -255,7 +288,7 @@ const orderDeliveryDto = reactive({
contactType: "1", //地址类型:寄件
cityId: "", //寄件市id,发货时的寄件地址必填(有区id可以不需要市id),有返回
districtId: "", //寄件区id,发货时的寄件地址必填,有返回
- deliveryCompany: "", //快递公司
+ deliveryid: "", //快递公司
remark: "", //发货备注
trackingNumber: "", // 物流单号
deliverType: "",
@@ -263,6 +296,13 @@ const orderDeliveryDto = reactive({
],
});
const sender = ref(null);
+let recipientList = ref({
+ contact: "", //联系人
+ tel: "", //联系电话
+ address: "", //详细地址
+});
+const receiptVisible = ref(false);
+const senderVisible = ref(false);
const ruleForm = reactive({
receiptInfor: [
{
@@ -326,8 +366,8 @@ const ruleForm = reactive({
{
type: "select",
label: "物流公司",
- props: "deliveryCompany",
- params: "deliveryCompany",
+ props: "deliveryid",
+ params: "deliveryid",
span: 11,
options: [],
},
@@ -384,8 +424,8 @@ const shippingAddresss = (rule, value, callback) => {
}
callback();
};
-const deliveryCompany = (rule, value, callback) => {
- if (!orderDeliveryDto.contactInfoList[1].deliveryCompany) {
+const deliveryid = (rule, value, callback) => {
+ if (!orderDeliveryDto.contactInfoList[1].deliveryid) {
callback(new Error("请选择物流公司"));
}
callback();
@@ -403,7 +443,7 @@ const rules = reactive({
shippingName: [{ validator: shippingName, trigger: "blur" }],
shippingTel: [{ validator: shippingTel, trigger: "blur" }],
shippingAddresss: [{ validator: shippingAddresss, trigger: "blur" }],
- deliveryCompany: [{ validator: deliveryCompany, trigger: "blur" }],
+ deliveryid: [{ validator: deliveryid, trigger: "blur" }],
trackingNumber: [{ validator: trackingNumber, trigger: "blur" }],
});
@@ -450,8 +490,8 @@ const changeRadio = (e) => {
{
type: "select",
label: "物流公司",
- props: "deliveryCompany",
- params: "deliveryCompany",
+ props: "deliveryid",
+ params: "deliveryid",
span: 11,
options: [],
},
@@ -487,8 +527,8 @@ const changeRadio = (e) => {
{
type: "select",
label: "物流公司",
- props: "deliveryCompany",
- params: "deliveryCompany",
+ props: "deliveryid",
+ params: "deliveryid",
span: 11,
options: [],
},
@@ -507,12 +547,28 @@ const changeRadio = (e) => {
ruleForm.shippingInfor.find((e) => e.label == "物流公司").options =
props.DeliveryInfoList.logisticsRespList.map((item) => ({
label: item.logisticsName,
- value: item.logisticsCode,
+ value: item.id,
}));
}
};
+const editCancel = (item) => {
+ if (item == "recipient") {
+ receiptVisible.value = false;
+ } else {
+ senderVisible.value = false;
+ }
+};
const changeInfo = (item) => {
- if (item.label === "寄件人:") {
+ if (item === "recipient") {
+ orderDeliveryDto.contactInfoList[1].trackingNumber = "";
+ orderDeliveryDto.contactInfoList[0] = {
+ ...orderDeliveryDto.contactInfoList[0],
+ ...recipientList.value,
+ };
+ editCancel(item);
+ quickorder("downlist");
+ } else if (item === "sender") {
+ orderDeliveryDto.contactInfoList[1].trackingNumber = "";
const senderinfo = props.DeliveryInfoList.senderList.find(
(item) => item.id === sender.value
);
@@ -528,10 +584,11 @@ const changeInfo = (item) => {
cityId: senderinfo.city_id,
districtId: senderinfo.district_id,
};
+ editCancel(item);
+ quickorder("downlist");
} else if (item.label === "物流公司") {
const logisticList = props.DeliveryInfoList.logisticsRespList.find(
- (e) =>
- e.logisticsCode == orderDeliveryDto.contactInfoList[1].deliveryCompany
+ (e) => e.id == orderDeliveryDto.contactInfoList[1].deliveryid
);
orderDeliveryDto.id = logisticList.id;
orderDeliveryDto.contactInfoList[1] = {
@@ -540,17 +597,21 @@ const changeInfo = (item) => {
address: `${logisticList.province}${logisticList.city}${logisticList.district}${logisticList.detailed}`,
cityId: logisticList.city_id,
districtId: logisticList.district_id,
- deliveryCompany: logisticList.logisticsCode,
+ deliveryid: logisticList.id,
deliverType: "0",
contactType: "1",
};
if (!logisticList.monthFlag) return;
orderDeliveryDto.contactInfoList[1].trackingNumber = "";
+
orderDeliveryDto.deliveryCompany =
- orderDeliveryDto.contactInfoList[1].deliveryCompany;
+ props.DeliveryInfoList.logisticsRespList.find(
+ (e) => e.id == orderDeliveryDto.contactInfoList[1].deliveryid
+ ).logisticsCode
quickorder("downlist");
}
};
+
const copyinfo = (e) => {
const text =
"收件人:" +
@@ -571,7 +632,7 @@ const quickorder = (str) => {
}
});
} else {
- const info = orderDeliveryDto.contactInfoList[1];
+ const info = orderDeliveryDto.deliveryCompany;
let status =
info.deliveryCompany == "sf" ? 1 : info.deliveryCompany == "jd" ? 2 : "";
emit("Print", {
@@ -591,7 +652,10 @@ watch(
if (val && val.senderList && val.senderList.length > 0) {
once = true;
const sender = val.senderList[0];
- const logisticList = val.logisticsRespList.find((e) => e.defaultFlag);
+ const defaultFlag = val.logisticsRespList.some((e) => e.defaultFlag);
+ const logisticList = defaultFlag
+ ? val.logisticsRespList.find((e) => e.defaultFlag)
+ : val.logisticsRespList[0];
if (sender && logisticList) {
sender.value = sender.id;
orderDeliveryDto.orderId = val.orderId;
@@ -609,18 +673,22 @@ watch(
address: `${logisticList.province}${logisticList.city}${logisticList.district}${logisticList.detailed}`,
cityId: logisticList.city_id,
districtId: logisticList.district_id,
- deliveryCompany: logisticList.logisticsCode,
+ deliveryid: logisticList.id,
deliverType: "0",
contactType: "1",
};
-
+ recipientList.value = {
+ contact: val.receiverName,
+ tel: val.receiverPhone,
+ address: `${val.receiverProvince}${val.receiverCity}${val.receiverDistrict}${val.receiverAddress}`,
+ };
ruleForm.shippingInfor.find((e) => e.label == "寄件人:").options =
val.senderList.map((item) => ({ label: item.name, value: item.id }));
ruleForm.shippingInfor.find((e) => e.label == "物流公司").options =
val.logisticsRespList.map((item) => ({
label: item.logisticsName,
- value: item.logisticsCode,
+ value: item.id,
}));
}
if (
@@ -718,6 +786,11 @@ onMounted(() => {});
height: 80px;
}
}
+.btnbox {
+ display: flex;
+ justify-content: flex-end;
+}
+
.dialog-footer {
display: flex;
justify-content: end;
diff --git a/src/components/table.vue b/src/components/table.vue
index 67a64c3..0f163d2 100644
--- a/src/components/table.vue
+++ b/src/components/table.vue
@@ -147,7 +147,7 @@
\ No newline at end of file
diff --git a/src/views/NewlyBuiltGoods/index.vue b/src/views/NewlyBuiltGoods/index.vue
index 475513f..8cd2ca4 100644
--- a/src/views/NewlyBuiltGoods/index.vue
+++ b/src/views/NewlyBuiltGoods/index.vue
@@ -575,6 +575,10 @@ const createGoods = reactive({
label: "普通商品",
value: 2,
},
+ // {
+ // label: "严选免检",
+ // value: 16,
+ // },
],
},
radio_group_sell: {
diff --git a/src/views/OrderManagement/index.vue b/src/views/OrderManagement/index.vue
index bb27f26..f5efe9e 100644
--- a/src/views/OrderManagement/index.vue
+++ b/src/views/OrderManagement/index.vue
@@ -11,7 +11,7 @@
-
+
{
+ console.log(item, "item");
+ if (!selectdateList.value.length)
+ return ElMessage.warning("至少选择一条数据!");
+ item.Loading = true;
+ const orderIds = [];
+ selectdateList.value.map((e) => orderIds.push(e.orderId));
+ manual_sync_order({ idList: orderIds }).then((res) => {
+ item.Loading = false;
+ if (res.code === "200") {
+ TableRef.value.clearCheckboxRow();
+ getDatas();
+ }
+ });
+ },
+ },
+]);
let orderInfoDto = reactive({
pageNo: 1,
@@ -557,6 +584,12 @@ const TabChange = (val) => {
New_TableLabel.value = TableLabel.value;
TableKey.value = new Date().getTime();
};
+const selectEvent = (data) => {
+ selectdateList.value = data;
+};
+const selectAllEvent = (data) => {
+ selectdateList.value = data;
+};
\ No newline at end of file
diff --git a/src/views/translateSet/components/addDialog.vue b/src/views/translateSet/components/addDialog.vue
index a14b642..23da4b2 100644
--- a/src/views/translateSet/components/addDialog.vue
+++ b/src/views/translateSet/components/addDialog.vue
@@ -3,7 +3,7 @@
@@ -35,6 +35,7 @@
:autocomplete="item.autocomplete"
:clearable="item.clearable"
:placeholder="item.placeholder"
+ @change="item.inputChange($event,item)"
>
- {{ row.default_flag ? "是" : "否" }}
+ {{ row.defaultFlag ? "是" : "否" }}
-
+
+ 编辑
+
+
+ 删除
+
+
+
@@ -167,12 +167,6 @@
clearable
>
-
@@ -186,8 +180,8 @@
-
-
-
-