From 3d3d10165349d0c08b4a6af4d8e551cafb9ac3ef Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sun, 28 Apr 2024 22:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ask-leave/create.vue          |  1 +
 src/pages/ask-leave/list.vue            | 10 +++++-
 src/pages/audits/data.data.js           |  2 +-
 src/pages/audits/detail.vue             |  6 ++--
 src/pages/audits/log.vue                | 43 ++++++-------------------
 src/pages/business/create.vue           |  1 +
 src/pages/business/list.vue             |  9 +++++-
 src/pages/contract/create.vue           | 26 ++++++++-------
 src/pages/contract/list.vue             | 10 +++++-
 src/pages/examination/detail.vue        |  2 +-
 src/pages/examination/index.vue         |  2 +-
 src/pages/expense-account/index.vue     | 12 +++++--
 src/pages/expense-account/submit.vue    | 37 ++++++++++-----------
 src/pages/make-card/create.vue          |  2 +-
 src/pages/make-card/list.vue            |  5 +--
 src/pages/overtime/create.vue           |  1 +
 src/pages/overtime/list.vue             |  9 +++++-
 src/pages/revert/index.vue              |  9 ++----
 src/pages/task/index.vue                |  9 +++++-
 src/pages/task/task_hygienes_submit.vue |  2 +-
 src/pages/work/create.vue               |  2 +-
 src/pages/work/list.vue                 |  9 +++---
 22 files changed, 117 insertions(+), 92 deletions(-)

diff --git a/src/pages/ask-leave/create.vue b/src/pages/ask-leave/create.vue
index 5f8fd02..e3d62cd 100644
--- a/src/pages/ask-leave/create.vue
+++ b/src/pages/ask-leave/create.vue
@@ -178,6 +178,7 @@ const onSubmit = async () => {
       icon: "none"
     })
     formRef.value.resetFields()
+    uni.$emit('refresh')
     uni.navigateBack()
   } catch (error) {
     console.log(error)
diff --git a/src/pages/ask-leave/list.vue b/src/pages/ask-leave/list.vue
index 9b228f4..ec25c6f 100644
--- a/src/pages/ask-leave/list.vue
+++ b/src/pages/ask-leave/list.vue
@@ -69,7 +69,7 @@
 <script setup>
 import CuNavbar from '@/components/cu-navbar/index'
 import { ref } from 'vue'
-import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
 import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import MescrollItem from '@/components/mescroll-api/more.vue'
 import statusFun from '@/utils/status'
@@ -98,6 +98,14 @@ const { tabIndex, getMescroll, scrollToLastY } = useMescrollMore(
   onPageScroll,
   onReachBottom
 )
+
+onLoad(() => {
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
+  })
+})
+
 const goPath = (url) => {
   uni.navigateTo({
     url,
diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js
index 37206bd..32656a0 100644
--- a/src/pages/audits/data.data.js
+++ b/src/pages/audits/data.data.js
@@ -63,7 +63,7 @@ export default {
       },
       {
         title: "申请时间",
-        dataIndex: "check.subject.created_at_format"
+        dataIndex: "check.subject.created_format"
       },
       {
         title: '报销分类',
diff --git a/src/pages/audits/detail.vue b/src/pages/audits/detail.vue
index 85cc0a9..7d21f17 100644
--- a/src/pages/audits/detail.vue
+++ b/src/pages/audits/detail.vue
@@ -77,9 +77,11 @@ const onConfirm = async () => {
       status: !modelOptions.isValue,
       remarks: modelOptions.isValue ? value.value : '',
     })
-    uni.$emit('audits:onRefresh')
+    uni.$emit('refresh', { index: 'check' })
     uni.navigateBack()
-  } catch (error) {}
+  } catch (error) {
+    console.log(error)
+  }
 }
 
 const onTg = () => {
diff --git a/src/pages/audits/log.vue b/src/pages/audits/log.vue
index cc84f65..a15263a 100644
--- a/src/pages/audits/log.vue
+++ b/src/pages/audits/log.vue
@@ -3,43 +3,23 @@
     <CuNavbar title="审核流程"></CuNavbar>
     <view class="card-shadow bg-white p-base">
       <uv-steps direction="column">
-        <uv-steps-item
-          v-for="item in list"
-          :key="item.id"
-          :title="item.check_status_text"
-          :desc="timeFormat(item.checked_at, 'yyyy-mm-dd hh:MM:ss')"
-        >
+        <uv-steps-item v-for="item in list" :key="item.id">
           <template #icon>
-            <view
-              class="w-31rpx h-31rpx rounded-full mt-4rpx"
-              :class="[
-                item.check_status == 2 || item.check_status == 3
-                  ? 'bg-blue'
-                  : 'bg-gray-300',
-              ]"
-            ></view>
+            <view class="w-31rpx h-31rpx rounded-full mt-4rpx" :class="[item.check_status == 2 || item.check_status == 3? 'bg-blue': 'bg-gray-300']"></view>
           </template>
           <template #title>
             <view class="space-y-6rpx">
               <view class="flex items-center space-x-14rpx">
                 <view> {{ item.check_user ? item.check_user.name : item.check_name }}</view>
               </view>
