From 434e95b8b1e7ffbdcd179a06d777968b117b85ed Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 13 Mar 2024 17:31:23 +0800
Subject: [PATCH] 更新
---
subPackage/workbench/views/editExamine.vue | 12 +-
subPackage/article/signature.vue | 9 +
subPackage/workbench/components/formItem.vue | 108 ++++++++++++++++++++++++++
subPackage/workbench/components/formItem.vue.bak | 48 ++++++++++++
subPackage/workbench/views/examine.vue | 24 ++++++
subPackage/workbench/views/cscj.vue | 15 +--
common/setting.js | 4
7 files changed, 199 insertions(+), 21 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 97a0c9e..e928fc9 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
- devUrl: 'http://192.168.2.140:9528',
- // devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // devUrl: 'http://192.168.2.140:9528',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/subPackage/article/signature.vue b/subPackage/article/signature.vue
index b561407..18ee543 100644
--- a/subPackage/article/signature.vue
+++ b/subPackage/article/signature.vue
@@ -121,9 +121,9 @@
// prePage.$vm.voteRequest(src);
}
- uni.navigateBack({
- delta: 2
- })
+ // uni.navigateBack({
+ // delta: 2
+ // })
},
confirmValidationCode() {
@@ -131,6 +131,9 @@
let prePage = pages[pages.length - 2];
prePage.$vm.voteRequest(this.imgUrl);
this.isShowPopup = false;
+ uni.navigateBack({
+ delta: 2
+ })
},
diff --git a/subPackage/workbench/components/formItem.vue b/subPackage/workbench/components/formItem.vue
index f1e9d66..3a6c439 100644
--- a/subPackage/workbench/components/formItem.vue
+++ b/subPackage/workbench/components/formItem.vue
@@ -10,17 +10,63 @@
<u-form-item label="暂住地" class="form-item">
<u--input v-model="form.tempAddress" border="none" placeholder="请填写地址"></u--input>
</u-form-item>
+ <u-form-item label="身份证号" class="form-item">
+ <u--input v-model="form.idCard" border="none" placeholder="请填写地址"></u--input>
+ </u-form-item>
+ <u-form-item label="微信号" class="form-item">
+ <u--input v-model="form.wxAccount" border="none" placeholder="请填写地址"></u--input>
+ </u-form-item>
+ <u-form-item label="年龄" class="form-item">
+ <u--input v-model="form.age" border="none" placeholder="请填写地址"></u--input>
+ </u-form-item>
+ <u-form-item @click="showGenderPicker = true" class="form-item" label="性别" prop="legalGender">
+ <u--input border="none" v-model="genderValue" disabled disabledColor="#ffffff" placeholder="请选择性别">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item @click="showNationPicker = true" class="form-item" label="民族" prop="ethnicity">
+ <u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff" placeholder="请选择民族">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item label="工作单位" class="form-item">
+ <u--input v-model="form.employer" border="none" placeholder="请填写地址"></u--input>
+ </u-form-item>
+ <u-form-item label="岗位性质" class="form-item">
+ <u--input v-model="form.jobNature" border="none" placeholder="请填写地址"></u--input>
+ </u-form-item>
+ <u-form-item label="户籍地址" class="form-item">
+ <u--input v-model="form.registeredAddress" border="none" placeholder="请填写地址"></u--input>
+ </u-form-item>
</u-form>
+ <u-picker :defaultIndex="nationTypeListIndex" :closeOnClickOverlay="true" :show="showNationPicker"
+ :columns="[nationTypeList]" @close="showNationPicker = false" @cancel="showNationPicker = false"
+ keyName="name" @confirm="confirmNation"></u-picker>
+
+ <u-picker :defaultIndex="genderIndex" :closeOnClickOverlay="true" :show="showGenderPicker" :columns="[gender]"
+ @close="showGenderPicker = false" @cancel="showGenderPicker = false" keyName="name"
+ @confirm="confirmGender"></u-picker>
</view>
</template>
<script>
+ import {
+ bizDictionary
+ } from '@/api/system/dict.js'
export default {
data() {
return {
form: {
name: '',
telephone: '',
- tempAddress: ''
+ tempAddress: '',
+ legalIdCard: '',
+ gender: "",
+ ethnicity: "",
+ registeredAddress: "",
+ jobNature: "",
+ wxAccount: "",
+ employer: "",
+ jobNature: ""
},
rules: {
name: {
@@ -29,8 +75,66 @@
message: '请填写姓名',
trigger: ['blur', 'change']
}
- }
+ },
+ nationTypeList: [], //民族
+ nationTypeIndex: [0],
+ nationValue: "",
+ gender: [{ //性别
+ value: 1,
+ name: '男',
+ },
+ {
+ value: 0,
+ name: '女',
+ }
+ ],
+ genderIndex: [0],
+ genderValue: "",
+ showNationPicker: false,
+ showGenderPicker: false
}
+ },
+
+ created() {
+ this.getAllBizDict()
+ },
+
+ methods: {
+ async getAllBizDict() {
+ // 获取民族
+ await this.getBizDict('nationType', this.nationTypeList);
+ },
+
+ // 获取业务字典
+ async getBizDict(code, list) {
+ const param = {
+ code: code
+ }
+ const res = await bizDictionary(param)
+ res.data.forEach(e => {
+ list.push({
+ name: e.dictValue,
+ value: Number(e.dictKey)
+ })
+ })
+ },
+
+ //选择民族
+ confirmNation(e) {
+ this.nationIndex = e.indexs;
+ this.nationValue = e.value[0].name;
+ this.form.ethnicity = e.value[0].value;
+ this.showNationPicker = false;
+ },
+
+ //选择性别
+ confirmGender(e) {
+ this.genderIndex = e.indexs;
+ this.genderValue = e.value[0].name;
+ this.form.gender = e.value[0].value;
+ this.showGenderPicker = false;
+ },
+
}
}
</script>
diff --git a/subPackage/workbench/components/formItem.vue.bak b/subPackage/workbench/components/formItem.vue.bak
new file mode 100644
index 0000000..62d1ae1
--- /dev/null
+++ b/subPackage/workbench/components/formItem.vue.bak
@@ -0,0 +1,48 @@
+<template>
+ <view class="form-box">
+ <u-form labelWidth="70" :model="form" :rules="rules" ref="form">
+ <u-form-item label="姓名" required prop="name" class="form-item">
+ <u--input v-model="form.name" border="none" placeholder="请填写姓名"></u--input>
+ </u-form-item>
+ <u-form-item label="电话号码" class="form-item">
+ <u--input v-model="form.telephone" border="none" placeholder="请填写电话号码"></u--input>
+ </u-form-item>
+ <u-form-item label="暂住地" class="form-item">
+ <u--input v-model="form.tempAddress" border="none" placeholder="请填写地址"></u--input>
+ </u-form-item>
+ </u-form>
+ </view>
+</template>
+<script>
+ export default {
+ data() {
+ return {
+ form: {
+ name: '',
+ telephone: '',
+ tempAddress: ''
+ },
+ rules: {
+ name: {
+ type: 'string',
+ required: true,
+ message: '请填写姓名',
+ trigger: ['blur', 'change']
+ }
+ }
+ }
+ }
+ }
+</script>
+<style lang="scss" scoped>
+ .form-box {
+ background-color: #fff;
+ padding: 0 30rpx;
+
+ .form-item {
+ border-bottom: 1rpx solid #f6f6f6;
+ padding: 0 20rpx;
+ background-color: #fff;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index a345c4e..c5afb59 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -144,7 +144,7 @@
</view>
- <view class="item">
+ <view class="item" v-if="false">
<view class="box-title">
<box-title title="房东信息"></box-title>
</view>
@@ -170,7 +170,7 @@
</u-form-item>
</view>
- <view class="item">
+ <view class="item" v-if="false">
<view class="box-title">
<box-title title="法人信息"></box-title>
</view>
@@ -199,7 +199,7 @@
</u-form-item>
<u-form-item @click="showNationPicker = true" class="form-item" labelWidth="100" label="民族"
prop="ethnicity">
- <u--input border="none" v-model="ntaionValue" disabled disabledColor="#ffffff"
+ <u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff"
placeholder="请选择民族">
</u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
@@ -211,23 +211,22 @@
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="微信号:" prop="legalWxAccount">
- <u--input border="none" type="idcard" v-model="form.legalWxAccount" placeholder="请输入">
+ <u--input border="none" v-model="form.legalWxAccount" placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="工作单位:" prop="employer">
- <u--input border="none" type="idcard" v-model="form.employer" placeholder="请输入">
+ <u--input border="none" v-model="form.employer" placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="岗位性质:" prop="legalJobNature">
- <u--input border="none" type="idcard" v-model="form.legalJobNature" placeholder="请输入">
+ <u--input border="none" v-model="form.legalJobNature" placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="户籍地址:" prop="legalRegisteredAddress">
- <u--textarea border="none" type="idcard" v-model="form.legalRegisteredAddress"
- placeholder="请输入">
+ <u--textarea border="none" v-model="form.legalRegisteredAddress" placeholder="请输入">
</u--textarea>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index e31de9c..f9a1b72 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -37,13 +37,13 @@
<u-form-item label="法人信息" required class="form-item" prop="legalPerson">
<u--input border="none" v-model="form.legalPerson" placeholder="请填写法人信息"></u--input>
</u-form-item>
- <u-form-item label="法人身份证" :required="isRequired" class="form-item" prop="legalIdCard">
+ <!-- <u-form-item label="法人身份证" :required="isRequired" class="form-item" prop="legalIdCard">
<u--input border="none" v-model="form.legalIdCard" placeholder="请填写法人身份证"></u--input>
- </u-form-item>
- <u-form-item label="法人电话" class="form-item" prop="legalTel" :required="isRequired">
+ </u-form-item> -->
+ <u-form-item label="法人电话" class="form-item" prop="legalTel" required>
<u--input border="none" type="number" v-model="form.legalTel" placeholder="请填写法人电话"></u--input>
</u-form-item>
- <u-form-item class="form-item" :required="isRequired" :disabled="isDisabled" label="微信号:"
+ <!-- <u-form-item class="form-item" :required="isRequired" :disabled="isDisabled" label="微信号:"
prop="legalWxAccount">
<u--input border="none" type="idcard" v-model="form.legalWxAccount" placeholder="请输入">
</u--input>
@@ -86,12 +86,12 @@
prop="legalTempAddress">
<u--textarea border="none" type="idcard" v-model="form.legalTempAddress" placeholder="请输入">
</u--textarea>
- </u-form-item>
+ </u-form-item> -->
</view>
- <view class="item bgc-ff mt-20">
+ <view class="item bgc-ff mt-20" v-if="false">
<view class="box-title">
<box-title title="房东信息"></box-title>
diff --git a/subPackage/workbench/views/examine.vue b/subPackage/workbench/views/examine.vue
index 6d9fd8e..7e04eac 100644
--- a/subPackage/workbench/views/examine.vue
+++ b/subPackage/workbench/views/examine.vue
@@ -43,9 +43,33 @@
<text>{{ item.telephone || '未完善' }}</text>
</view>
<view class="content">
+ <text>微信号</text>
+ <text>{{ item.wxAccount || '未完善' }}</text>
+ </view>
+ <view class="content">
+ <text>身份证号</text>
+ <text>{{ item.idCard || '未完善' }}</text>
+ </view>
+ <view class="content">
+ <text>年龄</text>
+ <text>{{ item.age || '未完善' }}</text>
+ </view>
+ <view class="content">
+ <text>工作单位</text>
+ <text>{{ item.employer || '未完善' }}</text>
+ </view>
+ <view class="content">
+ <text>岗位性质</text>
+ <text>{{ item.jobNature || '未完善' }}</text>
+ </view>
+ <view class="content">
<text>暂住地</text>
<text>{{ item.tempAddress || '未完善' }}</text>
</view>
+ <view class="content">
+ <text>户籍地址</text>
+ <text>{{ item.registeredAddress || '未完善' }}</text>
+ </view>
</view>
</view>
</view>
--
Gitblit v1.9.3