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

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

Browse Source
This commit is contained in:
liushuai
2020-03-23 17:59:13 +08:00
parent 94e5561fdf 373e1b24c1
commit b52efdee42
22 changed files with 630 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/Inventory/Inboundscanning.js
View File

@@ -81,3 +81,17 @@ export function insertOne(num0, num1, people, num4, num5, num6, num7) {
}
})
}
// 更新零件状态
export function FinishPart(num0) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: 'MES_机加工MES_库存管理_入库模块_更新零件状态',
param: '工艺计划流水号组=' + num0
}
})
}

3
src/api/ManufacturingCenter/AddingOrder.js
View File

@@ -80,8 +80,7 @@ export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, check
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m,
Pagination: pageCurrent + '&' + pageSize
param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}

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

@@ -26,8 +26,7 @@ export function searchTable(check, supplierNameValue, check1, MaterialsValue, ch
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协零件_查询数据_新',
param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2,
Pagination: pageCurrent + '&' + pageSize
param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}

2
src/views/Assembly/AssemblyProcessPlanning/index.vue
View File

@@ -685,9 +685,7 @@ export default {
this.form2.序号 = row.序号
this.form2.装配任务 = row.装配任务
this.Group = ''
console.log(row, 1111)
this.form2.组件 = (row.组件流水号.split(',')).map(Number)
console.log(this.form2.组件)
},
submitAdd() {
this.GroupNumberValue1 = this.form2.组件[0]

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

@@ -28,30 +28,12 @@
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldelete()">全部删除</el-button>
</el-tooltip>
</div>
<el-table
v-loading="loading"
:data="tableData"
highlight-current-row
border
stripe
size="mini"
style="width: 100%;max-height: 520px"
height="320">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column
label="机床图号"
align="center"
min-width="150px">
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%;max-height: 520px" height="320">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="机床图号" align="center" min-width="150px">
<template slot-scope="scope">{{ scope.row.机床图号 }}</template>
</el-table-column>
<el-table-column
label="零件图号"
align="center"
min-width="200px">
<el-table-column label="零件图号" align="center" min-width="200px">
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
@@ -113,9 +95,9 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top">
<el-button
:disabled="scope.row.考核状态>=6"
size="mini"
type="primary"
plain
@@ -853,7 +835,6 @@ export default {
this.loading = false
const res = response.data
this.total = res.total
// console.log(this.tableData)
this.tableData = res.map(item => {
if (item.整改类型 === '1') {
item.整改类型 = '新增'
@@ -871,7 +852,6 @@ export default {
const data = response.data
this.totalWB = data.total
this.tableDataWB = data.map(item => {
console.log(item)
item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
return item
})

140
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -70,11 +70,36 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="更新零件状态" center>
<el-table :data="finishParts" stripe border size="mini" style="width: 100%;margin: 3px 0px" height="300px">
<el-table-column label="序号" align="center" type="index" width="55"/>
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogFormVisible = false">取消</el-button>
<el-button type="primary" size="small" @click="FinishPart()">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { searchTable, insertOne, getlocate, searchPartNumber, CraftNumber } from '@/api/Inventory/Inboundscanning'
import { searchTable, insertOne, getlocate, searchPartNumber, CraftNumber, FinishPart } from '@/api/Inventory/Inboundscanning'
import { mapGetters } from 'vuex'
import { wsuri, name } from '@/utils/request'
export default {
@@ -94,7 +119,9 @@ export default {
locateName: [], // 货位名称下拉框
locateNumber: '',
Partpaint: '',
tableDataNum: []
tableDataNum: [],
dialogFormVisible: false,
finishParts: []
}
},
computed: {
@@ -178,34 +205,27 @@ export default {
type: 'warning'
})
} else {
this.finishParts = []
this.listLoading = true
searchTable(this.partNumber).then(response => {
console.log(response.data)
if (response.data.length === 0) {
this.listLoading = false
this.$notify({
title: '警告',
message: '该零件未加工完成',
message: '该零件未加工',
type: 'warning'
})
} else {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].考核状态 === 8) {
this.listLoading = false
if (response.data[i].状态 === '未完成') {
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已入库',
message: 'P' + response.data[i].工艺计划流水号 + '未加工完成',
type: 'warning'
})
} else if (response.data[i].考核状态 === 9) {
this.listLoading = false
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已出库',
type: 'warning'
})
} else if (response.data[i].考核状态 === 7) {
this.listLoading = false
this.tableData.push({
} else if (response.data[i].状态 === '可完成') {
this.finishParts.push({
plannumber: response.data[i].剩余数量,
innumber: response.data[i].入库数量,
capture: '',
@@ -215,28 +235,92 @@ export default {
机床图号: response.data[i].机床图号,
零件图号: response.data[i].零件图号
})
const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
工艺计划流水号: curVal.工艺计划流水号,
项目名称: curVal.项目名称,
机床图号: curVal.机床图号,
零件图号: curVal.零件图号,
plannumber: curVal.plannumber,
innumber: curVal.innumber,
} else if (response.data[i].状态 === '已完成') {
if (response.data[i].考核状态 === '7') {
this.listLoading = false
this.tableData.push({
plannumber: response.data[i].剩余数量,
innumber: response.data[i].入库数量,
capture: '',
note: ''
note: '',
工艺计划流水号: response.data[i].工艺计划流水号,
项目名称: response.data[i].项目名称,
机床图号: response.data[i].机床图号,
零件图号: response.data[i].零件图号
})
return preVal
}, [])
const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
工艺计划流水号: curVal.工艺计划流水号,
项目名称: curVal.项目名称,
机床图号: curVal.机床图号,
零件图号: curVal.零件图号,
plannumber: curVal.plannumber,
innumber: curVal.innumber,
capture: '',
note: ''
})
return preVal
}, [])
} else if (response.data[i].考核状态 === '8') {
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已入库',
type: 'warning'
})
} else if (response.data[i].考核状态 === '9') {
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已出库',
type: 'warning'
})
}
}
}
}
}).then(() => {
if (this.finishParts.length > 0) {
this.dialogFormVisible = true
}
this.listLoading = false
})
}
},
FinishPart() {
var nums = []
this.finishParts.map(v => {
nums.push(v.工艺计划流水号)
})
FinishPart(nums).then(response => {
this.dialogFormVisible = false
for (let i = 0; i < this.finishParts.length; i++) {
this.tableData.push({
plannumber: this.finishParts[i].plannumber,
innumber: this.finishParts[i].innumber,
capture: '',
note: '',
工艺计划流水号: this.finishParts[i].工艺计划流水号,
项目名称: this.finishParts[i].项目名称,
机床图号: this.finishParts[i].机床图号,
零件图号: this.finishParts[i].零件图号
})
const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
工艺计划流水号: curVal.工艺计划流水号,
项目名称: curVal.项目名称,
机床图号: curVal.机床图号,
零件图号: curVal.零件图号,
plannumber: curVal.plannumber,
innumber: curVal.innumber,
capture: '',
note: ''
})
return preVal
}, [])
}
})
},
// 修改入库
Innumber() {
this.$confirm('此操作将不可逆转,且如果入库数量大于计划数量，则全部入库,是否继续?', '提示', {

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

@@ -24,7 +24,7 @@
<el-button type="distribution" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 865px" size="mini">
<el-table v-loading="loading" :data="tableData1" stripe highlight-current-row border height="550px" style="width: 865px" size="mini">
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -185,6 +185,7 @@ export default {
locateNameValue: '',
locateName: [],
tableData1: [],
loading: false,
pageCurrent: 1,
pageSize: 20,
total: 0,
@@ -251,6 +252,7 @@ export default {
},
// 根据条件查物料货位数量
searchMaterial() {
this.loading = true
let check1, check2, check3, check4, check5
this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0
@@ -263,18 +265,19 @@ export default {
data: {
type: '1',
name: `库存管理_库存盘点_物料货位数量_查询数据`,
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}`,
Pagination: this.pageCurrent + '&' + this.pageSize
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}` + `&PageCurrent=${this.pageCurrent}&PageSize=${this.pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
}
request(param).then(res => {
this.tableData1 = res.data.rows
console.log(res.data)
this.tableData1 = res.data.result
this.tableData1.map(v => {
this.$set(v, 'changeValue', false)
v.原货位存量 = v.货位存量
return v
})
this.total = res.data.total
this.loading = false
this.total = parseInt(res.data.output[0].ItemCount)
})
},
// 分页
@@ -384,4 +387,3 @@ export default {
width:165px
}
</style>

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

@@ -443,24 +443,24 @@ export default {
this.checkbox_number = 1
}
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.result.length !== 0) {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData.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].完成数量, // MES里采集 现在没有
投产数量: response.data.rows[i].批次数量,
完成日期: response.data.rows[i].机加工实际完成时间 ? response.data.rows[i].机加工实际完成时间.split(' ')[0] : '', // 排产时间
计划结束时间: response.data.rows[i].机加工结束时间 ? response.data.rows[i].机加工结束时间.split(' ')[0] : '',
客户名称: response.data.rows[i].客户名称 // 客户名
工艺计划流水号: response.data.result[i].工艺计划流水号,
考核状态: response.data.result[i].考核状态,
序号: response.data.result[i].序号,
跟单号: response.data.result[i].跟单号,
零件图号: response.data.result[i].零件图号,
零件名称: response.data.result[i].零件名称,
加工数: response.data.result[i].完成数量, // MES里采集 现在没有
投产数量: response.data.result[i].批次数量,
完成日期: response.data.result[i].机加工实际完成时间 ? response.data.result[i].机加工实际完成时间.split(' ')[0] : '', // 排产时间
计划结束时间: response.data.result[i].机加工结束时间 ? response.data.result[i].机加工结束时间.split(' ')[0] : '',
客户名称: response.data.result[i].客户名称 // 客户名
})
}
}
this.total = response.data.total
this.total = parseInt(response.data.output[0].ItemCount)
this.loading0 = false
}).catch(() => {
this.loading0 = false

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

@@ -39,10 +39,9 @@
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="工序状态" show-overflow-tooltip min-width="90">
<el-table-column align="center" label="完成日期" show-overflow-tooltip min-width="90">
<template slot-scope="scope">
<span v-if="scope.row.工序状态 >= 4">已完成</span>
<span v-else>未完成</span>
{{ scope.row.完成日期 ? scope.row.完成日期.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>

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

@@ -732,11 +732,9 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val
console.log(this.multipleSelection, 1111)
},
handleEditNumber(index, row) {
this.dialogFormVisible3 = true
console.log(row, 123)
this.NumberValue = row.组件零件基本件流水号
this.form3.投产数量 = row.投产总数量
this.AlreadyCastNumber = row.已投产数量 ? parseInt(row.已投产数量) : 0

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

@@ -39,11 +39,6 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="已完数量" show-overflow-tooltip min-width="70">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.完成数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="投产数" width="80">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
@@ -56,7 +51,7 @@
</el-table-column>
<el-table-column align="center" label="操作者" show-overflow-tooltip width="70">
<template slot-scope="scope">
{{ scope.row.操作者 }}
{{ scope.row.工序间是否外协 === 1 ? (scope.row.操作者 === '超级管理员' ? '系统' : scope.row.操作者) : '外协' }}
</template>
</el-table-column>
<el-table-column align="center" label="扫码开始" width="95">
@@ -571,7 +566,8 @@ export default {
工序流水号: response.data[i].工序流水号,
完成过程流水号: response.data[i].完成过程流水号,
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量
完成数量: response.data[i].完成数量,
工序间是否外协: response.data[i].工序间是否外协
})
}
this.loading2 = false

513
src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
View File

@@ -21,7 +21,7 @@
<h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">编辑</el-button>
<el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
</el-row>
<el-row v-if="false">
<h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -32,292 +32,297 @@
<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"/>
</el-row>
</el-card>
<el-card style="overflow: auto">
<el-row>
<el-col style="width: 1400px;">
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
<el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
<el-card>
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
<el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="项目编号" align="center" width="170px" 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" min-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="80px">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="签订日期" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
</template>
</el-table-column>
<el-table-column label="安装调试节点" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
</template>
</el-table-column>
<el-table-column v-if="false" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 15px;">
<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>
</el-card>
</el-col>
<el-col style="width: 290px;margin-left: 10px">
<el-card>
<el-form label-position="left" label-width="90px" class="demo-ruleForm1">
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="设计者" prop="设计者" >
<el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="2">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="审图开始" prop="审图开始">
<el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图开始" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="3">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="审图结束" prop="审图结束">
<el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图结束" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="1">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="发图完成" prop="发图完成">
<el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="发图完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="2">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="采购完成" prop="采购完成">
<el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="采购完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="3">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="备料完成" prop="备料完成">
<el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="备料完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="4">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="制造完成" prop="制造完成">
<el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="制造完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="5">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="装配完成" prop="装配完成">
<el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="装配完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="9">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="更新时间" prop="更新时间">
<el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 150px"/>
<!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</el-col>
</el-row>
<el-row>
<el-card>
<h2 v-if="radio==='1'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 发图</h2>
<h2 v-if="radio==='2'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 采购</h2>
<h2 v-if="radio==='3'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 备料</h2>
<h2 v-if="radio==='4'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 制造</h2>
<h2 v-if="radio==='5'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 装配</h2>
<el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 7px 0 0 0" plain @click="addTable()">增加</el-button>
<el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
<el-table-column min-width="100px" label="组号" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.项目编号" size="mini"/>
<el-select v-model="scope.row.组件流水号" filterable clearable size="small" style="width: 100px" @change="groupChange(scope.row, scope.$index)">
<el-option
v-for="item in groupNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</template>
<template v-else>
{{ scope.row.项目编号 }}
{{ scope.row.组号 }}
</template>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
<el-table-column min-width="200px" label="任务名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
<template v-if="scope.row.edit">
<el-input v-model="scope.row.任务名称" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.任务名称 }}
</template>
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
<el-table-column min-width="100px" label="负责人" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
<template v-if="scope.row.edit">
<el-input v-model="scope.row.负责人" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.负责人 }}
</template>
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
<el-table-column label="接收任务时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
<template v-if="scope.row.edit">
<el-date-picker v-model="scope.row.接收任务时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.接收任务时间 }}
</template>
</template>
</el-table-column>
<el-table-column label="机床数量" align="center" width="100px">
<el-table-column label="任务开始时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
<template v-if="scope.row.edit">
<el-date-picker v-model="scope.row.任务开始时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.任务开始时间 }}
</template>
</template>
</el-table-column>
<el-table-column label="签订日期" align="center" width="125px">
<el-table-column label="计划完成时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
<template v-if="scope.row.edit">
<el-date-picker v-model="scope.row.计划完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.计划完成时间 }}
</template>
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="125px">
<el-table-column min-width="100px" label="货期" align="center">
<template slot-scope="scope">
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
<template v-if="scope.row.edit">
<el-input v-model="scope.row.货期" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.货期 }}
</template>
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="125px">
<el-table-column label="实际完成时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
<template v-if="scope.row.edit && !scope.row.组件流水号">
<el-date-picker v-model="scope.row.实际完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.实际完成时间 }}
</template>
</template>
</el-table-column>
<el-table-column label="安装调试节点" align="center" width="125px">
<el-table-column min-width="300px" label="备注" align="center" width="240px">
<template slot-scope="scope">
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
<template v-if="scope.row.edit">
<el-input v-model="scope.row.备注" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.备注 }}
</template>
</template>
</el-table-column>
<el-table-column v-if="false" label="操作" width="150px" align="center">
<el-table-column label="操作" width="180px" align="center" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
<el-button v-else type="danger" size="small" @click="Delete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 15px;">
<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>
</el-col>
<el-col style="width: 200px;">
<el-form label-position="left" label-width="90px" class="demo-ruleForm1">
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="设计者" prop="设计者" >
<el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="2">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="审图开始" prop="审图开始">
<el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图开始" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="3">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="审图结束" prop="审图结束">
<el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图结束" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="1">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="发图完成" prop="发图完成">
<el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="发图完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="2">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="采购完成" prop="采购完成">
<el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="采购完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="3">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="备料完成" prop="备料完成">
<el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="备料完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="4">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="制造完成" prop="制造完成">
<el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="制造完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<el-radio v-model="radio" label="5">{{ empty }}</el-radio>
</el-col>
<el-col style="width: 180px">
<el-form-item label="装配完成" prop="装配完成">
<el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="装配完成" class="time"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 20px">
<!--<el-radio v-model="radio" label="9">{{ empty }}</el-radio>-->
</el-col>
<el-col style="width: 180px;margin-left: 20px">
<el-form-item label="更新时间" prop="更新时间">
<el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 150px"/>
<!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
</el-card>
<el-card>
<h2 v-if="radio==='1'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 发图</h2>
<h2 v-if="radio==='2'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 采购</h2>
<h2 v-if="radio==='3'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 备料</h2>
<h2 v-if="radio==='4'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 制造</h2>
<h2 v-if="radio==='5'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 装配</h2>
<el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 7px 0 0 0" plain @click="addTable()">增加</el-button>
<el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
<el-table-column min-width="100px" label="组号" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-select v-model="scope.row.组件流水号" filterable clearable size="small" style="width: 100px" @change="groupChange(scope.row, scope.$index)">
<el-option
v-for="item in groupNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</template>
<template v-else>
{{ scope.row.组号 }}
</template>
</template>
</el-table-column>
<el-table-column min-width="200px" label="任务名称" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.任务名称" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.任务名称 }}
</template>
</template>
</el-table-column>
<el-table-column min-width="100px" label="负责人" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.负责人" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.负责人 }}
</template>
</template>
</el-table-column>
<el-table-column label="接收任务时间" align="center" width="150px">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-date-picker v-model="scope.row.接收任务时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.接收任务时间 }}
</template>
</template>
</el-table-column>
<el-table-column label="任务开始时间" align="center" width="150px">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-date-picker v-model="scope.row.任务开始时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.任务开始时间 }}
</template>
</template>
</el-table-column>
<el-table-column label="计划完成时间" align="center" width="150px">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-date-picker v-model="scope.row.计划完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.计划完成时间 }}
</template>
</template>
</el-table-column>
<el-table-column min-width="100px" label="货期" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.货期" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.货期 }}
</template>
</template>
</el-table-column>
<el-table-column label="实际完成时间" align="center" width="150px">
<template slot-scope="scope">
<template v-if="scope.row.edit && !scope.row.组件流水号">
<el-date-picker v-model="scope.row.实际完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.实际完成时间 }}
</template>
</template>
</el-table-column>
<el-table-column min-width="300px" label="备注" align="center" width="240px">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.备注" size="mini" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.备注 }}
</template>
</template>
</el-table-column>
<el-table-column label="操作" width="180px" align="center" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
<el-button v-else type="danger" size="small" @click="Delete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-card>
</el-row>
</div>
</template>
@@ -730,6 +735,16 @@ export default {
.demo-ruleForm1 .el-form-item {
margin-bottom: 0px
}
.demo-ruleForm1 .el-form-item__label {
text-align: right;
float: left;
font-size: 16px;
color: #606266;
line-height: 40px;
padding: 0 12px 0 0;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.bold-font .el-table{
font: bold 20px arial!important;
margin: 0 0 10px 0;

386
src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
View File

@@ -44,222 +44,226 @@
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
</el-row>
</el-card>
<el-card style="overflow: auto">
<el-row>
<el-col style="width: 1400px;">
<el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
<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"/>
<el-card>
<el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="项目编号" align="center" width="170px" 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>
<template v-else>
{{ scope.row.项目编号 }}
</el-table-column>
<el-table-column label="项目名称" align="center" min-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="80px">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="签订日期" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
</template>
</el-table-column>
<el-table-column label="安装调试节点" align="center" width="125px">
<template slot-scope="scope">
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
</template>
</el-table-column>
<el-table-column v-if="false" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 15px;">
<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>
</el-card>
</el-col>
<el-col style="width: 290px;margin-left: 10px">
<el-card style="height: 370px">
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
<el-form label-position="right" label-width="85px" class="demo-ruleForm1">
<el-row>
<el-col style="width: 270px">
<el-form-item label="审图开始">
<el-col style="width: 80px;">
{{ 审图开始 }}
</el-col>
<el-col style="width: 80px;">
-
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="审图结束">
<el-col style="width: 80px;">
{{ 审图结束 }}
</el-col>
<el-col style="width: 80px;">
{{ 审图实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="发图完成">
<el-col style="width: 80px;">
{{ 发图完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 机床设计实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="采购完成">
<el-col style="width: 80px;">
{{ 采购完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 采购实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="备料完成">
<el-col style="width: 80px;">
{{ 备料完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 备料实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="制造完成">
<el-col style="width: 80px;">
{{ 制造完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 机床生产实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="装配完成">
<el-col style="width: 80px;">
{{ 装配完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 机床装配实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</el-col>
</el-row>
<el-row>
<el-card>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
<el-table-column width="100px" label="计划名称" align="center">
<template slot-scope="scope">
{{ scope.row.计划类型名称 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
<el-table-column width="150px" label="组号" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
<el-table-column width="300px" label="任务名称" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
<el-table-column width="120px" label="负责人" align="center">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
{{ scope.row.负责人 }}
</template>
</el-table-column>
<el-table-column label="机床数量" align="center" width="100px">
<el-table-column label="任务开始时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
{{ scope.row.任务开始时间 ? scope.row.任务开始时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="签订日期" align="center" width="125px">
<el-table-column label="计划完成" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
{{ scope.row.计划完成时间 ? scope.row.计划完成时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="125px">
<el-table-column width="140px" label="计划工期(天)" align="center">
<template slot-scope="scope">
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
{{ scope.row.货期 }}
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="125px">
<el-table-column label="实际完成时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
{{ scope.row.实际完成时间 ? scope.row.实际完成时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="安装调试节点" align="center" width="125px">
<el-table-column width="140px" label="实际工期(天)" align="center">
<template slot-scope="scope">
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
</template>
</el-table-column>
<el-table-column v-if="false" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
{{ scope.row.实际完成时间 ? scope.row.实际工期 : '-' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 15px;">
<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>
</el-col>
<el-col style="width: 240px;">
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
<el-form label-position="right" label-width="85px" class="demo-ruleForm1">
<el-row>
<el-col style="width: 270px">
<el-form-item label="审图开始">
<el-col style="width: 80px;">
{{ 审图开始 }}
</el-col>
<el-col style="width: 80px;">
-
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="审图结束">
<el-col style="width: 80px;">
{{ 审图结束 }}
</el-col>
<el-col style="width: 80px;">
{{ 审图实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="发图完成">
<el-col style="width: 80px;">
{{ 发图完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 机床设计实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="采购完成">
<el-col style="width: 80px;">
{{ 采购完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 采购实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="备料完成">
<el-col style="width: 80px;">
{{ 备料完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 备料实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="制造完成">
<el-col style="width: 80px;">
{{ 制造完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 机床生产实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 270px">
<el-form-item label="装配完成">
<el-col style="width: 80px;">
{{ 装配完成 }}
</el-col>
<el-col style="width: 80px;">
{{ 机床装配实际完成时间 }}
</el-col>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
<el-table-column width="100px" label="计划名称" align="center">
<template slot-scope="scope">
{{ scope.row.计划类型名称 }}
</template>
</el-table-column>
<el-table-column width="150px" label="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column width="300px" label="任务名称" align="center">
<template slot-scope="scope">
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column width="120px" label="负责人" align="center">
<template slot-scope="scope">
{{ scope.row.负责人 }}
</template>
</el-table-column>
<el-table-column label="任务开始时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 ? scope.row.任务开始时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="计划完成" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.计划完成时间 ? scope.row.计划完成时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column width="140px" label="计划工期(天)" align="center">
<template slot-scope="scope">
{{ scope.row.货期 }}
</template>
</el-table-column>
<el-table-column label="实际完成时间" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.实际完成时间 ? scope.row.实际完成时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column width="140px" label="实际工期(天)" align="center">
<template slot-scope="scope">
{{ scope.row.实际完成时间 ? scope.row.实际工期 : '-' }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-card>
</el-row>
</div>
</template>
@@ -465,6 +469,16 @@ export default {
}
</style>
<style>
.demo-ruleForm1 .el-form-item__label {
text-align: right;
float: left;
font-size: 16px;
color: #606266;
line-height: 40px;
padding: 0 12px 0 0;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.PPMQHairDrawing{
background: rgb(189,215,238) !important;
}

1
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -798,7 +798,6 @@ export default {
this.peoplename = ''
},
TakeBack(row) {
console.log(row, 1111)
this.addForm('form1')
this.timetime = row.投标日期
this.form1.回收金额 = row.应收回金额

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

@@ -179,8 +179,8 @@ export default {
check2 = 1
}
searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => {
this.tableData = response.data.rows
this.total = response.data.total
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
},

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

@@ -450,7 +450,6 @@ export default {
})
this.title = ''
this.manufacturers = this.form.表单号
console.log(this.manufacturers, 111111)
this.fetchData()
this.dialogFormVisible = false
} else {

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

@@ -207,6 +207,7 @@ export default {
this.tableData2 = []
this.index2 = row.index
searchTable2(row.工艺计划流水号).then(response => {
// 工序流水号 206794 工序状态 null
this.num1 = row.工艺计划流水号
if (response.data.length === 0) {
this.loading0 = false
@@ -219,9 +220,9 @@ export default {
}
}
for (let i = 0; i < response.data.length; i++) {
response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : ''
response.data[i].机加工结束时间 ? response.data[i].机加工结束时间.split(' ')[0] : ''
response.data[i].计划日期 ? response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0] : ''
}
this.tableData2 = response.data
}

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

@@ -1825,7 +1825,6 @@ export default {
// })
// },
saveOrder(row) { // 保存询价单
console.log(row, 1111)
saveOrder(row.询价单明细流水号, row.数量, row.备注).then(response => {})
},
selectable(row, index) { // 控制某行是否可选

3
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -1048,7 +1048,6 @@ export default {
})
},
tabClick(tab) {
console.log(tab.name, 1111)
if (tab.name === '外购件') {
this.tabName = '外购件'
this.searchTable11()
@@ -1371,7 +1370,6 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log(row.离线合同明细流水号, 1111)
deleteMateriel(row.离线合同明细流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('移除成功')
@@ -1401,7 +1399,6 @@ export default {
})
},
saveContract() {
console.log(11111)
this.totalPrice = 0
this.partGroup = []
this.numGroup = []

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

@@ -426,7 +426,6 @@ export default {
// onClick: this.message(mess).then((res) => {
//
// // this.message(mess)
// console.log(res, 1111)
// this.$router.push({path: '/PurchasingCenter/PurchaseTaskAllocate'})
// // this.$router.push({ path: '/Inventory/MaterialOut' })
// // setTimeout(this.noticeContractKG.close(), 1000)

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

@@ -170,7 +170,6 @@ export default {
update(row) {
console.log(row, 12)
Preservation(row.采购合同明细流水号, row.单价).then(response => {
console.log(response, 1111)
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
// this.searchTable()

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

@@ -149,7 +149,6 @@ export default {
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)
}