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

12

Browse Source
This commit is contained in:
yanggongyan
2020-01-11 16:48:40 +08:00
parent 643426ea1c 4fb54f4d3e
commit abc24b9120
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/request.js
View File

@@ -26,8 +26,12 @@ 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({
<<<<<<< HEAD
baseURL: `http://192.168.0.100:8074/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.100:8074/submit/MESCommonBase.ashx`,
=======
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
>>>>>>> 4fb54f4d3ea13e7c327b17bde7ac4ffc21b9b821
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

3
src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
View File

@@ -30,7 +30,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作者" width="100"> <el-table-column align="center" label="操作者" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }} <!--{{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}-->
{{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="数量" show-overflow-tooltip min-width="90"> <el-table-column align="center" label="数量" show-overflow-tooltip min-width="90">