From 61242276f7bd71252dd5b52259b4c2aeffbf8818 Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Fri, 5 Apr 2024 18:19:51 +0800 Subject: [PATCH] add --- babel.config.js | 3 +- package.json | 1 + src/api/order.js | 18 ++ src/views/accounts/transferRecord/index.vue | 12 +- src/views/merchant/list/handle/merDetails.vue | 8 +- .../merchant/list/handle/merEditForm.vue | 12 + src/views/merchant/list/handle/merInfo.vue | 32 ++- src/views/merchant/list/index.vue | 10 + src/views/order/refund/index.vue | 51 +++- src/views/order/refund/refundDetail.vue | 192 +++++++++++++ src/views/product/productExamine/index.vue | 1 + src/views/product/productExamine/info.vue | 20 +- .../product/productExamine/proDetails.vue | 268 +++++++++++++++++- 13 files changed, 610 insertions(+), 18 deletions(-) create mode 100644 src/views/order/refund/refundDetail.vue diff --git a/babel.config.js b/babel.config.js index ba17966..8514aa8 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,6 @@ module.exports = { presets: [ '@vue/app' - ] + ], + plugins: ["@babel/plugin-proposal-optional-chaining"] } diff --git a/package.json b/package.json index ef93fef..dee09bb 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,7 @@ }, "devDependencies": { "@babel/core": "7.0.0", + "@babel/plugin-proposal-optional-chaining": "^7.21.0", "@babel/register": "7.0.0", "@vue/cli-plugin-babel": "3.5.3", "@vue/cli-plugin-eslint": "^3.9.1", diff --git a/src/api/order.js b/src/api/order.js index 63e1ec0..e3f2e5e 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -15,6 +15,24 @@ import request from './request' export function orderListApi(data) { return request.get('order/lst', data) } +/** + * @description 退款订单 -- 详情 + */ +export function refundorderDetailApi(id) { + return request.get(`order/refund/detail/${id}`) +} +/** + * @description 退款订单 -- 记录from + */ +export function refundorderLogApi(id) { + return request.get(`order/refund/log/${id}`) +} +/** + * @description 退款订单 -- 审核from + */ +export function refundorderStatusApi(id) { + return request.get(`order/refund/status/${id}/form`) +} /** * @description 开启退款 */ diff --git a/src/views/accounts/transferRecord/index.vue b/src/views/accounts/transferRecord/index.vue index 0130f7e..c7f67f6 100644 --- a/src/views/accounts/transferRecord/index.vue +++ b/src/views/accounts/transferRecord/index.vue @@ -160,7 +160,7 @@ @@ -186,15 +190,18 @@ import { refundorderListApi, orderUpdateApi, + refundorderStatusApi, + refundorderDetailApi, orderDeliveryApi, exportRefundOrderApi } from "@/api/order"; import createWorkBook from '@/utils/newToExcel.js'; +import detailsFrom from './refundDetail' import { fromList } from "@/libs/constants.js"; import fileList from '@/components/exportFile/fileList' import { roterPre } from "@/settings"; import timeOptions from '@/utils/timeOptions'; export default { - components: { fileList }, + components: { fileList,detailsFrom }, name: "OrderRefund", data() { return { @@ -232,6 +239,9 @@ export default { dialogVisible: false, cardLists: [], orderDatalist: null, + orderDetails: {}, + result: [], + dialogLogistics:false }; }, mounted() { @@ -252,6 +262,45 @@ export default { this.getList(''); }, methods: { + // 退款 + onOrderStatus(id) { + this.$modalForm(refundorderStatusApi(id)).then(() => this.getList('')) + }, + // 详情 + onRefundOrderDetail(id) { + this.orderId = id + this.$refs.orderDetail.dialogVisible = true + this.loading = true + refundorderDetailApi(id) + .then(res => { + this.orderDatalist = res.data + this.loading = false + this.$refs.orderDetail.onOrderLog(id) + }) + .catch(({ message }) => { + this.loading = false + this.$message.error(message) + }) + }, + openLogistics(row) { + this.orderDetails = row + this.getOrderData(row.refund_order_id) + this.dialogLogistics = true + }, + handleClose() { + this.dialogLogistics = false + this.dialogConfirm = false + }, + // 获取订单物流信息 + getOrderData(id) { + refundorderExpressApi(id) + .then(async res => { + this.result = res.data + }) + .catch(res => { + this.$message.error(res.message) + }) + }, /**重置 */ searchReset(){ this.timeVal = [] diff --git a/src/views/order/refund/refundDetail.vue b/src/views/order/refund/refundDetail.vue new file mode 100644 index 0000000..3ee22d4 --- /dev/null +++ b/src/views/order/refund/refundDetail.vue @@ -0,0 +1,192 @@ + + + + diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue index fa130b1..29ad17c 100644 --- a/src/views/product/productExamine/index.vue +++ b/src/views/product/productExamine/index.vue @@ -135,6 +135,7 @@ {{ scope.row.merchant ? scope.row.merchant.mer_name : '' }} + @@ -485,6 +498,200 @@ + + 商品名称： + + 国产 + 进口 + + +
+ 生产企业名称：{{ qualification.production_name }} + +
生产营业执照：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
商标注册证：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
销售授权及其他：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
商品检测报告：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
其他资质：
+
+
+ {{ item.name }} +
+ +
+
+
+ +
+
+ 进口/企业境内总代企业名称: {{ qualification.import_name }} + +
生产营业执照：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
销售授权及其他：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
海关检验检疫证书及报关单：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
产品外包装实物图：
+
+
+ {{ item.name }} +
+ +
+
+
+ + +
其他资质：
+
+
+ {{ item.name }} +
+ +
+
+
+ +
+ @@ -575,6 +782,23 @@ export default { return { loading: true, productId: '', + qualification:{ + production_name: '', + businessList: [], + licenceList: [], + trademarkList: [], + authorizedList: [], + commodityList: [], + otherList: [], + importBusinessList: [], + importAuthorizedList: [], + customsList: [], + packingList: [], + importOtherList: [], + commodity_type: 0, + brands_name: '', + import_name: '' + }, direction: 'rtl', activeName: 'basic', productData: {}, @@ -617,6 +841,11 @@ export default { filters: { }, methods: { + getType(val){ + var regex = /(?:\.([^.]+))?$/; + let suffix = regex.exec(val.url)[1] + return suffix == 'pdf' + }, handleClose() { this.activeName = 'basic'; this.$emit('closeDrawer'); @@ -627,6 +856,7 @@ export default { productDetailApi(id).then(res => { this.loading = false; this.productData = res.data + this.qualification = res.data.qualification this.mer_svip_status = res.data.mer_svip_status this.svip_type = res.data.svip_price_type if (this.productData.spec_type === 0) { @@ -764,6 +994,40 @@ export default { } } } +.sp { + display: block; + // width: 33%; + margin-bottom: 20px; + } +.upload{ + display: flex; + flex-direction: row; + // align-content: center; + align-items: center; + height: 60px; + // line-height: 60px; + margin-bottom: 20px; + &_right{ + display: flex; + height: 60px; + } + &_left{ + width: 115px; + } + .txt{ + width: 60px; + height: 60px; + line-height: 60px; + overflow: hidden; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + border: 1px solid #DCDFE6; + border-radius: 4px; + margin-right: 10px; + color: blue; + } + } .tabNumWidth{ max-height: 350px; overflow-y: auto;