Skip to content

E
ElectricitySheep
Commit 250adf18 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 78ef027d
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 72 deletions
src/components/offlineService/osOrderDetails.vue
View file @ 250adf18
......@@ -28,15 +28,15 @@
<el-step v-if="activeStep>2" title="已发货" icon="el-icon-edit" :description="dataInfo.DeliveryTime">
<i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i>
</el-step>
<el-step v-else title="未发货" icon="el-icon-edit" description="">
<el-step v-else title="未使用" icon="el-icon-edit" description="">
<i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i>
</el-step>
</template>
<template>
<el-step v-if="activeStep==3" title="未收货" icon="el-icon-edit">
<el-step v-if="activeStep==3" title="未使用" icon="el-icon-edit">
<i :class="activeStep==4?'step04Active':'step04'" slot="icon"></i>
</el-step>
<el-step v-else-if="activeStep>3" title="已收货" icon="el-icon-edit" :description="dataInfo.ReceivingTime">
<el-step v-else-if="activeStep>3" title="已使用" icon="el-icon-edit" :description="dataInfo.ReceivingTime">
<i :class="activeStep>3?'step04Active':'step04'" slot="icon"></i>
</el-step>
</template>
......@@ -69,7 +69,6 @@
<span
class="el-tag el-tag--success el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.PaymentWayName}}</span>
</div>
<div flex="dir:left cross:center" class="item-box"
v-if="dataInfo.CouponMoney && dataInfo.CouponMoney !='' && dataInfo.CouponMoney>0">
<span class="label">优惠金额:</span>
......@@ -162,7 +161,6 @@
</el-row>
</div>
</template>
</div>
</el-col>
<el-col :span="8">
......@@ -218,13 +216,11 @@
<span class="label">姓名:</span>
<div>{{item.UserName}}</div>
</div>
<div flex="dir:left cross:center" class="item-box share-price">
<span class="label orange-label">佣金:</span>
<div>￥{{item.Commission}}</div>
</div>
</div>
</div>
<div v-if="dataInfo.OrderIntroductionInfo!=undefined && dataInfo.OrderIntroductionInfo.length>0">
<h3>推荐供应商返佣</h3>
......@@ -233,13 +229,11 @@
<span class="label">姓名:</span>
<div>{{item.UserName}}</div>
</div>
<div flex="dir:left cross:center" class="item-box share-price">
<span class="label orange-label">佣金:</span>
<div>￥{{item.Commission}}</div>
</div>
</div>
</div>
<div v-if="dataInfo.SmallShopsCommissionInfo!=undefined && dataInfo.SmallShopsCommissionInfo.length>0">
<h3>微店佣金</h3>
......@@ -406,7 +400,6 @@
</el-form-item>
<el-form-item label="快递单号" prop="ExpressNumber">
<el-input size="small" v-model="fhMsg.ExpressNumber">
<!-- <el-button slot="append"> 获取面单</el-button> -->
</el-input>
</el-form-item>
<el-form-item label="商家留言">
......@@ -418,7 +411,6 @@
<el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></el-input>
</el-form-item>
</template>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="fhDig = false">取 消</el-button>
......@@ -534,16 +526,13 @@
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}).catch(() => {});
},
// 确认收货
ConfirmSh(item) {
......@@ -562,16 +551,13 @@
if (res.data.resultCode === 1) {
this.getData();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}).catch(() => {});
},
FhsubmitForm(formName) {
this.$refs[formName].validate((valid) => {
......@@ -609,7 +595,6 @@
},
TableSelectChange(val) {
this.checkfhList = val;
},
selectable(row, index) {
return row.IsBindExpress === 2
......@@ -657,7 +642,7 @@
}, res => {
console.log(" res.data", res.data);
this.dataInfo = res.data.data;
console.log("this.dataInfo",this.dataInfo);
console.log("this.dataInfo", this.dataInfo);
let data = res.data.data;
// 未付款
if (data.PaymentTime == '' && data.DeliveryTime == '') {
......@@ -754,7 +739,6 @@
this.getData();
this.Success(res.data.message)
this.shDig = false;
} else {
this.Error(res.data.message);
}
......@@ -793,13 +777,10 @@
}
})
},
},
mounted() {
}
};
</script>
<style>
.app-order-detail .goods-pic {
......
src/components/offlineService/osOrderList.vue
View file @ 250adf18
......@@ -2,7 +2,8 @@
<div class="orderList">
<div class="head-title">
订单列表
<el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
<el-button @click="dialogVisible=true" style="float:right;margin-top: -5px; display:none;" size="small"
type="primary">批量导出
</el-button>
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
清空回收站</el-button>
......@@ -115,7 +116,6 @@
<el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top">
<img src="../../assets/img/userman/remark.png" alt="">
</el-tooltip>
</div>
<div flex="dir:left wrap:wrap" class="app-order-offline">
<div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">
......@@ -226,7 +226,6 @@
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span>
</div>
<div class="billStyle_item">
支出单据:
......@@ -449,7 +448,6 @@
<el-input type="textarea" row="2" size="small" v-model="fhMsg.Remark"></el-input>
</el-form-item>
</template>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="fhDig = false">取 消</el-button>
......@@ -545,7 +543,6 @@
<el-button size="small" type="primary" @click="priceForm('priceMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 商品、运费成本的修改 -->
<el-dialog :title="cosType==1?'商品成本修改':'运费成本修改'" :visible.sync="costDig" width="600px">
<el-form :model="costMsg" ref="costMsg" label-width="80px">
......@@ -575,7 +572,6 @@
<el-button size="small" type="primary" @click="SaveSuplier">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -808,7 +804,6 @@
} else {
this.Error(res.data.message)
}
})
},
// 订单操作
......@@ -827,7 +822,6 @@
this.getList();
this.Success(res.data.message)
this.priceDig = false;
} else {
this.Error(res.data.message);
}
......@@ -939,7 +933,6 @@
this.getList();
this.Success(res.data.message)
this.hszDig = false;
} else {
this.Error(res.data.message);
}
......@@ -952,8 +945,6 @@
this.pendMgs.OrderId = item.OrderId;
this.pendMgs.Type = type;
this.pendMgs.Remark = '';
},
// 待处理调用接口
pendingForm() {
......@@ -968,10 +959,8 @@
} else {
this.Error(res.data.message);
this.loading = false;
}
},
);
},
// 确认完成
......@@ -991,16 +980,13 @@
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}).catch(() => {});
},
// 放入回收站
fRhsz(item, num) {
......@@ -1032,16 +1018,13 @@
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}).catch(() => {});
},
// 修改收货地址
ExitshAdress(item) {
......@@ -1075,20 +1058,15 @@
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}).catch(() => {});
},
Offpayment(item) { //线下付款
console.log(item)
let that = this;
that.$confirm('确认转为线下付款，转后无法恢复!', '提示', {
confirmButtonText: '确定',
......@@ -1102,16 +1080,13 @@
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}).catch(() => {});
},
// 判断是否有多个物流
getOrderSend(item) {
......@@ -1192,7 +1167,6 @@
},
TableSelectChange(val) {
this.checkfhList = val;
},
selectable(row, index) {
return row.IsBindExpress === 2
......@@ -1211,7 +1185,6 @@
OrderDetailIdList: [],
}
this.fahuoList = item.DetailList;
},
// 修改收货地址
shsubmitForm(formName) {
......@@ -1223,7 +1196,6 @@
this.getList();
this.Success(res.data.message)
this.shDig = false;
} else {
this.Error(res.data.message);
}
......@@ -1248,16 +1220,13 @@
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
}).catch(() => {});
},
Export() {
this.msg.ExcelEnumIds = this.checkedCities;
......@@ -1276,7 +1245,6 @@
data.forEach(item => {
this.cityOptions.push(item.Id)
})
})
},
handleCheckAllChange(val) {
......@@ -1298,7 +1266,6 @@
this.getList();
this.Success(res.data.message)
this.exitDig = false;
} else {
this.Error(res.data.message);
}
......@@ -1342,7 +1309,6 @@
} else {
that.Error(res.data.message);
that.loading = false
}
},
);
......@@ -1359,7 +1325,6 @@
this.msg.pageIndex = 1
this.getList();
},
getList() {
let that = this;
that.ChangeId(that.msgId);
......@@ -1389,7 +1354,6 @@
let pageData = res.data.data.pageData;
this.tableData = pageData;
}
})
},
handleCurrentChange(val) {
......@@ -1424,7 +1388,6 @@
this.orderTypeList = res.data.data;
})
},
getplat() {
this.apipost("/api/user/GetMemberUserSourceEnumList", {}, res => {
this.platList = res.data.data;
......@@ -1478,7 +1441,6 @@
}
this.costDig = true;
},
costForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -1523,7 +1485,6 @@
}
});
},
//修改供应商
UpdateSuplier(item) {
this.upSupliDilog = true;
......@@ -1593,7 +1554,6 @@
};
</script>
<style>
.orderList .remark-box {
padding-top: 3px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment