|
@@ -10,17 +10,17 @@
|
|
|
<rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-item label="总部销退单号">
|
|
|
<a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-item label="客户名称">
|
|
|
<dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-item label="业务状态">
|
|
|
<v-select
|
|
|
v-model="queryParam.billStatus"
|
|
@@ -32,6 +32,11 @@
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="出库仓库">
|
|
|
+ <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
<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>
|
|
@@ -77,12 +82,12 @@
|
|
|
v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
|
|
|
@click="handleCheck(record)"
|
|
|
id="salesReturn-eexamine-btn">品检</a-button>
|
|
|
- <a-button
|
|
|
- size="small"
|
|
|
- type="link"
|
|
|
- class="button-warning"
|
|
|
- @click="handleOpenPrintModal(record)"
|
|
|
- id="salesReturn-print-btn">打印</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-warning"
|
|
|
+ @click="handleOpenPrintModal(record)"
|
|
|
+ id="salesReturn-print-btn">打印</a-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</s-table>
|
|
@@ -107,6 +112,7 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import { salesReturnList } from '@/api/salesReturn'
|
|
|
import printModal from './printModal.vue'
|
|
|
+import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
export default {
|
|
|
name: 'ReceiveCheckList',
|
|
@@ -118,7 +124,8 @@ export default {
|
|
|
employee,
|
|
|
rangeDate,
|
|
|
printModal,
|
|
|
- commonModal
|
|
|
+ commonModal,
|
|
|
+ chooseWarehouse
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
@@ -159,7 +166,7 @@ export default {
|
|
|
visibleAudit: false,
|
|
|
auditInfo: null,
|
|
|
spinningAudit: false,
|
|
|
- showTipModal:false
|
|
|
+ showTipModal: false
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -169,6 +176,7 @@ export default {
|
|
|
{ title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -181,6 +189,10 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 选择出库仓库
|
|
|
+ handleWarehouse (val) {
|
|
|
+
|
|
|
+ },
|
|
|
// 审核时间 change
|
|
|
dateExamineChange (date) {
|
|
|
this.queryParam.beginAuditDate = date[0]
|
|
@@ -225,8 +237,8 @@ export default {
|
|
|
this.showTipModal = false
|
|
|
this.$refs.printModel.handleCommonCancel()
|
|
|
},
|
|
|
- handleOpenPrintModal(row){
|
|
|
- this.showTipModal=true
|
|
|
+ handleOpenPrintModal (row) {
|
|
|
+ this.showTipModal = true
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.printModel.getData(row)
|
|
|
})
|