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

src/views/material/cost/component/applyHome.vue

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

src/views/material/lease/outBound/index.vue

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

src/views/material/ma/device/index.vue

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