ldeyun/jeecgBootUniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into minJeecg

Browse Source 
# Conflicts:
#	src/pages-bpm/leaveApplication/index.vue
#	src/pages-process/components/myTask.vue
This commit is contained in:
lagos 2025-05-27 14:51:09 +08:00
commit 16ecf59e80
32 changed files with 235 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env/.env.development vendored
View File

@ -4,5 +4,5 @@ NODE_ENV = 'development'
VITE_DELETE_CONSOLE = false
# 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true
VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'

14
pages.config.ts
View File

@ -33,16 +33,16 @@ export default defineUniPages({
text: '首页',
},
{
"iconPath": "static/tabbar/tabbar-produce.png",
"selectedIconPath": "static/tabbar/tabbar-produce-2.png",
"pagePath": "pages/produce/index",
"iconPath": "static/tabbar/tabbar-production.png",
"selectedIconPath": "static/tabbar/tabbar-production-2.png",
"pagePath": "pages/production/index",
"text": "生产"
},
{
iconPath: 'static/tabbar/tabbar-workHome-2.png',
selectedIconPath: 'static/tabbar/tabbar-workHome.png',
pagePath: 'pages/workHome/index',
text: '工作台',
iconPath: 'static/tabbar/tabbar-operation.png',
selectedIconPath: 'static/tabbar/tabbar-operation-2.png',
pagePath: 'pages/operation/index',
text: '经营',
},
{
iconPath: 'static/tabbar/tabbar-user-2.png',

2
src/api/pages/file/index.ts
View File

@ -26,7 +26,7 @@ export function querySuperiorSystemApi(config : Object) { // 上级制度
export function queryFactorySystemApi(config : Object) { // 厂级制度
return http({
url: '/cxczd/cxcZdgl/list',
url: '/cxczd/cxcZdgl/zsList',
method: 'GET',
data: config
})

0
src/api/produce/index.ts → src/api/production/index.ts
View File

110
src/pages-bpm/leaveApplication/index.vue
View File

@ -1,5 +1,6 @@
<template>
<wd-cell-group border>
<wd-cell-group>
<wd-cell title="申请信息" value="历史查询" size="large" clickable @click="onClick"/>
<wd-cell title="职工姓名" :value="info.username_dictText" />
<wd-cell title="所属单位" :value="info.sysOrgCode_dictText" />
<wd-cell title="联系方式" :value="info.phone" />
@ -10,84 +11,55 @@
<wd-cell title="出发地" :value="info.departure" />
<wd-cell title="目的地" :value="info.destination" />
<wd-cell title="请假原因" :value="info.reason" />
<wd-cell title="附件" v-if="info.path&&info.path.length>0">
<template v-for="(img, index) in info.path" :key="index">
<wd-cell title="附件" v-if="info.path">
<template v-for="(img, index) in image" :key="index">
<wd-img :width="100" :height="100" :src="img" :enable-preview="true" />
</template>
</wd-cell>
</wd-cell-group>
</template>
<script setup lang="ts">
import {
ref,
onMounted
} from 'vue'
<script setup>
import {
queryByIdApi
} from '@/api/humanResource/absence'
} from '@/api/humanResource/absence'
import {
getEnvBaseUrl,
imgUrl
} from '@/utils/index'
import {
useUserStore
} from '@/store/user'
defineOptions({
name: 'index',
options: {
styleIsolation: 'shared',
},
name: 'index',
options: {
styleIsolation: 'shared',
},
})
const userStore = useUserStore();
const examineleader = ref('')
const imageValue = ref([])
const ifShowFj = ref(false)
const imageStyles = {
width: 64,
height: 64,
border: {
color: "#dce7e1",
width: 2,
style: 'dashed',
radius: '2px'
}
}
const uploadUrl = getEnvBaseUrl() + '/sys/common/upload?appPath=职工请假/' + userStore.userInfo.department + '/' +
userStore.userInfo.realname
const info = ref({})
const image = ref([])
const props = defineProps({
formData: {
type: Object,
default: () => { },
default: () => {},
}
})
const info = ref({})
const onClick = () => {
uni.navigateTo({
url: `/pages-humanResource/absence/index?username=${info.value.username}`
});
}
// 申请信息
const qjQueryById = () => {
console.log(props.formData)
queryByIdApi(props.formData.dataId).then((res) => {
if (res.success) {
if (res.result.records[0].zwmc == '单位专家' || res.result.records[0].zwmc == '基层正职' ||
res.result.records[0].zwmc == '高级主管') {
examineleader.value = '分管领导';
} else {
examineleader.value = '审批领导';
}
info.value = res.result.records[0]
// 构造 imageValue 数组
info.value.path = info.value.path.split(',').map(path => imgUrl(path))
console.log(info)
image.value = info.value.path.split(',').map(path => imgUrl(path))
}
})
}
onMounted(() => {
qjQueryById()
})
</script>
<style lang="scss" scoped>
@ -98,8 +70,8 @@
box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.5);
border-radius: 16rpx;
margin-top: 30rpx;
.title {
font-size: 28rpx;
color: #333333;
@ -111,21 +83,21 @@
display: flex;
justify-content: space-between;
}
.info {
font-size: 28rpx;
margin-bottom: 24rpx;
view {
color: #666666;
}
text {
color: #333333;
}
}
}
.progress {
background: #FFFFFF;
box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.5);
@ -134,26 +106,26 @@
padding: 40rpx 30rpx 16rpx 30rpx;
margin-top: 30rpx;
margin-bottom: 30rpx;
.status {
padding: 4rpx 8rpx;
display: inline-block;
color: #FFFFFF;
font-size: 20rpx;
margin-left: 8rpx;
border-radius: 8rpx;
}
.complete {
background-color: #7AC756;
}
.refuse {
background-color: #FE4600;
}
.title {
font-size: 28rpx;
color: #333333;
@ -162,16 +134,16 @@
background-repeat: no-repeat;
background-position: left bottom;
margin-bottom: 40rpx;
}
// .box:not(:first-child) {
// padding-top: 60rpx;
// }
.box:not(:last-child) {
position: relative;
padding-bottom: 60rpx;
&::before {
position: absolute;
content: ' ';
@ -182,16 +154,16 @@
top: 10rpx;
}
}
.box {
margin-left: 50rpx;
.topic {
position: relative;
font-size: 28rpx;
color: #333333;
&::before {
position: absolute;
content: ' ';
@ -204,7 +176,7 @@
transform: translateY(-50%);
}
}
.name_time {
font-size: 24rpx;
color: #888888;

1
src/pages-humanResource/absence/add.vue
View File

@ -167,7 +167,6 @@
errors
}) => {
if (valid) {
console.log('----',model)
const submitData = {
...model,
type: model.type[model.type.length - 1], // 取最后一级

7
src/pages-humanResource/absence/detail.vue
View File

@ -21,10 +21,11 @@
<wd-cell title="目的地" :value="info.destination" />
<wd-cell title="请假原因" :value="info.reason" />
<wd-cell title="附件" v-if="info.path">
<template v-for="(img, index) in joy" :key="index">
<template v-for="(img, index) in image" :key="index">
<wd-img :width="100" :height="100" :src="img" :enable-preview="true" />
</template>
</wd-cell>
<wd-cell title="流程状态" :value="info.bpmStatus_dictText" />
<wd-cell title="销假时间" :value="info.resumptiontime" v-if="info.resumptiontime && info.bpmStatus == '3'" />
<view v-if="!info.resumptiontime && info.bpmStatus == '3'">
<wd-calendar label="销假时间" prop="resumptiontime" v-model="resumptiontime" :min-date="minDate"/>
@ -58,7 +59,7 @@
const userStore = useUserStore();
const info = ref({})
const path = ref([])
const joy = ref([])
const image = ref([])
const resumptiontime = ref(0)
const minDate = ref(0)
const queryById = (e) => {
@ -66,7 +67,7 @@
if (res.success) {
info.value = res.result.records[0]
minDate.value = dateStringToTimestamp(info.value.begintime)
joy.value = info.value.path.split(',').map(path => imgUrl(path))
image.value = info.value.path.split(',').map(path => imgUrl(path))
}
})
}

65
src/pages-humanResource/absence/index.vue
View File

@ -10,31 +10,37 @@
<template>
<PageLayout navTitle="请假信息">
<wd-card style="margin-top: 10px;">
<view v-show="!username">
<wd-row>
<wd-col :span="12"><uni-title title="所属单位" align="left" type="h5"></uni-title></wd-col>
<wd-col :span="12"><uni-title title="重置" align="right" type="h5" color="#666666"
@click="reset"></uni-title></wd-col>
</wd-row>
<wd-row>
<wd-col :span="24">
<SelectDept label="" v-model="orgCode" @change="queryLeave" rowKey="orgCode" :multiple="false">
</SelectDept>
</wd-col>
</wd-row>
<wd-row>
<wd-col :span="12"><uni-title title="姓名" align="left" type="h5"></uni-title></wd-col>
<wd-col :span="12"><uni-title title="劳动合同号" align="left" type="h5"></uni-title></wd-col>
</wd-row>
<wd-row>
<wd-col :span="12">
<uni-easyinput v-model="realname" placeholder="姓名模糊查询" @change="queryLeave"
@clear="queryLeave" />
</wd-col>
<wd-col :span="12">
<uni-easyinput v-model="contractNumber" placeholder="劳动合同号查询" @change="queryLeave"
@clear="queryLeave" />
</wd-col>
</wd-row>
</view>
<wd-row>
<wd-col :span="12"><uni-title title="所属单位" align="left" type="h5"></uni-title></wd-col>
<wd-col :span="12"><uni-title title="请假时间" align="left" type="h5"></uni-title></wd-col>
<wd-col :span="12"><uni-title title="重置" align="right" type="h5" color="#666666"
@click="reset"></uni-title></wd-col>
</wd-row>
<wd-row>
<wd-col :span="24">
<SelectDept label="" v-model="orgCode" @change="queryLeave" rowKey="orgCode" :multiple="false">
</SelectDept>
</wd-col>
</wd-row>
<wd-row>
<wd-col :span="12"><uni-title title="姓名" align="left" type="h5"></uni-title></wd-col>
<wd-col :span="12"><uni-title title="劳动合同号" align="left" type="h5"></uni-title></wd-col>
</wd-row>
<wd-row>
<wd-col :span="12">
<uni-easyinput v-model="realname" placeholder="姓名模糊查询" @change="queryLeave" @clear="queryLeave" />
</wd-col>
<wd-col :span="12">
<uni-easyinput v-model="contractNumber" placeholder="劳动合同号查询" @change="queryLeave" @clear="queryLeave" />
</wd-col>
</wd-row>
<wd-row>
<wd-col :span="24"><uni-title title="请假时间" align="left" type="h5"></uni-title></wd-col>
@click="reset" v-show="username"></uni-title></wd-col>
</wd-row>
<wd-row>
<wd-col :span="24">
@ -74,17 +80,19 @@
const type = ref('') //图表点击事件 请假类别
const range = ref([]) //日期查询
const timeout = ref(null)
const username = ref('') //用户名
let pageNo = 1
let pageSize = 10
let loading = false
const queryLeave = (e) => {
console.log('----', range.value)
let param = {
sysOrgCode: orgCode.value,
begin: range.value[0],
end: range.value[1],
type: type.value,
// username: username.value,
username: username.value,
realname: realname.value,
contractNumbers: contractNumber.value
}
@ -151,7 +159,6 @@
orgCode.value = ''
range.value = []
type.value = ''
// username.value = ''
realname.value = ''
contractNumber.value = ''
queryLeave()
@ -162,10 +169,14 @@
url: url
});
}
onLoad((options) => {
getList()
if (options.username) {
username.value = options.username
}
queryLeave()
});
onReachBottom(() => {
if (loading) return
queryLeave(1); //下拉刷新传1

1
src/pages-process/components/DynamicLink.vue
View File

@ -37,7 +37,6 @@
})
// 监听 option 变化
watch(() => props.path, (newVal) => {
console.log(newVal)
if (newVal) compName.value = newVal;
//动态加载页面
const comp = modules[`/src/pages-bpm/${compName.value}.vue`]

1
src/pages-process/components/taskDeal.vue
View File

@ -300,7 +300,6 @@
const show1Change = (val, type) => {
let selectUser = val[0]
console.log(selectUser)
switch (type) {
case 'show1':
model.value.entrust = selectUser.username

9
src/pages-process/taskHandle.vue
View File

@ -94,7 +94,6 @@
}
const showNodeInfo= (data,taskId)=>{
console.log(data)
// this.$refs.nodeInfoModel.close();
// this.$refs.nodeInfoModel.showInfo(data,taskId);
}
@ -103,9 +102,7 @@
const eventChannel = proxy.getOpenerEventChannel();
eventChannel.on('taskData',(params)=>{
let useData = JSON.parse(params);
console.log(123)
getProcessNodeInfo({taskId:useData.id}).then(res=>{
console.log(res)
if(res.success){
let data = {
dataId:res.result.dataId,
@ -123,19 +120,14 @@
path.value = tempFormUrl; //url路径
}
})
console.log(useData)
getNodePositionInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
console.log(res)
if (res.success) {
nodePositionInfo.value = res.result
console.log(res)
}
})
getHisInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
console.log(res)
if (res.success) {
console.log(res)
dataSource.value = res.result.records
//查找最后一个，结束时间
completedNum.value = res.result.records.length
@ -153,7 +145,6 @@
'processInstanceId': formData.value.procInsId
})
let url = `${getEnvBaseUrl()}/act/task/traceImage?${params}`;
console.log(url)
return url;
})
</script>

43
src/pages.json
View File

@ -30,16 +30,16 @@
"text": "首页"
},
{
"iconPath": "static/tabbar/tabbar-produce.png",
"selectedIconPath": "static/tabbar/tabbar-produce-2.png",
"pagePath": "pages/produce/index",
"iconPath": "static/tabbar/tabbar-production.png",
"selectedIconPath": "static/tabbar/tabbar-production-2.png",
"pagePath": "pages/production/index",
"text": "生产"
},
{
"iconPath": "static/tabbar/tabbar-workHome-2.png",
"selectedIconPath": "static/tabbar/tabbar-workHome.png",
"pagePath": "pages/workHome/index",
"text": "工作台"
"iconPath": "static/tabbar/tabbar-operation.png",
"selectedIconPath": "static/tabbar/tabbar-operation-2.png",
"pagePath": "pages/operation/index",
"text": "经营"
},
{
"iconPath": "static/tabbar/tabbar-user-2.png",
@ -131,7 +131,16 @@
}
},
{
"path": "pages/produce/index",
"path": "pages/operation/index",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "经营数据"
}
},
{
"path": "pages/production/index",
"type": "page",
"layout": "default",
"style": {
@ -158,39 +167,39 @@
}
},
{
"path": "pages/produce/ribaoshuju/rbsjLsxq",
"path": "pages/production/ribaoshuju/rbsjLsxq",
"type": "page"
},
{
"path": "pages/produce/ribaoshuju/trqRbsj",
"path": "pages/production/ribaoshuju/trqRbsj",
"type": "page"
},
{
"path": "pages/produce/ribaoshuju/yyRbsj",
"path": "pages/production/ribaoshuju/yyRbsj",
"type": "page"
},
{
"path": "pages/produce/shishishuju/aqbjSssj",
"path": "pages/production/shishishuju/aqbjSssj",
"type": "page"
},
{
"path": "pages/produce/shishishuju/gycsSssj",
"path": "pages/production/shishishuju/gycsSssj",
"type": "page"
},
{
"path": "pages/produce/shishishuju/index",
"path": "pages/production/shishishuju/index",
"type": "page"
},
{
"path": "pages/produce/shishishuju/nyxhSssj",
"path": "pages/production/shishishuju/nyxhSssj",
"type": "page"
},
{
"path": "pages/produce/shishishuju/trqSssj",
"path": "pages/production/shishishuju/trqSssj",
"type": "page"
},
{
"path": "pages/produce/shishishuju/ysjSssj",
"path": "pages/production/shishishuju/ysjSssj",
"type": "page"
}
],

