|
|
@@ -2,103 +2,104 @@
|
|
|
<div class="edit-view">
|
|
|
<el-form :model="formData" :rules="rules" ref="form" label-width="108px" label-position="right" size="small"
|
|
|
style="max-width: 500px;">
|
|
|
- <el-form-item prop="userId" label="用户ID">
|
|
|
- <el-input-number type="number" v-model="formData.userId"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="userAddress" label="配送地址">
|
|
|
- <el-input v-model="formData.userAddress"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="merchantId" label="商户ID">
|
|
|
- <el-input-number type="number" v-model="formData.merchantId"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="goodsId" label="商品ID">
|
|
|
- <el-input-number type="number" v-model="formData.goodsId"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="merchantStatus" label="商家状态">
|
|
|
- <el-input v-model="formData.merchantStatus"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="merchantAddress" label="商家地址">
|
|
|
- <el-input v-model="formData.merchantAddress"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="jobNumber" label="骑手工号">
|
|
|
- <el-input v-model="formData.jobNumber"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="riderStatus" label="骑手状态">
|
|
|
- <el-select v-model="formData.riderStatus" clearable filterable placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in riderStatusOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="totalAmount" label="总价">
|
|
|
- <el-input-number type="number" v-model="formData.totalAmount"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="goodsAmount" label="商品总价">
|
|
|
- <el-input-number type="number" v-model="formData.goodsAmount"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="deliveryAmount" label="配送费">
|
|
|
- <el-input-number type="number" v-model="formData.deliveryAmount"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="realAmount" label="实付金额">
|
|
|
- <el-input-number type="number" v-model="formData.realAmount"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="payMethod" label="支付方式">
|
|
|
- <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in payMethodOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="cancel" label="取消订单">
|
|
|
- <el-switch v-model="formData.cancel"></el-switch>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="rated" label="已评价">
|
|
|
- <el-switch v-model="formData.rated"></el-switch>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="orderTime" label="下单时间">
|
|
|
- <el-date-picker
|
|
|
- v-model="formData.orderTime"
|
|
|
- type="datetime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- placeholder="选择日期时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="merchantOrderTime" label="商家接单时间">
|
|
|
- <el-date-picker
|
|
|
- v-model="formData.merchantOrderTime"
|
|
|
- type="datetime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- placeholder="选择日期时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="riderOrderTime" label="骑手接单时间">
|
|
|
- <el-date-picker
|
|
|
- v-model="formData.riderOrderTime"
|
|
|
- type="datetime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- placeholder="选择日期时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="userReceivedTime" label="用户收到时间">
|
|
|
- <el-date-picker
|
|
|
- v-model="formData.userReceivedTime"
|
|
|
- type="datetime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- placeholder="选择日期时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="isCoupon" label="使用优惠券">
|
|
|
- <el-switch v-model="formData.isCoupon"></el-switch>
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item prop="userId" label="用户ID">
|
|
|
+ <el-input-number type="number" v-model="formData.userId"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="userAddress" label="配送地址">
|
|
|
+ <el-input v-model="formData.userAddress"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="merchantId" label="商户ID">
|
|
|
+ <el-input-number type="number" v-model="formData.merchantId"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="goodsId" label="商品ID">
|
|
|
+ <el-input-number type="number" v-model="formData.goodsId"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="merchantStatus" label="商家状态">
|
|
|
+ <el-input v-model="formData.merchantStatus"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="merchantAddress" label="商家地址">
|
|
|
+ <el-input v-model="formData.merchantAddress"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="jobNumber" label="骑手工号">
|
|
|
+ <el-input v-model="formData.jobNumber"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="riderStatus" label="骑手状态">
|
|
|
+ <el-select v-model="formData.riderStatus" clearable filterable placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in riderStatusOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="totalAmount" label="总价">
|
|
|
+ <el-input-number type="number" v-model="formData.totalAmount"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="goodsAmount" label="商品总价">
|
|
|
+ <el-input-number type="number" v-model="formData.goodsAmount"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="deliveryAmount" label="配送费">
|
|
|
+ <el-input-number type="number" v-model="formData.deliveryAmount"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="realAmount" label="实付金额">
|
|
|
+ <el-input-number type="number" v-model="formData.realAmount"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="payMethod" label="支付方式">
|
|
|
+ <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in payMethodOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="cancel" label="取消订单">
|
|
|
+ <el-switch v-model="formData.cancel"></el-switch>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="rated" label="已评价">
|
|
|
+ <el-switch v-model="formData.rated"></el-switch>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="orderTime" label="下单时间">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="formData.orderTime"
|
|
|
+ type="datetime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ placeholder="选择日期时间">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+<!-- <el-form-item prop="merchantOrderTime" label="商家接单时间">-->
|
|
|
+<!-- <el-date-picker-->
|
|
|
+<!-- v-model="formData.merchantOrderTime"-->
|
|
|
+<!-- type="datetime"-->
|
|
|
+<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
|
|
|
+<!-- placeholder="选择日期时间">-->
|
|
|
+<!-- </el-date-picker>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item prop="riderOrderTime" label="骑手接单时间">-->
|
|
|
+<!-- <el-date-picker-->
|
|
|
+<!-- v-model="formData.riderOrderTime"-->
|
|
|
+<!-- type="datetime"-->
|
|
|
+<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
|
|
|
+<!-- placeholder="选择日期时间">-->
|
|
|
+<!-- </el-date-picker>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ <el-form-item prop="userReceivedTime" label="用户收到时间">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="formData.userReceivedTime"
|
|
|
+ type="datetime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ placeholder="选择日期时间">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="isCoupon" label="使用优惠券">
|
|
|
+ <el-switch v-model="formData.isCoupon"></el-switch>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button @click="onSave" :loading="saving"
|
|
|
- type="primary">保存</el-button>
|
|
|
+ type="primary">保存
|
|
|
+ </el-button>
|
|
|
<el-button @click="onDelete" :loading="saving"
|
|
|
type="danger" v-if="formData.id">删除
|
|
|
</el-button>
|
|
|
@@ -113,7 +114,7 @@
|
|
|
created() {
|
|
|
if (this.$route.query.id) {
|
|
|
this.$http
|
|
|
- .get('orderInfo/get/'+this.$route.query.id)
|
|
|
+ .get('orderInfo/get/' + this.$route.query.id)
|
|
|
.then(res => {
|
|
|
this.formData = res;
|
|
|
})
|
|
|
@@ -126,12 +127,16 @@
|
|
|
data() {
|
|
|
return {
|
|
|
saving: false,
|
|
|
- formData: {
|
|
|
- },
|
|
|
- rules: {
|
|
|
- },
|
|
|
- riderStatusOptions:[{"label":"JIEDAN","value":"JIEDAN"},{"label":"QUCAN","value":"QUCAN"},{"label":"SONGCAN","value":"SONGCAN"},{"label":"WANCHENG","value":"WANCHENG"}],
|
|
|
- payMethodOptions:[{"label":"支付宝","value":"ALI_PAY"},{"label":"货到付款","value":"CASH_DELIVERY"},{"label":"信用卡","value":"CREDIT_CARD"}],
|
|
|
+ formData: {},
|
|
|
+ rules: {},
|
|
|
+ riderStatusOptions: [{"label": "接单", "value": "RECEIVED"}, {
|
|
|
+ "label": "取餐",
|
|
|
+ "value": "TAKE_MEAL"
|
|
|
+ }, {"label": "送餐", "value": "MEAL_DELIVERY"}, {"label": "完成", "value": "CARRY_OUT"}],
|
|
|
+ payMethodOptions: [{"label": "支付宝", "value": "ALI_PAY"}, {
|
|
|
+ "label": "货到付款",
|
|
|
+ "value": "CASH_DELIVERY"
|
|
|
+ }, {"label": "信用卡", "value": "CREDIT_CARD"}],
|
|
|
}
|
|
|
},
|
|
|
methods: {
|