|
@@ -315,15 +315,11 @@
|
|
/>
|
|
/>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
-<!-- <el-form-item label="状态" prop="status" v-if="order.status >=1">-->
|
|
|
|
-<!-- <el-select style="width:220px" filterable v-model="editForm.status" placeholder="请选择状态" clearable size="small">-->
|
|
|
|
-<!-- <el-option key="2" label="待收货" value="2" />-->
|
|
|
|
-<!-- <el-option key="3" label="交易完成" value="3" />-->
|
|
|
|
-<!-- <el-option key="-1" label="退款中" value="-1" />-->
|
|
|
|
-<!-- <el-option key="-2" label="已退款" value="-2" />-->
|
|
|
|
-<!-- <el-option key="-3" label="已取消" value="-3" />-->
|
|
|
|
-<!-- </el-select>-->
|
|
|
|
-<!-- </el-form-item>-->
|
|
|
|
|
|
+ <el-form-item label="状态" prop="status" v-if="order.status >=1">
|
|
|
|
+ <el-select style="width:220px" filterable v-model="editForm.status" placeholder="请选择状态" clearable size="small">
|
|
|
|
+ <el-option key="2" label="待收货" value="2" />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item label="备注" prop="mark" >
|
|
<el-form-item label="备注" prop="mark" >
|
|
<el-input v-model="editForm.mark" placeholder="请输入备注" />
|
|
<el-input v-model="editForm.mark" placeholder="请输入备注" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -669,6 +665,7 @@ export default {
|
|
this.edit.open=true;
|
|
this.edit.open=true;
|
|
this.editForm.mark=this.order.mark
|
|
this.editForm.mark=this.order.mark
|
|
this.editForm.orderType=this.order.orderType.toString();
|
|
this.editForm.orderType=this.order.orderType.toString();
|
|
|
|
+ this.editForm.status = this.order.status;
|
|
this.editForm.id=this.order.id;
|
|
this.editForm.id=this.order.id;
|
|
},
|
|
},
|
|
//推送管易按钮
|
|
//推送管易按钮
|