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

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

Browse Source
This commit is contained in:
bryan sun
2019-10-31 08:16:14 +08:00
parent 7f380cdc86 80dbeaa2c3
commit 4af98a6f65
15 changed files with 563 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,14 +45,13 @@ export function getinventory() {
})
}
// 货位查询
export function getlocate(housenumber) {
export function getlocate() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_货位主文件_查询数据',
param: '仓库流水号=' + housenumber + '=int'
name: '库存管理_货位主文件_查询数据_查询全部'
}
})
}

12
src/api/Inventory/StockInquiry.js
View File

@@ -37,3 +37,15 @@ export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSi
}
})
}
export function getTable1(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_库存管理_基本件出库记录查询',
param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6,
Pagination: pageCurrent + '&' + pageSize
}
})
}

6
src/views/Assembly/DeliveryConfirmation/index.vue
View File

@@ -215,17 +215,17 @@
</el-table-column>
<el-table-column align="center" label="制单时间" min-width="85">
<template slot-scope="scope">
{{ scope.row.操作日期 }}
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="审核时间" min-width="85">
<template slot-scope="scope">
{{ scope.row.审核日期 }}
{{ scope.row.审核日期 ? scope.row.审核日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="发货时间" min-width="85">
<template slot-scope="scope">
{{ scope.row.发出时间 }}
{{ scope.row.发出时间 ? scope.row.发出时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
</el-table>

154
src/views/Assembly/MakeAssemblyPlan/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
<el-option
@@ -13,6 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -31,9 +33,8 @@
</div>
</div>
</el-card>
<el-card>
<h3 style="text-align: center;">机床信息</h3>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -56,9 +57,8 @@
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加装配计划</el-button>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-card style="width: 59.5%; float: left">
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-dblclick="changeState" @row-click="deleteData1">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
@@ -100,7 +100,6 @@
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -120,10 +119,12 @@ export default {
groupNum: [],
tableData1: [],
tableData2: [],
hadFile: []
hadFile: [],
plan: ''
}
},
created() {
this.searchTable1()
},
mounted() {
this.initProject()
@@ -155,6 +156,9 @@ export default {
})
}
},
changeState(row) {
row.edit = !row.edit
},
initProject() {
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -166,24 +170,23 @@ export default {
}
})
},
machineChange() {
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
},
confirmEdit(row) {
editData(row.计划流水号, row.组件流水号, this.groupNumberValue, row.任务名称, row.计划工时).then(response => {
if (response.data[0].result === '1') {
row.edit = false
this.searchTable2()
this.tableData2 = []
searchTable2(this.machineNumberValue, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('编辑成功')
} else {
this.$message.error('编辑失败')
@@ -192,45 +195,13 @@ export default {
},
cancel(row) {
row.edit = !row.edit
this.searchTable2()
},
deleteData(row) {
console.log(row.计划流水号)
this.deleteRow(deletedata, row.计划流水号, function() { this.searchTable2() })
deleteData1(row) {
this.plan = row.计划流水号
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 1).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.searchTable2()
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.check2 === 0) {
this.tableData1 = []
deleteData() {
this.deleteRow(deletedata, this.plan, function() {
this.tableData2 = []
} else {
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
}).then(() => {
this.searchTable2()
})
}
},
searchTable2() {
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
this.check2 = 1
searchTable2(this.machineNumberValue, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
@@ -243,8 +214,69 @@ export default {
})
}
})
console.log(this.tableData2, 222222)
} else { this.check2 = 0 }
})
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 1).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.tableData2 = []
searchTable2(this.machineNumberValue, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
})
},
searchTable2(row) {
this.tableData2 = []
this.machineNumberValue = row.机床流水号
searchTable2(this.machineNumberValue, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
}
}
}

