This commit is contained in:
xingquansheng
2019-09-21 17:08:22 +08:00
parent 52e223101a
commit 50c66e917e
36 changed files with 401 additions and 386 deletions

View File

@@ -43,28 +43,28 @@
</el-card>
<el-card>
<el-table v-loading="loading1" :data="tableData1" highlight-current-row height="350" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row stripe height="450px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column
label=" "
label="序号"
type="index"
align="center"
width="50"/>
<el-table-column label="零件图号" align="center" width="380px">
<el-table-column label="零件图号" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="320px">
<el-table-column label="零件名称" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" width="280px">
<el-table-column label="材料" align="center">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="种类" align="center" width="280px">
<el-table-column label="种类" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件类型名称 }}
</template>
@@ -87,15 +87,14 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
<el-table v-loading="loading2" :data="tableData2" height="450" style="width: 100%;" border stripe element-loading-text="拼命加载中" size="small">
<el-table-column
label=" "
label="序号"
type="index"
align="center"
width="50"/>
<el-table-column label="加工状态" width="100" align="center">
<el-table-column label="加工状态" width="75" align="center">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)===4&&parseInt(scope.row.工艺编号)!==29" size="small">已完成</el-tag>
@@ -103,18 +102,18 @@
<el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
</template>
</el-table-column>
<el-table-column label="序间外协" width="100" align="center">
<el-table-column label="序间外协" width="75" align="center">
<template slot-scope="scope">
<el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
</template>
</el-table-column>
<el-table-column label="是否外协" width="100" align="center">
<el-table-column label="是否外协" width="750" align="center">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small"></el-tag>
<el-tag v-else size="small"></el-tag>
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" width="220px">
<el-table-column label="工艺名称" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -124,22 +123,22 @@
<el-input v-model="scope.row.工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
</template>
</el-table-column>
<el-table-column label="机加工计划开始日期" align="center" width="150px">
<el-table-column label="机加工计划开始" align="center" width="105px">
<template slot-scope="scope">
{{ scope.row.机加工开始时间 }}
</template>
</el-table-column>
<el-table-column label="机加工计划结束日期" align="center" width="150px">
<el-table-column label="机加工计划结束" align="center" width="105px">
<template slot-scope="scope">
{{ scope.row.机加工结束时间 }}
</template>
</el-table-column>
<el-table-column label="工序计划" align="center" width="150px">
<el-table-column label="工序计划" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.计划日期 }}
</template>
</el-table-column>
<el-table-column label="工序工时" align="center">
<el-table-column label="工序工时" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.工序工时 }}
</template>
@@ -376,11 +375,8 @@ export default {
</script>
<style scoped>
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin-bottom: 15px;
margin:0px;
}
</style>
<style>