Merge branch 'zxrapp' into 'master'
Zxrapp See merge request cxcxt/jeecguniapp!16
This commit is contained in:
张 祥瑞
commit
9bc0f8da15
@ -80,18 +80,24 @@
|
||||
"@tanstack/query-core": "^5.76.0",
|
||||
"@tanstack/vue-query": "^5.62.16",
|
||||
"@vant/area-data": "^2.0.0",
|
||||
"@vue/devtools-api": "^7.7.6",
|
||||
"@vue/devtools-kit": "^7.7.6",
|
||||
"@vue/devtools-shared": "^7.7.6",
|
||||
"abortcontroller-polyfill": "^1.7.8",
|
||||
"base-64": "^1.0.0",
|
||||
"birpc": "^2.3.0",
|
||||
"charenc": "^0.0.2",
|
||||
"crypt": "^0.0.2",
|
||||
"dayjs": "1.11.10",
|
||||
"echarts": "^5.6.0",
|
||||
"fs-extra": "^11.3.0",
|
||||
"hookable": "^5.5.3",
|
||||
"is-buffer": "^2.0.5",
|
||||
"js-base64": "^3.6.1",
|
||||
"lodash": "^4.17.21",
|
||||
"lodash-es": "^4.17.21",
|
||||
"md5": "^2.3.0",
|
||||
"perfect-debounce": "^1.0.0",
|
||||
"pinia": "2.0.36",
|
||||
"pinia-plugin-persistedstate": "3.2.1",
|
||||
"qs": "6.5.3",
|
||||
|
||||
@ -68,12 +68,24 @@ importers:
|
||||
'@vant/area-data':
|
||||
specifier: ^2.0.0
|
||||
version: 2.0.0
|
||||
'@vue/devtools-api':
|
||||
specifier: ^7.7.6
|
||||
version: 7.7.6
|
||||
'@vue/devtools-kit':
|
||||
specifier: ^7.7.6
|
||||
version: 7.7.6
|
||||
'@vue/devtools-shared':
|
||||
specifier: ^7.7.6
|
||||
version: 7.7.6
|
||||
abortcontroller-polyfill:
|
||||
specifier: ^1.7.8
|
||||
version: 1.7.8
|
||||
base-64:
|
||||
specifier: ^1.0.0
|
||||
version: 1.0.0
|
||||
birpc:
|
||||
specifier: ^2.3.0
|
||||
version: 2.3.0
|
||||
charenc:
|
||||
specifier: ^0.0.2
|
||||
version: 0.0.2
|
||||
@ -89,6 +101,9 @@ importers:
|
||||
fs-extra:
|
||||
specifier: ^11.3.0
|
||||
version: 11.3.0
|
||||
hookable:
|
||||
specifier: ^5.5.3
|
||||
version: 5.5.3
|
||||
is-buffer:
|
||||
specifier: ^2.0.5
|
||||
version: 2.0.5
|
||||
@ -104,6 +119,9 @@ importers:
|
||||
md5:
|
||||
specifier: ^2.3.0
|
||||
version: 2.3.0
|
||||
perfect-debounce:
|
||||
specifier: ^1.0.0
|
||||
version: 1.0.0
|
||||
pinia:
|
||||
specifier: 2.0.36
|
||||
version: 2.0.36(typescript@5.7.2)(vue@3.4.21(typescript@5.7.2))
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
import { http } from '@/utils/http';
|
||||
|
||||
|
||||
/*通过id查询请假数据*/
|
||||
export function queryByIdApi(id : string) {
|
||||
return http({
|
||||
url: '/cxcbgjjwxsq/cxcBgjjwxsq/queryByIdForApp',//填写表单的queryById请求地址
|
||||
method: 'GET',
|
||||
data: { id }
|
||||
})
|
||||
}
|
||||
11
src/api/SuperiorSystem/bpmApi/index.ts
Normal file
11
src/api/SuperiorSystem/bpmApi/index.ts
Normal file
@ -0,0 +1,11 @@
|
||||
import { http } from '@/utils/http';
|
||||
|
||||
|
||||
/*通过id查询数据*/
|
||||
export function queryByIdApi(id : string) {
|
||||
return http({
|
||||
url: '/cxcjyglsjzdgl/cxcJyglSjzdgl/queryByIdForAPP',//填写表单的queryById请求地址
|
||||
method: 'GET',
|
||||
data: { id }
|
||||
})
|
||||
}
|
||||
11
src/api/lawsAndRegulations/bpmApi/index.ts
Normal file
11
src/api/lawsAndRegulations/bpmApi/index.ts
Normal file
@ -0,0 +1,11 @@
|
||||
import { http } from '@/utils/http';
|
||||
|
||||
|
||||
/*通过id查询请假数据*/
|
||||
export function queryByIdApi(id : string) {
|
||||
return http({
|
||||
url: '/cxcoaflgf/cxcOaFlgf/queryByIdForApp',//填写表单的queryById请求地址
|
||||
method: 'GET',
|
||||
data: { id }
|
||||
})
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
<template>
|
||||
<wd-cell-group title="申请信息">
|
||||
|
||||
<wd-cell title="申请人" :value="info.name" />
|
||||
<wd-cell title="申请时间" :value="info.sqtime" />
|
||||
<wd-cell title="申请单位" :value="info.sqdw_dictText" />
|
||||
<wd-cell title="设备类型" :value="info.sblx" />
|
||||
<wd-cell title="设备型号" :value="info.sbxh" />
|
||||
<wd-cell title="数量" :value="info.sbsl" />
|
||||
<wd-cell title="维修类型" :value="info.wxlx" />
|
||||
<wd-cell title="故障现象" />
|
||||
<wd-textarea title="" v-model="info.gzxx" readonly/>
|
||||
<wd-cell title="维修内容" />
|
||||
<wd-textarea title="维修内容" v-model="info.wxnr" readonly/>
|
||||
</wd-cell-group>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
queryByIdApi
|
||||
} from '@/api/OfficeEquipmentMaintenanceApplication/bpmApi'
|
||||
|
||||
const info = ref({})
|
||||
const image = ref([])
|
||||
const gzxxvalue = ref('')//故障现象
|
||||
const wxnrvalue = ref('')//维修内容
|
||||
const props = defineProps({
|
||||
formData: {
|
||||
type: Object,
|
||||
default: () => {},
|
||||
}
|
||||
})
|
||||
|
||||
// 申请信息
|
||||
const QueryById = () => {
|
||||
queryByIdApi(props.formData.dataId).then((res) => {
|
||||
console.log("res----------------",res)
|
||||
if (res.success) {
|
||||
info.value = res.result.records[0]
|
||||
// gzxxvalue= res.result.gzxx
|
||||
// wxnrvalue= res.result.wxnr
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
QueryById()
|
||||
})
|
||||
</script>
|
||||
56
src/pages-bpm/SuperiorSystem/index.vue
Normal file
56
src/pages-bpm/SuperiorSystem/index.vue
Normal file
@ -0,0 +1,56 @@
|
||||
<template>
|
||||
<wd-cell-group title="申请信息">
|
||||
|
||||
<!-- <wd-cell title="制度名称" :value="info.zdmc" /> -->
|
||||
<wd-cell title="制度名称" :value="info.sszd">
|
||||
<view style="color: blue;"
|
||||
@click="onlinePreview(`/pages/onlinePreview/detail?data=${info.sszd}`)">
|
||||
{{info.zdmc}}
|
||||
</view>
|
||||
</wd-cell>
|
||||
<wd-cell title="制度类型" :value="info.ssywlx_dictText" />
|
||||
<wd-cell title="制定部门" :value="info.sbbm_dictText" />
|
||||
<wd-cell title="发文字号" :value="info.wh" />
|
||||
<wd-cell title="发文时间" :value="info.fatime" />
|
||||
|
||||
</wd-cell-group>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
queryByIdApi
|
||||
} from '@/api/SuperiorSystem/bpmApi'
|
||||
|
||||
const info = ref({})
|
||||
const image = ref([])
|
||||
const gzxxvalue = ref('')//故障现象
|
||||
const wxnrvalue = ref('')//维修内容
|
||||
const props = defineProps({
|
||||
formData: {
|
||||
type: Object,
|
||||
default: () => {},
|
||||
}
|
||||
})
|
||||
|
||||
const onlinePreview = (url) => {
|
||||
uni.navigateTo({
|
||||
url
|
||||
})
|
||||
}
|
||||
|
||||
// 申请信息
|
||||
const QueryById = () => {
|
||||
queryByIdApi(props.formData.dataId).then((res) => {
|
||||
console.log("res----------------",res)
|
||||
if (res.success) {
|
||||
info.value = res.result.records[0]
|
||||
// gzxxvalue= res.result.gzxx
|
||||
// wxnrvalue= res.result.wxnr
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
QueryById()
|
||||
})
|
||||
</script>
|
||||
59
src/pages-bpm/lawsAndRegulations/index.vue
Normal file
59
src/pages-bpm/lawsAndRegulations/index.vue
Normal file
@ -0,0 +1,59 @@
|
||||
<template>
|
||||
<wd-cell-group title="审批信息">
|
||||
|
||||
<!-- <wd-cell title="制度名称" :value="info.zdmc" /> -->
|
||||
<wd-cell title="法律法规名称" :value="info.flfgmc">
|
||||
<view style="color: blue;"
|
||||
@click="onlinePreview(`/pages/onlinePreview/detail?data=${info.mingcheng}`)">
|
||||
{{info.flfgmc}}
|
||||
</view>
|
||||
</wd-cell>
|
||||
<wd-cell title="颁布部门" :value="info.fabubumen" />
|
||||
<wd-cell title="法律法规类型" :value="info.flfgfl_dictText" />
|
||||
<wd-cell title="实施日期" :value="info.shishiriqi" />
|
||||
<wd-cell title="最新修订日期" :value="info.zxxdrq" />
|
||||
<wd-cell title="适用条款" />
|
||||
<wd-textarea v-model="info.sytk" readonly/>
|
||||
<wd-cell title="识别人" :value="info.sbr" />
|
||||
|
||||
</wd-cell-group>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
queryByIdApi
|
||||
} from '@/api/lawsAndRegulations/bpmApi'
|
||||
|
||||
const info = ref({})
|
||||
const image = ref([])
|
||||
const gzxxvalue = ref('')//故障现象
|
||||
const wxnrvalue = ref('')//维修内容
|
||||
const props = defineProps({
|
||||
formData: {
|
||||
type: Object,
|
||||
default: () => {},
|
||||
}
|
||||
})
|
||||
|
||||
const onlinePreview = (url) => {
|
||||
uni.navigateTo({
|
||||
url
|
||||
})
|
||||
}
|
||||
|
||||
// 申请信息
|
||||
const QueryById = () => {
|
||||
queryByIdApi(props.formData.dataId).then((res) => {
|
||||
console.log("res----------------",res)
|
||||
if (res.success) {
|
||||
info.value = res.result.records[0]
|
||||
// gzxxvalue= res.result.gzxx
|
||||
// wxnrvalue= res.result.wxnr
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
QueryById()
|
||||
})
|
||||
</script>
|
||||
@ -22,8 +22,7 @@
|
||||
"fontSize": "11px",
|
||||
"iconWidth": "24px",
|
||||
"spacing": "3px",
|
||||
"list": [
|
||||
{
|
||||
"list": [{
|
||||
"iconPath": "static/tabbar/tabbar-home-2.png",
|
||||
"selectedIconPath": "static/tabbar/tabbar-home.png",
|
||||
"pagePath": "pages/index/index",
|
||||
@ -49,8 +48,7 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "pages/login/login",
|
||||
"type": "home",
|
||||
"style": {
|
||||
@ -217,24 +215,20 @@
|
||||
"type": "page"
|
||||
}
|
||||
],
|
||||
"subPackages": [
|
||||
{
|
||||
"subPackages": [{
|
||||
"root": "pages-home",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "home/home",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
"style": {
|
||||
"navigationBarTitleText": ""
|
||||
}
|
||||
}
|
||||
]
|
||||
}]
|
||||
},
|
||||
{
|
||||
"root": "pages-message",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "chat/chat",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -275,8 +269,7 @@
|
||||
},
|
||||
{
|
||||
"root": "pages-user",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "userEdit/userEdit",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -284,13 +277,11 @@
|
||||
"navigationBarTitleText": "",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
]
|
||||
}]
|
||||
},
|
||||
{
|
||||
"root": "pages-work",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "dragPage/index",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -330,8 +321,7 @@
|
||||
},
|
||||
{
|
||||
"root": "pages-sub",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "online/online",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -362,8 +352,7 @@
|
||||
},
|
||||
{
|
||||
"root": "pages-operate",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "file/detail",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -394,8 +383,7 @@
|
||||
},
|
||||
{
|
||||
"root": "pages-humanResource",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "absence/add",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -456,8 +444,7 @@
|
||||
},
|
||||
{
|
||||
"root": "pages-integrated",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "duty/index",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -465,13 +452,11 @@
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTitleText": "干部值班"
|
||||
}
|
||||
}
|
||||
]
|
||||
}]
|
||||
},
|
||||
{
|
||||
"root": "pages-politics",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "health/add",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -479,13 +464,11 @@
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTitleText": "健康填报"
|
||||
}
|
||||
}
|
||||
]
|
||||
}]
|
||||
},
|
||||
{
|
||||
"root": "pages-process",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "approvalTabbar",
|
||||
"type": "page",
|
||||
"layout": "default",
|
||||
@ -516,8 +499,7 @@
|
||||
},
|
||||
{
|
||||
"root": "pages-bpm",
|
||||
"pages": [
|
||||
{
|
||||
"pages": [{
|
||||
"path": "carRental/index",
|
||||
"type": "page"
|
||||
},
|
||||
@ -544,6 +526,19 @@
|
||||
{
|
||||
"path": "zbkh/index",
|
||||
"type": "page"
|
||||
},
|
||||
{
|
||||
|
||||
"path": "lawsAndRegulations/index",
|
||||
"type": "page"
|
||||
},
|
||||
{
|
||||
"path": "OfficeEquipmentMaintenanceApplication/index",
|
||||
"type": "page"
|
||||
},
|
||||
{
|
||||
"path": "SuperiorSystem/index",
|
||||
"type": "page"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
6
src/types/uni-pages.d.ts
vendored
6
src/types/uni-pages.d.ts
vendored
@ -56,10 +56,10 @@ interface NavigateToOptions {
|
||||
"/pages-process/approvalTabbar" |
|
||||
"/pages-process/myApplyProcess" |
|
||||
"/pages-process/taskHandle" |
|
||||
"/pages-bpm/carRental/index" |
|
||||
"/pages-bpm/document/index" |
|
||||
"/pages-bpm/khss/index" |
|
||||
"/pages-bpm/lawsAndRegulations/index" |
|
||||
"/pages-bpm/leaveApplication/index" |
|
||||
"/pages-bpm/OfficeEquipmentMaintenanceApplication/index" |
|
||||
"/pages-bpm/SuperiorSystem/index";
|
||||
"/pages-bpm/unconventional/index" |
|
||||
"/pages-bpm/unconventional/stamp" |
|
||||
"/pages-bpm/zbkh/index";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user