From 809f4133867123b27d64a2f86742ffab118b2f56 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Sun, 27 Jul 2025 16:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/apply/component/homeApply.vue       |   4 +-
 .../lease/clerkConfirmation/index.vue         |  25 ++-
 .../material/lease/materialConfirm/index.vue  |  29 ++--
 src/views/material/lease/outBound/index.vue   | 162 ++++++++----------
 4 files changed, 104 insertions(+), 116 deletions(-)

diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 29611822..22b88a99 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -110,9 +110,9 @@
           >
             发布
           </el-button>
-          <el-button size="mini" type="warning" v-if="scope.row.taskStatus != 1" @click="handleLld(scope.row)">
+          <!-- <el-button size="mini" type="warning" v-if="scope.row.taskStatus != 1" @click="handleLld(scope.row)">
             领料单
-          </el-button>
+          </el-button> -->
           <el-button size="mini" type="warning" @click="handlePrint(scope.row)" v-if="scope.row.taskStatus == 4">
             出库检验单
           </el-button>
diff --git a/src/views/material/lease/clerkConfirmation/index.vue b/src/views/material/lease/clerkConfirmation/index.vue
index 9f6213de..e559e186 100644
--- a/src/views/material/lease/clerkConfirmation/index.vue
+++ b/src/views/material/lease/clerkConfirmation/index.vue
@@ -275,15 +275,15 @@
             </tbody>
           </table>
 
-          <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
-            <div class="item" style="width: 23%; display: flex; align-items: center; flex-wrap: wrap">
+          <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
+            <div class="item" style="width: 23%; display: flex; align-items: flex-start; flex-wrap: wrap">
               <div style="width: 25%">审核：</div>
               <div
                 style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
                 v-if="approveSignList.length > 0"
               >
                 <div
-                  style="width: 80%; margin-left: 20px; height: 40px"
+                  style="width: 80%; margin-left: 20px; height: 40px;transform: translateY(-30px)"
                   v-for="(item, index) in approveSignList"
                   :key="index"
                 >
@@ -296,10 +296,10 @@
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+            <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
               <div style="width: 30%">领料：</div>
               <div
-                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap"
+                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
                 v-if="outSignList.length > 0"
               >
                 <div
@@ -316,14 +316,13 @@
                 </div>
               </div>
             </div>
-            <!-- confirmSign -->
-            <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+            <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
               <div style="width: 30%">材料员：</div>
               <div
-                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap"
+                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
                 v-if="confirmSign && confirmSign.confirmSignUrl"
               >
-                <div style="width: 80%; margin-left: 20px">
+                <div style="width: 80%; margin-left: 25px">
                   <img
                     :src="confirmSign.confirmSignUrl"
                     style="width: 40px; height: 100px; max-width: 100%"
@@ -333,9 +332,9 @@
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 28%; display: flex; align-items: center">
+            <div class="item" style="width: 28%; display: flex; align-items: flex-start">
               <div style="width: 25%">库管：</div>
-              <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" v-if="kgSignList.length > 0">
+              <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)" v-if="kgSignList.length > 0">
                 <div
                   style="width: 80%; margin-left: 20px; height: 40px"
                   v-for="(item, index) in kgSignList"
@@ -350,9 +349,9 @@
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 25%; display: flex; align-items: center">
+            <div class="item" style="width: 25%; display: flex; align-items: flex-start">
               <div style="width: 25%">制单：</div>
-              <div style="width: 75%" v-if="leaseApplyData.leaseSignUrl">
+              <div style="width: 75%;margin-left: 20px;transform: translateY(-30px)" v-if="leaseApplyData.leaseSignUrl">
                 <img
                   :src="leaseApplyData.leaseSignUrl"
                   style="width: 40px; height: 90px; max-width: 100%"
diff --git a/src/views/material/lease/materialConfirm/index.vue b/src/views/material/lease/materialConfirm/index.vue
index 3763820a..76a1b5ea 100644
--- a/src/views/material/lease/materialConfirm/index.vue
+++ b/src/views/material/lease/materialConfirm/index.vue
@@ -190,7 +190,7 @@
               确认
             </el-button>
             <el-button type="" size="mini" @click="openBills(row)">领料单</el-button>
-            <el-button type="" size="mini" @click="openPass(row)">出门证</el-button>
+            <!-- <el-button type="" size="mini" @click="openPass(row)">出门证</el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -275,15 +275,15 @@
             </tbody>
           </table>
 
-          <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
-            <div class="item" style="width: 23%; display: flex; align-items: center; flex-wrap: wrap">
+          <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
+            <div class="item" style="width: 23%; display: flex; align-items: flex-start; flex-wrap: wrap">
               <div style="width: 25%">审核：</div>
               <div
                 style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
                 v-if="approveSignList.length > 0"
               >
                 <div
-                  style="width: 80%; margin-left: 20px; height: 40px"
+                  style="width: 80%; margin-left: 20px; height: 40px;transform: translateY(-30px)"
                   v-for="(item, index) in approveSignList"
                   :key="index"
                 >
