|
@@ -105,30 +105,30 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-row :gutter="20">
|
|
|
- <template v-if="logisticsNumber === '001'">
|
|
|
- <el-col :xs="24" :sm="8" :lg="8">
|
|
|
- <el-form-item label="收货客户" :prop="logisticsNumber === '001' ? 'receivingName' : ''">
|
|
|
- <el-input v-model="mainForm.receivingName" :disabled="flag" placeholder="请输入收货客户"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :xs="24" :sm="8" :lg="8">
|
|
|
- <el-form-item label="电话" :prop="logisticsNumber === '001' ? 'phone' : ''">
|
|
|
- <el-input v-model="mainForm.phone" :disabled="flag" placeholder="请输入电话"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :xs="24" :sm="8" :lg="8">
|
|
|
- <el-form-item label="收货地址" :prop="logisticsNumber === '001' ? 'address' : ''">
|
|
|
- <el-input v-model="mainForm.address" :disabled="flag" placeholder="请输入收货地址"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </template>
|
|
|
- <el-col :xs="24" :sm="24" :lg="24">
|
|
|
- <el-form-item label="备注内容" prop="remark">
|
|
|
- <el-input v-model="mainForm.remark" :disabled="flag" placeholder="请输入备注内容"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
+ <!-- <el-row :gutter="20">-->
|
|
|
+ <!-- <template v-if="logisticsNumber === '001'">-->
|
|
|
+ <!-- <el-col :xs="24" :sm="8" :lg="8">-->
|
|
|
+ <!-- <el-form-item label="收货客户" :prop="logisticsNumber === '001' ? 'receivingName' : ''">-->
|
|
|
+ <!-- <el-input v-model="mainForm.receivingName" :disabled="flag" placeholder="请输入收货客户"></el-input>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
+ <!-- </el-col>-->
|
|
|
+ <!-- <el-col :xs="24" :sm="8" :lg="8">-->
|
|
|
+ <!-- <el-form-item label="电话" :prop="logisticsNumber === '001' ? 'phone' : ''">-->
|
|
|
+ <!-- <el-input v-model="mainForm.phone" :disabled="flag" placeholder="请输入电话"></el-input>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
+ <!-- </el-col>-->
|
|
|
+ <!-- <el-col :xs="24" :sm="8" :lg="8">-->
|
|
|
+ <!-- <el-form-item label="收货地址" :prop="logisticsNumber === '001' ? 'address' : ''">-->
|
|
|
+ <!-- <el-input v-model="mainForm.address" :disabled="flag" placeholder="请输入收货地址"></el-input>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
+ <!-- </el-col>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- <el-col :xs="24" :sm="24" :lg="24">-->
|
|
|
+ <!-- <el-form-item label="备注内容" prop="remark">-->
|
|
|
+ <!-- <el-input v-model="mainForm.remark" :disabled="flag" placeholder="请输入备注内容"></el-input>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
+ <!-- </el-col>-->
|
|
|
+ <!-- </el-row>-->
|
|
|
</el-form>
|
|
|
</div>
|
|
|
|
|
@@ -311,9 +311,9 @@ export default {
|
|
|
date: [{ required: true, message: '请选择预约日期', trigger: 'change' }],
|
|
|
timeSlot: [{ required: true, message: '请选择预约时段', trigger: 'change' }],
|
|
|
pickupWay: [{ required: true, message: '请选择提货方式', trigger: 'change' }],
|
|
|
- pickupMan: [{ required: true, message: '请选择提货人', trigger: 'change' }],
|
|
|
- receivingName: [{ required: true, message: '请填写收货客户', trigger: 'change' }],
|
|
|
- phone: [{ required: true, message: '请填写电话', trigger: 'change' }]
|
|
|
+ pickupMan: [{ required: true, message: '请选择提货人', trigger: 'change' }]
|
|
|
+ // receivingName: [{ required: true, message: '请填写收货客户', trigger: 'change' }],
|
|
|
+ // phone: [{ required: true, message: '请填写电话', trigger: 'change' }]
|
|
|
// address: [{ required: true, message: '请填写收货地址', trigger: 'change' }]
|
|
|
},
|
|
|
formLoading: false,
|
|
@@ -575,9 +575,9 @@ export default {
|
|
|
if (this.mainForm.pickupWay == '2') {
|
|
|
params.pickLogistics = this.mainForm.company
|
|
|
params.logisticsId = this.mainForm.logisticsId
|
|
|
- params.receivingName = this.mainForm.receivingName
|
|
|
- params.phone = this.mainForm.phone
|
|
|
- params.address = this.mainForm.address
|
|
|
+ // params.receivingName = this.mainForm.receivingName
|
|
|
+ // params.phone = this.mainForm.phone
|
|
|
+ // params.address = this.mainForm.address
|
|
|
}
|
|
|
if (this.listItem) {
|
|
|
params.id = this.listItem.id
|