Merge branch 'qin_v3'

.gitignore

@@ -25,3 +25,4 @@ dist-ssr
 *.sln
 *.sw?
 src/autoImport
+src/assets/icons/二代证机具开发包（支持港澳台）.rar

src/views/common/office/pdf.vue

@@ -17,7 +17,7 @@ const props = defineProps({
 
 const pdfWebUrl =computed({
 	get() {
-        console.log("props.isShow",props.pdfUrl  )
+        console.log("props.isShow",props.pdfUrl  )                                                                         
         return props.pdfUrl 
 	},
 	set(val: any) {
@@ -25,7 +25,7 @@ const pdfWebUrl =computed({
 	}
 });
 
-
+                                                         
 </script>
 <template>
     <div>

src/views/formTable/page/cardPage.vue

@@ -479,6 +479,9 @@ onMounted(()=>{
 */
 const onHandleAppTaskScroll = (event:any) => {
     console.log("onHandleScroll",loadingList.value, event)
+    if (loadingList.value === true) {
+        return
+    }
     let wrapRef = taskScrollbar.value.wrapRef
     taskScrollbar.value.moveY = wrapRef.scrollTop * 100 / wrapRef.clientHeight
     taskScrollbar.value.moveX = wrapRef.scrollLeft * 100 / wrapRef.clientWidth

src/views/formTable/page/flowAndLog.vue

@@ -313,22 +313,22 @@ defineExpose({
                 <el-timeline>
                     <el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
                         <el-card class="logCard">
-                            <table  cellspacing="0"  bgcolor="#EBEEF5">
+                            <table  cellspacing="0"  >
                                 <tbody>
                                     <tr  v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex">
-                                        <td class="biankuang" width="100" bgcolor="#F5F7FA">{{mastItem.label}}：</td>
-                                        <td class="biankuang" bgcolor="#FFFFFF">{{mastItem.value}}</td>
+                                        <td class="biankuang" width="100" >{{mastItem.label}}：</td>
+                                        <td class="biankuang" >{{mastItem.value}}</td>
                                     </tr>
                                 </tbody>
 							</table>
                             <el-tabs v-if="item.sunData" type="border-card" style="margin-top:20px;">
                                 <el-tab-pane v-for="(sonItem,sonIndex) in item.sunData" :label="sonIndex" :key="sonIndex">
-                                    <el-card  v-for="(sunItem,sunIndex) in sonItem" :key="sunIndex" class="logCard">
-                                        <table  cellspacing="0"  bgcolor="#EBEEF5">
+                                    <el-card  v-for="(sunItem,sunIndex) in sonItem" :key="sunIndex" class="logCard" style="margin-top:10px;">
+                                        <table  cellspacing="0"  >
                                             <tbody>
                                                 <tr  v-for="(mastSununItem,mastSunIndex) in sunItem" :key="mastSunIndex">
-                                                    <td class="biankuang" width="100" bgcolor="#F5F7FA">{{mastSununItem.label}}：</td>
-                                                    <td class="biankuang" bgcolor="#FFFFFF">{{mastSununItem.value}}</td>
+                                                    <td class="biankuang" width="100" >{{mastSununItem.label}}：</td>
+                                                    <td class="biankuang" ><el-text v-if="mastSununItem.types=='index'">{{sunIndex+1}}</el-text><el-text v-else>{{mastSununItem.value}}</el-text></td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -357,13 +357,13 @@ defineExpose({
     table {
         width: 100%;
         margin: 0;
-        border: 1px solid #EBEEF5;
+        // border: 1px solid #EBEEF5;
         border-collapse: collapse;
     }
     
     th,
     td {
-        border: 1px solid #EBEEF5;
+        // border: 1px solid #EBEEF5;
         text-align: left;
         padding: 0.5em;
         vertical-align: top;