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

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

Browse Source
This commit is contained in:
zhangdingyu
2020-01-09 16:40:17 +08:00
parent 7e5b6cfafd c919b7f11a
commit dbef495265
7 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/api/ManufacturingCenter/ProcessingStatusNew.js
View File

@@ -110,3 +110,22 @@ export function submitEdit(Number1, completetime, processSerialNumber) {
}
})
}
export function getExport(num) {
return request({
url: '',
method: 'post',
data: {
type: '3',
name: `select s1.* from (
select a1.*, row_number() over (partition by 工艺计划流水号 order
by 工序顺序) as group_idx
from (select TOP 100 PERCENT 零件图号,工艺计划流水号,机床流水号,工序顺序,工艺名称,材料,零件名称,投产数量,组号,机床图号 from dbo.车间生产管理工艺_零件工序_视图
where 考核状态 =6 and 机床流水号 = ${num} and 工艺编号 is not null and 完成日期 is null
group by 零件图号,工艺计划流水号,考核状态,机床流水号,工艺名称,工序顺序,材料,零件名称,投产数量,组号,机床图号
order by 工艺计划流水号,工序顺序) as a1 ) s1
where s1.group_idx= 1`
}
})
}

7
src/utils/request.js
View File

@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
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 url = `http://192.168.0.107:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.0.107:8079/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
@@ -26,7 +26,8 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

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

@@ -173,7 +173,7 @@ export default {
firstLevel.children = []
for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购'),
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' + response.data[j].考核状态名称 : (response.data[j].零件类型 === 2 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0制造采购' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购')),
value: response.data[j].工艺计划流水号,
考核状态: response.data[j].考核状态,
采购状态: response.data[j].采购状态,

18
src/views/ManufacturingCenter/OnlineProcessChange/index.vue
View File

@@ -506,7 +506,6 @@ import {
readyChange,
TableAddLi1,
TableAddLi,
getPartnames3,
getPartnames4,
modifyRemark,
detailInfo
@@ -1109,22 +1108,6 @@ export default {
searchPartsByMachineGroup() {
this.tableData = []
this.partNum = []
if (this.radio === 1) { // 未编制
this.disabled = false
this.isShow1 = true
this.isShow2 = false
this.checked1 = true
getPartnames3(this.machine_Group_part).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.partNum.push({
label: response.data[i].零件图号,
value: response.data[i].工艺计划流水号,
machine: response.data[i].机床图号,
group: response.data[i].组号
})
}
})
} else { // 已编制
this.isShow = true
this.isShow1 = false
this.isShow2 = true
@@ -1140,7 +1123,6 @@ export default {
})
}
})
}
},
searchParts() { // 根据条件查零件号
this.tableData = []

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

@@ -21,9 +21,10 @@
</el-select>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
</el-card>
<el-row>
<el-col style="width: 40%">
<el-col style="width: 37%">
<el-card>
<el-table
:data="tableData1"
@@ -36,7 +37,7 @@
border
@current-change="getRow">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工艺名" show-overflow-tooltip width="70">
<el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -56,11 +57,11 @@
{{ scope.row.操作者 }}
</template>
</el-table-column>
<el-table-column align="center" label="排产日期" width="95">
<template slot-scope="scope">
{{ scope.row.排产日期 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="排产日期" width="95">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.排产日期 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="完成日期" width="95">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
@@ -69,7 +70,7 @@
</el-table>
</el-card>
</el-col>
<el-col style="width: 60%">
<el-col style="width: 63%">
<el-card>
<el-table
:data="tableData"
@@ -80,16 +81,16 @@
border
height="630"
@current-change="getCurrentRow">
<el-table-column type="index" align="center" label="序号" width="80">
<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="跟单号" width="80">
<template slot-scope="scope">
{{ scope.row.跟单号 }}
<el-radio :label="scope.row.跟单号" v-model="radio"/>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="跟单号" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.跟单号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -210,7 +211,7 @@
</template>
<script>
import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit } from '@/api/ManufacturingCenter/ProcessingStatusNew'
import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit, getExport } from '@/api/ManufacturingCenter/ProcessingStatusNew'
import Cookie from 'js-cookie'
export default {
@@ -264,6 +265,33 @@ export default {
this.getTable9()
},
methods: {
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
return v[j]
}))
},
exportExcel() {
if (!this.Machine) {
this.$message.warning('请选择机床')
return
}
getExport(this.Machine).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'
})
})
})
},
getMachine() {
if (Cookie.get('machineValue') !== undefined) {
this.Machine = ''

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

@@ -37,7 +37,7 @@
{{ scope.row.设备总工时 }}
</template>
</el-table-column>
<el-table-column label="录入准结工时" align="center" width="100px">
<el-table-column label="录入准结" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.修补准结总工时 }}
</template>
@@ -66,7 +66,7 @@
<el-col :span="15">
<el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<el-table-column label="零件图号" align="center" width="135px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -96,12 +96,12 @@
{{ scope.row.设备工时 }}
</template>
</el-table-column>
<el-table-column label="录入准结工时" align="center" width="100px">
<el-table-column label="录入准结" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.修补准结工时 }}
</template>
</el-table-column>
<el-table-column label="加工时间" align="center" width="135px">
<el-table-column label="加工时间" align="center" width="115px">
<template slot-scope="scope">
{{ scope.row.操作时间 }}
</template>

10
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -233,21 +233,23 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block">
<div class="block" style="display: inline-block;">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:50px"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
<div style="display: inline-block; float: left">
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button
type="warning"
size="small"
style="margin: 0px 20px"
style="margin: 0px 20px; display: inline-block;"
@click="addInquirySheet">选入物料</el-button>
</el-tooltip>
</div>
@@ -1188,7 +1190,7 @@ export default {
tableData11: [], // 外购件列表
total11: 0,
pageCurrent11: 1,
pageSize11: 1000,
pageSize11: 50,
tableData12: [], // 基本件列表
total12: 0,
pageCurrent12: 1,