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

更新

Browse Source
This commit is contained in:
liushuai
2020-03-25 17:59:26 +08:00
parent ff3a340570 ca2bedc570
commit 6480d06063
22 changed files with 228 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/ManufacturingCenter/AntonMonitoring/index.vue
View File

@@ -4,21 +4,10 @@
<el-badge :value="value" class="item" style="margin-bottom: 10px; float: right">
<el-button size="small" @click="openWindow">Andon信息</el-button>
</el-badge>
<el-table
:data="tableData"
style="width: 100%;"
size="mini"
height="800"
highlight-current-row
border
stripe>
<el-table :data="tableData" style="width: 100%;" size="mini" height="800" highlight-current-row border stripe>
<el-table-column align="center" label="照片" width="50">
<template slot-scope="scope">
<el-popover
v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
placement="top-start"
width="200"
trigger="hover">
<el-popover v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'" placement="top-start" width="200" trigger="hover">
<el-button type="text" style="float:right" @click="deletePhoto(scope.row)">删除</el-button>
<el-image :src="scope.row.文件标识 && scope.row.文件标识 !== 'null' ? (readFile + scope.row.文件标识 + '.' + scope.row.文件后缀) : readFile + '123.jpg'">
<div slot="error" class="image-slot">
@@ -63,16 +52,8 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog
:visible.sync="dialogVisible"
width="60%">
<el-table
:data="tableDataMassage"
style="width: 100%;"
size="mini"
height="500"
highlight-current-row
border>
<el-dialog :visible.sync="dialogVisible" width="60%">
<el-table :data="tableDataMassage" style="width: 100%;" size="mini" height="500" highlight-current-row border>
<el-table-column align="center" label="工位号">
<template slot-scope="scope">
<el-button type="text">{{ scope.row.工位号 }}</el-button>

10
src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
View File

