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

new

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/views/ManufacturingCenter/RepairTimeEntry/index.vue
View File

@@ -1,5 +1,6 @@
<template>
<div class="app-container">
<<<<<<< HEAD
<el-card>
<span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
@@ -9,32 +10,68 @@
<el-card>
<el-table v-loading="loading0" :data="tableData" height="770" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
=======
<el-card>
<span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:10px;">
<el-button slot="append" icon="el-icon-search" size="small" @click="dialogTableVisible"/>
</el-input>
<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
label="序号"
type="index"
align="center"
width="50"/>
<<<<<<< HEAD
<el-table-column label="零件图号" align="center">
=======
<el-table-column label="零件图号" align="center" width="280px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.零件图号_零件工艺计划 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="修补工时" align="center">
=======
<el-table-column label="修补工时" align="center" width="110px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="年" align="center">
=======
<el-table-column label="年" align="center" width="100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.年 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="月" align="center">
=======
<el-table-column label="月" align="center" width="100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.月 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="人员" align="center">
=======
<el-table-column label="人员" align="center" width="140px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -44,6 +81,7 @@
{{ scope.row.修补工艺 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -65,6 +103,20 @@
@click="handleDelete(scope.$index, scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
<el-button
size="mini"
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -186,7 +238,11 @@
@node-click="handleNodeClick"
/>
</div>
<<<<<<< HEAD
<el-table :data="List1" highlight-current-row height="400" stripe border size="mini" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
=======
<el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
@@ -202,7 +258,11 @@
{{ scope.row.性别 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="工作岗位" align="center" show-overflow-tooltip>
=======
<el-table-column label="工作岗位" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
@@ -260,7 +320,11 @@ export default {
count1: 0, // 清表单验证计数器
count2: 0, // 清表单验证计数器
tableData: [], // 表格数据
<<<<<<< HEAD
pageSize: 20,
=======
pageSize: 10,
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
pageCurrent: 1,
total: 0,
dialogFormVisible: false,
@@ -466,7 +530,11 @@ export default {
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
<<<<<<< HEAD
this.title1 = '新增修补工时'
=======
this.title1 = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible = true
}
},
@@ -478,7 +546,11 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.pageCurrent = 1
<<<<<<< HEAD
this.pageSize = 20
=======
this.pageSize = 10
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.searchTable()
this.dialogFormVisible = false
} else {
@@ -506,7 +578,11 @@ export default {
this.form.timeNumber = row.修补工时
this.form.修补工艺 = row.修补工艺
this.dialogFormVisible = true
<<<<<<< HEAD
this.title1 = '编辑修补工时'
=======
this.title1 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
// 编辑确定
handleChange() {
@@ -554,7 +630,13 @@ export default {
</script>
<style scoped>
<<<<<<< HEAD
/*.el-card{*/
/* margin-bottom: 15px;*/
/*}*/
=======
.el-card{
margin-bottom: 15px;
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</style>