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

备料完成

Browse Source
This commit is contained in:
Vergil
2020-05-18 14:05:18 +08:00
parent 70ef97bae9
commit 7fb1360f32
3 changed files with 18 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/ManufacturingCenter/MaterialArrival/index.vue
View File

@@ -140,7 +140,7 @@ export default {
pageCurrent: 1,
pageSize: 50,
total: 0,
Name: 0,
Name: 1,
Partpaint: '',
tableData1: [], // 工序表
radio: '',
@@ -345,7 +345,11 @@ export default {
},
getRow(row) {
this.processSerialNumber = row.工序流水号
row.完成日期 ? this.Name = 1 : this.Name = 0
if (row.工艺名称 === '备料' && !row.完成日期) {
this.Name = 0
} else {
this.Name = 1
}
},
handleSizeChange(val) {
this.pageSize = val

95
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -2,114 +2,42 @@
<div class="app-container">
<el-card style="padding: 3px">
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 0px"/>
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">设备</el-button>
<!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
</el-tooltip>
<!-- <span style="margin-left: 40px">有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- &lt;!&ndash;<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>&ndash;&gt;-->
<!-- <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- &lt;!&ndash;<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>&ndash;&gt;-->
<!-- <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
</el-card>
<el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="700px" style="width: 570px">
<el-table-column label="设备名称" prop="设备名称" align="center" width="120px" >
<el-table :data="List" border size="small" stripe highlight-current-row height="840px" style="width: 750px">
<el-table-column label="设备名称" prop="设备名称" align="center" width="150px" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="设备编号" prop="设备编号" align="center" width="120px" >
<el-table-column label="设备编号" prop="设备编号" align="center">
<template slot-scope="scope">
{{ scope.row.设备编号 }}
</template>
</el-table-column>
<el-table-column label="设备型号" rop="设备型号" align="center" width="120px" >
<el-table-column label="设备型号" rop="设备型号" align="center" width="150px" >
<template slot-scope="scope">
{{ scope.row.设备型号 }}
</template>
</el-table-column>
<!-- <el-table-column label="设备性能指标" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备性能指标 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备加工能力" align="center" >-->
<!-- <template slot-scope="scope">p-->
<!-- {{ scope.row.设备加工能力工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="设备加工工艺" align="center" width="120px">
<el-table-column label="设备加工工艺" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.工艺属性 }}
</template>
</el-table-column>
<!-- <el-table-column label="班次类型" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.班次类型 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="整改工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.整改工时比例 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="预留工时系数" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备预留工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70px">
<el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:5px" @click="handleEdit(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" style="margin-left:5px" @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
<!-- <el-card>-->
<!-- <span>有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
<!-- </el-card>-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px" class="demo-ruleForm">
@@ -259,7 +187,6 @@ export default {
}
getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
this.List = response.data
// this.total = response.data.total
})
},
initialization() {
@@ -430,16 +357,6 @@ export default {
.el-card{
margin-bottom: 1px;
}
/*.el-button--success {*/
/* background: #ecf5ff;*/
/* border-color: #2d72d5;*/
/* color: #2d72d5;*/
/*}*/
/*.el-button--primary {*/
/* background: #fdf6ec;*/
/* border-color: #ff9759;*/
/* color: #ff9759;*/
/*}*/
</style>
<style lang="scss">
.button111{

12
src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-card style="width: 645px">
<el-card style="width: 750px">
<el-row style="width: 645px">
<el-input v-model="partNumber" placeholder="零件图号" style="width: 180px" size="small" clearable/>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
@@ -18,15 +18,15 @@
</el-upload>
</el-row>
</el-card>
<el-card style="width: 645px">
<el-table v-loading="loading" :data="tableData" border size="mini" style="width: 635px;height: 700px" height="520">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="零件图号" align="center" width="180px">
<el-card style="width: 750px">
<el-table v-loading="loading" :data="tableData" border size="mini" style="width: 100%" height="550">
<el-table-column label="序号" align="center" type="index" width="70"/>
<el-table-column label="零件图号" align="center" min-width="180px">
<template slot-scope="scope">
{{ scope.row.name }}
</template>
</el-table-column>
<el-table-column label="文件格式" align="center" width="80px">
<el-table-column label="文件格式" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.suffix }}
</template>