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-09-25 08:21:55 +08:00
parent d3b8f17031 190673f18d
commit 676f2a3ec3
33 changed files with 111 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@
<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-tooltip effect="dark" content="新增补录工时" placement="top" open-delay="1200">
<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>
</el-tooltip>
</el-row>

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

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

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

@@ -192,13 +192,13 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<el-tooltip effect="dark" content="打回到零件分配" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
</el-tooltip>
</div>

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

@@ -271,19 +271,19 @@
<el-table-column label="操作" width="490px" align="center">
<template slot-scope="scope">
<div>
<el-tooltip effect="dark" content="上移" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="上移" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="下移" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="置顶" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="置底" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
<el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
</el-tooltip>
</div>

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

@@ -22,13 +22,13 @@
</el-select>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-tooltip effect="dark" content="自家备料查询" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="自家备料查询" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="自家备料完成" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="将备料件打回重新分配" placement="top">
<el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
</el-tooltip>
</el-card>
@@ -68,10 +68,10 @@
<el-card>
<span>零件图号:</span>
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-tooltip effect="dark" content="外购备料确认" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="外购备料确认" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="外购备料完成" placement="top">
<el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
</el-tooltip>
</el-card>

60
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -3,139 +3,139 @@
<el-card>
<div class="main">
<div class="process" @click.stop="chaxun">
<div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
<div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1588px;top:190px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
<el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
<div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1400px;top:190px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床进行总装调试</div>
<el-button :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
<div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1210px;top:190px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
<div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 1005px;top:62px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
<div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 920px;top:140px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
<div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 835px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
<div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 750px;top:300px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
<div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 544px;top:190px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
<el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
<div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 321px;top:95px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对自制件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
<div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 240px;top:286px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对采购件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
<div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 30px;top:155px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
<el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
<div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -133px;top:33px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：外协员<br>进行外协加工</div>
<el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
<div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -335px;top:94px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
<el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son13" :class="[isActive ? color[9] : 'weikaishi']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
<div v-show="false" id="son13" :class="[isActive ? color[9] : 'weikaishi']" class="module" style="position: relative;left: -420px;top:94px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件定额</div>
<el-button :disabled="disabled" :class="[isActive ? color[9] : 'weikaishi']" type="text" @click.stop="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
<div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -520px;top:93px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件工艺</div>
<el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
<div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -728px;top:33px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
<el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
</el-tooltip>
<div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1255px;top:236px; width: 80px;height: 48px;">
<!--<el-tooltip placement="top">-->
<!--<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>-->
<!--</el-tooltip>-->
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
</div>
<div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
<div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1240px;top:236px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
<el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
<div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -980px;top:155px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
<el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
<div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1311px;top:236px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
<el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
<div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1269px;top:103px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
<el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
<div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1354px;top:236px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
</el-tooltip>
</div>
<div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
<div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -1438px;top:328px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
<el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
@@ -4453,8 +4453,8 @@ export default {
}
.process{
text-align: center;
margin-left: 30px;
margin-top: 20px;
margin-left: 0px;
margin-top: 0px;
width: 1858px;
height: 400px;
/*border: 1px solid red;*/
@@ -4469,7 +4469,7 @@ export default {
overflow-x: auto;
color: #000;
font-size: 16px;
height: 440px;
height: 400px;
}
.main p{height:300px;}
/*-------滚动条整体样式----*/

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

@@ -190,13 +190,13 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip effect="dark" content="将零件选择到采购单" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
<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-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
<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>
@@ -292,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" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<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" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>
@@ -365,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" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<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" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>

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

@@ -82,7 +82,7 @@
<el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<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>
@@ -91,7 +91,7 @@
</el-table-column>
<el-table-column label="[2]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<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>
@@ -100,7 +100,7 @@
</el-table-column>
<el-table-column label="[3]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<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>
@@ -109,7 +109,7 @@
</el-table-column>
<el-table-column label="[4]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<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>
@@ -118,7 +118,7 @@
</el-table-column>
<el-table-column label="[5]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
<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>

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

@@ -47,7 +47,7 @@
value-format="yyyy-MM-dd"
style="top: 1px;"
placeholder="选择开始日期"/>
<el-tooltip effect="dark" content="变更零件加工开始和结束时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
<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>
@@ -142,7 +142,7 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-tooltip effect="dark" content="将选中零件自动排出加工工序" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件自动排出加工工序" placement="top">
<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>
@@ -431,11 +431,11 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
<div style="float:right">
<el-tooltip effect="dark" content="自动计算工序加工时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="自动计算工序加工时间" placement="top">
<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-tooltip effect="dark" content="选出重新设置零件的加工时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="选出重新设置零件的加工时间" placement="top">
<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>

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

@@ -87,7 +87,7 @@
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip effect="dark" content="设定设备参数有效时间" placement="top" open-delay="1200">
<el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">