wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity

BUG优化

dev
xiepeng 2024-05-29 14:10:10 +08:00
parent 39544b2aa3
commit 92f4c0ef99
8 changed files with 199 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pages/application/safetymeeting/safetymeeting-detail.vue
View File

@ -42,13 +42,15 @@
<view class="message-warp" v-if="pd.CONFIRM_MESSAGE_SIGN_ROUTE">
<view class="cu-item" @click="$noMultipleClicks(goStuToOpen,pd.CONFIRM_MESSAGE_SIGN_ROUTE)">
<view class="cu-item" @click="$noMultipleClicks(goStuToOpen(pd.CONFIRM_MESSAGE_SIGN_ROUTE),pd.CONFIRM_MESSAGE_SIGN_ROUTE)">
<view class="content">
<text class="cuIcon-read text-blue"></text>
<text class="text-grey">会议附件</text>
</view>
</view>
</view>
</view>
</view>
<view class="cu-tabbar-height"></view>
@ -183,6 +185,7 @@
if (res.data != null) {
uni.hideLoading();
_this.pd = res.data.pd;
console.log(_this.pd)
} else {
uni.showToast({
@ -193,6 +196,50 @@
}
});
},
goStuToOpen(filePath) {
uni.downloadFile({
url: baseImgPath + filePath,
success: res => {
let filePath = res.tempFilePath;
if (true) { // open存在，代表预览操作
let system = uni.getSystemInfoSync().platform;
if (system == 'ios') {
filePath = encodeURI(filePath);
}
uni.openDocument({
filePath,
success: () => {
console.log('打开文档成功');
},
fail: error => {
console.log(error)
}
});
} else { // open不存在，代表下载操作
uni.saveFile({
tempFilePath: filePath,
success: () => {
uni.showToast({
title: '下载成功'
})
},
fail: () => {
uni.showToast({
title: '下载失败'
})
}
})
}
},
fail: () => {
if (!open) {
uni.showToast({
title: '下载失败'
})
}
}
})
},
ChooseImage() {
var _this = this;
uni.chooseImage({

36
pages/basics/basic-info/components/account.vue
View File

@ -5,7 +5,7 @@
<block slot="content">从业人员注册</block>
</cu-custom>-->
<scroll-view scroll-y="false" >
<view class="text-align" v-if="applyStatus == 0">
<view class="text-align" v-if="applyStatus == 0 && pd.APPLY_TYPE !== '3'">
<view class="text-align" style="color: red;text-align: center">人员审核确认中，不可编辑</view>
</view>
<view class="form">
@ -37,7 +37,9 @@
<script>
import {
validateIdCard,validateMobile
basePath, corpinfoId,
loginUser,
validateIdCard, validateMobile
} from '../../../../common/tool.js';
export default {
name: "register_account",
@ -64,11 +66,41 @@ import {
data() {
return {
noClick: true,
USER_STATUS: false,
pd: [],
}
},
mounted() {
this.getData()
},
methods: {
corpinfoId() {
return corpinfoId
},
getData() {
var _this = this;
uni.request({
url: basePath + '/app/user/getUserStatus',
method: 'POST',
dataType: 'json',
header:{
'Content-type':'application/x-www-form-urlencoded'
},
data: {
USER_ID:loginUser.USER_ID,
CORPINFO_ID: corpinfoId,
ISDELETE: '0',
},
success: (res) => {
if(res.data.pd) {
_this.pd = res.data.pd;
if(_this.pd.APPLY_TYPE == '3' || _this.pd.APPLY_TYPE == '4') {
_this.pd.APPLY_TYPE = '3'
}
}
}
});
},
//跳转事件
confirmAccount(e) {
if (this.validateData()) {

32
pages/basics/basic-info/components/baseInfo.vue
View File

@ -5,7 +5,7 @@
<block slot="content">从业人员注册-基础信息</block>
</cu-custom>-->
<scroll-view scroll-y="false" >
<view class="text-align" v-if="applyStatus == 0">
<view class="text-align" v-if="applyStatus == 0 && pd.APPLY_TYPE !== '3'">
<view class="text-align" style="color: red;text-align: center">人员审核确认中，不可编辑</view>
</view>
<view class="form">
@ -125,7 +125,7 @@
<script>
import {
formatDate,validateIdCard,validateMobile,getLevel
formatDate, validateIdCard, validateMobile, getLevel, corpinfoId, loginUser, basePath
} from '../../../../common/tool.js';
import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
@ -154,8 +154,10 @@ import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
},
data() {
return {
CORPINFO_ID: corpinfoId,
permissionID:'',
noClick: true,
pd: [],
// 范围限制
limitData: {
// 参加工作日期
@ -182,6 +184,7 @@ import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
}
},
mounted() {
this.getData()
this.getDictList()
this.limitData.WORKING_DATE.end = formatDate(new Date(), 'yyyy-MM-dd'); // 参加工作日期截止时间
this.limitData.PREVIOUS_POST_DATE.end = formatDate(new Date(), 'yyyy-MM-dd'); // 之前从事本岗位时间
@ -194,7 +197,30 @@ import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
this.dictData.POLITICAL_OUTLOOK.list = await getLevel({DICTIONARIES_ID: '6351efdd12dc4730952e5d195718e252'});
//文化程度
this.dictData.DEGREE_OF_EDUCATION.list = await getLevel({DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867'});
},
getData() {
var _this = this;
uni.request({
url: basePath + '/app/user/getUserStatus',
method: 'POST',
dataType: 'json',
header:{
'Content-type':'application/x-www-form-urlencoded'
},
data: {
USER_ID:loginUser.USER_ID,
CORPINFO_ID: corpinfoId,
ISDELETE: '0',
},
success: (res) => {
if(res.data.pd) {
_this.pd = res.data.pd;
if(_this.pd.APPLY_TYPE == '3' || _this.pd.APPLY_TYPE == '4') {
_this.pd.APPLY_TYPE = '3'
}
}
}
});
},
//跳转事件
confirmBaseInfo() {

30
pages/basics/basic-info/components/certificate.vue
View File

@ -5,7 +5,7 @@
<block slot="content">从业人员注册-基础信息</block>
</cu-custom>-->
<scroll-view scroll-y="false" >
<view class="text-align" v-if="applyStatus == 0">
<view class="text-align" v-if="applyStatus == 0 && pd.APPLY_TYPE !== '3'">
<view class="text-align" style="color: red;text-align: center">人员审核确认中，不可编辑</view>
</view>
<view class="form">
@ -388,7 +388,7 @@
<script>
import {
formatDate, baseImgPath, getLevel, getLevelCustom
formatDate, baseImgPath, getLevel, getLevelCustom, basePath, loginUser, corpinfoId
} from '../../../../common/tool.js';
import UniSection from "../../../../components/uni-section/components/uni-section/uni-section";
import ZqsSelect from '../../../../components/zqs-select/zqs-select.vue'
@ -435,6 +435,7 @@ export default {
permissionID:'',
noClick: true,
currentFileDataList: '', // 当前是那个附件选择list
pd: [],
// 范围限制
limitData: {
// 生日
@ -499,6 +500,7 @@ export default {
}
},
mounted() {
this.getData()
this.getDictList()
this.getNationality()
this.getQualificationCertificateNationality()
@ -556,6 +558,30 @@ export default {
this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list = this.dictData[name].list.filter(item => item.NAME.indexOf(e) > -1);
}
},
getData() {
var _this = this;
uni.request({
url: basePath + '/app/user/getUserStatus',
method: 'POST',
dataType: 'json',
header:{
'Content-type':'application/x-www-form-urlencoded'
},
data: {
USER_ID:loginUser.USER_ID,
CORPINFO_ID: corpinfoId,
ISDELETE: '0',
},
success: (res) => {
if(res.data.pd) {
_this.pd = res.data.pd;
if(_this.pd.APPLY_TYPE == '3' || _this.pd.APPLY_TYPE == '4') {
_this.pd.APPLY_TYPE = '3'
}
}
}
});
},
//跳转事件
confirmCertificate() {
if (this.validateData()) {

4
pages/basics/home.vue
View File

@ -119,14 +119,14 @@
</view>
<view v-if="keyProjectManagement" class="cu-tag badge">{{ keyProjectManagement }}</view>
</navigator>-->
<navigator class="home-apps-item" hover-class="none" url="/pages/application/commitment">
<!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/commitment">
<view class="home-apps-item-img">
<image src="../../static/icon-apps/home-cns.png" mode=""></image>
</view>
<view class="text">
<text>安全承诺</text>
</view>
</navigator>
</navigator>-->
<navigator class="home-apps-item" hover-class="none"
url="/pages/application/safetymeeting/home">
<view class="home-apps-item-img">

2
pages/login/register/baseInfo.vue
View File

@ -24,7 +24,7 @@
:multiple="true"
:list="dictData.PERSONNEL_TYPE.list"
:show-search="false"
v-model="formData.PERSONNEL_TYPE_NAME"
v-model="formData.PERSONNEL_TYPE"
label-key="NAME"
value-key="DICTIONARIES_ID"
placeholder="请选择人员类型"

18
pages/login/register/certificate.vue
View File

@ -20,11 +20,19 @@
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">人员类型</view>
<picker @change="pickerChangeData($event,'PERSONNEL_TYPE')" disabled :value="dictData.PERSONNEL_TYPE.index" :range="dictData.PERSONNEL_TYPE.list" range-key="NAME">
<view class="picker" style="color: #cccccc">
{{formData.PERSONNEL_TYPE.join()}}
</view>
</picker>
<zqs-select
:multiple="true"
:list="dictData.PERSONNEL_TYPE.list"
:show-search="false"
v-model="formData.PERSONNEL_TYPE"
disabled
label-key="NAME"
value-key="DICTIONARIES_ID"
placeholder="请选择人员类型"
title="选择人员类型"
clearable
@change="changeSelect($event, 'PERSONNEL_TYPE')"
></zqs-select>
</view>
<!-- 身份证 -->

51
pages/news/news-list-detail.vue
View File

@ -24,7 +24,7 @@
<video :src="baseImgPath + pd.VIDEO_ROUTE" controls="true"></video>
</view>
<view class="message-warp" v-if="pd.ATTACHMENT_ROUTE">
<view class="cu-item" @click="$noMultipleClicks(goStuToOpen,pd.ATTACHMENT_ROUTE)">
<view class="cu-item" @click="$noMultipleClicks(goStuToOpen(pd.ATTACHMENT_ROUTE),pd.ATTACHMENT_ROUTE)">
<view class="content">
<text class="cuIcon-read text-blue"></text>
<text class="text-grey">附件</text>
@ -171,12 +171,49 @@
},
});
},
goStuToOpen(e) {
var url=baseImgPath + e ;
var url2 = encodeURI(url);
plus.runtime.openURL(url2, function(res) {
});
goStuToOpen(filePath) {
uni.downloadFile({
url: baseImgPath + filePath,
success: res => {
let filePath = res.tempFilePath;
if (true) { // open存在，代表预览操作
let system = uni.getSystemInfoSync().platform;
if (system == 'ios') {
filePath = encodeURI(filePath);
}
uni.openDocument({
filePath,
success: () => {
console.log('打开文档成功');
},
fail: error => {
console.log(error)
}
});
} else { // open不存在，代表下载操作
uni.saveFile({
tempFilePath: filePath,
success: () => {
uni.showToast({
title: '下载成功'
})
},
fail: () => {
uni.showToast({
title: '下载失败'
})
}
})
}
},
fail: () => {
if (!open) {
uni.showToast({
title: '下载失败'
})
}
}
})
},
}
}