Skip to content

E
ElectricitySheep
Commit 9895f1bd authored by 罗超's avatar 罗超
Browse files
Options

2

parent 6746f369
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 31 deletions
src/components/coffeeManage/orderDetails.vue
View file @ 9895f1bd
......@@ -343,9 +343,9 @@
</el-form>
</el-card>
<div flex="dir:right" class="action-box">
<el-button v-if="(activeStep==2 || activeStep==3) && !exitState" style="margin-left: 10px;" size="small"
type="primary">打印发货单</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button>
<!-- <el-button v-if="(activeStep==2 || activeStep==3) && !exitState" style="margin-left: 10px;" size="small"
type="primary">打印发货单</el-button> -->
<!-- <el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button> -->
<el-button @click="qrEnd(dataInfo)" v-if="activeStep==4 && !exitState" style="margin-left: 10px;" size="small"
type="primary">确认完成</el-button>
<el-button @click="ConfirmSh(dataInfo)" v-if="activeStep==3 && !exitState" style="margin-left: 10px;"
......@@ -568,7 +568,7 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderOperation', msg,
this.i_post('/api/order/SetOrderOperation', msg,
res => {
if (res.data.resultCode === 1) {
this.getList();
......@@ -596,7 +596,7 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderOperation', msg,
this.i_post('/api/order/SetOrderOperation', msg,
res => {
if (res.data.resultCode === 1) {
this.getData();
......@@ -628,7 +628,7 @@
this.fhMsg.PostCode = "";
this.fhMsg.ExpressNumber = "";
}
this.apipost('/api/order/SetOrderSendGoods', this.fhMsg,
this.i_post('/api/order/SetOrderSendGoods', this.fhMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
......@@ -691,7 +691,7 @@
});
},
getData() {
this.apipost("/api/order/GetGoodsOrderInfo", {
this.i_post("/api/order/GetGoodsOrderInfo", {
OrderId: this.OrderId
}, res => {
this.dataInfo = res.data.data;
......@@ -728,7 +728,7 @@
},
// 快递公司
getExpressInfo() {
this.apipost("/api/MallBase/GetExpressInfo", {}, res => {
this.i_post("/api/MallBase/GetExpressInfo", {}, res => {
if (res.data.resultCode == 1) {
this.ExpressList = res.data.data;
} else {
......@@ -749,7 +749,7 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderOperation', this.exitMsg,
this.i_post('/api/order/SetOrderOperation', this.exitMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
......@@ -785,7 +785,7 @@
shsubmitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderShopingAddress', this.shMsg,
this.i_post('/api/order/SetOrderShopingAddress', this.shMsg,
res => {
if (res.data.resultCode === 1) {
this.getData();
......@@ -803,14 +803,14 @@
});
},
getArea(val) {
this.apipost("/api/Destination/GetChildList", {
this.i_post("/api/Destination/GetChildList", {
Id: val
}, res => {
this.areaList = res.data.data;
})
},
getCity(val) {
this.apipost("/api/Destination/GetChildList", {
this.i_post("/api/Destination/GetChildList", {
Id: val
}, res => {
this.cityList = res.data.data;
......@@ -820,7 +820,7 @@
})
},
getProvince() {
this.apipost("/api/Destination/GetChildList", {
this.i_post("/api/Destination/GetChildList", {
Id: 1
}, res => {
this.provinceList = res.data.data;
......
src/components/coffeeManage/orderList.vue
View file @ 9895f1bd
......@@ -7,11 +7,11 @@
<el-button :loading="btnLoad" size="small" type="primary">
赞羊导入</el-button>
</el-upload> -->
<!-- <el-button @click="dialogVisible = true" style="float: right; margin-top: -5px" size="small" type="primary">批量导出
</el-button> -->
<!-- <el-button @click="ClearHsz" style="float: right; margin-top: -5px; margin-right: 20px" size="small"
<el-button @click="dialogVisible = true" style="float: right; margin-top: -5px" 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> -->
清空回收站</el-button>
</div>
<div class="content">
<div>
......@@ -19,20 +19,20 @@
<el-date-picker v-model="dateList" @change="(msg.pageIndex = 1), getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
<span style="margin-left: 15px;font-size:14px">所属平台：</span>
<!-- <span style="margin-left: 15px;font-size:14px">所属平台：</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderSource" size="small"
placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<span style="margin-left: 15px;font-size:14px">订单类型：</span>
</el-select> -->
<!-- <span style="margin-left: 15px;font-size:14px">订单类型：</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderType" size="small"
placeholder="请选择">
<el-option label="全部订单" :value="0"></el-option>
<el-option v-for="item in orderTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-select> -->
<span style="margin-left: 15px;font-size:14px">配送方式：</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.DeliveryMethod" size="small"
......@@ -42,10 +42,10 @@
</el-option>
</el-select>
<el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()" clearable
style="margin-left: 15px;font-size:14px; width: 300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
style="margin-left: 15px;font-size:14px; width: 400px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
size="small">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择" style="width: 110px">
<el-option v-for="item in typeOption" :key="item.Id" :label="item.name" :value="item.Id">
</el-option>
</el-select>
</el-input>
......@@ -57,18 +57,18 @@
justify-content: space-between;
">
<div>
<span style="margin-left: 15px;font-size:14px">线下订单：</span>
<!-- <span style="margin-left: 15px;font-size:14px">线下订单：</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.IsOffline" size="small"
placeholder="请选择">
<el-option label="不限" :value="-1"></el-option>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
<span style="margin-left: 15px;font-size:14px">主播名称：</span>
</el-select> -->
<!-- <span style="margin-left: 15px;font-size:14px">主播名称：</span>
<el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()"
clearable style="margin-top: 10px; width: 200px" class="input-with-select" placeholder="请输入主播名称"
v-model="msg.AnchorName" size="small">
</el-input>
</el-input> -->
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px;font-size:14px"
@change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox>
</div>
......@@ -916,7 +916,12 @@
},
IsSelectPayMoney: 0,
platList: [],
option: [{
typeOption: [
{
Id: 0,
name: "订单Id",
},
{
Id: 1,
name: "订单号",
},
......@@ -977,7 +982,6 @@
// this.currentUserInfo = JSON.parse(localStorage.mall_userInfo);
// let currentUser = this.getLocalStorage();
this.TenantId = JSON.parse(localStorage.getItem('iframeData')).TenantId;
console.log(this.TenantId,JSON.parse(localStorage.getItem('iframeData')))
if (this.$route.query.TypeId) {
this.msgId = Number(this.$route.query.TypeId);
}
......@@ -1081,7 +1085,17 @@
},
ChangeId(val) {
let msgVal = this.msgVal;
if (val == 1) {
if (val == 0) {
this.msg.OrderId = msgVal;
this.msg.OrderNo = "";
this.msg.MerchantsNo = "";
this.msg.UserName = "";
this.msg.UserId = "";
this.msg.GoodsName = "";
this.msg.Consignee = "";
this.msg.Mobile = "";
this.msg.ProductCode = "";
}else if (val == 1) {
this.msg.OrderNo = msgVal;
this.msg.MerchantsNo = "";
this.msg.UserName = "";
......@@ -1090,6 +1104,7 @@
this.msg.Consignee = "";
this.msg.Mobile = "";
this.msg.ProductCode = "";
this.msg.OrderId =0
} else if (val == 2) {
this.msg.OrderNo = "";
this.msg.MerchantsNo = msgVal;
......@@ -1099,6 +1114,7 @@
this.msg.Consignee = "";
this.msg.Mobile = "";
this.msg.ProductCode = "";
this.msg.OrderId =0
} else if (val == 3) {
this.msg.OrderNo = "";
this.msg.MerchantsNo = "";
......@@ -1108,6 +1124,7 @@
this.msg.Consignee = "";
this.msg.Mobile = "";
this.msg.ProductCode = "";
this.msg.OrderId =0
} else if (val == 4) {
this.msg.OrderNo = "";
this.msg.MerchantsNo = "";
......@@ -1117,6 +1134,7 @@
this.msg.Consignee = "";
this.msg.Mobile = "";
this.msg.ProductCode = "";
this.msg.OrderId =0
} else if (val == 5) {
this.msg.OrderNo = "";
this.msg.MerchantsNo = "";
......@@ -1126,6 +1144,7 @@
this.msg.Consignee = "";
this.msg.Mobile = "";
this.msg.ProductCode = "";
this.msg.OrderId =0
} else if (val == 6) {
this.msg.OrderNo = "";
this.msg.MerchantsNo = "";
......@@ -1135,6 +1154,7 @@
this.msg.Consignee = msgVal;
this.msg.Mobile = "";
this.msg.ProductCode = "";
this.msg.OrderId =0
} else if (val == 7) {
this.msg.OrderNo = "";
this.msg.MerchantsNo = "";
......@@ -1144,6 +1164,7 @@
this.msg.Consignee = "";
this.msg.Mobile = msgVal;
this.msg.ProductCode = "";
this.msg.OrderId =0
} else if (val == 8) {
this.msg.OrderNo = "";
this.msg.MerchantsNo = "";
......@@ -1153,6 +1174,7 @@
this.msg.Consignee = "";
this.msg.Mobile = "";
this.msg.ProductCode = msgVal;
this.msg.OrderId =0
}
},
hszOk() {
......@@ -2131,4 +2153,7 @@
margin-right: 4px;
}
/* /deep/.el-input__inner {
width: 100px;
} */
</style>
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