Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/home/components/CardItemSeven.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="SevenDetailBox">
     <ul v-if="!loading && listData.length > 0">
-      <li v-for="(item, i) in listData" :key="i">
+      <li v-for="(item, i) in listData" :key="i" @click="clickHandle(item)">
         <div class="content">
-          <span>{{ item?.messageContent }}</span>
+          <span :title="item.messageContent">{{ item?.messageContent }}</span>
         </div>
         <span>{{ convertTimeToDate(item?.createTime) }}</span>
       </li>
@@ -16,6 +16,7 @@
 
 <script setup lang="ts">
 import request from '@/config/axios'
+import { openProcessFlow } from '@/utils/flow'
 import { convertTimeToDate } from '@/utils/formatTime'
 
 const loading = ref<boolean>(false)
@@ -34,6 +35,13 @@ const queryContractMessageByPage = async (): Promise<void> => {
   }
 }
 queryContractMessageByPage()
+const router = useRouter()
+const clickHandle = (item) => {
+  console.log(item)
+  openProcessFlow(router, item.invoiceInstanceId, {
+    title: '查看流程'
+  })
+}
 </script>
 
 <style lang="scss" scoped>
@@ -53,6 +61,7 @@ queryContractMessageByPage()
       display: flex;
       padding: 10px;
       font-size: 15px;
+      cursor: pointer;
       border-bottom: 1px solid #e3e3e3;
 
       > div {
@@ -63,6 +72,9 @@ queryContractMessageByPage()
         text-overflow: ellipsis;
         width: 0px;
         margin-right: 20px;
+        &:hover {
+          color: #2e77e6;
+        }
       }
 
       > span {

client_h5/src/pages/usemoney/index.vue

@@ -268,9 +268,9 @@ const initFormData = async () => {
   formData.value.applyTime = moment(formData.value.applyTime).format(
     "YYYY-MM-DD"
   );
-  formData.value.agreedPayTime = moment(formData.value.agreedPayTime).format(
+  formData.value.agreedPayTime = formData.value.agreedPayTime ? moment(formData.value.agreedPayTime).format(
     "YYYY-MM-DD"
-  );
+  ) : '';
   if (formData.value.paymentMethod == 1) {
     formData.value.paymentMethod = "银行";
   } else if (formData.value.paymentMethod == 2) {