|
@@ -3,47 +3,46 @@
|
|
<el-form ref="form" :rules="rules" label-position="left" :disabled="screenForm.disabled" label-width="120px" :model="screenForm" size="mini">
|
|
<el-form ref="form" :rules="rules" label-position="left" :disabled="screenForm.disabled" label-width="120px" :model="screenForm" size="mini">
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
- <el-form-item label="销售订单号" >
|
|
|
|
|
|
+ <el-form-item label="销售订单号">
|
|
<el-input v-model="screenForm.id" disabled placeholder="销售订单号" size="mini" />
|
|
<el-input v-model="screenForm.id" disabled placeholder="销售订单号" size="mini" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
- <el-form-item label="商家编号" >
|
|
|
|
|
|
+ <el-form-item label="商家编号">
|
|
<el-input v-model="screenForm.customerNumber" disabled placeholder="商家编号" size="mini" />
|
|
<el-input v-model="screenForm.customerNumber" disabled placeholder="商家编号" size="mini" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
- <el-form-item label="商家名称" >
|
|
|
|
|
|
+ <el-form-item label="商家名称">
|
|
<el-input v-model="screenForm.customerName" disabled placeholder="商家名称" size="mini" />
|
|
<el-input v-model="screenForm.customerName" disabled placeholder="商家名称" size="mini" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
<el-form-item label="配送日期" prop="pickTime">
|
|
<el-form-item label="配送日期" prop="pickTime">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
- style="width: 100%"
|
|
|
|
v-model="screenForm.pickTime"
|
|
v-model="screenForm.pickTime"
|
|
|
|
+ style="width: 100%"
|
|
type="date"
|
|
type="date"
|
|
size="mini"
|
|
size="mini"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
placeholder="选择日期"
|
|
placeholder="选择日期"
|
|
- >
|
|
|
|
- </el-date-picker>
|
|
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
-<!-- <el-col :xs="24" :ms="6" :lg="6">-->
|
|
|
|
-<!-- <el-form-item label="发货仓库编号" prop="code">-->
|
|
|
|
-<!-- <el-input v-model="screenForm.code" placeholder="发货仓库编号" size="mini" />-->
|
|
|
|
-<!-- </el-form-item>-->
|
|
|
|
-<!-- </el-col>-->
|
|
|
|
|
|
+ <!-- <el-col :xs="24" :ms="6" :lg="6">-->
|
|
|
|
+ <!-- <el-form-item label="发货仓库编号" prop="code">-->
|
|
|
|
+ <!-- <el-input v-model="screenForm.code" placeholder="发货仓库编号" size="mini" />-->
|
|
|
|
+ <!-- </el-form-item>-->
|
|
|
|
+ <!-- </el-col>-->
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
<el-col :xs="24" :ms="6" :lg="6">
|
|
<el-form-item label="发货仓库名称" prop="stockType">
|
|
<el-form-item label="发货仓库名称" prop="stockType">
|
|
- <el-select v-model="screenForm.stockType" placeholder="请选择" clearable>
|
|
|
|
|
|
+ <el-select v-model="screenForm.stockType" placeholder="请选择" clearable @change="handleStokType">
|
|
<el-option
|
|
<el-option
|
|
- label="前置仓"
|
|
|
|
|
|
+ label="嘉贤前置仓"
|
|
:value="1"
|
|
:value="1"
|
|
/>
|
|
/>
|
|
<el-option
|
|
<el-option
|
|
- label="商家仓"
|
|
|
|
|
|
+ label="商家商家仓"
|
|
:value="2"
|
|
:value="2"
|
|
/>
|
|
/>
|
|
</el-select>
|
|
</el-select>
|
|
@@ -61,25 +60,28 @@
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :ms="18" :lg="18" style="display: flex;" class="custom">
|
|
<el-col :xs="24" :ms="18" :lg="18" style="display: flex;" class="custom">
|
|
<el-form-item label="省" prop="provinceId" class="item">
|
|
<el-form-item label="省" prop="provinceId" class="item">
|
|
- <el-select v-model="screenForm.provinceId" placeholder="请选择省" @change="changeProvince"
|
|
|
|
- style="width: 100%"
|
|
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="screenForm.provinceId"
|
|
|
|
+ placeholder="请选择省"
|
|
|
|
+ style="width: 100%"
|
|
|
|
+ @change="changeProvince"
|
|
>
|
|
>
|
|
- <el-option v-for="item in provinceList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
|
|
|
+ <el-option v-for="item in provinceList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="市" prop="cityId" label-width="50px">
|
|
<el-form-item label="市" prop="cityId" label-width="50px">
|
|
- <el-select v-model="screenForm.cityId" placeholder="请选择市" @change="changeCity" style="width: 100%">
|
|
|
|
- <el-option v-for="item in cityList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
|
|
|
+ <el-select v-model="screenForm.cityId" placeholder="请选择市" style="width: 100%" @change="changeCity">
|
|
|
|
+ <el-option v-for="item in cityList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="区" prop="areaId" label-width="50px">
|
|
<el-form-item label="区" prop="areaId" label-width="50px">
|
|
- <el-select v-model="screenForm.areaId" placeholder="请选择区" @change="changeArea" style="width: 100%">
|
|
|
|
- <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
|
|
|
+ <el-select v-model="screenForm.areaId" placeholder="请选择区" style="width: 100%" @change="changeArea">
|
|
|
|
+ <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="街道" prop="streetId" label-width="50px">
|
|
<el-form-item label="街道" prop="streetId" label-width="50px">
|
|
- <el-select v-model="screenForm.streetId" placeholder="请选择街道" @change="changeStreet" style="width: 100%">
|
|
|
|
- <el-option v-for="item in streetList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
|
|
|
+ <el-select v-model="screenForm.streetId" placeholder="请选择街道" style="width: 100%" @change="changeStreet">
|
|
|
|
+ <el-option v-for="item in streetList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -157,10 +159,10 @@ export default {
|
|
required: true, message: '请输入用户名称', trigger: 'change'
|
|
required: true, message: '请输入用户名称', trigger: 'change'
|
|
}],
|
|
}],
|
|
phone: [{
|
|
phone: [{
|
|
- required: true, message: '请输入用户电话', trigger: 'change',
|
|
|
|
|
|
+ required: true, message: '请输入用户电话', trigger: 'change'
|
|
},
|
|
},
|
|
{ min: 11, max: 11, message: '请输入11位手机号', trigger: 'change' }
|
|
{ min: 11, max: 11, message: '请输入11位手机号', trigger: 'change' }
|
|
- ],
|
|
|
|
|
|
+ ],
|
|
receAddress: [{
|
|
receAddress: [{
|
|
required: true, message: '请输入送货地址', trigger: 'change'
|
|
required: true, message: '请输入送货地址', trigger: 'change'
|
|
}]
|
|
}]
|
|
@@ -169,7 +171,7 @@ export default {
|
|
cityList: [],
|
|
cityList: [],
|
|
areaList: [],
|
|
areaList: [],
|
|
streetList: [],
|
|
streetList: [],
|
|
- areaValue:''
|
|
|
|
|
|
+ areaValue: ''
|
|
}
|
|
}
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -191,10 +193,8 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- handleArea(value,type){
|
|
|
|
-
|
|
|
|
- this.screenForm[type] = this[type+'List'].find(k=>k.id===value).name
|
|
|
|
-
|
|
|
|
|
|
+ handleArea(value, type) {
|
|
|
|
+ this.screenForm[type] = this[type + 'List'].find(k => k.id === value).name
|
|
},
|
|
},
|
|
// 切换省
|
|
// 切换省
|
|
changeProvince(value) {
|
|
changeProvince(value) {
|
|
@@ -205,7 +205,7 @@ export default {
|
|
this.areaList = []
|
|
this.areaList = []
|
|
this.streetList = []
|
|
this.streetList = []
|
|
this.getRegion(1, value)
|
|
this.getRegion(1, value)
|
|
- this.handleArea(value,'province')
|
|
|
|
|
|
+ this.handleArea(value, 'province')
|
|
},
|
|
},
|
|
|
|
|
|
// 切换市
|
|
// 切换市
|
|
@@ -215,8 +215,7 @@ export default {
|
|
this.areaList = []
|
|
this.areaList = []
|
|
this.streetList = []
|
|
this.streetList = []
|
|
this.getRegion(2, value)
|
|
this.getRegion(2, value)
|
|
- this.handleArea(value,'city')
|
|
|
|
-
|
|
|
|
|
|
+ this.handleArea(value, 'city')
|
|
},
|
|
},
|
|
|
|
|
|
// 切换区
|
|
// 切换区
|
|
@@ -225,19 +224,18 @@ export default {
|
|
this.screenForm.streetId = ''
|
|
this.screenForm.streetId = ''
|
|
this.streetList = []
|
|
this.streetList = []
|
|
this.getRegion(3, value)
|
|
this.getRegion(3, value)
|
|
- this.handleArea(value,'area')
|
|
|
|
-
|
|
|
|
|
|
+ this.handleArea(value, 'area')
|
|
},
|
|
},
|
|
|
|
|
|
// 切换街道
|
|
// 切换街道
|
|
changeStreet(value) {
|
|
changeStreet(value) {
|
|
this.getRegion(3, this.areaValue)
|
|
this.getRegion(3, this.areaValue)
|
|
- this.handleArea(value,'street')
|
|
|
|
|
|
+ this.handleArea(value, 'street')
|
|
},
|
|
},
|
|
|
|
|
|
// 初始化省市区街道
|
|
// 初始化省市区街道
|
|
initRegion(level, item, id = 0) {
|
|
initRegion(level, item, id = 0) {
|
|
- let { province, city, area, street } = item
|
|
|
|
|
|
+ const { province, city, area, street } = item
|
|
let nextId = null
|
|
let nextId = null
|
|
getRegion({ pid: id }).then(res => {
|
|
getRegion({ pid: id }).then(res => {
|
|
if (level === 0) {
|
|
if (level === 0) {
|
|
@@ -258,6 +256,9 @@ export default {
|
|
this.initRegion(level, item, nextId)
|
|
this.initRegion(level, item, nextId)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
+ },
|
|
|
|
+ handleStokType(e) {
|
|
|
|
+ this.$emit('setStokType', e)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -269,7 +270,9 @@ export default {
|
|
padding: 20px;
|
|
padding: 20px;
|
|
box-shadow: 0 0 8px 0 rgb(0 0 0 / 20%);
|
|
box-shadow: 0 0 8px 0 rgb(0 0 0 / 20%);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+::v-deep .el-select{
|
|
|
|
+ width: 100%;
|
|
|
|
+}
|
|
.custom {
|
|
.custom {
|
|
.item {
|
|
.item {
|
|
::v-deep .el-form-item__label:first-child {
|
|
::v-deep .el-form-item__label:first-child {
|