|
@@ -4,7 +4,7 @@
|
|
|
class="modalBox"
|
|
|
:footer="null"
|
|
|
:maskClosable="false"
|
|
|
- title="查看详情"
|
|
|
+ title="发货"
|
|
|
v-model="isShow"
|
|
|
@cancle="isShow=false"
|
|
|
:width="1000">
|
|
@@ -16,113 +16,44 @@
|
|
|
@submit="handleSubmit">
|
|
|
<h4>物流信息:</h4>
|
|
|
<a-form-item label="快递公司" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
- <a-select
|
|
|
- id="logistics-expressName"
|
|
|
- allowClear
|
|
|
- v-decorator="[
|
|
|
- 'formData.expressName',
|
|
|
- { initialValue: formData.expressName,
|
|
|
- rules: [{ required: true, message: '请选择快递公司' }] },
|
|
|
- ]"
|
|
|
- placeholder="请选择快递公司"
|
|
|
- >
|
|
|
- <a-select-option v-for="(item,index) in expressCompany" :key="index" :value="item.expressName">
|
|
|
- {{ item.expressName }}
|
|
|
- </a-select-option>
|
|
|
- </a-select>
|
|
|
+ <span>{{ formData.expressName }}</span>
|
|
|
</a-form-item>
|
|
|
<a-form-item label="运单编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
- <a-input
|
|
|
- id="logistics-expressNum"
|
|
|
- :maxLength="30"
|
|
|
- v-decorator="[
|
|
|
- 'formData.expressNum',
|
|
|
- { initialValue: formData.expressNum, getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入运单编号' }] }
|
|
|
- ]"
|
|
|
- placeholder="请输入运单编号(最多30个字符)"
|
|
|
- allowClear />
|
|
|
+ <span>{{ formData.expressNum }}</span>
|
|
|
</a-form-item>
|
|
|
<h4>收货人信息:</h4>
|
|
|
<a-form-item label="收货人姓名" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
- <a-input
|
|
|
- id="network-edit-name"
|
|
|
- :maxLength="30"
|
|
|
- v-decorator="[
|
|
|
- 'formData.name',
|
|
|
- { initialValue: formData.name, getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入收货人姓名' }] }
|
|
|
- ]"
|
|
|
- placeholder="请输入收货人姓名(最多30个字符)"
|
|
|
- allowClear />
|
|
|
+ <span>{{ formData.receiverName }}</span>
|
|
|
</a-form-item>
|
|
|
<a-form-item label="收货人电话" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
- <a-input
|
|
|
- id="network-edit-name"
|
|
|
- :maxLength="30"
|
|
|
- v-decorator="[
|
|
|
- 'formData.name',
|
|
|
- { initialValue: formData.name, getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入收货人电话' }] }
|
|
|
- ]"
|
|
|
- placeholder="请输入收货人电话"
|
|
|
- allowClear />
|
|
|
+ <span>{{ formData.receiverPhone }}</span>
|
|
|
</a-form-item>
|
|
|
- <a-form-item label="省市区" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" required style="margin: 0;">
|
|
|
- <a-row :gutter="20">
|
|
|
- <!-- 地址 -->
|
|
|
- <a-col span="8">
|
|
|
- <a-form-item>
|
|
|
- <a-select id="network-edit-provinceCode" @change="getCityList" v-decorator="['formData.provinceCode', { initialValue: formData.provinceCode, rules: [{ required: true, message: '请选择省' }] }]" placeholder="请选择省">
|
|
|
- <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col span="8">
|
|
|
- <a-form-item prop="cityCode">
|
|
|
- <a-select id="network-edit-cityCode" v-decorator="['formData.cityCode', { initialValue: formData.cityCode, rules: [{ required: true, message: '请选择市' }] }]" @change="getAreaList" placeholder="请选择市">
|
|
|
- <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col span="8">
|
|
|
- <a-form-item prop="districtCode">
|
|
|
- <a-select id="network-edit-districtCode" v-decorator="['formData.districtCode', { initialValue: formData.districtCode, rules: [{ required: true, message: '请选择区' }] }]" @change="areaCharged" placeholder="请选择区/县">
|
|
|
- <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- </a-row>
|
|
|
+ <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="收货人地址">
|
|
|
+ <span>{{ formData.receiveAddress }}</span>
|
|
|
</a-form-item>
|
|
|
- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="详细地址">
|
|
|
- <a-input
|
|
|
- id="network-edit-address"
|
|
|
- :maxLength="30"
|
|
|
- v-decorator="[
|
|
|
- 'formData.address',
|
|
|
- { initialValue: formData.address, getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入详细地址' }] }
|
|
|
- ]"
|
|
|
- placeholder="请输入详细地址(最多30个字符)"
|
|
|
- allowClear />
|
|
|
- </a-form-item>
|
|
|
- <a-form-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
|
|
|
+ <!-- <a-form-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
|
|
|
+ <a-button type="primary" html-type="submit" id="logistics-submit" style="margin-right: 15px">保存</a-button>
|
|
|
<a-button @click="isShow=false" style="margin-left: 15px" id="logistics-close">取消</a-button>
|
|
|
- </a-form-item>
|
|
|
+ </a-form-item> -->
|
|
|
</a-form>
|
|
|
</a-modal>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import { VSelect } from '@/components'
|
|
|
-import { stationSave, stationFind, getProvince, getCityByPro, getDistrictByCity } from '@/api/station'
|
|
|
-import { expressCompanyQuery } from '@/api/order'
|
|
|
+import { getLuckyDrawWinDetail } from '@/api/luckyDraw.js'
|
|
|
+import { expressCompanyQuery } from '@/api/order.js'
|
|
|
export default {
|
|
|
- name: 'GoodsLogisticsDetail',
|
|
|
+ name: 'GoodsLogistics',
|
|
|
components: { VSelect },
|
|
|
props: {
|
|
|
openModal: { // 弹框显示状态
|
|
|
type: Boolean,
|
|
|
default: false
|
|
|
},
|
|
|
- recordId: { // 记录id
|
|
|
- type: [Number, String],
|
|
|
+ // 列id
|
|
|
+ itemId: {
|
|
|
+ type: String || Number,
|
|
|
default: ''
|
|
|
}
|
|
|
},
|
|
@@ -136,13 +67,9 @@ export default {
|
|
|
formData: {
|
|
|
expressName: undefined, // 快递公司
|
|
|
expressNum: '', // 运单编号
|
|
|
- provinceCode: undefined, // 省
|
|
|
- provinceName: '',
|
|
|
- cityCode: undefined, // 市
|
|
|
- cityName: '',
|
|
|
- districtCode: undefined, // 区
|
|
|
- districtName: '',
|
|
|
- address: '' // 详细地址
|
|
|
+ receiverName: '', // 收货人名称
|
|
|
+ receiverPhone: '', // 收货人电话
|
|
|
+ receiveAddress: '' // 详细地址
|
|
|
},
|
|
|
addrProvinceList: [], // 省下拉
|
|
|
addrCityList: [], // 市下拉
|
|
@@ -155,62 +82,6 @@ export default {
|
|
|
this.getExpressCompany()
|
|
|
},
|
|
|
methods: {
|
|
|
- // 获取详情
|
|
|
- getDetail () {
|
|
|
-
|
|
|
- },
|
|
|
- // 获取省列表
|
|
|
- getProvinceList () {
|
|
|
- getProvince().then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- this.addrProvinceList = res.data || []
|
|
|
- } else {
|
|
|
- this.addrProvinceList = []
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- // 获取城市列表
|
|
|
- getCityList (val) {
|
|
|
- this.addrCityList = []
|
|
|
- this.addrDistrictList = []
|
|
|
- this.form.setFieldsValue({ 'formData.cityCode': undefined })
|
|
|
- this.form.setFieldsValue({ 'formData.districtCode': undefined })
|
|
|
- this.form.setFieldsValue({ 'formData.address': '' })
|
|
|
- this.getCityListRequest(val)
|
|
|
- },
|
|
|
- getCityListRequest (val) {
|
|
|
- getCityByPro({
|
|
|
- id: val
|
|
|
- }).then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- this.addrCityList = res.data || []
|
|
|
- } else {
|
|
|
- this.addrCityList = []
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- // 获取区县列表
|
|
|
- getAreaList (val) {
|
|
|
- this.addrDistrictList = []
|
|
|
- this.form.setFieldsValue({ 'formData.districtCode': undefined })
|
|
|
- this.form.setFieldsValue({ 'formData.address': '' })
|
|
|
- this.getAreaListRequest(val)
|
|
|
- },
|
|
|
- getAreaListRequest (val) {
|
|
|
- getDistrictByCity({
|
|
|
- id: val
|
|
|
- }).then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- this.addrDistrictList = res.data || []
|
|
|
- } else {
|
|
|
- this.addrDistrictList = []
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- // 区县变更
|
|
|
- areaCharged (val) {
|
|
|
- this.form.setFieldsValue({ 'formData.address': '' })
|
|
|
- },
|
|
|
// 物流信息 保存
|
|
|
handleSubmit (e) {
|
|
|
e.preventDefault()
|
|
@@ -229,6 +100,15 @@ export default {
|
|
|
this.expressCompany = []
|
|
|
}
|
|
|
})
|
|
|
+ },
|
|
|
+ // 获取获奖用户信息
|
|
|
+ getCustomerInfo () {
|
|
|
+ getLuckyDrawWinDetail({ id: this.itemId }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.formData = res.data
|
|
|
+ // console.log(this.formData, 'lkllllllll')
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -240,14 +120,11 @@ export default {
|
|
|
isShow (val) {
|
|
|
if (!val) {
|
|
|
this.$emit('close')
|
|
|
- } else {
|
|
|
- this.getProvinceList()
|
|
|
this.form.resetFields()
|
|
|
- }
|
|
|
- },
|
|
|
- recordId (newValue, oldValue) {
|
|
|
- if (this.isShow && newValue) {
|
|
|
- this.getDetail()
|
|
|
+ } else {
|
|
|
+ if (this.itemId) {
|
|
|
+ this.getCustomerInfo()
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|