From ee1454ef55da360a66a3cde82e21a644533e5def Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 8 Jan 2025 10:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=92=8C=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=BD=E6=B7=BB=E5=8A=A0=E5=AE=9E=E6=96=BD?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=EF=BC=8C=E5=90=88=E5=90=8C=E4=B8=BB=E4=BD=93?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/back/component/addReturn.vue     | 21 +++++++--------
 .../back/component/dialogFormByCq.vue         |  3 +++
 src/views/material/back/component/home.vue    |  2 +-
 .../lease/apply/component/homeApply.vue       | 24 +++++++++++++----
 .../lease/outBound/component/homeOutBound.vue | 22 +++++++++++++---
 src/views/material/lease/outBound/index.vue   | 26 ++++++++++++++-----
 .../repair/repairManage/component/home.vue    |  2 +-
 .../repair/testedInBound/component/home.vue   |  2 +-
 src/views/material/stquery/deviceOutBound.vue |  2 ++
 .../material/stquery/deviceUsingRecord.vue    |  2 ++
 10 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index 8631cf7f..d8a54a55 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -263,7 +263,7 @@
             >
                 <template slot-scope="scope">
                     <el-button size="mini" type="danger" 
-                        @click="handleDelete({ ...scope.row, index: scope.$index })">删除</el-button>
+                        @click="handleDelete(scope.row,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -772,19 +772,18 @@ export default {
   
         /** 删除按钮操作 */
         handleDelete(row,index) {
-            this.$modal
-                .confirm('是否确认删除所选择的数据项？')
-                .then(() => {
-                    this.deviceType.forEach((e, index) => {
+            this.$modal.confirm('是否确认删除所选择的数据项？').then(() => {
+                    this.deviceType.forEach((e, i) => {
                         if (e[3] === row.typeId) {
-                            this.deviceType.splice(index, 1)
+                            this.deviceType.splice(i, 1)
                             this.propsKey++
                         }
-                    }) 
-                    this.equipmentList.splice(index+1, 1)
-                        
-                })
-                .catch(() => {})
+                    })
+                    console.log(index)
+                    // let index = this.equipmentList.findIndex(item=>item.typeId==row.typeId) 
+                    this.equipmentList.splice(index, 1)
+                }).catch(() => {})
+                
             // this.equipmentList.splice(row.index, 1)
         },
         
diff --git a/src/views/material/back/component/dialogFormByCq.vue b/src/views/material/back/component/dialogFormByCq.vue
index c88775ef..85290e63 100644
--- a/src/views/material/back/component/dialogFormByCq.vue
+++ b/src/views/material/back/component/dialogFormByCq.vue
@@ -10,6 +10,9 @@
   >
     <div id="printcontent" style="height: 600px;overflow-y: scroll;padding: 0 20px;">
       <vue-easy-print tableShow ref="printRef">
+        <div style="text-align: center;font-weight: 600;font-size: 16px;">
+            机具设备退料单
+        </div>
         <div class="order_box">
           <div class="order_box_one">
             <div>
diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue
index 4e5b289d..786145f3 100644
--- a/src/views/material/back/component/home.vue
+++ b/src/views/material/back/component/home.vue
@@ -114,7 +114,7 @@
 
         <el-table
             v-loading="loading"
-            :data="typeList"
+            :data="typeList" border
             @selection-change="handleSelectionChange"
         >
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 2fa4d46f..2f47de9a 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -132,6 +132,20 @@
         prop="createBy"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="实施单位"
+        align="center"
+        prop="impUnitName"
+        width="150px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="合同主体单位"
+        align="center"
+        prop="contractPart"
+        width="150px"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="租赁单位"
         align="center"
@@ -146,13 +160,13 @@
         width="150px"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="领料物资类型"
         align="center"
         prop="maTypeNames"
         width="110px"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="协议号"
         align="center"
@@ -176,13 +190,13 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column
+      <!-- <el-table-column
         label="领料人电话"
         align="center"
         prop="phone"
         width="120px"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="状态"
         align="center"
