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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-11-28 15:55:03 +08:00
parent bc92463932 a9f8a4dd08
commit f885648614
19 changed files with 353 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
View File

@@ -37,11 +37,11 @@
</el-row>
<el-row>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:120px; margin-top: 10px;margin-bottom: 10px"/>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>
<span>工艺名称:</span>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:200px"/>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:150px"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top">
<el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
@@ -507,7 +507,6 @@ export default {
this.partNumber ? check4 = 1 : check4 = 0
this.startTime2 && this.endTime2 ? check5 = 1 : check5 = 0
searchTable(this.technologyName, check1, this.workerName, check2, check3, this.endTime1, this.startTime1, this.partNumber, check4, check5, this.endTime2, this.startTime2, this.pageCurrent, this.pageSize).then(res => {
console.log(res.data.rows, 898989)
this.tableData = res.data.rows
this.total = res.data.total
this.tableData.map(v => {

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

@@ -633,7 +633,8 @@ export default {
},
opclickshowPanel($event) {
if ($event.path[2].id !== undefined && $event.path[2].id !== null && $event.path[2].id !== '') {
var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101'
// var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101'
var aaa = 'http://192.168.1.232:8007/#/login?OPNAME=' + $event.path[2].id
window.open(aaa)
}
},

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

@@ -3,7 +3,6 @@
<el-card>
<div>
<el-row>
<!-- <span style="margin-left: 10px">机床号：</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
@@ -14,17 +13,14 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<!-- <span style="margin-left: 10px">组号：</span>-->
<el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:150px" size="small" clearable>
<el-select v-model="groupNumberValue" 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>
<!-- <span style="margin-left: 10px">零件号：</span>-->
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px; margin:0px 10px;width:150px"/>
<!-- <span style="margin-left: 10px">工艺员：</span>-->
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 10px;width:150px"/>
<el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable >
<el-option
v-for="item in person"
@@ -33,6 +29,9 @@
:value="item.value"/>
</el-select>
<el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
</el-tooltip>
</el-row>
</div>
</el-card>
@@ -64,22 +63,22 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="130px">
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" min-width="140px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="90px">
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="100px">
<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="50px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工艺员" prop="工艺员" align="center" width="90px">
<el-table-column label="工艺员" prop="工艺员" align="center" width="75px">
<template slot-scope="scope">
{{ scope.row.工艺员 }}
</template>
@@ -90,21 +89,13 @@
:current-page="pageCurrent"
:page-sizes="[5, 10, 20, 300]"
:page-size="pageSize"
:pager-count="5"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<div>
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
<div style="display: inline-block">
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
</div>
</el-tooltip>
</div>
</el-card>
</el-col>
<el-col style="width: 1000px">
<el-card v-if="tableData2.length">

24
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -24,6 +24,7 @@
</el-select>
<el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
<el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
<el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="currency">保存</el-button>
</el-card>
<el-card>
<el-table
@@ -159,7 +160,10 @@ export default {
PageCurrent: 1,
PageSize: 50,
total: 0,
Craftsmens: [] // 工艺员
Craftsmens: [], // 工艺员
通用件图号: [],
通用件规格: [],
工艺员: []
}
},
created() {
@@ -292,6 +296,7 @@ export default {
工艺结束时间: response.data.rows[i].工艺计划结束时间,
数量: response.data.rows[i].批次数量,
投产时间: response.data.rows[i].操作时间,
规格: response.data.rows[i].规格,
工艺员: '',
人员编号: '',
工艺计划流水号: response.data.rows[i].工艺计划流水号
@@ -356,7 +361,6 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val
console.log(val)
},
save() {
for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -376,6 +380,22 @@ export default {
})
}
}
},
// 直接保存工艺
currency() {
this.通用件图号 = []
this.通用件规格 = []
this.工艺员 = []
this.multipleSelection.map(v => {
if (!v.工艺员) {
return false
}
console.log(111)
this.通用件图号.push(v.零件号)
this.通用件规格.push(v.规格)
this.工艺员.push(v.工艺员)
})
console.log(this.通用件图号, this.通用件规格, this.工艺员)
}
}
}

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

@@ -14,7 +14,7 @@
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号">
<el-select v-model="Group" size="small" style="width: 100px" clearable placeholder="组号">
<el-option
v-for="item in Groups"
:key="item.value"
@@ -23,8 +23,9 @@
</el-select>
<span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row>
<el-row>
<el-row v-if="false">
<span class="demonstration">计划下达时间:</span>
<el-date-picker
v-model="startTime"
@@ -41,7 +42,6 @@
style="width: 160px"
type="date"
placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row>
</el-card>

44
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -22,7 +22,7 @@
<!-- </el-tooltip>-->
</el-card>
<el-row>
<el-col style="width: 400px">
<el-col style="width: 350px">
<el-card>
<el-table
v-loading="loading"
@@ -35,22 +35,22 @@
border
element-loading-text="拼命加载中"
@row-click="searchTable2">
<el-table-column label="操作者" align="center" width="110px" show-overflow-tooltip>
<el-table-column label="操作者" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="计划工时" align="center">
<el-table-column label="计划工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column label="加工工时" align="center">
<el-table-column label="加工工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 }}
</template>
</el-table-column>
<el-table-column label="完成数量" align="center">
<el-table-column label="完成数量" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
@@ -66,15 +66,15 @@
</div>
</el-card>
</el-col>
<el-col style="margin-left: 0px;width: 810px">
<el-col style="margin-left: 0px;width: 860px">
<el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="170px" show-overflow-tooltip>
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="90px" show-overflow-tooltip>
<el-table-column label="零件名称" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -84,7 +84,7 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="完成数量" align="center" width="70px">
<el-table-column label="完成数" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
@@ -94,11 +94,11 @@
{{ scope.row.质检结果 }}
</template>
</el-table-column>
<el-table-column label="不合格数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<!--<el-table-column label="不合格数" align="center" width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.不合格数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="计划工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.理论加工时间段 }}
@@ -109,7 +109,12 @@
{{ scope.row.实际加工时间段 }}
</template>
</el-table-column>
<el-table-column label="完成时间" align="center" width="100px">
<el-table-column label="加工开始" align="center" width="135px">
<template slot-scope="scope">
{{ scope.row.加工开始时间 }}
</template>
</el-table-column>
<el-table-column label="加工完成" align="center" width="135px">
<template slot-scope="scope">
{{ scope.row.加工完成时间 }}
</template>
@@ -145,10 +150,10 @@ export default {
loading2: '',
pageCurrent: 1,
pageSize: 10000,
total: '',
total: 0,
pageCurrent2: 1,
pageSize2: 10000,
total2: '',
total2: 0,
timeCheck: '',
operater: ''
}
@@ -166,8 +171,6 @@ export default {
if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) {
this.timeCheck = 1
} else {
// this.startTime = ''
// this.endTime = ''
this.timeCheck = 0
}
searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
@@ -197,7 +200,8 @@ export default {
不合格数量: response.data.rows[i].不合格数量,
理论加工时间段: response.data.rows[i].理论加工时间段,
实际加工时间段: response.data.rows[i].实际加工时间段,
加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间.split(' ')[0] : ''
加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '',
加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : ''
})
}
}

4
src/views/ManufacturingCenter/ShopScheduling/index.vue
View File

@@ -13,7 +13,7 @@
:value="item.value"/>
</el-select>
</el-row>
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="600" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
<el-table-column
label="序号"
type="index"
@@ -51,7 +51,7 @@
:page-sizes="[50, 100, 200, 500, 1000]"
:page-size="pageSize"
:total="total"
:pager-count="5"
:pager-count="4"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>