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

src/api/ma/base.js

@@ -210,6 +210,13 @@ export function getEquipmentThreeTypeThree() {
   })
 }
 
+export function equipmentThreeTypeLease() {
+  return request({
+    url: '/material/leaseTask/equipmentThreeTypeLease',
+    method: 'get',
+  })
+}
+
 // 规格型号-select
 export function getMaTypeOpt(data) {
   return request({

src/api/purchase/goodsArrived.js

@@ -105,12 +105,11 @@ export function equipmentTypeTree(query) {
   })
 }
 
-//获取机具类型树--领用申请
-export function equipmentTypeTreeLY(query) {
+export function equipmentTypeLease(query) {
   return request({
-      url: '/material/ma_type/equipmentTypeLY',
-      method: 'get',
-      params: query,
+    url: '/material/ma_type/equipmentTypeLease',
+    method: 'get',
+    params: query,
   })
 }
 
@@ -123,5 +122,5 @@ export function uploadPurchaseFile(data) {
   })
 }
 
-  
+
 

src/views/business/businessHandling/index.vue

@@ -454,7 +454,7 @@
 </template>
 
 <script>
-import { equipmentTypeTree,equipmentTypeTreeLY } from '@/api/purchase/goodsArrived'
+import {equipmentTypeLease} from '@/api/purchase/goodsArrived'
 import { getLeaseProjectListApi, getListUnite, getAgreement, getProjectList, getDepartNameList } from '@/api/lease/apply'
 import { getImpUnitListApi } from "@/api/materialsStation"
 import {
@@ -465,7 +465,7 @@ import {
   getLeaseTaskDetail,
   getCode
 } from '@/api/business/index'
-import { getEquipmentThreeTypeThree, getMaTypeOpt } from '@/api/ma/base'
+import {equipmentThreeTypeLease, getMaTypeOpt} from '@/api/ma/base'
 import { getAuditingDetailsApi } from '@/api/receive-apply/index.js'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -850,8 +850,8 @@ export default {
     // 获取物资名称-tree
     async getMaTypeNameOpt() {
       try {
-        const res = await getEquipmentThreeTypeThree()
-        console.log('🚀 ~ getEquipmentThreeTypeThree ~ res:', res)
+        const res = await equipmentThreeTypeLease()
+        console.log('🚀 ~ equipmentThreeTypeLease ~ res:', res)
         const filterData = (data, level = 1) => {
           return data.map(item => {
             if (level < 3 && item.children && item.children.length) {
@@ -1057,8 +1057,8 @@ export default {
     },
     /** 机具类型 */
     equipmentType() {
-      equipmentTypeTreeLY().then(response => {
-        console.log('🚀 ~ equipmentTypeTree ~ response:', response)
+      equipmentTypeLease().then(response => {
+        console.log('🚀 ~ equipmentTypeLease ~ response:', response)
         this.equipmentTypeList = response.data
         // 处理并扁平化所有类型数据
         this.flattenTypeOptions = this.processTypeData(response.data)

src/views/business/leasePublish/component/homeApply.vue

@@ -444,11 +444,19 @@ export default {
         const seconds = String(date.getSeconds()).padStart(2, '0');
         return `${year}${month}${day}_${hours}${minutes}${seconds}`;
       };
+      const params = {
+        keyWord: this.queryParams.keyWord,
+        status: this.queryParams.taskStatus,
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+      };
 
       const currentTime = formatTime(new Date());
       this.download(
         "/material/leaseTask/exportPublish",
-        { ...this.queryParams },
+         params,
         `领料申请发布_${currentTime}.xlsx`
       );
     },
@@ -557,7 +565,7 @@ export default {
     async downloadPDF() {
       try {
         this.$modal.loading('正在生成PDF，请稍候...')
-        
+
         // 获取要转换的DOM元素
         const element = document.getElementById('print-content1')
         if (!element) {

src/views/material/repair/repairManage/component/home.vue

@@ -75,7 +75,7 @@
             <!-- <el-table-column label="退料人电话" align="center" prop="phone" :show-overflow-tooltip="true"/> -->
             <el-table-column label="创建人" align="center" prop="createName" :show-overflow-tooltip="true"/>
             <el-table-column label="创建时间" align="center" width="100" prop="createTime" />
-            <el-table-column label="状态" align="center" width="110" :show-overflow-tooltip="true" prop="repairStatusCode">
+            <el-table-column label="状态" align="center" width="100" :show-overflow-tooltip="true" prop="repairStatusCode">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.repair_task_status" :value="scope.row.repairStatusCode"/>
                 </template>