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.112:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2018-12-07 18:58:31 +08:00
parent 3fed67dec1 044ceeb344
commit 081758df73
18 changed files with 333 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -609,7 +609,7 @@ export default {
this.form.完成时间 = ''
this.form.人员 = ''
this.form.考勤编号 = ''
if (this.worker[index][a] !== '请选择') {
if (this.worker[index][a] !== '超级管理员') {
this.midd = 1
this.form.人员 = this.worker[index][a]
}

1
src/views/ManufacturingCenter/QuotaFormulation/index.vue
View File

@@ -308,6 +308,7 @@ export default {
numm: response.data[i].工艺计划流水号
})
}
this.listLoading = false
}
})
})

9
src/views/ManufacturingCenter/SparePartsForScrap/index.vue
View File

@@ -51,36 +51,42 @@
style="width: 100%; text-align: center"
@current-change="fetchTableData2">
<el-table-column
align="center"
prop="province1"
label="零件号"
>
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province2"
label="零件名称"
>
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province4"
label="批次数量"
>
<template slot-scope="scope">{{ scope.row.批次数量 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province5"
label="开始时间"
>
<template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province6"
label="结束时间"
>
<template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province7"
label="批次零件状态"
>
@@ -90,6 +96,7 @@
</template>
</el-table-column>
<el-table-column
align="center"
fixed="right"
label="操作"
width="100px"
@@ -119,7 +126,6 @@
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(226,223,223,1)"
height="250"
highlight-current-row
border
stripe
style="width: 100%">
@@ -377,6 +383,7 @@ export default {
this.MachineDrawingValue ? this.MachineCode_check = 1 : this.MachineCode_check = 0
this.TeamValue ? this.TeamCode_check = 1 : this.TeamCode_check = 0
this.PartDrawing ? this.PartDrawing_check = 1 : this.PartDrawing_check = 0
this.tableData2 = []
this.getTable(TableDataSelect, [this.ProjectCode_check, this.ProjectNameValue, this.MachineCode_check, this.MachineDrawingValue, this.TeamCode_check, this.TeamValue, this.ComponentPartsBasicCattleTaxNumber_check, this.ComponentPartsBasicCattleTaxNumber, this.CutCode_check, this.CutCode, this.CutCodeBefore_check, this.CutCodeBefore, this.Assess_check, this.Assess, this.PartDrawing_check, this.PartDrawing, this.currentPage1, this.pageSize1], ['tableData', 'total1', 'loading'])
},
fetchTableData2(row) {

37
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -27,7 +27,6 @@
</el-input>
<span>零件号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
<br>
<span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
<el-option
@@ -36,14 +35,14 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件类型:</span>
<el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">
<el-option
v-for="item in partType"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>零件类型:</span>-->
<!--<el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">-->
<!--<el-option-->
<!--v-for="item in partType"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
</el-card>
@@ -100,15 +99,15 @@
</el-steps>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="120px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
</template>
</el-table-column>
<!--<el-table-column label="操作" fixed="right" align="center" width="120px">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--icon="el-icon-edit"-->
<!--@click="handleEdit(scope.row)">编辑</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
@@ -352,7 +351,6 @@ export default {
}
this.loading0 = true
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
console.log(response.data)
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
@@ -435,7 +433,6 @@ export default {
this.dialogFormVisible3 = false
},
handleEdit(row) {
console.log(row)
this.title = '编辑'
this.partStateValue1 = parseInt(row.考核状态) + 2
this.dialogFormVisible4 = true

59
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -98,18 +98,6 @@
<el-input v-model="form.设备型号" placeholder="设备型号" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="设备性能指标" prop="设备性能指标" >
<el-input v-model="form.设备性能指标" placeholder="设备性能指标" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span = "12">
<el-form-item label="设备加工能力" prop="设备加工能力" >
<el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="设备加工工艺" prop="设备加工工艺" >
<el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" size="small" style="width:200px" clearable >
@@ -122,7 +110,19 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-show="title!=='增加'">
<el-col :span = "12">
<el-form-item label="设备加工能力" prop="设备加工能力" >
<el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="设备性能指标" prop="设备性能指标" >
<el-input v-model="form.设备性能指标" placeholder="设备性能指标" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row v-show="title!=='增加'">
<el-col :span = "12">
<el-form-item label="班次类型" prop="班次类型" >
<el-select v-model="form.班次类型" placeholder="班次类型" size="small" style="width:200px" clearable >
@@ -140,7 +140,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-show="title!=='增加'">
<el-col :span = "12">
<el-form-item label="整改工时系数" prop="整改工时系数" >
<el-input v-model="form.整改工时系数" placeholder="整改工时系数" size="small" style="width:200px" clearable />
@@ -200,12 +200,12 @@ export default {
设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }],
设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }],
设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }],
设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }],
班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }]
// 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
// 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
// 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
// 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
// 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
}
}
},
@@ -241,9 +241,20 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.dialogFormVisible = true
this.title = '增加'
this.form = {}
this.form = {
设备名称: '',
设备编号: '',
设备型号: '',
设备加工工艺: ''
}
this.form.设备性能指标 = 1
this.form.设备加工能力 = 1
this.form.班次类型 = 1
this.form.设备工时系数 = 1
this.form.整改工时系数 = 1
this.form.预留工时系数 = 1
this.dialogFormVisible = true
},
handleEdit(row) {
if (this.$refs['form'] !== undefined) {
@@ -268,10 +279,8 @@ export default {
if (valid) {
if (this.title === '增加') {
this.submitAdd()
this.title = ''
} else if (this.title === '编辑') {
this.submitEdit()
this.title = ''
}
}
})
@@ -290,6 +299,7 @@ export default {
type: 'success'
})
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else {
this.$message.error('信息添加失败')
@@ -305,6 +315,7 @@ export default {
type: 'success'
})
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else {
this.$message.error('信息编辑失败')