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
2019-09-21 17:15:42 +08:00
parent d77493b15d 01357eba7d
commit c49f5a0500
43 changed files with 413 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@
<el-table
:data="tableData"
:stripe="true"
height="440"
height="550"
size="mini"
highlight-current-row
style="width: 100%;"
@@ -67,12 +67,12 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="完成数量" align="center" min-width="100px">
<el-table-column label="完成数量" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" min-width="100px">
<el-table-column label="工艺名称" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -92,12 +92,12 @@
{{ scope.row.加工完成时间 || '—' }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" min-width="100px">
<el-table-column label="实际工时" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }}
</template>
</el-table-column>
<el-table-column label="修补数量" align="center" min-width="100px">
<el-table-column label="修补数量" align="center" min-width="70px">
<template slot-scope="scope">
<template v-if="scope.row.isEditing">
<el-input v-model="scope.row.数量" class="edit-input" size="mini"/>
@@ -105,7 +105,7 @@
<span v-else>{{ scope.row.数量 }}</span>
</template>
</el-table-column>
<el-table-column label="修补工时" align="center" min-width="100px">
<el-table-column label="修补工时" align="center" min-width="70px">
<template slot-scope="scope">
<template v-if="scope.row.isEditing">
<el-input v-model="scope.row.修补工时" class="edit-input" size="mini"/>
@@ -123,7 +123,7 @@
{{ scope.row.修补人 || '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="300" fixed="right">
<el-table-column label="操作" align="center" min-width="200" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.isEditing" type="mini" plain size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" class="cancel-btn" plain size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
@@ -157,7 +157,7 @@
</div>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="650px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="补录工时" center style="min-height: 300px" width="650px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="80px" class="demo-ruleForm">
<el-row>
<el-col :span="12">

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

@@ -7,8 +7,8 @@
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
<el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
<el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-row>
</el-card>

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

@@ -36,6 +36,7 @@
v-loading="listLoading2"
:data="tableData2"
style="width: 100%;max-height: 400px;"
stripe
size="mini"
height="300"
highlight-current-row
@@ -98,6 +99,7 @@
v-loading="listLoading"
:data="tableData"
style="width: 100%;max-height: 400px;"
stripe
size="mini"
height="300"
highlight-current-row
@@ -155,6 +157,7 @@
v-loading="listLoading1"
:data="tableData1"
style="width: 100%;max-height: 400px;"
stripe
size="mini"
height="300"
highlight-current-row
@@ -397,5 +400,7 @@ export default {
</script>
<style scoped>
.el-card{
margin: 0px!important;
}
</style>

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

@@ -1,8 +1,6 @@
<template>
<div class="app-container">
<el-card>
<el-col :span="12">
<el-form label-width="270px" label-position="right" class="Time">
<el-form-item v-show="false">
@@ -94,6 +92,8 @@
v-loading="listLoading"
:data="tableData"
border
stripe
highlight-current-row
style="width: 100%;max-height: 400px"
height="400"
@selection-change="handleSelectionChange"
@@ -172,6 +172,7 @@
:disabled="checked_hebing"
size="mini"
type="primary"
plain
@click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
<!--<el-button-->
<!--size="mini"-->

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

@@ -23,8 +23,8 @@
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="back()">打回</el-button>
<el-button size="small" icon="el-icon-success" type="info" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
<el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
@@ -63,7 +63,7 @@
<span>零件图号:</span>
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
<el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">

1
src/views/ManufacturingCenter/OwnTimeStatistics/index.vue
View File

@@ -70,6 +70,7 @@ export default {
methods: {
fetchData() {
this.project = []
console.log(1111)
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.project.push({

13
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -199,7 +199,7 @@
<span>请购单号：</span>
<el-input v-model="PurchaseOrder" size="small" style="width: 200px" placeholder="请购单号" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">创建</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">新增</el-button>
</el-row>
</el-card>
<el-card>
@@ -373,9 +373,8 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="请购车间" prop="请购车间">
<el-input
v-model="form.请购车间"
@@ -407,7 +406,7 @@
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="数量" prop="数量">
<el-input
@@ -420,7 +419,7 @@
<el-button type="primary" @click="submitEdit1('form3')">确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible4" title="使用库存" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="使用库存" center style="min-height: 300px" width="400px">
<el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="数量" prop="数量">
<el-input-number v-model="form4.数量" :min="0" :max="100" size="small" style="width:200px"/>
@@ -432,6 +431,7 @@
</div>
</el-dialog>
<el-dialog
v-el-drag-dialog
:visible.sync="dialogFormVisible1"
title="基本件打回信息"
center
@@ -443,6 +443,7 @@
size="mini"
style="width: 97%;max-height: 300px"
height="400"
stripe
highlight-current-row
border>
<el-table-column align="center" label="零件图号">
@@ -502,6 +503,7 @@
</el-table>
</el-dialog>
<el-dialog
v-el-drag-dialog
:visible.sync="dialogFormVisible2"
title="外购件和标准件打回信息"
center
@@ -513,6 +515,7 @@
size="mini"
style="width: 97%;max-height: 300px"
height="400"
stripe
highlight-current-row
border>
<el-table-column align="center" label="物料名称">

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

@@ -2,36 +2,40 @@
<div class="app-container">
<el-card>
<div>
<span style="margin-left: 10px">机床号：</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 3px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<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="组号" 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"/>
<span style="margin-left: 10px">工艺员：</span>
<el-select v-model="personValue" placeholder="工艺员" size="small" clearable >
<el-option
v-for="item in person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-row>
<span style="margin-left: 10px">机床号：</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-bottom: 10px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<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="组号" 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"/>
</el-row>
<el-row>
<span style="margin-left: 10px">工艺员：</span>
<el-select v-model="personValue" placeholder="工艺员" size="small" clearable >
<el-option
v-for="item in person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
</el-row>
</div>
</el-card>
<el-card>

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

@@ -34,13 +34,13 @@
:data="tableData"
style="width: 100%;"
size="mini"
height="770"
height="500"
highlight-current-row
border
stripe
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection"/>
<el-table-column align="center" label="零件号">
<el-table-column align="center" label="零件号" min-width="160">
<template slot-scope="scope">
{{ scope.row.零件号 }}
</template>

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

@@ -1,6 +1,5 @@
<template>
<div class="app-container">
<el-card>
<div style="margin-top: -10px;">
<el-row>
@@ -59,6 +58,7 @@
:data="tableData"
:row-class-name="tableRowClassName"
border
stripe
style="max-height: 400px;margin-top:10px"
height="400"
@selection-change="handleSelectionChange"
@@ -168,19 +168,20 @@
:data="tableData1"
class="table"
borde
stripe
style="max-height: 500px"
height="500">
<el-table-column label="零件图号" align="center" width="240">
<el-table-column label="零件图号" align="center" min-width="160">
<template slot-scope="scope">
{{ 零件图号[scope.$index] }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="160">
<el-table-column label="零件名称" align="center" width="140">
<template slot-scope="scope">
{{ 零件名称[scope.$index] }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" width="100">
<el-table-column label="零件数量" align="center" width="80">
<template slot-scope="scope">
{{ 投产数量[scope.$index] }}
</template>
@@ -412,10 +413,10 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" width="200px" align="center" fixed="right">
<el-table-column label="操作" width="180px" align="center" fixed="right">
<template slot-scope="scope" align="center">
<el-button size="mini" type="primary" @click="adjustFunc(scope.$index)">调整</el-button>
<el-button size="mini" type="danger" icon="el-icon-upload2" @click="xuanChu(scope.$index)">选出</el-button>
<el-button size="mini" type="primary" plain @click="adjustFunc(scope.$index)">调整</el-button>
<el-button size="mini" type="danger" plain icon="el-icon-upload2" @click="xuanChu(scope.$index)">选出</el-button>
</template>
</el-table-column>
</el-table>
@@ -1646,4 +1647,7 @@ export default {
background-color: lightgreen!important;
border: 1px solid #1f2d3d;
}
.el-card{
margin: 0px;
}
</style>

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

@@ -6,9 +6,8 @@
<el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button>
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" height="770" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
<el-table v-loading="loading0" :data="tableData" height="500" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
<el-table-column
label="序号"
type="index"
@@ -80,7 +79,6 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row>

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

@@ -1,11 +1,10 @@
<!--零件报废补投-->
<template>
<div class="app-container">
<el-card>
<div>
<el-row>
<span>项目名称:</span>
<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px;margin-bottom: 10px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
<el-option
v-for="item in ProjectName"
:key="item.value"
@@ -28,12 +27,13 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 15px">零件图号:</span>
</el-row>
<el-row>
<span>零件图号:</span>
<el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 200px" clearable/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 20px" @click="currentPage1=1; fetchTableData()">查询</el-button>
</div>
</el-row>
</el-card>
<el-card>
<el-table
v-loading="loading"
@@ -99,7 +99,7 @@
width="100px"
>
<template slot-scope="scope" >
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" size="small" @click="handleEdit(scope.row)">停产</el-button>
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="small" @click="handleEdit(scope.row)">停产</el-button>
</template>
</el-table-column>
</el-table>
@@ -114,7 +114,6 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card>
<el-table
v-loading="loading2"
@@ -182,7 +181,6 @@
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<el-card>
<div>停产后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B</div>
<div style="margin-top: 20px; display: block">
@@ -201,7 +199,6 @@
<el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
</div>
</el-card>
<el-card v-show="false">
<el-table
:data="tableData4"
@@ -236,8 +233,7 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
<el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
<el-form ref="form" :model="form" label-position="left">
<el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
@@ -282,7 +278,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
<el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
<el-form ref="form2" :model="form2" label-position="left">
<el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form2.reason" auto-complete="off"/>
@@ -530,7 +526,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom:0px;
}
.el-date-editor{
width:200px;

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

@@ -8,7 +8,7 @@
</el-card>
<el-card>
<el-table :data="List" border size="small" height="500px">
<el-table :data="List" border size="small" stripe highlight-current-row height="500px">
<el-table-column label="设备名称" align="center" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
@@ -61,8 +61,8 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200px" fixed="right" >
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
<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>
</template>
</el-table-column>
</el-table>
@@ -93,7 +93,7 @@
</el-tooltip>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-col :span = "12">
@@ -169,7 +169,7 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="callOff('form')">取消</el-button>
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
@@ -395,6 +395,6 @@ export default {
</script>
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom: 1px;
}
</style>