|
@@ -107,6 +107,26 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="订单类型" prop="orderType">
|
|
|
+ <el-select v-model="form.orderType" placeholder="请选择订单类型" clearable size="small" >
|
|
|
+ <el-option
|
|
|
+ v-for="item in orderTypeOptions"
|
|
|
+ :key="item.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="媒体来源" prop="orderMedium" v-if="orderMediumOptions.length>0">
|
|
|
+ <el-select v-model="form.orderMedium" placeholder="请选择媒体来源" clearable size="small" >
|
|
|
+ <el-option
|
|
|
+ v-for="item in orderMediumOptions"
|
|
|
+ :key="item.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="支付方式" prop="payType">
|
|
|
<el-select v-model="form.payType" placeholder="请选择支付方式" clearable size="small" >
|
|
|
<el-option
|
|
@@ -118,10 +138,10 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="改价" prop="payPrice">
|
|
|
- <el-input-number v-model="form.payPrice" placeholder="修改商品总价" size="medium" :precision="2" min=0.01 :step="0.1" />
|
|
|
+ <el-input-number v-model="form.payPrice" placeholder="修改商品总价" size="medium" :precision="2" :min="0.01" :step="0.1" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="物流代收" prop="amount" v-if="form.payType == '3'">
|
|
|
- <el-input-number v-model="form.amount" placeholder="平台支付价格" size="medium" :precision="2" min=0.01 :step="0.1" />
|
|
|
+ <el-input-number v-model="form.amount" placeholder="平台支付价格" size="medium" :precision="2" :min="0.01" :step="0.1" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="订单备注" prop="mark">
|
|
|
<el-input type="textarea" rows="2" v-model="form.mark" placeholder="" />
|
|
@@ -169,7 +189,11 @@ export default {
|
|
|
props: {
|
|
|
customerId: {
|
|
|
type: Number, // 或 Number,根据实际情况选择
|
|
|
- required: true
|
|
|
+ required: false
|
|
|
+ },
|
|
|
+ userId: {
|
|
|
+ type: Number, // 或 Number,根据实际情况选择
|
|
|
+ required: false
|
|
|
}
|
|
|
},
|
|
|
data() {
|
|
@@ -186,6 +210,7 @@ export default {
|
|
|
deliveryStatusOptions:[],
|
|
|
dateRange: [],
|
|
|
orderTypeOptions:[],
|
|
|
+ orderMediumOptions:[],
|
|
|
payTypeOptions:[],
|
|
|
payQr:{
|
|
|
open:false,
|
|
@@ -315,10 +340,14 @@ export default {
|
|
|
// 根据名称筛选部门树
|
|
|
deptName(val) {
|
|
|
this.$refs.tree.filter(val);
|
|
|
- },
|
|
|
+ },
|
|
|
},
|
|
|
created() {
|
|
|
this.getTreeselect();
|
|
|
+ // 媒体来源 如需要则增加字典
|
|
|
+ this.getDicts("store_order_medium").then((response) => {
|
|
|
+ this.orderMediumOptions = response.data;
|
|
|
+ });
|
|
|
this.getDicts("store_order_type").then((response) => {
|
|
|
this.orderTypeOptions = response.data;
|
|
|
});
|
|
@@ -341,9 +370,26 @@ export default {
|
|
|
getTcmScheduleList().then(response => {
|
|
|
this.scheduleOptions = response.data;
|
|
|
});
|
|
|
-
|
|
|
+ this.initUser();
|
|
|
},
|
|
|
methods: {
|
|
|
+ initUser(){
|
|
|
+ console.log("--------------",this.userId)
|
|
|
+ if(this.userId != null){
|
|
|
+ var data={userId:this.userId}
|
|
|
+ this.userloading = true;
|
|
|
+ this.users=[];
|
|
|
+ this.address=[];
|
|
|
+ getUserList(data).then(response => {
|
|
|
+ this.users = response.data;
|
|
|
+ this.userloading = false;
|
|
|
+ if(this.users!=null&&this.users.length==1){
|
|
|
+ this.form.userId=this.users[0].userId;
|
|
|
+ this.getAddressList(this.form.userId)
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect() {
|
|
|
treeselect().then((response) => {
|