meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工时查询

Browse Source
This commit is contained in:
zhangdingyu
2020-01-07 10:08:30 +08:00
parent d41ff3f025
commit 434e66453d
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

28
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -32,17 +32,12 @@
{{ scope.row.定额总工时 }} {{ scope.row.定额总工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备工时" align="center" width="70px"> <el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.设备总工时 }} {{ scope.row.设备总工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扫码工时" align="center" width="70px"> <el-table-column label="录入准结工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.扫码总工时 }}
</template>
</el-table-column>
<el-table-column label="修补准结工时" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补准结总工时 }} {{ scope.row.修补准结总工时 }}
</template> </template>
@@ -52,6 +47,11 @@
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扫码工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.扫码总工时 }}
</template>
</el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <el-pagination
@@ -91,17 +91,12 @@
{{ scope.row.工时总额 }} {{ scope.row.工时总额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备工时" align="center" width="70px"> <el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.设备工时 }} {{ scope.row.设备工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扫码工时" align="center" width="70px"> <el-table-column label="录入准结工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
<el-table-column label="修补准结工时" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补准结工时 }} {{ scope.row.修补准结工时 }}
</template> </template>
@@ -111,6 +106,11 @@
{{ scope.row.操作时间 }} {{ scope.row.操作时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扫码工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <el-pagination