|
@@ -1,57 +1,62 @@
|
|
<template>
|
|
<template>
|
|
<div>
|
|
<div>
|
|
- <a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
|
|
- <!-- 搜索条件 -->
|
|
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
|
- <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
|
- <a-row :gutter="15">
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="创建时间">
|
|
|
|
- <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="调拨退货单号">
|
|
|
|
- <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="调拨退货对象名称">
|
|
|
|
- <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <template v-if="advanced">
|
|
|
|
|
|
+ <a-card size="small" :bordered="false" class="searchBoxNormal">
|
|
|
|
+ <!-- 搜索条件 -->
|
|
|
|
+ <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
|
+ <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
|
+ <a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="费用/调拨退货类型">
|
|
|
|
- <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
|
|
|
|
|
|
+ <a-form-item label="创建时间">
|
|
|
|
+ <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="调入仓库">
|
|
|
|
- <warehouse
|
|
|
|
- v-model="queryParam.warehouseSn"
|
|
|
|
- id="transferReturn-warehouseSn"
|
|
|
|
- placeholder="请选择调入仓库"
|
|
|
|
- />
|
|
|
|
|
|
+ <a-form-item label="调拨退货单号">
|
|
|
|
+ <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="业务状态">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.state"
|
|
|
|
- ref="state"
|
|
|
|
- id="transferReturn-state"
|
|
|
|
- code="ALLOCATE_RETURN_STATE"
|
|
|
|
- placeholder="请选择业务状态"
|
|
|
|
- allowClear
|
|
|
|
- ></v-select>
|
|
|
|
|
|
+ <a-form-item label="调拨退货对象名称">
|
|
|
|
+ <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- </template>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
|
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
|
|
|
|
- <!-- <a-button
|
|
|
|
|
|
+ <template v-if="advanced">
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="费用/调拨退货类型">
|
|
|
|
+ <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="调入仓库">
|
|
|
|
+ <warehouse
|
|
|
|
+ v-model="queryParam.warehouseSn"
|
|
|
|
+ id="transferReturn-warehouseSn"
|
|
|
|
+ placeholder="请选择调入仓库"
|
|
|
|
+ />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="业务状态">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.state"
|
|
|
|
+ ref="state"
|
|
|
|
+ id="transferReturn-state"
|
|
|
|
+ code="ALLOCATE_RETURN_STATE"
|
|
|
|
+ placeholder="请选择业务状态"
|
|
|
|
+ allowClear
|
|
|
|
+ ></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
|
|
|
|
+ <a-form-item label="客服">
|
|
|
|
+ <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ </template>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
|
|
|
|
+ <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
|
|
|
|
+ <!-- <a-button
|
|
style="margin-left: 5px"
|
|
style="margin-left: 5px"
|
|
type="primary"
|
|
type="primary"
|
|
class="button-warning"
|
|
class="button-warning"
|
|
@@ -60,93 +65,93 @@
|
|
:disabled="disabled"
|
|
:disabled="disabled"
|
|
:loading="exportLoading"
|
|
:loading="exportLoading"
|
|
id="transferReturn-export">导出</a-button> -->
|
|
id="transferReturn-export">导出</a-button> -->
|
|
- <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
- </a>
|
|
|
|
- </a-col>
|
|
|
|
- </a-row>
|
|
|
|
- </a-form>
|
|
|
|
- </div>
|
|
|
|
- </a-card>
|
|
|
|
-
|
|
|
|
- <a-card size="small" :bordered="false" class="transferReturn-wrap">
|
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
|
- <!-- 操作按钮 -->
|
|
|
|
- <div class="table-operator">
|
|
|
|
- <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
|
|
|
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
+ </a>
|
|
|
|
+ </a-col>
|
|
|
|
+ </a-row>
|
|
|
|
+ </a-form>
|
|
</div>
|
|
</div>
|
|
- <!-- 列表 -->
|
|
|
|
- <s-table
|
|
|
|
- class="sTable fixPagination"
|
|
|
|
- ref="table"
|
|
|
|
- :style="{ height: tableHeight+84.5+'px' }"
|
|
|
|
- size="small"
|
|
|
|
- :rowKey="(record) => record.id"
|
|
|
|
- :columns="columns"
|
|
|
|
- :data="loadData"
|
|
|
|
- :defaultLoadData="false"
|
|
|
|
- :scroll="{ y: tableHeight }"
|
|
|
|
- bordered>
|
|
|
|
- <!-- 单号 -->
|
|
|
|
- <template slot="allocateReturnNo" slot-scope="text, record">
|
|
|
|
- <span v-if="$hasPermissions('M_transferReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
|
|
|
|
- <span v-else>{{ record.allocateReturnNo }}</span>
|
|
|
|
- </template>
|
|
|
|
- <!-- 调拨类型 -->
|
|
|
|
- <template slot="allocateType" slot-scope="text, record">
|
|
|
|
- <div>
|
|
|
|
- <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
|
|
|
|
- <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
|
|
|
|
- <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
|
|
|
|
- </div>
|
|
|
|
- </template>
|
|
|
|
- <!-- 操作 -->
|
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
|
- <a-button
|
|
|
|
- size="small"
|
|
|
|
- type="link"
|
|
|
|
- v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferReturnAudit')"
|
|
|
|
- class="button-warning"
|
|
|
|
- @click="handleExamine(record)"
|
|
|
|
- id="transferReturn-examine-btn">审核</a-button>
|
|
|
|
- <a-button
|
|
|
|
- size="small"
|
|
|
|
- type="link"
|
|
|
|
- class="button-warning"
|
|
|
|
- v-if="record.state=='WAIT_CHECK' && $hasPermissions('M_transferReturnCheck')"
|
|
|
|
- @click="handleCheck(record)"
|
|
|
|
- id="transferReturn-examine-btn">品检</a-button>
|
|
|
|
- <a-button
|
|
|
|
- size="small"
|
|
|
|
- type="link"
|
|
|
|
- v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnEdit')"
|
|
|
|
- class="button-info"
|
|
|
|
- @click="handleEdit(record)"
|
|
|
|
- id="transferReturn-edit-btn">编辑</a-button>
|
|
|
|
- <a-button
|
|
|
|
- size="small"
|
|
|
|
- type="link"
|
|
|
|
- v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnDel')"
|
|
|
|
- class="button-error"
|
|
|
|
- @click="handleDel(record)"
|
|
|
|
- id="transferReturn-del-btn">删除</a-button>
|
|
|
|
- <!-- 带财务确认或已完结 -->
|
|
|
|
- <span v-if="record.state == 'WAIT_FINANCIAL_AUDIT'||record.state == 'FINISH'">--</span>
|
|
|
|
- </template>
|
|
|
|
- </s-table>
|
|
|
|
- </a-spin>
|
|
|
|
- <!-- 新增 -->
|
|
|
|
- <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
|
|
|
|
- <!-- 审核 -->
|
|
|
|
- <auditModal
|
|
|
|
- v-drag
|
|
|
|
- :openModal="visibleAudit"
|
|
|
|
- :spinning="spinningAudit"
|
|
|
|
- @close="visibleAudit=false"
|
|
|
|
- @ok="auditOrder('WAIT_CHECK')"
|
|
|
|
- @fail="auditOrder('AUDIT_REJECT')" />
|
|
|
|
- </a-card>
|
|
|
|
|
|
+ </a-card>
|
|
|
|
+
|
|
|
|
+ <a-card size="small" :bordered="false" class="transferReturn-wrap">
|
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
|
+ <!-- 操作按钮 -->
|
|
|
|
+ <div class="table-operator">
|
|
|
|
+ <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
|
|
|
|
+ </div>
|
|
|
|
+ <!-- 列表 -->
|
|
|
|
+ <s-table
|
|
|
|
+ class="sTable fixPagination"
|
|
|
|
+ ref="table"
|
|
|
|
+ :style="{ height: tableHeight+84.5+'px' }"
|
|
|
|
+ size="small"
|
|
|
|
+ :rowKey="(record) => record.id"
|
|
|
|
+ :columns="columns"
|
|
|
|
+ :data="loadData"
|
|
|
|
+ :defaultLoadData="false"
|
|
|
|
+ :scroll="{ y: tableHeight }"
|
|
|
|
+ bordered>
|
|
|
|
+ <!-- 单号 -->
|
|
|
|
+ <template slot="allocateReturnNo" slot-scope="text, record">
|
|
|
|
+ <span v-if="$hasPermissions('M_transferReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
|
|
|
|
+ <span v-else>{{ record.allocateReturnNo }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ <!-- 调拨类型 -->
|
|
|
|
+ <template slot="allocateType" slot-scope="text, record">
|
|
|
|
+ <div>
|
|
|
|
+ <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
|
|
|
|
+ <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
|
|
|
|
+ <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
|
|
|
|
+ </div>
|
|
|
|
+ </template>
|
|
|
|
+ <!-- 操作 -->
|
|
|
|
+ <template slot="action" slot-scope="text, record">
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ type="link"
|
|
|
|
+ v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferReturnAudit')"
|
|
|
|
+ class="button-warning"
|
|
|
|
+ @click="handleExamine(record)"
|
|
|
|
+ id="transferReturn-examine-btn">审核</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ type="link"
|
|
|
|
+ class="button-warning"
|
|
|
|
+ v-if="record.state=='WAIT_CHECK' && $hasPermissions('M_transferReturnCheck')"
|
|
|
|
+ @click="handleCheck(record)"
|
|
|
|
+ id="transferReturn-examine-btn">品检</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ type="link"
|
|
|
|
+ v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnEdit')"
|
|
|
|
+ class="button-info"
|
|
|
|
+ @click="handleEdit(record)"
|
|
|
|
+ id="transferReturn-edit-btn">编辑</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ type="link"
|
|
|
|
+ v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnDel')"
|
|
|
|
+ class="button-error"
|
|
|
|
+ @click="handleDel(record)"
|
|
|
|
+ id="transferReturn-del-btn">删除</a-button>
|
|
|
|
+ <!-- 带财务确认或已完结 -->
|
|
|
|
+ <span v-if="record.state == 'WAIT_FINANCIAL_AUDIT'||record.state == 'FINISH'">--</span>
|
|
|
|
+ </template>
|
|
|
|
+ </s-table>
|
|
|
|
+ </a-spin>
|
|
|
|
+ <!-- 新增 -->
|
|
|
|
+ <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
|
|
|
|
+ <!-- 审核 -->
|
|
|
|
+ <auditModal
|
|
|
|
+ v-drag
|
|
|
|
+ :openModal="visibleAudit"
|
|
|
|
+ :spinning="spinningAudit"
|
|
|
|
+ @close="visibleAudit=false"
|
|
|
|
+ @ok="auditOrder('WAIT_CHECK')"
|
|
|
|
+ @fail="auditOrder('AUDIT_REJECT')" />
|
|
|
|
+ </a-card>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -159,11 +164,12 @@ import auditModal from '@/views/common/auditModal.vue'
|
|
import { allocateReturnQueryPage, allocateReturnAudit, allocateReturnDelete, allocateReturnExport } from '@/api/allocateReturn'
|
|
import { allocateReturnQueryPage, allocateReturnAudit, allocateReturnDelete, allocateReturnExport } from '@/api/allocateReturn'
|
|
import AllocateType from '@/views/common/allocateType.js'
|
|
import AllocateType from '@/views/common/allocateType.js'
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
|
+import customerService from '@/views/common/customerService'
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
export default {
|
|
export default {
|
|
name: 'TransferReturnList',
|
|
name: 'TransferReturnList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType, warehouse },
|
|
|
|
|
|
+ components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType, warehouse, customerService },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -180,7 +186,8 @@ export default {
|
|
allocateReturnTypeSn: undefined, // 调拨退货类型2
|
|
allocateReturnTypeSn: undefined, // 调拨退货类型2
|
|
state: undefined, // 业务状态
|
|
state: undefined, // 业务状态
|
|
warehouseSn: undefined,
|
|
warehouseSn: undefined,
|
|
- allocateReturnNo: '' // 调拨单号
|
|
|
|
|
|
+ allocateReturnNo: '', // 调拨单号
|
|
|
|
+ bizUserSn: undefined
|
|
},
|
|
},
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
exportLoading: false,
|
|
exportLoading: false,
|
|
@@ -258,6 +265,7 @@ export default {
|
|
this.queryParam.allocateSortSn = undefined
|
|
this.queryParam.allocateSortSn = undefined
|
|
this.queryParam.allocateReturnTypeSn = undefined
|
|
this.queryParam.allocateReturnTypeSn = undefined
|
|
this.queryParam.warehouseSn = undefined
|
|
this.queryParam.warehouseSn = undefined
|
|
|
|
+ this.queryParam.bizUserSn = undefined
|
|
this.allocateTypeVal = []
|
|
this.allocateTypeVal = []
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|