2 Commits

Author SHA1 Message Date
ZhangYong 3b3537ed77 退款执行上传图片提示 13 hours ago
ZhangYong 4ee3a62df6 收款执行修改精网号问题 13 hours ago
  1. 4
      src/views/moneyManage/executor/executor.vue
  2. 40
      src/views/moneyManage/receiveDetail/receiveService.vue

4
src/views/moneyManage/executor/executor.vue

@ -634,9 +634,9 @@ const customUpload = async (options) => {
}) })
if (response.code === 200 && response.data) { if (response.code === 200 && response.data) {
editForm.value.imageUrl = response.data.url editForm.value.imageUrl = response.data.url
ElMessage.success(response.msg || t('elmessage.uploadSuccess'))
ElMessage.success( t('elmessage.uploadSuccess'))
} else { } else {
ElMessage.error(response.msg || t('elmessage.uploadFailed'))
ElMessage.error( t('elmessage.uploadFailed'))
} }
} catch (error) { } catch (error) {
console.error('上传错误:', error) console.error('上传错误:', error)

40
src/views/moneyManage/receiveDetail/receiveService.vue

@ -804,11 +804,12 @@ const handleJwcodeBlur = () => {
// //
const jwcodeQuerying = ref(false) const jwcodeQuerying = ref(false)
let jwcodeQueryPromise = null let jwcodeQueryPromise = null
//
const lastSearchedJwcode = ref('')
const jwcodeSeachMarket = async () => { const jwcodeSeachMarket = async () => {
try { try {
if (jwcodeQuerying.value && jwcodeQueryPromise) { if (jwcodeQuerying.value && jwcodeQueryPromise) {
await jwcodeQueryPromise
return
return await jwcodeQueryPromise
} }
const jwcode = String(addFormData.value.jwcode ?? '').replace(/\s/g, '') const jwcode = String(addFormData.value.jwcode ?? '').replace(/\s/g, '')
addFormData.value.jwcode = jwcode addFormData.value.jwcode = jwcode
@ -824,6 +825,12 @@ const jwcodeSeachMarket = async () => {
ElMessage.error(t('elmessage.limitJwcodeLength')) ElMessage.error(t('elmessage.limitJwcodeLength'))
return return
} }
//
if (lastSearchedJwcode.value === jwcode && addFormData.value.name && addFormData.value.market) {
return { code: 200, data: { market: addFormData.value.market, marketName: addFormData.value.marketName, name: addFormData.value.name } }
}
jwcodeQuerying.value = true jwcodeQuerying.value = true
jwcodeQueryPromise = request({ jwcodeQueryPromise = request({
url: '/cashCollection/getNameAndMarket', url: '/cashCollection/getNameAndMarket',
@ -835,25 +842,32 @@ const jwcodeSeachMarket = async () => {
addFormData.value.market = result.data.market addFormData.value.market = result.data.market
addFormData.value.marketName = result.data.marketName addFormData.value.marketName = result.data.marketName
addFormData.value.name = result.data.name addFormData.value.name = result.data.name
lastSearchedJwcode.value = jwcode //
if (addFormRef.value) { if (addFormRef.value) {
addFormRef.value.validateField('name'); addFormRef.value.validateField('name');
addFormRef.value.validateField('market'); addFormRef.value.validateField('market');
} }
return result; // 便
} else if (result.code == 0) { } else if (result.code == 0) {
lastSearchedJwcode.value = '' //
const region = result.data && result.data.market const region = result.data && result.data.market
if (region) { if (region) {
ElMessage.info({ ElMessage.info({
message: t('elmessage.userRegionHint', { region }), message: t('elmessage.userRegionHint', { region }),
customClass: 'custom-blue-message' customClass: 'custom-blue-message'
}) })
return
} }
ElMessage.error(t('elmessage.customerNotExist')) ElMessage.error(t('elmessage.customerNotExist'))
return result; // code0便
} else { } else {
lastSearchedJwcode.value = '' //
ElMessage.error(t('elmessage.customerNotExist')) ElMessage.error(t('elmessage.customerNotExist'))
return result; //
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
lastSearchedJwcode.value = ''
return { code: 500 }; //
} finally { } finally {
jwcodeQuerying.value = false jwcodeQuerying.value = false
jwcodeQueryPromise = null jwcodeQueryPromise = null
@ -862,8 +876,9 @@ const jwcodeSeachMarket = async () => {
const waitJwcodeQuery = async () => { const waitJwcodeQuery = async () => {
if (jwcodeQuerying.value && jwcodeQueryPromise) { if (jwcodeQuerying.value && jwcodeQueryPromise) {
await jwcodeQueryPromise
return await jwcodeQueryPromise
} }
return null
} }
const LastGoodsName = ref('') const LastGoodsName = ref('')
@ -935,7 +950,9 @@ const testGold = () => {
// //
const handleAddForm = async () => { const handleAddForm = async () => {
try { try {
await waitJwcodeQuery()
// null
const waitResult = await waitJwcodeQuery()
await addFormRef.value.validate(); await addFormRef.value.validate();
if (!testGold().valid) { if (!testGold().valid) {
ElMessage.error(testGold().message); ElMessage.error(testGold().message);
@ -976,6 +993,19 @@ const handleAddForm = async () => {
} }
ifAddDone.value = true ifAddDone.value = true
//
let jwcodeResult = waitResult
if (!jwcodeResult) {
jwcodeResult = await jwcodeSeachMarket()
}
// code=0 退
if (!jwcodeResult || jwcodeResult.code === 0 || jwcodeResult.code === 500) {
ifAddDone.value = false;
return;
}
const result = await request({ const result = await request({
url: '/cashCollection/add', url: '/cashCollection/add',
data: { data: {

Loading…
Cancel
Save