158
src/views/Assembly/MakeColdWorkPlan/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
<el-option
@@ -13,6 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -31,9 +33,8 @@
</div>
</div>
</el-card>
<el-card>
<h3 style="text-align: center;">机床信息</h3>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -56,9 +57,8 @@
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加冷作计划</el-button>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-card style="width: 59.5%; float: left">
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-dblclick="changeState" @row-click="deleteData1">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
@@ -98,9 +98,8 @@
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="warning" plain size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
</template>
</el-table-column>
</el-table>
@@ -120,10 +119,12 @@ export default {
groupNum: [],
tableData1: [],
tableData2: [],
hadFile: []
hadFile: [],
plan: ''
}
},
created() {
this.searchTable1()
},
mounted() {
this.initProject()
@@ -155,6 +156,9 @@ export default {
})
}
},
changeState(row) {
row.edit = !row.edit
},
initProject() {
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -166,24 +170,23 @@ export default {
}
})
},
machineChange() {
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
},
confirmEdit(row) {
editData(row.计划流水号, row.组件流水号, this.groupNumberValue, row.任务名称, row.计划工时).then(response => {
if (response.data[0].result === '1') {
row.edit = false
this.searchTable2()
this.tableData2 = []
searchTable2(this.machineNumberValue, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('编辑成功')
} else {
this.$message.error('编辑失败')
@@ -192,45 +195,13 @@ export default {
},
cancel(row) {
row.edit = !row.edit
this.searchTable2()
},
deleteData(row) {
console.log(row.计划流水号)
this.deleteRow(deletedata, row.计划流水号, function() { this.searchTable2() })
deleteData1(row) {
this.plan = row.计划流水号
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 3).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.searchTable2()
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.check2 === 0) {
this.tableData1 = []
deleteData() {
this.deleteRow(deletedata, this.plan, function() {
this.tableData2 = []
} else {
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
}).then(() => {
this.searchTable2()
})
}
},
searchTable2() {
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
this.check2 = 1
searchTable2(this.machineNumberValue, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
@@ -243,8 +214,69 @@ export default {
})
}
})
console.log(this.tableData2, 222222)
} else { this.check2 = 0 }
})
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 3).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.tableData2 = []
searchTable2(this.machineNumberValue, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
})
},
searchTable2(row) {
this.tableData2 = []
this.machineNumberValue = row.机床流水号
searchTable2(this.machineNumberValue, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
}
}
}

158
src/views/Assembly/MakeElectricalAssembly/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
<el-option
@@ -13,6 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -31,9 +33,8 @@
</div>
</div>
</el-card>
<el-card>
<h3 style="text-align: center;">机床信息</h3>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -56,9 +57,8 @@
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">新增电气计划</el-button>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-card style="width: 59.5%; float: left">
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-dblclick="changeState" @row-click="deleteData1">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
@@ -98,9 +98,8 @@
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="warning" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
</template>
</el-table-column>
</el-table>
@@ -120,10 +119,12 @@ export default {
groupNum: [],
tableData1: [],
tableData2: [],
hadFile: []
hadFile: [],
plan: ''
}
},
created() {
this.searchTable1()
},
mounted() {
this.initProject()
@@ -155,6 +156,9 @@ export default {
})
}
},
changeState(row) {
row.edit = !row.edit
},
initProject() {
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -166,24 +170,23 @@ export default {
}
})
},
machineChange() {
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
},
confirmEdit(row) {
editData(row.计划流水号, row.组件流水号, this.groupNumberValue, row.任务名称, row.计划工时).then(response => {
if (response.data[0].result === '1') {
row.edit = false
this.searchTable2()
this.tableData2 = []
searchTable2(this.machineNumberValue, 2).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('编辑成功')
} else {
this.$message.error('编辑失败')
@@ -192,45 +195,13 @@ export default {
},
cancel(row) {
row.edit = !row.edit
this.searchTable2()
},
deleteData(row) {
console.log(row.计划流水号)
this.deleteRow(deletedata, row.计划流水号, function() { this.searchTable2() })
deleteData1(row) {
this.plan = row.计划流水号
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 2).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.searchTable2()
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.check2 === 0) {
this.tableData1 = []
deleteData() {
this.deleteRow(deletedata, this.plan, function() {
this.tableData2 = []
} else {
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
}).then(() => {
this.searchTable2()
})
}
},
searchTable2() {
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
this.check2 = 1
searchTable2(this.machineNumberValue, 2).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
@@ -243,8 +214,69 @@ export default {
})
}
})
console.log(this.tableData2, 222222)
} else { this.check2 = 0 }
})
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 2).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.tableData2 = []
searchTable2(this.machineNumberValue, 2).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
})
},
searchTable2(row) {
this.tableData2 = []
this.machineNumberValue = row.机床流水号
searchTable2(this.machineNumberValue, 2).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
}
}
}

