|
@@ -44,7 +44,7 @@
|
|
|
<a style="color: #409eff;" @click="showAdvanceOrder = true" v-if="!orderForm.orderNo">选择预约订单</a>
|
|
|
<a style="color: #409eff; margin-left: 10px;" @click="clearAppointment" v-if="orderForm.orderNo">删除</a>
|
|
|
</el-descriptions-item>
|
|
|
- </el-descriptions>
|
|
|
+ </el-descriptions>
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
<el-col :span="18" :xs="24">
|
|
@@ -148,10 +148,10 @@
|
|
|
<el-radio-group v-model="orderForm.isAppointment">
|
|
|
<el-radio-button v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio-button>
|
|
|
</el-radio-group>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="预约单号" prop="orderNo" v-if="orderForm.isAppointment == 'Y'">
|
|
|
<el-input v-model="orderForm.orderNo" placeholder="请输入预约单号" clearable required />
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
<br />
|
|
|
|
|
|
<el-form-item label="会员余额:" prop="userAmount">
|
|
@@ -1436,10 +1436,10 @@ export default {
|
|
|
|
|
|
return
|
|
|
}
|
|
|
- // if (!this.orderForm.sendClothWay) {
|
|
|
- // this.$message.error('请先选取衣方式')
|
|
|
- // return
|
|
|
- // }
|
|
|
+ if (this.orderForm.isAppointment == 'Y' && !this.isEmpty(this.orderForm.orderNo) && !this.orderForm.sendClothWay) {
|
|
|
+ this.$message.error('请先选取衣方式')
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
if (this.orderForm.isAppointment == 'Y') {
|
|
|
var res = await getInfoByOrderNo({ orderNo: this.orderForm.orderNo, appUserId: this.appUserInfo.id })
|