From b73b5e52b238a934c5cada6e43a3f9f1b33fe963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B1=B3=E5=AD=90=E8=B1=AA?= <1012743329@qq.com>
Date: Mon, 6 Jan 2025 10:19:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.=E8=80=83=E5=8B=A4=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BottomPop/BottomPop.vue        |  1 +
 src/components/CommonItemItem/CommonItem.vue  |  8 ++-
 .../attendance-add-group.vue                  | 38 +++++++++++--
 .../attendance-add-group/outside-rules.vue    | 56 +++++++++++++++++++
 src/typings.ts                                |  6 ++
 5 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/attendance/attendance-add-group/outside-rules.vue

diff --git a/src/components/BottomPop/BottomPop.vue b/src/components/BottomPop/BottomPop.vue
index 3dee1c8..bbe5990 100644
--- a/src/components/BottomPop/BottomPop.vue
+++ b/src/components/BottomPop/BottomPop.vue
@@ -32,6 +32,7 @@
       >
         确定
       </wd-button>
+      <view v-else class="mx-3 my-5"></view>
     </view>
   </wd-popup>
 </template>
diff --git a/src/components/CommonItemItem/CommonItem.vue b/src/components/CommonItemItem/CommonItem.vue
index 40bcf32..7f4bad4 100644
--- a/src/components/CommonItemItem/CommonItem.vue
+++ b/src/components/CommonItemItem/CommonItem.vue
@@ -1,9 +1,11 @@
 <template>
   <view class="mx-2">
     <view class="flex flex-row items-center py-4">
-      <view class="mr-0.5" :class="isMust ? 'color-transparent' : 'color-red'">*</view>
+      <view class="mr-0.5" :class="isMust ? 'color-red' : 'color-transparent'">*</view>
       <view>{{ text }}</view>
-      <view v-if="$slots.child" class="flex-1 mx-2"><slot name="child" class="flex-1"></slot></view>
+      <view v-if="$slots.child" class="flex-1 flex flex-row mx-2">
+        <slot name="child" class="flex-1"></slot>
+      </view>
       <view v-if="!$slots.child" class="flex-1 flex flex-row flex-justify-end items-center">
         <view v-if="!value" class="color-gray">{{ hint }}</view>
         <view v-else class="color-[#656567]">{{ value }}</view>
@@ -15,7 +17,7 @@
         ></wd-icon>
       </view>
     </view>
-    <view v-if="!noLine" class="hpx bg-gray-300 mx-2.5"></view>
+    <view v-if="!noLine" class="hpx bg-gray-100 mx-2.5"></view>
   </view>
 </template>
 
diff --git a/src/pages/attendance/attendance-add-group/attendance-add-group.vue b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
index af27917..30da208 100644
--- a/src/pages/attendance/attendance-add-group/attendance-add-group.vue
+++ b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
@@ -55,7 +55,6 @@
         showWay = false
       }
     "
-    :onSure="() => {}"
     noSure
   >
     <template v-slot:child>
@@ -63,7 +62,12 @@
         <view class="bg-white rounded-1 mt-2">
           <view
             class="flex flex-row items-center p-3 box-border"
-            @click="wayIndex = index"
+            @click="
+              () => {
+                wayIndex = index
+                showWay = false
+              }
+            "
             v-for="(item, index) in wayList"
             :key="index"
           >
@@ -85,7 +89,7 @@
       <CommonItem text="考勤组名称" isMust value="有多少">
         <template v-slot:child>
           <input
-            class="text-right"
+            class="text-right w-100%"
             v-model="name"
             placeholder="必填"
             placeholder-class="color-gray"
@@ -117,12 +121,23 @@
           }
         "
         text="打卡方式"
-        value="打卡设备"
+        :value="wayList[wayIndex].title"
       ></CommonItem>
-      <CommonItem text="打卡设备" isMust noLine value="" hint="未选择"></CommonItem>
+      <CommonItem
+        text="打卡设备"
+        :isMust="wayIndex == 0"
+        :noLine="wayIndex == 0"
+        value=""
+        hint="未选择"
+      ></CommonItem>
+      <CommonItem text="打卡地点" v-show="wayIndex == 1" value="" hint="未设置"></CommonItem>
+      <CommonItem text="打卡WIFI" v-show="wayIndex == 1" noLine value="" hint="未设置"></CommonItem>
+    </view>
+    <view @click="goOtsideRule()" v-show="wayIndex == 1" class="bg-white rounded-1.2 mt-2">
+      <CommonItem text="外勤规则" noLine value="允许外勤卡" hint=""></CommonItem>
     </view>
     <view class="bg-white rounded-1.2 mt-2">
-      <CommonItem text="加班统计规则" noLine value="" hint="未开启"></CommonItem>
+      <CommonItem text="加班统计规则" noLine value="未开启" hint=""></CommonItem>
     </view>
     <view class="fixed bottom-0 left-0 w-full p-3 box-border">
       <wd-button block>保存</wd-button>
@@ -169,6 +184,17 @@
       desc: '选择后可开启外勤打卡'
     }
   ]
+  const outsideRule = {
+    allow: false,
+    takePhoto: false,
+    remark: false,
+    selectPhoto: false
+  }
+  const goOtsideRule = () => {
+    uni.navigateTo({
+      url: '/pages/attendance/attendance-add-group/outside-rules'
+    })
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/attendance/attendance-add-group/outside-rules.vue b/src/pages/attendance/attendance-add-group/outside-rules.vue
new file mode 100644
index 0000000..c705bf6
--- /dev/null
+++ b/src/pages/attendance/attendance-add-group/outside-rules.vue
@@ -0,0 +1,56 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
+<template>
+  <TopNavigation title="外勤规则"></TopNavigation>
+  <view class="h-[calc(100vh-60px)] p-3 box-border">
+    <view class="bg-white rounded-1.2">
+      <CommonItem text="允许外勤打卡" noLine value="">
+        <template v-slot:child>
+          <wd-switch v-model="checked" class="ml-a" />
+        </template>
+      </CommonItem>
+    </view>
+    <view class="bg-white rounded-1.2 mt-2">
+      <CommonItem text="外勤打卡必须拍照" value="">
+        <template v-slot:child>
+          <wd-switch v-model="checked" class="ml-a" />
+        </template>
+      </CommonItem>
+      <CommonItem text="外勤卡必须填写备注" value="">
+        <template v-slot:child>
+          <wd-switch v-model="checked" class="ml-a" />
+        </template>
+      </CommonItem>
+      <CommonItem text="允许从手机相册选择照片" noLine value="">
+        <template v-slot:child>
+          <wd-switch v-model="checked" class="ml-a" />
+        </template>
+      </CommonItem>
+    </view>
+    <view class=""></view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+  import CommonItem from '@/components/CommonItemItem/CommonItem.vue'
+  const checked = ref(false)
+  const props = defineProps({
+    outsideRules: {
+      type: OutsideRules,
+      default: () => ({})
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f6f8fc;
+  }
+</style>
diff --git a/src/typings.ts b/src/typings.ts
index b52c6dd..910d108 100644
--- a/src/typings.ts
+++ b/src/typings.ts
@@ -47,3 +47,9 @@ export enum PlatId {
   miniProgram = 3,
   pc = 4
 }
+export type OutsideRules = {
+  allow: boolean
+  takePhoto: boolean
+  remark: boolean
+  selectPhoto: boolean
+}