|
|
|
|
@ -2,17 +2,6 @@
|
|
|
|
|
<el-container style="height: 100%;position: absolute;width: 100%;">
|
|
|
|
|
<el-col :span="16" style="height:100%;">
|
|
|
|
|
<div style="color:#909399;font-size: 12px;height: 9%">
|
|
|
|
|
所属公司：
|
|
|
|
|
<el-select v-model="query.companyName" clearable placeholder="所属公司" style="width: 100px">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in dm_depart"
|
|
|
|
|
:key="item.depart_code"
|
|
|
|
|
:label="item.depart_name"
|
|
|
|
|
:value="item.depart_code"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
班组编码：
|
|
|
|
|
<el-input v-model="query.resourcesCode" placeholder="班组编码" style="width: 100px" clearable />
|
|
|
|
|
班组名称：
|
|
|
|
|
<el-input v-model="query.resourcesName" placeholder="班组名称" style="width: 100px" clearable />
|
|
|
|
|
班组分类：
|
|
|
|
|
@ -46,7 +35,7 @@
|
|
|
|
|
ref="bzxxTable"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
:data="c_yhxxTableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"
|
|
|
|
|
height="calc(100% - 60px - 35px)"
|
|
|
|
|
height="calc(100% - 80px - 35px)"
|
|
|
|
|
:header-cell-style="{ textAlign: 'center' }"
|
|
|
|
|
:cell-style="{ textAlign: 'center' }"
|
|
|
|
|
width="100%"
|
|
|
|
|
@ -63,24 +52,17 @@
|
|
|
|
|
<el-table-column label="序号" type="index" />
|
|
|
|
|
<el-table-column label="班组编码" property="resourcesCode" />
|
|
|
|
|
<el-table-column label="班组名称" property="resourcesName" />
|
|
|
|
|
<el-table-column label="是否资源" property="resource" />
|
|
|
|
|
<el-table-column label="所属工厂" property="factoryName" />
|
|
|
|
|
<el-table-column label="所属车间" property="workshopName" />
|
|
|
|
|
<el-table-column label="所属跨位" width="100px">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ getKwName(scope.row.kw) }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="所属产线" property="productionLineName" />
|
|
|
|
|
<el-table-column label="组织类型" property="resourcesType" />
|
|
|
|
|
<el-table-column label="外部对照码" property="comparisonCode" />
|
|
|
|
|
<el-table-column label="班组分类" property="classification" />
|
|
|
|
|
<el-table-column label="状态" property="flagStatus" />
|
|
|
|
|
<!-- <el-table-column label="操作" fixed="right">-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <el-button @click="handleDeleteYhxx2" type="text" size="small" style="text-align: center;color: red">删除</el-button>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<el-table-column label="操作" fixed="right">
|
|
|
|
|
<template #default="{row}">
|
|
|
|
|
<el-button @click="(event)=>bzPersonAdd(event,row)" type="text" style="text-align: center;color: blue">编辑</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
<el-pagination
|
|
|
|
|
:current-page="currentPage"
|
|
|
|
|
@ -177,7 +159,7 @@
|
|
|
|
|
class="bzryTable"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
:data="bzryTableData"
|
|
|
|
|
height="calc(100% - 30px - 35px)"
|
|
|
|
|
height="calc(100% - 80px - 35px)"
|
|
|
|
|
width="100%"
|
|
|
|
|
:border="true"
|
|
|
|
|
highlight-current-row
|
|
|
|
|
@ -199,6 +181,23 @@
|
|
|
|
|
</el-table>
|
|
|
|
|
</el-col>
|
|
|
|
|
<tbfilter ref="tbFilter" :list="c_yhxxTableData" :filter="columnFilter" @execFilter="execFilter" />
|
|
|
|
|
<el-dialog class="YhxxDialog" title="增加人员" :visible.sync="addPersonVisible" width="450px" center="">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<span style="width: 110px;display:inline-block;">所属班组：</span>
|
|
|
|
|
<el-input v-model="selectedPerson.resourcesCode" style="width: 250px;display: none" />
|
|
|
|
|
<el-input v-model="selectedPerson.resourcesName" disabled placeholder="" style="width: 250px;" />
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<span style="width: 110px;display:inline-block;">人员编码：</span>
|
|
|
|
|
<el-input v-model="selectedPerson.userCode" placeholder="" style="width: 250px;" />
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<span style="width: 110px;display:inline-block;">人员姓名：</span>
|
|
|
|
|
<el-input v-model="selectedPerson.userName" placeholder="" style="width: 250px;" />
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
</el-container>
|
|
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
@ -222,6 +221,8 @@ export default {
|
|
|
|
|
components: { tbfilter },
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
selectedPerson:{},
|
|
|
|
|
addPersonVisible:false,
|
|
|
|
|
defaultHeight: {
|
|
|
|
|
height: '100%'
|
|
|
|
|
},
|
|
|
|
|
@ -291,6 +292,11 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
bzPersonAdd(e,row){
|
|
|
|
|
this.selectedPerson=row
|
|
|
|
|
this.addPersonVisible=true
|
|
|
|
|
e.preventDefault()
|
|
|
|
|
},
|
|
|
|
|
showFilter(column) {
|
|
|
|
|
this.$refs.tbFilter.showFilter(column)
|
|
|
|
|
},
|
|
|
|
|
@ -299,7 +305,7 @@ export default {
|
|
|
|
|
this.$set(this.columnFilter, property, vals)
|
|
|
|
|
},
|
|
|
|
|
getHeight() {
|
|
|
|
|
this.defaultHeight.height = window.innerHeight - 140 + 'px'
|
|
|
|
|
this.defaultHeight.height = window.innerHeight - 170 + 'px'
|
|
|
|
|
},
|
|
|
|
|
handleSizeChange(val) {
|
|
|
|
|
this.pageSize = val
|
|
|
|
|
|
