|
@@ -87,7 +87,7 @@
|
|
|
</a-col>
|
|
|
<a-col :span="6">
|
|
|
<a-form-model-item label="客户关系">
|
|
|
- <v-select code="CUSTOMER_RELATION_TYPE" id="salesManagementList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
|
|
|
+ <v-select code="CUSTOMER_RELATION_TYPE" id="salesManagementList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
@@ -292,18 +292,19 @@ export default {
|
|
|
endDate: getDate.getMonthDays(3).endtime,
|
|
|
auditBeginDate: '',
|
|
|
auditEndDate: '',
|
|
|
- outWarehouseBeginDate: '',
|
|
|
- outWarehouseEndDate: '',
|
|
|
+ outWarehouseBeginDate: '', // 出库开始时间
|
|
|
+ outWarehouseEndDate: '', // 出库结束时间
|
|
|
buyerNameCurrent: undefined, // 客户名称
|
|
|
- buyerSn: undefined,
|
|
|
+ buyerSn: undefined, // 客户sn
|
|
|
salesBillNo: '', // 销售单号
|
|
|
purchaseBillNo: '', // 采购单号
|
|
|
payType: undefined, // 支付方式
|
|
|
settleStyleSn: undefined, // 收款方式
|
|
|
billStatus: undefined, // 业务状态
|
|
|
financialStatus: undefined, // 财务状态
|
|
|
- sourceType: undefined,
|
|
|
- distributionFlag: undefined
|
|
|
+ sourceType: undefined, // 单据来源
|
|
|
+ distributionFlag: undefined, // 铺货出库
|
|
|
+ buyerRelationType: undefined // 客户关系
|
|
|
},
|
|
|
totalData: {
|
|
|
totalAmount: 0,
|
|
@@ -348,7 +349,7 @@ export default {
|
|
|
{ title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: this.showDiscount ? '6%' : '9%', align: 'center' },
|
|
|
{ title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: this.showDiscount ? '12%' : '15%', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '客户关系', dataIndex: 'relationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户关系', dataIndex: 'buyerRelationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
@@ -517,7 +518,6 @@ export default {
|
|
|
this.$refs.rangeDate.resetDate(flag ? '' : this.time)
|
|
|
this.queryParam.beginDate = flag ? '' : getDate.getMonthDays(3).starttime
|
|
|
this.queryParam.endDate = flag ? '' : getDate.getMonthDays(3).endtime
|
|
|
-
|
|
|
this.queryParam.auditBeginDate = ''
|
|
|
this.queryParam.auditEndDate = ''
|
|
|
this.queryParam.outWarehouseBeginDate = ''
|
|
@@ -528,7 +528,6 @@ export default {
|
|
|
this.$refs.auditRangeDate.resetDate('')
|
|
|
this.$refs.outWareRangeDate.resetDate('')
|
|
|
}
|
|
|
-
|
|
|
this.queryParam.buyerNameCurrent = undefined
|
|
|
this.queryParam.buyerSn = undefined
|
|
|
this.queryParam.salesBillNo = ''
|
|
@@ -539,6 +538,8 @@ export default {
|
|
|
this.queryParam.financialStatus = undefined
|
|
|
this.queryParam.sourceType = undefined
|
|
|
this.queryParam.distributionFlag = undefined
|
|
|
+ this.queryParam.buyerRelationType = undefined
|
|
|
+
|
|
|
this.$refs.custList.resetForm()
|
|
|
if (!flag) {
|
|
|
this.setIsHomeNav(this.$route.name, null)
|