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

dev
zhangyanli 2024-05-20 10:38:46 +08:00
parent 52f23a7647 c45fa85a3f
commit 198927a265
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,6 @@
</view>
</view>
</view>
<view v-if="item.ISNORMAL==0 || item.ISNORMAL==1" class="input" >
<textarea :disabled="item.OPERATION_TYPE === 1 ? true : false" maxlength="-1" v-model="item.REMARK" placeholder="检查详细描述" :class="item.OPERATION_TYPE === 1 ? 'bgh' : ''" style="border: 1px solid #eeeeee; z-index: 999; height: 50px; padding: 10px;font-size: 12px; width: 100%"></textarea>
</view>
</radio-group>
</view>
</view>

4
pages/basics/basic-info/components/apply.vue
View File

@ -20,10 +20,10 @@
</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>
<view v-if="forbidEdit" style="color: #cccccc">{{formData.PERSONNEL_TYPE}}</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?formData.PERSONNEL_TYPE_NAME:'请选择'}}
</view>
</picker>
</view>

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

@ -24,7 +24,7 @@
:multiple="true"
:list="dictData.PERSONNEL_TYPE.list"
:show-search="false"
v-model="formData.PERSONNEL_TYPE"
v-model="formData.PERSONNEL_TYPE_NAME"
label-key="NAME"
value-key="DICTIONARIES_ID"
placeholder="请选择人员类型"
@ -188,7 +188,7 @@ import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
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_TYPENAME = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].NAME
this.formData.PERSONNEL_TYPE_NAME = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].NAME
}
// 政治面貌
if (name === 'POLITICAL_OUTLOOK') {

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

@ -20,12 +20,19 @@
</view>
<view class="cu-form-group margin-top-xs">
<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.join()}}
</view>
</picker>
<zqs-select
:multiple="true"
:list="dictData.PERSONNEL_TYPE.list"
:show-search="false"
v-model="formData.PERSONNEL_TYPE_NAME"
disabled
label-key="NAME"
value-key="DICTIONARIES_ID"
placeholder="请选择人员类型"
title="选择人员类型"
clearable
@change="changeSelect($event, 'PERSONNEL_TYPE')"
></zqs-select>
</view>
<!-- 身份证 -->

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

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