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

conflict

Browse Source
This commit is contained in:
chenjianan
2019-06-14 08:18:40 +08:00
parent a374ea5c8d 8b9c1033da
commit a6082d08cc
22 changed files with 855 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>高精机电装备有限公司数字化工厂</title>
</head>
<body>
<body style="background-color: #eeeeee">
<script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
<div id="app"></div>
<script></script>

14
src/api/Assembly/QualityInspectionInformationInquiry.js
View File

@@ -34,7 +34,7 @@ export function searchgroup(num) {
}
})
}
// 组件查询
// 质检管理_质量情况_查询数据
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, pageCurrent, pageSize) {
return request({
url: '',
@@ -48,4 +48,14 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
}
})
}
export function searchPic(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '质检管理_图片_查询数据',
param: '质检流水号=' + num
}
})
}

103
src/api/BasicData/PartsNumberMaintenance.js
View File

@@ -34,7 +34,42 @@ export function groupSelect(machineValue) {
}
})
}
export function searchTable5(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_外购件和标准件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function searchTable6(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_基本件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function searchTable7(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_外购件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function basicPartsData(project_check, project, machine_check, machine, group_check, group, pageSize, pageCurrent) {
return request({
url: '',
@@ -70,6 +105,61 @@ export function deleteBasicParts(basicNum) {
}
})
}
export function alldelete(basicNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_基本件_删除数据_根据组件流水号',
param: `组件流水号=${basicNum}`
}
})
}
export function deleteBasicParts5(basicNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_外购件和标准件_临时表_删除',
param: `id=${basicNum}`
}
})
}
export function alldeleteBasicParts5(project, machine, group) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_外购件和标准件_临时表_全部删除',
param: `项目=${project}&机床=${machine}&组号=${group}`
}
})
}
export function deleteBasicParts6(basicNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_基本件_临时表_删除',
param: `id=${basicNum}`
}
})
}
export function alldeleteBasicParts6(project, machine, group) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_基本件_临时表_全部删除',
param: `项目=${project}&机床=${machine}&组号=${group}`
}
})
}
export function deletePurchaseData(num) {
return request({
url: '',
@@ -81,6 +171,17 @@ export function deletePurchaseData(num) {
}
})
}
export function alldeleteWB(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_标准件和外购件_删除数据_根据组件流水号',
param: '组件流水号=' + num + '=int'
}
})
}
export function editPurchaseData(num, num1) {
return request({
url: '',

14
src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
View File

@@ -57,7 +57,7 @@ export function JurisdictionControl(num1, num2) {
}
})
}
// 所有工序
// 所有工序(原）
export function getTable2(stepNumber) {
return request({
url: '',
@@ -69,6 +69,18 @@ export function getTable2(stepNumber) {
}
})
}
// 所有工序(新)
export function getTable3(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_加工进度修改2_查询',
param: '工艺计划流水号=' + stepNumber
}
})
}
// 正在加工零件
export function searchParts(stepNumber) {
return request({

2
src/api/ManufacturingCenter/ProcessingStatus.js
View File

@@ -69,7 +69,7 @@ export function getExport(num) {
name: `select 机床流水号,机床图号,组件流水号,组号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
from ( select 工艺计划流水号,min(工序顺序) as 待加工工序顺序
from 车间生产管理工艺_零件工序_视图
where 完成日期_短 is null and 考核状态 = 6
where 完成日期_短 is null and 考核状态 = 6 or 考核状态 = 7
group by 工艺计划流水号) as 当前加工工序表
inner join 车间生产管理工艺_零件工艺计划 on 当前加工工序表.工艺计划流水号 = 车间生产管理工艺_零件工艺计划.工艺计划流水号
inner join 车间生产管理工艺_零件工序 on 当前加工工序表.工艺计划流水号 = 车间生产管理工艺_零件工序.工艺计划流水号 and 当前加工工序表.待加工工序顺序 = 车间生产管理工艺_零件工序.工序顺序

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

@@ -47,3 +47,15 @@ export function searchtable2(machineValue, type) {
}
})
}
export function searchtable5(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '项目计划管理_项目总计划_查询数据',
param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12,
Pagination: pageCurrent + '&' + pageSize
}
})
}

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

@@ -49,14 +49,14 @@ export function getprocedure(processPlan, single) {
})
}
// 外协厂家查询
export function searchManufactor(name) {
export function searchManufactor(check, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
}
})
}

3
src/store/getters.js
View File

@@ -9,6 +9,7 @@ const getters = {
cachedViews: state => state.tagsView.cachedViews,
permission_routers: state => state.permission.routers,
addRouters: state => state.permission.addRouters,
id: state => state.user.id
id: state => state.user.id,
userId: state => state.user.userId
}
export default getters

9
src/store/modules/user.js
View File

@@ -7,7 +7,8 @@ const user = {
token: getToken(),
name: Cookies.get('name'),
roles: [],
id: Cookies.get('id')
id: Cookies.get('id'),
userId: Cookies.get('userId')
},
mutations: {
@@ -22,6 +23,9 @@ const user = {
},
SET_ID: (state, id) => {
state.id = id
},
SET_userId: (state, userId) => {
state.userId = userId
}
},
@@ -39,9 +43,11 @@ const user = {
setToken(data[0].角色编号)
Cookies.set('id', data[0].人员编号, { expires: 1 })
Cookies.set('name', data[0].姓名, { expires: 1 })
Cookies.set('userId', data[0].考勤编号, { expires: 1 })
commit('SET_TOKEN', data[0].角色编号)
commit('SET_NAME', data[0].姓名)
commit('SET_ID', data[0].人员编号)
commit('SET_userId', data[0].考勤编号)
resolve()
}
}).catch(error => {
@@ -68,6 +74,7 @@ const user = {
commit('SET_TOKEN', '')
Cookies.remove('name')
Cookies.remove('id')
Cookies.remove('userId')
removeToken()
resolve()
})

24
src/styles/element-ui.scss
View File

@@ -27,12 +27,24 @@
}
}
}
//.el-table td, .el-table th.is-leaf{
// border-bottom: 1px solid DarkGray;
// border-left: 1px solid DarkGray;
// border-top: 1px solid DarkGray;
// border-right: 1px solid DarkGray;
//}
.el-table th{
background-color: rgb(98, 157, 209);
color: white;
}
.el-tree-node__content>.el-tree-node__expand-icon{
display: none;
}
.el-table td, .is-leaf{
background-color: rgb(213, 230, 347);
color: black;
font-weight:400
}
.el-table--striped .el-table__body tr.el-table__row--striped td{
background-color: rgb(255, 255, 255);
}
.el-table thead.is-group th{
background-color: rgb(98, 157, 209);
}
.el-textarea__inner,
.el-radio__inner,
.el-input__inner{

21
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -144,16 +144,17 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="600px">
<div class="demo-image__lazy">
<el-image v-for="url in urls" :key="url" :src="url" lazy/>
</div>
<el-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="1100px">
<viewer>
<img v-for="url in urls" :key="url" :src="url" lazy style="width: 1000px;height: 700px">
</viewer>
</el-dialog>
</div>
</template>
<script>
import { initProject, searchgroup, selecttable, QualityType } from '@/api/Assembly/QualityInspectionInformationInquiry'
import { initProject, searchgroup, selecttable, QualityType, searchPic } from '@/api/Assembly/QualityInspectionInformationInquiry'
import { readFile } from '@/utils/request'
// import { mapGetters } from 'vuex'
export default {
data() {
@@ -163,6 +164,7 @@ export default {
startTime: '',
endTime: '',
urls: [],
URL: '',
number: '',
groupNumberValue: '',
groupNumber: [],
@@ -234,6 +236,15 @@ export default {
},
viewPicture(row) {
this.dialogFormVisible = true
console.log(row)
searchPic(row.质检流水号).then(response => {
console.log(response.data, 222)
this.urls = []
// this.URL = readFile + response.data[0].文件标识 + '.' + response.data[0].文件后缀
for (let i = 0; i < response.data.length; i++) {
this.urls.push(readFile + response.data[i].文件标识 + '.' + response.data[i].文件后缀)
}
})
},
// 分页
handleSizeChange(val) {

311
src/views/BasicData/PartsNumberMaintenance/index.vue
View File

@@ -9,7 +9,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号</span>
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
<el-option
@@ -34,7 +33,10 @@
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData();pageCurrent1 = 1;pageSize1 = 10;getTable();pageCurrent2 = 1;pageSize2 = 10;getTable1()">查询</el-button>
</el-card>
<el-card>
<div style="font-size: 20px;margin-bottom: 20px">基本件三表数量</div>
<div>
<span style="font-size: 20px;margin-bottom: 20px">基本件三表数量</span>
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
</div>
<el-table
v-loading="loading"
:data="tableData"
@@ -144,7 +146,10 @@
</div>
</el-card>
<el-card>
<div style="font-size: 20px;margin-bottom: 20px">外购件和标准件三表数量</div>
<div>
<span style="font-size: 20px;margin-bottom: 20px">外购件和标准件三表数量</span>
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
</div>
<el-table
v-loading="loadingWB"
:data="tableDataWB"
@@ -493,6 +498,125 @@
</el-tab-pane>
</el-tabs>
</el-card>
<el-card>
<div>
<span style="font-size: 20px">临时表</span>
<el-button style="float: right" type="danger" size="small" @click="alldelete5()">全部删除</el-button>
</div>
<el-tabs v-model="activeName" style="margin-top: 20px" type="border-card" @tab-click="searchTable5();searchTable6()">
<el-tab-pane label="标准件和外购件" name="1">
<el-table :data="tableData5" size="mini" style="max-height: 320px" height="320px" border>
<el-table-column align="center" label="项目" min-width="100px">
<template slot-scope="scope">
{{ scope.row.项目 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床" min-width="80px">
<template slot-scope="scope">
{{ scope.row.机床 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料名称" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料规格" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料型号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="装机数量" min-width="100px">
<template slot-scope="scope">
{{ scope.row.装机数量 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="handleDelete5(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent5"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize5"
:total="total5"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="2">
<el-table :data="tableData6" size="mini" style="max-height: 320px" height="320px" border>
<el-table-column align="center" label="项目" min-width="100px">
<template slot-scope="scope">
{{ scope.row.项目 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床" min-width="80px">
<template slot-scope="scope">
{{ scope.row.机床 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="图号或者型号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.图号或者型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="材料或者规格" min-width="100px">
<template slot-scope="scope">
{{ scope.row.材料或者规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="装机数量" min-width="100px">
<template slot-scope="scope">
{{ scope.row.装机数量 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="handleDelete6(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent6"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize6"
:total="total6"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange6"
@current-change="handleCurrentChange6"/>
</div>
</el-tab-pane>
</el-tabs>
</el-card>
<el-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="数量" prop="数量">
@@ -510,12 +634,14 @@
</template>
<script>
import { projectSelect, machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, editPurchaseData, editBasicParts, getTable, editProductNum, getTable1, editProduceNum, searchTable1, searchTable2, editGroupBasicPartNum, editGroupPartNum } from '@/api/BasicData/PartsNumberMaintenance'
import { alldeleteWB, alldelete, projectSelect, machineSelect, groupSelect, basicPartsData, deleteBasicParts, deleteBasicParts5, deleteBasicParts6, alldeleteBasicParts5, alldeleteBasicParts6, purchasePartsData, deletePurchaseData, editPurchaseData, editBasicParts, getTable, editProductNum, getTable1, editProduceNum, searchTable1, searchTable2, searchTable5, searchTable6, searchTable7, editGroupBasicPartNum, editGroupPartNum } from '@/api/BasicData/PartsNumberMaintenance'
export default {
name: 'Index',
data() {
return {
activeName: '1',
projectValue: '',
projectName: '',
BasicParts: '',
PurchaseData: '',
productNum: '',
@@ -526,6 +652,7 @@ export default {
type: '',
project: [],
machineValue: '',
machineName: '',
machine: [],
groupValue: '',
group: [],
@@ -543,6 +670,10 @@ export default {
tableData1: [],
tableData2: [],
tableData3: [],
tableData4: [],
tableData5: [],
tableData6: [],
tableData7: [],
tableDataWB: [],
pageCurrent: 1,
pageSize: 10,
@@ -558,6 +689,15 @@ export default {
pageCurrent4: 1,
pageSize4: 10,
total4: 0,
pageCurrent5: 1,
pageSize5: 10,
total5: 0,
pageCurrent6: 1,
pageSize6: 10,
total6: 0,
pageCurrent7: 1,
pageSize7: 10,
total7: 0,
pageCurrentWB: 1,
pageSizeWB: 10,
totalWB: 0
@@ -574,12 +714,16 @@ export default {
},
watch: {
project(val) {
console.log(val)
if (val.length > 0) {
this.projectValue = val[0].value
}
},
projectValue(val) {
for (let i = 0; i < this.project.length; i++) {
if (this.project[i].value === this.projectValue) {
this.projectName = this.project[i].label
}
}
this.machineValue = ''
this.machine = []
this.groupValue = ''
@@ -591,6 +735,11 @@ export default {
machine(val) {
if (val.length > 0) {
this.machineValue = val[0].value
for (let i = 0; i < this.machine.length; i++) {
if (this.machine[i].value === val[0].value) {
this.machineName = this.machine[i].label
}
}
}
},
machineValue(val) {
@@ -611,11 +760,14 @@ export default {
this.pageSizeWB = 10
this.pageCurrent = 1
this.pageSize = 10
// console.log(this.projectName, this.machineName, this.groupName)
this.getTableData()
this.getTable()
this.getTable1()
this.searchTable1()
this.searchTable2()
this.searchTable5()
this.searchTable6()
}
}
},
@@ -632,6 +784,76 @@ export default {
getGroupSelect(val) {
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
},
alldelete5() {
this.$confirm('此操作将永久删除所有数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.activeName === '1') {
alldeleteBasicParts5(this.projectName, this.machineName, this.groupName).then(res => {
console.log(res, 1)
if (res.data[0].result === '1') {
this.$message.success('删除成功')
this.searchTable5()
this.searchTable6()
} else { this.$message.error('删除失败') }
})
} else if (this.activeName === '2') {
alldeleteBasicParts6(this.projectName, this.machineName, this.groupName).then(res => {
console.log(res, 2)
if (res.data[0].result === '1') {
this.$message.success('删除成功')
this.searchTable5()
this.searchTable6()
} else { this.$message.error('删除失败') }
})
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
alldelete() {
this.$confirm('此操作将永久删除所有数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
alldelete(this.groupValue).then(res => {
if (res.data[0].result === '1') {
this.$message.success('删除成功')
this.getTableData()
} else { this.$message.error('删除失败') }
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
alldeleteWB() {
this.$confirm('此操作将永久删除所有数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
alldeleteWB(this.groupValue).then(res => {
if (res.data[0].result === '1') {
this.$message.success('删除成功')
this.getTableData()
} else { this.$message.error('删除失败') }
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
getTableData() {
const project_check = this.projectValue ? 1 : 0
const machine_check = this.machineValue ? 1 : 0
@@ -641,7 +863,7 @@ export default {
this.loading = false
const res = response.data
this.total = res.total
console.log(this.tableData)
// console.log(this.tableData)
this.tableData = res.rows.map(item => {
if (item.整改类型 === '1') {
item.整改类型 = '新增'
@@ -744,6 +966,40 @@ export default {
this.total4 = response.data.total
})
},
searchTable5() { // 查询标准件
let check0, check1, check2
this.projectName ? check2 = 1 : check2 = 0
this.machineName ? check0 = 1 : check0 = 0
this.groupName ? check1 = 1 : check1 = 0
searchTable5(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
console.log(response, 5, this.activeName)
this.tableData5 = response.data.rows
this.total5 = response.data.total
})
},
searchTable6() { // 查询基本件
let check0, check1, check2
this.projectName ? check2 = 1 : check2 = 0
this.machineName ? check0 = 1 : check0 = 0
this.groupName ? check1 = 1 : check1 = 0
// console.log(this.projectName, this.machineName, this.groupName, 44)
searchTable6(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
console.log(response, 6)
this.tableData6 = response.data.rows
this.total6 = response.data.total
})
},
searchTable7() { // 查询外购件
let check0, check1, check2
this.projectName ? check2 = 1 : check2 = 0
this.machineName ? check0 = 1 : check0 = 0
this.groupName ? check1 = 1 : check1 = 0
searchTable7(this.pageCurrent7, this.pageSize7, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
console.log(response, 7)
this.tableData7 = response.data.rows
this.total7 = response.data.total
})
},
handleEdit(row) {
this.BasicParts = ''
this.PurchaseData = ''
@@ -842,6 +1098,22 @@ export default {
})
}
},
handleDelete5(row) {
if (row.id) {
this.deleteRow(deleteBasicParts5, row.id, function() {
this.searchTable5()
this.searchTable6()
})
}
},
handleDelete6(row) {
if (row.id) {
this.deleteRow(deleteBasicParts6, row.id, function() {
this.searchTable5()
this.searchTable6()
})
}
},
handleSizeChanges(val) {
this.pageCurrent = 1
this.pageSize = val
@@ -895,6 +1167,33 @@ export default {
handleCurrentChange4(val) {
this.pageCurrent4 = val
this.searchTable2()
},
handleSizeChange5(val) {
this.pageSize5 = val
this.pageCurrent5 = 1
this.searchTable5()
},
handleCurrentChange5(val) {
this.pageCurrent5 = val
this.searchTable5()
},
handleSizeChange6(val) {
this.pageSize6 = val
this.pageCurrent6 = 1
this.searchTable6()
},
handleCurrentChange6(val) {
this.pageCurrent6 = val
this.searchTable6()
},
handleSizeChange7(val) {
this.pageSize7 = val
this.pageCurrent7 = 1
this.searchTable7()
},
handleCurrentChange7(val) {
this.pageCurrent7 = val
this.searchTable7()
}
}
}

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

@@ -755,6 +755,7 @@ export default {
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
console.log(val)
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
@@ -786,7 +787,8 @@ export default {
} else {
this.check5 = 0
}
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
@@ -837,7 +839,7 @@ export default {
} else {
this.check5 = 0
}
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]

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

@@ -320,7 +320,7 @@
</template>
<script>
import { searchParts, getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl, JurisdictionContro2, outParts } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
import { searchParts, getMachine, getMachine2, searchtable, getTable3, Order, JurisdictionControl, JurisdictionContro2, outParts } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
import { wsuri, name } from '@/utils/request'
export default {
data() {
@@ -379,7 +379,7 @@ export default {
})
},
getRowKeys(row) {
return row.零件图号
return row.工艺计划流水号
},
selectMachine(row) {
this.process = []
@@ -388,7 +388,7 @@ export default {
this.colorCode = []
this.realDate = []
this.tableData2 = []
getTable2(row.零件图号).then(response => {
getTable3(row.工艺计划流水号).then(response => {
for (let k = 0; k < response.data.length; k++) {
this.process[k] = response.data[k].工艺名称简称
this.planDate[k] = response.data[k].计划日期_短
@@ -469,18 +469,18 @@ export default {
},
searchTable2(row) {
if (this.a === 1) {
this.expands.push(row.零件图号)
this.b = row.零件图号
this.expands.push(row.工艺计划流水号)
this.b = row.工艺计划流水号
this.a = 0
} else {
if (this.b === row.零件图号) {
if (this.b === row.工艺计划流水号) {
this.expands = []
this.a = 1
} else {
this.expands = []
this.expands.push(row.零件图号)
this.expands.push(row.工艺计划流水号)
this.a = 0
this.b = row.零件图号
this.b = row.工艺计划流水号
}
}
this.process = []
@@ -489,7 +489,7 @@ export default {
this.colorCode = []
this.realDate = []
this.tableData2 = []
getTable2(row.零件图号).then(response => {
getTable3(row.工艺计划流水号).then(response => {
for (let k = 0; k < response.data.length; k++) {
this.process[k] = response.data[k].工艺名称简称
this.planDate[k] = response.data[k].计划日期_短

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

@@ -15,7 +15,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="asd()">查询</el-button>
<span>分组:</span>
<el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
<el-option
@@ -727,6 +727,7 @@ export default {
this.getTable()
},
methods: {
asd() {},
// TABLE每行颜色
tableRowClassName({ row, rowIndex }) {
if (rowIndex === 1) {
@@ -1442,7 +1443,6 @@ export default {
this.bianliang1.push(this.tableData1[i].工艺计划流水号)
}
discharge(this.bianliang1).then(response => {
console.log(response.data)
this.Selection1()
})
},

341
src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
View File

@@ -2,62 +2,181 @@
<div class="app-container bold-font">
<el-card>
<div slot="header">
<el-row>
<h3 style="display: inline-block;margin: 0">项目名称:</h3>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" @change="searchMachine">
<el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<h3 style="display: inline-block;margin: 0 0 0 20px">机床图号:</h3>
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
<h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3>
<el-select v-model="machineValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>签订日期:</span>-->
<!--<el-date-picker-->
<!--v-model="startTime"-->
<!--value-format="yyyy-MM-dd"-->
<!--size="small"-->
<!--style="width: 160px"-->
<!--type="date"-->
<!--placeholder="选择日期"/>-->
<!--<span class="demonstration">~</span>-->
<!--<el-date-picker-->
<!--v-model="endTime"-->
<!--value-format="yyyy-MM-dd"-->
<!--size="small"-->
<!--style="width: 160px"-->
<!--type="date"-->
<!--placeholder="选择日期"/>-->
<!--<span>交货期:</span>-->
<!--<el-date-picker-->
<!--v-model="startTime1"-->
<!--value-format="yyyy-MM-dd"-->
<!--size="small"-->
<!--style="width: 160px"-->
<!--type="date"-->
<!--placeholder="选择日期"/>-->
<!--<span class="demonstration">~</span>-->
<!--<el-date-picker-->
<!--v-model="endTime1"-->
<!--value-format="yyyy-MM-dd"-->
<!--size="small"-->
<!--style="width: 160px"-->
<!--type="date"-->
<!--placeholder="选择日期"/>-->
<h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
</el-row>
<el-row>
<h3 style="display: inline-block;margin: 0">签订日期:</h3>
<el-date-picker v-model="time_SignStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/> ~
<el-date-picker v-model="time_SignFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>
<h3 style="display: inline-block;margin: 0 0 0 20px">交货期:</h3>
<el-date-picker v-model="time_deliveryStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/> ~
<el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
<span>提前</span>
<el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
<span>天预警</span>
<el-button icon="el-icon-search" type="success" size="small" style="margin-left: 20px" @click="searchTable()">查询</el-button>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1()">查询</el-button>
</el-row>
</div>
<h1 class="word" style="margin: 0">总计划:</h1>
<el-table v-loading="loading" :data="tableData10" height="550" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.项目编号" size="mini"/>
</template>
<template v-else>
{{ scope.row.项目编号 }}
</template>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" width="120px" fixed="left">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="机床数量" align="center" width="100px">
<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>
<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="150px">
<template slot-scope="scope">
{{ scope.row.设备预验收节点 }}
</template>
</el-table-column>
<el-table-column label="安装调试节点" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.安装调试节点 }}
</template>
</el-table-column>
<el-table-column label="设计者" align="center" width="90px">
<template slot-scope="scope">
<div>{{ scope.row.机床设计者 }}</div>
</template>
</el-table-column>
<el-table-column label="审图（计划开始）" align="center" width="170px">
<template slot-scope="scope">
<div>{{ scope.row.审图计划开始时间 }}</div>
</template>
</el-table-column>
<el-table-column label="审图（计划完成）" align="center" width="170px">
<template slot-scope="scope">
<div>{{ scope.row.审图计划完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="审图（实际完成）" align="center" width="170px">
<template slot-scope="scope">
<div>{{ scope.row.审图实际完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="发图（计划）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.机床设计完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="发图（实际）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.机床设计实际完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="采购（计划）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.采购完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="采购（实际）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.采购实际完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="备料（计划）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.备料完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="备料（实际）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.备料实际完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="制造（计划）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.机床生产完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="制造（实际）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.机床生产实际完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="装配（计划）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.机床装配完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="装配（实际）" align="center" width="150px">
<template slot-scope="scope">
<div>{{ scope.row.机床装配实际完成时间 }}</div>
</template>
</el-table-column>
<el-table-column label="更新" align="center" width="90px">
<template slot-scope="scope">
<div>{{ scope.row.更新 }}</div>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
v-if="!loading"
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<sticky :z-index="10" style="height: 180px">
<div>
<h1 class="word" style="margin: 0">总计划</h1>
<h1 class="word" style="margin: 0">当前总计划</h1>
<el-table v-loading="loading" :data="tableData" height="120px" border element-loading-text="拼命加载中">
<el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
<template slot-scope="scope">
@@ -387,18 +506,28 @@
</template>
<script>
import { initProject, initMachine, searchtable, searchtable2 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
import { initProject, initMachine, searchtable, searchtable2, searchtable5 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
import Sticky from '@/components/Sticky'
export default {
components: { Sticky },
data() {
return {
projectValue: '',
projectValue1: '',
project: [],
machineValue: '',
machineValue1: '',
machine: [],
time_SignStart: '', // 签订开始
time_SignFinish: '', // 签订结束
time_deliveryStart: '', // 交货开始
time_deliveryFinish: '', // 交货结束
CustomerNameValue: '',
CustomerName: [], // 客户名称
loading: false,
loading1: false,
pageSize: 10,
pageCurrent: 1,
now: '',
arrival: [],
judge: [],
@@ -411,6 +540,7 @@ export default {
arrival4: [],
judge4: [],
warningValue: '',
tableData10: [], // 表格数据
tableData: [], // 表格数据
tableData1: [], // 表格数据
tableData2: [], // 表格数据
@@ -421,6 +551,7 @@ export default {
},
created() {
this.fetchData()
this.searchTable1()
},
methods: {
colorJudge(time1, time2) {
@@ -448,7 +579,7 @@ export default {
fetchData() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
},
searchMachine() {
typeChange() {
this.machineValue = ''
this.machine = []
initMachine(this.projectValue).then(response => {
@@ -461,9 +592,113 @@ export default {
})
},
// 查询表格数据
searchTable() {
if (this.projectValue !== '') {
if (this.machineValue !== '') {
searchTable1() {
this.loading = true
this.tableData10 = []
if (this.projectValue !== '' && this.projectValue !== null) { this.projectValuecheck = 1 } else { this.projectValuecheck = 0 }
if (this.CustomerNameValue !== '' && this.CustomerNameValue !== null) { this.CustomerNameValuecheck = 1 } else { this.CustomerNameValuecheck = 0 }
if (this.machineValue !== '' && this.machineValue !== null) { this.machineValuecheck = 1 } else { this.machineValuecheck = 0 }
if (this.time_SignStart !== '' && this.time_SignStart !== null && this.time_SignFinish !== '' && this.time_SignFinish) { this.time_Signcheck = 1 } else { this.time_Signcheck = 0 }
if (this.time_deliveryStart !== '' && this.time_deliveryStart !== null && this.time_deliveryFinish !== '' && this.time_deliveryFinish) { this.time_deliverycheck = 1 } else { this.time_deliverycheck = 0 }
searchtable5(this.projectValuecheck, this.projectValue, this.machineValuecheck, this.machineValue, this.CustomerNameValuecheck, this.CustomerNameValue, this.time_Signcheck, this.time_SignStart, this.time_SignFinish, this.time_deliverycheck, this.time_deliveryStart, this.time_deliveryFinish, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) {
this.loading = false
} else {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) {
response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
}
if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) {
response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
}
if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) {
response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
}
if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) {
response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
}
if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) {
response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
}
if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) {
response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
}
if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) {
response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
}
if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) {
response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
}
if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) {
response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
}
if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) {
response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
}
if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) {
response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
}
if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) {
response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
}
if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) {
response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
}
if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) {
response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
}
if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null) {
response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0]
}
if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null) {
response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0]
}
if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) {
response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
}
this.tableData10.push({
项目编号: response.data.rows[i].项目编号,
项目名称: response.data.rows[i].项目名称,
机床图号: response.data.rows[i].机床图号,
机床名称: response.data.rows[i].机床名称,
机床数量: response.data.rows[i].机床数量,
合同签订日期: response.data.rows[i].合同签订日期,
发货节点: response.data.rows[i].发货节点,
设备预验收节点: response.data.rows[i].设备预验收节点,
安装调试节点: response.data.rows[i].安装调试节点,
客户名称: response.data.rows[i].客户名称,
机床设计者: response.data.rows[i].机床设计者,
机床设计完成时间: response.data.rows[i].机床设计完成时间,
采购完成时间: response.data.rows[i].采购完成时间,
备料完成时间: response.data.rows[i].备料完成时间,
机床生产完成时间: response.data.rows[i].机床生产完成时间,
机床装配完成时间: response.data.rows[i].机床装配完成时间,
机床设计实际完成时间: response.data.rows[i].机床设计实际完成时间,
采购实际完成时间: response.data.rows[i].采购实际完成时间,
备料实际完成时间: response.data.rows[i].备料实际完成时间,
机床生产实际完成时间: response.data.rows[i].机床生产实际完成时间,
机床装配实际完成时间: response.data.rows[i].机床装配实际完成时间,
审图计划开始时间: response.data.rows[i].审图计划开始时间,
审图计划完成时间: response.data.rows[i].审图计划完成时间,
审图实际完成时间: response.data.rows[i].审图实际完成时间,
完成顺序: response.data.rows[i].完成顺序,
更新: response.data.rows[i].更新,
项目流水号: response.data.rows[i].项目流水号,
机床流水号: response.data.rows[i].机床流水号
})
}
this.total = response.data.total
}
}).then(() => {
this.loading = false
})
},
// 查询表格数据
searchTable(row) {
this.projectValue1 = row.项目流水号
this.machineValue1 = row.机床流水号
if (this.projectValue1 !== '') {
if (this.machineValue1 !== '') {
this.loading = true
this.tableData = []
this.tableData1 = []
@@ -472,7 +707,7 @@ export default {
this.tableData4 = []
this.tableData5 = []
this.now = new Date()
searchtable(this.projectValue, this.machineValue).then(response => {
searchtable(this.projectValue1, this.machineValue1).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].合同签订日期 !== '' && response.data[i].合同签订日期 !== null) {
response.data[i].合同签订日期 = response.data[i].合同签订日期.split(' ')[0]
@@ -531,7 +766,7 @@ export default {
console.log(response.data, 222222)
this.tableData = response.data
}).then(() => {
searchtable2(this.machineValue, 1).then(response => {
searchtable2(this.machineValue1, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
// this.arrival.push(new Date(response.data[i].计划完成时间))
// if ((this.arrival[i] - this.now) > 0 && (this.arrival[i] - this.now) < (86400000 * this.warningValue)) {
@@ -555,7 +790,7 @@ export default {
console.log(response.data, 2)
this.tableData1 = response.data
})
searchtable2(this.machineValue, 2).then(response => {
searchtable2(this.machineValue1, 2).then(response => {
for (let i = 0; i < response.data.length; i++) {
// this.arrival1.push(new Date(response.data[i].计划完成时间))
// if ((this.arrival1[i] - this.now) > 0 && (this.arrival1[i] - this.now) < (86400000 * this.warningValue)) {
@@ -583,7 +818,7 @@ export default {
this.tableData2 = response.data
console.log(response.data, 2222)
})
searchtable2(this.machineValue, 3).then(response => {
searchtable2(this.machineValue1, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
// this.arrival2.push(new Date(response.data[i].计划完成时间))
// if ((this.arrival2[i] - this.now) > 0 && (this.arrival2[i] - this.now) < (86400000 * this.warningValue)) {
@@ -610,7 +845,7 @@ export default {
console.log(response.data, 4)
this.tableData3 = response.data
})
searchtable2(this.machineValue, 4).then(response => {
searchtable2(this.machineValue1, 4).then(response => {
for (let i = 0; i < response.data.length; i++) {
// this.arrival3.push(new Date(response.data[i].计划完成时间))
// if ((this.arrival3[i] - this.now) > 0 && (this.arrival3[i] - this.now) < (86400000 * this.warningValue)) {
@@ -637,7 +872,7 @@ export default {
console.log(response.data, 5)
this.tableData4 = response.data
})
searchtable2(this.machineValue, 5).then(response => {
searchtable2(this.machineValue1, 5).then(response => {
console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
// this.arrival4.push(new Date(response.data[i].计划完成时间))
@@ -672,6 +907,16 @@ export default {
} else {
this.$message.warning('请选择项目')
}
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchTable1()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable1()
}
}
}

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

@@ -588,6 +588,7 @@ export default {
body.append(printNode)
window.print()
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()
}
},
@@ -1010,7 +1011,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1137,7 +1138,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1351,7 +1352,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1424,7 +1425,12 @@ export default {
})
},
searchData() {
searchManufactor(this.input).then(response => {
if (this.input !== '') {
this.check = 1
} else {
this.check = 0
}
searchManufactor(this.check, this.input).then(response => {
this.List2 = response.data
})
},
@@ -1487,7 +1493,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1

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

@@ -451,7 +451,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -750,7 +750,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -877,7 +877,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1092,7 +1092,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1227,7 +1227,7 @@ export default {
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
'<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
document.getElementById('tableHead').after(tr[i])
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1

1
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -431,6 +431,7 @@ export default {
body.append(printNode)
window.print()
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()
},
handleSizeChange1(val) {