Commit 1775c330 authored by honghy's avatar honghy

需求95 报价单页面和列表调整

parent db2c8a90
...@@ -525,16 +525,16 @@ ...@@ -525,16 +525,16 @@
</el-form-item> </el-form-item>
<br> <br>
<el-form-item :label="$t('厂家')" prop="manufacturer"> <el-form-item :label="$t('厂家')" prop="manufacturer">
<el-input v-model="form.manufacturer" type="textarea" style="width: 1100px; height: 50px"></el-input> <el-input v-model="form.manufacturer" type="textarea" style="width: 500px; height: 50px"></el-input>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item :label="$t('厂家电话')" prop="manufacturerPhone"> <el-form-item :label="$t('厂家电话')" prop="manufacturerPhone">
<el-input v-model="form.manufacturerPhone" type="textarea" style="width: 1100px; height: 50px"></el-input> <el-input v-model="form.manufacturerPhone" type="textarea" style="width: 500px; height: 50px"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="form-section"> <div class="form-section">
<el-form-item :label="$t('备注')" :span="2" prop="remarks"> <el-form-item :label="$t('备注')" :span="2" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="" style="width: 1100px; height: 100px"></el-input> <el-input v-model="form.remarks" type="textarea" placeholder="" style="width: 500px; height: 100px"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-card> </el-card>
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['ecw:offer:export']">{{ $t("导出") }}</el-button> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['ecw:offer:export']">{{ $t("导出") }}</el-button>
</el-col> </el-col>
<el-col :span="15"> <el-col :span="15" style="font-size: 19px" v-if="statistics.volume">
<!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 --> <!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
汇总:{{statistics.volume}}CBM/{{statistics.weight}}KG 汇总:{{statistics.volume}}CBM/{{statistics.weight}}KG
</el-col> </el-col>
...@@ -157,7 +157,9 @@ ...@@ -157,7 +157,9 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户编号')" align="left" width="100" fixed> <el-table-column :label="$t('客户编号')" align="left" width="100" fixed>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<router-link :to="`/customer/query/${row.customerId}`" class="link-type">
{{ row.customerNumber }} {{ row.customerNumber }}
</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户名称')" align="left" prop="customerName" fixed> </el-table-column> <el-table-column :label="$t('客户名称')" align="left" prop="customerName" fixed> </el-table-column>
...@@ -688,6 +690,7 @@ export default { ...@@ -688,6 +690,7 @@ export default {
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.statistics = {}
this.loading = true this.loading = true
let func = this.dept ? offerDeptPage : getOfferPage let func = this.dept ? offerDeptPage : getOfferPage
if(!this.dept) { if(!this.dept) {
...@@ -703,9 +706,12 @@ export default { ...@@ -703,9 +706,12 @@ export default {
...this.queryParams, ...this.queryParams,
...this.formatQuery() ...this.formatQuery()
}).then((response) => { }).then((response) => {
this.$nextTick(() => {
this.list = response.data.list this.list = response.data.list
this.total = response.data.total this.total = response.data.total
this.loading = false this.loading = false
this.getHeight()
})
}) })
}, },
handleCustomerFollowLink(row) { handleCustomerFollowLink(row) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment