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

1002

Browse Source
This commit is contained in:
zhangdingyu
2019-09-27 09:01:50 +08:00
parent b577075990
commit 1f0dfe3f6d
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -23,7 +23,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.0.102:8005/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.103:8005/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

12
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -437,34 +437,34 @@
height="300" height="300"
highlight-current-row highlight-current-row
border> border>
<el-table-column align="center" label="工序顺序" width="100"> <el-table-column align="center" label="工序顺序" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工序顺序 }} {{ scope.row.工序顺序 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺名称" width="150"> <el-table-column align="center" label="工艺名称" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺要求"> <el-table-column align="center" label="工艺要求" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺要求 }} {{ scope.row.工艺要求 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="计划日期"> <el-table-column align="center" label="计划日期" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.计划日期 }} {{ scope.row.计划日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺是否完成" width="130"> <el-table-column align="center" label="工艺是否完成" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺是否质检" width="130"> <el-table-column align="center" label="工艺是否质检" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag> <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
<el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag> <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>

23
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -45,7 +45,7 @@
<!--:label="item.label"--> <!--:label="item.label"-->
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
@@ -59,32 +59,32 @@
highlight-current-row highlight-current-row
border> border>
<el-table-column align="center" label="序号" type="index" width="55px"/> <el-table-column align="center" label="序号" type="index" width="55px"/>
<el-table-column align="center" label="机床图号" width="150px"> <el-table-column align="center" label="机床图号" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" width="120px"> <el-table-column align="center" label="组号" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件图号" width="160px"> <el-table-column align="center" label="零件图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件名称" width="120px"> <el-table-column align="center" label="零件名称" width="80px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="数量" width="60px"> <el-table-column align="center" label="数量" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="投产时间" width="130px"> <el-table-column align="center" label="投产时间" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.传递时间 }} {{ scope.row.传递时间 }}
</template> </template>
@@ -273,11 +273,11 @@ export default {
partTypeValue: null, // 零件类型 partTypeValue: null, // 零件类型
num: null, num: null,
pageCurrent: 1, pageCurrent: 1,
pageSize: 10, pageSize: 20,
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 10, pageSize1: 20,
pageCurrent2: 1, pageCurrent2: 1,
pageSize2: 10, pageSize2: 20,
tableData7: [], tableData7: [],
tableData6: [], tableData6: [],
tableData: [], tableData: [],
@@ -495,4 +495,7 @@ export default {
.el-card{ .el-card{
margin: 0px; margin: 0px;
} }
.el-steps--simple {
padding: 0;
}
</style> </style>

10
src/views/PurchasingCenter/ArrivalStateSearch/index.vue
View File

@@ -27,8 +27,8 @@
:data="tableData1" :data="tableData1"
border border
highlight-current-row highlight-current-row
style="width: 100%;max-height: 250px;" style="width: 100%"
height="250px" height="400px"
size="mini" size="mini"
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column label="采购合同编号" align="center" min-width="100"> <el-table-column label="采购合同编号" align="center" min-width="100">
@@ -83,7 +83,7 @@
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号" align="center" min-width="100"> <el-table-column label="图号" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }} {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template> </template>
@@ -98,12 +98,12 @@
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }} {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购总数量" align="center" min-width="100"> <el-table-column label="采购总数量" align="center" width="100">
<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" min-width="100"> <el-table-column label="已到货数量" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.已到货数量 }} {{ scope.row.已到货数量 }}
</template> </template>

6
src/views/PurchasingCenter/FundApproval2/index.vue
View File

@@ -39,10 +39,10 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button> <el-button slot="reference" plain size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
</el-popover> </el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button> <el-button type="warning" plain size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button> <el-button type="danger" plain size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

14
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -75,11 +75,11 @@
:data="tableData1" :data="tableData1"
size="mini" size="mini"
border border
style="width: 100%;max-height: 350px;" style="width: 100%"
height="350px" height="500px"
highlight-current-row highlight-current-row
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column type="expand"> <el-table-column label="详情" type="expand">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand"> <el-form label-position="left" inline class="demo-table-expand">
<el-row> <el-row>
@@ -110,7 +110,7 @@
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" min-width="220"> <el-table-column label="供应商" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -139,12 +139,12 @@
<el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag> <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未通过审核原因" align="center" min-width="150"> <el-table-column label="未通过审核原因" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }} {{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未通过审批原因" align="center" min-width="150"> <el-table-column label="未通过审批原因" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }} {{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }}
</template> </template>
@@ -171,7 +171,7 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总金额" align="center" min-width="60"> <el-table-column label="总金额" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同总额 }} {{ scope.row.合同总额 }}
</template> </template>