Merge branch 'qin_16'

src/views/formTable/page/cardPageNew.vue

@@ -452,6 +452,7 @@ const delTask = (val:any) => {
 	.then(() => {
 		let sendData = {
 			id: [val.masters_key],
+            tableKey:val.tableKey,
 			isTrue: 2,
 		};
 		softDeletion(sendData).then((data) => {
@@ -474,7 +475,7 @@ const delTask = (val:any) => {
                     <div class="card-header contentBetween">
                         <div>
                             <el-checkbox  v-if="item.isMyMsg" label="" :value="item.masters_key"  />
-                            <el-text class="cardInfoTitle">{{ item.title }}</el-text>
+                            <span class="cardInfoTitle">{{ item.title }}</span>
                         </div>
                         <div v-if="item.flowIsOpens==1" class="carHeadStaus">
                             
@@ -553,16 +554,18 @@ const delTask = (val:any) => {
         margin-top:10px;
         
         :deep .el-card__footer{
-            padding: 5px 5px;
+            border:0px;
+            padding: 0px 5px 5px 5px;
             text-align: right;
         }
     }
     :deep .el-card__body{
         min-height:100px;
-        padding: 10px 10px;
+        padding: 0px 10px;
     }
     :deep .el-card__header{
-        padding: 3px 5px;
+        padding: 0px 5px;
+        border:0px;
     }
     .cardImg{
         max-height: 150px;
@@ -593,18 +596,18 @@ const delTask = (val:any) => {
 }
 .cardInfoTitle{
     font-size:16px;
-    line-height:35px;
+    line-height:30px;
     color: #000000;
 }
 .cardInfoContent{
     font-size:14px;
-    line-height:20px;
+    line-height:14px;
     color:rgb(99, 91, 91);
-    margin-top:10px;
+    margin-top:5px;
 }
 .cardInfoContents{
     font-size:14px;
-    line-height:20px;
+    line-height:14px;
     color:rgb(99, 91, 91);
     margin-top:5px;
 }