154
src/views/Assembly/MakePaintPlan/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()">
<el-option
@@ -13,6 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -31,9 +33,8 @@
</div>
</div>
</el-card>
<el-card>
<h3 style="text-align: center;">机床信息</h3>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-card style="width: 40%; float: left">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -56,9 +57,8 @@
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加油漆计划</el-button>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-card style="width: 59.5%; float: left">
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-dblclick="changeState" @row-click="deleteData1">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
@@ -100,7 +100,6 @@
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" size="small" plain @click="deleteData(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -120,10 +119,12 @@ export default {
groupNum: [],
tableData1: [],
tableData2: [],
hadFile: []
hadFile: [],
plan: ''
}
},
created() {
this.searchTable1()
},
mounted() {
this.initProject()
@@ -155,6 +156,9 @@ export default {
})
}
},
changeState(row) {
row.edit = !row.edit
},
initProject() {
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -166,24 +170,23 @@ export default {
}
})
},
machineChange() {
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
},
confirmEdit(row) {
editData(row.计划流水号, row.组件流水号, this.groupNumberValue, row.任务名称, row.计划工时).then(response => {
if (response.data[0].result === '1') {
row.edit = false
this.searchTable2()
this.tableData2 = []
searchTable2(this.machineNumberValue, 4).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('编辑成功')
} else {
this.$message.error('编辑失败')
@@ -192,45 +195,13 @@ export default {
},
cancel(row) {
row.edit = !row.edit
this.searchTable2()
},
deleteData(row) {
console.log(row.计划流水号)
this.deleteRow(deletedata, row.计划流水号, function() { this.searchTable2() })
deleteData1(row) {
this.plan = row.计划流水号
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 4).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.searchTable2()
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.check2 === 0) {
this.tableData1 = []
deleteData() {
this.deleteRow(deletedata, this.plan, function() {
this.tableData2 = []
} else {
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
}).then(() => {
this.searchTable2()
})
}
},
searchTable2() {
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
this.check2 = 1
searchTable2(this.machineNumberValue, 4).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
@@ -243,8 +214,69 @@ export default {
})
}
})
console.log(this.tableData2, 222222)
} else { this.check2 = 0 }
})
},
addTable() {
if (this.machineNumberValue !== '') {
addData(this.machineNumberValue, 4).then(response => {
console.log(response)
if (response.data[0].result === '1') {
this.tableData2 = []
searchTable2(this.machineNumberValue, 4).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
} else {
this.$message.warning('请选择机床')
}
},
searchTable1() {
this.tableData1 = []
this.tableData2 = []
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
searchTable1(this.machineNumberValue, this.check2).then(response => {
this.tableData1 = response.data
})
},
searchTable2(row) {
this.tableData2 = []
this.machineNumberValue = row.机床流水号
searchTable2(this.machineNumberValue, 4).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
计划流水号: response.data[i].计划流水号,
组件流水号: response.data[i].组件流水号,
组号: response.data[i].组号,
任务名称: response.data[i].任务名称,
计划工时: response.data[i].计划工时,
edit: false
})
}
})
this.groupNumberValue = ''
this.groupNum = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
this.getFileData(this.machineNumberValue)
}
}
}

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

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card>
<el-card style="width: 1000px">
<el-row>
<span style="margin-left: 10px">零件图号</span>
<el-input v-model="Partpaint" clearable size="small" style="width:200px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
@@ -11,19 +11,29 @@
<el-tooltip :open-delay="1200" effect="dark" content="将所有机床零件入库" placement="top">
<el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="清除该条零件信息" placement="top">
<el-button
size="small"
type="danger"
style="float: right; margin-right: 10px;margin-top: 12px"
plain
class="el-icon-delete"
@click="handleDelete()">移除</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
<el-card style="width: 1000px">
<el-table
v-loading="listLoading"
:data="tableDataNum"
:row-class-name="tableRowClassName"
stripe
highlight-current-row
border
size="mini"
style="width: 100%;margin: 3px 0px"
height="650px">
height="750px">
<el-table-column
label="序号"
align="center"
@@ -39,33 +49,22 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="100">
<el-table-column label="零件图号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="计划数量" align="center" min-width="100">
<el-table-column label="计划数量" align="center" min-width="70">
<template slot-scope="scope" align="center">
{{ tableDataNum[scope.$index].plannumber }}
</template>
</el-table-column>
<el-table-column label="入库数量" align="center" min-width="100">
<el-table-column label="入库数量" align="center" min-width="70">
<template slot-scope="scope">
<el-input v-model="tableDataNum[scope.$index].innumber" clearable size="mini"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" min-width="100">
<template slot-scope="scope">
<el-select v-model="inventoryNumber" filterable clearable size="mini" placeholder="仓库名称" @change="Getlocate">
<el-option
v-for="item in inventoryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="货位" align="center" min-width="120">
<el-table-column label="货位" align="center" width="120">
<template slot-scope="scope">
<el-select v-model="locateNumber" filterable clearable size="mini" placeholder="货位名称">
<el-option
@@ -81,26 +80,13 @@
<el-input v-model="tableData[scope.$index].note" clearable size="mini"/>
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="清除该条零件信息" placement="top">
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="danger"
plain
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">移除</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</el-card>
</div>
</template>
<script>
import { searchTable, insertOne, getinventory, getlocate, searchPartNumber, CraftNumber } from '@/api/Inventory/Inboundscanning'
import { searchTable, insertOne, getlocate, searchPartNumber, CraftNumber } from '@/api/Inventory/Inboundscanning'
import { mapGetters } from 'vuex'
import { wsuri, name } from '@/utils/request'
export default {
@@ -114,6 +100,7 @@ export default {
craftplannumber: '',
radio2: 3,
PeopleNumber: '',
NUM: '',
inventoryName: [], // 仓库名称下拉框
inventoryNumber: '',
locateName: [], // 货位名称下拉框
@@ -131,13 +118,21 @@ export default {
created() {
this.initWebpack()
this.getpeopleid()
this.Getinvent()
this.Getlocate()
},
methods: {
// 移除
handleDelete(index, row) {
this.tableDataNum.splice(index, 1)
this.tableData.splice(index, 1)
handleDelete() {
this.tableDataNum.splice(this.NUM, 1)
this.tableData.splice(this.NUM, 1)
this.NUM = ''
},
tableRowClassName({ row, rowIndex }) {
console.log(rowIndex)
this.NUM = rowIndex
},
searchData(index) {
this.NUM = index
},
// 获取人员编号
getpeopleid() {
@@ -309,17 +304,11 @@ export default {
this.tableDataNum = []
this.Partpaint = ''
},
// 仓库查询
Getinvent() {
this.getSelect(getinventory, ['仓库名称', '仓库流水号'], 'inventoryName')
},
// 根据仓库获取货位
Getlocate() {
this.locateName = []
this.locateNumber = ''
if (this.inventoryNumber) {
this.getSelect(getlocate, ['货位名称', '货位流水号'], 'locateName', this.inventoryNumber)
}
this.getSelect(getlocate, ['货位名称', '货位流水号'], 'locateName')
}
}
}

25
src/views/Inventory/OutPartSelect/index.vue
View File

@@ -34,12 +34,7 @@
size="mini"
highlight-current-row
border
height="550">
<el-table-column
label="序号"
align="center"
width="55"
type="index"/>
height="730">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
@@ -50,7 +45,7 @@
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库数量" width="120px">
<el-table-column align="center" label="出库数" width="70px">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
@@ -60,29 +55,29 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="120px">
<el-table-column align="center" label="组号" prop="组号" width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料人" prop="出库备注">
<el-table-column align="center" label="领料人" prop="出库备注" width="80px">
<template slot-scope="scope">
{{ scope.row.出库备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库时间" prop="出库时间">
<el-table-column align="center" label="出库时间" prop="出库时间" width="100px">
<template slot-scope="scope">
{{ scope.row.出库时间 }}
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-if="!listLoading1"
:current-page="pageCurrent"
:page-sizes="[15, 20, 30, 40]"
:page-size="pageSize"
:total="total"
:current-page="pageCurrent1"
:page-sizes="[15, 20, 30, 500]"
:page-size="pageSize1"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>

119
src/views/Inventory/StockInquiry/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span style="margin-left: 10px">机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 120px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -13,7 +13,7 @@
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 120px;">
<el-option
v-for="item in Groups"
:key="item.value"
@@ -21,36 +21,32 @@
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=15;total = 0">查询</el-button>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 120px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
</el-card>
<el-card>
<el-card style="width: 49.5%; float: left">
<el-table
v-loading="listLoading1"
:data="tableData1"
stripe
size="mini"
style="width: 100%"
highlight-current-row
class="table"
border
height="550">
<el-table-column
label="序号"
align="center"
width="55"
type="index"/>
height="730">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
<el-table-column align="center" label="零件图号" prop="零件图号" min-width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库数量" width="120px">
<el-table-column align="center" label="入库数" width="70px">
<template slot-scope="scope">
{{ scope.row.入库数量 }}
</template>
@@ -60,24 +56,19 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="120px">
<el-table-column align="center" label="组号" prop="组号" width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="仓库名称" width="120px">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="货位名称" prop="货位名称" width="120px">
<el-table-column align="center" label="货位名称" prop="货位名称" width="100px">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库时间" prop="入库时间">
<el-table-column align="center" label="入库时间" prop="入库时间" width="100px">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
{{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
</el-table>
@@ -85,7 +76,7 @@
<el-pagination
v-if="!listLoading1"
:current-page="pageCurrent"
:page-sizes="[15, 20, 30, 40]"
:page-sizes="[15, 20, 30, 500]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@@ -94,11 +85,71 @@
</div>
</el-card>
<el-card style="width: 49.5%; float: left;margin-left: 10px">
<el-table
v-loading="listLoading2"
:data="tableData0"
class="table"
stripe
size="mini"
style="width: 100%"
highlight-current-row
border
height="730">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" prop="零件图号" min-idth="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库数" width="70px">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料人" prop="出库备注" width="80px">
<template slot-scope="scope">
{{ scope.row.出库备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库时间" prop="出库时间" width="100px">
<template slot-scope="scope">
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-if="!listLoading2"
:current-page="pageCurrent0"
:page-sizes="[15, 20, 30, 500]"
:page-size="pageSize0"
:total="total0"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { getMachines, getGroups, getTable } from '@/api/Inventory/StockInquiry'
import { getMachines, getGroups, getTable, getTable1 } from '@/api/Inventory/StockInquiry'
export default {
data() {
@@ -112,10 +163,15 @@ export default {
checkbox_Group: false,
checkbox_number: false,
tableData1: [],
tableData0: [],
listLoading1: false,
listLoading2: false,
total: 0, // 总条数
pageSize: 15,
pageCurrent: 1
pageSize: 500,
pageCurrent: 1,
total0: 0, // 总条数
pageSize0: 500,
pageCurrent0: 1
}
},
created() {
@@ -153,6 +209,7 @@ export default {
// 按条件查询
getTableData() {
this.listLoading1 = true
this.listLoading2 = true
if (this.Machine === '') {
this.checkbox_Machine = 0
} else {
@@ -169,6 +226,7 @@ export default {
this.checkbox_number = 1
}
this.tableData1 = []
this.tableData0 = []
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) {
this.listLoading1 = false
@@ -178,6 +236,15 @@ export default {
this.listLoading1 = false
}
})
getTable1(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent0, this.pageSize0).then(response => {
if (response.data.total === 0) {
this.listLoading2 = false
} else {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.listLoading2 = false
}
})
},
handleSizeChange(val) {
this.pageCurrent = 1

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

@@ -127,7 +127,7 @@
<div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1225px;top:235px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">采购计划完成率：{{ `${data2[0].车间采购}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">制造部采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
</el-tooltip>
</div>
<div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -465px;top:278px; width: 80px;height: 48px;">
@@ -911,7 +911,7 @@
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>车间采购</h3>
<h3>制造部采购</h3>
<el-table
id="div3"
ref="div3"
@@ -943,7 +943,7 @@
{{ scope.row.总零件数量 ? scope.row.总零件数量 : '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="车间采购到货" width="60px">
<el-table-column align="center" label="采购到货" width="60px">
<template slot-scope="scope">
{{ scope.row.到货数量 ? scope.row.到货数量 : 0 }}
</template>
@@ -1511,10 +1511,10 @@
</el-row>
</el-card>
</div>
<!--车间采购-->
<!--制造部采购-->
<div v-show="showDiv17">
<el-card class="showDiv">
<h3 style="align-content: center">{{ Machine }} : 车间采购</h3>
<h3 style="align-content: center">{{ Machine }} : 制造部采购</h3>
<el-row style="margin-top: 10px">
<el-col :span="12">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">

34
src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
View File

@@ -67,22 +67,22 @@
</el-table-column>
<el-table-column label="签订日期" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '-' }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.发货节点 }}
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '-' }}
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.设备预验收节点 }}
{{ scope.row.设备预验收节点 !== '1900-01-01' ? scope.row.设备预验收节点 : '-' }}
</template>
</el-table-column>
<el-table-column label="安装调试节点" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.安装调试节点 }}
{{ scope.row.安装调试节点 !== '1900-01-01' ? scope.row.安装调试节点 : '-' }}
</template>
</el-table-column>
<el-table-column label="设计者" align="center" width="90px">
@@ -101,7 +101,7 @@
<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.审图计划开始时间 }}
{{ scope.row.审图计划开始时间 !== '1900-01-01' ? scope.row.审图计划开始时间 : '-' }}
</template>
</template>
</el-table-column>
@@ -111,7 +111,7 @@
<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.审图计划完成时间 }}
{{ scope.row.审图计划完成时间 !== '1900-01-01' ? scope.row.审图计划完成时间 : '-' }}
</template>
</template>
</el-table-column>
@@ -121,7 +121,7 @@
<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.审图实际完成时间 }}
{{ scope.row.审图实际完成时间 !== '1900-01-01' ? scope.row.审图实际完成时间 : '-' }}
</template>
</template>
</el-table-column>
@@ -131,13 +131,13 @@
<el-date-picker v-model="scope.row.机床设计完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 !== '1900-01-01 00:00:00' ? scope.row.机床设计完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="发图（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.机床设计实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.机床设计实际完成时间 !== '1900-01-01' ? scope.row.机床设计实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="采购（计划）" align="center" width="150px">
@@ -146,13 +146,13 @@
<el-date-picker v-model="scope.row.采购完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 !== '1900-01-01' ? scope.row.采购完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="采购（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.采购实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.采购实际完成时间 !== '1900-01-01' ? scope.row.采购实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="备料（计划）" align="center" width="150px">
@@ -161,13 +161,13 @@
<el-date-picker v-model="scope.row.备料完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 !== '1900-01-01' ? scope.row.备料完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="备料（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.备料实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.备料实际完成时间 !== '1900-01-01' ? scope.row.备料实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="制造（计划）" align="center" width="150px">
@@ -176,13 +176,13 @@
<el-date-picker v-model="scope.row.机床生产完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 !== '1900-01-01' ? scope.row.机床生产完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="制造（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.机床生产实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.机床生产实际完成时间 !== '1900-01-01' ? scope.row.机床生产实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="装配（计划）" align="center" width="150px">
@@ -191,13 +191,13 @@
<el-date-picker v-model="scope.row.机床装配完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 !== '1900-01-01' ? scope.row.机床装配完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="装配（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.机床装配实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.机床装配实际完成时间 !== '1900-01-01' ? scope.row.机床装配实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<!--<el-table-column label="顺序" align="center" width="100px">-->

