suojin
/
pillow_customize_pc
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改物流消息详情样式，删除报名单中地址相关

Browse Source
main
jinna 2 years ago
parent ee2213fe0d
commit aa36d0191d
3 changed files with 76 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 53
      src/views/order/index.vue
  2. 75
      src/views/statistics/index.vue
  3. 2
      src/views/wel/index.vue

53
src/views/order/index.vue
Unescape View File

@ -96,7 +96,7 @@
<template slot="label"> <template slot="label">
<div>地址</div> <div>地址</div>
</template> </template>
<div style="width: 158px">{{ checkaccept.address }}</div> <div>{{ checkaccept.province }}{{ checkaccept.city }}{{ checkaccept.district }}{{ checkaccept.address }}</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">订单状态</template> <template slot="label">订单状态</template>
@ -138,7 +138,28 @@
:timestamp="activity.time" :timestamp="activity.time"
:color="activity.color"> :color="activity.color">
<div> <div>
<p>{{activity.status == '揽收' ? '已揽件' : activity.status == '运输中' ? '运输中' : activity.status == '派件' ? '派件中' : activity.status == '投柜或驿站' ? '投柜或驿站' : ''}}</p> <!-- <p>{{activity.status == '揽收' ? '已揽件' : activity.status == '运输中' ? '运输中' : activity.status == '派件' ? '派件中' : activity.status == '投柜或驿站' ? '投柜或驿站' : ''}}</p> -->
<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '1' || activity.status == '103'">
已揽收
</p>
<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '101'">
已下单
</p>
<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '102'">
待揽收
</p>
<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '0' || activity.statusCode == '1001' || activity.statusCode == '1002' || activity.statusCode == '1003'">
运输中
</p>
<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '5'">
派件中
</p>
<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '501'">
已投递菜鸟驿站/快递柜
</p>
<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '3' || activity.statusCode == '301' || activity.statusCode == '302' || activity.statusCode == '303' || activity.statusCode == '304'">
已签收
</p>
<p>{{activity.context}}</p> <p>{{activity.context}}</p>
</div> </div>
@ -169,19 +190,21 @@ import md5 from "js-md5";
export default { export default {
data() { data() {
return { return {
activities: [{ activities: [
status:'在途', // {
content: '【昆明市】 快件已到达 昆明中转', // status:'在途',
time: '2023-08-15 15:30:16' // content: '【昆明市】 快件已到达 昆明中转',
}, { // time: '2023-08-15 15:30:16'
status:'在途', // }, {
content: '【丽江市】 快件已发往 昆明中转', // status:'在途',
time: '2023-08-14 19:02:02' // content: '【丽江市】 快件已发往 昆明中转',
}, { // time: '2023-08-14 19:02:02'
status:'揽收', // }, {
content: '【丽江市】 【丽江华坪县】（0888-8834031） 的 P1陈平（15108866686） 已揽收', // status:'揽收',
time: '2023-08-14 19:01:18' // content: '【丽江市】 【丽江华坪县】（0888-8834031） 的 P1陈平（15108866686） 已揽收',
}], // time: '2023-08-14 19:01:18'
// }
],
active: "1", active: "1",
form: {}, form: {},
dialogVisible: false, dialogVisible: false,

75
src/views/statistics/index.vue
Unescape View File

@ -14,8 +14,8 @@
<el-option v-for="item in ageData" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in ageData" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</template> </template>
<template slot-scope="scope" slot="purchaseChannelSearch"> <template slot-scope="scope" slot="roadSearch">
<el-select v-model="form.purchaseChannel" placeholder="请选择购买渠道"> <el-select v-model="form.road" placeholder="请选择购买渠道">
<el-option v-for="item in channelData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option> <el-option v-for="item in channelData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select> </el-select>
</template> </template>
@ -48,10 +48,12 @@
<div v-show="scope.row.sleepingPosture == 1">仰睡</div> <div v-show="scope.row.sleepingPosture == 1">仰睡</div>
<div v-show="scope.row.sleepingPosture == 2">侧睡</div> <div v-show="scope.row.sleepingPosture == 2">侧睡</div>
</template> </template>
<template slot-scope="scope" slot="road"> <template slot-scope="scope" slot="purchaseChannel">
<div v-show="scope.row.road == 0">微信商城</div> <div>{{calcChannel(scope.row.purchaseChannel) }}</div>
<div v-show="scope.row.road == 1">抖音商城</div> <!-- <div v-show="scope.row.purchaseChannel == 0">微信商城</div>
<div v-show="scope.row.road == 2">微信小程序</div> <div v-show="scope.row.purchaseChannel == 1">抖音商城</div>
<div v-show="scope.row.purchaseChannel == 2">微信小程序</div>
<div v-show="scope.row.purchaseChannel == 4">微信小程序</div> -->
</template> </template>
<template slot-scope="scope" slot="neckShoulderWidth"> <template slot-scope="scope" slot="neckShoulderWidth">
<div v-show="scope.row.neckShoulderWidth != '-1'">{{ scope.row.neckShoulderWidth }}</div> <div v-show="scope.row.neckShoulderWidth != '-1'">{{ scope.row.neckShoulderWidth }}</div>
@ -79,10 +81,10 @@
<template slot-scope="scope" slot="finishTime"> <template slot-scope="scope" slot="finishTime">
<div>{{ scope.row.finishTime !== '' ? scope.row.finishTime : '---/-/---' }}</div> <div>{{ scope.row.finishTime !== '' ? scope.row.finishTime : '---/-/---' }}</div>
</template> </template>
<template slot-scope="scope" slot="position"> <!-- <template slot-scope="scope" slot="position">
<div>{{ (scope.row.province ? scope.row.province : '') + (scope.row.city ? scope.row.city : '') + <div>{{ (scope.row.province ? scope.row.province : '') + (scope.row.city ? scope.row.city : '') +
(scope.row.district ? scope.row.district : '') + (scope.row.detail ? scope.row.detail : '') }}</div> (scope.row.district ? scope.row.district : '') + (scope.row.detail ? scope.row.detail : '') }}</div>
</template> </template> -->
<template slot-scope="scope" slot="menuLeft"> <template slot-scope="scope" slot="menuLeft">
<el-button icon="el-icon-delete" type="danger" size="small" plain @click="deleteItem">删除</el-button> <el-button icon="el-icon-delete" type="danger" size="small" plain @click="deleteItem">删除</el-button>
<el-button icon="el-icon-download" type="warning" size="small" plain @click="exportData">导出</el-button> <el-button icon="el-icon-download" type="warning" size="small" plain @click="exportData">导出</el-button>
@ -118,12 +120,12 @@
</template> </template>
<div>{{ checkaccept.weight }}</div> <div>{{ checkaccept.weight }}</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <!-- <el-descriptions-item>
<template slot="label"> <template slot="label">
<div>地址</div> <div>地址</div>
</template> </template>
<div style="width: 158px">{{ checkaccept.position }}</div> <div style="width: 158px">{{ checkaccept.position }}</div>
</el-descriptions-item> </el-descriptions-item> -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label">睡眠姿势</template> <template slot="label">睡眠姿势</template>
<div> <div>
@ -338,7 +340,7 @@ export default {
}, },
{ {
label: "购买渠道", label: "购买渠道",
prop: "purchaseChannel", prop: "road",
search: true, search: true,
searchslot: true, searchslot: true,
hide: true, hide: true,
@ -389,13 +391,13 @@ export default {
prop: "weight", prop: "weight",
align: "center", align: "center",
}, },
{ // {
label: "地址", // label: "地址",
overHidden: true, // overHidden: true,
prop: "position", // prop: "position",
slot: true, // slot: true,
align: "center", // align: "center",
}, // },
{ {
label: "睡眠姿势", label: "睡眠姿势",
slot: true, slot: true,
@ -452,14 +454,11 @@ export default {
slot: true, slot: true,
align: "center", align: "center",
}, },
// { {
// label: "购买渠道", label: "购买渠道",
// prop: "purchaseChannel", prop: "purchaseChannel",
// type: "select", align: "center",
// search: true, },
// slot: true,
// align: "center",
// },
{ {
label: "备注", label: "备注",
prop: "remark", prop: "remark",
@ -516,10 +515,10 @@ export default {
detailList({ id: row.id }).then(res => { detailList({ id: row.id }).then(res => {
console.log(res) console.log(res)
this.checkaccept = res.data.data; this.checkaccept = res.data.data;
this.checkaccept.position = this.checkaccept.province + // this.checkaccept.position = this.checkaccept.province +
this.checkaccept.city + // this.checkaccept.city +
this.checkaccept.district + // this.checkaccept.district +
this.checkaccept.detail // this.checkaccept.detail
}) })
}, },
selectionChange(data) { selectionChange(data) {
@ -606,7 +605,7 @@ export default {
pillowHardness: this.form.hardness ? this.form.hardness : '', pillowHardness: this.form.hardness ? this.form.hardness : '',
pillowMaterial: this.form.material ? this.form.material : '', pillowMaterial: this.form.material ? this.form.material : '',
ageRange: this.form.age ? this.form.age : '', ageRange: this.form.age ? this.form.age : '',
purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '', purchaseChannel: this.form.road ? this.form.road : '',
orderNo: this.form.orderNumber ? this.form.orderNumber : '', orderNo: this.form.orderNumber ? this.form.orderNumber : '',
} }
} else { } else {
@ -618,7 +617,7 @@ export default {
ageRange: this.form.age ? this.form.age : '', ageRange: this.form.age ? this.form.age : '',
startTime: this.form.timeArr[0], startTime: this.form.timeArr[0],
endTime: this.form.timeArr[1], endTime: this.form.timeArr[1],
purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '', purchaseChannel: this.form.road ? this.form.road : '',
orderNo: this.form.orderNumber ? this.form.orderNumber : '', orderNo: this.form.orderNumber ? this.form.orderNumber : '',
} }
} }
@ -644,7 +643,7 @@ export default {
pillowHardness: this.form.hardness ? this.form.hardness : '', pillowHardness: this.form.hardness ? this.form.hardness : '',
pillowMaterial: this.form.material ? this.form.material : '', pillowMaterial: this.form.material ? this.form.material : '',
ageRange: this.form.age ? this.form.age : '', ageRange: this.form.age ? this.form.age : '',
purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '', purchaseChannel: this.form.road ? this.form.road : '',
orderNo: this.form.orderNumber ? this.form.orderNumber : '', orderNo: this.form.orderNumber ? this.form.orderNumber : '',
} }
} else { } else {
@ -656,7 +655,7 @@ export default {
ageRange: this.form.age ? this.form.age : '', ageRange: this.form.age ? this.form.age : '',
startTime: this.form.timeArr[0], startTime: this.form.timeArr[0],
endTime: this.form.timeArr[1], endTime: this.form.timeArr[1],
purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '', purchaseChannel: this.form.road ? this.form.road : '',
orderNo: this.form.orderNumber ? this.form.orderNumber : '', orderNo: this.form.orderNumber ? this.form.orderNumber : '',
} }
} }
@ -726,10 +725,10 @@ export default {
this.diaType = 'edit'; this.diaType = 'edit';
detailList({ id: row.id }).then(res => { detailList({ id: row.id }).then(res => {
this.checkaccept = res.data.data; this.checkaccept = res.data.data;
this.checkaccept.position = this.checkaccept.province + // this.checkaccept.position = this.checkaccept.province +
this.checkaccept.city + // this.checkaccept.city +
this.checkaccept.district + // this.checkaccept.district +
this.checkaccept.detail // this.checkaccept.detail
}) })
}, },

2
src/views/wel/index.vue
Unescape View File

@ -351,7 +351,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
// font-size: 80px; font-size: 80px;
.left_form{ .left_form{
width: 70%; width: 70%;

Write Preview
Loading…
Cancel
Save