huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

财务被代收用户数据问题

lihuilin/feature-20251104102812-现金二期
ZhangYong 1 week ago
parent
a6049c22fe
commit
99f5292a5a
2 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  2. 16
      src/views/moneyManage/receiveDetail/receiveManage.vue

16
src/views/moneyManage/receiveDetail/receiveFinance.vue
View File

@ -200,7 +200,7 @@
@click="openAuditForm(scope.row)">审核 @click="openAuditForm(scope.row)">审核
</el-link> </el-link>
<el-link <el-link
v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
style="color: #2741DE;" @click="openEditForm(scope.row)">编辑 style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
</el-link> </el-link>
<el-link <el-link
@ -344,8 +344,8 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3"
maxlength="100" show-word-limit />
<el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="驳回理由" v-if="ifReject" required> <el-form-item label="驳回理由" v-if="ifReject" required>
<el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由" <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
@ -458,7 +458,7 @@
<div class="right"> <div class="right">
<el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt" <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
label-width="4.5vw" label-position="left"> label-width="4.5vw" label-position="left">
<el-form-item label="到账货币" >
<el-form-item label="到账货币">
<CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions" <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
placeholder="请选择到账货币" /> placeholder="请选择到账货币" />
</el-form-item> </el-form-item>
@ -468,7 +468,7 @@
<el-form-item label="手续费" prop="handlingCharge"> <el-form-item label="手续费" prop="handlingCharge">
<el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" /> <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
</el-form-item> </el-form-item>
<el-form-item label="到账时间" >
<el-form-item label="到账时间">
<el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" /> <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -1086,7 +1086,7 @@ watch(auditFormisible, (val) => {
// 打开编辑弹窗 // 打开编辑弹窗
const openEditForm = (row) => { const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge); console.log('row.aaa', row.handlingCharge);
editFormData.value = { ...row }; editFormData.value = { ...row };
// 区分金币产品与普通产品 // 区分金币产品与普通产品
if (row.goodsName === '金币充值') isEditGold.value = true; if (row.goodsName === '金币充值') isEditGold.value = true;
@ -1115,12 +1115,12 @@ const submitEditForm = async () => {
editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss'); editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
} }
console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge); console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
const result = await request({ const result = await request({
url: '/cashCollection/complete', url: '/cashCollection/complete',
data: { data: {
orderCode: editFormData.value.orderCode, orderCode: editFormData.value.orderCode,
handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency), paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency), receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),

16
src/views/moneyManage/receiveDetail/receiveManage.vue
View File

@ -200,7 +200,7 @@
@click="openAuditForm(scope.row)">审核 @click="openAuditForm(scope.row)">审核
</el-link> </el-link>
<el-link <el-link
v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
style="color: #2741DE;" @click="openEditForm(scope.row)">编辑 style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
</el-link> </el-link>
<el-link <el-link
@ -344,8 +344,8 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3"
maxlength="100" show-word-limit />
<el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="驳回理由" v-if="ifReject" required> <el-form-item label="驳回理由" v-if="ifReject" required>
<el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由" <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
@ -458,7 +458,7 @@
<div class="right"> <div class="right">
<el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt" <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
label-width="4.5vw" label-position="left"> label-width="4.5vw" label-position="left">
<el-form-item label="到账货币" >
<el-form-item label="到账货币">
<CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions" <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
placeholder="请选择到账货币" /> placeholder="请选择到账货币" />
</el-form-item> </el-form-item>
@ -468,7 +468,7 @@
<el-form-item label="手续费" prop="handlingCharge"> <el-form-item label="手续费" prop="handlingCharge">
<el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" /> <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
</el-form-item> </el-form-item>
<el-form-item label="到账时间" >
<el-form-item label="到账时间">
<el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" /> <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -1086,7 +1086,7 @@ watch(auditFormisible, (val) => {
// 打开编辑弹窗 // 打开编辑弹窗
const openEditForm = (row) => { const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge); console.log('row.aaa', row.handlingCharge);
editFormData.value = { ...row }; editFormData.value = { ...row };
// 区分金币产品与普通产品 // 区分金币产品与普通产品
if (row.goodsName === '金币充值') isEditGold.value = true; if (row.goodsName === '金币充值') isEditGold.value = true;
@ -1115,12 +1115,12 @@ const submitEditForm = async () => {
editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss'); editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
} }
console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge); console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
const result = await request({ const result = await request({
url: '/cashCollection/complete', url: '/cashCollection/complete',
data: { data: {
orderCode: editFormData.value.orderCode, orderCode: editFormData.value.orderCode,
handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency), paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency), receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),

Write Preview
Loading…
Cancel
Save