优化

src/views/material/lease/clerkConfirmation/index.vue

@@ -336,23 +336,27 @@
             <div class="item" style="width: 28%; display: flex; align-items: center">
               <div style="width: 25%">库管：</div>
               <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" v-if="kgSignList.length > 0">
-                <img
+                <div
+                  style="width: 80%; margin-left: 20px; height: 40px"
                   v-for="(item, index) in kgSignList"
                   :key="index"
+                >
+                  <img
                     :src="item.outSignUrl"
-                  style="width: 50px; height: 100px"
+                    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 style="width: 25%">制单：</div>
               <div style="width: 75%" v-if="leaseApplyData.leaseSignUrl">
                 <img
                   :src="leaseApplyData.leaseSignUrl"
-                  :class="{ 'is-rotate': leaseApplyData.leaseSignType == 0 }"
                   style="width: 40px; height: 90px; max-width: 100%"
+                  :style="{ transform: confirmSign.confirmSignType == 0 ? 'rotate(-90deg)' : '' }"
                   alt=""
                 />
               </div>
@@ -450,7 +454,14 @@
 </template>
 
 <script>
-import { getCompleteOutTaskList, outInfoList, confirmMaterial, getInfoApi, getLeaseRequestVoApi,getCompleteTaskList } from '@/api/lease/out'
+import {
+  getCompleteOutTaskList,
+  outInfoList,
+  confirmMaterial,
+  getInfoApi,
+  getLeaseRequestVoApi,
+  getCompleteTaskList
+} from '@/api/lease/out'
 import vueEasyPrint from 'vue-easy-print'
 import printJS from 'print-js'
 import chapter from '@/utils/chapter'
@@ -647,9 +658,11 @@ export default {
       })
     },
     openBills(row) {
+      console.log('🚀 ~ openBills ~ row:', row)
       const params = {
         id: this.confirmForm2.id,
-        leaseSignId: row.leaseSignId
+        leaseSignId: row.leaseSignId,
+        publishTask: row.publishTask
       }
       getLeaseRequestVoApi(params).then(res => {
         this.leaseApplyData = res.data.leaseApplyInfo
@@ -692,7 +705,7 @@ export default {
       this.showPass = true
       const passArray = row.maTypeNames.split(',')
       this.passContent = passArray.slice(0, 3).join(',')
-      const date = new Date(row.confirmTime)
+      const date = new Date(row.confirmTime || Date.now())
       this.passTime = `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`
     },
     printPass() {

src/views/material/lease/materialConfirm/index.vue

@@ -343,8 +343,8 @@
                 >
                   <img
                     :src="item.outSignUrl"
-                    :class="{ 'is-rotate': item.outSignType == 0 }"
                     style="width: 40px; height: 90px; max-width: 100%"
+                    :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
                     alt=""
                   />
                 </div>
@@ -355,8 +355,8 @@
               <div style="width: 75%" 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>
@@ -666,7 +666,8 @@ export default {
     openBills(row) {
       const params = {
         id: this.confirmForm2.id,
-        leaseSignId: row.leaseSignId
+        leaseSignId: row.leaseSignId,
+        publishTask: row.publishTask
       }
       getLeaseRequestVoApi(params).then(res => {
         this.leaseApplyData = res.data.leaseApplyInfo
@@ -709,7 +710,7 @@ export default {
       this.showPass = true
       const passArray = row.maTypeNames.split(',')
       this.passContent = passArray.slice(0, 3).join(',')
-      const date = new Date(row.confirmTime)
+      const date = new Date(row.confirmTime || Date.now())
       this.passTime = `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`
     },
     printPass() {