@@ -35,12 +35,12 @@
{{ scope.row.工序名 }}
</template>
</el-table-column>
<el-table-column label="投产数" align="center" width="80">
<el-table-column label="投产数" align="center" prop="计划数量" width="80">
<template slot-scope="scope">
{{ scope.row.计划数量 }}
</template>
</el-table-column>
<el-table-column label="计划准结(分)" align="center" width="110">
<el-table-column label="计划准结(分)" align="center" prop="计划准备工时" width="110">
<template slot-scope="scope">
{{ scope.row.计划准备工时 }}
</template>
@@ -60,12 +60,12 @@
{{ scope.row.计划加工日期 }}
</template>
</el-table-column>
<el-table-column label="加工件数" align="center" width="80">
<el-table-column label="加工件数" align="center" prop="加工数量" width="80">
<template slot-scope="scope">
{{ scope.row.加工数量 }}
</template>
</el-table-column>
<el-table-column label="准结(分)" align="center" width="110">
<el-table-column label="准结(分)" align="center" prop="修补工时" width="110">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
@@ -75,7 +75,7 @@
{{ scope.row.修补单件工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" prop="加工工时" width="110">
<el-table-column label="加工工时(分)" align="center" prop="完成工时" width="110">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>

38
src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
View File

@@ -19,23 +19,11 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable()">查询</el-button>
</el-row>
</div>
<div>
<el-table
v-loading="loading"
:data="tableData"
border
style="width: 100%;max-height: 460px;"
height="460"
size="mini"
@selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="tableData" border style="width: 100%;max-height: 460px;" height="460" size="mini" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="库存状态" width="100" align="center">
<template slot-scope="scope">
@@ -115,27 +103,13 @@
<div slot="header">
<span>采购明细表名称:</span>
<el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button
type="primary"
size="small"
style="margin-left: 10px"
@click="addpurchasingDetailsForm">创建采购明细表</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" @click="addpurchasingDetailsForm">创建采购明细表</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的采购明细表" placement="top">
<el-button
:disabled="Number(whetherToAllocate) === 1"
type="warning"
size="small"
style="margin-left: 10px"
@click="addMateriel">选入物料</el-button>
<el-button :disabled="Number(whetherToAllocate) === 1" type="warning" size="small" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
</el-tooltip>
</div>
<!-- -->
<el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
<el-table-column label="分配状态" align="center" min-width="170">
<template slot-scope="scope">

3
src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
View File

@@ -161,7 +161,8 @@
</div>
</template>
<script>import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
<script>
import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
export default {
data() {

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

@@ -11,7 +11,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">
<el-option
v-for="item in Groups"
:key="item.value"
@@ -21,7 +21,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
</el-card>
<el-card>
<el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
@@ -77,10 +77,10 @@
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize"
:total="total"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
@@ -139,11 +139,11 @@
<div class="block">
<el-pagination
:current-page="pageCurrent00"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize00"
:total="total00"
style="margin-top:10px;display:inline-block;width:50%"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
@@ -199,11 +199,11 @@
<div class="block">
<el-pagination
:current-page="pageCurrent01"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize01"
:total="total01"
style="margin-top:10px;display:inline-block;width:50%"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange01"
@current-change="handleCurrentChange01"/>
</div>
@@ -264,11 +264,11 @@
<div class="block">
<el-pagination
:current-page="pageCurrent02"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize02"
:total="total02"
style="margin-top:10px;display:inline-block;width:50%"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange02"
@current-change="handleCurrentChange02"/>
</div>
@@ -317,10 +317,10 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent5"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize5"
:total="total5"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
@@ -398,13 +398,13 @@ export default {
PartType: '标准件',
PartType2: '车间生产',
pageCurrent00: 1,
pageSize00: 1000,
pageSize00: 50,
pageCurrent01: 1,
pageSize01: 10,
pageCurrent02: 1,
pageSize02: 1000,
pageSize02: 50,
pageCurrent: 1,
pageSize: 1000,
pageSize: 50,
pageCurrent1: 1,
pageSize1: 10,
pageCurrent2: 1,
@@ -496,19 +496,19 @@ export default {
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== '') {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
if (response.data.result[i].计划完成时间) {
response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
}
if (response.data.rows[i].机加工实际完成时间 !== '') {
response.data.rows[i].机加工实际完成时间 = response.data.rows[i].机加工实际完成时间.split(' ', 2)[0]
if (response.data.result[i].机加工实际完成时间) {
response.data.result[i].机加工实际完成时间 = response.data.result[i].机加工实际完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
@@ -603,16 +603,16 @@ export default {
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== '') {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
if (response.data.result[i].计划完成时间) {
response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
},
@@ -622,16 +622,16 @@ export default {
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== '') {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
if (response.data.result[i].计划完成时间) {
response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
},

2
src/views/ManufacturingCenter/ManHourStatistics/index.vue
View File

@@ -29,7 +29,7 @@
{{ 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>

6
src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
View File

@@ -37,7 +37,7 @@
:data="tableData"
:row-class-name="tableRowClassName"
height="570"
style="width: 960px; margin: 3px 0"
style="width: 1000px; margin: 3px 0"
size="mini"
border
highlight-current-row
@@ -63,7 +63,7 @@
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="计划投产" align="center" width="80">
<el-table-column label="计划投产数" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.投产总数量 }}
</template>
@@ -78,7 +78,7 @@
{{ scope.row.投产批次 }}
</template>
</el-table-column>
<el-table-column label="投产" align="center" width="80">
<el-table-column label="批次投产数" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>

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

@@ -119,11 +119,11 @@
</div>
</el-card>
</el-col>
<el-col style="width: 370px;margin-left: 10px">
<el-col style="width: 373px;margin-left: 10px">
<el-card style="height: 370px">
<div style="width: 110px;font-size: 18px;float: left;text-align: center;">进程</div>
<div style="width: 110px;font-size: 18px;float: left;text-align: center;">计划时间</div>
<div style="width: 110px;font-size: 18px;float: left;text-align: center;">实际时间</div>
<!--<div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">进程</div>-->
<div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold;margin-left: 100px">计划时间</div>
<div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold;margin-left: 10px">实际时间</div>
<el-form label-position="right" label-width="100px" class="ProjectPlanningManagementQuery">
<el-row>
<el-col style="width: 370px">

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

@@ -24,7 +24,7 @@
:value="item.value"/>
</el-select>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=30;total=0;searchData()">查询</el-button>
</el-row>
</el-card>
<el-card>
@@ -60,14 +60,14 @@
{{ scope.row.传递时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件状态" width="650px">
<el-table-column align="center" label="零件状态" width="550px">
<template slot-scope="scope">
<el-steps :active="scope.row.考核状态" finish-status="success" simple>
<el-step title="投产" />
<el-step title="工艺" />
<el-step title="定额" />
<el-step title="平衡" />
<el-step title="完成" />
<!--<el-step title="定额" />-->
<!--<el-step title="平衡" />-->
<el-step title="制造" />
<el-step title="入库" />
<el-step title="出库" />
</el-steps>
@@ -77,7 +77,7 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-sizes="[30, 50, 100]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@@ -108,7 +108,7 @@ export default {
partTypeValue: null, // 零件类型
num: null,
pageCurrent: 1,
pageSize: 20,
pageSize: 30,
tableData7: [],
tableData6: [],
tableData: [],
@@ -173,9 +173,18 @@ export default {
this.loading0 = true
searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.result.length; i++) {
response.data.result[i].考核状态 = parseInt(response.data.result[i].考核状态) - 2
if (response.data.result[i].传递时间 !== undefined || response.data.result[i].hasOwnProperty('传递时间')) {
response.data.result[i].传递时间 = response.data.result[i].传递时间.split(' ', 2)[0]
if (response.data.result[i].考核状态 === 3) {
response.data.result[i].考核状态 = 1
} else if (response.data.result[i].考核状态 === 4) {
response.data.result[i].考核状态 = 2
} else if (response.data.result[i].考核状态 === 5) {
response.data.result[i].考核状态 = 2
} else if (response.data.result[i].考核状态 === 6) {
response.data.result[i].考核状态 = 3
} else if (response.data.result[i].考核状态 === 7) {
response.data.result[i].考核状态 = 4
} else if (response.data.result[i].考核状态 === 8) {
response.data.result[i].考核状态 = 5
}
}
this.loading0 = false