Skip to content

M
mocp-uniapp
Commit c9d7df8f by pangchong
Options

feat: 优化调整

parent c8706357
Showing with 306 additions and 131 deletions
src/mocp/components/global-upload/global-upload.vue
......@@ -107,7 +107,7 @@ watch(
{ immediate: true }
)
const getFileList = computed(() => {
return fileList.value.map((item) => {
return fileList.value?.map((item) => {
return { ...item, url: item.fileUrl }
})
})
......
src/pages.json
......@@ -216,6 +216,12 @@
"style": {
"navigationBarTitleText": "客户工程授权人意见"
}
},
{
"path": "pages/modules/mocp/panel/my-toDo/index",
"style": {
"navigationBarTitleText": "我的待办"
}
}
],
"globalStyle": {
......
src/pages/modules/mocp/panel/app-center/index.vue
<template>
<global-page
ref="pageRef"
title="应用中心"
navLeftClick="emit"
@handleLeftClick="handleLeftClick"
......
src/pages/modules/mocp/panel/appraisal-record/constants/list.scss deleted 100644 → 0
.item {
padding: 24rpx;
margin-bottom: 16rpx;
border-radius: 12rpx;
background: linear-gradient(#e6eeff, #ffffff, #ffffff);
&-title {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 16rpx;
border-bottom: 2rpx solid #f4f4f4;
.desc {
display: flex;
align-items: center;
.txt {
color: $mocp-text-5;
font-size: 34rpx;
margin: 0 16rpx;
}
.place {
font-size: 28rpx;
color: $mocp-text-3;
}
}
}
&-content {
padding-top: 16rpx;
font-size: 30rpx;
color: $mocp-text-4;
line-height: 40rpx;
}
}
src/pages/modules/mocp/panel/appraisal-record/edit-rqm-data.vue
<template>
<global-page title="申诉状态" showFooterBtn @handleFooterClick="handleSubmit">
<view class="mocp-form">
<up-form labelPosition="left" labelWidth="auto" :model="formData" :rules="rules" ref="formRef">
<up-form labelPosition="left" labelWidth="auto" :model="formData" ref="formRef">
<up-form-item label="申诉情况" :borderBottom="true">
<global-picker pickAlign="right" dictkey="ar_appealInfo" v-model="formData.appealInfo" clearable :emptyValue="-1"></global-picker>
</up-form-item>
......@@ -55,6 +55,7 @@ const formData = reactive({
// 页面初始化
onShow(() => {
Object.assign(formData, cloneDeep(details.value))
formData.file = JSON.parse(formData.file)
})
//提交表单
const handleSubmit = async () => {
......
src/pages/modules/mocp/panel/appraisal-record/list.vue
......@@ -64,5 +64,5 @@ onUnload(() => {
})
</script>
<style lang="scss" scoped>
@import './constants/list.scss';
@import 'mocpStatic/css/list.scss';
</style>
src/pages/modules/mocp/panel/assign-work/constants/list.scss deleted 100644 → 0
.item {
padding: 24rpx;
margin-bottom: 16rpx;
border-radius: 12rpx;
background: linear-gradient(#e6eeff, #ffffff, #ffffff);
&-title {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 16rpx;
border-bottom: 2rpx solid #f4f4f4;
.left {
display: flex;
align-items: center;
.txt {
color: $mocp-text-5;
font-size: 34rpx;
margin: 0 16rpx;
}
}
.right {
color: $mocp-primary-6;
}
}
&-content {
padding-top: 16rpx;
font-size: 30rpx;
color: $mocp-text-4;
line-height: 40rpx;
}
&-footer {
.label {
display: flex;
align-items: center;
margin-top: 16rpx;
.txt {
margin-left: 16rpx;
}
}
}
}
src/pages/modules/mocp/panel/assign-work/list.vue
......@@ -79,5 +79,5 @@ onUnload(() => {
})
</script>
<style lang="scss" scoped>
@import './constants/list.scss';
@import 'mocpStatic/css/list.scss';
</style>
src/pages/modules/mocp/panel/components/panel-navbar.vue
......@@ -13,7 +13,7 @@
</view>
</view>
<view class="navbar-bottom-list">
<view class="list-item">
<view class="list-item" @tap="goMyToDo">
<image class="list-item-image" src="/static/mocp/image/panel/wddb.png" />
<view class="list-item-msg">
<view class="list-item-title">我的待办</view>
......@@ -40,9 +40,14 @@ import useBaseStore from 'mocp/store/base'
const userStore = useUserStore()
const baseStore = useBaseStore()
const weatherInfo = ref()
//渲染天气信息
uni.$on('sendWeatherInfo', (info) => {
weatherInfo.value = info
})
//跳转我的待办
const goMyToDo = () => {
uni.$mocpJump.navigateTo('/panel/my-toDo/index')
}
</script>
<style lang="scss" scoped>
@import '../constants/panel-navbar.scss';
......
src/pages/modules/mocp/panel/move-decision/constants/list.scss deleted 100644 → 0
.item {
padding: 24rpx;
margin-bottom: 16rpx;
border-radius: 12rpx;
background: linear-gradient(#e6eeff, #ffffff, #ffffff);
&-title {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 16rpx;
border-bottom: 2rpx solid #f4f4f4;
.left {
display: flex;
align-items: center;
}
.right {
display: flex;
align-items: center;
justify-content: space-between;
.txt {
color: $mocp-text-5;
font-size: 28rpx;
margin-left: 16rpx;
}
}
}
&-content {
padding-top: 16rpx;
font-size: 30rpx;
color: $mocp-text-4;
line-height: 40rpx;
}
&-footer {
display: flex;
align-items: center;
justify-content: space-between;
.label {
display: flex;
align-items: center;
margin-top: 16rpx;
.txt {
margin-left: 16rpx;
}
}
}
}
src/pages/modules/mocp/panel/move-decision/list.vue
......@@ -72,5 +72,5 @@ onUnload(() => {
})
</script>
<style lang="scss" scoped>
@import './constants/list.scss';
@import 'mocpStatic/css/list.scss';
</style>
src/pages/modules/mocp/panel/my-toDo/index.vue 0 → 100644
<template>
<global-page title="我的待办">
<up-collapse :border="false" accordion>
<up-collapse-item title="布置工作（2）">
<view class="item" v-for="item in dataList" :key="item.id" @tap="goDetails(item)">
<view class="item-title">
<view class="left">
<custom-state :value="item.state == 1 ? 'OPEN' : 'CLOSE'"></custom-state>
<view class="txt u-line-1">{{ item.seat }}</view>
</view>
<view class="right u-line-1">{{ baseStore.getParamNameByValue('LayoutWorkType', item.workType) }}</view>
</view>
<view class="item-content u-line-3">
{{ item.taskDescribe }}
</view>
<view class="item-footer">
<view class="label">
<global-icon icon="calendar"></global-icon>
<text class="txt">
{{ timeStampFormat(item.startTime, { format: 'YYYY/MM/DD' }) }}
-
{{ timeStampFormat(item.feedbackTime, { format: 'YYYY/MM/DD' }) }}
</text>
</view>
<view class="label">
<global-icon icon="idcard"></global-icon>
<text class="txt">提出人:{{ item.presenter || '-' }}</text>
</view>
</view>
</view>
</up-collapse-item>
<up-collapse-item title="考核记录（2）">
<view class="item" v-for="item in dataList" :key="item.id" @tap="goDetails(item)">
<view class="item-title">
<view class="left">
<custom-state :value="item.state == 1 ? 'OPEN' : 'CLOSE'"></custom-state>
<view class="txt u-line-1">{{ item.seat }}</view>
</view>
<view class="right u-line-1">{{ baseStore.getParamNameByValue('LayoutWorkType', item.workType) }}</view>
</view>
<view class="item-content u-line-3">
{{ item.taskDescribe }}
</view>
<view class="item-footer">
<view class="label">
<global-icon icon="calendar"></global-icon>
<text class="txt">
{{ timeStampFormat(item.startTime, { format: 'YYYY/MM/DD' }) }}
-
{{ timeStampFormat(item.feedbackTime, { format: 'YYYY/MM/DD' }) }}
</text>
</view>
<view class="label">
<global-icon icon="idcard"></global-icon>
<text class="txt">提出人:{{ item.presenter || '-' }}</text>
</view>
</view>
</view>
</up-collapse-item>
<up-collapse-item title="运行决策（2）">运行决策</up-collapse-item>
<up-collapse-item title="技术评估（2）">技术评估</up-collapse-item>
</up-collapse>
</global-page>
</template>
<script setup>
import { ref } from 'vue'
import useBaseStore from 'mocp/store/base'
import { timeStampFormat } from 'mocp/utils/tool'
const baseStore = useBaseStore()
const dataList = ref([
{
addressee: '[""]',
appType: '',
arrangeWorkExtendList: [
{
appType: '',
approvalContent: '',
approvalFile: '',
approvalFileVoList: [],
approvalTime: 0.0,
approvalUser: '',
approvalUserId: null,
baseApprovalLeader: '',
company: '116133',
companyFullName: '海南海航迎宾馆有限公司',
createTime: 1720768765000,
current: '',
decompose: '',
eventType: '',
feedbackState: '1',
feedbackTime: 0.0,
feedbackUser: '',
file: '',
fileVoList: [],
followUpFeedback: '',
followUpFeedbackContent: '',
followUpFeedbackFile: '',
followUpFeedbackFileVoList: [],
followUpFeedbackTime: 0.0,
followUpFeedbackUser: '',
followUpFeedbackUserId: null,
gzApprovalComments: '',
gzApprovalContent: '',
gzApprovalTime: 0.0,
gzApprovalUser: '',
gzApprovalUserId: null,
gzFeedbackContent: '',
gzFeedbackTime: 0.0,
gzFeedbackUser: '',
gzFeedbackUserId: null,
id: '1811661626631987201',
leaderApprovalComments: '',
mcdApprovalLeader: '',
pcTime: 0.0,
problem: '',
tag: '0',
trackingPoints: '',
validateCloseTime: 0.0,
validateCloseUser: '',
validateCloseUserId: null,
validateFile: '',
validateFileVoList: [],
validateState: '1',
validateType: '',
workId: '1811661626093338624',
workTarget: ''
}
],
company: '116133',
createTime: 1720768765000,
createUser: '专家20',
createUserId: '32815',
del: '0',
emailTime: 0.0,
endTime: 0.0,
feedback: '1',
feedbackState: '',
feedbackTime: 1720768719000,
followUpFeedback: '',
id: '1811661626093338624',
leaderApprovalComments: '',
pcTime: 0.0,
presenter: '专家20',
presenterId: '32815',
reply: '[[]]',
seat: '测试席位1',
startTime: 1720768719000,
state: '1',
tag: '',
taskDescribe: '测试',
taskFile: '',
taskFileVoList: [],
updateTime: 1720768765000,
updateUser: '专家20',
updateUserId: '32815',
validateState: '',
validateType: '',
workType: '1',
workbench: ''
},
{
addressee: '[""]',
appType: '',
arrangeWorkExtendList: [
{
appType: '',
approvalContent: '',
approvalFile: '',
approvalFileVoList: [],
approvalTime: 0.0,
approvalUser: '',
approvalUserId: null,
baseApprovalLeader: '',
company: '116133',
companyFullName: '海南海航迎宾馆有限公司',
createTime: 1720768765000,
current: '',
decompose: '',
eventType: '',
feedbackState: '1',
feedbackTime: 0.0,
feedbackUser: '',
file: '',
fileVoList: [],
followUpFeedback: '',
followUpFeedbackContent: '',
followUpFeedbackFile: '',
followUpFeedbackFileVoList: [],
followUpFeedbackTime: 0.0,
followUpFeedbackUser: '',
followUpFeedbackUserId: null,
gzApprovalComments: '',
gzApprovalContent: '',
gzApprovalTime: 0.0,
gzApprovalUser: '',
gzApprovalUserId: null,
gzFeedbackContent: '',
gzFeedbackTime: 0.0,
gzFeedbackUser: '',
gzFeedbackUserId: null,
id: '1811661626631987201',
leaderApprovalComments: '',
mcdApprovalLeader: '',
pcTime: 0.0,
problem: '',
tag: '0',
trackingPoints: '',
validateCloseTime: 0.0,
validateCloseUser: '',
validateCloseUserId: null,
validateFile: '',
validateFileVoList: [],
validateState: '1',
validateType: '',
workId: '1811661626093338624',
workTarget: ''
}
],
company: '116133',
createTime: 1720768765000,
createUser: '专家20',
createUserId: '32815',
del: '0',
emailTime: 0.0,
endTime: 0.0,
feedback: '1',
feedbackState: '',
feedbackTime: 1720768719000,
followUpFeedback: '',
id: '1811661626093338624',
leaderApprovalComments: '',
pcTime: 0.0,
presenter: '专家20',
presenterId: '32815',
reply: '[[]]',
seat: '测试席位1',
startTime: 1720768719000,
state: '1',
tag: '',
taskDescribe: '测试',
taskFile: '',
taskFileVoList: [],
updateTime: 1720768765000,
updateUser: '专家20',
updateUserId: '32815',
validateState: '',
validateType: '',
workType: '1',
workbench: ''
}
])
</script>
<style lang="scss" scoped>
@import 'mocpStatic/css/list.scss';
.item:last-child {
margin-bottom: 0;
}
:deep(.u-collapse-item) {
margin-bottom: 16rpx;
.u-cell__body {
background: #fff;
padding: 24rpx !important;
}
.u-cell__title {
color: $mocp-text-5;
font-size: 34rpx;
}
}
</style>
src/pages/modules/mocp/panel/technology-evaluation/list.vue
......@@ -77,5 +77,5 @@ onUnload(() => {
})
</script>
<style lang="scss" scoped>
@import './constants/list.scss';
@import 'mocpStatic/css/list.scss';
</style>
src/pages/modules/mocp/panel/technology-evaluation/constants/list.scss → src/static/mocp/css/list.scss
......@@ -9,16 +9,30 @@
justify-content: space-between;
padding-bottom: 16rpx;
border-bottom: 2rpx solid #f4f4f4;
.desc {
display: flex;
align-items: center;
.txt {
color: $mocp-text-5;
font-size: 34rpx;
margin: 0 16rpx;
}
.place {
font-size: 28rpx;
color: $mocp-text-3;
}
}
.left {
display: flex;
align-items: center;
.txt {
color: $mocp-text-5;
font-size: 34rpx;
margin-left: 16rpx;
margin: 0 16rpx;
}
}
.right {
color: $mocp-primary-6;
display: flex;
align-items: center;
justify-content: space-between;
......@@ -36,9 +50,6 @@
line-height: 40rpx;
}
&-footer {
display: flex;
align-items: center;
justify-content: space-between;
.label {
display: flex;
align-items: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment