bug修复

src/api/costPush/costPush.js

@@ -164,5 +164,14 @@ export function consumeCheckData(data) {
   })
 }
 
+// 查询租赁弹窗列表
+export function getCostPushLeaseListApi(query) {
+    return request({
+      url: '/material/backstage/costPush/getCostPushLeaseList',
+      method: 'get',
+      params: query
+    })
+}
+
 
 

src/views/business/businessHandling/index.vue

@@ -139,6 +139,7 @@
                 @mouseenter.native="showCustomTooltip(item, $event)"
                 @mouseleave.native="hideCustomTooltip"
               >
+              <span v-html="highlightText(item.fullPath, searchKeyword)"></span>
               </el-option>
             </el-select>
             <div

src/views/material/costPush/leaseExpensePush/index.vue

@@ -124,11 +124,11 @@
     <!-- 弹框 -->
     <el-dialog title="查看" :visible.sync="dialogVisible" width="70%">
       <el-form ref="dialogForm" :model="dialogForm" label-width="80px" size="small" inline @submit.native.prevent>
-        <el-form-item label="" prop="name">
+        <el-form-item label="" prop="modelName">
-          <el-input v-model="dialogForm.name" placeholder="请输入机具名称" clearable style="width: 240px" />
+          <el-input v-model="dialogForm.modelName" placeholder="请输入机具名称" clearable style="width: 240px" />
         </el-form-item>
-        <el-form-item label="" prop="type">
+        <el-form-item label="" prop="typeName">
-          <el-input v-model="dialogForm.type" placeholder="请输入规格型号" clearable style="width: 240px" />
+          <el-input v-model="dialogForm.typeName" placeholder="请输入规格型号" clearable style="width: 240px" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="getDiaList">查询</el-button>
@@ -145,7 +145,13 @@
         :summary-method="getDiaSummaries"
         style="width: 100%"
       >
-        <el-table-column type="index" width="55" label="序号" align="center" />
+      <el-table-column
+        type="index"
+        width="55"
+        label="序号"
+        align="center"
+        :index="index => (dialogForm.pageNum - 1) * dialogForm.pageSize + index + 1"
+      />
         <el-table-column
           v-for="(column, index) in dialogColumns"
           show-overflow-tooltip
@@ -155,13 +161,21 @@
           align="center"
         ></el-table-column>
       </el-table>
+          <!-- 分页 -->
+        <pagination
+          v-show="dialogTotal > 0"
+          :total="dialogTotal"
+          :page.sync="dialogForm.pageNum"
+          :limit.sync="dialogForm.pageSize"
+          @pagination="getDiaList"
+        />
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { getProjectList, getUnitList, getAgreementInfoById } from '@/api/back/index.js'
-import { getCostPushCheckList, getCostPushCheckListCount, checkData } from '@/api/costPush/costPush'
+import { getCostPushCheckList, getCostPushCheckListCount, checkData,getCostPushLeaseListApi } from '@/api/costPush/costPush'
 import TreeSelect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
@@ -217,8 +231,11 @@ export default {
       dialogVisible: false,
       dialogForm: {
         name: '',
-        type: ''
+        type: '',
+        pageNum: 1,
+        pageSize: 10
       },
+      dialogTotal: 0,
       dialogTableList: [],
       dialogColumns: [],
       dialogColumns1: [
@@ -452,9 +469,11 @@ export default {
       let res = null
       const params = { ...this.dialogForm }
       try {
-        // if (this.costIndex === 1) {
+        if (this.costIndex === 1) {
-        //   res = await
+          res = await getCostPushLeaseListApi(params)
-        // } else if (this.costIndex === 2) {
+          this.dialogTableList = res.data
+        }
+        //  else if (this.costIndex === 2) {
         //   res = await
         // } else if (this.costIndex === 3) {
         //   res = await
@@ -466,8 +485,8 @@ export default {
     // 弹框重置
     resetDialog() {
       this.dialogForm = {
-        name: '',
+        modelName: '',
-        type: ''
+        typeName: ''
       }
       this.getDiaList()
     },