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

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

Browse Source
This commit is contained in:
liushuai
2020-02-20 08:51:01 +08:00
parent ab082f5742 43b7acf363
commit 74eab855dc
16 changed files with 391 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/Outsourcing/OutsourcingPartsQuery.js
View File

@@ -45,3 +45,15 @@ export function getExport(check, supplierNameValue, check1, MaterialsValue, chec
}
})
}
export function search1() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协厂家效率图表_查询'
}
})
}

3
src/main.js
View File

@@ -28,6 +28,9 @@ Vue.use(Direction)
Vue.use(curd)
Vue.use(htmlToPdf)
Vue.use(ElementUI)
// 关闭点弹窗周围关闭功能 -- 20200218
ElementUI.Dialog.props.closeOnClickModal.default = false
// 查看图片
Vue.use(Viewer)
Viewer.setDefaults({

2
src/router/getRouter.js
View File

@@ -4,7 +4,7 @@ export default function fn(data, pid) {
let temp
for (let i = 0; i < data.length; i++) {
if (data[i].pid === pid) {
const obj = { 'path': data[i].path, 'component': () => import(`@/views${(data[i].component)}`), 'redirect': data[i].redirect, alwaysShow: true, 'name': data[i].name, meta: { 'title': data[i].title, 'icon': data[i].icon }}
const obj = { 'path': data[i].path, 'component': () => import(`@/views${(data[i].component)}`), 'redirect': data[i].redirect, alwaysShow: true, 'name': data[i].name, meta: { 'title': data[i].title, 'icon': data[i].icon, 'keepAlive': true }}
temp = fn(data, data[i].id)
if (temp.length > 0) {
obj.children = temp

2
src/styles/sidebar.scss
View File

@@ -1,7 +1,7 @@
#app {
// 主体区域
.main-container {
min-width: 1380px;
min-width: 1380px; // div3固定宽度后新增
min-height: 100%;
transition: margin-left .28s;
margin-left: 200px;

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

@@ -1,6 +1,6 @@
<template>
<div>
<el-card class="cardSBJK">
<el-card class="cardSBJK" style="overflow-y:hidden">
<div class="process">
<el-tooltip :enterable="false" :id="OPNAME137" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
@@ -84,7 +84,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME136" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:199px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:159px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME136+fang" class="fang"/>-->
<div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
@@ -578,31 +578,50 @@
<!-- <span style="margin-left: 5px">电流计故障</span>-->
<!-- </div>-->
<!-- </el-card>-->
<div style="position: relative;margin-top: -610px;margin-left: 490px;;width: 120px;height: 600px;background-color: transparent;overflow-y:hidden">
<div style="">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData1" style="width: 433px; text-align: center" size="mini">
<el-table-column label="总装机床" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
</el-table>
</div>
</div>
<div style="position: relative;margin-top: -600px;margin-left: 617px;width: 154px;height: 600px;background-color: transparent;overflow-y:hidden">
<div style="">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData2" max-height="365" style="width: 148px;text-align: center" size="mini">
<el-table-column label="总装机床" align="left" width="148" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}&nbsp;&nbsp;{{ scope.row.任务名称 }}
</template>
</el-table-column>
<!-- <el-table-column label="任务名称" align="left" width="70" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.任务名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
</div>
</el-card>
<div style="position: absolute;margin-top: -610px;margin-left: 490px;height: 350px;width: 124px;background-color: transparent">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData1" style="width: 433px; text-align: center" size="mini">
<el-table-column label="总装机床" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
</el-table>
</div>
<div style="position: absolute;margin-top: -610px;margin-left: 625px;background-color: transparent">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData2" max-height="365" style="width: 156px;text-align: center" size="mini">
<el-table-column label="总装机床" align="left" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;{{ scope.row.任务名称 }}
</template>
</el-table-column>
<!-- <el-table-column label="任务名称" align="left" width="70" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.任务名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<!-- <div style="position: absolute;margin-top: -610px;margin-left: 490px;;width: 1200px;height: auto;background-color: transparent">-->
<!-- <div>-->
<!-- <el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData1" style="width: 433px; text-align: center" size="mini">-->
<!-- <el-table-column label="总装机床" align="center" width="120" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.机床图号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- </div>-->
</div>
</template>
<script>
@@ -994,10 +1013,84 @@ export default {
</script>
<style scoped>
>>>.el-table th, .el-table tr {
/* background-color: #FFF; */
}
/* 滚动条 */
>>>.el-table__body-wrapper::-webkit-scrollbar-thumb {
background: rgb(42,118,206);
width: 1px;
border: none;
border-radius:4px;
}
>>>.el-table__body-wrapper::-webkit-scrollbar {
color: rgb(42,118,206);
width: 4px;
}
/* 滚动条 */
>>>.el-table td, .el-table th.is-leaf {
border: 0px solid #EBEEF5;
}
>>>.el-table--border,.el-table--group {
border: 0px solid #EBEEF5;
}
>>>.el-table::before {
left: 0;
bottom: 0;
width: 100%;
/* height: 1px; */
}
>>>.el-table tbody tr:hover>td {
background-color:transparent
}
>>>.el-table--enable-row-hover >>> .el-table__body tr:hover > td {
background: transparent !important;
}
>>>.el-table{
/* 表格字体颜色 */
color:black;
/* 表格边框颜色 */
/* border: 0.5px solid #758a99; */
height: 500px;
background: transparent !important;
}
/* 表格内背景颜色 */
>>>.el-table th,.el-table tr,.el-table td {
border: 0;
background-color: transparent;
}
/* 双数行背景颜色 */
>>>.el-table--striped .el-table__body tr.el-table__row--striped td {
background-color: transparent;
background-color: rgba(148, 144, 144, 0.3)
}
/* 使表格背景透明 */
>>>.el-table th, .el-table tr {
background-color: transparent;
}
/* 删除表格下横线 */
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
height: 0px;
}
/* 表格表头字体颜色 */
.el-table thead {
color: white;
font-weight: 500;
background-color: rgba(148, 144, 144, 0.3)
}
.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: transparent !important;
}
.cardSBJK{
overflow: auto;
}
.process{
position: relative;
text-align: center;
margin-left: 0px;
margin-top: 0px;
@@ -1077,71 +1170,71 @@ export default {
background-color:#FFBB00 ;
}
</style>
<style lang="scss">
/* 滚动条 */
.el-table__body-wrapper::-webkit-scrollbar-thumb {
background: rgb(42,118,206);
width: 1px;
border: none;
border-radius:4px;
}
.el-table__body-wrapper::-webkit-scrollbar {
color: rgb(42,118,206);
width: 4px;
}
/* 滚动条 */
.el-table td, .el-table th.is-leaf {
border: 0px solid #EBEEF5;
}
.el-table--border, .el-table--group {
border: 0px solid #EBEEF5;
}
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
/* height: 1px; */
}
.el-table tbody tr:hover>td {
background-color:transparent!important
}
.el-table{
/* 表格字体颜色 */
color:black;
/* 表格边框颜色 */
/* border: 0.5px solid #758a99; */
height: 500px;
background: transparent;
}
/* 表格内背景颜色 */
.el-table th, .el-table tr,.el-table td{
border: 0;
background-color: transparent;
}
/* 双数行背景颜色 */
.el-table--striped .el-table__body tr.el-table__row--striped td {
<!--<style lang="scss">-->
<!-- /* 滚动条 */-->
<!-- .el-table__body-wrapper::-webkit-scrollbar-thumb {-->
<!-- background: rgb(42,118,206);-->
<!-- width: 1px;-->
<!-- border: none;-->
<!-- border-radius:4px;-->
<!-- }-->
<!-- .el-table__body-wrapper::-webkit-scrollbar {-->
<!-- color: rgb(42,118,206);-->
<!-- width: 4px;-->
<!-- }-->
<!-- /* 滚动条 */-->
<!-- .el-table td, .el-table th.is-leaf {-->
<!-- border: 0px solid #EBEEF5;-->
<!-- }-->
<!-- .el-table&#45;&#45;border, .el-table&#45;&#45;group {-->
<!-- border: 0px solid #EBEEF5;-->
<!-- }-->
<!-- .el-table::before {-->
<!-- left: 0;-->
<!-- bottom: 0;-->
<!-- width: 100%;-->
<!-- /* height: 1px; */-->
<!-- }-->
<!-- .el-table tbody tr:hover>td {-->
<!-- background-color:transparent!important-->
<!-- }-->
<!-- .el-table{-->
<!-- /* 表格字体颜色 */-->
<!-- color:black;-->
<!-- /* 表格边框颜色 */-->
<!-- /* border: 0.5px solid #758a99; */-->
<!-- height: 500px;-->
<!-- background: transparent;-->
<!-- }-->
<!-- /* 表格内背景颜色 */-->
<!-- .el-table th, .el-table tr,.el-table td{-->
<!-- border: 0;-->
<!-- background-color: transparent;-->
<!-- }-->
<!-- /* 双数行背景颜色 */-->
<!-- .el-table&#45;&#45;striped .el-table__body tr.el-table__row&#45;&#45;striped td {-->
background-color: transparent;
background-color: rgba(148, 144, 144, 0.3)
}
/* 使表格背景透明 */
.el-table th, .el-table tr {
background-color: transparent;
}
/* 删除表格下横线 */
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
height: 0px;
}
/* 表格表头字体颜色 */
.el-table thead {
color: white;
font-weight: 500;
background-color: rgba(148, 144, 144, 0.3)
}
.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: transparent !important;
}
</style>
<!-- background-color: transparent;-->
<!-- background-color: rgba(148, 144, 144, 0.3)-->
<!-- }-->
<!-- /* 使表格背景透明 */-->
<!-- .el-table th, .el-table tr {-->
<!-- background-color: transparent;-->
<!-- }-->
<!-- /* 删除表格下横线 */-->
<!-- .el-table::before {-->
<!-- left: 0;-->
<!-- bottom: 0;-->
<!-- width: 100%;-->
<!-- height: 0px;-->
<!-- }-->
<!-- /* 表格表头字体颜色 */-->
<!-- .el-table thead {-->
<!-- color: white;-->
<!-- font-weight: 500;-->
<!-- background-color: rgba(148, 144, 144, 0.3)-->
<!-- }-->
<!-- .el-table&#45;&#45;enable-row-hover .el-table__body tr:hover>td{-->
<!-- background-color: transparent !important;-->
<!-- }-->
<!--</style>-->

