diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 95ce268..b14158e 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -331,6 +331,7 @@ export default {
limitJwcodeNine: "ID must be digits (max 9)",
limitBalance: "Amount > balance",
limitRefundAmount: "Refund > Order Amount",
+ pleaseSelectExecutor: "Please select executor",
// Image Upload
onlyUploadJPGPNG: "JPG/PNG only!",
limitImageSize: "Max 1MB!",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 89f37d0..4dc4f10 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -331,6 +331,7 @@ export default {
limitJwcodeNine: "精网号必须为数字且不超过九位",
limitBalance: "所填金额大于该类金币余额",
limitRefundAmount: "退款金额不能大于订单金额",
+ pleaseSelectExecutor: "请选择执行人",
// 图片上传
onlyUploadJPGPNG: "只能上传 JPG/PNG 图片!",
limitImageSize: "图片大小不能超过 1MB!",
diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 52610fa..078d5dd 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -12,7 +12,7 @@
{{ t('common.productName') }}
-
+
{{ t('common.market') }}
@@ -197,8 +197,8 @@
show-word-limit clearable />
- 退款理由
- {{ t('common_add.refundReason') }}
+
@@ -304,8 +304,8 @@ const getRefund = async function () {
statusesParam.value = [40, 41]
}
- const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
- ? searchForm.value.goodsName: []
+ let goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
+ ? [searchForm.value.goodsName] : []
if (searchForm.value.jwcode) {
const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 3535aa1..4230485 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -485,6 +485,10 @@ const executorList = ref([
{
value: '90047947',
label: '宋彤彤'
+ },
+ {
+ value: '90047860',
+ label: 'zy'
}
])
// 查全部
@@ -558,6 +562,10 @@ const handlePass = async function () {
ElMessage.error(t('elmessage.noPermission'))
return
}
+ if (!addForm.value.executor) {
+ ElMessage.error(t('elmessage.pleaseSelectExecutor'))
+ return
+ }
try {
const params = {
id: auditRow.value.id,
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index a237c7c..38896b1 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -14,7 +14,7 @@
{{ t('common.productName') }}
-
+
{{ t('common.market') }}
@@ -322,8 +322,10 @@ const getRefund = async function () {
statusParam.value = [12, 22, 32]
}
- const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
- ? searchForm.value.goodsName : []
+ console.log('goodsName', searchForm.value.goodsName);
+
+ let goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
+ ? [searchForm.value.goodsName] : []
if (searchForm.value.jwcode) {
const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);