-              <view
-                class="text-24rpx"
-                :style="{
-                  color: statusFun(item.check_status, 'statusExpense', 'color'),
-                }"
-                >{{ item.check_status_text }}</view
-              >
-              <view class="text-24rpx text-hex-999" v-if="item.check_status == 4">{{
-                item.remarks
-              }}</view>
+              <view v-if="item.check_status > 1" class="text-26rpx" :style="{ color: statusFun(item.check_status, 'statusExpense', 'color')}">
+                {{ item.check_status == 2 ? '待审核' : item.check_status_text }}
+              </view>
+              <view class="text-26rpx text-red" v-if="item.check_status == 4">{{item.remarks}}</view>
             </view>
           </template>
           <template #desc>
-            <view v-if="item.checked_at" class="text-22rpx text-hex-999">
-              {{ timeFormat(item.checked_at, 'yyyy-mm-dd hh:MM:ss') }}
-            </view>
+            <view v-if="item.checked_at" class="text-26rpx text-hex-999">{{ item.checked_format }}</view>
           </template>
         </uv-steps-item>
       </uv-steps>
@@ -54,12 +34,9 @@ import { computed, ref } from 'vue'
 import { timeFormat } from '@climblee/uv-ui/libs/function'
 import statusFun from '@/utils/status'
 const list = ref([])
-// const currentStop = computed(()=>list.value.filter(e=>e.check_status>=3))
 onLoad((options) => {
-  http
-    .get(`/workflow/${options.id}/logs`)
-    .then((res) => {
-      list.value = res
-    })
+  http.get(`/workflow/${options.id}/logs`).then((res) => {
+    list.value = res
+  })
 })
 </script>
diff --git a/src/pages/business/create.vue b/src/pages/business/create.vue
index 62346e7..d12780f 100644
--- a/src/pages/business/create.vue
+++ b/src/pages/business/create.vue
@@ -164,6 +164,7 @@ const onSubmit = async () => {
       icon: "none"
     })
     formRef.value.resetFields()