118
src/pages/index/index.vue
View File

@ -39,13 +39,31 @@
</swiper>
<wd-row>
<wd-col :span="12" v-for="(item, index) in middleApps" :key="index" @click="goToProcess">
<wd-img :width="50" :height="50" :src="getFileAccessHttpUrl(item.icon)"></wd-img>
<wd-col :span="12" @click="goToProcess">
<wd-img :width="50" :height="50"
:src="getFileAccessHttpUrl('https://static.jeecg.com/upload/test/line2_icon1_1595818065964.png')"></wd-img>
<view class="textBox">
<wd-text :text="item.title"></wd-text>
<wd-text :text="item.subTitle"></wd-text>
<wd-badge :modelValue="badge">
<wd-text text="个人审批"></wd-text>
</wd-badge>
</view>
</wd-col>
<wd-col :span="12" @click="goToProcess">
<wd-img :width="50" :height="50"
:src="getFileAccessHttpUrl('https://static.jeecg.com/upload/test/line2_icon2_1595818070168.png')"></wd-img>
<view class="textBox">
<wd-text text="我发起流程"></wd-text>
</view>
</wd-col>
<!-- <wd-col :span="12" v-for="(item, index) in middleApps" :key="index" @click="goToProcess">
<wd-img :width="50" :height="50" :src="getFileAccessHttpUrl(item.icon)"></wd-img>
<view class="textBox">
<wd-badge modelValue="12">
<wd-text :text="item.title"></wd-text>
</wd-badge>
<wd-text :text="item.subTitle"></wd-text>
</view>
</wd-col> -->
</wd-row>
<view class="serveBox">
@ -67,17 +85,39 @@
</PageLayout>
</template>
<script lang="ts" setup>
import { ref } from 'vue'
import { getFileAccessHttpUrl } from '@/common/uitls'
import { onLoad } from '@dcloudio/uni-app'
import { useToast } from 'wot-design-uni'
import { useRouter } from '@/plugin/uni-mini-router'
<script setup>
import {
ref
} from 'vue'
import {
getFileAccessHttpUrl
} from '@/common/uitls'
import {
onLoad
} from '@dcloudio/uni-app'
import {
useToast
} from 'wot-design-uni'
import {
useRouter
} from '@/plugin/uni-mini-router'
import Grid from '@/components/Grid/Grid.vue'
import { queryCarouselApi, getUserPermissionApi } from '@/api/system'
import { getEnvBaseUrl } from '@/utils/index'
import { useUserStore } from '@/store/user'
import { useAppStore } from '@/store'
import {
queryCarouselApi,
getUserPermissionApi
} from '@/api/system'
import {
getEnvBaseUrl
} from '@/utils/index'
import {
useUserStore
} from '@/store/user'
import {
useAppStore
} from '@/store'
import {
taskListApi
} from '@/api/process'
defineOptions({
name: 'index',
options: {
@ -93,19 +133,22 @@
const usList = ref([])
const osList = ref([])
const msgCount = ref(0)
const dot = ref({ mailHome: false })
const dot = ref({
mailHome: false
})
const userStore = useUserStore()
const appStore = useAppStore()
const badge = ref(0)
const res = wx.getSystemInfoSync();
const statusHeight = res.statusBarHeight; //状态栏高度
const cusnavbarheight = (statusHeight + 30) + "px";
const goPage = (item : any) => {
const goPage = (item) => {
uni.navigateTo({
url: `${item.path}?title=${item.text}`
})
}
const goToProcess = ()=>{
const goToProcess = () => {
uni.navigateTo({
url: '/pages-process/approvalTabbar'
})
@ -113,14 +156,20 @@
const goPageMore = (page) => {
router.replace({ name: 'more', params: { backRouteName: 'index', type: page } })
router.replace({
name: 'more',
params: {
backRouteName: 'index',
type: page
}
})
}
const queryCarousel = () => {
// 轮播图
queryCarouselApi({
zslb: 6
}).then((res : any) => {
}).then((res) => {
if (res.success) {
let arr = res.result.records[0].wenjian.split(',')
carouselList.value = arr.map((item) => {
@ -133,7 +182,7 @@
const queryModule = () => {
getUserPermissionApi({
token: userStore.userInfo.token,
}).then((res : any) => {
}).then((res) => {
if (res.success) {
let data = res.result.menu
data = data.filter(e => e.name == 'APP')[0] //保留APP菜单
@ -161,21 +210,6 @@
})
}
middleApps.value = [
{
icon: 'https://static.jeecg.com/upload/test/line2_icon1_1595818065964.png',
title: '审批',
subTitle: '个人审批',
routeIndex: 'paper',
},
{
icon: 'https://static.jeecg.com/upload/test/line2_icon2_1595818070168.png',
title: '流程',
subTitle: '我发起流程',
routeIndex: 'draft',
},
]
/**
* 获取年月日
*/
@ -187,6 +221,18 @@
return `${y}-${m}-${d}`
}
const queryTaskBadge = () => {
taskListApi().then((res) => {
if (res.success) {
badge.value = res.result.total
}
})
}
onShow(() => {
queryTaskBadge()
})
onLoad(() => {
queryCarousel()
queryModule()

16
src/pages/operation/index.vue Normal file
View File

@ -0,0 +1,16 @@
<route lang="json5" type="page">
{
layout: 'default',
style: {
navigationStyle: 'custom',
navigationBarTitleText: '经营数据',
},
}
</route>
<template>
<PageLayout :navbarShow="false">
<view style="margin: 100px;">
功能正在开发中... 请耐心等待
</view>
</PageLayout>
</template>

8
src/pages/produce/index.vue → src/pages/production/index.vue
View File

@ -40,12 +40,6 @@
<sssjForm></sssjForm>
</scroll-view>
</view>
<view v-show="current === 2">
<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
选项卡2的内容
</scroll-view>
</view>
</view>
</view>
</PageLayout>
@ -68,7 +62,7 @@
watchEffect,
onUnmounted
} from 'vue';
const items = ref(['日报数据', '实时数据', '经营数据'])
const items = ref(['日报数据', '实时数据'])
const current = ref(0)
const res = wx.getSystemInfoSync();
const statusHeight = res.statusBarHeight; //状态栏高度

2
src/pages/produce/ribaoshuju/rbsjLsxq.vue → src/pages/production/ribaoshuju/rbsjLsxq.vue
View File

@ -74,7 +74,7 @@
import {
queryJinriShengchansj,
queryJinriYuanyouShengchansj
} from '@/api/produce';
} from '@/api/production';
import {
formatDate,
getDateAfterDays,

2
src/pages/produce/ribaoshuju/trqRbsj.vue → src/pages/production/ribaoshuju/trqRbsj.vue
View File

@ -92,7 +92,7 @@
queryJinriShengchansj,
queryYearShengchansj,
queryJinriTrqShengchansj
} from '@/api/produce';
} from '@/api/production';
import {
formatDate,
getDateAfterDays

2
src/pages/produce/ribaoshuju/yyRbsj.vue → src/pages/production/ribaoshuju/yyRbsj.vue
View File

@ -83,7 +83,7 @@
<script setup>
import {
queryJinriYuanyouShengchansj
} from '@/api/produce';
} from '@/api/production';
import {
formatDate,
getDateAfterDays

0
src/pages/produce/shishishuju/aqbjSssj.vue → src/pages/production/shishishuju/aqbjSssj.vue
View File

0
src/pages/produce/shishishuju/gycsSssj.vue → src/pages/production/shishishuju/gycsSssj.vue
View File

2
src/pages/produce/shishishuju/index.vue → src/pages/production/shishishuju/index.vue
View File

@ -7,7 +7,7 @@
queryJinriShengchansj,
queryYearShengchansj,
queryJinriTrqShengchansj
} from '@/api/produce';
} from '@/api/production';
import {
formatDate,
getDateAfterDays

0
src/pages/produce/shishishuju/nyxhSssj.vue → src/pages/production/shishishuju/nyxhSssj.vue
View File

2
src/pages/produce/shishishuju/trqSssj.vue → src/pages/production/shishishuju/trqSssj.vue
View File

@ -76,7 +76,7 @@
import {
queryJldZcList,
queryJldDataByZc
} from '@/api/produce'
} from '@/api/production'
import {
formatDate,
getDateAfterDays

0
src/pages/produce/shishishuju/ysjSssj.vue → src/pages/production/shishishuju/ysjSssj.vue
View File

BIN
src/static/tabbar/tabbar-operation-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
src/static/tabbar/tabbar-operation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
src/static/tabbar/tabbar-produce-2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

BIN
src/static/tabbar/tabbar-produce.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
src/static/tabbar/tabbar-production-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
src/static/tabbar/tabbar-production.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

23
src/types/uni-pages.d.ts vendored
View File

@ -13,18 +13,19 @@ interface NavigateToOptions {
"/pages/onlinePreview/detail" |
"/pages/onlinePreview/onlinePreview" |
"/pages/onlinePreview/onlinePreviewH5" |
"/pages/produce/index" |
"/pages/operation/index" |
"/pages/production/index" |
"/pages/user/people" |
"/pages/workHome/index" |
"/pages/produce/ribaoshuju/rbsjLsxq" |
"/pages/produce/ribaoshuju/trqRbsj" |
"/pages/produce/ribaoshuju/yyRbsj" |
"/pages/produce/shishishuju/aqbjSssj" |
"/pages/produce/shishishuju/gycsSssj" |
"/pages/produce/shishishuju/index" |
"/pages/produce/shishishuju/nyxhSssj" |
"/pages/produce/shishishuju/trqSssj" |
"/pages/produce/shishishuju/ysjSssj" |
"/pages/production/ribaoshuju/rbsjLsxq" |
"/pages/production/ribaoshuju/trqRbsj" |
"/pages/production/ribaoshuju/yyRbsj" |
"/pages/production/shishishuju/aqbjSssj" |
"/pages/production/shishishuju/gycsSssj" |
"/pages/production/shishishuju/index" |
"/pages/production/shishishuju/nyxhSssj" |
"/pages/production/shishishuju/trqSssj" |
"/pages/production/shishishuju/ysjSssj" |
"/pages-home/home/home" |
"/pages-message/chat/chat" |
"/pages-message/contacts/contacts" |
@ -58,7 +59,7 @@ interface NavigateToOptions {
interface RedirectToOptions extends NavigateToOptions {}
interface SwitchTabOptions {
url: "/pages/index/index" | "/pages/produce/index" | "/pages/workHome/index" | "/pages/user/people"
url: "/pages/index/index" | "/pages/production/index" | "/pages/operation/index" | "/pages/user/people"
}
type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;

2
src/uni_modules/cxc-szcx-stationJl-select/components/cxc-szcx-stationJl-select/cxc-szcx-stationJl-select.vue
View File

@ -14,7 +14,7 @@
<script setup>
import {
queryJldZcList
} from '@/api/produce'
} from '@/api/production'
import {
queryMyDeptTreeListApi
} from '@/api/system/department'