Merge branch 'feature_20250603_主管任务增加经销商选项' into uat(dev)

src/views/week/VisitSummary.vue

@@ -39,7 +39,7 @@
             <van-field v-model="formData.summaryTaskName" placeholder="请输入任务名称" />
           </van-cell>
         </van-col>
-        <van-col span="24">
+        <van-col span="12">
           <van-cell
             :title="approvalStatus.text"
             is-link
@@ -70,22 +70,20 @@
             <div class="cardContent" @click="dailyFn(item)">
               <div class="title">
                 <p class="textLeft">{{ item.nickName }}的{{ item.summaryTaskName }}</p>
+                <div class="approvalStatusBtn" v-if="item.approvalStatus">
+                  <span class="approvalStatusBtn1" v-if="item.approvalStatus == '2'">审批通过</span>
+                  <span class="approvalStatusBtn2" v-if="item.approvalStatus == '1'"
+                    >提交待审批</span
+                  >
+                  <span class="approvalStatusBtn3" v-if="item.approvalStatus == '3'"
+                    >拒绝待提交</span
+                  >
+                </div>
               </div>
               <div class="info">部门：{{ item.deptName }}</div>
               <div class="info">提交时间：{{ item.createTime }}</div>
             </div>
           </van-cell>
-          <div class="approvalStatusBtn" v-if="item.approvalStatus">
-            <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" />
       </van-list>
@@ -601,6 +599,8 @@ export default {
   font-weight: bold;
   color: #333;
   line-height: 22px;
+  display: flex;
+  justify-content: space-between;
 }
 
 .cardContent .title p {
@@ -675,18 +675,39 @@ export default {
   margin: 4px 0;
 }
 </style>
-<style scoped lang="scss">
+<style lang="scss">
 .VisitSummary {
   .brud {
     position: relative;
   }
   .approvalStatusBtn {
-    position: absolute;
-    bottom: 40px;
-    right: 10px;
-    .van-button {
+    span {
+      color: #fff;
       border-radius: 5px;
-      width: 78px;
+      display: inline-block;
+      padding: 3px 5px;
+      font-size: 14px;
+      width: 80px;
+      text-align: center;
+    }
+    .approvalStatusBtn1 {
+      background-color: #12ea7a;
+    }
+    .approvalStatusBtn2 {
+      background-color: rgb(112, 33, 239);
+    }
+    .approvalStatusBtn3 {
+      background-color: red;
+    }
+  }
+  .van-cell__title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    span {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }