|
|
|
|
@ -1,11 +1,22 @@
|
|
|
|
|
<template> |
|
|
|
|
<basic-container> |
|
|
|
|
<div class="avue-crud"> |
|
|
|
|
<el-row v-if="!search" class="el_row_top"> |
|
|
|
|
<el-row v-if="!search" class="el_row_top"> |
|
|
|
|
<!-- 查询模块 --> |
|
|
|
|
<el-form :inline="true" :model="query" class="fr-fm el_from_top" > |
|
|
|
|
<el-form :inline="true" :model="query" class="fr-fm el_from_top" > |
|
|
|
|
<div class="fr-fo"> |
|
|
|
|
|
|
|
|
|
<el-form-item label="类型:"> |
|
|
|
|
<el-select v-model="searchType" placeholder="请选择搜索类型"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in searchTypeDate" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value"> |
|
|
|
|
</el-option> |
|
|
|
|
|
|
|
|
|
<el-form-item label="类型:"> |
|
|
|
|
<el-select v-model="searchType" placeholder="请选择搜索类型"> |
|
|
|
|
<el-option |
|
|
|
|
@ -16,6 +27,8 @@
|
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="包条码:"> |
|
|
|
|
<el-input v-model="query.searchCode" placeholder="请输入包条码"></el-input> |
|
|
|
|
<el-form-item label="包条码:"> |
|
|
|
|
<el-input v-model="query.searchCode" placeholder="请输入包条码"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
@ -38,6 +51,15 @@
|
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain--> |
|
|
|
|
<!-- >导出图片--> |
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div class="avue-crud__left">--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain--> |
|
|
|
|
<!-- >导出--> |
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
<!-- <!– v-loading.fullscreen.lock="fullscreenLoading"–>--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain--> |
|
|
|
|
<!-- >导出图片--> |
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
@ -65,6 +87,24 @@
|
|
|
|
|
</el-timeline-item> |
|
|
|
|
</el-timeline> |
|
|
|
|
</div> |
|
|
|
|
<div class="block"> |
|
|
|
|
<el-timeline> |
|
|
|
|
<el-timeline-item |
|
|
|
|
v-for="(activity, index) in activities" |
|
|
|
|
:key="index" |
|
|
|
|
:icon="activity.icon" |
|
|
|
|
:type="activity.type" |
|
|
|
|
:color="activity.color" |
|
|
|
|
:size="activity.size" |
|
|
|
|
:timestamp="activity.timestamp"> |
|
|
|
|
{{activity.content}} |
|
|
|
|
<el-card> |
|
|
|
|
<p>操作人:{{activity.nodeUserName}}</p> |
|
|
|
|
<p>描述:{{activity.nodeInfo}}</p> |
|
|
|
|
</el-card> |
|
|
|
|
</el-timeline-item> |
|
|
|
|
</el-timeline> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</basic-container> |
|
|
|
|
</template> |
|
|
|
|
@ -77,6 +117,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
@ -84,6 +125,18 @@
|
|
|
|
|
reverse: true, |
|
|
|
|
query:{}, |
|
|
|
|
searchType:'', |
|
|
|
|
searchTypeDate:[ |
|
|
|
|
{ |
|
|
|
|
value: '1', |
|
|
|
|
label: '配送单号' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: '2', |
|
|
|
|
label: '预约单号' |
|
|
|
|
search:false, |
|
|
|
|
reverse: true, |
|
|
|
|
query:{}, |
|
|
|
|
searchType:'', |
|
|
|
|
searchTypeDate:[ |
|
|
|
|
{ |
|
|
|
|
value: '1', |
|
|
|
|
@ -96,6 +149,8 @@
|
|
|
|
|
{ |
|
|
|
|
value: '3', |
|
|
|
|
label: '自提单号' |
|
|
|
|
value: '3', |
|
|
|
|
label: '自提单号' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: '4', |
|
|
|
|
@ -106,12 +161,23 @@
|
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() {}, |
|
|
|
|
computed: {}, |
|
|
|
|
value: '4', |
|
|
|
|
label: '备货单号' |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
activities: [] |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() {}, |
|
|
|
|
computed: {}, |
|
|
|
|
methods: { |
|
|
|
|
searchHide() { |
|
|
|
|
this.search = !this.search; |
|
|
|
|
}, |
|
|
|
|
searchChange() { |
|
|
|
|
if (this.searchType == '' || this.searchType === undefined){ |
|
|
|
|
this.$message.warning("请选择搜索类型"); |
|
|
|
|
if (this.searchType == '' || this.searchType === undefined){ |
|
|
|
|
this.$message.warning("请选择搜索类型"); |
|
|
|
|
return; |
|
|
|
|
@ -133,6 +199,26 @@
|
|
|
|
|
console.log("res=>",res); |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
searchReset() { |
|
|
|
|
this.query = {}; |
|
|
|
|
this.searchType = ''; |
|
|
|
|
searchNode(this.searchType,this.query.searchCode).then(res=>{ |
|
|
|
|
const data = res.data.data; |
|
|
|
|
let bbb = data.map(item=>{ |
|
|
|
|
return { |
|
|
|
|
content : item.nodeName, |
|
|
|
|
content : item.nodeName, |
|
|
|
|
color: '#0bbd87', |
|
|
|
|
timestamp : item.time, |
|
|
|
|
nodeUserName : item.nodeUserName, |
|
|
|
|
nodeInfo : item.nodeInfo, |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
console.log("bbb-------->",bbb); |
|
|
|
|
this.activities = bbb; |
|
|
|
|
console.log("res=>",res); |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
searchReset() { |
|
|
|
|
this.query = {}; |
|
|
|
|
this.searchType = ''; |
|
|
|
|
|
