|
@@ -1,147 +1,152 @@
|
|
|
<template>
|
|
|
<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="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="提货单号">
|
|
|
- <a-input id="billOfLading-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="总部销退单号">
|
|
|
- <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" 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-form-item label="申请人">
|
|
|
- <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
|
|
|
+ <a-form-item label="创建时间">
|
|
|
+ <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="物流点">
|
|
|
- <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
|
|
|
+ <a-form-item label="提货单号">
|
|
|
+ <a-input id="billOfLading-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="发货方">
|
|
|
- <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="审核时间">
|
|
|
- <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.state"
|
|
|
- ref="state"
|
|
|
- id="billOfLading-state"
|
|
|
- code="PICK_UP_STATE"
|
|
|
- placeholder="请选择状态"
|
|
|
- allowClear></v-select>
|
|
|
+ <a-form-item label="总部销退单号">
|
|
|
+ <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+
|
|
|
+ <template v-if="advanced">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="申请人">
|
|
|
+ <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="物流点">
|
|
|
+ <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="发货方">
|
|
|
+ <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="审核时间">
|
|
|
+ <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.state"
|
|
|
+ ref="state"
|
|
|
+ id="billOfLading-state"
|
|
|
+ code="PICK_UP_STATE"
|
|
|
+ placeholder="请选择状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="退货仓库">
|
|
|
+ <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
|
|
|
+ </a-form-model-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-form-model-item label="退货仓库">
|
|
|
- <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
|
|
|
- </a-form-model-item>
|
|
|
+ <span class="table-page-search-submitButtons">
|
|
|
+ <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
+ <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
+ </a>
|
|
|
+ </span>
|
|
|
</a-col>
|
|
|
- </template>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <span class="table-page-search-submitButtons">
|
|
|
- <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
- <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
- </a>
|
|
|
- </span>
|
|
|
- </a-col>
|
|
|
- </a-row>
|
|
|
- </a-form>
|
|
|
- </div>
|
|
|
- </a-card>
|
|
|
- <a-card size="small" :bordered="false" class="billOfLading-wrap">
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <!-- 操作按钮 -->
|
|
|
- <div class="table-operator">
|
|
|
- <a-button type="primary" v-if="$hasPermissions('B_newPickUp')" @click="handleAdd">新增</a-button>
|
|
|
+ </a-row>
|
|
|
+ </a-form>
|
|
|
</div>
|
|
|
- <!-- 列表 -->
|
|
|
- <s-table
|
|
|
- class="sTable fixPagination"
|
|
|
- ref="table"
|
|
|
- :style="{ height: tableHeight+64.5+'px' }"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- :pageSize="30"
|
|
|
- :scroll="{ y: tableHeight }"
|
|
|
- :defaultLoadData="false"
|
|
|
- bordered>
|
|
|
- <!-- 单号 -->
|
|
|
- <template slot="pickUpNo" slot-scope="text, record">
|
|
|
- <div v-if="$hasPermissions('M_detailPickUp')">
|
|
|
- <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
|
|
|
- </div>
|
|
|
- <div v-else>{{ record.pickUpNo }}</div>
|
|
|
- </template>
|
|
|
- <!-- 关联单数 -->
|
|
|
- <template slot="salesReturnNum" slot-scope="text, record">
|
|
|
- <div v-if="record.salesReturnNum">{{ record.salesReturnNum }} 单</div>
|
|
|
- <div v-else></div>
|
|
|
- </template>
|
|
|
- <!-- 操作 -->
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
- <div>
|
|
|
- <a-button
|
|
|
- size="small"
|
|
|
- type="link"
|
|
|
- class="button-warning"
|
|
|
- v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_auditPickUp')"
|
|
|
- @click="handleEexamine(record)"
|
|
|
- id="billOfLading-eexamine-btn">审核进度</a-button>
|
|
|
- <a-button
|
|
|
- size="small"
|
|
|
- type="link"
|
|
|
- class="button-warning"
|
|
|
- v-if="record.state == 'AUDIT_REJECT'&&$hasPermissions('B_asginEditPickUp')"
|
|
|
- @click="handleAgainEdit(record)"
|
|
|
- id="billOfLading-eexamine-btn">再次编辑</a-button>
|
|
|
- <a-button
|
|
|
- size="small"
|
|
|
- v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_editPickUp')"
|
|
|
- type="link"
|
|
|
- class="button-info"
|
|
|
- @click="handleEdit(record)"
|
|
|
- id="billOfLading-edit-btn">编辑</a-button>
|
|
|
- <a-button
|
|
|
- size="small"
|
|
|
- v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_delPickUp')"
|
|
|
- type="link"
|
|
|
- class="button-error"
|
|
|
- @click="handleDel(record)"
|
|
|
- id="billOfLading-del-btn">删除</a-button>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </s-table>
|
|
|
- </a-spin>
|
|
|
- <!-- 审核进度 -->
|
|
|
- <verifyModal :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.pickUpSn" @close="visibleAudit=false"></verifyModal>
|
|
|
- </a-card>
|
|
|
+ </a-card>
|
|
|
+ <a-card size="small" :bordered="false" class="billOfLading-wrap">
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
|
+ <!-- 操作按钮 -->
|
|
|
+ <div class="table-operator">
|
|
|
+ <a-button type="primary" v-if="$hasPermissions('B_newPickUp')" @click="handleAdd">新增</a-button>
|
|
|
+ </div>
|
|
|
+ <!-- 列表 -->
|
|
|
+ <s-table
|
|
|
+ class="sTable fixPagination"
|
|
|
+ ref="table"
|
|
|
+ :style="{ height: tableHeight+64.5+'px' }"
|
|
|
+ size="small"
|
|
|
+ :rowKey="(record) => record.id"
|
|
|
+ :columns="columns"
|
|
|
+ :data="loadData"
|
|
|
+ :pageSize="30"
|
|
|
+ :scroll="{ y: tableHeight }"
|
|
|
+ :defaultLoadData="false"
|
|
|
+ bordered>
|
|
|
+ <!-- 单号 -->
|
|
|
+ <template slot="pickUpNo" slot-scope="text, record">
|
|
|
+ <div v-if="$hasPermissions('M_detailPickUp')">
|
|
|
+ <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
|
|
|
+ </div>
|
|
|
+ <div v-else>{{ record.pickUpNo }}</div>
|
|
|
+ </template>
|
|
|
+ <!-- 关联单数 -->
|
|
|
+ <template slot="salesReturnNum" slot-scope="text, record">
|
|
|
+ <div v-if="record.salesReturnNum">{{ record.salesReturnNum }} 单</div>
|
|
|
+ <div v-else></div>
|
|
|
+ </template>
|
|
|
+ <!-- 操作 -->
|
|
|
+ <template slot="action" slot-scope="text, record">
|
|
|
+ <div>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-warning"
|
|
|
+ v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_auditPickUp')"
|
|
|
+ @click="handleEexamine(record)"
|
|
|
+ id="billOfLading-eexamine-btn">审核进度</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-warning"
|
|
|
+ v-if="record.state == 'AUDIT_REJECT'&&$hasPermissions('B_asginEditPickUp')"
|
|
|
+ @click="handleAgainEdit(record)"
|
|
|
+ id="billOfLading-eexamine-btn">再次编辑</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_editPickUp')"
|
|
|
+ type="link"
|
|
|
+ class="button-info"
|
|
|
+ @click="handleEdit(record)"
|
|
|
+ id="billOfLading-edit-btn">编辑</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_delPickUp')"
|
|
|
+ type="link"
|
|
|
+ class="button-error"
|
|
|
+ @click="handleDel(record)"
|
|
|
+ id="billOfLading-del-btn">删除</a-button>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </s-table>
|
|
|
+ </a-spin>
|
|
|
+ <!-- 审核进度 -->
|
|
|
+ <verifyModal :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.pickUpSn" @close="visibleAudit=false"></verifyModal>
|
|
|
+ </a-card>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -153,6 +158,7 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
|
import verifyModal from './verifyModal.vue'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
+import customerService from '@/views/common/customerService'
|
|
|
import { pickUpQueryPage, pickUpDelete, pickUpAgainEdit } from '@/api/pickUp'
|
|
|
export default {
|
|
|
name: 'BillOfLadingList',
|
|
@@ -164,7 +170,8 @@ export default {
|
|
|
employee,
|
|
|
rangeDate,
|
|
|
verifyModal,
|
|
|
- warehouse
|
|
|
+ warehouse,
|
|
|
+ customerService
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
@@ -185,8 +192,9 @@ export default {
|
|
|
salesReturnBillNo: undefined, // 总部销退单号
|
|
|
logisticsPoint: undefined, // 物流点
|
|
|
senderSn: undefined, // 发货人
|
|
|
- state: undefined ,// 业务状态
|
|
|
- warehouseSn:undefined//退货仓库
|
|
|
+ state: undefined, // 业务状态
|
|
|
+ warehouseSn: undefined, // 退货仓库
|
|
|
+ bizUserSn: undefined // 客服
|
|
|
},
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -324,6 +332,7 @@ export default {
|
|
|
this.queryParam.salesReturnBillNo = flag ? this.$route.query.billNo : ''
|
|
|
this.queryParam.state = undefined
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
+ this.queryParam.bizUserSn = undefined
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
pageInit () {
|