Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui

src/views/business/businessHandlingRecord/directApplyRecord.vue

@@ -36,7 +36,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-hasPermi="['direct:info:add']">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">直转申请</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -83,7 +83,8 @@
         <template slot-scope="scope">
           <el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button>
           <el-button
-            v-if="scope.row.status == '0'"
+            v-show="scope.row.status == '0'"
+            v-hasPermi="['direct:info:edit']"
             type="text"
             size="mini"
             icon="el-icon-edit"
@@ -92,7 +93,8 @@
             编辑
           </el-button>
           <el-button
-            v-if="scope.row.status == '0'"
+            v-show="scope.row.status == '0'"
+            v-hasPermi="['direct:info:delete']"
             type="text"
             size="mini"
             icon="el-icon-delete"

src/views/business/businessHandlingRecord/index.vue

@@ -41,7 +41,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-hasPermi="['business:info:add']">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">领料申请</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -85,7 +85,8 @@
         <template slot-scope="scope">
           <el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button>
           <el-button
-            v-if="scope.row.taskStatus == '0' || scope.row.taskStatus == '5'"
+            v-show="scope.row.taskStatus == '0' || scope.row.taskStatus == '5'"
+            v-hasPermi="['business:info:edit']"
             type="text"
             size="mini"
             icon="el-icon-edit"
@@ -103,7 +104,8 @@
             业务联系单
           </el-button>
           <el-button
-            v-if="scope.row.taskStatus == '0' || scope.row.taskStatus == '5'"
+            v-show="scope.row.taskStatus == '0' || scope.row.taskStatus == '5'"
+            v-hasPermi="['business:info:delete']"
             type="text"
             size="mini"
             icon="el-icon-delete"

src/views/business/reliefRecord/index.vue

@@ -44,7 +44,7 @@
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">
-                    减免申请--
+                    减免申请
                 </el-button>
             </el-col>
             <el-col :span="1.5">

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

@@ -75,7 +75,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="deviceList" ref="multipleTable" row-key="maId">
+    <el-table v-loading="loading" :data="deviceList" ref="multipleTable" row-key="maId" :max-height="650">
       <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> -->
       <el-table-column label="序号" align="center" width="80" type="index">
         <template slot-scope="scope">

src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue

@@ -53,7 +53,6 @@
           clearable
           maxlength="11"
           style="width: 240px"
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
@@ -289,6 +288,7 @@ export default {
         standardConfig: undefined,
         bmFileInfos: [],
         proId: undefined,
+        relPhone: '',
       },
       standardConfigList: [],
       // 表单参数
@@ -598,6 +598,7 @@ export default {
         Object.assign(this.maForm, response.data.leaseApplyInfo)
         this.maForm.projectId = response.data.leaseApplyInfo.proId
         this.maForm.proId = response.data.leaseApplyInfo.proId
+        this.maForm.relPhone = response.data.leaseApplyInfo.phone || response.data.leaseApplyInfo.relPhone || ''
         this.equipmentList = response.data.leaseApplyDetailsList || []
         if (this.equipmentList.length > 0) {
           this.equipmentList.forEach(item => {
@@ -697,6 +698,7 @@ export default {
             })
             console.log('projectId', this.projectTemp)
             this.maForm.taskId = this.taskId
+            this.maForm.phone = this.maForm.relPhone
             await this.$modal
               .confirm('是否确认保存当前页面')
               .then(function () {})

src/views/warning-analysis/engineering-in-use/safetyToolEarlyWarning.vue

@@ -47,6 +47,18 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="设备状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="请选择机规格型号" style="width: 240px">
+                    <el-option
+                        v-for="item in statusList"
+                        :key="item.status"
+                        :label="item.label"
+                        :value="item.status"
+                        filterable
+                        clearable
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
             <!-- 表单按钮 -->
             <el-form-item>
@@ -121,6 +133,7 @@ export default {
                 keyWord: '', // 关键字
                 thirdTypeId: '',
                 typeId: '',
+                status: null, // 设备状态
                 timeRange: [] // 日期范围
             },
             typeIds: [],
@@ -156,7 +169,8 @@ export default {
             ],
             dialogList: [],
             typeList: [],
-            typeIdList: []
+            typeIdList: [],
+            statusList: [{ label: '正常', status: 0 }, { label: '超期', status: 1 }]
         }
     },
     created() {