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

我去

Browse Source
This commit is contained in:
caoxinyu
2019-09-24 08:22:02 +08:00
parent 0758701e5e
commit ac47b69ea3
24 changed files with 241 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,9 @@
<span>工艺名称:</span>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:200px"/>
<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-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
<el-tooltip effect="dark" content="新增补录工时" placement="top" open-delay="1200">
<el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
</el-tooltip>
</el-row>
</el-card>

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

@@ -5,10 +5,18 @@
<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=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="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-tooltip effect="dark" content="已导出和未导出备料单" placement="top" open-delay="1200">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
<el-tooltip effect="dark" content="打印备料单" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将选中零件分配为自家备料" placement="top" open-delay="1200">
<el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将选中零件分配为外购备料" placement="top" open-delay="1200">
<el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-tooltip>
</el-row>
</el-card>

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

@@ -192,9 +192,15 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
<el-tooltip effect="dark" content="打回到零件分配" placement="top" open-delay="1200">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="选中零件进行投产" placement="top" open-delay="1200">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将不同组号中相同图号的零件合并" placement="top" open-delay="1200">
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
</el-tooltip>
</div>
</div>
</el-card>

20
src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
View File

@@ -271,11 +271,21 @@
<el-table-column label="操作" width="490px" align="center">
<template slot-scope="scope">
<div>
<el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
<el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
<el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
<el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
<el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
<el-tooltip effect="dark" content="上移" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="下移" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="置顶" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="置底" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="删除" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
</el-tooltip>
</div>
</template>
</el-table-column>

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

@@ -22,9 +22,15 @@
</el-select>
<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="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-tooltip effect="dark" content="自家备料查询" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="自家备料完成" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-success" type="info" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将备料件打回重新分配" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
</el-tooltip>
</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">
@@ -62,8 +68,12 @@
<el-card>
<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="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
<el-tooltip effect="dark" content="外购备料确认" placement="top" open-delay="1200">
<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-tooltip>
<el-tooltip effect="dark" content="外购备料完成" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
</el-tooltip>
</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">

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

@@ -190,9 +190,15 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
<el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
<el-tooltip effect="dark" content="将零件选择到采购单" placement="top" open-delay="1200">
<el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="所选零件分配到采购部" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="所选零件分配为自家生产" placement="top" open-delay="1200">
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-row>
@@ -286,12 +292,12 @@
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
<el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
<div style="display: inline-block;margin-right: 10px">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="移出" placement="top">
<el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>
@@ -359,12 +365,12 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
<el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
<div style="display: inline-block;margin-right: 10px">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="移出" placement="top">
<el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>

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

@@ -82,37 +82,47 @@
<el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
<h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
</div>
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
<h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[2]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
<h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
</div>
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
<h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[3]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
<h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
</div>
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
<h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[4]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
<h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
</div>
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
<h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[5]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
<h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
</div>
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
<h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[6]" align="center" width="120px">
@@ -340,6 +350,8 @@
style="width: 150px;float: left"
height="400"
accordion
default-expand-all="true"
highlight-current="true"
@node-click="handleNodeClick"/>
</div>
<el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">

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

@@ -25,15 +25,12 @@
</el-select>
<span>零件图号:</span>
<el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 200px;"/>
<el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
<el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
<el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
</el-row>
</div>
</el-card>
<el-card>
<span class="demonstration">开始日期: </span>
<el-date-picker
@@ -51,7 +48,9 @@
value-format="yyyy-MM-dd"
style="top: 1px;"
placeholder="选择开始日期"/>
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
<el-tooltip effect="dark" content="变更零件加工开始和结束时间" placement="top" open-delay="1200">
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
</el-tooltip>
<el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
<el-table
v-loading="listLoading"
@@ -144,7 +143,9 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
<el-tooltip effect="dark" content="将选中零件自动排出加工工序" placement="top" open-delay="1200">
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
</el-tooltip>
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 20px 10px 10px" @click="SelectionAll">全部选入</el-button>
</div>
<div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
@@ -431,9 +432,13 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
<div style="float:right">
<el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
<el-tooltip effect="dark" content="自动计算工序加工时间" placement="top" open-delay="1200">
<el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
</el-tooltip>
<el-button v-if="可以确定零件计划" type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
<el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
<el-tooltip effect="dark" content="选出重新设置零件的加工时间" placement="top" open-delay="1200">
<el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
</el-tooltip>
</div>
</div>
</div>
@@ -1606,7 +1611,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin: 0px;
}
.el-date-editor{
width: 200px;
@@ -1647,7 +1652,4 @@ export default {
background-color: lightgreen!important;
border: 1px solid #1f2d3d;
}
.el-card{
margin: 0px;
}
</style>

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

@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-card>
<span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请双击选择人员名称" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
<span>人员姓名:</span>
<el-input v-model="personnelNumber" placeholder="请双击选择人员姓名" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
<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>
@@ -454,7 +454,7 @@ export default {
// 增加打开
editType1(formName) {
if (this.personnelNumber === '' || this.personnelNumber === null) {
this.$message.error('请输入人员编号')
this.$message.error('请选择人员名称')
} else {
this.form.TechnologyValue = ''
this.form.timeNumber = ''
@@ -464,7 +464,7 @@ export default {
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.title1 = '新增修补工时'
this.title1 = '新增'+this.personnelNumber+'修补工时'
this.dialogFormVisible = true
}
},

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

@@ -4,7 +4,9 @@
<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" @click="pageCurrent = 1;fetchData()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</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" @click="handleAdd()">新增</el-button>
</el-tooltip>
</el-card>
<el-card>