|
|
@ -539,7 +539,7 @@ |
|
|
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" |
|
|
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" |
|
|
style="margin-left: 5px"> |
|
|
style="margin-left: 5px"> |
|
|
<el-form-item style="margin-left: 235px" prop="setupLaborClassNo" :rules="componentRules.setupLaborClassNo"> |
|
|
<el-form-item style="margin-left: 235px" prop="setupLaborClassNo" :rules="componentRules.setupLaborClassNo"> |
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(118, 2)"><a |
|
|
|
|
|
|
|
|
<span style="cursor: pointer" slot="label" @click="queryWorkerLevel1()"><a |
|
|
herf="#">调机过程中人员等级</a></span> |
|
|
herf="#">调机过程中人员等级</a></span> |
|
|
<el-input v-model="componentData.setupLaborClassNo" @blur="setupLaborClassBlur(118)" |
|
|
<el-input v-model="componentData.setupLaborClassNo" @blur="setupLaborClassBlur(118)" |
|
|
style="width: 90px"></el-input> |
|
|
style="width: 90px"></el-input> |
|
|
@ -575,7 +575,8 @@ |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item prop="laborClassNo" :rules="componentRules.laborClassNo"> |
|
|
<el-form-item prop="laborClassNo" :rules="componentRules.laborClassNo"> |
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(118, 1)"><a herf="#">人员等级</a></span> |
|
|
|
|
|
|
|
|
<span style="cursor: pointer" slot="label" @click="queryWorkerLevel2()"><a |
|
|
|
|
|
herf="#">人员等级</a></span> |
|
|
<el-input v-model="componentData.laborClassNo" @blur="laborClassBlur(118)" style="width: 90px"></el-input> |
|
|
<el-input v-model="componentData.laborClassNo" @blur="laborClassBlur(118)" style="width: 90px"></el-input> |
|
|
<el-input v-model="componentData.laborClassDesc" disabled style="width: 127px"></el-input> |
|
|
<el-input v-model="componentData.laborClassDesc" disabled style="width: 127px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
@ -1080,6 +1081,111 @@ |
|
|
<el-button type="primary" @click="workCenterModelFlag = false">关闭</el-button> |
|
|
<el-button type="primary" @click="workCenterModelFlag = false">关闭</el-button> |
|
|
</el-footer> |
|
|
</el-footer> |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 人员等级模态框 --> |
|
|
|
|
|
<el-dialog title="人员等级" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workerLevelModelFlag1" |
|
|
|
|
|
width="940px"> |
|
|
|
|
|
<el-form :inline="true" label-position="top" :model="searchData"> |
|
|
|
|
|
<el-form-item :label="'编码'" @keyup.enter.native="queryWorkerLevel1()"> |
|
|
|
|
|
<el-input v-model="searchData.levelId" clearable style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="'名称'" @keyup.enter.native="queryWorkerLevel1()"> |
|
|
|
|
|
<el-input v-model="searchData.levelDesc" clearable style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="' '"> |
|
|
|
|
|
<el-button type="primary" @click="queryWorkerLevel1()">查询</el-button> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
|
|
|
<el-table |
|
|
|
|
|
:height="250" |
|
|
|
|
|
:data="workerLevelList" |
|
|
|
|
|
@row-dblclick="getWorkerLevelRowData1()" |
|
|
|
|
|
border |
|
|
|
|
|
style="width: 100%;"> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
v-for="(item,index) in workerLevelColumnList" :key="index" |
|
|
|
|
|
:sortable="item.columnSortable" |
|
|
|
|
|
:prop="item.columnProp" |
|
|
|
|
|
:header-align="item.headerAlign" |
|
|
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
|
|
:align="item.align" |
|
|
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
|
|
:min-width="item.columnWidth" |
|
|
|
|
|
:label="item.columnLabel"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
|
|
|
style="width: 100px; height: 80px"/></span> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
</el-table> |
|
|
|
|
|
<!-- 分页插件 --> |
|
|
|
|
|
<el-pagination |
|
|
|
|
|
style="margin-top: 5px" |
|
|
|
|
|
@size-change="sizeChangeHandle6" |
|
|
|
|
|
@current-change="currentChangeHandle6" |
|
|
|
|
|
:current-page="pageIndex6" |
|
|
|
|
|
:page-sizes="[20, 50, 100, 200, 500]" |
|
|
|
|
|
:page-size="pageSize6" |
|
|
|
|
|
:total="totalPage6" |
|
|
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
|
|
</el-pagination> |
|
|
|
|
|
<el-footer style="height:35px;margin-top:10px;text-align:center"> |
|
|
|
|
|
<el-button type="primary" @click="workerLevelModelFlag1 = false">关闭</el-button> |
|
|
|
|
|
</el-footer> |
|
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<el-dialog title="人员等级" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workerLevelModelFlag2" |
|
|
|
|
|
width="940px"> |
|
|
|
|
|
<el-form :inline="true" label-position="top" :model="searchData"> |
|
|
|
|
|
<el-form-item :label="'编码'" @keyup.enter.native="queryWorkerLevel2()"> |
|
|
|
|
|
<el-input v-model="searchData.levelId" clearable style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="'名称'" @keyup.enter.native="queryWorkerLevel2()"> |
|
|
|
|
|
<el-input v-model="searchData.levelDesc" clearable style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="' '"> |
|
|
|
|
|
<el-button type="primary" @click="queryWorkerLevel2()">查询</el-button> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
|
|
|
<el-table |
|
|
|
|
|
:height="250" |
|
|
|
|
|
:data="workerLevelList" |
|
|
|
|
|
@row-dblclick="getWorkerLevelRowData2()" |
|
|
|
|
|
border |
|
|
|
|
|
style="width: 100%;"> |
|
|
|
|
|
<el-table-column |
|
|
|
|
|
v-for="(item,index) in workerLevelColumnList" :key="index" |
|
|
|
|
|
:sortable="item.columnSortable" |
|
|
|
|
|
:prop="item.columnProp" |
|
|
|
|
|
:header-align="item.headerAlign" |
|
|
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
|
|
:align="item.align" |
|
|
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
|
|
:min-width="item.columnWidth" |
|
|
|
|
|
:label="item.columnLabel"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
|
|
|
style="width: 100px; height: 80px"/></span> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
</el-table> |
|
|
|
|
|
<!-- 分页插件 --> |
|
|
|
|
|
<el-pagination |
|
|
|
|
|
style="margin-top: 5px" |
|
|
|
|
|
@size-change="sizeChangeHandle7" |
|
|
|
|
|
@current-change="currentChangeHandle7" |
|
|
|
|
|
:current-page="pageIndex6" |
|
|
|
|
|
:page-sizes="[20, 50, 100, 200, 500]" |
|
|
|
|
|
:page-size="pageSize6" |
|
|
|
|
|
:total="totalPage6" |
|
|
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
|
|
</el-pagination> |
|
|
|
|
|
<el-footer style="height:35px;margin-top:10px;text-align:center"> |
|
|
|
|
|
<el-button type="primary" @click="workerLevelModelFlag2 = false">关闭</el-button> |
|
|
|
|
|
</el-footer> |
|
|
|
|
|
</el-dialog> |
|
|
</div> |
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
|
|
|
|
|
|
@ -1128,6 +1234,7 @@ import { |
|
|
import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js" |
|
|
import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js" |
|
|
import ChooseList from '@/views/modules/common/Chooselist' |
|
|
import ChooseList from '@/views/modules/common/Chooselist' |
|
|
import {queryWorkCenterList} from "../../../api/part/workCenter"; |
|
|
import {queryWorkCenterList} from "../../../api/part/workCenter"; |
|
|
|
|
|
import {queryWorkerLevelList} from "../../../api/base/laborClass"; |
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
// 组件 |
|
|
// 组件 |
|
|
@ -1209,6 +1316,12 @@ export default { |
|
|
pageIndex5: 1, |
|
|
pageIndex5: 1, |
|
|
pageSize5: 20, |
|
|
pageSize5: 20, |
|
|
totalPage5: 0, |
|
|
totalPage5: 0, |
|
|
|
|
|
pageIndex6: 1, |
|
|
|
|
|
pageSize6: 20, |
|
|
|
|
|
totalPage6: 0, |
|
|
|
|
|
pageIndex7: 1, |
|
|
|
|
|
pageSize7: 20, |
|
|
|
|
|
totalPage7: 0, |
|
|
selectedDataNum: 0, |
|
|
selectedDataNum: 0, |
|
|
// 条件查询 |
|
|
// 条件查询 |
|
|
searchData: { |
|
|
searchData: { |
|
|
@ -1222,7 +1335,9 @@ export default { |
|
|
page: 1, |
|
|
page: 1, |
|
|
limit: 10, |
|
|
limit: 10, |
|
|
workCenterNo: '', |
|
|
workCenterNo: '', |
|
|
workCenterDesc: '' |
|
|
|
|
|
|
|
|
workCenterDesc: '', |
|
|
|
|
|
levelId: '', |
|
|
|
|
|
levelDesc: '' |
|
|
}, |
|
|
}, |
|
|
// loading |
|
|
// loading |
|
|
queryLoading: false, |
|
|
queryLoading: false, |
|
|
@ -1232,6 +1347,8 @@ export default { |
|
|
toBecomeOfficialLoading: false, |
|
|
toBecomeOfficialLoading: false, |
|
|
copyLoading: false, |
|
|
copyLoading: false, |
|
|
workCenterModelFlag: false, |
|
|
workCenterModelFlag: false, |
|
|
|
|
|
workerLevelModelFlag1: false, |
|
|
|
|
|
workerLevelModelFlag2: false, |
|
|
// 初始页签 |
|
|
// 初始页签 |
|
|
detailTable: 'routing_detail', |
|
|
detailTable: 'routing_detail', |
|
|
subDetailTable: 'routing_sub_detail', |
|
|
subDetailTable: 'routing_sub_detail', |
|
|
@ -1313,7 +1430,9 @@ export default { |
|
|
updateDate: '', |
|
|
updateDate: '', |
|
|
updateBy: '', |
|
|
updateBy: '', |
|
|
ifsRowId: '', |
|
|
ifsRowId: '', |
|
|
ifsRowVersion: '' |
|
|
|
|
|
|
|
|
ifsRowVersion: '', |
|
|
|
|
|
levelId: '', |
|
|
|
|
|
levelDesc: '', |
|
|
}, |
|
|
}, |
|
|
partData: { |
|
|
partData: { |
|
|
site: this.$store.state.user.site, |
|
|
site: this.$store.state.user.site, |
|
|
@ -1480,6 +1599,7 @@ export default { |
|
|
copyPartList: [], |
|
|
copyPartList: [], |
|
|
toolList: [], |
|
|
toolList: [], |
|
|
workCenterList: [], |
|
|
workCenterList: [], |
|
|
|
|
|
workerLevelList: [], |
|
|
// ======== 列表表头 ======== |
|
|
// ======== 列表表头 ======== |
|
|
columnList: [ |
|
|
columnList: [ |
|
|
{ |
|
|
{ |
|
|
@ -2503,6 +2623,32 @@ export default { |
|
|
columnWidth: 100 |
|
|
columnWidth: 100 |
|
|
}, |
|
|
}, |
|
|
], |
|
|
], |
|
|
|
|
|
workerLevelColumnList: [ |
|
|
|
|
|
{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
columnProp: 'levelId', |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "left", |
|
|
|
|
|
columnLabel: '编码', |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 100 |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
columnProp: 'levelDesc', |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "left", |
|
|
|
|
|
columnLabel: '名称', |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 200 |
|
|
|
|
|
} |
|
|
|
|
|
], |
|
|
componentPartColumnList: [ |
|
|
componentPartColumnList: [ |
|
|
{ |
|
|
{ |
|
|
columnProp: 'plmPartNo', |
|
|
columnProp: 'plmPartNo', |
|
|
@ -2972,6 +3118,32 @@ export default { |
|
|
this.queryWorkCenter() |
|
|
this.queryWorkCenter() |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 每页数 |
|
|
|
|
|
sizeChangeHandle6(val) { |
|
|
|
|
|
this.pageSize6 = val |
|
|
|
|
|
this.pageIndex6 = 1 |
|
|
|
|
|
this.queryWorkerLevel1() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 当前页 |
|
|
|
|
|
currentChangeHandle6(val) { |
|
|
|
|
|
this.pageIndex6 = val |
|
|
|
|
|
this.queryWorkerLevel1() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 每页数 |
|
|
|
|
|
sizeChangeHandle7(val) { |
|
|
|
|
|
this.pageSize7 = val |
|
|
|
|
|
this.pageIndex7 = 1 |
|
|
|
|
|
this.queryWorkerLevel2() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 当前页 |
|
|
|
|
|
currentChangeHandle7(val) { |
|
|
|
|
|
this.pageIndex7 = val |
|
|
|
|
|
this.queryWorkerLevel2() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
// copy物料列表 |
|
|
// copy物料列表 |
|
|
queryCopyPartModal() { |
|
|
queryCopyPartModal() { |
|
|
this.copyPartData.limit = this.pageSize4 |
|
|
this.copyPartData.limit = this.pageSize4 |
|
|
@ -4962,13 +5134,66 @@ export default { |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 查询人员等级列表 |
|
|
|
|
|
queryWorkerLevel1() { |
|
|
|
|
|
//调机过程中人员等级 |
|
|
|
|
|
this.searchData.limit = this.pageSize6 |
|
|
|
|
|
this.searchData.page = this.pageIndex6 |
|
|
|
|
|
queryWorkerLevelList(this.searchData).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
this.workerLevelList = data.page.list |
|
|
|
|
|
this.pageIndex6 = data.page.currPage |
|
|
|
|
|
this.pageSize6 = data.page.pageSize |
|
|
|
|
|
this.totalPage6 = data.page.totalCount |
|
|
|
|
|
this.workerLevelModelFlag1 = true |
|
|
|
|
|
} else { |
|
|
|
|
|
this.workerLevelList = [] |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
queryWorkerLevel2() { |
|
|
|
|
|
//调机过程中人员等级 |
|
|
|
|
|
this.searchData.limit = this.pageSize6 |
|
|
|
|
|
this.searchData.page = this.pageIndex6 |
|
|
|
|
|
queryWorkerLevelList(this.searchData).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
this.workerLevelList = data.page.list |
|
|
|
|
|
this.pageIndex6 = data.page.currPage |
|
|
|
|
|
this.pageSize6 = data.page.pageSize |
|
|
|
|
|
this.totalPage6 = data.page.totalCount |
|
|
|
|
|
this.workerLevelModelFlag2 = true |
|
|
|
|
|
} else { |
|
|
|
|
|
this.workerLevelList = [] |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
// 双击选中加工中心 |
|
|
// 双击选中加工中心 |
|
|
getWorkCenterRowData (row) { |
|
|
|
|
|
this.modalData.workCenterNo = row.workCenterNo |
|
|
|
|
|
this.modalData.workCenterDesc = row.workCenterDesc |
|
|
|
|
|
this.modalData.workCenterType = row.workCenterType |
|
|
|
|
|
|
|
|
getWorkCenterRowData(row) { |
|
|
|
|
|
this.componentData.workCenterNo = row.workCenterNo |
|
|
|
|
|
this.componentData.workCenterDesc = row.workCenterDesc |
|
|
|
|
|
this.componentData.workCenterType = row.workCenterType |
|
|
this.workCenterModelFlag = false |
|
|
this.workCenterModelFlag = false |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 双击选中人员等级 |
|
|
|
|
|
getWorkerLevelRowData1(row) { |
|
|
|
|
|
console.log(row.levelId) |
|
|
|
|
|
this.componentData.setupLaborClassNo = row.levelId |
|
|
|
|
|
this.componentData.setupLaborClassDesc = row.levelDesc |
|
|
|
|
|
this.workerLevelModelFlag1 = false |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
getWorkerLevelRowData2(row) { |
|
|
|
|
|
this.componentData.laborClassNo = row.levelId |
|
|
|
|
|
this.componentData.laborClassDesc = row.levelDesc |
|
|
|
|
|
this.workerLevelModelFlag2 = false |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
</script> |
|
|
</script> |
|
|
|