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

刘璐珈

Browse Source
This commit is contained in:
Vergil
2020-03-18 17:47:47 +08:00
parent 715298cf6c
commit 8151bd6393
7 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/Assembly/AssemblyExecution/index.vue
View File

@@ -125,9 +125,9 @@
<el-button v-if="scope.row.调试状态===2" size="small" type="text" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button> <el-button v-if="scope.row.调试状态===2" size="small" type="text" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top" style="margin-left: 10px"> <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top" style="margin-left: 10px">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button> <el-button v-if="scope.row.edit" type="text" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/> <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button> <el-button v-if="scope.row.edit" type="text" size="small" @click="cancel(scope.row)">取消</el-button>
</div> </div>
</el-tooltip> </el-tooltip>
</template> </template>

12
src/views/Assembly/ColdWorkPlanExecution/index.vue
View File

@@ -87,9 +87,9 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/> <el-button v-if="!scope.row.isEditing" type="text" size="small" icon="el-icon-edit-outline" @click="editTable2(scope.row)"/>
<el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button> <el-button v-if="scope.row.isEditing" type="text" size="small" @click="submitTable2(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button> <el-button v-if="scope.row.isEditing" type="text" size="small" @click="cancelTable2(scope.row)">取消</el-button>
</div> </div>
</el-tooltip> </el-tooltip>
<el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button> <el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
@@ -203,9 +203,7 @@ export default {
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
this.check2 = 1 this.check2 = 1
searchTable2(this.machineNumberValue, 3).then(response => { searchTable2(this.machineNumberValue, 3).then(response => {
console.log(response.data, 111) response.data.map(v => {
this.tableData2 = response.data
this.tableData2.map(v => {
this.$set(v, 'isEditing', false) this.$set(v, 'isEditing', false)
this.$set(v, '原实际工时', '') this.$set(v, '原实际工时', '')
this.$set(v, '原修补工时', '') this.$set(v, '原修补工时', '')
@@ -219,6 +217,8 @@ export default {
} }
return v return v
}) })
this.tableData2 = response.data
console.log(this.tableData2, 111)
}) })
} else { this.check2 = 0 } } else { this.check2 = 0 }
}, },

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

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row style="margin-top: 10px; margin-bottom: 10px"> <el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span> <span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
:key="item.value" :key="item.value"
@@ -198,7 +198,12 @@ export default {
}) })
}, },
confirmEdit(row) { confirmEdit(row) {
editData(row.计划流水号, row.组件流水号, row.组号, row.任务名称, row.计划工时).then(response => { console.log(row, 999)
let obj = {}
obj = this.groupNum.find((item) => { // 这里的userList就是上面遍历的数据源
return item.value === row.组件流水号// 筛选出匹配数据
})
editData(row.计划流水号, row.组件流水号, obj.label, row.任务名称, row.计划工时).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
row.edit = false row.edit = false
this.tableData2 = [] this.tableData2 = []
@@ -244,7 +249,8 @@ export default {
}) })
}, },
addTable() { addTable() {
if (this.machineNumberValue !== '') { console.log(this.machineNumberValue, 888)
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
addData(this.machineNumberValue, 1).then(response => { addData(this.machineNumberValue, 1).then(response => {
console.log(response) console.log(response)
if (response.data[0].result === '1') { if (response.data[0].result === '1') {

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

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row style="margin-top: 10px; margin-bottom: 10px"> <el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span> <span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
:key="item.value" :key="item.value"
@@ -250,7 +250,7 @@ export default {
}) })
}, },
addTable() { addTable() {
if (this.machineNumberValue !== '') { if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
addData(this.machineNumberValue, 3).then(response => { addData(this.machineNumberValue, 3).then(response => {
console.log(response) console.log(response)
if (response.data[0].result === '1') { if (response.data[0].result === '1') {

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

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row style="margin-top: 10px; margin-bottom: 10px"> <el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span> <span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
:key="item.value" :key="item.value"
@@ -238,7 +238,7 @@ export default {
}) })
}, },
addTable() { addTable() {
if (this.machineNumberValue !== '') { if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
addData(this.machineNumberValue, 2).then(response => { addData(this.machineNumberValue, 2).then(response => {
console.log(response) console.log(response)
if (response.data[0].result === '1') { if (response.data[0].result === '1') {

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

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row style="margin-top: 10px; margin-bottom: 10px"> <el-row style="margin-top: 10px; margin-bottom: 10px">
<span>机床编号:</span> <span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();machineChange()"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
:key="item.value" :key="item.value"
@@ -238,7 +238,7 @@ export default {
}) })
}, },
addTable() { addTable() {
if (this.machineNumberValue !== '') { if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
addData(this.machineNumberValue, 4).then(response => { addData(this.machineNumberValue, 4).then(response => {
console.log(response) console.log(response)
if (response.data[0].result === '1') { if (response.data[0].result === '1') {

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

@@ -87,9 +87,9 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/> <el-button v-if="!scope.row.isEditing" type="text" size="small" icon="el-icon-edit-outline" @click="editTable2(scope.row)"/>
<el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button> <el-button v-if="scope.row.isEditing" type="text" size="small" @click="submitTable2(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button> <el-button v-if="scope.row.isEditing" type="text" size="small" @click="cancelTable2(scope.row)">取消</el-button>
</div> </div>
</el-tooltip> </el-tooltip>
<el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button> <el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>