This commit is contained in:
Vergil
2020-02-08 09:33:46 +08:00
9 changed files with 125 additions and 68 deletions

View File

@@ -12,21 +12,21 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px;width: 100px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="TestValue" filterable placeholder="组" style="margin:0px 10px" size="small" clearable>
<el-select v-model="TestValue" filterable placeholder="组件名称" style="margin:0px 10px;width: 150px;" size="small" clearable>
<el-option
v-for="item in Test"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px" size="small" clearable>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px;width: 100px;" size="small" clearable>
<el-option
v-for="item in qualityInspection"
:key="item.value"
@@ -63,7 +63,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="部件名称" prop="组件名称" align="center" width="100px">
<el-table-column label="部件名称" prop="组件名称" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
</template>
@@ -78,6 +78,16 @@
{{ scope.row.检测项明细 }}
</template>
</el-table-column>
<el-table-column label="质检时间" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.质检时间 }}
</template>
</el-table-column>
<el-table-column label="质检员" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center">
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -109,7 +119,7 @@ export default {
groupNumber: [],
TestValue: '',
Test: [],
qualityInspectionValue: '',
qualityInspectionValue: 2,
qualityInspection: [
{
value: 1,

View File

@@ -19,7 +19,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px;margin-left: 10px" size="small" clearable/>
<el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
<el-select v-model="QualityTypeValue" filterable placeholder="质检类型" style="margin-left: 10px;width:150px" size="small" clearable>
<el-option
v-for="item in QualityTypeNumber"
@@ -27,8 +27,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-top: 10px">
<!--<span class="demonstration">时间区间:</span>-->
<el-date-picker
v-model="startTime"
@@ -46,7 +44,7 @@
type="date"
placeholder="选择结束日期"/>
<!--<span>质检情况:</span>-->
<el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 100px;margin-left: 50px" clearable>
<el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
<el-option
v-for="item in qualityInspection"
:key="item.value"
@@ -75,7 +73,7 @@
<el-tag v-if="parseInt(scope.row.是否禁用)===1" type="error" size="small">已禁用</el-tag>
</template>
</el-table-column>
<el-table-column label="机床图号" align="center">
<el-table-column label="机床图号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -90,7 +88,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件号" align="center" min-width="120px">
<el-table-column label="零件号" align="center" min-width="130px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -100,12 +98,12 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center">
<el-table-column label="加工数" align="center">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="规格或材料" align="center" width="100px">
<el-table-column label="规格或材料" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格或材料 }}
</template>
@@ -115,22 +113,22 @@
{{ 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">
<el-table-column label="检数量" align="center">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="不合格数" align="center" width="90px">
<el-table-column label="不合格数" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
@@ -155,7 +153,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="形位" fixed="right" align="center" width="100">
<el-table-column label="形位" fixed="right" align="center" width="70">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -176,11 +174,11 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
<el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
</el-popover>
</template>
</el-table-column>
<el-table-column label="尺寸" fixed="right" align="center" width="100">
<el-table-column label="尺寸" fixed="right" align="center" width="70">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -201,11 +199,11 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
<el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
</el-popover>
</template>
</el-table-column>
<el-table-column label="外观" fixed="right" align="center" width="100">
<el-table-column label="外观" fixed="right" align="center" width="70">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -226,15 +224,15 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
<el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
</el-popover>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="120">
<el-table-column label="操作" fixed="right" align="center" min-width="90">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
type="text"
plain
icon="el-icon-search"
@click="viewPicture(scope.row)">查看图片</el-button>
@@ -256,7 +254,7 @@
<el-card>
<span style="margin-left: 45%;font-size: 20px;">正在加工零件列表</span>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" prop="机床图号" align="center">
<el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -471,7 +469,7 @@ export default {
gridData: [],
QualityTypeNumber: [],
QualityTypeValue: '',
qualityInspectionValue: '',
qualityInspectionValue: 1,
qualityInspection: [
{
value: 1,

View File

@@ -28,7 +28,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total1=0;pageSize1 = 10000;pageCurrent1 = 1;searchData1()">查询</el-button>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 15px" @click="total1=0;pageSize1 = 10000;pageCurrent1 = 1;searchData1()">查询</el-button>
</el-row>
</el-card>
<el-card style="margin-top: 15px">

View File

@@ -6,7 +6,7 @@
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
</el-row>
</div>

View File

@@ -25,7 +25,7 @@
:value="item.value"/>
</el-select>
<el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px; margin: 0px 10px" clearable/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="currentPage1=1; fetchTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="currentPage1=1; fetchTableData()">查询</el-button>
</el-row>
</el-card>
<el-row>
@@ -131,7 +131,6 @@
element-loading-background="rgba(226,223,223,1)"
height="600"
border
stripe
style="width: 510px">
<el-table-column
width="50px"
@@ -213,7 +212,7 @@
<el-input v-model="inputC" auto-complete="off" style="width: 100px" size="small" />
<span>开始工序</span>
<el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
<el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
<el-button type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
</div>
</el-card>
<el-card v-show="false">

View File

@@ -3,9 +3,11 @@
<el-card>
<span>设备名称:</span>
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
<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="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: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>
<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
@@ -15,10 +17,12 @@
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;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>
<!--<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>-->
<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">
<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>
<!--<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>-->
<el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
</el-tooltip>
</el-card>
@@ -74,10 +78,10 @@
{{ scope.row.设备预留工时系数 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200px" fixed="right" >
<el-table-column label="操作" align="center" width="100px" fixed="right" >
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" plain @click="handleDelete(scope.row)">删除</el-button>
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -336,6 +340,13 @@ export default {
}
})
},
ADD() {
this.addForm('form')
this.dialogFormVisible1 = true
this.form.contractSigningDate = getNowTime()// new Date()
this.temp = 1
this.title = '新增项目'
},
submitEdit() {
editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
if (response.data[0].result === '1') {
@@ -423,3 +434,20 @@ export default {
/* color: #ff9759;*/
/*}*/
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

View File

@@ -177,10 +177,10 @@
<el-table-column label="操作" align="center" width="170">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button

View File

@@ -39,9 +39,11 @@
<!-- size="small"-->
<!-- type="date"-->
<!-- placeholder="请选择结束日期"/>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<!--<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>-->
</el-tooltip>
</div>
</el-card>
@@ -83,14 +85,19 @@
</el-table-column>
<el-table-column label="操作" align="center" width="160">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
<el-button
size="mini"
type="warning"
plain
icon="el-icon-plus"
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
</el-tooltip>
<!--<el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="warning"-->
<!--plain-->
<!--icon="el-icon-plus"-->
<!--@click.stop="addMachine(scope.row);flag = 1">机床</el-button>-->
<!--</el-tooltip>-->
<el-button
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
<el-button
size="mini"
type="text"
@@ -118,7 +125,8 @@
</el-col>
<el-col style="width: 43%">
<el-card>
<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">
<!--<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">-->
<el-table :data="tableData2" border stripe style="width: 100%; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -472,6 +480,21 @@ export default {
/*}*/
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
.subTableHeader {
th {
background: #8ff4ea !important;

View File

@@ -1,10 +1,9 @@
<template>
<div class="app-container">
<el-card>
<el-input v-model="orderNumber" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协到货单" size="small"/>
<el-input v-model="orderNumber" clearable style="width: 210px;margin:0px 10px" placeholder="输入外协到货单或外协厂家" size="small"/>
<!-- <span style="margin-left: 10px">外协厂家:</span>-->
<el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>
<!-- <el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>-->
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
<el-table-column label="序号" align="center" width="55" type="index"/>
@@ -20,7 +19,7 @@
</el-table-column>
<el-table-column label="创建日期" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.操作日期 }}
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
</el-table>
@@ -47,7 +46,7 @@
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件数" align="center" width="70px">
<el-table-column label="零件数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
@@ -57,12 +56,12 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="检验数" align="center" width="70px">
<el-table-column label="检验数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.数量 || 0 }}
</template>
</el-table-column>
<el-table-column label="不合格数" align="center" min-width="140px">
<el-table-column label="不合格数" align="center" min-width="140px">
<template slot-scope="scope">
{{ scope.row.不合格数量 || 0 }}
</template>
@@ -79,7 +78,7 @@
</el-table-column>
<el-table-column label="检验时间" align="center" min-width="135px">
<template slot-scope="scope">
{{ scope.row.操作时间 || '—' }}
{{ scope.row.操作时间.split(' ')[0] || '—' }}
</template>
</el-table-column>
<el-table-column label="形位" align="center" width="90px">
@@ -103,7 +102,7 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
<el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
</el-popover>
</template>
</el-table-column>
@@ -128,7 +127,7 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
<el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
</el-popover>
</template>
</el-table-column>
@@ -153,7 +152,7 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
<el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
</el-popover>
</template>
</el-table-column>