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
2018-11-26 15:59:25 +08:00
parent 4c54c82b4a
commit 0113ef27db
2 changed files with 67 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -143,24 +143,24 @@
{{ scope.row.零件类型名称 }}
</template>
</el-table-column>
<el-table-column label="是否外协" align="center" width="90">
<template slot-scope="scope">
<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>
外协
</template>
</el-table-column>
<el-table-column label="是否带料" align="center" width="90">
<template slot-scope="scope">
<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>
带料
</template>
</el-table-column>
<el-table-column label="是否着急" align="center" width="90">
<template slot-scope="scope">
<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>
着急
</template>
</el-table-column>
<!--<el-table-column label="是否外协" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>-->
<!--外协-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否带料" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>-->
<!--带料-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否着急" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>-->
<!--着急-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column prop="name" label="打回原因" width="170" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">-->
@@ -176,7 +176,7 @@
<el-button
size="mini"
type="primary"
@click="handleDele(scope.$index, scope.row, 'form1')">打回档案</el-button>
@click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>
</template>
</el-table-column>
</el-table>
@@ -190,16 +190,10 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>
<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
<el-button type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button>
</div>
<!--<el-row>-->
<!--<el-checkbox v-model="checked_baitu" style="margin-top:20px">是否白图</el-checkbox>-->
<!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
<!--<el-button type="primary" size="small" @click="production" style="float:right;margin-top:10px">投产</el-button>-->
<!--</el-row>-->
</div>
</el-card>
@@ -236,14 +230,14 @@
label="批次数量">
<template slot-scope="scope">{{ scope.row.批次数量 }}</template>
</el-table-column>
<el-table-column
label="是否外协">
<template slot-scope="scope">{{ scope.row.是否外协 }}</template>
</el-table-column>
<el-table-column
label="是否带料">
<template slot-scope="scope">{{ scope.row.是否带料 }}</template>
</el-table-column>
<!--<el-table-column-->
<!--label="是否外协">-->
<!--<template slot-scope="scope">{{ scope.row.是否外协 }}</template>-->
<!--</el-table-column>-->
<!--<el-table-column-->
<!--label="是否带料">-->
<!--<template slot-scope="scope">{{ scope.row.是否带料 }}</template>-->
<!--</el-table-column>-->
<el-table-column
label="机加工开始时间">
<template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>

76
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -73,12 +73,12 @@
type="selection"
align="center"
width="35"/>
<el-table-column label="零件图号" align="center" width="200">
<el-table-column label="零件图号" align="center" width="300">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="130">
<el-table-column label="零件名称" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -103,42 +103,42 @@
{{ scope.row.工序数量 }}
</template>
</el-table-column>
<el-table-column label="是否超负荷" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.是否超负荷 }}
</template>
</el-table-column>
<el-table-column label="外协" width="100" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>
</template>
</el-table-column>
<el-table-column label="加工件合格" align="center" width="230">
<template slot-scope="scope">
<el-date-picker
v-model="tableData[scope.$index].加工件合格时间"
size="mini"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择加工件合格时间"
@change="timeChange(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="板焊结束" width="150" align="center">
<template slot-scope="scope">
{{ scope.row.板焊 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope" align="center">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>
<!--<el-button size="mini" type="primary" @click="inBatches">分批</el-button>-->
</template>
</el-table-column>
<!--<el-table-column label="是否超负荷" align="center" width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.是否超负荷 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="外协" width="100" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="加工件合格" align="center" width="230">-->
<!--<template slot-scope="scope">-->
<!--<el-date-picker-->
<!--v-model="tableData[scope.$index].加工件合格时间"-->
<!--size="mini"-->
<!--type="date"-->
<!--value-format="yyyy-MM-dd"-->
<!--placeholder="选择加工件合格时间"-->
<!--@change="timeChange(scope.row)"/>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="板焊结束" width="150" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.板焊 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" width="200px" align="center" fixed="right">-->
<!--<template slot-scope="scope" align="center">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--class="el-icon-edit"-->
<!--@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>-->
<!--&lt;!&ndash;<el-button size="mini" type="primary" @click="inBatches">分批</el-button>&ndash;&gt;-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
<el-pagination