对接后台,部分已完成

This commit is contained in:
2021-12-08 14:54:13 +08:00
parent ab898dda04
commit ee44a9f77f
32 changed files with 1556 additions and 877 deletions

View File

@@ -2,91 +2,110 @@
<div class="mod-config">
<el-form :inline="true">
<el-form-item>
<el-button type="success" @click="$router.push({ name: 'report-order-history' })">返回订单历史列表</el-button>
<el-button
type="success"
@click="$router.push({ name: 'report-order-history' })"
>返回订单历史列表</el-button
>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
style="width: 100%;"
>
<el-table-column
type="index"
header-align="center"
align="center"
label="序号"
width="50">
width="50"
>
</el-table-column>
<el-table-column
prop="taskCode"
header-align="center"
align="center"
label="任务编码"
>
</el-table-column
><el-table-column
prop="abeginTime"
header-align="center"
align="center"
label="发起时间"
>
</el-table-column>
<el-table-column
prop="aendTime"
header-align="center"
align="center"
label="完成时间"
>
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="任务编码">
</el-table-column><el-table-column
prop="start"
header-align="center"
align="center"
label="发起时间">
label="任务来源"
>
</el-table-column>
<el-table-column
prop="end"
prop="taskType"
header-align="center"
align="center"
label="完成时间">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="任务来源">
</el-table-column>
<el-table-column
prop="paramValue"
header-align="center"
align="center"
label="任务类型">
label="任务类型"
>
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="当前工序">
label="当前工序"
>
</el-table-column>
<el-table-column
prop="unit"
header-align="center"
align="center"
label="单位">
label="单位"
>
</el-table-column>
<el-table-column
prop="num"
prop="quantity"
header-align="center"
align="center"
label="数量">
label="数量"
>
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
align="center"
label="重量">
label="重量"
>
</el-table-column>
<el-table-column
prop="start"
prop="startPosition"
header-align="center"
align="center"
label="开始位置">
label="开始位置"
>
</el-table-column>
<el-table-column
prop="end"
prop="targetPosition"
header-align="center"
align="center"
label="目标位置">
label="目标位置"
>
</el-table-column>
<el-table-column
prop="name"
prop="vehicleName"
header-align="center"
align="center"
label="车辆名称">
label="车辆名称"
>
</el-table-column>
</el-table>
<el-pagination
@@ -96,61 +115,67 @@
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
layout="total, sizes, prev, pager, next, jumper"
>
</el-pagination>
</div>
</template>
<script>
export default {
data () {
return {
dataList: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false
}
export default {
data () {
return {
dataList: [],
idenCardNum: '',
orderNo: '',
pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false
}
},
activated () {
this.getDataList()
},
created () {
this.orderNo = this.$route.query.orderNo
this.idenCardNum = this.$route.query.idenCardNum
},
methods: {
// 获取数据列表
getDataList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/orderInfoHis/getTaskInfo'),
method: 'post',
data: this.$http.adornData({
current: this.pageIndex,
size: this.pageSize,
idenCardNum: this.idenCardNum,
orderNo: this.orderNo
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataList = data.data.records
this.totalPage = data.data.total
} else {
this.dataList = []
this.totalPage = 0
}
this.dataListLoading = false
})
},
activated () {
// 每页数
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
created () {
console.log(this.$route.query.id)
},
methods: {
// 获取数据列表
getDataList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/config/list'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize
})
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
this.totalPage = data.page.totalCount
} else {
this.dataList = []
this.totalPage = 0
}
this.dataListLoading = false
})
},
// 每页数
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
// 当前页
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
}
// 当前页
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
}
}
}
</script>