|
@@ -95,6 +95,11 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="发货经销商">
|
|
|
|
+ <custList id="salesManagementList-transferDealerSn" :dataAuthFlag="0" placeholder="请输入发货经销商" ref="dealerTireScopeList" @change="custTireChange" />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="转费用报销单">
|
|
<a-form-item label="转费用报销单">
|
|
<a-select v-model="queryParam.expenseClainFlag" placeholder="请选择转费用报销单状态" allowClear>
|
|
<a-select v-model="queryParam.expenseClainFlag" placeholder="请选择转费用报销单状态" allowClear>
|
|
@@ -181,10 +186,11 @@
|
|
</template>
|
|
</template>
|
|
<!-- 销售单号 -->
|
|
<!-- 销售单号 -->
|
|
<template slot="salesBillNo" slot-scope="text, record">
|
|
<template slot="salesBillNo" slot-scope="text, record">
|
|
- <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
|
|
|
|
|
|
+ <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record,'salesNewDetail')">{{ record.salesBillNo }}</span>
|
|
<span v-else>{{ record.salesBillNo }}</span>
|
|
<span v-else>{{ record.salesBillNo }}</span>
|
|
<a-badge :count="'改'+record.changeTimes" :number-style="{ zoom:'0.8' }" v-if="record.changeTimes>0"></a-badge>
|
|
<a-badge :count="'改'+record.changeTimes" :number-style="{ zoom:'0.8' }" v-if="record.changeTimes>0"></a-badge>
|
|
<a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'0.8' }"></a-badge>
|
|
<a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'0.8' }"></a-badge>
|
|
|
|
+ <a-badge count="转" v-if="record.transferFlag==1" :number-style="{ backgroundColor: '#ccb01e', zoom:'0.8' }"></a-badge>
|
|
</template>
|
|
</template>
|
|
<!-- 出库仓库 -->
|
|
<!-- 出库仓库 -->
|
|
<template slot="warehouseBox" slot-scope="text, record">
|
|
<template slot="warehouseBox" slot-scope="text, record">
|
|
@@ -205,8 +211,8 @@
|
|
size="small"
|
|
size="small"
|
|
type="link"
|
|
type="link"
|
|
class="button-warning"
|
|
class="button-warning"
|
|
- v-if="(record.billStatus == 'WAIT_AUDIT'||record.billStatus=='WAIT_UP_AUDIT_PASS')&&$hasPermissions('B_salesAudit')"
|
|
|
|
- @click="handleDetailAudit(record)"
|
|
|
|
|
|
+ v-if="(record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_AUDIT_REJECT' || record.billStatus == 'TRANSFER_AUDIT_REJECT')&&$hasPermissions('B_salesAudit')"
|
|
|
|
+ @click="handleDetail(record,'salesNewDetailAudit')"
|
|
>审核</a-button>
|
|
>审核</a-button>
|
|
<a-button
|
|
<a-button
|
|
size="small"
|
|
size="small"
|
|
@@ -228,11 +234,31 @@
|
|
size="small"
|
|
size="small"
|
|
type="link"
|
|
type="link"
|
|
class="button-info"
|
|
class="button-info"
|
|
- v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'HQ_CHANGE') && $hasPermissions('B_salesEdit')"
|
|
|
|
|
|
+ v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'HQ_CHANGE' || record.billStatus == 'SUPERIOR_AUDIT_REJECT' || record.billStatus == 'TRANSFER_AUDIT_REJECT') && $hasPermissions('B_salesEdit')"
|
|
@click="handleChangeOrder(record)"
|
|
@click="handleChangeOrder(record)"
|
|
>
|
|
>
|
|
改单
|
|
改单
|
|
</a-button>
|
|
</a-button>
|
|
|
|
+ <!-- 转单显示条件: 业务状态 待审核;非促销单;下级提交,且产品类型是“轮胎产品”的销售单 -->
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ type="link"
|
|
|
|
+ class="button-success"
|
|
|
|
+ v-if="$hasPermissions('B_salesTransfer')&&record.promoFlag!=1&&(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'SUPERIOR_AUDIT_REJECT' || record.billStatus == 'TRANSFER_AUDIT_REJECT')&&record.salesBillSource=='PURCHASE'&&record.orderType==='TIRE'"
|
|
|
|
+ @click="handleDetail(record,'salesNewDetailTransfer')"
|
|
|
|
+ >
|
|
|
|
+ 转单
|
|
|
|
+ </a-button>
|
|
|
|
+ <!-- 上级审核 -->
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ type="link"
|
|
|
|
+ class="button-info"
|
|
|
|
+ v-if="$hasPermissions('B_higherLevelAudit')&&record.billStatus == 'SUPERIOR_WAIT_AUDIT'"
|
|
|
|
+ @click="handleDetail(record,'salesNewDetailTransfer')"
|
|
|
|
+ >
|
|
|
|
+ 上级审核
|
|
|
|
+ </a-button>
|
|
<a-button
|
|
<a-button
|
|
size="small"
|
|
size="small"
|
|
type="link"
|
|
type="link"
|
|
@@ -246,7 +272,7 @@
|
|
size="small"
|
|
size="small"
|
|
type="link"
|
|
type="link"
|
|
class="button-error"
|
|
class="button-error"
|
|
- v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'HQ_CHANGE') && $hasPermissions('B_salesDel')"
|
|
|
|
|
|
+ v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'HQ_CHANGE'||record.billStatus == 'SUPERIOR_AUDIT_REJECT' || record.billStatus == 'TRANSFER_AUDIT_REJECT') && $hasPermissions('B_salesDel')"
|
|
@click="handleDel(record)"
|
|
@click="handleDel(record)"
|
|
>
|
|
>
|
|
取消
|
|
取消
|
|
@@ -318,6 +344,7 @@ import reportModal from '@/views/common/reportModal.vue'
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import customerService from '@/views/common/customerService'
|
|
import customerService from '@/views/common/customerService'
|
|
import hideCellMenus from '@/views/common/hideCellMenus'
|
|
import hideCellMenus from '@/views/common/hideCellMenus'
|
|
|
|
+import custList from '@/views/common/custList.vue'
|
|
// 接口
|
|
// 接口
|
|
import { dispatchBatchPrintStatus, queryBySalesBillSn } from '@/api/dispatch'
|
|
import { dispatchBatchPrintStatus, queryBySalesBillSn } from '@/api/dispatch'
|
|
import { salesList, salesDel, salesCancle, salesCount, queryCreateBySalesBillSn, expenseAccountSave, changeBillCheckUpdatePrice, changeBillCheck } from '@/api/salesNew'
|
|
import { salesList, salesDel, salesCancle, salesCount, queryCreateBySalesBillSn, expenseAccountSave, changeBillCheckUpdatePrice, changeBillCheck } from '@/api/salesNew'
|
|
@@ -326,7 +353,7 @@ import { salesDetailExport } from '@/api/salesBillReport'
|
|
export default {
|
|
export default {
|
|
name: 'SalesQueryList',
|
|
name: 'SalesQueryList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { VTable, VSelect, tipModal, hideCellMenus, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal, customerService },
|
|
|
|
|
|
+ components: { VTable, VSelect, tipModal, custList, hideCellMenus, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal, customerService },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -545,13 +572,9 @@ export default {
|
|
handleDispatch (row) {
|
|
handleDispatch (row) {
|
|
this.$router.push({ name: 'waitDispatchNew', params: { salesBillSn: row.salesBillSn } })
|
|
this.$router.push({ name: 'waitDispatchNew', params: { salesBillSn: row.salesBillSn } })
|
|
},
|
|
},
|
|
- // 详情
|
|
|
|
- handleDetail (row) {
|
|
|
|
- this.$router.push({ name: 'salesNewDetail', params: { sn: row.salesBillSn } })
|
|
|
|
- },
|
|
|
|
- // 审核
|
|
|
|
- handleDetailAudit (row) {
|
|
|
|
- this.$router.push({ name: 'salesNewDetailAudit', params: { sn: row.salesBillSn } })
|
|
|
|
|
|
+ // 详情 审核 转单
|
|
|
|
+ handleDetail (row, name) {
|
|
|
|
+ this.$router.push({ name, params: { sn: row.salesBillSn, pageType: name } })
|
|
},
|
|
},
|
|
// 编辑
|
|
// 编辑
|
|
handleEdit (row) {
|
|
handleEdit (row) {
|