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 @@ @@ -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 @@ @@ -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 @@