Merge remote-tracking branch 'origin/master'

jy-ui/src/components/PDF/moneyPDF.vue

@@ -451,7 +451,7 @@
                 >
                   {{ printDetails.depositBank }}
                 </div>
-                <div style="width: 27%; padding: 0 8px; display: flex; align-items: center">
+                <div style="width: 27%; padding: 0 8px; display: flex; align-items: center; word-break: break-all">
                   {{ printDetails.account }}
                 </div>
               </div>
@@ -498,7 +498,7 @@
                     <div style="width: calc(100% - 120px); word-wrap: break-word">
                       <span>{{ item.nodeName }}: </span>
                       <span style="padding-left: 4px">{{ item.approver }}</span>
-                      <span style="padding-left: 4px">（{{getStatus(item)}}）</span>
+                      <span style="padding-left: 4px">（{{ getStatus(item) }}）</span>
                       <span style="padding-left: 4px">{{ item.message }}</span>
                     </div>
                     <div style="width: 120px">{{ item.updateTime }}</div>
@@ -670,20 +670,20 @@ const getAtts = (atts) => {
   }
   return text
 }
-const getStatus = (row) =>{
+const getStatus = (row) => {
   switch (row.flowStatus) {
     case '0':
-        return '待提交'
+      return '待提交'
     case '1':
-        return '审批中'
+      return '审批中'
     case '2':
-        return '审批通过'
+      return '审批通过'
     case '4':
-        return '驳回'
+      return '驳回'
     case '6':
-        return '撤销'
+      return '撤销'
     case '7':
-        return '取回'
+      return '取回'
     default:
       return ''
   }

jy-ui/src/views/business/payment/requests/index.vue

@@ -624,7 +624,7 @@ const clickDownload = () => {
       </a-form>
     </a-dialog>
 
-    <a-dialog :footer="false" v-model="dialogPrint" title="打印" width="840px" height="200px">
+    <a-dialog :footer="false" v-if="dialogPrint" v-model="dialogPrint" title="打印" width="840px" height="200px">
       <MoneyPDF :rowData="rowData"></MoneyPDF>
       <template #footer>
         <div>