Merge branch 'feature_20250521_主管任务审批' into uat(dev)

src/views/week/SUPTaskApproval/SUPTaskApprovalDetail.vue

@@ -25,16 +25,18 @@
         padding: 10px;
       ">
       <div style="padding: 4px 0">
-        <van-icon :name="ry" size="16" style="float: left" />
-        <span>&nbsp;{{ info.nickName }} - {{ info.postName }}</span>
+        <img :src="require('@/assets/zhuguan.png')" width="14" />
+        <span style="font-size: 13px; margin-left: 8px"
+          >&nbsp;{{ info.nickName }} - {{ info.postName }}</span
+        >
       </div>
       <div style="padding: 4px 0">
-        <van-icon :name="zw" size="16" style="float: left" />
-        <span>&nbsp;所属部门：{{ info.deptName }}</span>
+        <img :src="require('@/assets/bumen.png')" width="14" />
+        <span style="font-size: 13px; margin-left: 8px">&nbsp;所属部门：{{ info.deptName }}</span>
       </div>
       <div style="padding: 4px 0">
-        <van-icon :name="tm" size="16" style="float: left" />
-        <span>&nbsp;提交时间：{{ info.createTime }}</span>
+        <img :src="require('@/assets/rili.png')" width="14" />
+        <span style="font-size: 13px; margin-left: 8px">&nbsp;提交时间：{{ info.createTime }}</span>
       </div>
     </div>
     <div class="lineGrey"></div>

src/views/week/VisitSummary.vue

@@ -76,9 +76,15 @@
             </div>
           </van-cell>
           <div class="approvalStatusBtn" v-if="item.approvalStatus">
-            <van-button type="primary" v-if="item.approvalStatus == '2'">审批通过</van-button>
-            <van-button type="info" v-if="item.approvalStatus == '1'">提交待审批</van-button>
-            <van-button color="red" v-if="item.approvalStatus == '3'">拒绝待提交</van-button>
+            <van-button type="primary" size="small" v-if="item.approvalStatus == '2'"
+              >审批通过</van-button
+            >
+            <van-button type="info" size="small" v-if="item.approvalStatus == '1'"
+              >提交待审批</van-button
+            >
+            <van-button color="red" size="small" v-if="item.approvalStatus == '3'"
+              >拒绝待提交</van-button
+            >
           </div>
         </div>
         <van-empty v-if="list.length == 0" />
@@ -678,8 +684,12 @@ export default {
   }
   .approvalStatusBtn {
     position: absolute;
-    bottom: 17px;
+    bottom: 40px;
     right: 10px;
+    .van-button {
+      border-radius: 5px;
+      width: 78px;
+    }
   }
 }
 </style>

src/views/week/VisitSummaryDetail.vue

@@ -26,15 +26,17 @@
       ">
       <div style="padding: 4px 0">
         <van-icon :name="ry" size="16" style="float: left" />
-        <span>&nbsp;{{ info.nickName }} - {{ info.postName }}</span>
+        <span style="font-size: 13px; margin-left: 8px"
+          >&nbsp;{{ info.nickName }} - {{ info.postName }}</span
+        >
       </div>
       <div style="padding: 4px 0">
         <van-icon :name="zw" size="16" style="float: left" />
-        <span>&nbsp;所属部门：{{ info.deptName }}</span>
+        <span style="font-size: 13px; margin-left: 8px">&nbsp;所属部门：{{ info.deptName }}</span>
       </div>
       <div style="padding: 4px 0">
         <van-icon :name="tm" size="16" style="float: left" />
-        <span>&nbsp;提交时间：{{ info.createTime }}</span>
+        <span style="font-size: 13px; margin-left: 8px">&nbsp;提交时间：{{ info.createTime }}</span>
       </div>
     </div>
     <div class="lineGrey"></div>