Browse Source

金币三期需求补充

zhangrenyuan/feature-20260128093451-日常优化1.0
ZhangYong 1 month ago
parent
commit
c8448276fd
  1. 1
      src/components/locales/lang/en.js
  2. 1
      src/components/locales/lang/zh-CN.js
  3. 10
      src/views/moneyManage/executor/executor.vue
  4. 8
      src/views/moneyManage/refundDetail/refundHeader.vue
  5. 8
      src/views/moneyManage/refundDetail/refundService.vue

1
src/components/locales/lang/en.js

@ -331,6 +331,7 @@ export default {
limitJwcodeNine: "ID must be digits (max 9)", limitJwcodeNine: "ID must be digits (max 9)",
limitBalance: "Amount > balance", limitBalance: "Amount > balance",
limitRefundAmount: "Refund > Order Amount", limitRefundAmount: "Refund > Order Amount",
pleaseSelectExecutor: "Please select executor",
// Image Upload // Image Upload
onlyUploadJPGPNG: "JPG/PNG only!", onlyUploadJPGPNG: "JPG/PNG only!",
limitImageSize: "Max 1MB!", limitImageSize: "Max 1MB!",

1
src/components/locales/lang/zh-CN.js

@ -331,6 +331,7 @@ export default {
limitJwcodeNine: "精网号必须为数字且不超过九位", limitJwcodeNine: "精网号必须为数字且不超过九位",
limitBalance: "所填金额大于该类金币余额", limitBalance: "所填金额大于该类金币余额",
limitRefundAmount: "退款金额不能大于订单金额", limitRefundAmount: "退款金额不能大于订单金额",
pleaseSelectExecutor: "请选择执行人",
// 图片上传 // 图片上传
onlyUploadJPGPNG: "只能上传 JPG/PNG 图片!", onlyUploadJPGPNG: "只能上传 JPG/PNG 图片!",
limitImageSize: "图片大小不能超过 1MB!", limitImageSize: "图片大小不能超过 1MB!",

10
src/views/moneyManage/executor/executor.vue

@ -12,7 +12,7 @@
</div> </div>
<div class="search"> <div class="search">
<el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text> <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
<el-cascader v-model="searchForm.goodsName" :props="{ multiple: true, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
<el-cascader v-model="searchForm.goodsName" :props="{ multiple: false, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
</div> </div>
<div class="search" v-if="adminData.markets === t('common.markets.headquarter')"> <div class="search" v-if="adminData.markets === t('common.markets.headquarter')">
<el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text> <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
@ -197,8 +197,8 @@
show-word-limit clearable /> show-word-limit clearable />
</div> </div>
<div class="dialog-item"> <div class="dialog-item">
<el-text style="width:4vw;">退款理由</el-text>
<el-input v-model="editRow.rejectReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
<el-text style="width:4vw;">{{ t('common_add.refundReason') }}</el-text>
<el-input v-model="editRow.refundReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
show-word-limit clearable /> show-word-limit clearable />
</div> </div>
</div> </div>
@ -304,8 +304,8 @@ const getRefund = async function () {
statusesParam.value = [40, 41] 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) { if (searchForm.value.jwcode) {
const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode); const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);

8
src/views/moneyManage/refundDetail/refundHeader.vue

@ -485,6 +485,10 @@ const executorList = ref([
{ {
value: '90047947', value: '90047947',
label: '宋彤彤' label: '宋彤彤'
},
{
value: '90047860',
label: 'zy'
} }
]) ])
// //
@ -558,6 +562,10 @@ const handlePass = async function () {
ElMessage.error(t('elmessage.noPermission')) ElMessage.error(t('elmessage.noPermission'))
return return
} }
if (!addForm.value.executor) {
ElMessage.error(t('elmessage.pleaseSelectExecutor'))
return
}
try { try {
const params = { const params = {
id: auditRow.value.id, id: auditRow.value.id,

8
src/views/moneyManage/refundDetail/refundService.vue

@ -14,7 +14,7 @@
</div> </div>
<div class="item1"> <div class="item1">
<el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text> <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
<el-cascader v-model="searchForm.goodsName" :props="{ multiple: true, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
<el-cascader v-model="searchForm.goodsName" :props="{ multiple: false, emitPath: false }" :show-all-levels="false" :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
</div> </div>
<div class="item1" v-if="isHeadquarters"> <div class="item1" v-if="isHeadquarters">
<el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text> <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
@ -322,8 +322,10 @@ const getRefund = async function () {
statusParam.value = [12, 22, 32] 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) { if (searchForm.value.jwcode) {
const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode); const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);

Loading…
Cancel
Save