From 2099b07178a44a27be426e08751d2de32672f7c9 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 9 Jun 2025 11:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/back/component/dialogFormByCq.vue | 12 ++++++------
 src/views/material/back/outRecord.vue                |  4 ++--
 .../material/lease/apply/component/addToolsApply.vue |  2 +-
 .../material/lease/apply/component/homeApply.vue     |  4 ++--
 src/views/material/lease/apply/leaseRecord.vue       |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/material/back/component/dialogFormByCq.vue b/src/views/material/back/component/dialogFormByCq.vue
index 18f0acfc..32516b97 100644
--- a/src/views/material/back/component/dialogFormByCq.vue
+++ b/src/views/material/back/component/dialogFormByCq.vue
@@ -43,13 +43,13 @@
           <el-table-column
             label="物资名称"
             align="center"
-            prop="typeName"
+            prop="materialType"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="规格型号"
             align="center"
-            prop="typeModel"
+            prop="typeName"
             :show-overflow-tooltip="true"
           />
           <el-table-column
@@ -75,7 +75,7 @@
           >
           <template slot-scope="scope">
               <span v-if="scope.row.manageType==1">无编码</span>
-              <span v-if="scope.row.manageType==0" style="color: rgb(2, 167, 240);" @click="checkDetail(scope.row)">查看明细</span>
+              <span v-if="scope.row.manageType==0" style="color: rgb(2, 167, 240); cursor: pointer;" @click="checkDetail(scope.row)">查看明细</span>
             </template>
           </el-table-column>
           <!-- <el-table-column prop="remarks" label="备注" align="center">
@@ -129,7 +129,7 @@
           </div>
           <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;text-align: right;">
             <div>
-              <span>退料单位：</span><span>{{ rowObj.unitName }}</span>
+              <span>退料班组：</span><span>{{ rowObj.teamName }}</span>
             </div>
             <div>
               <span>单号：</span><span>{{ rowObj.code }}</span>
@@ -140,9 +140,9 @@
           <el-table-column label="序号" align="center" type="index" width="60px"/>
           <el-table-column prop="materialType" label="物资类型" align="center">
           </el-table-column>
-          <el-table-column prop="typeName" label="物资名称" align="center">
+          <el-table-column prop="materialName" label="物资名称" align="center">
           </el-table-column>
-          <el-table-column prop="materialName" label="规格型号" align="center">
+          <el-table-column prop="typeName" label="规格型号" align="center">
           </el-table-column>
           <el-table-column prop="maCode" label="设备编号" align="center">
           </el-table-column>
diff --git a/src/views/material/back/outRecord.vue b/src/views/material/back/outRecord.vue
index f135e6f0..8a9e2822 100644
--- a/src/views/material/back/outRecord.vue
+++ b/src/views/material/back/outRecord.vue
@@ -188,8 +188,8 @@ export default {
         console.log(this.tableList)
         let param = {
           keyWord: this.queryParams.keyWord,
-          typeName: this.queryParams.typeName,
-          typeModelName: this.queryParams.typeModelName
+          startTime: this.queryParams.timeRange ? this.queryParams.timeRange[0] : null,
+          endTime: this.queryParams.timeRange ? this.queryParams.timeRange[1] : null,
         }
         const response = await getBackInfoDetailsNoPageListApi(param)
         let obj = {
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index abe86b58..9227717d 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -331,7 +331,7 @@ export default {
           }
         ],
         phone: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          // { required: true, message: '联系电话不能为空', trigger: 'blur' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: '请输入正确的手机号码',
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 1df91fed..fa0236b6 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -537,7 +537,7 @@ export default {
       this.open = true
       var ids = row.id
       const res = await getApplyInfo(ids)
-      this.leaseApplyDetails = res.data.leaseOutDetailsList
+      this.leaseApplyDetails = res.data.leaseApplyDetailsList
       this.leaseApplyData = res.data.leaseApplyInfo
     },
 
@@ -560,7 +560,7 @@ export default {
     codeInfo(row) {
       this.showView = true
       this.titleView = '查看'
-      this.getListViewInfo = row.outMaCodeVoList
+      this.getListViewInfo = row.maCodeVoList
     },
 
     //打印
diff --git a/src/views/material/lease/apply/leaseRecord.vue b/src/views/material/lease/apply/leaseRecord.vue
index c78ef4c1..093ba1c3 100644
--- a/src/views/material/lease/apply/leaseRecord.vue
+++ b/src/views/material/lease/apply/leaseRecord.vue
@@ -188,8 +188,8 @@ export default {
       console.log(this.tableList)
       let param = {
         keyWord: this.queryParams.keyWord,
-        typeName: this.queryParams.typeName,
-        typeModelName: this.queryParams.typeModelName
+        startTime: this.queryParams.timeRange && this.queryParams.timeRange[0],
+        endTime: this.queryParams.timeRange && this.queryParams.timeRange[1]
       }
       const response = await getLeaseInfoDetailsNoPageListApi(param)
       let obj = {