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

BUG优化

dev
xiepeng 2024-05-16 18:01:12 +08:00
parent 3ac6e233e1
commit b73c4da3c5
5 changed files with 113 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@
this.loginUserId = loginUser.USER_ID; this.loginUserId = loginUser.USER_ID;
this.background = require('@/common/background.json'); this.background = require('@/common/background.json');
await this.getFunc(); await this.getFunc();
this.getData(); this.fnInit();
// setTimeout(function() { // setTimeout(function() {
// that.loading = true // that.loading = true
// }, 500) // }, 500)
@ -140,8 +140,7 @@
_this.list1 = []; _this.list1 = [];
await this.getFunc(); await this.getFunc();
} }
this.getData() this.fnInit()
}, },
methods: { methods: {
@ -159,6 +158,39 @@
this.list = []; this.list = [];
this.list1 = []; this.list1 = [];
this.getData() this.getData()
},
async fnInit() {
uni.request({
url: basePath + '/app/offduty/isRest',
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
USER_NAME: loginUser.NAME,
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
console.log(res)
if("0" == res.data.ISREST){
this.getData();
}else{
uni.showModal({
title: "温馨提示",
confirmText: "确定",
content:
"重要提醒：您当前处于离岗状态，无法操作。",
success: (res) => {
if (res.cancel || res.confirm) {
uni.navigateBack();
}
},
});
}
}
})
}, },
getData(){ getData(){
var _this=this; var _this=this;
@ -170,7 +202,6 @@
title: '加载中' title: '加载中'
}) })
uni.request({ uni.request({
url: basePath + '/app/waybillregistration/listForSecurityWaybillre', url: basePath + '/app/waybillregistration/listForSecurityWaybillre',
method: 'POST', method: 'POST',
dataType: 'json', dataType: 'json',

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

@ -45,7 +45,7 @@
<view class="select"> <view class="select">
<view @click="checkTrue1({index:index},1)" class="flex align-center"> <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> <radio class='yellow mr10' :class="item.ISNORMAL==1?'checked':''" :checked="item.ISNORMAL==1" disabled ></radio>
<text>不是</text> <text>否</text>
</view> </view>
</view> </view>
<view class="select"> <view class="select">

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

@ -19,6 +19,21 @@
<input v-model="formData.PHONE" disabled placeholder="请输入手机证号" maxlength="11" name="input" style="color: #cccccc" /> <input v-model="formData.PHONE" disabled placeholder="请输入手机证号" maxlength="11" name="input" style="color: #cccccc" />
</view> </view>
<view class="cu-form-group margin-top-xs"> <view class="cu-form-group margin-top-xs">
<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 class="title">人员类型</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.PERSONNEL_TYPE_NAME}}</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"> <picker v-else @change="pickerChangeData($event,'PERSONNEL_TYPE')" :value="dictData.PERSONNEL_TYPE.index" :range="dictData.PERSONNEL_TYPE.list" range-key="NAME">
@ -26,7 +41,7 @@
{{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}} {{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}}
</view> </view>
</picker> </picker>
</view> </view>-->
<view class="cu-form-group margin-top"> <view class="cu-form-group margin-top">
<view class="title">文化程度</view> <view class="title">文化程度</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.DEGREE_OF_EDUCATION_NAME}}</view> <view v-if="forbidEdit" style="color: #cccccc">{{formData.DEGREE_OF_EDUCATION_NAME}}</view>
@ -85,8 +100,11 @@
import { import {
formatDate,validateIdCard,validateMobile,getLevel formatDate,validateIdCard,validateMobile,getLevel
} from '../../../../common/tool.js'; } from '../../../../common/tool.js';
import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
export default { export default {
name: "register_baseInfo", name: "register_baseInfo",
components: {ZqsSelect},
props: { props: {
applyStatus: { applyStatus: {
type: String, type: String,
@ -162,12 +180,15 @@ import {
this.formData[name] = e.detail.value this.formData[name] = e.detail.value
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
changeSelect(e, name) {
this.$forceUpdate();//强制刷新
},
pickerChangeData(e,name) { pickerChangeData(e,name) {
// 人员类型 // 人员类型
if (name === 'PERSONNEL_TYPE') { if (name === 'PERSONNEL_TYPE') {
this.dictData.PERSONNEL_TYPE.index = e.detail.value; 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 = 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') { if (name === 'POLITICAL_OUTLOOK') {
@ -192,7 +213,7 @@ import {
}, },
validateData() { validateData() {
// 人员类型 // 人员类型
if (!this.formData.PERSONNEL_TYPE) { if (this.formData.PERSONNEL_TYPE.length < 1) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请选择人员类型', title: '请选择人员类型',

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

@ -20,10 +20,10 @@
</view> </view>
<view class="cu-form-group margin-top-xs"> <view class="cu-form-group margin-top-xs">
<view class="title">人员类型</view> <view class="title">人员类型</view>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.PERSONNEL_TYPE_NAME}}</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"> <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"> <view class="picker" style="color: #cccccc">
{{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}} {{formData.PERSONNEL_TYPE.join()}}
</view> </view>
</picker> </picker>
</view> </view>
@ -737,53 +737,55 @@ export default {
} }
// 驾驶证 // 驾驶证
if (this.fileData.driverLicense.length < 1) { if (this.formData.PERSONNEL_TYPE_NAME.find((item) => item === '驾驶员')) {
uni.showToast({ if (this.fileData.driverLicense.length < 1) {
icon: 'none', uni.showToast({
title: '请上传驾驶证照片', icon: 'none',
duration: 2000 title: '请上传驾驶证照片',
}); duration: 2000
return false; });
} return false;
if (!this.formData.DRIVER_LICENSE_NO) { }
uni.showToast({ if (!this.formData.DRIVER_LICENSE_NO) {
icon: 'none', uni.showToast({
title: '请输入驾驶证号', icon: 'none',
duration: 2000 title: '请输入驾驶证号',
}); duration: 2000
return false; });
} return false;
if (this.formData.DRIVING_MODEL.length < 1) { }
uni.showToast({ if (this.formData.DRIVING_MODEL.length < 1) {
icon: 'none', uni.showToast({
title: '请选择准驾车型', icon: 'none',
duration: 2000 title: '请选择准驾车型',
}); duration: 2000
return false; });
} return false;
if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) { }
uni.showToast({ if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) {
icon: 'none', uni.showToast({
title: '请选择初次领证日期', icon: 'none',
duration: 2000 title: '请选择初次领证日期',
}); duration: 2000
return false; });
} return false;
if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) { }
uni.showToast({ if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) {
icon: 'none', uni.showToast({
title: '请选择驾驶证有效期时间', icon: 'none',
duration: 2000 title: '请选择驾驶证有效期时间',
}); duration: 2000
return false; });
} return false;
if (!this.formData.DRIVER_LICENSE_ORGAN) { }
uni.showToast({ if (!this.formData.DRIVER_LICENSE_ORGAN) {
icon: 'none', uni.showToast({
title: '请输入驾驶证的签发机关', icon: 'none',
duration: 2000 title: '请输入驾驶证的签发机关',
}); duration: 2000
return false; });
return false;
}
} }
// 从业资格证证 // 从业资格证证

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

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