diff --git a/src/App.vue b/src/App.vue
index 69da161..f9cc09d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,13 +3,9 @@ import { useUserStoreWithOut } from '@/store/modules/user'
export default {
onLaunch: function () {
const userStore = useUserStoreWithOut()
- // if (userStore.isLogin) {
- // userStore.fetchUserInfo()
- // } else {
- // uni.navigateTo({
- // url: '/pages/login/index',
- // })
- // }
+ if (userStore.isLogin) {
+ userStore.fetchUserInfo()
+ }
// #ifdef APP-PLUS
if (userStore.isLogin) {
plus.navigator.closeSplashscreen()
diff --git a/src/pages.json b/src/pages.json
index 4a6d729..7e54840 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -172,6 +172,12 @@
"navigationBarTitleText": "报销管理"
}
},
+ {
+ "path": "detail",
+ "style": {
+ "navigationBarTitleText": "报销详情"
+ }
+ },
{
"path": "submit",
"style": {
diff --git a/src/pages/audits/base-data.vue b/src/pages/audits/base-data.vue
index 69c2836..3d07827 100644
--- a/src/pages/audits/base-data.vue
+++ b/src/pages/audits/base-data.vue
@@ -1,42 +1,47 @@
-
-
-
-
-
-
-
-
- {{ item.value }}
+
-
-
+
+
+
+
+
+
+ {{ item.value }}
+
+
+
@@ -58,14 +63,19 @@ const props = defineProps({
const columsList = computed(() => {
const arr = []
props.colums.forEach((e) => {
- const { dataIndex, format } = e
+ const { dataIndex, format, isShow } = e
let str = getValue(props.data, dataIndex)
+ let show = true
if (isFunction(format)) {
str = format(str)
}
+ if (isFunction(isShow)) {
+ show = isShow(props.data)
+ }
arr.push({
...e,
value: str,
+ show: show,
})
})
return arr
diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js
index f2f66da..9d55b37 100644
--- a/src/pages/audits/data.data.js
+++ b/src/pages/audits/data.data.js
@@ -2,15 +2,15 @@ import { timeFormat } from '@climblee/uv-ui/libs/function'
export default {
//清洁任务
task_hygienes: [
- {
- title: '申请人',
- dataIndex: 'name',
- },
+ // {
+ // title: '申请人',
+ // dataIndex: 'name',
+ // },
{
title: '所属门店',
- dataIndex: 'taskable.store.address',
- borderBottom: false,
- labelPosition: 'top'
+ dataIndex: 'taskable.store.title',
+ // borderBottom: false,
+ // labelPosition: 'top'
},
{
title: '电话号码',
diff --git a/src/pages/audits/log.vue b/src/pages/audits/log.vue
index 7694472..7cc237a 100644
--- a/src/pages/audits/log.vue
+++ b/src/pages/audits/log.vue
@@ -1,12 +1,42 @@
-
+
-
-
- {{ item.check_name }}
- {{ item.check_status_text }}
- {{ item.checked_at }}
-
+
+
+
+
+
+
+
+
+
+ {{ item.check_name }}
+
+ {{ item.check_status_text }}
+
+
+
+
+ {{ timeFormat(item.checked_at, 'yyyy-mm-dd hh:MM:ss') }}
+
+
+
+
@@ -14,13 +44,18 @@
import CuNavbar from '@/components/cu-navbar/index'
import { http } from '@/utils/request'
import { onLoad } from '@dcloudio/uni-app'
-import { ref } from 'vue'
-
+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`, { params: { subject_type: options.type } }).then(res => {
- list.value = res
- })
+ http
+ .get(`/workflow/${options.id}/logs`, {
+ params: { subject_type: options.type },
+ })
+ .then((res) => {
+ list.value = res
+ })
})
diff --git a/src/pages/expense-account/detail.vue b/src/pages/expense-account/detail.vue
new file mode 100644
index 0000000..7e75451
--- /dev/null
+++ b/src/pages/expense-account/detail.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/expense-account/index.vue b/src/pages/expense-account/index.vue
index c43a1f3..db5408f 100644
--- a/src/pages/expense-account/index.vue
+++ b/src/pages/expense-account/index.vue
@@ -19,7 +19,7 @@
@change="tabChange"
>
-
+
-
+
+
+
+
+
-
+
+
+
@@ -48,13 +59,9 @@
diff --git a/src/pages/expense-account/item.vue b/src/pages/expense-account/item.vue
index 5977a09..7fa425d 100644
--- a/src/pages/expense-account/item.vue
+++ b/src/pages/expense-account/item.vue
@@ -1,16 +1,23 @@
-
+
{{ item.type?.name }}
- {{ item.workflow_check?.check_status_text }}
+ {{ item.workflow_check?.check_status_text }}
报销金额
@@ -35,9 +42,20 @@ const emits = defineEmits(['click'])
const props = defineProps({
item: Object,
+ type: String,
+ status: String,
})
const detail = (item) => {
- emits('click', item)
+ let url
+ if (props.type) {
+ url = `/pages/audits/detail?id=${props.item.id}&type=${props.type}`
+ } else {
+ url = `/pages/expense-account/detail?id=${props.item.id}`
+ }
+
+ uni.navigateTo({
+ url: url,
+ })
}
-
\ No newline at end of file
+
diff --git a/src/pages/make-card/create.vue b/src/pages/make-card/create.vue
index ae437ca..0d3f5fc 100644
--- a/src/pages/make-card/create.vue
+++ b/src/pages/make-card/create.vue
@@ -57,6 +57,7 @@
placeholder="请选择日期"
ref="datetimePicker"
mode="datetime"
+ :maxDate="new Date().getTime()"
@confirm="confirmDatePicker"
>
@@ -69,7 +70,7 @@ import { ref, reactive, computed } from "vue"
import { onLoad } from "@dcloudio/uni-app"
import { http } from "@/utils/request"
import { timeFormat } from "@climblee/uv-ui/libs/function/index"
-const columns = [["上班补卡", "上班补卡"]]
+const columns = [["上班补卡", "下班补卡"]]
const formRef = ref(null)
const datetimePicker = ref(null)
const pickerRef = ref(null)
@@ -154,6 +155,7 @@ const onSubmit = async () => {
title: "提交成功",
icon: "none"
})
+ uni.$emit("make-card:update")
formRef.value.resetFields()
uni.navigateBack()
} catch (error) {
diff --git a/src/pages/make-card/list.vue b/src/pages/make-card/list.vue
index 48b50b1..d65406e 100644
--- a/src/pages/make-card/list.vue
+++ b/src/pages/make-card/list.vue
@@ -54,7 +54,7 @@
diff --git a/src/pages/user/detail.vue b/src/pages/user/detail.vue
index 827a9d9..8341c9c 100644
--- a/src/pages/user/detail.vue
+++ b/src/pages/user/detail.vue
@@ -25,7 +25,7 @@
门店
- {{ detail.store.address }}
+ {{ detail.store.title }}
无
diff --git a/src/pages/user/update.vue b/src/pages/user/update.vue
index def630d..5e57dbc 100644
--- a/src/pages/user/update.vue
+++ b/src/pages/user/update.vue
@@ -1,10 +1,6 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
@@ -72,6 +84,12 @@
@confirm="onSubmit"
:showCancelButton="true"
>
+
+
diff --git a/src/pages/work/list.vue b/src/pages/work/list.vue
index cd5054b..7b6519b 100644
--- a/src/pages/work/list.vue
+++ b/src/pages/work/list.vue
@@ -77,7 +77,7 @@ const tabList = ref([
},
{
name: '推荐列表',
- apiUrl: '/hr/promotion/apply',
+ apiUrl: '/hr/promotion/invite',
},
{
name: '审核列表',
@@ -99,7 +99,9 @@ const { tabIndex, getMescroll, scrollToLastY } = useMescrollMore(
)
onLoad(() => {
- uni.$on('work:submit', getMescroll(tabIndex.value))
+ uni.$on('work:submit', ()=>{
+ getMescroll(tabIndex.value).resetUpScroll()
+ })
})
const goPath = (url) => {
diff --git a/src/utils/status.js b/src/utils/status.js
index a71eca2..168d6ec 100644
--- a/src/utils/status.js
+++ b/src/utils/status.js
@@ -139,6 +139,9 @@ const data = {
value: 4,
name: '未完成',
color: '#999999'
+ }],
+ job_text:[{
+
}]
}
export default function (value, status, key) {