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

sdd

Browse Source
This commit is contained in:
caoxinyu
2019-09-25 16:15:30 +08:00
parent 0d820bec95
commit c90acc6a85
13 changed files with 164 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

22
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -3,19 +3,12 @@
<el-card>
<div slot="header">
<el-row style="margin-bottom:-10px!important;">
<el-col style="width: 250px">
<span>物料名称:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
</el-col>
<el-col style="width: 250px">
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
</el-col>
<el-col style="width: 250px">
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
</el-col>
<el-col style="width: 250px">
<span>仓库名称:</span>
<el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">
<el-option
@@ -24,24 +17,21 @@
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 250px">
</el-row>
<el-row>
<span>货位名称:</span>
<el-select v-model="locateNameValue" style="margin-bottom: 10px;" size="small" clearable>
<el-select v-model="locateNameValue" style="margin-top: 10px;" size="small" clearable>
<el-option
v-for="item in locateName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 170px">
<el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
<el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
</el-col>
</el-row>
</div>
<el-table :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" show-summary>
<el-table :data="tableData1" stripe border style="max-height: 500px;" height="500px" size="mini" show-summary>
<el-table-column label="名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -118,7 +108,7 @@
<el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=10;searchMaterial01()">查询</el-button>
</el-col>
</el-row>
<el-table :data="tableData01" border highlight-current-row height="300" size="mini" style="margin-bottom: 10px" @row-click="selectMaterial">
<el-table :data="tableData01" border stripe highlight-current-row height="300" size="mini" style="margin-bottom: 10px" @row-click="selectMaterial">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}

10
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -4,7 +4,7 @@
<div slot="header" class="clearfix">
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
</div>
<el-table :data="tableData" border size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
<el-table :data="tableData" border stripe size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
<el-table-column label="仓库编号" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.仓库编号 }}
@@ -49,13 +49,13 @@
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-table v-loading="listLoading" :data="tableData2" border size="mini" style="width: 100%;max-height: 300px" height="300">
<el-table v-loading="listLoading" :data="tableData2" border stripe size="mini" style="width: 100%;max-height: 300px" height="300">
<el-table-column label="货位名称" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.货位名称 }}
@@ -92,11 +92,13 @@
size="mini"
icon="el-icon-edit"
type="primary"
plain
@click="handleLocateEdit(scope.row)">修改</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
plain
@click="locateDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
@@ -587,7 +589,7 @@ export default {
height: auto!important;
}
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-select{
width:200px

4
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -13,7 +13,7 @@
</el-card>
<el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border style="width: 100%;" height="440" @row-click="searchoutRecord">
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" align="center" min-width="120">
<template slot-scope="scope">
@@ -66,7 +66,7 @@
</el-card>
<el-card>
<el-table v-loading="listLoading1" :data="tableDataOut" size="mini" border style="width: 100%;" height="250">
<el-table v-loading="listLoading1" :data="tableDataOut" size="mini" stripe border style="width: 100%;" height="250">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" align="center" min-width="80">
<template slot-scope="scope">

4
src/views/Inventory/PurchaseInRecord/index.vue
View File

@@ -49,7 +49,7 @@
</el-row>
</div>
<h4 style="margin-top: 0">采购合同件</h4>
<el-table :data="tableData1" border size="mini" style="width: 100%;" height="400">
<el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
@@ -93,7 +93,7 @@
@current-change="handleCurrentChange1"/>
</div>
<h4>离线合同件</h4>
<el-table :data="tableData2" border size="mini" style="width: 100%;" height="400">
<el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}

2
src/views/Inventory/PurchaseOutRecord/index.vue
View File

@@ -63,7 +63,7 @@
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;searchRecord()">查询</el-button>
</el-row>
</div>
<el-table :data="tableData" border size="mini" style="width: 100%;" height="600">
<el-table :data="tableData" border stripe size="mini" style="width: 100%;" height="600">
<el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}

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

@@ -13,10 +13,10 @@
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
</el-tooltip>
<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-button type="warning" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">自家备料</el-button>
</el-tooltip>
<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-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-tooltip>
</el-row>
</el-card>

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

@@ -26,7 +26,7 @@
<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 :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-button size="small" icon="el-icon-success" type="warning" plain style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
</el-tooltip>
<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>

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