@@ -296,10 +296,10 @@
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+            <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
               <div style="width: 30%">领料：</div>
               <div
-                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap"
+                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
                 v-if="outSignList.length > 0"
               >
                 <div
@@ -316,14 +316,13 @@
                 </div>
               </div>
             </div>
-            <!-- confirmSign -->
-            <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+            <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
               <div style="width: 30%">材料员：</div>
               <div
-                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap"
+                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
                 v-if="confirmSign && confirmSign.confirmSignUrl"
               >
-                <div style="width: 80%; margin-left: 20px">
+                <div style="width: 80%; margin-left: 25px">
                   <img
                     :src="confirmSign.confirmSignUrl"
                     style="width: 40px; height: 100px; max-width: 100%"
@@ -333,9 +332,9 @@
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 28%; display: flex; align-items: center">
+            <div class="item" style="width: 28%; display: flex; align-items: flex-start">
               <div style="width: 25%">库管：</div>
-              <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" v-if="kgSignList.length > 0">
+              <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)" v-if="kgSignList.length > 0">
                 <div
                   style="width: 80%; margin-left: 20px; height: 40px"
                   v-for="(item, index) in kgSignList"
@@ -343,16 +342,16 @@
                 >
                   <img
                     :src="item.outSignUrl"
-                    style="width: 40px; height: 90px; max-width: 100%"
+                    style="width: 40px; height: 90px"
                     :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
                     alt=""
                   />
                 </div>
               </div>
             </div>
-            <div class="item" style="width: 25%; display: flex; align-items: center">
+            <div class="item" style="width: 25%; display: flex; align-items: flex-start">
               <div style="width: 25%">制单：</div>
-              <div style="width: 75%" v-if="leaseApplyData.leaseSignUrl">
+              <div style="width: 75%;margin-left: 20px;transform: translateY(-30px)" v-if="leaseApplyData.leaseSignUrl">
                 <img
                   :src="leaseApplyData.leaseSignUrl"
                   style="width: 40px; height: 90px; max-width: 100%"
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index 39875084..d9c0b222 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -72,18 +72,8 @@
                 width="150px"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column
-                label="租赁单位"
-                align="center"
-                prop="leaseUnit"
-                width="180px"
-            />
-            <el-table-column
-                label="租赁工程"
-                align="center"
-                prop="leaseProject"
-                width="180px"
-            />
+            <el-table-column label="租赁单位" align="center" prop="leaseUnit" width="180px" />
+            <el-table-column label="租赁工程" align="center" prop="leaseProject" width="180px" />
             <!-- <el-table-column
         label="领料物资类型"
         align="center"
@@ -91,29 +81,10 @@
         width="110px"
         :show-overflow-tooltip="true"
       /> -->
-            <el-table-column
-                label="协议号"
-                align="center"
-                prop="agreementCode"
-                width="140px"
-            />
-            <el-table-column
-                label="租赁申请单号"
-                align="center"
-                prop="code"
-                width="140px"
-            ></el-table-column>
-            <el-table-column
-                label="业务联系单号"
-                align="center"
-                prop="businessCode"
-                width="140px"
-            ></el-table-column>
-            <el-table-column
-                label="申请数量"
-                align="center"
-                prop="preCountNum"
-            ></el-table-column>
+            <el-table-column label="协议号" align="center" prop="agreementCode" width="140px" />
+            <el-table-column label="租赁申请单号" align="center" prop="code" width="140px"></el-table-column>
+            <el-table-column label="业务联系单号" align="center" prop="businessCode" width="140px"></el-table-column>
+            <el-table-column label="申请数量" align="center" prop="preCountNum"></el-table-column>
 
             <!-- <el-table-column
                 label="已出库数量"
@@ -506,31 +477,37 @@
                             </tr>
                         </tbody>
                     </table>
-                    <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
-                        <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+                    <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
+                        <div class="item" style="width: 23%; display: flex; align-items: flex-start; flex-wrap: wrap">
                             <div style="width: 25%">审核：</div>
                             <div
                                 style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
                                 v-if="approveSignList.length > 0"
                             >
-                            <div
-                                style="width: 80%; margin-left: 20px; height: 40px"
-                                v-for="(item, index) in approveSignList"
-                                :key="index"
-                            >
-                                <img
-                                :src="item.outSignUrl"
-                                :class="{ 'is-rotate': item.outSignType == 0 }"
-                                style="width: 40px; height: 90px; max-width: 100%"
-                                alt=""
-                                />
+                                <div
+                                    style="width: 80%; margin-left: 20px; height: 40px; transform: translateY(-30px)"
+                                    v-for="(item, index) in approveSignList"
+                                    :key="index"
+                                >
+                                    <img
+                                        :src="item.outSignUrl"
+                                        style="width: 40px; height: 90px; max-width: 100%"
+                                        :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
+                                        alt=""
+                                    />
+                                </div>
                             </div>
                         </div>
