|
@@ -53,13 +53,8 @@
|
|
|
<chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
|
</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="isShowCustomerSearch?6:24" :sm="24" :style="{textAlign:isShowCustomerSearch?'':'center'}">
|
|
|
+ <a-col :md="24" :sm="24" style="textAlign:center;">
|
|
|
<div 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>
|
|
@@ -133,7 +128,6 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
|
import logisticsPoint from '../billOfLading/logisticsPoint'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
-import customerService from '@/views/common/customerService'
|
|
|
import { warehouseQueryPage, pickUpFinish } from '@/api/pickUp'
|
|
|
export default {
|
|
|
name: 'PickUpList',
|
|
@@ -145,8 +139,7 @@ export default {
|
|
|
employee,
|
|
|
rangeDate,
|
|
|
logisticsPoint,
|
|
|
- chooseWarehouse,
|
|
|
- customerService
|
|
|
+ chooseWarehouse
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
@@ -166,8 +159,8 @@ export default {
|
|
|
senderSn: undefined, // 发货人
|
|
|
state: 'AUDIT_PASS', // 业务状态
|
|
|
stateList: ['FINISH', 'AUDIT_PASS'],
|
|
|
- warehouseSn: undefined,
|
|
|
- bizUserSn: undefined
|
|
|
+ warehouseSn: undefined
|
|
|
+
|
|
|
},
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -261,7 +254,6 @@ export default {
|
|
|
this.queryParam.salesReturnBillNo = ''
|
|
|
this.queryParam.state = undefined
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
- this.queryParam.bizUserSn = undefined
|
|
|
this.queryParam.stateList = ['FINISH', 'AUDIT_PASS']
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|