bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2026-01-27 16:54:23 +08:00
parent 32f2c3f0ce 286c63f2f9
commit 6aaa6898f1
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/material/cost/component/applyHome.vue
View File

@ -514,7 +514,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
sltStatus: '', sltStatus: '',
settlementType: '', settlementType: '1',
isCommit: '', isCommit: '',
unitId: null, unitId: null,
projectId: null, projectId: null,
@ -522,7 +522,7 @@ export default {
agreementCode: '' agreementCode: ''
}, },
settlementTypeList: [ settlementTypeList: [
{ label: '总费用', value: '' }, // { label: '总费用', value: '' },
{ label: '工器具', value: '1' }, { label: '工器具', value: '1' },
{ label: '安全工器具', value: '2' }, { label: '安全工器具', value: '2' },
], ],
@ -613,6 +613,8 @@ export default {
this.GetUnitData() this.GetUnitData()
// this.GetProData() // this.GetProData()
this.getList() this.getList()
// 设置默认值
this.queryParams.settlementType = '1' // 或者根据业务逻辑动态设置
}, },
activated() { activated() {
// 组件被 keep-alive 缓存后重新激活时，不重新加载数据 // 组件被 keep-alive 缓存后重新激活时，不重新加载数据

2
src/views/material/lease/outBound/index.vue
View File

@ -938,7 +938,7 @@ export default {
}, },
unitChange(val){ unitChange(val){
setTimeout(()=>{ setTimeout(()=>{
// this.GetProData() this.GetProData()
},500) },500)
}, },
// 获取 工程名称 列表数据 // 获取 工程名称 列表数据

18
src/views/material/ma/device/index.vue
View File

@ -242,15 +242,15 @@
> >
编辑 编辑
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdateStatus(scope.row)" <!-- @click="handleUpdateStatus(scope.row)"-->
v-hasPermi="['ma:machine:edit']" <!-- v-hasPermi="['ma:machine:change']"-->
> <!-- >-->
修改状态 <!-- 修改状态-->
</el-button> <!-- </el-button>-->
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"