-                        </div>
-                        <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+                        <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
                             <div style="width: 30%">领料：</div>
                             <div
-                                style="width: 70%; display: flex; align-items: center; flex-wrap: wrap"
+                                style="
+                                    width: 70%;
+                                    display: flex;
+                                    align-items: center;
+                                    flex-wrap: wrap;
+                                    transform: translateY(-30px);
+                                "
                                 v-if="outSignList.length > 0"
                             >
                                 <div
@@ -541,16 +518,22 @@
                                     <img
                                         :src="item.outSignUrl"
                                         style="width: 40px; height: 90px; max-width: 100%"
-                                        :class="{ 'is-rotate': item.outSignType == 0 }"
+                                        :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
                                         alt=""
                                     />
                                 </div>
                             </div>
                         </div>
-                        <div class="item" style="width: 28%; display: flex; align-items: center">
+                        <div class="item" style="width: 28%; display: flex; align-items: flex-start">
                             <div style="width: 25%">库管：</div>
                             <div
-                                style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
+                                style="
+                                    width: 75%;
+                                    display: flex;
+                                    align-items: center;
+                                    flex-wrap: wrap;
+                                    transform: translateY(-30px);
+                                "
                                 v-if="kgSignList.length > 0"
                             >
                                 <div
@@ -560,20 +543,23 @@
                                 >
                                     <img
                                         :src="item.outSignUrl"
-                                        :class="{ 'is-rotate': item.outSignType == 0 }"
-                                        style="width: 40px; height: 90px; max-width: 100%"
+                                        style="width: 40px; height: 90px"
+                                        :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
                                         alt=""
                                     />
                                 </div>
                             </div>
                         </div>
-                        <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
+                        <div class="item" style="width: 25%; display: flex; align-items: flex-start">
                             <div style="width: 25%">制单：</div>
-                            <div style="width: 75%" v-if="leaseApplyData.leaseSignUrl">
+                            <div
+                                style="width: 75%; margin-left: 20px; transform: translateY(-30px)"
+                                v-if="leaseApplyData.leaseSignUrl"
+                            >
                                 <img
                                     :src="leaseApplyData.leaseSignUrl"
-                                    :class="{ 'is-rotate': leaseApplyData.leaseSignType == 0 }"
                                     style="width: 40px; height: 90px; max-width: 100%"
+                                    :style="{ transform: leaseApplyData.leaseSignType == 0 ? 'rotate(-90deg)' : '' }"
                                     alt=""
                                 />
                             </div>
@@ -786,7 +772,7 @@ export default {
             kgSignList: [],
             outSignList: [],
             approveSignList: [],
-            currentRowData: null, // 当前查看的行数据
+            currentRowData: null // 当前查看的行数据
         }
     },
     created() {
@@ -1221,36 +1207,40 @@ export default {
 
         // 处理驳回操作
         handleReject(row) {
-          console.log(row);
-          this.$confirm('确定要驳回此条数据吗？', '提示', {
+            console.log(row)
+            this.$confirm('确定要驳回此条数据吗？', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
-            }).then(() => {
-                // 调用驳回API
-                const rejectData = {
-                    id: row.id,
-                    parentId: row.parentId,
-                    taskId: this.currentRowData ? this.currentRowData.taskId : row.taskId, // 使用主列表的taskId
-                    typeId: row.typeId,
-                    newTypeId: row.newTypeId,
-                    publishTask: this.publishTask,
-                    outNum: row.outNum, // 待出库数量
-                    remark: '已出库数量为0，执行驳回操作'
-                }
-
-                rejectLeaseOut(rejectData).then(response => {
-                    this.$modal.msgSuccess('驳回成功')
-                    // 刷新查看弹窗的数据
-                    this.getListView()
-                    // 刷新主列表数据
-                    this.getList()
-                }).catch(error => {
-                    this.$modal.msgError('驳回失败: ' + (error.message || '未知错误'))
-                })
-            }).catch(() => {
-                // 用户取消操作
             })
+                .then(() => {
+                    // 调用驳回API
+                    const rejectData = {
+                        id: row.id,
+                        parentId: row.parentId,
+                        taskId: this.currentRowData ? this.currentRowData.taskId : row.taskId, // 使用主列表的taskId
+                        typeId: row.typeId,
+                        newTypeId: row.newTypeId,
+                        publishTask: this.publishTask,
+                        outNum: row.outNum, // 待出库数量
+                        remark: '已出库数量为0，执行驳回操作'
+                    }
+
+                    rejectLeaseOut(rejectData)
+                        .then(response => {
+                            this.$modal.msgSuccess('驳回成功')
+                            // 刷新查看弹窗的数据
+                            this.getListView()
+                            // 刷新主列表数据
+                            this.getList()
+                        })
+                        .catch(error => {
+                            this.$modal.msgError('驳回失败: ' + (error.message || '未知错误'))
+                        })
+                })
+                .catch(() => {
+                    // 用户取消操作
+                })
         },
 
         //绘制五角星