|
|
@@ -33,7 +33,7 @@
|
|
|
<el-option value="为空" label="为空"></el-option>
|
|
|
</el-select>
|
|
|
<el-select class="w-350px" v-if="item.name == 'contactPersonPhone'" v-model="item.search" placeholder="请选择"
|
|
|
- clearable filterable :disabled="item.type == '为空'">
|
|
|
+ clearable :disabled="item.type == '为空'">
|
|
|
<el-option v-for="item in options" :key="item.contactPersonPhone" :value="item.contactPersonPhone"
|
|
|
:label="item.contactPerson"></el-option>
|
|
|
</el-select>
|
|
|
@@ -308,7 +308,6 @@ const handleSearch = () => {
|
|
|
console.log(searchList.value)
|
|
|
// router
|
|
|
api.financeApi.getSelectedReceivableList({
|
|
|
- contactPersonPhone: route.query.contactPersonPhone,
|
|
|
orderNos: selectedList.value.map(item => item.orderNo),
|
|
|
searchList: searchList.value,
|
|
|
logicJudge: logicJudge.value,
|
|
|
@@ -439,8 +438,8 @@ const handelComfirm = (formEl: FormInstance | undefined) => {
|
|
|
api.financeApi.platformSettlement({
|
|
|
settlementVo: countForm.value,
|
|
|
invoicingVo: {
|
|
|
- incomeIds: selectedList.value.map(item => item.id),
|
|
|
- orderNos: selectedList.value.map(item => item.orderNo),
|
|
|
+ incomeIds: tableData.value.map(item => item.id),
|
|
|
+ orderNos: tableData.value.map(item => item.orderNo),
|
|
|
contactPersonPhone: contactPersonPhone.value,
|
|
|
contactPerson: contactPersonObj.contactPerson,
|
|
|
receivablePremium: receivablePremium.value,
|
|
|
@@ -473,7 +472,7 @@ const uploadImage = async (file, fileList) => {
|
|
|
}
|
|
|
const initData = () => {
|
|
|
// router
|
|
|
- api.financeApi.getSelectedReceivableList({ orderNos: selectedList.value.map(v => v.orderNo), contactPersonPhone: route.query.contactPersonPhone }).then((res: any) => {
|
|
|
+ api.financeApi.getSelectedReceivableList({ orderNos: selectedList.value.map(v => v.orderNo), searchList: searchList.value,logicJudge: logicJudge.value, }).then((res: any) => {
|
|
|
if (res.code == 200) {
|
|
|
tableData.value = res.data
|
|
|
}
|