ldeyun/cxc-szcx-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yzqUniapp' into 'master'

Browse Source 
Yzq uniapp

See merge request cxcxt/cxc-szcx-uniapp!16
This commit is contained in:
杨哲琦 2025-03-03 18:14:17 +08:00
commit 4e1bc040b8
7 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bpm/leaveApplication/index.vue
View File

@ -49,7 +49,7 @@
</view>
<view class="info f-row aic jcb">
<view>
审批人：
{{examineleader}}：
</view>
<text>{{info.examineleader_dictText}}</text>
</view>
@ -125,6 +125,7 @@
default: ''
},
})
const examineleader = ref('')
const imageValue = ref([])
const ifShowFj = ref(false)
const imageStyles = {
@ -144,6 +145,12 @@
id: props.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 数组
if (info.value.path) {

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "数智产销",
"appid" : "__UNI__9F097F0",
"description" : "",
"versionName" : "1.1.9",
"versionCode" : 20250302,
"versionName" : "1.1.10",
"versionCode" : 20250303,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

16
pages.json
View File

@ -110,14 +110,6 @@
"navigationBarTextStyle": "white"
}
},
{
"path": "pages/leave/application",
"style": {
"navigationBarTitleText": "请假申请",
"enablePullDownRefresh": false,
"navigationBarTextStyle": "white"
}
},
{
"path": "pages/checkin/index",
"style": {
@ -256,6 +248,14 @@
"navigationBarTitleText": "请假详情",
"navigationBarTextStyle": "white"
}
},
{
"path": "pages/views/renliziyuan/qingjiaxinxi/application",
"style": {
"navigationBarTitleText": "请假申请",
"enablePullDownRefresh": false,
"navigationBarTextStyle": "white"
}
}
],
"tabBar": {

1
pages/login/login.vue
View File

@ -202,7 +202,6 @@
}
}
}
console.log(deviceIp)
return deviceIp;
// #endif
}

16
pages/leave/application.vue → pages/views/renliziyuan/qingjiaxinxi/application.vue
View File

@ -51,10 +51,10 @@
</view>
</view>
</picker>
<picker @change="bindType" :value="typeIndex" :range="typeArr" range-key="realname" v-if="ifShow">
<picker @change="bindType" :value="typeIndex" :range="typeArr" range-key="realname">
<view class="f-row aic jcb box">
<view class="title">
审批领导：
{{examineleader}}：
</view>
<view class="f-row aic">
<view :class="[{'choose':typeIndex==null},{'choosed':typeIndex!=null}]">
@ -155,8 +155,8 @@
/**审批领导*/
const typeArr = ref([])
const typeIndex = ref(null)
/**判断是否显示审批领导字段*/
const ifShow = ref(true)
/**判断显示审批 / 分管 领导*/
const examineleader = ref(true)
/**职位层级*/
const zwcj = ref('')
/**出发地*/
@ -205,10 +205,8 @@
if (!type.value) return proxy.$toast('请选择请假类型')
if (!beginTime.value) return proxy.$toast('请选择开始时间')
if (!endTime.value) return proxy.$toast('请选择结束时间')
if (ifShow.value) {
if (typeIndex.value == null) { //副职、员工需要选择审批领导
return proxy.$toast('请选择审批领导')
}
return proxy.$toast('请选择' + examineleader.value)
}
if (!departure.value.trim()) return proxy.$toast('请输入出发地')
if (!destination.value.trim()) return proxy.$toast('请输入目的地')
@ -270,7 +268,9 @@
typeArr.value = res.result.list
zwcj.value = res.result.zwmc
if (zwcj.value == '单位专家' || zwcj.value == '基层正职' || zwcj.value == '高级主管') {
ifShow.value = false;
examineleader.value = '分管领导';
}else{
examineleader.value = '审批领导';
}
} else {
proxy.$toast(res.message);

59
pages/views/zhongheguanli/zhiban/index.vue
View File

@ -120,43 +120,50 @@
</script>
<style lang="scss" scoped>
// 使用变量来定义颜色，便于统一修改
$primary-color: #0056b3;
$secondary-color: #f2f9fc;
$border-color: #d1e7ff;
$text-color: #333;
.date {
width: 690rpx;
padding: 20rpx 30rpx 0 30rpx;
width: 100%; // 让宽度更具响应性
padding: 20rpx 30rpx;
font-size: 28rpx;
color: #333333;
color: $text-color;
text-align: center; // 文字居中
background: $secondary-color; // 使用变量代替直接颜色值
border-bottom: 1px solid $border-color; // 调整边框颜色
}
.titleStyle {
font-size: 12px;
color: #747474;
line-height: 25px;
height: 25px;
background: #F2F9FC;
text-align: center;
font-size: 14px; // 增加字体大小以提高可读性
color: $primary-color; // 更清晰的颜色
line-height: 2;
height: auto; // 根据内容自动调整高度
background: $secondary-color;
text-align: center; // 文字居中
vertical-align: middle;
border-left: 1px solid #919191;
border-bottom: 1px solid #919191;
;
border-left: 1px solid $border-color;
border-bottom: 1px solid $border-color;
}
/* 内容样式 */
.dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 12px;
color: #00007f;
line-height: 25px;
height: 25px;
font-weight: 500;
text-align: center;
font-size: 14px;
color: $text-color;
line-height: 1.5; // 改进行高以提升阅读体验
height: auto; // 动态高度
font-weight: normal; // 减少字体重量
text-align: center; // 文字居中
vertical-align: middle;
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
text-overflow: ellipsis;
border-bottom: 1px solid $border-color;
border-left: 1px solid $border-color;
padding: 10rpx; // 添加内边距
// 当内容超出容器大小时，显示省略号
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>