Skip to content

9
91isoft_OA
Commit 686f7878 authored by 张伯涛's avatar 张伯涛
Browse files
Options

页面样式初步调整

parent 70f20f9a
Hide whitespace changes
Inline Side-by-side
Showing with 606 additions and 74 deletions
package-lock.json
View file @ 686f7878
{
"requires": true,
"name": "91isoft_oa",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"call-bind": {
"version": "1.0.7",
......@@ -93,6 +95,11 @@
"resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
"integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
},
"moment": {
"version": "2.30.1",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
},
"object-inspect": {
"version": "1.13.1",
"resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz",
......
pages.json
View file @ 686f7878
......@@ -15,9 +15,14 @@
"navigationBarTitleText": "若依移动端框架"
}
}, {
"path": "pages/work/index",
"path": "pages/approval/approval",
"style": {
"navigationBarTitleText": "工作台"
"navigationBarTitleText": "审批"
}
},{
"path": "pages/document/index",
"style": {
"navigationBarTitleText": "单据"
}
}, {
"path": "pages/mine/index",
......@@ -32,7 +37,7 @@
}, {
"path": "pages/classes/classesInfo",
"style": {
"navigationBarTitleText": "班次"
"navigationBarTitleText": "详情"
}
}, {
"path": "pages/mine/avatar/index",
......@@ -90,12 +95,20 @@
"iconPath": "static/images/tabbar/home.png",
"selectedIconPath": "static/images/tabbar/home_.png",
"text": "首页"
}, {
"pagePath": "pages/work/index",
"iconPath": "static/images/tabbar/work.png",
"selectedIconPath": "static/images/tabbar/work_.png",
"text": "工作台"
}, {
},
{
"pagePath": "pages/approval/approval",
"iconPath": "static/images/tabbar/approval.png",
"selectedIconPath": "static/images/tabbar/approval_active.png",
"text": "审批"
},
{
"pagePath": "pages/document/index",
"iconPath": "static/images/tabbar/apply.png",
"selectedIconPath": "static/images/tabbar/apply_active.png",
"text": "单据"
},
{
"pagePath": "pages/mine/index",
"iconPath": "static/images/tabbar/mine.png",
"selectedIconPath": "static/images/tabbar/mine_.png",
......
pages/approval/approval.vue 0 → 100644
View file @ 686f7878
<template>
<view class="container">
<view class="approval">
<uni-segmented-control :current="current" :values="approvalList" @clickItem="onClickItem" styleType="button" activeColor="#007AFF"></uni-segmented-control>
<view class="content">
<view v-show="current === 0" class="approval_content">
<my-apply></my-apply>
</view>
<view v-show="current === 1" class="approval_content">
<my-approval></my-approval>
</view>
<!-- <view v-show="current === 2" class="approval_content">-->
<!-- <my-rejected></my-rejected>-->
<!-- </view>-->
</view>
</view>
</view>
</template>
<script>
import MyApply from'./myapply.vue'
import MyApproval from './myapproval.vue'
import MyRejected from './myrejected.vue'
import UniSegmentedControl
from "../../uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue";
export default {
components:{UniSegmentedControl, MyApproval, MyApply, MyRejected },
data() {
return {
current:0,
approvalList:['待办','已办']
}
},
methods: {
onClickItem(e) {
this.current = e.currentIndex
}
}
}
</script>
<style lang="scss">
.container{
width:100%;
height: 100%;
.approval{
padding: 10px 20px;
margin-bottom: 10px;
.approval_content{
margin-top: 10px;
border-radius: 4px;
}
}
}
</style>
pages/classes/components/myapply.vue → pages/approval/myapply.vue
View file @ 686f7878
......@@ -3,12 +3,12 @@
<uni-swipe-action>
<ul>
<li v-for="(item,index) in myApprovalList" :key="index" class="my_approval_li">
<uni-swipe-action-item @click="bindClick($event,item.businessId)" @change="swipeChange($event, index)">
<view class="my_approval_item">
<h3 class="my_approval_title"><text>[{{item.classesName}}]--{{item.classesName}}</text> <text @click="toNav(item.businessId)" class="approval_title_right">{{'修改'}}</text></h3>
<uni-swipe-action-item :right-options="options" @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
<view class="my_approval_item" @click="toNav(item.businessId)">
<h3 class="my_approval_title"><text>[{{item.type}}]--{{item.name}}</text> <text class="approval_title_right">{{item.stateName}}</text></h3>
<view class="my_approval_info">
<text>{{item.classesName}}</text>
<text class="approval_info_right">{{item.createDate}}</text>
<text>{{item.department}}</text>
<text class="approval_info_right">{{item.time}}</text>
</view>
</view>
</uni-swipe-action-item>
......@@ -20,22 +20,45 @@
</template>
<script>
import {queryAeClassesInfos} from "@/api/system/classes";
export default{
export default{
data() {
return {
myApprovalList:[]
myApprovalList:[{
businessId: 1,
type:"请假",
name:"张三",
reason:"家里有事",
stateName:"待办",
state:'0',
department:"研发部",
time:'2021-10-14',
eventId:'211'
}],
options:[
{
text: '撤回',
style: {
backgroundColor: '#999999'
},
}, {
text: '提醒',
style: {
backgroundColor: '#f0ad4e'
}
}
]
}
},
created() {
this.getQueryAeClassesInfos()
},
methods:{
getQueryAeClassesInfos() {
queryAeClassesInfos().then(res => {
this.myApprovalList = res.data
})
toNav(id) {
uni.navigateTo({
url: `/pages/classes/classesInfo?businessId=${id}`,
success:(res) =>{
},
fail:(err) =>{
console.log(err)
}
});
},
bindClick(e,id) {
if(e.content.text === '撤回'){
......@@ -50,17 +73,7 @@
},
swipeChange(e,index){
},
toNav(id) {
uni.navigateTo({
url: `classesInfo?businessId=${id}`,
success:(res) =>{
},
fail:(err) =>{
console.log(err)
}
});
}
}
}
}
</script>
......
pages/approval/myapproval.vue 0 → 100644
View file @ 686f7878
<template>
<view class="my_approval">
<uni-swipe-action>
<ul>
<li v-for="(item,index) in myApprovalList" :key="index" class="my_approval_li">
<uni-swipe-action-item :right-options="options" @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
<view class="my_approval_item">
<h3 class="my_approval_title"><text>[{{item.type}}]--{{item.name}}</text> <text class="approval_title_right">{{item.stateName}}</text></h3>
<view class="my_approval_info">
<text>{{item.department}}</text>
<text class="approval_info_right">{{item.time}}</text>
</view>
</view>
</uni-swipe-action-item>
</li>
</ul>
</uni-swipe-action>
</view>
</template>
<script>
export default{
data() {
return {
myApprovalList:[{
type:"请假",
name:"张三",
reason:"家里有事",
stateName:"已办",
state:'0',
department:"研发部",
time:'2021-10-14',
eventId:'201'
},{
type:"调休",
name:"李四",
reason:"家里有事",
stateName:"已办",
state:'1',
department:"研发部",
time:'2021-10-14',
eventId:'202'
}],
options:[
{
text: '驳回',
style: {
backgroundColor: '#dd524d'
},
}, {
text: '同意',
style: {
backgroundColor: '#007aff'
}
}
]
}
},
methods:{
bindClick(e,id) {
if(e.content.text === '驳回'){
console.log('驳回')
console.log(id)
}
if(e.content.text === '同意'){
console.log('同意')
console.log(id)
}
},
swipeChange(e,index){
}
}
}
</script>
<style lang="scss">
.my_approval{
.my_approval_li{
margin-bottom: 20rpx;
background: #ffffff;
padding:20rpx;
border-radius: 8rpx;
}
.my_approval_item{
.my_approval_title{
display: flex;
font-size: 14px;
.approval_title_right{
font-size: 13px;
font-weight: 400;
flex: 1;
text-align: right;
color: #007aff;
}
}
.my_approval_info{
height: 60rpx;
line-height: 60rpx;
font-size: 12px;
display: flex;
color: #999;
.approval_info_right{
flex: 1;
text-align: right;
}
}
}
}
</style>
pages/approval/myrejected.vue 0 → 100644
View file @ 686f7878
<template>
<view class="my_approval">
<uni-swipe-action>
<ul>
<li v-for="(item,index) in myApprovalList" :key="index" class="my_approval_li">
<uni-swipe-action-item :right-options="options" @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
<view class="my_approval_item">
<h3 class="my_approval_title"><text>[{{item.type}}]--{{item.name}}</text> <text class="approval_title_right">{{item.stateName}}</text></h3>
<view class="my_approval_info">
<text>{{item.department}}</text>
<text class="approval_info_right">{{item.time}}</text>
</view>
</view>
</uni-swipe-action-item>
</li>
</ul>
</uni-swipe-action>
</view>
</template>
<script>
export default{
data() {
return {
myApprovalList:[{
type:"请假",
name:"张三",
reason:"家里有事",
stateName:"已驳回",
state:'-1',
department:"研发部",
time:'2021-10-14',
eventId:'211'
}],
options:[
{
text: '重新提交',
style: {
backgroundColor: '#4cd964'
},
}
]
}
},
methods:{
bindClick(e,id) {
if(e.content.text === '重新提交'){
console.log(id)
}
},
swipeChange(e,index){
}
}
}
</script>
<style lang="scss">
.my_approval{
.my_approval_li{
margin-bottom: 20rpx;
background: #ffffff;
padding:20rpx;
border-radius: 8rpx;
}
.my_approval_item{
.my_approval_title{
display: flex;
font-size: 14px;
.approval_title_right{
font-size: 13px;
font-weight: 400;
flex: 1;
text-align: right;
color: #dd524d;
}
}
.my_approval_info{
height: 60rpx;
line-height: 60rpx;
font-size: 12px;
display: flex;
color: #999;
.approval_info_right{
flex: 1;
text-align: right;
}
}
}
}
</style>
pages/classes/classesInfo.vue
View file @ 686f7878
......@@ -9,24 +9,30 @@
<uni-forms ref="baseForm" :modelValue="classesForm" label-position="left" label-width="120">
<uni-forms-item label="部门" required>
<uni-data-picker v-model="classesForm.deptId" :map="{value: 'deptId', text: 'deptName'}" :localdata="deptTree" popup-title="请选择部门" @change="onchange"></uni-data-picker>
<text class="beforeValue">部门2</text>
</uni-forms-item>
<uni-forms-item label="产线" required>
<uni-data-picker v-model="classesForm.productId" :map="{value: 'productId', text: 'productName'}" :localdata="productTree" popup-title="请选择产线" @change="onchange"></uni-data-picker>
<text class="beforeValue">产线2</text>
</uni-forms-item>
<uni-forms-item label="是否跨天" required>
<uni-data-checkbox v-model="classesForm.isTwodays" style="float: right;margin-top: 5px;" :localdata="towDayMap"></uni-data-checkbox>
</uni-forms-item>
<uni-forms-item label="开始时间" required>
<uni-datetime-picker type="date" :clear-icon="false" v-model="classesForm.startDate" placeholder="请选择开始时间" />
<text class="beforeValue">2024-03-01</text>
</uni-forms-item>
<uni-forms-item label="结束时间" required>
<uni-datetime-picker type="date" :clear-icon="false" v-model="classesForm.endDate" placeholder="请选择结束时间" />
<text class="beforeValue">2024-03-11</text>
</uni-forms-item>
<uni-forms-item label="权重" required>
<uni-easyinput type="number" disabled v-model="classesForm.weight" placeholder="请输入权重" />
<text class="beforeValue">3</text>
</uni-forms-item>
<uni-forms-item label="版本" required>
<uni-easyinput v-model="classesForm.version" disabled placeholder="请输入版本" />
<text class="beforeValue">2</text>
</uni-forms-item>
</uni-forms>
<button type="primary" @click="submit('baseForm')">提交</button>
......@@ -134,6 +140,10 @@ export default {
<style scoped lang="scss">
.beforeValue{
padding-left: 10px;
color: red;
}
.example {
padding: 15px;
background-color: #fff;
......
pages/classes/index.vue
View file @ 686f7878
<template>
<view class="container">
<view class="approval">
<uni-segmented-control :current="current" :values="approvalList" @clickItem="onClickItem" styleType="button" activeColor="#007AFF"></uni-segmented-control>
<view class="content">
<view v-show="current === 0" class="approval_content">
<my-apply></my-apply>
</view>
<view v-show="current === 1" class="approval_content">
<my-approval></my-approval>
</view>
<view v-show="current === 2" class="approval_content">
<my-rejected></my-rejected>
</view>
</view>
</view>
<view class="my_approval">
<uni-swipe-action>
<ul>
<li v-for="(item,index) in myApprovalList" :key="index" class="my_approval_li">
<uni-swipe-action-item @click="bindClick($event,item.businessId)" @change="swipeChange($event, index)">
<view class="my_approval_item">
<h3 class="my_approval_title"><text>[{{item.classesName}}]--{{item.classesName}}</text> <text @click="toNav(item.businessId)" class="approval_title_right">{{'修改'}}</text></h3>
<view class="my_approval_info">
<text>{{item.classesName}}</text>
<text class="approval_info_right">{{item.createDate}}</text>
</view>
</view>
</uni-swipe-action-item>
</li>
</ul>
</uni-swipe-action>
</view>
</template>
<script>
import MyApply from './components/myapply.vue'
export default {
components:{ MyApply },
import {queryAeClassesInfos} from "@/api/system/classes";
export default{
data() {
return {
current:0,
approvalList:['我的申请','经我审批','已驳回']
myApprovalList:[
{businessId: 1, classesName: 'aaaaa', createDate: ''}
]
}
},
methods: {
onClickItem(e) {
this.current = e.currentIndex
}
created() {
// this.getQueryAeClassesInfos()
},
methods:{
getQueryAeClassesInfos() {
queryAeClassesInfos().then(res => {
this.myApprovalList = res.data
})
},
bindClick(e,id) {
if(e.content.text === '撤回'){
console.log('撤回')
console.log(id)
}
if(e.content.text === '提醒'){
console.log('提醒')
console.log(id)
}
},
swipeChange(e,index){
},
toNav(id) {
uni.navigateTo({
url: `classesInfo?businessId=${id}`,
success:(res) =>{
},
fail:(err) =>{
console.log(err)
}
});
}
}
}
</script>
<style lang="scss">
.container{
width:100%;
height: 100%;
.approval{
padding: 10px 20px;
margin-bottom: 10px;
.approval_content{
margin-top: 10px;
border-radius: 4px;
}
.my_approval{
.my_approval_li{
margin-bottom: 20rpx;
background: #ffffff;
padding:20rpx;
border-radius: 8rpx;
}
.my_approval_item{
.my_approval_title{
display: flex;
font-size: 14px;
.approval_title_right{
font-size: 13px;
font-weight: 400;
flex: 1;
text-align: right;
color: #007aff;
}
}
.my_approval_info{
height: 60rpx;
line-height: 60rpx;
font-size: 12px;
display: flex;
color: #999;
.approval_info_right{
flex: 1;
text-align: right;
}
}
}
}
</style>
pages/document/index.vue 0 → 100644
View file @ 686f7878
<template>
<view class="document_module">
<view class="leave_container">
<view class="leave_title">
<text>单据类型<text class="red-icon">*</text></text>
<view class="leave_con">
<uni-combox :candidates="leaveList" placeholder="请选择单据类型" v-model="form.leave_type"></uni-combox>
</view>
</view>
<view class="leave_title">
<text>开始时间<text class="red-icon">*</text></text>
<view class="leave_con">
<uni-datetime-picker type="date" v-model="form.start_date" />
</view>
</view>
<view class="leave_title">
<text>结束时间<text class="red-icon">*</text></text>
<view class="leave_con">
<uni-datetime-picker type="date" v-model="form.end_date" />
</view>
</view>
<view class="leave_btn">
<button type="primary" @click="submitLeave">搜索</button>
</view >
</view>
<uni-swipe-action>
<ul>
<li v-for="(item,index) in myApprovalList" :key="index" class="my_approval_li">
<uni-swipe-action-item :right-options="options" @click="bindClick($event,item.eventId)" @change="swipeChange($event, index)">
<view class="my_approval_item">
<h3 class="my_approval_title"><text>[{{item.type}}]--{{item.name}}</text> <text class="approval_title_right">{{item.stateName}}</text></h3>
<view class="my_approval_info">
<text>{{item.department}}</text>
<text class="approval_info_right">{{item.time}}</text>
</view>
</view>
</uni-swipe-action-item>
</li>
</ul>
</uni-swipe-action>
</view>
</template>
<script>
export default{
data() {
return {
leaveList: [
'单据类型1',
'单据类型2',
'单据类型3'
],
form:{
leave_type: '',
start_date:'',
end_date:'',
},
value: 1,
range: [
{ value: 0, text: "篮球" },
{ value: 1, text: "足球" },
{ value: 2, text: "游泳" },
],
myApprovalList:[{
type:"请假",
name:"张三",
reason:"家里有事",
stateName:"待办",
state:'0',
department:"研发部",
time:'2021-10-14',
eventId:'211'
}],
options:[
{
text: '撤回',
style: {
backgroundColor: '#999999'
},
}, {
text: '提醒',
style: {
backgroundColor: '#f0ad4e'
}
}
]
}
},
methods:{
bindClick(e,id) {
if(e.content.text === '撤回'){
console.log('撤回')
console.log(id)
}
if(e.content.text === '提醒'){
console.log('提醒')
console.log(id)
}
},
swipeChange(e,index){
}
}
}
</script>
<style lang="scss">
.document_module{
padding: 10px 20px;
.leave_container {
margin-bottom: 10px;
.leave_title {
display: flex;
align-items: center;
background:#ffffff;
padding: 10px 20px;
margin-bottom: 10px;
.red-icon {
color: red;
padding-right: 20px;
}
.leave_con{
flex:1;
.leave_all_time{
padding-left: 20px;
}
}
}
.leave_btn{
margin-top: 10px;
//padding:0 20px;
}
}
.my_approval_li{
margin-bottom: 20rpx;
background: #ffffff;
padding:20rpx;
border-radius: 8rpx;
}
.my_approval_item{
.my_approval_title{
display: flex;
font-size: 14px;
.approval_title_right{
font-size: 13px;
font-weight: 400;
flex: 1;
text-align: right;
color: #007aff;
}
}
.my_approval_info{
height: 60rpx;
line-height: 60rpx;
font-size: 12px;
display: flex;
color: #999;
.approval_info_right{
flex: 1;
text-align: right;
}
}
}
}
</style>
pages/login.vue
View file @ 686f7878
......@@ -50,7 +50,7 @@
register: false,
globalConfig: getApp().globalData.config,
loginForm: {
username: "guanliyuan",
username: "admin",
password: "123456",
code: "",
uuid: ''
......
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