89
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -4,11 +4,8 @@
<div slot="header">
<el-row style="margin-bottom:-10px!important;">
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
<!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
@@ -69,92 +66,6 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<!-- <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">-->
<!-- <el-row>-->
<!-- <el-col style="width: 240px">-->
<!-- <span>物料名称:</span>-->
<!-- <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 240px">-->
<!-- <span>物料规格:</span>-->
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 240px">-->
<!-- <span>物料型号:</span>-->
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 80px">-->
<!-- <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <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.物料名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="图号或型号" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料型号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="规格" align="center" min-width="200">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料规格 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="供货商" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.供货商 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <div class="block" style="margin: 10px 0">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent01"-->
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
<!-- :page-size="pageSize01"-->
<!-- :total="total01"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange01"-->
<!-- @current-change="handleCurrentChange01"/>-->
<!-- </div><hr>-->
<!-- <el-row>-->
<!-- <el-col style="width: 210px">-->
<!-- <span>仓库:</span>-->
<!-- <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">-->
<!-- <el-option-->
<!-- v-for="item in inventoryName"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- <el-col style="width: 210px">-->
<!-- <span>货位:</span>-->
<!-- <el-select v-model="locateNameValue" style="margin-bottom: 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: 210px">-->
<!-- <span>货位存量:</span>-->
<!-- <el-input-number v-model="localNumber" :min="0" :precision="2" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 180px">-->
<!-- <span>是否为滞货:</span>-->
<!-- <el-checkbox v-model="isBacklog" size="small" label="滞货件" border style="border: 1px solid rgb(49,56,72)"/>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button size="small" @click="dialogVisible=false">取消</el-button>-->
<!-- <el-button type="primary" size="small" @click="submitAdd">确定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>

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

