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

更新

Browse Source
This commit is contained in:
liushuai
2020-02-04 09:39:34 +08:00
parent 311e014375
commit 5f41045ae7
22 changed files with 521 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip Normal file
View File

Binary file not shown.

12
src/api/ManufacturingCenter/CreatePreparationBill.js
View File

@@ -49,3 +49,15 @@ export function edit2(num1) {
}
})
}
export function getExport(num1, num2, num3, num4) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询',
param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0'
}
})
}

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

@@ -47,6 +47,18 @@ export function getTable1(check, partNumber) {
}
})
}
// 打回
export function getBack(processPlan) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_外协零件_打回',
param: '工艺计划流水号=' + processPlan
}
})
}
// 获取零件工序信息（零件号表中）
export function getprocedure(processPlan, single) {
return request({

12
src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
View File

@@ -25,3 +25,15 @@ export function searchTable(check, supplierNameValue, check1, partNumber, check2
}
})
}
// 导出
export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_外购备料_综合查询数据',
param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue
}
})
}

BIN
src/assets/img/StationLayout.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 KiB

BIN
src/assets/img/StationLayout.psd Normal file
View File

Binary file not shown.

38
src/utils/request.js
View File

@@ -1,32 +1,32 @@
import axios from 'axios'
export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const wsuri = `ws://123.56.95.229:8010//WebMoudule//websocket`
export const name = `OP8888`
export const name1 = `OP1000`
export const name3 = `OP2000`
export const name4 = `OP9999`
// 创建axios实例
export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice
export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond
export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://123.56.95.229:8010/submit/upload2.ashx` // delivery
export const upload3 = `http://123.56.95.229:8010/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://123.56.95.229:8010/submit/uploadInvoiceScan.ashx` // invoice
export const uploadInvoiceScan1 = `http://123.56.95.229:8010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

54
src/views/Assembly/SparePartsOutStockRecord/index.vue
View File

@@ -2,27 +2,27 @@
<div class="app-container">
<el-card>
<el-row>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin: 3px 0;width: 130px" clearable @change="machineChange()">
<el-option
v-for="item in machineNumber"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span style="margin-left: 10px">组号:</span>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" style="width: 130px" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>机床编号:</span>-->
<!--<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin: 3px 0;width: 130px" clearable @change="machineChange()">-->
<!--<el-option-->
<!--v-for="item in machineNumber"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value">-->
<!--<div style="float: left">{{ item.label }}</div>-->
<!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
<!--</el-option>-->
<!--</el-select>-->
<!--<span style="margin-left: 10px">组号:</span>-->
<!--<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" style="width: 130px" clearable>-->
<!--<el-option-->
<!--v-for="item in groupNumber"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<span style="margin-left: 10px">零件图号:</span>
<el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 130px" size="small" clearable/>
<el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 150px" size="small" clearable/>
<span class="demonstration" style="margin-left: 10px">时间区间:</span>
<el-date-picker
v-model="startTime"
@@ -45,30 +45,30 @@
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 3px" height="550px">
<el-table-column label="项目名称" prop="项目名称" align="center">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 840px;margin-top: 3px" height="550px">
<el-table-column label="项目名称" prop="项目名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center">
<el-table-column label="机床图号" prop="机床图号" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center">
<el-table-column label="零件图号" prop="零件图号" align="center" width="225" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="出库时间" prop="出库时间" align="center">
<el-table-column label="出库时间" prop="出库时间" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.出库时间 }}
{{ scope.row.出库时间 | formatTime }}
</template>
</el-table-column>
</el-table>

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

@@ -321,7 +321,7 @@ export default {
this.dialogFormVisible2 = true
},
deleteProcess() {
this.$confirm('确定删除该合同?', '提示', {
this.$confirm('确定删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

106
src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span>项目名称</span>
<el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()">
<el-select v-model="projectValue" filterable clearable size="small" style="margin-right:10px;width: 180px" placeholder="项目名称" @change="typeChange">
<el-option
v-for="item in project"
:key="item.value"
@@ -10,13 +10,107 @@
:value="item.value"/>
</el-select>
<span>机床名称</span>
<el-select v-model="machineValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称">
<el-select v-model="machineValue" clearable filterable size="small" style="margin-right:10px;width: 150px" placeholder="机床名称">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>分组</span>
<el-select v-model="partValue" clearable filterable size="small" style="margin-right:10px;width: 80px" placeholder="分组">
<el-option
v-for="item in part"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>规格及型号</span>
<el-input v-model="specificationValue" clearable size="small" style="margin-right:10px;width: 150px" placeholder="规格型号"/>
<span>加工总工时（小时）:</span>
<el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/>
<span>计划总工时（小时）:</span>
<el-input v-model="totalPlannedHours" clearable size="small" style="margin-right:10px;width: 100px"/>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
</el-card>
<el-card>
<el-table :data="tableData" highlight-current-row border style="width: 100%;" size="mini" height="300">
<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="200">
<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="200">
<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="200">
<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="200">
<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="200">
<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="200">
<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="200">
<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>
</el-card>
</div>
</template>
@@ -29,7 +123,13 @@ export default {
project: [],
projectValue: '', // 项目名称
machineValue: '', // 机床名称
machine: []
machine: [],
part: [], // 分組
partValue: '',
specificationValue: '', // 规格型号
totalProcessingHours: '', // 加工总工时
totalPlannedHours: '', // 计划总工时
tableData: [] // 详情表
}
},
created() {

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

@@ -18,47 +18,51 @@
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button type="primary" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="760" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55"
width="50"
align="center"/>
<el-table-column label="打印状态" prop="备料打印" align="center">
<el-table-column label="备料分配" prop="备料分配" align="center" width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.备料打印!=='0'" type="success" size="mini">已导出</el-tag>
<el-tag v-else type="warning" size="mini">未导出</el-tag>
<el-tag v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</el-tag>
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</el-tag>
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" >
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" >
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" >
<el-table-column label="数量" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" >
<el-table-column label="材料" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="重量" align="center" >
<el-table-column label="重量" align="center" width="60" >
<template slot-scope="scope">
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="备料" align="center">
<el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
@@ -114,7 +118,7 @@
</template>
<script>
import { searchtable, searchtable2, edit, edit2 } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { searchtable, searchtable2, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { exportExcelMethod } from './exportExcel'
import $ from 'jquery'
export default {
@@ -161,6 +165,7 @@ export default {
this.partNamecheck = false
}
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
if (response.data.total === 0) {
this.loading = false
} else {
@@ -178,6 +183,7 @@ export default {
零件名称: this.Data[i].零件名称,
零件图号: this.Data[i].零件图号,
备料打印: this.Data[i].备料打印,
是否外购备料: this.Data[i].是否外购备料,
工艺要求: response.data[0].工艺要求,
材料: this.Data[i].材料,
重量: this.Data[i].重量,
@@ -242,9 +248,38 @@ export default {
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
},
exportExcel() {
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
} else {
this.partNamecheck = false
}
getExport(this.partNamecheck, this.partName, !this.all, 0).then(res => {
console.log(res.data)
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['备料分配', '零件名称', '零件图号', '数量', '材料', '重量', '工艺要求']
const filterVal = ['分配状态', '零件名称', '零件图号', '批次数量', '材料', '重量', '工艺要求']
const list = res.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '备料分配表',
autoWidth: true,
bookType: 'xlsx'
})
})
})
},
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
return v[j]
}))
}
}
}
</script>
<style scoped>

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

@@ -83,7 +83,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:149px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:199px;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;"/>
@@ -91,9 +91,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME150" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME150" :title="tooltip" style="position: relative;left:788px;top:10px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME150 }}</div>
<div :id="OPNAME150+circle" class="circle"/>
<!--<div :id="OPNAME102+fang" class="fang" style="margin-left: 9px"/>-->
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME102" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:76px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:50px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div>
<div :id="OPNAME102+circle" class="circle"/>
@@ -103,7 +113,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME103" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:71px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:41px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div>
<div :id="OPNAME103+circle" class="circle"/>
@@ -113,7 +123,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME104" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:66px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:36px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div>
<div :id="OPNAME104+circle" class="circle"/>
@@ -123,7 +133,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME105" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME105" :title="tooltip" style="position: relative;left:788px;top:61px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME105" :title="tooltip" style="position: relative;left:788px;top:31px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
<div :id="OPNAME105+circle" class="circle"/>
@@ -133,7 +143,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME145" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME145" :title="tooltip" style="position: relative;left:788px;top:55px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME145" :title="tooltip" style="position: relative;left:788px;top:25px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME145 }}</div>
<div :id="OPNAME145+circle" class="circle"/>
@@ -143,7 +153,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME106" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:50px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:20px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div>
<div :id="OPNAME106+circle" class="circle"/>
@@ -151,9 +161,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME1061" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME1061" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME1061 }}</div>
<div :id="OPNAME1061+circle" class="circle"/>
<!--<div :id="OPNAME106+fang" class="fang" style="margin-left: 9px"/>-->
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME107" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:43px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:8px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div>
<div :id="OPNAME107+circle" class="circle"/>
@@ -163,7 +183,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME108" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:38px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:3px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div>
<div :id="OPNAME108+circle" class="circle"/>
@@ -173,7 +193,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME109" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:32px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:-3px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div>
<div :id="OPNAME109+circle" class="circle"/>
@@ -181,9 +201,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME1091" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME1091" :title="tooltip" style="position: relative;left:788px;top:-8px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME1091 }}</div>
<div :id="OPNAME1091+circle" class="circle"/>
<!--<div :id="OPNAME109+fang" class="fang" style="margin-left: 9px"/>-->
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME110" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:27px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:-12px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div>
<div :id="OPNAME110+circle" class="circle"/>
@@ -193,7 +223,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME111" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:21px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:-18px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div>
<div :id="OPNAME111+circle" class="circle"/>
@@ -203,7 +233,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME112" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:-25px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div>
<div :id="OPNAME112+circle" class="circle"/>
@@ -213,7 +243,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME113" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-380px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div>
<div :id="OPNAME113+circle" class="circle"/>
@@ -223,7 +253,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME114" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-325px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div>
<div :id="OPNAME114+circle" class="circle"/>
@@ -233,7 +263,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME101" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME101" :title="tooltip" style="position: relative;left:895px;top:-225px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME101" :title="tooltip" style="position: relative;left:895px;top:-305px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div>
<div :id="OPNAME101+circle" class="circle"/>
@@ -243,7 +273,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME149" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME149" :title="tooltip" style="position: relative;left:895px;top:-190px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME149" :title="tooltip" style="position: relative;left:895px;top:-270px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME149 }}</div>
<div :id="OPNAME149+circle" class="circle"/>
@@ -253,7 +283,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME115" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-186px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-266px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div>
<div :id="OPNAME115+circle" class="circle"/>
@@ -263,7 +293,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME116" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-152px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-232px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div>
<div :id="OPNAME116+circle" class="circle"/>
@@ -273,7 +303,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME117" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-150px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-230px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div>
<div :id="OPNAME117+circle" class="circle"/>
@@ -283,7 +313,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME118" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME118" :title="tooltip" style="position: relative;left:1032px;top:-381px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME118" :title="tooltip" style="position: relative;left:1032px;top:-461px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME118+fang" class="fang"/>-->
<div :id="OPNAME118+circle" class="circle" style="margin-left: 13px"/>
@@ -293,7 +323,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME119" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME119" :title="tooltip" style="position: relative;left:1032px;top:-366px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME119" :title="tooltip" style="position: relative;left:1032px;top:-446px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME119+fang" class="fang"/>-->
<div :id="OPNAME119+circle" class="circle" style="margin-left: 13px"/>
@@ -303,7 +333,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME120" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME120" :title="tooltip" style="position: relative;left:1032px;top:-350px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME120" :title="tooltip" style="position: relative;left:1032px;top:-430px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME120+fang" class="fang"/>-->
<div :id="OPNAME120+circle" class="circle" style="margin-left: 13px"/>
@@ -313,7 +343,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME121" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME121" :title="tooltip" style="position: relative;left:1032px;top:-255px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME121" :title="tooltip" style="position: relative;left:1032px;top:-325px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME121+fang" class="fang"/>-->
<div :id="OPNAME121+circle" class="circle" style="margin-left: 13px"/>
@@ -323,7 +353,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME122" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME122" :title="tooltip" style="position: relative;left:1032px;top:-175px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME122" :title="tooltip" style="position: relative;left:1032px;top:-245px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME122+fang" class="fang"/>-->
<div :id="OPNAME122+circle" class="circle" style="margin-left: 13px"/>
@@ -333,7 +363,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME123" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME123" :title="tooltip" style="position: relative;left:1128px;top:-685px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME123" :title="tooltip" style="position: relative;left:1128px;top:-770px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME123+fang" class="fang"/>-->
<div :id="OPNAME123+circle" class="circle" style="margin-left: 13px"/>
@@ -343,7 +373,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME124" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME124" :title="tooltip" style="position: relative;left:1128px;top:-666px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME124" :title="tooltip" style="position: relative;left:1128px;top:-751px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME124+fang" class="fang"/>-->
<div :id="OPNAME124+circle" class="circle" style="margin-left: 13px"/>
@@ -353,7 +383,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME125" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME125" :title="tooltip" style="position: relative;left:1128px;top:-651px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME125" :title="tooltip" style="position: relative;left:1128px;top:-736px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME125+fang" class="fang"/>-->
<div :id="OPNAME125+circle" class="circle" style="margin-left: 13px"/>
@@ -363,7 +393,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME126" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME126" :title="tooltip" style="position: relative;left:1128px;top:-635px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME126" :title="tooltip" style="position: relative;left:1128px;top:-720px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME126+fang" class="fang"/>-->
<div :id="OPNAME126+circle" class="circle" style="margin-left: 13px"/>
@@ -373,7 +403,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME127" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME127" :title="tooltip" style="position: relative;left:1128px;top:-395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME127" :title="tooltip" style="position: relative;left:1128px;top:-445px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME127+fang" class="fang"/>-->
<div :id="OPNAME127+circle" class="circle" style="margin-left: 13px"/>
@@ -383,7 +413,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME128" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME128" :title="tooltip" style="position: relative;left:1128px;top:-374px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME128" :title="tooltip" style="position: relative;left:1128px;top:-444px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME128+fang" class="fang"/>-->
<div :id="OPNAME128+circle" class="circle" style="margin-left: 13px"/>
@@ -393,7 +423,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME129" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME129" :title="tooltip" style="position: relative;left:1280px;top:-828px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME129" :title="tooltip" style="position: relative;left:1280px;top:-908px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME129+fang" class="fang"/>-->
<div :id="OPNAME129+circle" class="circle" style="margin-left: 13px"/>
@@ -403,7 +433,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME130" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME130" :title="tooltip" style="position: relative;left:1280px;top:-818px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME130" :title="tooltip" style="position: relative;left:1280px;top:-898px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME130+fang" class="fang"/>-->
<div :id="OPNAME130+circle" class="circle" style="margin-left: 13px"/>
@@ -413,7 +443,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME131" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME131" :title="tooltip" style="position: relative;left:1280px;top:-778px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME131" :title="tooltip" style="position: relative;left:1280px;top:-858px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME131+fang" class="fang"/>-->
<div :id="OPNAME131+circle" class="circle" style="margin-left: 13px"/>
@@ -423,7 +453,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME132" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME132" :title="tooltip" style="position: relative;left:1280px;top:-700px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME132" :title="tooltip" style="position: relative;left:1280px;top:-780px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME132+fang" class="fang"/>-->
<div :id="OPNAME132+circle" class="circle" style="margin-left: 13px"/>
@@ -433,7 +463,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME133" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME133" :title="tooltip" style="position: relative;left:1283px;top:-697px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME133" :title="tooltip" style="position: relative;left:1283px;top:-777px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME133+fang" class="fang"/>-->
<div :id="OPNAME133+circle" class="circle" style="margin-left: 10px"/>
@@ -441,9 +471,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME1331" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME1331" :title="tooltip" style="position: relative;left:1283px;top:-777px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME1331+fang" class="fang"/>-->
<div :id="OPNAME1331+circle" class="circle" style="margin-left: 10px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME1331 }}</div>
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME134" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME134" :title="tooltip" style="position: relative;left:1280px;top:-605px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME134" :title="tooltip" style="position: relative;left:1280px;top:-705px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME134+fang" class="fang"/>-->
<div :id="OPNAME134+circle" class="circle" style="margin-left: 13px"/>
@@ -453,7 +493,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME135" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME135" :title="tooltip" style="position: relative;left:1280px;top:-590px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME135" :title="tooltip" style="position: relative;left:1280px;top:-630px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<div :id="OPNAME135+circle" class="circle" style="margin-left: 13px"/>
@@ -463,7 +503,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME146" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME146" :title="tooltip" style="position: relative;left:1460px;top:-1057px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME146" :title="tooltip" style="position: relative;left:1460px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>-->
@@ -473,7 +513,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME148" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME148" :title="tooltip" style="position: relative;left:1578px;top:-1085px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME148" :title="tooltip" style="position: relative;left:1578px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>-->
@@ -493,7 +533,7 @@
</el-tooltip>
<el-tooltip :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns1"/>
<div :title="tooltip" style="position: relative;left:520px;top:-1170px; width: 100px;height: 28px;">
<div :title="tooltip" style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 机床总装 }}</div>
</el-row>
@@ -501,7 +541,7 @@
</el-tooltip>
<el-tooltip :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns2"/>
<div :title="tooltip" style="position: relative;left:660px;top:-1198px; width: 100px;height: 28px;">
<div :title="tooltip" style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 部件装配 }}</div>
</el-row>
@@ -536,9 +576,11 @@ export default {
OPNAME104: 'OP1040',
OPNAME105: 'OP1050',
OPNAME106: 'OP1060',
OPNAME1061: 'OP1061',
OPNAME107: 'OP1070',
OPNAME108: 'OP1080',
OPNAME109: 'OP1090',
OPNAME1091: 'OP1091',
OPNAME110: 'OP1100',
OPNAME111: 'OP1110',
OPNAME112: 'OP1120',
@@ -563,6 +605,7 @@ export default {
OPNAME131: 'OP1310',
OPNAME132: 'OP1320',
OPNAME133: 'OP1330',
OPNAME1331: 'OP1331',
OPNAME134: 'OP1340',
OPNAME135: 'OP1350',
OPNAME136: 'OP1360',
@@ -579,6 +622,7 @@ export default {
OPNAME147: 'OP1470',
OPNAME148: 'OP1480',
OPNAME149: 'OP1490',
OPNAME150: 'OP1500',
timer: null,
opname: ''
}
@@ -873,7 +917,7 @@ export default {
width: 1690px;
height: 830px;
/*border: 1px solid red;*/
background: url('../../../assets/img/img26.jpg') repeat;
background: url('../../../assets/img/StationLayout.jpg') repeat;
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
overflow: hidden;

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

@@ -20,7 +20,7 @@
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" class="el-icon-search" size="small" style="margin-left: 220px;" @click="submit">完成</el-button>
<el-button :disabled="Name===1" type="success" class="el-icon-finished" size="small" style="margin-left: 220px;background-color: green" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 50%; float: left">

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

@@ -69,7 +69,7 @@
</el-table-column>
<el-table-column align="center" label="加工日期" width="100px">
<template slot-scope="scope">
{{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
{{ scope.row.操作时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="计划准结工时" width="100px">
@@ -132,8 +132,8 @@ export default {
return
}
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料']
const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料']
const tHeader = ['日期', '姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料']
const filterVal = ['操作时间', '姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料']
const list = this.tableData
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({

56
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -427,7 +427,7 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px;">
<el-table :data="tableData4" border stripe style="width: 200px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
<el-table :data="tableData4" border style="width: 200px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
<el-table-column label="部门" align="center" >
<template slot-scope="scope">
{{ scope.row.部门名称 }}
@@ -517,40 +517,40 @@
</el-dialog>
<!--客户选择-->
<el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="400px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 330px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
<el-table-column label="省份" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.省份 }}
</template>
</el-table-column>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 350px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
<!-- <el-table-column label="省份" align="center" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.省份 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="客户名称" align="center" >
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column label="联系人" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column label="联系电话" align="center">
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<!-- <el-table-column label="联系人" align="center" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ 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-pagination
:current-page="PageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize1"
:total="total1"
style="margin-top: 10px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
<!-- <el-pagination-->
<!-- :current-page="PageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="PageSize1"-->
<!-- :total="total1"-->
<!-- style="margin-top: 10px"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<div slot="footer" class="dialog-footer">
<el-button @click="offCustomerChange">取消</el-button>
<el-button type="primary" @click="getCustomerCode">确 定</el-button>
@@ -659,7 +659,7 @@ export default {
PageSize: 30,
total: null,
PageCurrent1: 1,
PageSize1: 30,
PageSize1: 100000,
total1: null,
infoDisable: true,
hetongID: '',

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

@@ -4,6 +4,7 @@
<span>零件号:</span>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button>
<el-button type="danger" size="mini" icon="el-icon-caret-right" style="margin-left:10px" @click="getBack()">打回车间</el-button>
<el-table
v-loading="loading1"
ref="multipleTable"
@@ -327,7 +328,7 @@
</template>
<script>
import { initOutHelp, getTable, getData1, getTable1, getprocedure, searchManufactor, spareParts, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber } from '@/api/Outsourcing/OutsourcingTaskExecution'
import { initOutHelp, getTable, getData1, getTable1, getprocedure, searchManufactor, spareParts, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber, getBack } from '@/api/Outsourcing/OutsourcingTaskExecution'
import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex'
@@ -1339,6 +1340,22 @@ export default {
handleSelectionChange(val) {
this.processNum = val
},
getBack() {
if (this.processNum.length !== 0) {
this.result = 0
for (let i = 0; i < this.processNum.length; i++) {
getBack(this.processNum[i].工艺计划流水号).then(response => {
this.result += parseInt(response.data[0].result)
if (this.processNum.length === this.result) {
this.$message.success('打回成功')
this.getList()
}
})
}
} else {
this.$message.warning('请勾选要打回的零件')
}
},
// 选入零件
getSpareParts() {
if (this.Number !== null) {

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

@@ -164,6 +164,15 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="handle(scope.row)">替换
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
@@ -339,7 +348,7 @@
<script>
import { sleep } from '../../../utils/tool'
import { unSpecificationQuery1, specificationQuery1, unSpecificationQueryWB1, specificationQueryWB1, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX1, update, searchOldParts, getMachineNames, transferWG1, allDelete, update1, searchMaterial1 } from '../../../api/TechnologyCenter/ImportParts'
import { unSpecificationQuery1, updateNum, specificationQuery1, unSpecificationQueryWB1, specificationQueryWB1, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX1, update, searchOldParts, getMachineNames, transferWG1, allDelete, update1, searchMaterial1 } from '../../../api/TechnologyCenter/ImportParts'
export default {
name: 'SpecificationData',
props: {
@@ -383,6 +392,7 @@ export default {
oldPartsValue: '',
Number: '',
Type: '',
NumId: '', // 物料流水号
PartsValue: [],
PartsValueNum: '',
type: 0, // 零件类型 暂定1为基本件，2为外购件和标准件
@@ -547,6 +557,7 @@ export default {
},
searchMaterial1(row) {
console.log(row)
this.NumId = row.id
searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => {
this.tableData10 = response.data
console.log(response.data)
@@ -638,6 +649,28 @@ export default {
console.log(`编辑类型发生错误`)
}
},
handle(row) {
this.$confirm('是否替换?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
updateNum(row.物料流水号, this.NumId).then(response => {
if (response.data[0].result === '1') {
this.$message.success('替换成功')
this.tableData10 = []
this.fetchData()
} else {
this.$message.error('替换失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消替换'
})
})
},
cancel() {
this.dialogFormVisible = false
},

24
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -16,27 +16,27 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" width="65" align="center">
<el-table-column label="组号" prop="组号" width="55" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" min-width="120" align="center">
<el-table-column label="零件图号" prop="零件图号" min-width="120" width="155" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" width="100" align="center">
<el-table-column label="零件名称" prop="零件名称" width="110" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" width="50" align="center">
<el-table-column label="数量" width="45" align="center">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" prop="材料" width="85" align="center">
<el-table-column label="材料" prop="材料" width="85" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
@@ -96,12 +96,12 @@
{{ scope.row.采购单名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" show-overflow-tooltip>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="230" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="采购员" prop="姓名" align="center" width="70">
<el-table-column label="采购员" prop="姓名" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -137,7 +137,7 @@
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize2"
:total="total2"
style="display:inline-block;width:40%;float: right"
style="display:inline-block;width:40%;float: right;margin-right: 60px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
@@ -150,7 +150,7 @@
<el-tag v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</el-tag>
</template>
</el-table-column>
<el-table-column label="物料编码" prop="物料零件编码" align="center" width="140">
<el-table-column label="物料编码" prop="物料零件编码" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料零件编码 }}
</template>
@@ -185,11 +185,11 @@
<el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注1" size="mini" style="width:100%" @change="saveRemarks(scope.$index, scope.row)"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="110px" fixed="right">
<el-table-column label="操作" align="center" width="90px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="物料移出" placement="top">
<el-tooltip :open-delay="1000" effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="info" size="mini" icon="el-icon-right" plain @click="deleteMateriel(scope.row)">物料移出</el-button>
<el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="info" size="mini" icon="el-icon-right" plain @click="deleteMateriel(scope.row)">移出</el-button>
</div>
</el-tooltip>
</template>

56
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -83,6 +83,7 @@
</el-card>
<el-card style="width: 54%;float: left;margin-left: 10px">
<span>到货单明细</span>
<!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
<el-table
v-loading=""
:data="tableData5"
@@ -96,7 +97,7 @@
size="mini"
@row-click="searchTable6">
<el-table-column width="60" align="center" type="index" label="序号"/>
<el-table-column label="材料" prop="材料" align="center" width="200">
<el-table-column label="材料" prop="材料" align="center" width="180">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
@@ -495,15 +496,15 @@
</el-dialog>
</div>
</template>
<script>
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5,
searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6, searchLxPurchaseOrder, searchLxMateriel } from '@/api/WorkshopProcurement/NewArrivalList.js'
import { mapGetters } from 'vuex'
// import { ExcelWaiGou } from '@/utils/request'
export default {
data() {
return {
excle_row: [],
supplierNameValue: '',
supplierName: [], // 供应商
partNumber: '',
@@ -908,6 +909,7 @@ export default {
})
},
searchTable5(row) {
this.excle_row = row
console.log(this.userId, this.id)
this.disable = row.是否关联
console.log(this.disable)
@@ -1121,9 +1123,57 @@ export default {
message: '已取消操作'
})
})
},
// downloadExcel() {
// const _ExcelWaiGou = ExcelWaiGou
// this.download(`${_ExcelWaiGou}?type=Excel_NewArrivalList&folename=外购单&rec1=${this.excle_row.到货单流水号}&rec2=${this.excle_row.到货单流水号}&rec3=${this.excle_row.到货单流水号}&rec4=${this.excle_row.到货单流水号}`)
// },
/**
* 下载
* @param {String} url 目标文件地址
* @param {String} filename 想要保存的文件名称
*/
download(url) {
this.getBlob(url, function(blob, filename) {
saveAs(blob, filename)
})
},
getBlob(url, cb) {
var xhr = new XMLHttpRequest()
xhr.open('GET', url, true)
xhr.responseType = 'blob'
xhr.onload = function() {
if (xhr.status === 200) {
console.log(xhr, 1111)
const name = xhr.getResponseHeader('content-disposition').split('=')[1]
cb(xhr.response, name)
}
}
xhr.send()
}
}
}
/**
* 保存
* @param {Blob} blob
* @param {String} filename 想要保存的文件名称
*/
function saveAs(blob, filename = '下载文件.xls') {
if (window.navigator.msSaveOrOpenBlob) {
navigator.msSaveBlob(blob, filename)
} else {
var link = document.createElement('a')
var body = document.querySelector('body')
link.href = window.URL.createObjectURL(blob)
link.download = filename
// fix Firefox
link.style.display = 'none'
body.appendChild(link)
link.click()
body.removeChild(link)
window.URL.revokeObjectURL(link.href)
}
}
</script>
<style scoped>

2
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -34,7 +34,7 @@
<el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
</el-tooltip>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增发票</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增到票</el-button>
</el-row>
</el-card>
<el-card style="width: 58%;float: left">

34
src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
View File

@@ -21,6 +21,7 @@
:value="item.value"/>
</el-select>
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
</div>
</el-card>
<el-card style="width: 72%">
@@ -116,7 +117,7 @@
</template>
<script>
import { searchSupplier, searchTable } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
import { searchSupplier, searchTable, searchTablesheet } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
export default {
name: 'Index',
data() {
@@ -147,6 +148,37 @@ export default {
this.getTableData()
},
methods: {
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
return v[j]
}))
},
exportExcel() {
let check, check1, check2
this.supplierNameValue ? check = 1 : check = 0
this.partNumber ? check1 = 1 : check1 = 0
if (this.MaterialsValue !== '' && this.MaterialsValue !== null) {
check2 = 1
} else {
check2 = 0
}
searchTablesheet(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue).then(res => {
console.log(res.data, 11)
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['备料状态', '供应商', '物料编码', '物料名称', '材料', '备件件数', '备料时间', '到货件数', '到货时间', '结算时间']
const filterVal = ['是否到货', '供应商名称', '物料编码', '零件名称', '材料', '采购数量', '下单日期', '到货数量', '日期', '开票时间']
const list = res.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '外购备料',
autoWidth: true,
bookType: 'xlsx'
})
})
})
},
fetchData() {
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) {

23
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -70,9 +70,9 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="150">
<el-table-column label="请款时间" align="center" min-width="150" prop="date">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
{{ scope.row.请款时间 | formatTime }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="80">
@@ -82,7 +82,7 @@
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="请款付款情况" align="center">
@@ -134,7 +134,7 @@
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="采购计划请款" center style="min-height: 300px" width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
<span>供应商：</span>
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
<el-option
@@ -150,7 +150,7 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="250">
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -160,6 +160,11 @@
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column label="开票时间" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.开票时间 | formatTime }}
</template>
</el-table-column>
</el-table>
<span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
<el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
@@ -237,6 +242,14 @@ export default {
this.searchTable1()
},
methods: {
// dateFormat(row, column) {
// var date = row[column.property]
// console.log(date)
// if (date === undefined) {
// return ''
// }
// return util.formatDate.format(new Date(date), 'yyyy-MM-dd')
// },
fetchData() {
this.supplier = []
searchOfflineContract().then(response => {