11
src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
View File

@@ -40,7 +40,7 @@
</el-table-column>
<el-table-column label="请款时间" prop="。请款时间" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="请款人" prop="姓名" align="center" min-width="80">
@@ -227,7 +227,7 @@
</el-table-column>
<el-table-column label="合同总额" align="center" width="80" prop="合同总额">
<template slot-scope="scope">
{{ scope.row.合同总额 }}
{{ scope.row.合同总额 ? parseInt(scope.row.合同总额 * 100)/100 : '-' }}
</template>
</el-table-column>
<el-table-column label="已付金额" align="center" width="80" prop="已付金额">
@@ -242,7 +242,7 @@
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="120" prop="请款金额">
<template slot-scope="scope">
<el-input-number :precision="2" :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" v-model="scope.row.请款金额" size="mini" controls-position="right" style="width: 100%;"/>
<el-input-number :precision="2" :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" :min="0" v-model="scope.row.请款金额" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
@@ -468,7 +468,8 @@ export default {
})
this.tableData01.map(v => {
this.$set(v, '请款金额', 0)
v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额
console.log(v.合同总额, v.已付金额, v.申请中金额)
v.请款金额 = v.合同总额 - v.已付金额
return v
})
})
@@ -488,6 +489,8 @@ export default {
this.sumGroup = []
console.log(val)
for (let i = 0; i < val.length; i++) {
console.log(val[i].请款金额)
console.log(parseFloat(val[i].请款金额), 123)
this.SUM += parseFloat(val[i].请款金额)
this.contractGroup.push(val[i].离线合同流水号)
this.sumGroup.push(val[i].请款金额)

73
src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
View File

@@ -1,62 +1,5 @@
<template>
<div class="app-container">
<el-card>
<div slot="header">
<span>时间段:</span>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:300px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable0()">查询</el-button>
</div>
<h3>付款计划</h3>
<el-table :data="tableData0" size="mini" border style="max-height: 250px;" height="250px" highlight-current-row @row-click="searchContract">
<el-table-column label="计划状态" prop="计划付款日期" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="timeToStamp(scope.row.计划付款日期) <= getDate" type="danger" size="small">已拖期</el-tag>
<el-tag v-if="timeToStamp(scope.row.计划付款日期) > getDate" type="success" size="small">未拖期</el-tag>
</template>
</el-table-column>
<el-table-column label="计划付款日期" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.计划付款日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="计划付款金额" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.计划付款金额 }}
</template>
</el-table-column>
<el-table-column label="计划付款备注" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.计划付款备注 }}
</template>
</el-table-column>
<el-table-column label="采购合同编号" prop="采购合同编号" min-width="100" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="采购合同名称" prop="采购合同名称" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" prop="供应商名称" min-width="150" align="center">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<div slot="header">
@@ -75,14 +18,6 @@
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
<div>
<span v-show="supplierValue">累计合同总额：</span>
<el-input v-show="supplierValue" v-model="totalSum" size="mini" style="width: 100px;" readonly/>
<span v-show="supplierValue">累计付款：</span>
<el-input v-show="supplierValue" v-model="totalPay" size="mini" style="width: 100px;" readonly/>
<span v-show="supplierValue">累计欠款：</span>
<el-input v-show="supplierValue" v-model="totalDebt" size="mini" style="width: 100px;" readonly/>
</div>
</div>
<h3>请款表</h3>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
@@ -93,7 +28,7 @@
</el-table-column>
<el-table-column label="请款时间" prop="请款时间" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="请款人" prop="姓名" align="center" min-width="80">
@@ -184,7 +119,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1000px">
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1000px">
<span>供应商：</span>
<el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small">
<el-option
@@ -218,7 +153,7 @@
</el-table-column>
<el-table-column label="合同总额" align="center" width="80" prop="合同总额">
<template slot-scope="scope">
{{ scope.row.合同总额 }}
{{ scope.row.合同总额 ? parseInt(scope.row.合同总额 * 100)/100 : '-' }}
</template>
</el-table-column>
<el-table-column label="已付金额" align="center" width="80" prop="已付金额">
@@ -233,7 +168,7 @@
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="120" prop="请款金额">
<template slot-scope="scope">
<el-input-number :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" v-model="scope.row.请款金额" :precision="2" size="mini" controls-position="right" style="width: 100%;"/>
<el-input-number :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" :min="0" v-model="scope.row.请款金额" :precision="2" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>

4
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -553,14 +553,14 @@ export default {
data.图号或者型号 = data.图号或者型号.substring(index + 1)
if (data.图号或者型号.indexOf('组') > -1) {
const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量)
const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, data.部件数量)
const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++
}
} else {
const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量)
const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, data.部件数量, 1)
const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, 1)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++