|
|
|
@ -61,7 +61,7 @@ |
|
|
|
<el-form-item label="新班组" prop="makeTeam"> |
|
|
|
<el-form-item label="新班组" prop="makeTeam"> |
|
|
|
<el-select v-model="teamForm.makeTeam"> |
|
|
|
<el-select v-model="teamForm.makeTeam"> |
|
|
|
<el-option |
|
|
|
<el-option |
|
|
|
v-for="(item,index) in teamSetList" |
|
|
|
v-for="(item, index) in teamSetList" |
|
|
|
:label="item.tsName" |
|
|
|
:label="item.tsName" |
|
|
|
:value="item.id" |
|
|
|
:value="item.id" |
|
|
|
></el-option> |
|
|
|
></el-option> |
|
|
|
@ -248,7 +248,6 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 页面切换获取数据 |
|
|
|
// 页面切换获取数据 |
|
|
|
onLoad(page, params = {}) { |
|
|
|
onLoad(page, params = {}) { |
|
|
|
this.loading = true; |
|
|
|
|
|
|
|
if (this.tabPosition == 'workReporting') { |
|
|
|
if (this.tabPosition == 'workReporting') { |
|
|
|
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
// this.data = res.data.data.records; |
|
|
|
// this.data = res.data.data.records; |
|
|
|
@ -258,6 +257,7 @@ export default { |
|
|
|
// this.selectionClear(); |
|
|
|
// this.selectionClear(); |
|
|
|
// }); |
|
|
|
// }); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
this.loading = true; |
|
|
|
getRecordList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
getRecordList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
res => { |
|
|
|
res => { |
|
|
|
this.data = res.data.data.records; |
|
|
|
this.data = res.data.data.records; |
|
|
|
|