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

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	pages/basics/basic-info/components/baseInfo.vue
#	pages/basics/basic-info/components/certificate.vue
dev
zhangyanli 2024-05-17 16:00:49 +08:00
parent 145ceb69da 57a2833e51
commit 52f23a7647
6 changed files with 185 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/application/driving-inspections/dirving-inspections-list.vue
View File

@ -112,7 +112,7 @@
this.loginUserId = loginUser.USER_ID;
this.background = require('@/common/background.json');
await this.getFunc();
this.getData();
this.getData();
// setTimeout(function() {
// that.loading = true
// }, 500)
@ -140,8 +140,7 @@
_this.list1 = [];
await this.getFunc();
}
this.getData()
this.getData();
},
methods: {
@ -170,7 +169,6 @@
title: '加载中'
})
uni.request({
url: basePath + '/app/waybillregistration/listForSecurityWaybillre',
method: 'POST',
dataType: 'json',

11
pages/application/driving-inspections/driving-item-check-list.vue
View File

@ -45,7 +45,7 @@
<view class="select">
<view @click="checkTrue1({index:index},1)" class="flex align-center">
<radio class='yellow mr10' :class="item.ISNORMAL==1?'checked':''" :checked="item.ISNORMAL==1" disabled ></radio>
<text>不是</text>
<text>否</text>
</view>
</view>
<view class="select">
@ -196,16 +196,17 @@
type: 'gcj02',
geocode: true,
success: function (locationRes) {
const locationAddress = `${locationRes.address.province}${locationRes.address.city}${locationRes.address.district}${locationRes.address.street}${locationRes.address.streetNum}${locationRes.address.poiName}`;
// 创建画布
let locationAddress = `${locationRes.address.province}${locationRes.address.city}${locationRes.address.district}${locationRes.address.street}${locationRes.address.streetNum}${locationRes.address.poiName}`;
locationAddress = locationAddress.replace(/undefined/g,'')
// 创建画布
const ctx = uni.createCanvasContext('watermarkCanvas', _this);
ctx.drawImage(tempFilePath, 0, 0, 300, 150); // 图片大小
ctx.setFontSize(20); // 水印字体大小
ctx.setFillStyle('red'); // 水印字体颜色
ctx.setFontSize(10); // 调整字体大小，适应位置信息
// 绘制水印
ctx.fillText(`当前时间: ${_this.todayDate}`, 10, 120); // 根据实际情况调整位置
ctx.fillText(`当前位置: ${locationAddress}`, 10, 130); // 根据实际情况调整位置
ctx.fillText(`当前时间: ${_this.todayDate}`, 10, 130); // 根据实际情况调整位置
ctx.fillText(`当前位置: ${locationAddress}`, 10, 140); // 根据实际情况调整位置
ctx.draw(false, () => {
// 将画布内容保存为图片
uni.canvasToTempFilePath({

18
pages/application/onlinexxks/video_study.vue
View File

@ -496,9 +496,21 @@ export default {
CHAPTER_ID: this.videoData.CHAPTER_ID,
VIDEOCOURSEWARE_ID: this.videoData.VIDEOCOURSEWARE_ID,
})
uni.navigateTo({
url: '/pages/application/onlinexxks/face/index?params=' + params
})
const resData = await this.post('/app/user/getUserFace', {
USERNAME: loginUser.NAME,
USER_ID: loginUser.USER_ID,
});
if (!resData.pd.PORTRAIT) {
uni.showModal({
title: "温馨提示",
confirmText: "确定",
content: "您当前还未进行人脸认证，请先进行认证",
});
} else {
uni.navigateTo({
url: '/pages/application/onlinexxks/face/index?params=' + params
})
}
},
fnNavigationExercises(VIDEOCOURSEWARE_ID) {
uni.navigateTo({

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

@ -7,28 +7,43 @@
<scroll-view scroll-y="false" >
<view class="form">
<view class="cu-form-group">
<view class="title is-required">姓名</view>
<view class="title">姓名</view>
<input v-model="formData.NAME" disabled placeholder="请输入姓名" maxlength="50" name="input" style="color: #cccccc" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">身份证号</view>
<view class="title">身份证号</view>
<input v-model="formData.USER_ID_CARD" disabled placeholder="请输入身份证号" maxlength="18" name="input" style="color: #cccccc" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">手机</view>
<input v-model="formData.PHONE" disabled placeholder="请输入手机号码" maxlength="11" name="input" style="color: #cccccc" />
<view class="title">手机</view>
<input v-model="formData.PHONE" disabled placeholder="请输入手机证号" maxlength="11" name="input" style="color: #cccccc" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">人员类型</view>
<view class="title">人员类型</view>
<zqs-select
:multiple="true"
:list="dictData.PERSONNEL_TYPE.list"
:show-search="false"
v-model="formData.PERSONNEL_TYPE"
label-key="NAME"
value-key="DICTIONARIES_ID"
placeholder="请选择人员类型"
title="选择人员类型"
clearable
@change="changeSelect($event, 'PERSONNEL_TYPE')"
></zqs-select>
</view>
<!-- <view class="cu-form-group margin-top-xs">
<view class="title">人员类型</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.PERSONNEL_TYPE_NAME}}</view>
<picker v-else @change="pickerChangeData($event,'PERSONNEL_TYPE')" :value="dictData.PERSONNEL_TYPE.index" :range="dictData.PERSONNEL_TYPE.list" range-key="NAME">
<view class="picker">
{{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}}
</view>
</picker>
</view>
</view>-->
<view class="cu-form-group margin-top">
<view class="title is-required">文化程度</view>
<view class="title">文化程度</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.DEGREE_OF_EDUCATION_NAME}}</view>
<picker v-else @change="pickerChangeData($event,'DEGREE_OF_EDUCATION')" :value="dictData.DEGREE_OF_EDUCATION.index" :range="dictData.DEGREE_OF_EDUCATION.list" range-key="NAME">
<view class="picker">
@ -37,7 +52,7 @@
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">政治面貌</view>
<view class="title">政治面貌</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.POLITICAL_OUTLOOK_NAME}}</view>
<picker v-else @change="pickerChangeData($event,'POLITICAL_OUTLOOK')" :value="dictData.POLITICAL_OUTLOOK.index" :range="dictData.POLITICAL_OUTLOOK.list" range-key="NAME">
<view class="picker">
@ -46,7 +61,7 @@
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">参加工作日期</view>
<view class="title">参加工作日期</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.WORKING_DATE}}</view>
<picker v-else mode="date" @change="changeDate($event,'WORKING_DATE')" :value="formData.WORKING_DATE" :end="limitData.WORKING_DATE.end">
<view class="picker">
@ -55,43 +70,26 @@
</picker>
</view>
<view class="cu-form-group">
<view class="title is-required">健康状况</view>
<view class="title">健康状况</view>
<input v-model="formData.HEALTH" placeholder="请输入健康状况" maxlength="50" name="input" />
</view>
<view class="cu-form-group">
<view class="title is-required">毕业院校及专业</view>
<input v-model="formData.UNIVERSITY" placeholder="请输入毕业院校及专业" maxlength="50" name="input" />
</view>
<view class="cu-form-group">
<view class="title is-required">户籍所在地</view>
<input v-model="formData.RESIDENCE" placeholder="请输入户籍所在地" maxlength="50" name="input" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">之前从事本岗位时间</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.PREVIOUS_POST_DATE}}</view>
<picker v-else mode="date" @change="changeDate($event,'PREVIOUS_POST_DATE')" :value="formData.PREVIOUS_POST_DATE" :end="limitData.PREVIOUS_POST_DATE.end">
<view class="picker">
{{formData.PREVIOUS_POST_DATE?formData.PREVIOUS_POST_DATE:'请选择'}}
</view>
</picker>
</view>
<view class="cu-form-textarea margin-top-xs">
<view class="cu-form-title is-required-cu">主要工作经历</view>
<view class="cu-form-title">主要工作经历</view>
<textarea v-model="formData.WORK_EXPERIENCE" maxlength="200" placeholder="请输入主要工作经历"></textarea>
</view>
<view class="cu-form-textarea margin-top-xs">
<view class="cu-form-title is-required-cu">入职前接受安全培训和考核以及取得安全培训有关的岗位证书等情况</view>
<view class="cu-form-title">入职前接受安全培训和考核以及取得安全培训有关的岗位证书等情况</view>
<textarea v-model="formData.CERTIFICATES" maxlength="200" placeholder="请输入入职前接受安全培训和考核以及取得安全培训有关的岗位证书等情况"></textarea>
</view>
<view class="cu-form-textarea margin-top-xs">
<view class="cu-form-title is-required-cu">入职前受过何种有关安全生产的处罚以及是否受到刑事处罚</view>
<view class="cu-form-title">入职前受过何种有关安全生产的处罚以及是否受到刑事处罚</view>
<textarea v-model="formData.PUNISH" maxlength="200" placeholder="请输入入职前受过何种有关安全生产的处罚以及是否受到刑事处罚"></textarea>
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button v-if="!forbidEdit" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(confirmBaseInfo)">下一步</button>
<button v-if="forbidEdit && applyStatus !== '0'" class="cu-btn bg-blue margin-tb-sm lg" @click="goEdit">编辑</button>
<button v-if="forbidEdit && applyStatus !== '0'" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goEdit)">编辑</button>
<!-- <button class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goback)">返回</button>-->
</view>
</scroll-view>
@ -102,8 +100,11 @@
import {
formatDate,validateIdCard,validateMobile,getLevel
} from '../../../../common/tool.js';
import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
export default {
name: "register_baseInfo",
components: {ZqsSelect},
props: {
applyStatus: {
type: String,
@ -132,7 +133,6 @@ import {
limitData: {
// 参加工作日期
WORKING_DATE:{ start: '', end: '' },
PREVIOUS_POST_DATE:{ start: '', end: '' },
},
dictData:{
// 人员类型
@ -156,7 +156,6 @@ import {
mounted() {
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'); // 之前从事本岗位时间
},
methods: {
async getDictList(){
@ -181,12 +180,15 @@ import {
this.formData[name] = e.detail.value
this.$forceUpdate();//强制刷新
},
changeSelect(e, name) {
this.$forceUpdate();//强制刷新
},
pickerChangeData(e,name) {
// 人员类型
if (name === 'PERSONNEL_TYPE') {
this.dictData.PERSONNEL_TYPE.index = e.detail.value;
this.formData.PERSONNEL_TYPE = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].DICTIONARIES_ID
this.formData.PERSONNEL_TYPE_NAME = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].NAME
this.formData.PERSONNEL_TYPENAME = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].NAME
}
// 政治面貌
if (name === 'POLITICAL_OUTLOOK') {
@ -211,7 +213,7 @@ import {
},
validateData() {
// 人员类型
if (!this.formData.PERSONNEL_TYPE) {
if (this.formData.PERSONNEL_TYPE.length < 1) {
uni.showToast({
icon: 'none',
title: '请选择人员类型',
@ -219,54 +221,6 @@ import {
});
return false;
}
if (!this.formData.HEALTH) {
uni.showToast({
icon: 'none',
title: '健康状况不能为空',
duration: 2000
});
return false;
}
if (!this.formData.UNIVERSITY) {
uni.showToast({
icon: 'none',
title: '毕业院校及专业不能为空',
duration: 2000
});
return false;
}
if (!this.formData.RESIDENCE) {
uni.showToast({
icon: 'none',
title: '户籍所在地不能为空',
duration: 2000
});
return false;
}
if (!this.formData.WORK_EXPERIENCE) {
uni.showToast({
icon: 'none',
title: '主要工作经历不能为空',
duration: 2000
});
return false;
}
if (!this.formData.CERTIFICATES) {
uni.showToast({
icon: 'none',
title: '入职前接受安全培训和考核以及取得安全培训有关的岗位证书等情况不能为空',
duration: 2000
});
return false;
}
if (!this.formData.PUNISH) {
uni.showToast({
icon: 'none',
title: '入职前受过何种有关安全生产的处罚以及是否受到刑事处罚不能为空',
duration: 2000
});
return false;
}
return true;
},

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

@ -7,23 +7,23 @@
<scroll-view scroll-y="false" >
<view class="form">
<view class="cu-form-group">
<view class="title is-required">姓名</view>
<view class="title">姓名</view>
<input v-model="formData.NAME" disabled placeholder="请输入姓名" maxlength="50" name="input" style="color: #cccccc" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">身份证号</view>
<view class="title">身份证号</view>
<input v-model="formData.USER_ID_CARD" disabled placeholder="请输入身份证号" maxlength="18" name="input" style="color: #cccccc" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">手机</view>
<input v-model="formData.PHONE" disabled placeholder="请输入手机号码" maxlength="11" name="input" style="color: #cccccc" />
<view class="title">手机</view>
<input v-model="formData.PHONE" disabled placeholder="请输入手机证号" maxlength="11" name="input" style="color: #cccccc" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">人员类型</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.PERSONNEL_TYPE_NAME}}</view>
<view class="title">人员类型</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.PERSONNEL_TYPENAME}}</view>
<picker v-else @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_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}}
{{formData.PERSONNEL_TYPE.join()}}
</view>
</picker>
</view>
@ -31,7 +31,7 @@
<!-- 身份证 -->
<uni-section title="身份证" type="line" class="margin-top" padding>
<view v-if="forbidEdit" class="cu-form-textarea">
<view class="title is-required-pic">
<view class="title">
<text>身份证（正面）</text>
</view>
<view class="cu-form-p">
@ -44,7 +44,7 @@
</view>
</view>
<view v-if="!forbidEdit" class="cu-bar bg-white margin-top">
<view class="action is-required" style="font-size: 28upx; font-weight: bold; color: #000;">
<view class="action" style="font-size: 28upx; font-weight: bold; color: #000;">
身份证（正面）
</view>
<view class="action">
@ -65,7 +65,7 @@
</view>
</view>
<view v-if="forbidEdit" class="cu-form-textarea">
<view class="title is-required-pic">
<view class="title">
<text>身份证（背面）</text>
</view>
<view class="cu-form-p">
@ -78,7 +78,7 @@
</view>
</view>
<view v-if="!forbidEdit" class="cu-bar bg-white margin-top-xs">
<view class="action is-required" style="font-size: 28upx; font-weight: bold; color: #000;">
<view class="action" style="font-size: 28upx; font-weight: bold; color: #000;">
身份证（背面）
</view>
<view class="action">
@ -99,7 +99,7 @@
</view>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">生日</view>
<view class="title">生日</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.DATE_OF_BIRTH}}</view>
<picker v-else mode="date" @change="changeDate($event,'DATE_OF_BIRTH')" :value="formData.DATE_OF_BIRTH" :end="limitData.DATE_OF_BIRTH.end">
<view class="picker">
@ -108,7 +108,7 @@
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">民族</view>
<view class="title">民族</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.NATION_NAME}}</view>
<picker v-else @change="pickerChangeData($event,'NATION')" :value="dictData.NATION.index" :range="dictData.NATION.list" range-key="NAME">
<view class="picker">
@ -117,7 +117,7 @@
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">性别</view>
<view class="title">性别</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.SEX_NAME}}</view>
<picker v-else @change="pickerChangeData($event,'SEX')" :value="dictData.SEX.index" :range="dictData.SEX.list" range-key="NAME">
<view class="picker">
@ -126,16 +126,16 @@
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">有效期（起始）</view>
<view class="title">有效期（起始）</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.ID_CARD_VALIDITY_START}}</view>
<picker v-else mode="date" @change="changeDate($event,'ID_CARD_VALIDITY_START')" :value="formData.ID_CARD_VALIDITY_START" :end="limitData.ID_CARD_VALIDITY_START.end">
<picker v-else mode="date" @change="changeDate($event,'ID_CARD_VALIDITY_START')" :value="formData.ID_CARD_VALIDITY_START" >
<view class="picker">
{{formData.ID_CARD_VALIDITY_START?formData.ID_CARD_VALIDITY_START:'请选择'}}
</view>
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">有效期（截止）</view>
<view class="title">有效期（截止）</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.ID_CARD_VALIDITY_END}}</view>
<picker v-else mode="date" @change="changeDate($event,'ID_CARD_VALIDITY_END')" :value="formData.ID_CARD_VALIDITY_END" >
<view class="picker">
@ -144,11 +144,11 @@
</picker>
</view>
<view class="cu-form-textarea margin-top-xs">
<view class="cu-form-title is-required-cu">住址</view>
<view class="cu-form-title">住址</view>
<textarea v-model="formData.ID_CARD_ADDRESS" :disabled="forbidEdit" maxlength="150" placeholder="请输入身份证住址" :style="'color:' + colorValue + ';'"></textarea>
</view>
<view class="cu-form-textarea margin-top-xs">
<view class="cu-form-title is-required-cu">签发机关</view>
<view class="cu-form-title">签发机关</view>
<textarea v-model="formData.ID_CARD_ORGAN" :disabled="forbidEdit" maxlength="150" placeholder="请输入身份证签发机关" :style="'color:' + colorValue + ';'"></textarea>
</view>
</uni-section>
@ -156,7 +156,7 @@
<!-- 驾驶证 -->
<uni-section title="驾驶证" type="line" class="margin-top" padding>
<view v-if="forbidEdit" class="cu-form-textarea">
<view class="title is-required-pic">
<view class="title">
<text>驾驶证</text>
</view>
<view class="cu-form-p">
@ -169,7 +169,7 @@
</view>
</view>
<view v-if="!forbidEdit" class="cu-bar bg-white margin-top">
<view class="action is-required" style="font-size: 28upx; font-weight: bold; color: #000;">
<view class="action" style="font-size: 28upx; font-weight: bold; color: #000;">
驾驶证
</view>
<view class="action">
@ -190,11 +190,11 @@
</view>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">驾驶证号</view>
<view class="title">驾驶证号</view>
<input v-model="formData.DRIVER_LICENSE_NO" :disabled="forbidEdit" placeholder="请输入驾驶证号" maxlength="18" name="input" :style="'color:' + colorValue + ';'" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">准驾车型</view>
<view class="title">准驾车型</view>
<zqs-select
:multiple="true"
:list="dictData.DRIVING_MODEL.list"
@ -210,7 +210,7 @@
></zqs-select>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">国籍</view>
<view class="title">国籍</view>
<zqs-select
:multiple="false"
:list="dictData.NATIONALITY.list"
@ -222,29 +222,28 @@
placeholder="请选择国籍"
title="选择国籍"
clearable
@search="searchSelectNationality($event, 'NATIONALITY')"
></zqs-select>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">初次领证日期</view>
<view class="title">初次领证日期</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.DRIVER_LICENSE_ISSUE_DATE}}</view>
<picker v-else mode="date" @change="changeDate($event,'DRIVER_LICENSE_ISSUE_DATE')" :value="formData.DRIVER_LICENSE_ISSUE_DATE" :end="limitData.DRIVER_LICENSE_ISSUE_DATE.end">
<picker v-else mode="date" @change="changeDate($event,'DRIVER_LICENSE_ISSUE_DATE')" :value="formData.DRIVER_LICENSE_ISSUE_DATE" >
<view class="picker">
{{formData.DRIVER_LICENSE_ISSUE_DATE?formData.DRIVER_LICENSE_ISSUE_DATE:'请选择'}}
</view>
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">有效期（起始）</view>
<view class="title">有效期（起始）</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.DRIVER_LICENSE_VALIDITY_START}}</view>
<picker v-else mode="date" @change="changeDate($event,'DRIVER_LICENSE_VALIDITY_START')" :value="formData.DRIVER_LICENSE_VALIDITY_START" :end="limitData.DRIVER_LICENSE_VALIDITY_START.end">
<picker v-else mode="date" @change="changeDate($event,'DRIVER_LICENSE_VALIDITY_START')" :value="formData.DRIVER_LICENSE_VALIDITY_START" >
<view class="picker">
{{formData.DRIVER_LICENSE_VALIDITY_START?formData.DRIVER_LICENSE_VALIDITY_START:'请选择'}}
</view>
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">有效期（截止）</view>
<view class="title">有效期（截止）</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.DRIVER_LICENSE_VALIDITY_END}}</view>
<picker v-else mode="date" @change="changeDate($event,'DRIVER_LICENSE_VALIDITY_END')" :value="formData.DRIVER_LICENSE_VALIDITY_END" >
<view class="picker">
@ -253,7 +252,7 @@
</picker>
</view>
<view class="cu-form-textarea margin-top-xs">
<view class="cu-form-title is-required-cu">签发机关</view>
<view class="cu-form-title">签发机关</view>
<textarea v-model="formData.DRIVER_LICENSE_ORGAN" :disabled="forbidEdit" maxlength="150" placeholder="请输入驾驶证签发机关" :style="'color:' + colorValue + ';'"></textarea>
</view>
</uni-section>
@ -261,7 +260,7 @@
<!-- 道路运输从业人员从业资格证 -->
<uni-section title="道路运输从业人员从业资格证" type="line" class="margin-top" padding>
<view v-if="forbidEdit" class="cu-form-textarea">
<view class="title is-required-pic">
<view class="title">
<text>从业资格证</text>
</view>
<view class="cu-form-p">
@ -274,7 +273,7 @@
</view>
</view>
<view v-if="!forbidEdit" class="cu-bar bg-white margin-top">
<view class="action is-required" style="font-size: 28upx; font-weight: bold; color: #000;">
<view class="action" style="font-size: 28upx; font-weight: bold; color: #000;">
从业资格证
</view>
<view class="action">
@ -295,11 +294,11 @@
</view>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">从业资格证号</view>
<view class="title">从业资格证号</view>
<input v-model="formData.QUALIFICATION_CERTIFICATE_NO" :disabled="forbidEdit" placeholder="请输入从业资格证号" maxlength="18" name="input" :style="'color:' + colorValue + ';'" />
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">从业资格类别</view>
<view class="title">从业资格类别</view>
<zqs-select
:multiple="true"
:list="dictData.QUALIFICATION_CERTIFICATE_CATEGORY.list"
@ -315,10 +314,10 @@
></zqs-select>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">国籍</view>
<view class="title">国籍</view>
<zqs-select
:multiple="false"
:list="dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list"
:list="dictData.NATIONALITY.list"
:show-search="true"
:disabled="forbidEdit"
v-model="formData.QUALIFICATION_CERTIFICATE_NATIONALITY"
@ -327,29 +326,28 @@
placeholder="请选择国籍"
title="选择国籍"
clearable
@search="searchSelectQualificationCertificateNationality($event, 'QUALIFICATION_CERTIFICATE_NATIONALITY')"
></zqs-select>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">初次领证日期</view>
<view class="title">初次领证日期</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE}}</view>
<picker v-else mode="date" @change="changeDate($event,'QUALIFICATION_CERTIFICATE_ISSUE_DATE')" :value="formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE" :end="limitData.QUALIFICATION_CERTIFICATE_ISSUE_DATE.end">
<picker v-else mode="date" @change="changeDate($event,'QUALIFICATION_CERTIFICATE_ISSUE_DATE')" :value="formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE" >
<view class="picker">
{{formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE?formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE:'请选择'}}
</view>
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">有效期（起始）</view>
<view class="title">有效期（起始）</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.QUALIFICATION_CERTIFICATE_VALIDITY_START}}</view>
<picker v-else mode="date" @change="changeDate($event,'QUALIFICATION_CERTIFICATE_VALIDITY_START')" :value="formData.QUALIFICATION_CERTIFICATE_VALIDITY_START" :end="limitData.QUALIFICATION_CERTIFICATE_VALIDITY_START.end">
<picker v-else mode="date" @change="changeDate($event,'QUALIFICATION_CERTIFICATE_VALIDITY_START')" :value="formData.QUALIFICATION_CERTIFICATE_VALIDITY_START" >
<view class="picker">
{{formData.QUALIFICATION_CERTIFICATE_VALIDITY_START?formData.QUALIFICATION_CERTIFICATE_VALIDITY_START:'请选择'}}
</view>
</picker>
</view>
<view class="cu-form-group margin-top-xs">
<view class="title is-required">有效期（截止）</view>
<view class="title">有效期（截止）</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.QUALIFICATION_CERTIFICATE_VALIDITY_END}}</view>
<picker v-else mode="date" @change="changeDate($event,'QUALIFICATION_CERTIFICATE_VALIDITY_END')" :value="formData.QUALIFICATION_CERTIFICATE_VALIDITY_END" >
<view class="picker">
@ -358,7 +356,7 @@
</picker>
</view>
<view class="cu-form-textarea margin-top-xs">
<view class="cu-form-title is-required-cu">签发机关</view>
<view class="cu-form-title">签发机关</view>
<textarea v-model="formData.QUALIFICATION_CERTIFICATE_ORGAN" :disabled="forbidEdit" maxlength="150" placeholder="请输入从业资格证签发机关" :style="'color:' + colorValue + ';'"></textarea>
</view>
</uni-section>
@ -368,7 +366,7 @@
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<!-- <button v-if="!forbidEdit" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(confirmCertificate)">下一步</button>-->
<button v-if="!forbidEdit" :loading="buttonloading" :disabled="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(confirmCertificate)">提 交</button>
<button v-if="forbidEdit && applyStatus !== '0'" class="cu-btn bg-blue margin-tb-sm lg" @click="goEdit">编辑</button>
<button v-if="forbidEdit && applyStatus !== '0'" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goEdit)">编辑</button>
<!-- <button class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goback)">返回</button>-->
</view>
</scroll-view>
@ -378,7 +376,7 @@
<script>
import {
formatDate, baseImgPath, getLevel, getLevelCustom, listCorpAll
formatDate, baseImgPath, getLevel, getLevelCustom
} from '../../../../common/tool.js';
import UniSection from "../../../../components/uni-section/components/uni-section/uni-section";
import ZqsSelect from '../../../../components/zqs-select/zqs-select.vue'
@ -421,89 +419,80 @@ export default {
},
data() {
return {
baseImgPath: baseImgPath,
permissionID: '',
baseImgPath:baseImgPath,
permissionID:'',
noClick: true,
currentFileDataList: '', // 当前是那个附件选择list
// 范围限制
limitData: {
// 生日
DATE_OF_BIRTH: {start: '', end: ''},
DATE_OF_BIRTH:{ start: '', end: '' },
// 身份证有效期（起始）
ID_CARD_VALIDITY_START: {start: '', end: ''},
ID_CARD_VALIDITY_START:{ start: '', end: '' },
// 身份证有效期（截止）
ID_CARD_VALIDITY_END: {start: '', end: ''},
ID_CARD_VALIDITY_END:{ start: '', end: '' },
// 驾驶证初次领证日期
DRIVER_LICENSE_ISSUE_DATE: {start: '', end: ''},
DRIVER_LICENSE_ISSUE_DATE:{ start: '', end: '' },
// 驾驶证有效期（起始）
DRIVER_LICENSE_VALIDITY_START: {start: '', end: ''},
DRIVER_LICENSE_VALIDITY_START:{ start: '', end: '' },
// 驾驶证有效期（截止）
DRIVER_LICENSE_VALIDITY_END: {start: '', end: ''},
DRIVER_LICENSE_VALIDITY_END:{ start: '', end: '' },
// 从业资格证初次领证日期
QUALIFICATION_CERTIFICATE_ISSUE_DATE: {start: '', end: ''},
QUALIFICATION_CERTIFICATE_ISSUE_DATE:{ start: '', end: '' },
// 从业资格证有效期（起始）
QUALIFICATION_CERTIFICATE_VALIDITY_START: {start: '', end: ''},
QUALIFICATION_CERTIFICATE_VALIDITY_START:{ start: '', end: '' },
// 从业资格证有效期（截止）
QUALIFICATION_CERTIFICATE_VALIDITY_END: {start: '', end: ''},
QUALIFICATION_CERTIFICATE_VALIDITY_END:{ start: '', end: '' },
},
dictData: {
dictData:{
// 人员类型
PERSONNEL_TYPE: {
PERSONNEL_TYPE:{
index: -1,
list: [],
list:[],
},
// 性别
SEX: {
SEX:{
index: -1,
list: [
{NAME: '男', DICTIONARIES_ID: '1'},
{NAME: '女', DICTIONARIES_ID: '0'}
list:[
{ NAME: '男', DICTIONARIES_ID: '1' },
{ NAME: '女', DICTIONARIES_ID: '0' }
],
},
// 民族
NATION: {
NATION:{
index: -1,
list: [],
list:[],
},
// 准驾车型
DRIVING_MODEL: {
index: -1,
list: [],
list:[],
},
// 国籍
NATIONALITY: {
index: -1,
list: [],
tempList: [],
list:[],
},
// 从业资格类别
QUALIFICATION_CERTIFICATE_CATEGORY: {
index: -1,
list: [],
list:[],
},
// 国籍
QUALIFICATION_CERTIFICATE_NATIONALITY: {
index: -1,
list: [],
tempList: [],
list:[],
},
}
}
},
mounted() {
this.getDictList()
this.getNationality()
this.getQualificationCertificateNationality()
var _this = this
let now = new Date();
var birthEnd=now.setFullYear(now.getFullYear()-17);
birthEnd=new Date(birthEnd);
this.limitData.DATE_OF_BIRTH.end = formatDate(birthEnd, 'yyyy-MM-dd'); // 生日截止时间
this.limitData.ID_CARD_VALIDITY_START.end = formatDate(new Date(), 'yyyy-MM-dd'); // 身份证有效期（起始）
this.limitData.DRIVER_LICENSE_ISSUE_DATE.end = formatDate(new Date(), 'yyyy-MM-dd'); // 驾驶证初次领证日期
this.limitData.DRIVER_LICENSE_VALIDITY_START.end = formatDate(new Date(), 'yyyy-MM-dd'); // 驾驶证有效期（起始）
this.limitData.QUALIFICATION_CERTIFICATE_ISSUE_DATE.end = formatDate(new Date(), 'yyyy-MM-dd'); // 从业资格证初次领证日期
this.limitData.QUALIFICATION_CERTIFICATE_VALIDITY_START.end = formatDate(new Date(), 'yyyy-MM-dd'); // 从业资格证有效期（起始）
this.dictData.SEX.list.forEach((item, index) => {
if (item.DICTIONARIES_ID === _this.formData.SEX) {
_this.dictData.SEX.index = index;
@ -520,6 +509,8 @@ export default {
this.dictData.NATION.list = await getLevel({DICTIONARIES_ID: '0a0e406f27f74ee698fe9979d25f62dd'});
// 准驾车型
this.dictData.DRIVING_MODEL.list = await getLevel({DICTIONARIES_ID: 'b41e247057334789b60bdf3fe6d8d6ba'});
// 国籍
this.dictData.NATIONALITY.list = await getLevel({DICTIONARIES_ID: '3b614b43e8814f51a3492f2fdbc9a415'});
// 从业资格类别
this.dictData.QUALIFICATION_CERTIFICATE_CATEGORY.list = await getLevelCustom({DICTIONARIES_ID: 'ed38fa5f78c64e6d906d2bad0d72bd63', LEVEL: 3});
this.dictData.QUALIFICATION_CERTIFICATE_CATEGORY.list.forEach((item) => {
@ -527,27 +518,6 @@ export default {
})
},
async getNationality(){
// 国籍
this.dictData.NATIONALITY.list = await getLevel({DICTIONARIES_ID: '3b614b43e8814f51a3492f2fdbc9a415'});
this.dictData.NATIONALITY.tempList = JSON.parse(JSON.stringify(this.dictData.NATIONALITY.list));
},
async getQualificationCertificateNationality(){
this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list = await getLevel({DICTIONARIES_ID: '3b614b43e8814f51a3492f2fdbc9a415'});
this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.tempList = JSON.parse(JSON.stringify(this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list));
},
searchSelectNationality(e, name) {
this.dictData.NATIONALITY.list = JSON.parse(JSON.stringify(this.dictData.NATIONALITY.tempList));
if (e) {
this.dictData.NATIONALITY.list = this.dictData[name].list.filter(item => item.NAME.indexOf(e) > -1);
}
},
searchSelectQualificationCertificateNationality(e, name) {
this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list = JSON.parse(JSON.stringify(this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.tempList));
if (e) {
this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list = this.dictData[name].list.filter(item => item.NAME.indexOf(e) > -1);
}
},
//跳转事件
confirmCertificate() {
if (this.validateData()) {
@ -701,18 +671,18 @@ export default {
},
validateData() {
// 身份证
if(!this.forbidEdit && this.fileData.idCardFront.length === 0){
if (this.fileData.idCardFront.length < 1) {
uni.showToast({
icon: 'none',
title: '请上传身份证（正面）',
title: '请上传身份证照片（正面）',
duration: 2000
});
return false;
}
if(!this.forbidEdit && this.fileData.idCardBack.length === 0){
if (this.fileData.idCardBack.length < 1) {
uni.showToast({
icon: 'none',
title: '请上传身份证（反面）',
title: '请上传身份证照片（背面）',
duration: 2000
});
return false;
@ -749,14 +719,6 @@ export default {
});
return false;
}
if (new Date(this.formData.ID_CARD_VALIDITY_START).getTime() > new Date(this.formData.ID_CARD_VALIDITY_END).getTime()) {
uni.showToast({
icon: 'none',
title: '身份证有效起始时间不能超过结束时间',
duration: 2000
});
return false;
}
if (!this.formData.ID_CARD_ADDRESS) {
uni.showToast({
icon: 'none',
@ -775,69 +737,55 @@ export default {
}
// 驾驶证
if (this.fileData.driverLicense.length < 1) {
uni.showToast({
icon: 'none',
title: '请上传驾驶证照片',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_NO) {
uni.showToast({
icon: 'none',
title: '请输入驾驶证号',
duration: 2000
});
return false;
}
if (this.formData.DRIVING_MODEL.length < 1) {
uni.showToast({
icon: 'none',
title: '请选择准驾车型',
duration: 2000
});
return false;
}
if (!this.formData.DRIVING_NATIONALITY) {
uni.showToast({
icon: 'none',
title: '请选择国籍',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) {
uni.showToast({
icon: 'none',
title: '请选择初次领证日期',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) {
uni.showToast({
icon: 'none',
title: '请选择驾驶证有效期时间',
duration: 2000
});
return false;
}
if (new Date(this.formData.DRIVER_LICENSE_VALIDITY_START).getTime() > new Date(this.formData.DRIVER_LICENSE_VALIDITY_END).getTime()) {
uni.showToast({
icon: 'none',
title: '驾驶证有效起始时间不能超过结束时间',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_ORGAN) {
uni.showToast({
icon: 'none',
title: '请输入驾驶证的签发机关',
duration: 2000
});
return false;
if (this.formData.PERSONNEL_TYPE_NAME.find((item) => item === '驾驶员')) {
if (this.fileData.driverLicense.length < 1) {
uni.showToast({
icon: 'none',
title: '请上传驾驶证照片',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_NO) {
uni.showToast({
icon: 'none',
title: '请输入驾驶证号',
duration: 2000
});
return false;
}
if (this.formData.DRIVING_MODEL.length < 1) {
uni.showToast({
icon: 'none',
title: '请选择准驾车型',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) {
uni.showToast({
icon: 'none',
title: '请选择初次领证日期',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) {
uni.showToast({
icon: 'none',
title: '请选择驾驶证有效期时间',
duration: 2000
});
return false;
}
if (!this.formData.DRIVER_LICENSE_ORGAN) {
uni.showToast({
icon: 'none',
title: '请输入驾驶证的签发机关',
duration: 2000
});
return false;
}
}
// 从业资格证证
@ -873,14 +821,6 @@ export default {
});
return false;
}
if (!this.formData.QUALIFICATION_CERTIFICATE_NATIONALITY) {
uni.showToast({
icon: 'none',
title: '请选择国籍',
duration: 2000
});
return false;
}
if (!this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_START || !this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_END) {
uni.showToast({
icon: 'none',
@ -889,14 +829,6 @@ export default {
});
return false;
}
if (new Date(this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_START).getTime() > new Date(this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_END).getTime()) {
uni.showToast({
icon: 'none',
title: '从业资格证有效起始时间不能超过结束时间',
duration: 2000
});
return false;
}
if (!this.formData.QUALIFICATION_CERTIFICATE_ORGAN) {
uni.showToast({
icon: 'none',

4
pages/basics/basic-info/user-info.vue
View File

@ -93,8 +93,8 @@ import Apply from "./components/apply.vue"
SEXNAME: '',
//人员类型
PERSONNEL_TYPE: '',
PERSONNEL_TYPE_NAME: '',
PERSONNEL_TYPE: [],
PERSONNEL_TYPENAME: '',
// 政治面貌
POLITICAL_OUTLOOK: '',
POLITICAL_OUTLOOK_NAME: '',