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:
chenjianan
2019-03-29 18:53:38 +08:00
parent ba65c1ffec 25d84bd2c4
commit 0b575f11a6
7 changed files with 82 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@
<el-card>
<el-table v-loading="loading" :data="tableData" height="580" size="mini" style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column min-width="300px" label="项目编号" align="center" width="240px">
<el-table-column label="项目编号" align="center" width="140px">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.项目编号" size="mini"/>
@@ -44,37 +44,32 @@
</template>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" width="250px">
<el-table-column label="项目名称" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="250px">
<el-table-column label="机床图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="250px">
<el-table-column label="机床名称" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="100px">
<el-table-column label="机床数量" align="center" width="70px">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.数量" size="mini"/>
</template>
<template v-else>
{{ scope.row.数量 }}
</template>
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="签订日期" align="center" width="250px">
<el-table-column label="签订日期" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="250px">
<el-table-column label="交货期" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.发货节点 }}
</template>
@@ -94,7 +89,7 @@
</template>
</template>
</el-table-column>
<el-table-column label="发图" align="center" width="250px">
<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"/>
@@ -104,7 +99,7 @@
</template>
</template>
</el-table-column>
<el-table-column label="采购" align="center" width="250px">
<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"/>
@@ -114,7 +109,7 @@
</template>
</template>
</el-table-column>
<el-table-column label="备料" align="center" width="250px">
<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"/>
@@ -124,7 +119,7 @@
</template>
</template>
</el-table-column>
<el-table-column label="制造" align="center" width="250px">
<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"/>
@@ -134,7 +129,7 @@
</template>
</template>
</el-table-column>
<el-table-column label="装配" align="center" width="250px">
<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"/>
@@ -407,7 +402,7 @@ export default {
项目名称: response.data.rows[i].项目名称,
机床图号: response.data.rows[i].机床图号,
机床名称: response.data.rows[i].机床名称,
数量: response.data.rows[i].数量,
机床数量: response.data.rows[i].机床数量,
合同签订日期: response.data.rows[i].合同签订日期,
发货节点: response.data.rows[i].发货节点,
客户名称: response.data.rows[i].客户名称,
@@ -431,7 +426,7 @@ export default {
},
// 表格1保存
confirmEdit(row) {
editTable(row.项目流水号, row.机床流水号, row.项目编号, row.数量, row.机床设计者, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
editTable(row.项目流水号, row.机床流水号, row.项目编号, row.机床设计者, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
if (response.data[0].result === '1') {
row.edit = false
this.$notify({

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

@@ -320,30 +320,78 @@ export default {
if (this.projectValue !== '') {
if (this.machineValue !== '') {
searchtable(this.projectValue, this.machineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].合同签订日期 !== '' && response.data[i].合同签订日期 !== null) {
response.data[i].合同签订日期 = response.data[i].合同签订日期.split(' ')[0]
}
if (response.data[i].发货节点 !== '' && response.data[i].发货节点 !== null) {
response.data[i].发货节点 = response.data[i].发货节点.split(' ')[0]
}
}
this.loading = false
this.tableData = response.data
}).then(() => {
searchtable2(this.machineValue, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
}
if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
}
}
this.loading1 = false
console.log(response.data, 2)
this.tableData1 = response.data
})
searchtable2(this.machineValue, 2).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
}
if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
}
}
this.loading1 = false
console.log(response.data, 3)
this.tableData2 = response.data
})
searchtable2(this.machineValue, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
}
if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
}
}
this.loading1 = false
console.log(response.data, 4)
this.tableData3 = response.data
})
searchtable2(this.machineValue, 4).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
}
if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
}
}
this.loading1 = false
console.log(response.data, 5)
this.tableData4 = response.data
})
searchtable2(this.machineValue, 5).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
}
if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
}
}
this.loading1 = false
console.log(response.data, 6)
this.tableData5 = response.data

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

@@ -50,7 +50,7 @@
@expand-change="selectMachine">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 491px; text-align: center" size="mini">
<el-table :data="tableData2" border style="width: 571px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="130">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -61,6 +61,11 @@
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="机床数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
@@ -372,6 +377,9 @@
<el-form-item label="设备名称" prop="设备名称">
<el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:200px"/>
</el-form-item>
<el-form-item label="机床数量" prop="机床数量">
<el-input-number v-model="form1.机床数量" controls-position="right" :min="1" style="width:200px" size="small"></el-input-number>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form1')">取消</el-button>
@@ -632,7 +640,8 @@ export default {
executionProgressID: '',
form1: {
设备型号: '',
设备名称: ''
设备名称: '',
机床数量: 1
},
form2: {
进度完成日期: ''
@@ -1095,9 +1104,9 @@ export default {
this.dialogFormVisible2 = false
}
if (this.flag === 1) {
this.addTable(submitMachine, [this.projectNum, this.form1.设备型号, this.form1.设备名称], 'form1', a)
this.addTable(submitMachine, [this.projectNum, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
} else {
this.editTable(editMachine, [this.c, this.form1.设备型号, this.form1.设备名称], 'form1', a)
this.editTable(editMachine, [this.c, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
}
},
deleteMachine(row) {