|
@@ -20,54 +20,54 @@
|
|
|
>
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :span="20">
|
|
|
- <a-form-model-item label="销售退单号" prop="buyerSn">
|
|
|
- <a-input id="base-salesReturnBillNo" v-model.trim="form.salesReturnBillNo" allowClear placeholder="请输入销售退单号"/>
|
|
|
+ <a-form-model-item label="销售退货单号" prop="salesReturnBillNo">
|
|
|
+ <a-input id="base-salesReturnBillNo" v-model.trim="form.salesReturnBillNo" @change="fetchUser" allowClear placeholder="请输入销售退货单号"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :span="20">
|
|
|
- <a-form-model-item label="客户名称" prop="syncFlag">
|
|
|
- {{ form.dearlerName||'--' }}
|
|
|
+ <a-form-model-item label="客户名称" prop="buyerSn">
|
|
|
+ {{ dealerData&&dealerData.buyerName||'--' }}
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :span="20">
|
|
|
- <a-form-model-item label="全国销售日报" prop="goodFlag">
|
|
|
- <a-radio-group name="radioGroup">
|
|
|
+ <a-form-model-item label="全国销售日报" prop="countrySalesDay">
|
|
|
+ <a-radio-group name="radioGroup" v-model="form.countrySalesDay">
|
|
|
<a-radio value="1">剔除</a-radio>
|
|
|
- <a-radio value="2">不剔除</a-radio>
|
|
|
+ <a-radio value="0">不剔除</a-radio>
|
|
|
</a-radio-group>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :span="20">
|
|
|
- <a-form-model-item label="项目销售日报1" prop="goodFlag">
|
|
|
- <a-radio-group name="radioGroup">
|
|
|
+ <a-form-model-item label="项目销售日报1" prop="dailyPl">
|
|
|
+ <a-radio-group name="radioGroup1" v-model="form.dailyPl">
|
|
|
<a-radio value="1">剔除</a-radio>
|
|
|
- <a-radio value="2">不剔除</a-radio>
|
|
|
+ <a-radio value="0">不剔除</a-radio>
|
|
|
</a-radio-group>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :span="20">
|
|
|
- <a-form-model-item label="项目销售日报2" prop="goodFlag">
|
|
|
- <a-radio-group name="radioGroup">
|
|
|
+ <a-form-model-item label="项目销售日报2" prop="dailyPljl">
|
|
|
+ <a-radio-group name="radioGroup2" v-model="form.dailyPljl">
|
|
|
<a-radio value="1">剔除</a-radio>
|
|
|
- <a-radio value="2">不剔除</a-radio>
|
|
|
+ <a-radio value="0">不剔除</a-radio>
|
|
|
</a-radio-group>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :span="20">
|
|
|
- <a-form-model-item label="分区销售日报" prop="goodFlag">
|
|
|
- <a-radio-group name="radioGroup">
|
|
|
+ <a-form-model-item label="分区销售日报" prop="areaSalesDay">
|
|
|
+ <a-radio-group name="radioGroup3" v-model="form.areaSalesDay">
|
|
|
<a-radio value="1">剔除</a-radio>
|
|
|
- <a-radio value="2">不剔除</a-radio>
|
|
|
+ <a-radio value="0">不剔除</a-radio>
|
|
|
</a-radio-group>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
@@ -86,9 +86,7 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import { VSelect } from '@/components'
|
|
|
import debounce from 'lodash/debounce'
|
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
-import { dealerSubareaScopeList, dealerDetailBySn } from '@/api/dealer'
|
|
|
-import { getDefaultWarehouse } from '@/api/warehouse'
|
|
|
-import { salesReturnInsert } from '@/api/salesReturn'
|
|
|
+import { bizRemoveConfigCreate, bizRemoveConfigModify, bizRemoveConfigDetail, salesReturnDetailByNo } from '@/api/bizRemove'
|
|
|
export default {
|
|
|
name: 'BaseModal',
|
|
|
mixins: [commonMixin],
|
|
@@ -109,69 +107,51 @@ export default {
|
|
|
wrapperCol: { span: 18 }
|
|
|
},
|
|
|
form: {
|
|
|
- salesReturnBillSource: 'SALES',
|
|
|
- buyerName: '', // 客户名称
|
|
|
- buyerSn: undefined, // 客户sn
|
|
|
- contactTel: '', // 联系电话
|
|
|
- contactName: '', // 联系人
|
|
|
- provinceSn: '', // 省
|
|
|
- provinceName: '',
|
|
|
- citySn: '', // 市
|
|
|
- cityName: '',
|
|
|
- countySn: '', // 区
|
|
|
- countyName: '',
|
|
|
- customerAddr: '', // 详细地址
|
|
|
- warehouseSn: undefined, // 退货仓库
|
|
|
- syncFlag: undefined, // 是否同步
|
|
|
- goodFlag: undefined
|
|
|
+ salesReturnBillNo: '',
|
|
|
+ buyerSn: undefined,
|
|
|
+ configType: 'DAILY_REPORT',
|
|
|
+ bizSn: undefined, // bizsn
|
|
|
+ dailyPl: undefined,
|
|
|
+ countrySalesDay: undefined,
|
|
|
+ dailyPljl: undefined,
|
|
|
+ areaSalesDay: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
+ salesReturnBillNo: [{ required: true, message: '请输入销售退货单号', trigger: ['change', 'blur'] }],
|
|
|
buyerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
|
|
|
- warehouseSn: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
|
|
|
- syncFlag: [{ required: true, message: '请选择是否同步', trigger: ['change', 'blur'] }],
|
|
|
- goodFlag: [{ required: true, message: '请选择退货类别', trigger: ['change', 'blur'] }]
|
|
|
+ dailyPl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
|
|
|
+ countrySalesDay: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
|
|
|
+ dailyPljl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
|
|
|
+ areaSalesDay: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }]
|
|
|
},
|
|
|
fetching: false,
|
|
|
- dealerData: []
|
|
|
+ dealerData: null,
|
|
|
+ bizSn: undefined
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- fetchUser (dealerName) {
|
|
|
- if (dealerName == '') return
|
|
|
+ fetchUser () {
|
|
|
+ if (!this.form.salesReturnBillNo) return
|
|
|
this.lastFetchId += 1
|
|
|
const fetchId = this.lastFetchId
|
|
|
- this.dealerData = []
|
|
|
+ this.dealerData = null
|
|
|
this.fetching = true
|
|
|
- dealerSubareaScopeList({ nameLike: dealerName.replace(/\s+/g, ''), pageNo: 1, pageSize: 20 }).then(res => {
|
|
|
+ this.spinning = true
|
|
|
+ salesReturnDetailByNo({ salesReturnBillNo: this.form.salesReturnBillNo }).then(res => {
|
|
|
if (fetchId !== this.lastFetchId) {
|
|
|
return
|
|
|
}
|
|
|
- this.dealerData = res.data && res.data.list ? res.data.list : []
|
|
|
- this.fetching = false
|
|
|
- })
|
|
|
- },
|
|
|
- // 客户 change
|
|
|
- handleChange (value) {
|
|
|
- dealerDetailBySn({ sn: this.form.buyerSn }).then(res => {
|
|
|
if (res.data) {
|
|
|
- const data = res.data
|
|
|
- this.form = Object.assign(this.form, {
|
|
|
- buyerName: data.dealerName, // 客户名称
|
|
|
- buyerSn: data.dealerSn, // 客户sn
|
|
|
- contactTel: data.contactMobile, // 联系电话
|
|
|
- contactName: data.contact, // 联系人
|
|
|
- provinceSn: data.provinceSn, // 省
|
|
|
- provinceName: data.provinceName,
|
|
|
- citySn: data.citySn, // 市
|
|
|
- cityName: data.cityName,
|
|
|
- countySn: data.districtSn, // 区
|
|
|
- countyName: data.districtName,
|
|
|
- customerAddr: data.address // 详细地址
|
|
|
- })
|
|
|
- console.log(this.form)
|
|
|
+ this.dealerData = res.data
|
|
|
+ this.form.buyerSn = res.data.buyerSn
|
|
|
+ this.form.bizSn = res.data.salesReturnBillSn
|
|
|
} else {
|
|
|
- this.$message.error('获取客户信息失败')
|
|
|
+ this.dealerData = null
|
|
|
+ this.form.buyerSn = undefined
|
|
|
+ this.form.bizSn = undefined
|
|
|
}
|
|
|
+ this.spinning = false
|
|
|
+ this.fetching = false
|
|
|
})
|
|
|
},
|
|
|
// 保存
|
|
@@ -180,10 +160,9 @@ export default {
|
|
|
const _this = this
|
|
|
this.$refs.ruleForm.validate(valid => {
|
|
|
if (valid) {
|
|
|
- // 保存销售单
|
|
|
+ // 保存
|
|
|
_this.salesSaveFun()
|
|
|
} else {
|
|
|
- console.log('error submit!!')
|
|
|
return false
|
|
|
}
|
|
|
})
|
|
@@ -192,54 +171,63 @@ export default {
|
|
|
salesSaveFun () {
|
|
|
const _this = this
|
|
|
const form = this.form
|
|
|
- console.log(form, 'save data')
|
|
|
+ const funs = !this.bizSn ? bizRemoveConfigCreate : bizRemoveConfigModify
|
|
|
_this.spinning = true
|
|
|
- salesReturnInsert(form).then(res => {
|
|
|
+ funs(form).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
_this.$message.success(res.message)
|
|
|
_this.$emit('ok', res.data)
|
|
|
_this.cancel()
|
|
|
- _this.spinning = false
|
|
|
- } else {
|
|
|
- _this.spinning = false
|
|
|
}
|
|
|
- })
|
|
|
- },
|
|
|
- getDefaultWarehouse () {
|
|
|
- getDefaultWarehouse().then(res => {
|
|
|
- this.form.warehouseSn = res.data ? res.data.warehouseSn : undefined
|
|
|
+ _this.spinning = false
|
|
|
})
|
|
|
},
|
|
|
cancel () {
|
|
|
this.opened = false
|
|
|
this.form = {
|
|
|
- salesReturnBillSource: 'SALES',
|
|
|
- buyerName: '', // 客户名称
|
|
|
- buyerSn: undefined, // 客户sn
|
|
|
- contactTel: '', // 联系电话
|
|
|
- contactName: '', // 联系人
|
|
|
- provinceSn: '', // 省
|
|
|
- provinceName: '',
|
|
|
- citySn: '', // 市
|
|
|
- cityName: '',
|
|
|
- countySn: '', // 区
|
|
|
- countyName: '',
|
|
|
- customerAddr: '', // 详细地址
|
|
|
- warehouseSn: undefined,
|
|
|
- syncFlag: undefined, // 是否同步
|
|
|
- goodFlag: undefined
|
|
|
+ configType: 'DAILY_REPORT',
|
|
|
+ salesReturnBillNo: '',
|
|
|
+ buyerSn: undefined,
|
|
|
+ bizSn: undefined, // bizsn
|
|
|
+ dailyPl: undefined,
|
|
|
+ countrySalesDay: undefined,
|
|
|
+ dailyPljl: undefined,
|
|
|
+ areaSalesDay: undefined
|
|
|
}
|
|
|
+ this.bizSn = undefined
|
|
|
+ this.dealerData = null
|
|
|
this.$refs.ruleForm.resetFields()
|
|
|
- this.dealerData = []
|
|
|
this.$emit('cancel')
|
|
|
+ },
|
|
|
+ getDetail () {
|
|
|
+ bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'DAILY_REPORT' }).then(res => {
|
|
|
+ const { bizSn, bizNo, dealerSn, dealerName, areaSalesDay, countrySalesDay, dailyPl, dailyPljl } = res.data
|
|
|
+ this.dealerData = { buyerName: dealerName }
|
|
|
+ this.form = Object.assign(this.form, {
|
|
|
+ salesReturnBillNo: bizNo,
|
|
|
+ buyerSn: dealerSn,
|
|
|
+ bizSn: bizSn,
|
|
|
+ dailyPl: dailyPl,
|
|
|
+ countrySalesDay: countrySalesDay,
|
|
|
+ dailyPljl: dailyPljl,
|
|
|
+ areaSalesDay: areaSalesDay
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ edit (row) {
|
|
|
+ if (row && row.bizSn) {
|
|
|
+ this.title = '编辑配置'
|
|
|
+ this.bizSn = row.bizSn
|
|
|
+ this.getDetail()
|
|
|
+ } else {
|
|
|
+ this.title = '新增配置'
|
|
|
+ this.bizSn = undefined
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
show (newValue, oldValue) {
|
|
|
this.opened = newValue
|
|
|
- if (newValue) {
|
|
|
- this.getDefaultWarehouse()
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|