Browse Source

Merge branch 'feature_20260316_日报分享内容自定义配置' into uat(dev)

zhujindu 2 weeks ago
parent
commit
50d992ac15
1 changed files with 68 additions and 21 deletions
  1. 68 21
      src/views/week/dailyDetails.vue

+ 68 - 21
src/views/week/dailyDetails.vue

@@ -197,16 +197,33 @@
             style="margin-left: 10px"></van-checkbox>
             style="margin-left: 10px"></van-checkbox>
         </p> -->
         </p> -->
         <p
         <p
-          style="margin-bottom: 10px; margin-top: 0; display: flex"
-          v-if="reportTarget.isHistory == '0'">
-          日报指标<van-checkbox v-model="isTarget" style="margin-left: 10px"></van-checkbox>
+          style="
+            margin-bottom: 10px;
+            margin-top: 0;
+            display: flex;
+            align-items: center;
+            cursor: pointer;
+          "
+          v-if="reportTarget.isHistory == '0'"
+          @click="isTarget = !isTarget">
+          <van-checkbox v-model="isTarget" style="margin-right: 10px" @click.stop></van-checkbox>
+          <span>日报指标</span>
         </p>
         </p>
         <p
         <p
-          style="margin-bottom: 10px; margin-top: 0; display: flex"
-          v-if="reportTarget.isHistory == '0'">
-          日报填写内容<van-checkbox
+          style="
+            margin-bottom: 10px;
+            margin-top: 0;
+            display: flex;
+            align-items: center;
+            cursor: pointer;
+          "
+          v-if="reportTarget.isHistory == '0'"
+          @click="isReportCustom = !isReportCustom">
+          <van-checkbox
             v-model="isReportCustom"
             v-model="isReportCustom"
-            style="margin-left: 10px"></van-checkbox>
+            style="margin-right: 10px"
+            @click.stop></van-checkbox>
+          <span>日报填写内容</span>
         </p>
         </p>
         <template v-if="reportTarget.photoSummary">
         <template v-if="reportTarget.photoSummary">
           <p style="margin-top: 0">请点击勾选想要分享的今日拜访照片</p>
           <p style="margin-top: 0">请点击勾选想要分享的今日拜访照片</p>
@@ -836,25 +853,60 @@ export default {
     flex-direction: column;
     flex-direction: column;
     max-height: 70%;
     max-height: 70%;
     margin-top: 0 !important;
     margin-top: 0 !important;
+    border-radius: 12px;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+    z-index: 10000;
     .el-dialog__header {
     .el-dialog__header {
-      height: 40px;
+      height: 50px;
       display: flex;
       display: flex;
-      justify-content: right;
+      align-items: center;
+      justify-content: center;
+      border-bottom: 1px solid #ebeef5;
+      padding: 0 20px;
+      background-color: #fff;
+      .el-dialog__title {
+        font-size: 16px;
+        font-weight: 500;
+        color: #303133;
+      }
       .el-dialog__headerbtn {
       .el-dialog__headerbtn {
-        position: static !important;
+        position: absolute;
+        right: 15px;
+        top: 15px;
       }
       }
     }
     }
     .el-dialog__body {
     .el-dialog__body {
-      padding: 30px 20px !important;
+      padding: 20px !important;
       overflow-y: auto;
       overflow-y: auto;
       flex: 1;
       flex: 1;
+      background-color: #fff;
     }
     }
     .cell {
     .cell {
       font-size: 12px;
       font-size: 12px;
     }
     }
     .footer-btn {
     .footer-btn {
       display: flex;
       display: flex;
-      justify-content: space-around;
+      justify-content: center;
+      gap: 30px;
+      padding: 15px 20px;
+      border-top: 1px solid #ebeef5;
+      background-color: #fff;
+      border-radius: 0 0 12px 12px;
+      margin-top: 0 !important;
+      button {
+        width: 120px;
+        height: 36px;
+        border-radius: 18px;
+      }
+      .van-button--primary {
+        background-color: #2b73cf;
+        border-color: #2b73cf;
+      }
+      .van-button--primary.van-button--plain {
+        color: #999;
+        border-color: #dcdfe6;
+        background-color: #f5f7fa;
+      }
     }
     }
   }
   }
 }
 }
@@ -868,21 +920,16 @@ export default {
       margin-right: 3%;
       margin-right: 3%;
       margin-top: 10px;
       margin-top: 10px;
       position: relative;
       position: relative;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
       img {
       img {
         width: 100%;
         width: 100%;
         height: 100%;
         height: 100%;
+        object-fit: cover;
       }
       }
     }
     }
   }
   }
-  .el-dialog__header {
-    display: flex;
-    .el-dialog__title {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
 }
 }
 .notifyIndex {
 .notifyIndex {
   z-index: 999999 !important;
   z-index: 999999 !important;