|
@@ -31,7 +31,7 @@
|
|
|
<el-form-item label="出单协议">
|
|
<el-form-item label="出单协议">
|
|
|
<el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
|
|
<el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
|
|
|
<el-option v-for="item in agreementList" :key="item.id" :value="item.id"
|
|
<el-option v-for="item in agreementList" :key="item.id" :value="item.id"
|
|
|
- :label="item.agreementTitle"></el-option>
|
|
|
|
|
|
|
+ :label="item.agreementTitle"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -129,7 +129,9 @@
|
|
|
<el-button class="radius-2px width-100" type="primary" @click="handleExport(1)">导出</el-button>
|
|
<el-button class="radius-2px width-100" type="primary" @click="handleExport(1)">导出</el-button>
|
|
|
</div>
|
|
</div>
|
|
|
<span class="col-108 m-r-8">
|
|
<span class="col-108 m-r-8">
|
|
|
- <el-button class="radius-2px width-100" :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')" @click="handleBatchEdit">批量修改比例</el-button>
|
|
|
|
|
|
|
+ <el-button class="radius-2px width-100"
|
|
|
|
|
+ :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')"
|
|
|
|
|
+ @click="handleBatchEdit">批量修改比例</el-button>
|
|
|
</span>
|
|
</span>
|
|
|
<span class="col-108 m-r-8">
|
|
<span class="col-108 m-r-8">
|
|
|
<el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
|
|
<el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
|
|
@@ -224,7 +226,7 @@
|
|
|
<el-form-item label="出单协议">
|
|
<el-form-item label="出单协议">
|
|
|
<el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
|
|
<el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
|
|
|
<el-option v-for="item in agreementList" :key="item.id" :value="item.id"
|
|
<el-option v-for="item in agreementList" :key="item.id" :value="item.id"
|
|
|
- :label="item.agreementTitle"></el-option>
|
|
|
|
|
|
|
+ :label="item.agreementTitle"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -476,20 +478,27 @@
|
|
|
<el-form :model="editForm">
|
|
<el-form :model="editForm">
|
|
|
<el-radio v-model="feeRate">跟单比例</el-radio>
|
|
<el-radio v-model="feeRate">跟单比例</el-radio>
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="12">
|
|
|
|
|
|
|
+ <el-col :span="12" v-if="activeName === '1'">
|
|
|
<el-form-item label="交强险跟单费比例">
|
|
<el-form-item label="交强险跟单费比例">
|
|
|
<el-input v-model="editForm.jqInsurance">
|
|
<el-input v-model="editForm.jqInsurance">
|
|
|
<template #append>%</template>
|
|
<template #append>%</template>
|
|
|
</el-input>
|
|
</el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
- <el-col :span="12">
|
|
|
|
|
|
|
+ <el-col :span="12" v-if="activeName === '1'">
|
|
|
<el-form-item label="商业险跟单费比例">
|
|
<el-form-item label="商业险跟单费比例">
|
|
|
<el-input v-model="editForm.syInsurance">
|
|
<el-input v-model="editForm.syInsurance">
|
|
|
<template #append>%</template>
|
|
<template #append>%</template>
|
|
|
</el-input>
|
|
</el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
+ <el-col :span="12" v-if="activeName === '2'">
|
|
|
|
|
+ <el-form-item label="驾意跟单费比例">
|
|
|
|
|
+ <el-input v-model="editForm.jyOtherCostsProportion">
|
|
|
|
|
+ <template #append>%</template>
|
|
|
|
|
+ </el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-radio v-model="signTime">签单时间</el-radio>
|
|
<el-radio v-model="signTime">签单时间</el-radio>
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
@@ -854,8 +863,8 @@ const handleInvoiceSubmit = () => {
|
|
|
myRouter.push({
|
|
myRouter.push({
|
|
|
name: 'documentaryTicket',
|
|
name: 'documentaryTicket',
|
|
|
query: {
|
|
query: {
|
|
|
- invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1088,7 +1097,7 @@ const getOtherReceivableList = () => {
|
|
|
jqEndDate: receivableForm.value?.jqDate?.[1],
|
|
jqEndDate: receivableForm.value?.jqDate?.[1],
|
|
|
syStartDate: receivableForm.value?.syDate?.[0],
|
|
syStartDate: receivableForm.value?.syDate?.[0],
|
|
|
syEndDate: receivableForm.value?.syDate?.[1],
|
|
syEndDate: receivableForm.value?.syDate?.[1],
|
|
|
- invoiceType:'2'
|
|
|
|
|
|
|
+ invoiceType: '2'
|
|
|
}
|
|
}
|
|
|
api.financeApi.getOtherReceivableList({
|
|
api.financeApi.getOtherReceivableList({
|
|
|
...params,
|
|
...params,
|
|
@@ -1129,7 +1138,7 @@ const getJyOtherReceivableList = () => {
|
|
|
jqEndDate: receivableForm.value?.jqDate?.[1],
|
|
jqEndDate: receivableForm.value?.jqDate?.[1],
|
|
|
syStartDate: receivableForm.value?.syDate?.[0],
|
|
syStartDate: receivableForm.value?.syDate?.[0],
|
|
|
syEndDate: receivableForm.value?.syDate?.[1],
|
|
syEndDate: receivableForm.value?.syDate?.[1],
|
|
|
- invoiceType:'4'
|
|
|
|
|
|
|
+ invoiceType: '4'
|
|
|
}
|
|
}
|
|
|
api.financeApi.getJyOtherReceivableList({
|
|
api.financeApi.getJyOtherReceivableList({
|
|
|
...params,
|
|
...params,
|