lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11.8财务流程

Browse Source
zth
lijingjia 2 weeks ago
parent 59c6d7726c
commit def3115dde
9 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File

40
src/components/CostEntry/components/feeTable.vue
Unescape Escape View File

@ -23,7 +23,6 @@
:max="record.restAmount"
:step="0.01"
string-mode
@change="amountChange($event, record)"
@click.native.stop="handleInputClick"
/>
</template>
@ -35,7 +34,6 @@
</div>
</template>
</a-table>
</div>
</template>
<script lang="ts" setup>
@ -84,9 +82,9 @@
loading.value = false
const { data } = res
data.forEach((item, index) => {
if (item.amount) item.amount = numberThousandFormat(item.amount, 2, true)
if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, true)
if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, true)
if (item.amount) item.amount = numberThousandFormat(item.amount, 2, false)
if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, false)
if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, false)
item['feeStatusText'] = feeStatusList[item.feeStatus]
if (item.createTime) item.createTime = item.createTime.split(' ')[0]
if (item.auditDate) item.auditDate = item.auditDate.split(' ')[0]
@ -96,9 +94,10 @@
})
}
// 改变申请金额计算总金额
const amountChange = (e, row) => {
row.amount = Number(e * row.originalRate).toFixed(6)
}
// const amountChange = (e, row) => {
// console.log(row)
// row.amount = Number(e * row.originalRate || 1).toFixed(2)
// }
// 根据业务编号及类型获取关联费用记录 (Auth)
const getFees = async (id, businessType, customerId, queryCondition) => {
const postData = {
@ -116,9 +115,9 @@
const { data } = res
loading.value = false
data.items.forEach((item, index) => {
if (item.amount) item.amount = numberThousandFormat(item.amount, 2, true)
if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, true)
if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, true)
if (item.amount) item.amount = numberThousandFormat(item.amount, 2, false)
if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, false)
if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, false)
item['feeStatusText'] = feeStatusList[item.feeStatus]
item['id'] = item.recordId
if (item.createTime) item.createTime = item.createTime.split(' ')[0]
@ -146,9 +145,9 @@
const { data } = res
loading.value = false
data.forEach((item, index) => {
if (item.amount) item.amount = numberThousandFormat(item.amount, 2, true)
if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, true)
if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, true)
if (item.amount) item.amount = numberThousandFormat(item.amount, 2, false)
if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, false)
if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, false)
item['feeStatusText'] = feeStatusList[item.feeStatus]
if (item.createTime) item.createTime = item.createTime.split(' ')[0]
if (item.auditDate) item.auditDate = item.auditDate.split(' ')[0]
@ -177,10 +176,13 @@
list.value.push(row)
}
if (currencyList[row.currency]) {
currencyList[row.currency] = currencyList[row.currency] + Number(row.amount) || 0
currencyList[row.currency] = Number(currencyList[row.currency]) + Number(row.amount) || 0
} else {
currencyList[row.currency] = row.amount
}
if (currencyList[row.currency]) {
currencyList[row.currency] = Number(currencyList[row.currency]).toFixed(2)
}
}
})
})
@ -241,18 +243,20 @@
row['feeStatusText'] = '录入状态'
list.value.push(row)
}
console.log(row)
if (currencyList[row.currency]) {
currencyList[row.currency] = currencyList[row.currency] + Number(row.amount) || 0
currencyList[row.currency] = Number(currencyList[row.currency]) + Number(row.amount) || 0
} else {
currencyList[row.currency] = row.amount
}
if (currencyList[row.currency]) {
currencyList[row.currency] = Number(currencyList[row.currency]).toFixed(2)
}
}
})
})
state.infoRowKeys = newSelectedRowKeys
}, 100)
console.log(state.infoRowKeys)
}
}
}

32
src/components/CostEntry/feeTable.vue
Unescape Escape View File