+    uni.$emit('refresh')
     uni.navigateBack()
   } catch (error) {
     console.log(error)
diff --git a/src/pages/business/list.vue b/src/pages/business/list.vue
index 81094d6..32730c2 100644
--- a/src/pages/business/list.vue
+++ b/src/pages/business/list.vue
@@ -74,7 +74,7 @@
 <script setup>
 import CuNavbar from '@/components/cu-navbar/index'
 import { ref } from 'vue'
-import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
 import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import MescrollItem from '@/components/mescroll-api/more.vue'
 import statusFun from "@/utils/status"
@@ -103,6 +103,13 @@ const { tabIndex, getMescroll, scrollToLastY } = useMescrollMore(
   onPageScroll,
   onReachBottom
 )
+
+onLoad(() => {
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
+  })
+})
 const goPath = (url) => {
   uni.navigateTo({
     url,
diff --git a/src/pages/contract/create.vue b/src/pages/contract/create.vue
index f4c2b58..a3a97cf 100644
--- a/src/pages/contract/create.vue
+++ b/src/pages/contract/create.vue
@@ -11,18 +11,19 @@
           <uv-input placeholder="请输入合同名称" inputAlign="right" :border="`none`" v-model="form.name"> </uv-input>
         </uv-form-item>
         <uv-line color="#f5f5f5"></uv-line>
-        <uv-form-item label="合同照片" labelPosition="top" prop="images" required>
-          <view class="w-full mt-15rpx">
-            <uv-upload
-              :maxCount="9"
-              multiple
-              :fileList="form.images"
-              @afterRead="afterRead"
-              @delete="deletePic"
-              name="images"
-            ></uv-upload>
-          </view>
+        <uv-form-item label="合同照片" prop="images" required>
+          <view class="text-right w-full text-hex-999">{{ form.images.length }}/{{ maxCount }}</view>
         </uv-form-item>
+        <view class="w-full">
+          <uv-upload
+            :maxCount="maxCount"
+            multiple
+            :fileList="form.images"
+            @afterRead="afterRead"
+            @delete="deletePic"
+            name="images"
+          ></uv-upload>
+        </view>
       </uv-form>
     </view>
     <uv-modal ref="modalRef" title="提示" content="确定提交吗?" @confirm="onSubmit" :showCancelButton="true"></uv-modal>
@@ -37,6 +38,7 @@ const formRef = ref(null)
 const modalRef = ref(null)
 const id = ref(0)
 const loading = ref(false)
+const maxCount = ref(50)
 const form = reactive({
   name: "",
   images: []
@@ -100,7 +102,7 @@ const onSubmit = async () => {
     })
     form.images = []
     formRef.value.resetFields()
-    uni.$emit("task:submit")
+    uni.$emit('refresh')
     uni.navigateBack()
   } catch (error) {
     console.log(error)
diff --git a/src/pages/contract/list.vue b/src/pages/contract/list.vue
index 7abda1c..79d4f88 100644
--- a/src/pages/contract/list.vue
+++ b/src/pages/contract/list.vue
@@ -71,7 +71,7 @@
 <script setup>
 import CuNavbar from '@/components/cu-navbar/index'
 import { computed, reactive, ref } from 'vue'
-import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
 import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import MescrollItem from '@/components/mescroll-api/more.vue'
 import statusFun from '@/utils/status'
@@ -100,6 +100,14 @@ const tabList = ref([
     },
   },
 ])
+
+onLoad(() => {
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
+  })
+})
+
 const goPath = (url) => {
   uni.navigateTo({
     url,
diff --git a/src/pages/examination/detail.vue b/src/pages/examination/detail.vue
index a42a4e3..02c18ac 100644
--- a/src/pages/examination/detail.vue
+++ b/src/pages/examination/detail.vue
@@ -149,7 +149,7 @@ const onSubmit = async () => {
     await http.post(`/train/examinations/${id.value}/answer`, {
       answers: answer.value,
     })
-    // uni.$emit('examination:onRefresh')
+    uni.$emit('examination:onRefresh')
     uni.navigateBack()
   } catch (error) {
   } finally {
diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue
index 1b13406..a3a8be6 100644
--- a/src/pages/examination/index.vue
+++ b/src/pages/examination/index.vue
@@ -38,7 +38,7 @@ const { mescrollItem } = useMescrollComp(onPageScroll, onReachBottom)
 
 onLoad(() => {
   uni.$on('examination:onRefresh', () => {
-    mescrollItem.value?.refresh()
+    mescrollItem?.value?.refresh()
   })
 })
 
diff --git a/src/pages/expense-account/index.vue b/src/pages/expense-account/index.vue
index 0fb1389..efbb9b3 100644
--- a/src/pages/expense-account/index.vue
+++ b/src/pages/expense-account/index.vue
@@ -55,7 +55,7 @@
               v-for="item in list"
               :key="item.id"
               :title="item.check.subject.type?.name"
-              :status-text="item.check_status_text"
+              :status-text="item.check_status == 2 ? '待审核' : item.check_status_text"
               :status-color="statusFun(item.check_status,'statusExpense','color')"
               :body="[
                 { label: '申请人: ', value: item.check.subject.employee.name },
@@ -74,10 +74,9 @@
 <script setup>
 import CuNavbar from '@/components/cu-navbar/index'
 import { ref } from 'vue'
-import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
 import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import MescrollItem from '@/components/mescroll-api/more.vue'
-import { timeFormat } from '@climblee/uv-ui/libs/function'
 import statusFun from '@/utils/status'
 import ListItem from '@/components/list-item/index'
 
@@ -103,6 +102,13 @@ const tabList = ref([
   },
 ])
 
+onLoad(() => {
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
+  })
+})
+
 const tabChange = ({ index }) => {
   tabIndex.value = index
   scrollToLastY()
diff --git a/src/pages/expense-account/submit.vue b/src/pages/expense-account/submit.vue
index 8e5fd67..a3eaf85 100644
--- a/src/pages/expense-account/submit.vue
+++ b/src/pages/expense-account/submit.vue
@@ -12,12 +12,8 @@
           labelPosition="left"
         >
           <uv-form-item label="报销分类" required prop="reimbursement_type_id">
-            <view
-              @click="openType"
-              keyName="name"
-              class="h-full w-full flex justify-end"
-            >
-              {{ type.name }}
+            <view @click="openType" keyName="name" class="h-full w-full flex justify-end">
+              <view :class="{'text-gray': !type.name }">{{ type.name ?? '请选择' }}</view>
               <uv-icon name="arrow-right"></uv-icon>
             </view>
           </uv-form-item>
@@ -29,6 +25,7 @@
               type="digit"
               input-align="right"
               v-model="form.expense"
+              @blur="handleBlurExpense"
             ></uv-input>
           </uv-form-item>
           <uv-line color="#f5f5f5"></uv-line>
@@ -94,6 +91,7 @@ const type = ref({})
 const modalRef = ref(null)
 const formRef = ref(null)
 const loading = ref(false)
+const id = ref(null)
 const form = reactive({
   reimbursement_type_id: '',
   expense: '',
@@ -112,13 +110,7 @@ const rules = reactive({
     {
       required: true,
       type: 'number',
-      min: 0.01,
-      max: 22,
-      message: '报销金额不能小于0.01',
-    },{
-      validator: (rule, value) => {
-        return value > 0
-      },
+      min: 0,
       message: '报销金额不能小于0',
     }
   ],
@@ -132,8 +124,8 @@ const rules = reactive({
 
 onLoad((e) => {
   if (e.id) {
+    id.value = e.id
     http.get(`reimbursements/${e.id}`).then(res => {
-      console.log(res)
       type.value = res.type
       form.reimbursement_type_id = res.reimbursement_type_id
       form.expense = res.expense
@@ -148,27 +140,36 @@ onLoad((e) => {
   getTypes()
 })
 
+const handleBlurExpense = (e) => {
+  form.expense = Math.floor(e * 100) / 100
+}
+
 const submit = () => {
   formRef.value.validate().then((res) => {
     modalRef.value.open()
-  })
+  }).catch(error => {})
 }
 const onSubmit = async () => {
   if (loading.value) return
   loading.value = true
   try {
-    const resData = await http.post('/reimbursements', {
+    const params = {
       reimbursement_type_id: form.reimbursement_type_id,
       expense: form.expense,
       reason: form.reason,
       photos: form.photos.map((item) => item.url),
-    })
+    }
+    if (id.value) {
+      await http.put(`/reimbursements/${id.value}`, params)
+    } else {
+      await http.post('/reimbursements', params)
+    }
     uni.showToast({
       title: '提交成功',
       icon: 'none',
     })
     formRef.value.resetFields()
-    uni.$emit('ex:submit', resData)
+    uni.$emit('refresh', { index: 0 })
     uni.navigateBack()
   } catch (error) {
   } finally {
diff --git a/src/pages/make-card/create.vue b/src/pages/make-card/create.vue
index ed69243..d90df17 100644
--- a/src/pages/make-card/create.vue
+++ b/src/pages/make-card/create.vue
@@ -155,8 +155,8 @@ const onSubmit = async () => {
       title: "提交成功",
       icon: "none"
     })
-    uni.$emit("make-card:update")
     formRef.value.resetFields()
+    uni.$emit('refresh')
     uni.navigateBack()
   } catch (error) {
     console.log(error)
diff --git a/src/pages/make-card/list.vue b/src/pages/make-card/list.vue
index a0ed102..fffe6c9 100644
--- a/src/pages/make-card/list.vue
+++ b/src/pages/make-card/list.vue
@@ -101,8 +101,9 @@ const { tabIndex, getMescroll, scrollToLastY } = useMescrollMore(
 )
 
 onLoad(() => {
-  uni.$on('make-card:update', () => {
-    getMescroll(0).resetUpScroll()
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
   })
 })
 
diff --git a/src/pages/overtime/create.vue b/src/pages/overtime/create.vue
index 02cfa5b..8cd4360 100644
--- a/src/pages/overtime/create.vue
+++ b/src/pages/overtime/create.vue
@@ -176,6 +176,7 @@ const onSubmit = async () => {
       icon: "none"
     })
     formRef.value.resetFields()
+    uni.$emit('refresh')
     uni.navigateBack()
   } catch (error) {
     console.log(error)
diff --git a/src/pages/overtime/list.vue b/src/pages/overtime/list.vue
index 386033e..e15123e 100644
--- a/src/pages/overtime/list.vue
+++ b/src/pages/overtime/list.vue
@@ -72,7 +72,7 @@
 <script setup>
 import CuNavbar from '@/components/cu-navbar/index'
 import { ref } from 'vue'
-import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
 import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import MescrollItem from '@/components/mescroll-api/more.vue'
 import statusFun from "@/utils/status"
@@ -101,6 +101,13 @@ const { tabIndex, getMescroll, scrollToLastY } = useMescrollMore(
   onPageScroll,
   onReachBottom
 )
+onLoad(() => {
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
+  })
+})
+
 const goPath = (url) => {
   uni.navigateTo({
     url,
diff --git a/src/pages/revert/index.vue b/src/pages/revert/index.vue
index 39787e1..ca87b50 100644
--- a/src/pages/revert/index.vue
+++ b/src/pages/revert/index.vue
@@ -271,13 +271,8 @@ const onSubmit = async () => {
       data: params,
     })
     .then((res) => {
-      uni.$emit('revert:submit', res)
-      getData()
-      uni.showToast({
-        title: '提交成功',
-        duration: 2000,
-        icon: 'none',
-      })
+      uni.$emit('refresh')
+      uni.navigateBack()
     })
 }
 
diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue
index 85a7fb7..adeb6d1 100644
--- a/src/pages/task/index.vue
+++ b/src/pages/task/index.vue
@@ -67,7 +67,7 @@
 <script setup>
 import CuNavbar from '@/components/cu-navbar/index'
 import { computed, reactive, ref } from 'vue'
-import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
 import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import MescrollItem from '@/components/mescroll-api/more.vue'
 import statusFun from '@/utils/status'
@@ -98,6 +98,13 @@ const tabList = ref([
   },
 ])
 
+onLoad(() => {
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
+  })
+})
+
 const tabChange = ({ index }) => {
   tabIndex.value = index
   scrollToLastY()
diff --git a/src/pages/task/task_hygienes_submit.vue b/src/pages/task/task_hygienes_submit.vue
index 8be991c..71813a7 100644
--- a/src/pages/task/task_hygienes_submit.vue
+++ b/src/pages/task/task_hygienes_submit.vue
@@ -117,7 +117,7 @@ const onSubmit = async () => {
       icon: 'none',
     })
     formRef.value.resetFields()
-    uni.$emit('task:submit')
+    uni.$emit('refresh')
     uni.navigateBack()
   } catch (error) {
     console.log(error)
diff --git a/src/pages/work/create.vue b/src/pages/work/create.vue
index b8bf1d6..f4bef55 100644
--- a/src/pages/work/create.vue
+++ b/src/pages/work/create.vue
@@ -282,7 +282,7 @@ const onSubmit = async () => {
       icon: 'none',
     })
     formRef.value.resetFields()
-    uni.$emit('work:submit')
+    uni.$emit('refresh')
     uni.navigateBack()
   } catch (error) {
     console.log(error)
diff --git a/src/pages/work/list.vue b/src/pages/work/list.vue
index 4d4629c..c58ab2e 100644
--- a/src/pages/work/list.vue
+++ b/src/pages/work/list.vue
@@ -89,10 +89,9 @@
 <script setup>
 import CuNavbar from '@/components/cu-navbar/index'
 import { ref } from 'vue'
-import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
 import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js'
 import MescrollItem from '@/components/mescroll-api/more.vue'
-import { onLoad } from '@dcloudio/uni-app'
 import statusFun from '@/utils/status'
 import ListItem from '@/components/list-item/index'
 
@@ -126,8 +125,10 @@ const { tabIndex, getMescroll, scrollToLastY } = useMescrollMore(
 )
 
 onLoad(() => {
-  uni.$on('work:submit', () => {
-    getMescroll(tabIndex.value).resetUpScroll()
+  uni.$on('refresh', () => {
+    mescrollItem0?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem1?.value?.getMescroll()?.resetUpScroll()
+    mescrollItem2?.value?.getMescroll()?.resetUpScroll()
   })
 })