@@ -204,7 +218,7 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column label="操作" align="center" width="300">
+      <el-table-column label="操作" align="center" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/src/views/material/lease/outBound/component/homeOutBound.vue b/src/views/material/lease/outBound/component/homeOutBound.vue
index 996dc10f..86de82c4 100644
--- a/src/views/material/lease/outBound/component/homeOutBound.vue
+++ b/src/views/material/lease/outBound/component/homeOutBound.vue
@@ -93,6 +93,20 @@
         prop="createBy"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="实施单位"
+        align="center"
+        prop="impUnitName"
+        width="150px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="合同主体单位"
+        align="center"
+        prop="contractPart"
+        width="150px"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="租赁单位"
         align="center"
@@ -105,13 +119,13 @@
         prop="leaseProject"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="领料物资类型"
         align="center"
         prop="leaseType"
         width="110px"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="协议号"
         align="center"
@@ -134,13 +148,13 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column
+      <!-- <el-table-column
         label="领料人电话"
         align="center"
         prop="phone"
         width="120px"
         :show-overflow-tooltip="true"
-      />
+      /> -->
 
       <el-table-column
         label="操作时间"
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index bb571dda..8704aeb9 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -83,6 +83,20 @@
         prop="createBy"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="实施单位"
+        align="center"
+        prop="impUnitName"
+        width="150px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="合同主体单位"
+        align="center"
+        prop="contractPart"
+        width="150px"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="租赁单位"
         align="center"
@@ -97,13 +111,13 @@
         width="150px"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="领料物资类型"
         align="center"
         prop="maTypeNames"
         width="110px"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="协议号"
         align="center"
@@ -145,18 +159,18 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column
+      <!-- <el-table-column
         label="领料人电话"
         align="center"
         prop="phone"
         width="120px"
         :show-overflow-tooltip="true"
-      />
+      /> -->
 
       <el-table-column
         label="状态"
         align="center"
-        prop="taskStatus"
+        prop="taskStatus" width="120px"
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
@@ -174,7 +188,7 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column label="操作" align="center" width="270">
+      <el-table-column label="操作" align="center" width="270" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue
index 8bbebc8a..9d12a5a3 100644
--- a/src/views/material/repair/repairManage/component/home.vue
+++ b/src/views/material/repair/repairManage/component/home.vue
@@ -72,7 +72,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" >
+        <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange" >
             <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
             <el-table-column label="序号" align="center" width="80" type="index">
                 <template slot-scope="scope">
diff --git a/src/views/material/repair/testedInBound/component/home.vue b/src/views/material/repair/testedInBound/component/home.vue
index fb74466d..ecc2f184 100644
--- a/src/views/material/repair/testedInBound/component/home.vue
+++ b/src/views/material/repair/testedInBound/component/home.vue
@@ -84,7 +84,7 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="testedList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="testedList" border ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"  :selectable="selectable"/>
       <el-table-column label="序号" align="center" width="80" type="index">
         <template slot-scope="scope">
diff --git a/src/views/material/stquery/deviceOutBound.vue b/src/views/material/stquery/deviceOutBound.vue
index 97ba98eb..9534036a 100644
--- a/src/views/material/stquery/deviceOutBound.vue
+++ b/src/views/material/stquery/deviceOutBound.vue
@@ -124,6 +124,8 @@
           <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true"/>
           <el-table-column label="往来单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
           <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
+          <el-table-column label="实施单位" align="center" prop="impUnitName" width="150px" :show-overflow-tooltip="true"/>
+          <el-table-column label="合同主体单位" align="center" prop="contractPart" width="150px" :show-overflow-tooltip="true"/>
           <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
           <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
           <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/> 
diff --git a/src/views/material/stquery/deviceUsingRecord.vue b/src/views/material/stquery/deviceUsingRecord.vue
index 79df15f9..837ef586 100644
--- a/src/views/material/stquery/deviceUsingRecord.vue
+++ b/src/views/material/stquery/deviceUsingRecord.vue
@@ -118,6 +118,8 @@
           <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
           <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true"/>
           <el-table-column label="往来单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
+          <el-table-column label="实施单位" align="center" prop="impUnitName" width="150px" :show-overflow-tooltip="true"/>
+          <el-table-column label="合同主体单位" align="center" prop="contractPart" width="150px" :show-overflow-tooltip="true"/>
           <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
           <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
           <el-table-column label="计量单位" align="center" prop="unit" :show-overflow-tooltip="true"/>