This commit is contained in:
linfso 2024-11-11 11:14:11 +08:00
parent a00d9e352f
commit 27858d99e2
2 changed files with 28 additions and 21 deletions

View File

@ -305,7 +305,7 @@
</el-row>
</el-col>
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('36')||applyTypeArr.length>0)" >
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('36'))" >
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>计费方式调整</span>
@ -740,6 +740,23 @@
</el-row>
</el-col>
<!-- v-if="applyType&&applyTypeArr.includes('12')" -->
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('9')||applyTypeArr.includes('12'))">
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>费用备注调整</span>
</el-col>
<el-col :span="7" class="md-value">
<span >{{billDetail.feeRemark}}</span>
</el-col>
<el-col :span="14">
<el-form-item :label="$t('费用备注')" prop="feeRemark" >
<el-input v-model="form.feeRemark" type="textarea" placeholder=""/>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
@ -1016,22 +1033,7 @@
</el-col>
</el-row>
</el-col>
<!-- v-if="applyType&&applyTypeArr.includes('12')" -->
<el-col :span="24" v-if="applyType&&applyTypeArr.includes('9')||applyType&&applyTypeArr.includes('12')">
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>费用备注调整</span>
</el-col>
<el-col :span="7" class="md-value">
<span >{{billDetail.feeRemark}}</span>
</el-col>
<el-col :span="14">
<el-form-item :label="$t('费用备注')" prop="feeRemark" >
<el-input v-model="form.feeRemark" type="textarea" placeholder=""/>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="24" v-if="applyType&&applyTypeArr.length>0">
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">

View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="9">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@ -37,7 +37,12 @@
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
size="mini"
:data="emisWaybillCargoList"
@ -132,7 +137,7 @@
</div>
</XdPageContainer>
</template>
<script>