@ -1141,20 +1141,26 @@ import { Item } from 'ant-design-vue/lib/menu'
// 数据初始化
if (props.isShowBtn) init()
// 处理输入法第一个字母失效
document.addEventListener('keyup', handKeyUp, false)
document.addEventListener('mousedown', handKeyDown, false)
// document.addEventListener('keyup', handKeyUp, false)
// document.addEventListener('mousedown', handKeyDown, false)
})
const handKeyUp = (event) => {
if (editKeyCode.indexOf(event.keyCode) > -1) {
hotTb.value.hotInstance.removeHook('afterSelectionEnd', afterSelect)
}
}
const handKeyDown = (event) => {
hotTb.value.hotInstance.removeHook('afterSelectionEnd', afterSelect)
}
const afterSelect = () => {
hotTb.value.hotInstance.getActiveEditor().beginEditing()
}
// const handKeyUp = (event) => {
// if (editKeyCode.indexOf(event.keyCode) > -1) {
// console.log(222)
// hotTb.value.hotInstance.removeHook('afterSelectionEnd', afterSelect)
// } else {
// console.log(666)
// hotTb.value.hotInstance.addHook('afterSelectionEnd', afterSelect)
// }
// }
// const handKeyDown = (event) => {
// console.log(333)
// hotTb.value.hotInstance.removeHook('afterSelectionEnd', afterSelect)
// }
// const afterSelect = () => {
// console.log(555)
// hotTb.value.hotInstance.getActiveEditor().beginEditing()
// }
// 实时更新表格列
const updateCol = (list) => {
hotTb.value.hotInstance.updateSettings({

2
src/components/Form/src/BasicForm.vue
Unescape Escape View File

@ -31,7 +31,7 @@
<a-col :span="schema?.colProps?.span || 24" v-if="getReadonlyColItemVisible(schema)">
<div class="ds-form-onlyread">
<span class="label">{{ schema.label }}：</span>
<span>{{ formModel[schema.field] || '-' }}</span>
<slot :name="schema.field" :model="formModel"><span>{{ formModel[schema.field] || '-' }}</span></slot>
<span
v-if="!schema.dynamicDisabled"
class="iconfont icon-bianji1"

4
src/views/finance/paymentSettlement/detail/components/feeTable.vue
Unescape Escape View File

@ -42,7 +42,9 @@
showTableSetting: true,
bordered: true,
showIndexColumn: false,
canResize: false,
canResize: true,
resizeHeightOffset: 15,
rowSelection: { type: '' },
immediate: false,
id: '2'
})

1
src/views/finance/paymentSettlement/detail/index.vue
Unescape Escape View File

@ -221,7 +221,6 @@
}
.ant-divider-vertical {
height: 1.9em;
margin-top: 12px;
background: #cccccc;
}
.ant-divider-horizontal {

2
src/views/finance/paymentSettlement/index.vue
Unescape Escape View File

@ -137,7 +137,7 @@
// 编辑
const handleEdit = (row) => {
if(row.mode==1){
go(`/payment-settlement/create?type=1&id=`+row.id)
go(`/payment-settlement/detail?type=1&id=`+row.id)
}
if(row.mode==3){
go(`/paymentSettlementFree?type=free&id=`+row.id)

26
src/views/operation/paidApply/detail/components/businessTable.vue
Unescape Escape View File

@ -140,13 +140,13 @@
const res = await GetBizList(p)
res.data.forEach((item, index) => {
item['idIndex'] = item.id + index
item['unpaidRMB'] = numberThousandFormat(item['unpaidRMB'], 2, true)
item['unpaidUSD'] = numberThousandFormat(item['unpaidUSD'], 2, true)
item['unreceivedRMB'] = numberThousandFormat(item['unreceivedRMB'], 2, true)
item['unreceivedUSD'] = numberThousandFormat(item['unreceivedUSD'], 2, true)
item['unBilledRMB'] = numberThousandFormat(item['unBilledRMB'], 2, true)
item['unBilledUSD'] = numberThousandFormat(item['unBilledUSD'], 2, true)
item['unreceivedTotal'] = numberThousandFormat(item['unreceivedTotal'], 2, true)
item['unpaidRMB'] = numberThousandFormat(item['unpaidRMB'], 2, false)
item['unpaidUSD'] = numberThousandFormat(item['unpaidUSD'], 2, false)
item['unreceivedRMB'] = numberThousandFormat(item['unreceivedRMB'], 2, false)
item['unreceivedUSD'] = numberThousandFormat(item['unreceivedUSD'], 2, false)
item['unBilledRMB'] = numberThousandFormat(item['unBilledRMB'], 2, false)
item['unBilledUSD'] = numberThousandFormat(item['unBilledUSD'], 2, false)
item['unreceivedTotal'] = numberThousandFormat(item['unreceivedTotal'], 2, false)
})
if (res?.data?.length) state.historyRowKeys = [res.data[0].id + 0]
setSelectedRows([res.data[0]])
@ -506,15 +506,13 @@
pusd.value = 0
rother.value = 0
pother.value = 0
console.log(rows)
// 计算业务表合计
rows.forEach(item => {
rrmb.value = numberThousandFormat(rrmb.value + Number(item.unreceivedRMB) || 0, 2, true)
prmb.value = numberThousandFormat(prmb.value + Number(item.unpaidRMB) || 0, 2, true)
rusd.value = numberThousandFormat(rusd.value + Number(item.unreceivedUSD) || 0, 2, true)
pusd.value = numberThousandFormat(pusd.value + Number(item.unpaidUSD) || 0, 2, true)
// rother.value = rother.value + Number(item.unreceivedOther) || 0
// pother.value = pother.value + Number(item.unpaidOther) || 0
rrmb.value = numberThousandFormat(rrmb.value + Number(item.unreceivedRMB) || 0, 2, false)
prmb.value = numberThousandFormat(prmb.value + Number(item.unpaidRMB) || 0, 2, false)
rusd.value = numberThousandFormat(rusd.value + Number(item.unreceivedUSD) || 0, 2, false)
pusd.value = numberThousandFormat(pusd.value + Number(item.unpaidUSD) || 0, 2, false)
})
})

1
src/views/operation/paidApply/detail/index.vue
Unescape Escape View File

@ -197,7 +197,6 @@
additionalData.value = res.additionalData
})
// 如果存在id 禁用弹窗的币别选择
} else {
// 新建
visible.value = true

3
src/views/taskmanage/index.vue
Unescape Escape View File

@ -1175,7 +1175,8 @@ function handleEdit(data) {
path: '/approve-fee',
query: {
id: data.ouT_BS_NO,
btype: 1
btype: 1,
status: data.tasK_TYPE
}
})
break

Write Preview
Loading…
Cancel
Save