Skip to content

J
jiedao-app-operator-master
Commit fd151d23 authored by honghy's avatar honghy Committed by wux
Browse files
Options

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

parent 5a6b5545
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 20 deletions
src/views/ecw/offer/detail.vue
View file @ fd151d23
......@@ -6,11 +6,11 @@
<div class="offer-header">
<span style="font-size: 15px"></span>
<div class="btns">
<el-button v-hasPermi="['ecw:offer:update']" size="mini" type="primary" v-if="[0,2, 1, 5].indexOf(list.status) > -1" @click="$router.push('edit?id=' + offerId)">{{ $t("编辑") }}</el-button>
<el-button v-hasPermi="['ecw:offer:loglist']" type="primary" v-if="[0,2, 1, 5].indexOf(list.status) > -1" size="mini" @click="handleAddOffer">{{ $t("跟进") }}</el-button>
<el-button v-hasPermi="['ecw:offer:result']" type="primary" v-if="[0,1, 5].indexOf(list.status) > -1" size="mini" @click="toResult">{{ $t("结果") }}</el-button>
<el-button v-hasPermi="['ecw:offer:discount', 'ecw:offer:commission']" size="mini" v-if="[0,2, 1, 5].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)">{{ $t("特价") }}</el-button>
<el-button v-hasPermi="['ecw:offer:delete']" type="danger" size="mini" @click="handleDelete">{{ $t("删除") }}</el-button>
<el-button v-hasPermi="['ecw:offer:update']" size="mini" type="primary" v-if="[0,1,2,3,4,5,7,9].indexOf(list.status) > -1" @click="$router.push('edit?id=' + offerId)">{{ $t("编辑") }}</el-button>
<el-button v-hasPermi="['ecw:offer:loglist']" type="primary" v-if="[0,1,2,3,4,5,6,7,8,9].indexOf(list.status) > -1" size="mini" @click="handleAddOffer">{{ $t("跟进") }}</el-button>
<el-button v-hasPermi="['ecw:offer:result']" type="primary" v-if="[0,1,2,3,4,5,6,7,8,9].indexOf(list.status) > -1" size="mini" @click="toResult">{{ $t("结果") }}</el-button>
<el-button v-hasPermi="['ecw:offer:discount', 'ecw:offer:commission']" size="mini" v-if="[0,1,2,3,4,5,6,7,9].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)">{{ $t("特价") }}</el-button>
<!-- <el-button v-hasPermi="['ecw:offer:delete']" type="danger" size="mini" @click="handleDelete">{{ $t("删除") }}</el-button>-->
</div>
</div>
<div>
......@@ -48,15 +48,6 @@
<dict-tag :type="DICT_TYPE.SOCIAL" :value="consignorData.social" />
{{ consignorData.socialNumber ? "(" + consignorData.socialNumber + ")" : "" }}
</el-descriptions-item>
<el-descriptions-item :label="$t('客户状态') + ':'">
<dict-tag :type="DICT_TYPE.ECW_OFFER_CUSTOMER_STATUS" :value="list.customerStatus" />
</el-descriptions-item>
<el-descriptions-item :label="$t('货物状态') + ':'">
<dict-tag :type="DICT_TYPE.ECW_OFFER_CARGO_STATUS" :value="list.cargoStatus" />
</el-descriptions-item>
<el-descriptions-item :label="$t('询盘来源') + ':'">
<dict-tag :type="DICT_TYPE.ECW_OFFER_INQUIRY_SOURCE" :value="list.inquirySource" />
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="3" border class="card" v-if="list.consigneeId" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
......@@ -80,6 +71,19 @@
{{ consigneeData.socialNumber ? "(" + consigneeData.socialNumber + ")" : "" }}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="3" border class="card" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
<el-descriptions-item :label="$t('客户状态') + ':'">
<dict-tag :type="DICT_TYPE.ECW_OFFER_CUSTOMER_STATUS" :value="list.customerStatus" />
</el-descriptions-item>
<el-descriptions-item :label="$t('货物状态') + ':'">
<dict-tag :type="DICT_TYPE.ECW_OFFER_CARGO_STATUS" :value="list.cargoStatus" />
</el-descriptions-item>
<el-descriptions-item :label="$t('询盘来源') + ':'">
<dict-tag :type="DICT_TYPE.ECW_OFFER_INQUIRY_SOURCE" :value="list.inquirySource" />
</el-descriptions-item>
</el-descriptions>
</div>
</el-card>
<el-card class="card">
......
src/views/ecw/offer/edit.vue
View file @ fd151d23
......@@ -1347,6 +1347,9 @@ export default {
formData.endTime = ""
formData.stopTime = ""
formData.estimatedShippingTime = ""
formData.orderId = null
formData.orderNo = null
// 复制报价单状态重置为草稿
formData.status = 1
}
......
src/views/ecw/offer/index.vue
View file @ fd151d23
......@@ -303,14 +303,14 @@
<el-dropdown>
<el-button icon="el-icon-plus" circle type="primary"></el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)" v-if="[0,2, 1, 5].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:update']">{{ $t("编辑") }}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('create?copyId=' + scope.row.offerId)" v-if="[0,2, 1, 5].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:update']">{{ $t("复制") }}</el-dropdown-item>
<el-dropdown-item @click.native="handleAddOffer(scope.row)" v-if="[0,2, 1, 5].indexOf(scope.row.status) > -1">{{ $t("跟进") }}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}&status=${scope.row.status}`)" v-if="[3, 7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:result']">{{ $t("结果") }}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)" v-if="[0,2, 1, 5].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:discount', 'ecw:offer:commission']">{{ $t("特价") }}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)" v-if="[0,1,2,3,4,5,7,9].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:update']">{{ $t("编辑") }}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('create?copyId=' + scope.row.offerId)" v-if="[0,1,2,3,4,5,6,7,8,9].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:update']">{{ $t("复制") }}</el-dropdown-item>
<el-dropdown-item @click.native="handleAddOffer(scope.row)" v-if="[0,1,2,3,4,5,6,7,8,9].indexOf(scope.row.status) > -1">{{ $t("跟进") }}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}&status=${scope.row.status}`)" v-if="[0,1,2,3,4,5,7,9].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:result']">{{ $t("结果") }}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)" v-if="[0,1,2,3,4,5,6,7,9].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:discount', 'ecw:offer:commission']">{{ $t("特价") }}</el-dropdown-item>
<!-- <el-dropdown-item @click.native="cancel(scope.row.offerId)" v-if="[2, 1, 5].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:cancel']">{{ $t("取消") }}</el-dropdown-item>-->
<!-- <el-dropdown-item @click.native="recovery(scope.row.offerId)" v-if="[8].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:recovery']">{{ $t("恢复") }}</el-dropdown-item>-->
<el-dropdown-item @click.native="deleteOffer(scope.row.offerId)" v-if="[0, 1, 2, 3, 4, 5, 6, 7,8].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:delete']">{{ $t("删除") }}</el-dropdown-item>
<!-- <el-dropdown-item @click.native="deleteOffer(scope.row.offerId)" v-if="[0, 1, 2, 3, 4, 5, 6, 7,8].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:delete']">{{ $t("删除") }}</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</template>
......
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