@@ -4,91 +4,91 @@
<div class="main">
<div class="process" @click.stop="chaxun">
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
<el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：质检部<br>对机床进行总装调试</div>
<el-button :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data2[0].机械装配}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
<el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：质检部<br>对自制件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：质检部<br>对采购件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
<el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data2[0].车间加工}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：外协员<br>进行外协加工</div>
<el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data2[0].外协}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
<el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data2[0].能力平衡}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：工艺部<br>制定零件工艺定额</div>
<el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺定额<br>{{ `${data2[0].工艺定额}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
<el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data2[0].自家备料}%` }}</el-button>
</el-tooltip>
@@ -100,37 +100,37 @@
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data2[0].签订合同}%` }}</el-button>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
<el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data2[0].产品设计}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
<el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data2[0].外购备料}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
<el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data2[0].零件分配}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" 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>{{ `${data2[0].自制件}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
</el-tooltip>
</div>
<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">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
<el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data2[0].采购部采购}%` }}</el-button>
</el-tooltip>
@@ -157,6 +157,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border
@row-click="handleSelect">
@@ -330,6 +331,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -396,6 +398,7 @@
:data="tableDataDiv3"
height="340"
style="width: 100%;min-height: 300px;"
stripe
size="mini"
highlight-current-row
border
@@ -473,6 +476,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border
@row-click="turnIniPro">
@@ -537,6 +541,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -605,6 +610,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -673,6 +679,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -741,6 +748,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -797,12 +805,15 @@
<el-row>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>加工完成</h3>
<el-table
id="div1"
ref="div1"
:data="tableDataDiv9A"
style="width: 100%;height: 340px;overflow-y: auto;"
size="mini"
stripe
height="340px"
highlight-current-row
border
@mouseenter.native="changeScroll1">
@@ -811,27 +822,27 @@
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号" width="55px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组件名称">
<el-table-column align="center" label="组件名称" min-width="95px">
<template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="投产数量" width="80px">
<el-table-column align="center" label="投产数量" width="60px">
<template slot-scope="scope">
{{ scope.row.投产数量 ? scope.row.投产数量 : '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成数量">
<el-table-column align="center" label="加工完成数量" width="60px">
<template slot-scope="scope">
{{ scope.row.入库数量 ? scope.row.入库数量 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成时间" width="100px">
<el-table-column align="center" label="完成时间" min-width="70px">
<template slot-scope="scope">
{{ scope.row.完成时间 ? scope.row.完成时间.substring(0, 11) : 0 }}
</template>
@@ -841,12 +852,15 @@
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>采购到货</h3>
<el-table
id="div2"
ref="div2"
:data="tableDataDiv9B"
style="width: 100%;height: 340px;overflow-y: scroll;"
size="mini"
stripe
height="340px"
highlight-current-row
border
@mouseenter.native="changeScroll2">
@@ -855,27 +869,27 @@
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号" width="55px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组件名称">
<el-table-column align="center" label="组件名称" min-width="95px">
<template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="投产数量" width="80px">
<el-table-column align="center" label="投产数量" width="60px">
<template slot-scope="scope">
{{ scope.row.总零件数量 ? scope.row.总零件数量 : '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="采购到货数量">
<el-table-column align="center" label="采购到货数量" width="60px">
<template slot-scope="scope">
{{ scope.row.总到货数量 ? scope.row.总到货数量 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成时间" width="100px">
<el-table-column align="center" label="完成时间" min-width="70px">
<template slot-scope="scope">
{{ scope.row.完成时间 !== '1900-01-01 00:00:00' ? scope.row.完成时间 : '未完成' }}
</template>
@@ -885,12 +899,15 @@
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>车间采购</h3>
<el-table
id="div3"
ref="div3"
:data="tableDataDiv9C"
style="width: 100%;height: 340px;overflow-y: scroll;"
stripe
size="mini"
height="340px"
highlight-current-row
border
@mouseenter.native="changeScroll3">
@@ -899,27 +916,27 @@
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号" width="55px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组件名称">
<el-table-column align="center" label="组件名称" min-width="95px">
<template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="投产数量" width="80px">
<el-table-column align="center" label="投产数量" width="60px">
<template slot-scope="scope">
{{ scope.row.总零件数量 ? scope.row.总零件数量 : '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="车间采购到货">
<el-table-column align="center" label="车间采购到货" width="60px">
<template slot-scope="scope">
{{ scope.row.到货数量 ? scope.row.到货数量 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成时间">
<el-table-column align="center" label="完成时间" min-width="70px">
<template slot-scope="scope">
{{ scope.row.完成时间 !== '1900-01-01 00:00:00' ? scope.row.完成时间 : '未完成' }}
</template>
@@ -946,6 +963,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border
@row-click="turnToProStatus">
@@ -1012,6 +1030,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border
@row-click="turnMaterArrMan">
@@ -1063,6 +1082,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1122,6 +1142,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1176,6 +1197,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1235,6 +1257,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border
@row-click="turnToPCB">
@@ -1284,6 +1307,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1351,38 +1375,41 @@
<el-row>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>外购件</h3>
<el-table
:data="tableDataDiv16A"
style="width: 100%;height: 340px;overflow-y: auto;"
size="mini"
stripe
height="340px"
highlight-current-row
border>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号" width="55px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组件名称">
<el-table-column align="center" label="组件名称" min-width="95px">
<template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="总外购件数" width="80px">
<el-table-column align="center" label="总数" width="60px">
<template slot-scope="scope">
{{ scope.row.总外购件数 ? scope.row.总外购件数 : '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="已采购外购件数" width="100px">
<el-table-column align="center" label="已采购数" width="60px">
<template slot-scope="scope">
{{ scope.row.已采购外购件数 ? scope.row.已采购外购件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="部分采购外购件数" width="100px">
<el-table-column align="center" label="部分采购数" width="60px">
<template slot-scope="scope">
{{ scope.row.部分采购外购件数 ? scope.row.部分采购外购件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="总到货数外购件数" width="100px">
<el-table-column align="center" label="总到货数数" width="60px">
<template slot-scope="scope">
{{ scope.row.总到货数外购件数 ? scope.row.总到货数外购件数 : 0 }}
</template>
@@ -1392,38 +1419,41 @@
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>标准件</h3>
<el-table
:data="tableDataDiv16B"
style="width: 100%;height: 340px;overflow-y: scroll;"
size="mini"
stripe
height="340px"
highlight-current-row
border>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号" width="55px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组件名称">
<el-table-column align="center" label="组件名称" min-width="95px">
<template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="总标准件数" width="80px">
<el-table-column align="center" label="总数" width="60px">
<template slot-scope="scope">
{{ scope.row.总标准件数 ? scope.row.总标准件数: '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="已采购标准件数">
<el-table-column align="center" label="已采购数" width="60px">
<template slot-scope="scope">
{{ scope.row.已采购标准件数 ? scope.row.已采购标准件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="部分采购标准件数">
<el-table-column align="center" label="部分采购数" width="60px">
<template slot-scope="scope">
{{ scope.row.部分采购标准件数 ? scope.row.部分采购标准件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="总到货数标准件数">
<el-table-column align="center" label="总到货数" width="60px">
<template slot-scope="scope">
{{ scope.row.总到货数标准件数 ? scope.row.总到货数标准件数 : 0 }}
</template>
@@ -1433,38 +1463,41 @@
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>基本件</h3>
<el-table
:data="tableDataDiv16C"
style="width: 100%;height: 340px;overflow-y: scroll;"
height="340px"
size="mini"
stripe
highlight-current-row
border>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号" width="55px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组件名称">
<el-table-column align="center" label="组件名称" min-width="95px">
<template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="总基本件数" width="80px">
<el-table-column align="center" label="总数" width="60px">
<template slot-scope="scope">
{{ scope.row.总基本件数 ? scope.row.总基本件数: '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="已采购基本件数">
<el-table-column align="center" label="已采购数" width="60px">
<template slot-scope="scope">
{{ scope.row.已采购基本件数 ? scope.row.已采购基本件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="部分采购基本件数">
<el-table-column align="center" label="部分采购数" width="60px">
<template slot-scope="scope">
{{ scope.row.部分采购基本件数 ? scope.row.部分采购基本件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="总到货数基本件数">
<el-table-column align="center" label="总到货数" width="60px">
<template slot-scope="scope">
{{ scope.row.总到货数基本件数 ? scope.row.总到货数基本件数 : 0 }}
</template>
@@ -1483,15 +1516,17 @@
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<el-table
:data="tableDataDiv17A"
style="width: 100%;height: 340px;overflow-y: auto;"
style="width: 100%;overflow-y: auto;"
height="340px"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
label="序号"
align="center"
type="index"
width="60"/>
width="55"/>
<el-table-column align="center" label="组号" width="120px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
@@ -1502,17 +1537,17 @@
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="总基本件数" width="150px">
<el-table-column align="center" label="总基本件数" width="120px">
<template slot-scope="scope">
{{ scope.row.总基本件数 ? scope.row.总基本件数 : '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="已采购基本件数" width="150px">
<el-table-column align="center" label="已采购基本件数" width="120px">
<template slot-scope="scope">
{{ scope.row.已采购基本件数? scope.row.已采购基本件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="总到货数基本件数" width="150px">
<el-table-column align="center" label="总到货数基本件数" width="120px">
<template slot-scope="scope">
{{ scope.row.总到货数基本件数 ? scope.row.总到货数基本件数 : 0 }}
</template>
@@ -1524,15 +1559,17 @@
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<el-table
:data="tableDataDiv17B"
style="width: 100%;height: 340px;overflow-y: scroll;"
style="width: 100%;overflow-y: scroll;"
height="340px"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
label="序号"
align="center"
type="index"
width="60"/>
width="55"/>
<el-table-column align="center" label="组号" width="120px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
@@ -1543,17 +1580,17 @@
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="总基本件数" width="150px">
<el-table-column align="center" label="总基本件数" width="120px">
<template slot-scope="scope">
{{ scope.row.总基本件数 ? scope.row.总基本件数: '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="已采购基本件数" width="150px">
<el-table-column align="center" label="已采购基本件数" width="120px">
<template slot-scope="scope">
{{ scope.row.已采购基本件数 ? scope.row.已采购基本件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="总到货数基本件数" width="150px">
<el-table-column align="center" label="总到货数基本件数" width="120px">
<template slot-scope="scope">
{{ scope.row.总到货数基本件数 ? scope.row.总到货数基本件数 : 0 }}
</template>
@@ -1582,6 +1619,7 @@
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1638,6 +1676,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1692,6 +1731,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1752,6 +1792,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1759,38 +1800,38 @@
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="是否完成">
<el-table-column align="center" label="是否完成" width="105">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)=== 1" type="success" size="mini" style="width: 80px">合格</el-tag>
<el-tag v-else type="danger" size="mini" style="width: 80px">不合格</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号">
<el-table-column align="center" label="机床图号" width="110">
<template slot-scope="scope">
{{ scope.row.机床图号 ? scope.row.机床图号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="机床名称">
<el-table-column align="center" label="机床名称" min-width="210">
<template slot-scope="scope">
{{ scope.row.机床名称 ? scope.row.机床名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号" width="70px">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="组件名称">
<el-table-column align="center" label="组件名称" width="110">
<template slot-scope="scope">
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="检测项">
<el-table-column align="center" label="检测项" width="110">
<template slot-scope="scope">
{{ scope.row.检测项 ? scope.row.检测项 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="检测项明细">
<el-table-column align="center" label="检测项明细" min-width="310">
<template slot-scope="scope">
{{ scope.row.检测项明细 ? scope.row.检测项明细 : '--' }}
</template>
@@ -1822,6 +1863,7 @@
height="340"
style="width: 100%"
size="mini"
stripe
highlight-current-row
border>
<el-table-column
@@ -1839,7 +1881,7 @@
{{ scope.row.机床名称 ? scope.row.机床名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="总装开始时间" width="80px">
<el-table-column align="center" label="总装开始时间" width="150px">
<template slot-scope="scope">
{{ scope.row.机床装配实际开始时间 ? scope.row.机床装配实际开始时间 : '--' }}
</template>

1
src/views/PurchasingCenter/ArrivalEnquiry/index.vue
View File

@@ -26,6 +26,7 @@
v-loading=""
:data="tableData1"
border
stripe
highlight-current-row
style="width: 100%;max-height: 250px;"
height="250px"

4
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -21,7 +21,7 @@
<el-tooltip :open-delay="1000" effect="dark" content="将三表信息传递给零件分配" placement="top">
<el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="在三表中删除导入的机床信息" placement="top">
<el-tooltip :open-delay="1000" effect="dark" content="删除导入信息" placement="top">
<el-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
</el-tooltip>
<el-row style="margin-top: 10px">
@@ -555,7 +555,7 @@ export default {
})
},
allDelete() {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

4
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -30,9 +30,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-tooltip :open-delay="1000" effect="dark" content="上传项目设计总图" placement="top">
<el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
</el-tooltip>
</div>
<upload-excel-component @on-selected-file="selected"/>
</div>

2
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -21,7 +21,9 @@
<el-tooltip content="asdsdr" placement="top" effect="light">
<el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除三表中导入的信息" placement="top">
<el-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
</el-tooltip>
<el-row style="margin-top: 5px;margin-bottom: 3px">
<span>机床名称：</span>
<el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>