@@ -122,7 +122,6 @@ export default {
},
searchChart() {
searchChart().then(response => {
console.log(response, 11)
for (let i = 0; i < response.data.length; i++) {
this.dataX.push(response.data[i].姓名)
this.partsNum.push(response.data[i].零件数量)

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

@@ -80,8 +80,8 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" :title="title" center width="400px">
<el-table ref="multipleTable" :data="tableData2" size="mini" height="400" border>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" :title="title" center width="400px">
<el-table :data="tableData2" size="mini" height="400" border>
<el-table-column align="center" label="序号" width="80">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}

74
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -29,9 +29,9 @@
<el-col style="width: 37%">
<el-card>
<el-table
v-loading="loading2"
:data="tableData1"
:row-class-name="tableRowClassName1"
loading="loading"
class="table"
style="max-height: 830px"
highlight-current-row
@@ -44,11 +44,6 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="已完数量" show-overflow-tooltip min-width="70">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.完成数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="质检" width="60">
<template slot-scope="scope">
{{ scope.row.序间质检 }}
@@ -75,20 +70,15 @@
<el-col style="width: 63%">
<el-card>
<el-table
v-loading="loading"
ref="singleTable"
:data="tableData"
:row-class-name="tableRowClassName"
loading="loading"
class="table"
highlight-current-row
border
height="630"
@row-click="getCurrentRow">
<!--<el-table-column type="index" align="center" label="跟单号" width="140">-->
<!--<template slot-scope="scope">-->
<!--<el-radio :label="scope.row.跟单号" v-model="radio"/>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -127,6 +117,7 @@
</el-table>
<div class="block">
<el-pagination
v-if="!loading"
:current-page="pageCurrent"
:page-sizes="[100, 200, 300, 400]"
:page-size="pageSize"
@@ -285,7 +276,8 @@ export default {
Groups: [],
number: '', // 零件图号
tableData: [], // 工序表
loading: '',
loading: false,
loading2: false,
checkbox_Machine: '', // 机床
checkbox_Group: '', // 分组
checkbox_number: '',
@@ -351,10 +343,13 @@ export default {
this.getTable9()
var _this = this
document.onkeydown = function(e) {
if (event.keyCode === 37 || event.keyCode === 38) {
// 暂时弃用↑↓ 只用←→
// event.keyCode === 38 ||
if (event.keyCode === 37) {
_this.click_Up()
}
if (event.keyCode === 39 || event.keyCode === 40) {
// event.keyCode === 40 ||
if (event.keyCode === 39) {
_this.click_Down()
}
}
@@ -364,22 +359,26 @@ export default {
if (this.index === -1) {
console.log(-1)
} else {
this.index = this.index - 1
console.log(this.index)
this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
this.批次数量 = this.tableData[this.index].批次数量
this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
if (this.index !== 0) {
this.index = this.index - 1
console.log(this.index)
this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
this.批次数量 = this.tableData[this.index].批次数量
this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
}
}
},
click_Down() {
if (this.index === -1) {
console.log(-1)
} else {
this.index = this.index + 1
console.log(this.index)
this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
this.批次数量 = this.tableData[this.index].批次数量
this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
if (this.index + 1 !== this.tableData.length) {
this.index = this.index + 1
console.log(this.index)
this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
this.批次数量 = this.tableData[this.index].批次数量
this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
}
}
},
getCurrentRow_Click(row) {
@@ -529,12 +528,13 @@ export default {
this.Group = response.data[0].组件流水号
})
this.getTableData()
}, // 按条件查询
},
// 按条件查询
getTableData() {
this.tableData = []
this.tableData1 = []
this.isDisabled = true
this.Loading = true
this.loading = true
if (this.Machine === '') {
this.checkbox_Machine = 0
} else {
@@ -574,6 +574,7 @@ export default {
},
// 获取工序表
getCurrentRow(row) {
this.loading2 = true
this.批次数量 = row.批次数量
this.index = row.index
this.row2 = row.工艺计划流水号
@@ -599,6 +600,7 @@ export default {
完成数量: response.data[i].完成数量
})
}
this.loading2 = false
}
})
},
@@ -645,13 +647,15 @@ export default {
this.dialogFormVisible1 = true
this.fetchData3()
},
// 获取人员信息树
fetchData3() {
getTree().then(response => { // 获取人员信息树
getTree().then(response => {
const data = response.data
this.data2 = fn(data, 0)
})
},
handleNodeClick(data) { // 树节点点击
// 树节点点击
handleNodeClick(data) {
this.ssks = data.label
getTable8(data.id).then(response => {
this.List1 = response.data
@@ -663,12 +667,14 @@ export default {
this.List1 = response.data
})
},
handleCurrentChange2(row) { // 获取当前行人员信息
// 获取当前行人员信息
handleCurrentChange2(row) {
this.ssks = row.节点名称
this.Number1 = row.人员编号
this.Name = row.姓名
},
getName() { // 提交人员
// 提交人员
getName() {
this.dialogFormVisible1 = false
this.form.人员 = this.Name
this.form.人员编号 = this.Number1
@@ -690,13 +696,15 @@ export default {
if (parseInt(row.考核状态) > 6) {
return 'CompleteColor'
}
}, // 工序状态变色
},
// 工序状态变色
tableRowClassName1({ row, rowIndex }) {
row.index = rowIndex
if (parseInt(row.工序状态) > 3) {
return 'CompleteColor'
}
}, // 重置表单
},
// 重置表单
callOff(formName) {
this.dialogFormVisible = false
this.$refs[formName].resetFields()

4
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -122,12 +122,12 @@
<el-card>
<!--<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">-->
<el-table :data="tableData2" border stripe style="width: 433px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="120">
<el-table-column label="机床图号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" width="150">
<el-table-column label="机床名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>

162
src/views/Outsourcing/OutsourcingPartsQuery/index.vue
View File

@@ -1,13 +1,10 @@
<template>
<div class="app-container">
<el-card style="width: 65%">
<el-card>
<div style="margin-top: 7px; margin-bottom: 7px">
<span>外协厂家</span>
<el-input v-model="supplierNameValue" size="small" placeholder="外协厂家或零件图号" style="width: 180px" clearable/>
<span>外协日期</span>
<el-date-picker v-model="timer" type="daterange" value-format="yyyy-MM-dd" size="small" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
<span>外协状态</span>
<el-select v-model="MaterialsValue" placeholder="外协状态" filterable size="small" style="width: 100px" clearable>
<el-select v-model="MaterialsValue" placeholder="外协状态" filterable size="small" style="width: 120px" clearable>
<el-option
v-for="item in Materials"
:key="item.value"
@@ -18,47 +15,29 @@
<el-button type="primary" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
</div>
</el-card>
<el-card style="width: 70%">
<el-table
v-loading="loading"
:data="tableData"
highlight-current-row
border
stripe
size="mini"
style="width: 100%"
height="760">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column
label="外协状态"
align="center"
width="70px">
<el-card>
<el-table v-loading="loading" :data="tableData" border stripe size="mini" height="700" style="width: 1210px">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="外协状态" align="center" width="90px">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.到货状态)!==1" type="warning" size="mini">未到</el-tag>
<el-tag v-if="Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag>
</template>
</el-table-column>
<el-table-column
label="项目名称"
align="center"
width="140px">
<template slot-scope="scope">{{ scope.row.项目名称 }}</template>
<el-table-column label="项目名称" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column
label="零件图号"
align="center"
width="160px">
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
<el-table-column label="零件图号" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column
label="零件名称"
align="center"
width="120px">
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
<el-table-column label="零件名称" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="70">
<template slot-scope="scope">
@@ -70,23 +49,20 @@
{{ scope.row.外协工序 }}
</template>
</el-table-column>
<el-table-column
label="外协厂家"
align="center"
width="160px">
<template slot-scope="scope">{{ scope.row.外协厂家名称 }}</template>
<el-table-column label="外协厂家" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column
label="外协单号"
align="center"
width="200">
<template slot-scope="scope">{{ scope.row.表单号 }}</template>
<el-table-column label="外协单号" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.表单号 }}
</template>
</el-table-column>
<el-table-column
label="外协日期"
align="center"
width="100">
<template slot-scope="scope">{{ scope.row.任务下达日期.substr(0,10) }}</template>
<el-table-column label="外协日期" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.任务下达日期.substr(0,10) }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
@@ -100,14 +76,17 @@
@current-change="handleCurrentChanges"/>
</div>
</el-card>
<el-card>
<div id="myChart1" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
</el-card>
</div>
</template>
<script>
import { searchTable, getprocedure } from '@/api/Outsourcing/OutsourcingPartsQuery'
import { searchTable, getprocedure, search1 } from '@/api/Outsourcing/OutsourcingPartsQuery'
import echarts from 'echarts'
export default {
name: 'Index',
data() {
return {
timer: '',
@@ -131,6 +110,7 @@ export default {
},
created() {
this.getTableData()
this.search1()
},
methods: {
formatJson(filterVal, jsonData) {
@@ -185,7 +165,6 @@ export default {
})
},
exportExcel1() {
console.log(this.tableData1, 232332)
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['外协状态', '项目名称', '零件图号', '零件名称', '数量', '外协工序', '外协厂家', '外协单号', '外协日期']
const filterVal = ['到货状态', '项目名称', '零件图号', '零件名称', '批次数量', '外协工序', '外协厂家名称', '表单号', '任务下达日期']
@@ -201,8 +180,6 @@ export default {
})
},
getTableData() {
// console.log(this.timer[0], 1)
// console.log(this.timer[1], 2)
this.tableData = []
this.loading = true
let check, check1, check2
@@ -212,17 +189,14 @@ export default {
} else {
check1 = 0
}
// this.timer === null ? (check2 = 0, this.timer = '') : check2 = 1
if (this.timer === null) {
this.timer = ''
console.log(this.timer, 123)
}
if (this.timer[1] === undefined || this.timer[0] === undefined || this.timer[1] === null || this.timer[0] === null) {
check2 = 0
} else {
check2 = 1
}
console.log(check2, 4564688)
searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({
@@ -263,6 +237,70 @@ export default {
handleCurrentChanges(val) {
this.pageCurrent = val
this.getTableData()
},
// 统计图
search1() {
search1().then(response => {
this.res1 = response.data
}).then(() => {
var myChart1 = echarts.init(document.getElementById('myChart1'))
myChart1.clear()
this.drawLine1(this.res1)
})
},
drawLine1(data) {
var dataX = []
var lineData1 = []
for (let i = 0; i < data.length; i++) {
dataX.push(data[i].外协厂家名称)
lineData1.push(data[i].时间)
}
var myChart1 = echarts.init(document.getElementById('myChart1'))
myChart1.clear()
myChart1.setOption({
grid: {
left: '3%',
right: '8%',
bottom: '3%',
containLabel: true
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
xAxis: {
type: 'category',
name: '外协厂家',
axisLabel: {
interval: 0,
rotate: 0,
margin: 10
},
data: dataX
},
yAxis: {
type: 'value',
name: '天',
min: 0,
scale: 'true'
},
series: [
{
name: '加工时间(天)',
type: 'bar',
color: '#67C23A',
label: {
normal: {
show: true,
position: 'inside'
}
},
data: lineData1
}
]
})
}
}
}

30
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -79,13 +79,10 @@
</el-card>
<el-card>
<el-col :span="8">
<!--<span>表单号:</span>-->
<!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>-->
<span>厂家:</span>
<el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
<el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
<el-checkbox v-model="isChecked" size="small" label="编辑已提交"/>
<el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
<el-checkbox v-model="isChecked" size="small" label="历史"/>
<el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:1px" @click="handleAdd()">新增</el-button>
<el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" stripe border @row-click="searchProcess" >
<el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
<template slot-scope="scope">
@@ -115,31 +112,10 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<!--<span>下达任务日期:</span>-->
<!--<el-date-picker-->
<!--type="date"-->
<!--size="small"-->
<!--placeholder="选择日期"/>-->
<!--<span>单据状态:</span>-->
<!--<el-select v-model="documentStatus" filterable placeholder="请选择" size="small" clearable>-->
<!--<el-option-->
<!--v-for="item in options"-->
<!--: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>-->
</el-col>
<el-col :span="16">
<div>
<!--<span>下调金额:（百分比）</span>-->
<!--<el-input v-model="money" size="small" clearable style="width: 90px"/>-->
<!--<el-tooltip :open-delay="1200" effect="dark" content="计算选入零件的价格" placement="top">-->
<!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>-->
<!--</el-tooltip>-->
<el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">选入零件</el-button>
<el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-top:3px" plain @click="getSpareParts">选入零件</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
<el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>

21
src/views/Outsourcing/OutsourcingTaskQuery/index.vue
View File

@@ -2,16 +2,8 @@
<div class="app-container">
<el-col :span="10">
<el-card>
<!--<span>表单号:</span>-->
<!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:150px"/>-->
<span>厂家:</span>
<el-input v-model="manufacturers" size="small" placeholder="厂家或外协任务单号" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()"/>
<!--<span>下达任务日期:</span>-->
<!--<el-date-picker-->
<!--v-model="time"-->
<!--type="date"-->
<!--size="small"-->
<!--placeholder="选择日期"/>-->
<el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
</el-card>
<el-card>
@@ -42,8 +34,8 @@
</el-col>
<el-col :span="14">
<el-card>
<el-button :disabled="loading=false" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
<el-table v-loading="loading" :data="List3" border size="mini" highlight-current-row height="595" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
<el-button :disabled="loading" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
<el-table v-loading="loading" :data="List3" border size="mini" height="595" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column
:selectable="selectable"
type="selection"
@@ -70,11 +62,6 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<!--<el-table-column label="外协工序" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.外协工序 }}-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
</el-card>
</el-col>
@@ -214,8 +201,8 @@ export default {
getTable(check, this.manufacturers, this.pageList, this.pageSize).then(response => {
this.total = parseInt(response.data.total)
this.List = response.data.rows
this.loading2 = false
})
this.loading2 = false
},
// 控制某行是否可选
selectable(row, index) {
@@ -223,8 +210,8 @@ export default {
},
// 查询
searchProcess(row) {
this.Number = row.外协加工任务单流水号
this.loading = true
this.Number = row.外协加工任务单流水号
this.List3 = []
getParts(row.外协加工任务单流水号).then(response => {
this.List3 = response.data

4
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -69,7 +69,7 @@
<span v-if="parseInt(scope.row.工序状态)===5" size="small">停产</span>
</template>
</el-table-column>
<el-table-column label="是否外协" width="75" align="center">
<el-table-column label="是否外协" width="80" align="center">
<template slot-scope="scope">
<el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)"/>
</template>
@@ -84,7 +84,7 @@
{{ scope.row.计划日期 }}
</template>
</el-table-column>
<el-table-column label="计划工时" align="center" width="85px">
<el-table-column label="计划工时" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.工序工时 }}
</template>

19
src/views/layout/components/AppMain.vue
View File

@@ -1,19 +1,30 @@
<template>
<section class="app-main">
<!-- <router-view :key="key"></router-view> -->
<transition name="fade-transform" mode="out-in">
<!-- or name="fade" -->
<!-- <router-view :key="key"></router-view> -->
<keep-alive>
<router-view/>
<keep-alive id="keepAlive">
<router-view v-if="$route.meta.keepAlive"/>
</keep-alive>
</transition>
<transition name="fade-transform" mode="out-in">
<router-view v-if="!$route.meta.keepAlive"/>
</transition>
</section>
</template>
<script>
import store from '@/store'
export default {
name: 'AppMain',
computed: {
keepAliveList() {
var keepAliveList = ''
store.state.tagsView.cachedViews.map(v => {
keepAliveList = keepAliveList + v + ','
})
console.log(keepAliveList)
return keepAliveList
}
// key() {
// return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
// }

20
src/views/layout/components/TagsView.vue
View File

@@ -54,12 +54,26 @@ export default {
methods: {
// generateTitle, // generateTitle by vue-i18n
generateRoute() {
switch (this.$route.name) {
// 生产监控
case 'EquipmentMonitoring':
document.getElementsByClassName('app-main')[0].style.width = '1710px'
document.getElementsByClassName('main-container')[0].style.minWidth = '1710px'
break
// 默认
default:
document.getElementsByClassName('app-main')[0].style.width = '1380px'
document.getElementsByClassName('main-container')[0].style.minWidth = '1380px'
}
if (this.$route.name) {
return this.$route
}
return false
},
isActive(route) {
if (!this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = true
}
return route.path === this.$route.path || route.name === this.$route.name
},
addViewTags() {
@@ -90,8 +104,14 @@ export default {
if (this.isActive(view)) {
const latestView = views.slice(-1)[0]
if (latestView) {
if (this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = false
}
this.$router.push(latestView.path)
} else {
if (this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = false
}
this.$router.push('/')
}
}