From 72f5f5ad0ef15d211ee5f7f51933f17d0e1650b4 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 26 Apr 2024 16:43:20 +0800
Subject: [PATCH] 更新
---
pages/login/login-account.vue | 13
utils/func.js | 5
api/system/index.js | 22 ++
subPackage/school/troubleAuditList.vue | 4
subPackage/workbench/views/audit.vue | 3
subPackage/workbench/views/editCscj.vue | 30 +-
subPackage/workbench/views/editExamine.vue | 64 ++++++
pages/home/index.vue | 135 +++++++++++--
subPackage/school/trouble.vue | 3
subPackage/workbench/views/cscj.vue | 43 +++-
subPackage/school/troubleDetail.vue | 5
common/setting.js | 2
subPackage/school/clockIn.vue | 147 +++++++++++++-
subPackage/school/securityDetail.vue | 2
pages/home/index.scss | 61 ++++++
subPackage/task/index.vue | 6
16 files changed, 472 insertions(+), 73 deletions(-)
diff --git a/api/system/index.js b/api/system/index.js
index 0ce77f2..4588fd3 100644
--- a/api/system/index.js
+++ b/api/system/index.js
@@ -44,6 +44,28 @@
})
}
+
+export const sendLoginCode = (params) => {
+ return http.request({
+ url: '/blade-smsSend/smsSend/loginSend',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
+
+
+export const checkLoginCode = (params) => {
+ return http.request({
+ url: '/blade-smsSend/smsSend/checkCode',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
+
export const searchContent = (params) => {
return http.request({
url: '/es/es/page',
diff --git a/common/setting.js b/common/setting.js
index 1cb651f..45fea46 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,7 +10,7 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
- devUrl: 'http://192.168.2.111:9528',
+ devUrl: 'http://192.168.2.105:9528',
// devUrl: 'https://srgdjczzxtpt.com:2080/api',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
diff --git a/pages/home/index.scss b/pages/home/index.scss
index 5f2cc98..236c507 100644
--- a/pages/home/index.scss
+++ b/pages/home/index.scss
@@ -318,4 +318,65 @@
top:6rpx;
display: inline-block;
}
+ .login-mode {
+ padding: 20rpx;
+ }
+
+ .login-input {
+ height: 90rpx;
+ border-radius: 45rpx;
+ background-color: #f0f0f0;
+ padding: 0 30rpx 0 40rpx;
+ margin-top: 20rpx;
+ width: 550rpx;
+ box-sizing: border-box;
+ }
+
+ .login-input text {
+ flex: 1;
+ }
+
+ .login-input input {
+ height: 90rpx;
+ width: 100%;
+ // flex: 3
+ }
+
+ .login-input-btn {
+ width: 200rpx;
+ height: 60rpx;
+ line-height: 60rpx;
+ border-radius: 30rpx;
+ padding: 0;
+ margin: 0;
+ transition: all ease-out .3s;
+ border: none;
+ }
+
+ .login-input-btn::after {
+ border: none;
+ }
+
+ .login-input-btn[disabled] {
+ background-color: #fff !important;
+ color: #aaa !important;
+ }
+
+ .login-explain {
+ margin-top: 10rpx;
+ }
+
+ .login-btn {
+ width: 550rpx;
+ height: 90rpx;
+ line-height: 90rpx;
+ border-radius: 45rpx;
+ margin-top: 50rpx;
+ transition: all ease-out .3s;
+ }
+
+ .login-btn[disabled] {
+ background-color: #9DB9F7 !important;
+ color: #fff !important;
+ }
\ No newline at end of file
diff --git a/pages/home/index.vue b/pages/home/index.vue
index f50aab0..abb352c 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -217,14 +217,14 @@
</view>
</u-grid-item>
<!-- <block v-if="curSelectSite.categoryList[0].parentNo == 1601"> -->
+
+ <u-grid-item @click="navToSchoolClockIn()" v-if="roleName == 'xyty'">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-29.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">护学打卡</text>
+ </view>
+ </u-grid-item>
<block v-if="roleName == 'xyzt' || roleName == 'xyty'">
- <u-grid-item @click="navToSchoolClockIn()">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon name="/static/icon/nav-29.png" width="80rpx"
- height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">护学打卡</text>
- </view>
- </u-grid-item>
<u-grid-item @click="navigatorPage('/subPackage/school/trouble?type=1')">
<view class="nav-item flex f-d-c a-i-c">
<u-icon name="/static/icon/nav-29.png" width="80rpx"
@@ -297,8 +297,35 @@
<notice-list :data="notice" />
</view>
</view>
-
</view>
+
+
+ <u-popup :show="isShowModal" @close="isShowModal = false" mode="center" :round="10"
+ :closeOnClickOverlay="false">
+ <view class='login-mode'>
+ <view class="f-30 fw">
+ 安全验证
+ </view>
+ <view class="login-input">
+ <input class='f-30 c-33' type='number' placeholder='请输入手机号' v-model="phone"
+ placeholder-class='c-aa f-28'></input>
+ </view>
+
+ <view class='flex a-i-c login-input'>
+
+ <input class='f-30 c-33' type='number' placeholder='请输入验证码' v-model="validationCode"
+ placeholder-class='c-aa f-28'></input>
+ <button class='login-input-btn f-24 c-33' :disabled="phone?false:true"
+ @click='getValidationCode'>{{text}}</button>
+ </view>
+ <!-- <button class='login-btn c-ff f-30' :class='validationCode?"bgc-main":""'
+ :disabled="validationCode?false:true">确定</button> -->
+ <button class='login-btn c-ff f-30 bgc-main' @click="confirmValidationCode()">确定</button>
+ </view>
+ </u-popup>
+
+
+
<tabBar :current="0" :list="tabList" />
</view>
</template>
@@ -323,7 +350,9 @@
getBannerList,
getContact,
getQrCodeDetail,
- searchContent
+ searchContent,
+ sendLoginCode,
+ checkLoginCode
} from "@/api/system/index"
import {
minioBaseUrl
@@ -585,7 +614,6 @@
],
-
tabs3: [{
name: '公众服务',
list: [{
@@ -670,12 +698,16 @@
tabList: [],
keyword: "",
searchList: [],
- roleName: ""
+ roleName: "",
+ isShowModal: false,
+ phone: "",
+ validationCode: "",
+ text: "获取验证码",
+ isSendCode: false,
+ isCheckCode: false
}
},
-
onLoad() {
-
this.init()
uni.$on('refresh', () => {
this.selectSiteIndex = [0, 0]
@@ -708,7 +740,6 @@
onShareAppMessage() {
},
-
computed: {
hasMenu() {
return (name) => {
@@ -721,7 +752,6 @@
}
}
},
-
watch: {
'curSelectSite.id': {
handler(newVal, oldVal) {
@@ -735,7 +765,6 @@
deep: true,
immediate: true
},
-
'curSelectSite.addressType': {
handler(newVal, oldVal) {
if (newVal) {
@@ -836,7 +865,8 @@
let data = res.data;
let count = 0;
count += Number(data.bqsj) + Number(data.xfzc) + Number(data.xfyhzg) + Number(data.qbhs) +
- Number(data.cssh) + Number(data.czsh) + Number(data.jzzsq) + Number(data.wztj);
+ Number(data.cssh) + Number(data.czsh) + Number(data.jzzsq) + Number(data.wztj) + Number(
+ data.xyaqyhpc) + Number(data.xyjfmd) + Number(data.xyyh);
this.taskCount = count
})
},
@@ -988,8 +1018,76 @@
uni.setStorageSync("curHouseCode", data[0].children[0].id)
}
uni.setStorageSync("curStreet", data[0].name);
+
+ if (this.selectRole.roleAlias == "xyzt" && uni.getStorageSync("pageType")) {
+ uni.navigateTo({
+ url: `/subPackage/school/trouble?type=${uni.getStorageSync("pageType")}`
+ })
+ }
+ if (this.selectRole.roleAlias == "xyty" && uni.getStorageSync("pageType")) {
+ this.isShowModal = true;
+ }
}
// this.buildSiteColumn(data, 0)
+ },
+
+ getValidationCode() {
+ let phone_reg = /^1(3|4|5|6|7|8|9)\d{9}$/;
+ if (!phone_reg.test(this.phone)) {
+ this.$showTips("手机号码有误~");
+ return false;
+ }
+ if (this.isSendCode) return;
+ let second = 60;
+ this.isSendCode = true;
+ sendLoginCode({
+ phone: uni.getStorageSync("userInfo").phone,
+ }).then(res => {
+ if (res.code == 200) {
+ let time = setInterval(() => {
+ second--
+ this.text = `${second}秒后获取`
+ if (second == 0 || !this.isLogin) {
+ clearInterval(time);
+ this.isSendCode = false
+ this.text = "获取验证码";
+ }
+ }, 1000)
+ } else {
+ this.isSendCode = false;
+ }
+ })
+ },
+
+ confirmValidationCode() {
+ if (!this.validationCode) {
+ this.$showTips("请输入验证码");
+ return
+ }
+ this.checkCodeRequest();
+ },
+
+ checkCodeRequest() {
+ checkLoginCode({
+ phone: this.phone,
+ code: this.validationCode
+ }).then(res => {
+ if (res.code == 200) {
+ this.navToPage();
+ }
+ })
+ },
+
+ navToPage() {
+ if (uni.getStorageSync("pageType") == 3) {
+ uni.navigateTo({
+ url: "/subPackage/school/clockIn"
+ })
+ } else {
+ uni.navigateTo({
+ url: `/subPackage/school/trouble?type=${uni.getStorageSync("pageType")}`
+ })
+ }
},
buildSiteColumn(dataList, index) {
@@ -1114,10 +1212,8 @@
},
setLiveMenu(arr) {
- console.log("0000", arr);
if (arr.length) {
let index3 = arr.findIndex(item => item.name.trim() == "取保监居")
- console.log("0000", index3)
if (index3 != -1) {
console.log(uni.getStorageSync("activeRole").roleName, 11111);
this.isBailer = true;
@@ -1130,7 +1226,6 @@
// }]
// })
} else {
- console.log(2222)
this.isBailer = false;
let itemIndex = this.tabs.findIndex(item => item.name.trim() == "警务服务")
if (itemIndex != -1) {
diff --git a/pages/login/login-account.vue b/pages/login/login-account.vue
index ff894f1..699056b 100644
--- a/pages/login/login-account.vue
+++ b/pages/login/login-account.vue
@@ -138,8 +138,6 @@
form: {
phone: "",
password: "",
-
-
},
rules: {
'phone': [{
@@ -175,13 +173,17 @@
}
},
- onLoad() {
+ onLoad(option) {
+ if (option.type) {
+ //type 1 安全隐患 2 矛盾纠纷 3 护学打卡
+
+ uni.setStorageSync("pageType", option.type);
+ }
this.screenHeight = `${uni.getSystemInfoSync().screenHeight}px`;
this.form.phone = uni.getStorageSync("phoneNmber");
},
methods: {
-
accountLogin() {
// if(!this.isAgreement){
@@ -272,8 +274,6 @@
margin-top: 40rpx;
font-weight: 700;
font-size: 32rpx;
-
-
}
}
@@ -282,6 +282,7 @@
height: 104rpx;
display: block;
margin: 320rpx 0 120rpx;
+
}
.content {
diff --git a/subPackage/school/clockIn.vue b/subPackage/school/clockIn.vue
index 3e97edb..7ca38a4 100644
--- a/subPackage/school/clockIn.vue
+++ b/subPackage/school/clockIn.vue
@@ -1,22 +1,40 @@
<template>
<view class="">
+
+
+ <view class="top item flex j-c-s-b a-i-c bgc-ff" @click="onScan()" v-if="roleName =='mj'">
+ <view class="flex a-i-c">
+ <u-icon name="/static/icon/nav-05.png" width="90rpx" height="90rpx"></u-icon>
+ <text class="f-28 ml-10">扫码获取信息</text>
+ </view>
+ <u-icon name="arrow-right" size="20"></u-icon>
+ </view>
+
<view class="content bgc-ff">
<u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="90"
:labelStyle="{fontSize:'28rpx'}">
- <u-form-item label="家长姓名" prop="name" borderBottom ref="name">
+
+ <u-form-item label="角色类型" prop="type" borderBottom ref="phone" @click="showPicker = true"
+ v-if="roleName !='mj'">
+ <u-input v-model="clockInRoleTypeValue" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
+ inputAlign="right" disabled disabledColor="#ffffff"></u-input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+ <u-form-item label="家长姓名" prop="name" borderBottom ref="name" v-if="info.type == 2">
<u-input v-model="info.name" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="家长手机号" prop="phone" borderBottom ref="phone">
+ <u-form-item label="家长手机号" prop="phone" borderBottom ref="phone" v-if="info.type == 2">
<u-input v-model="info.phone" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="学生姓名" prop="realName" borderBottom ref="realName">
+ <u-form-item label="学生姓名" prop="realName" borderBottom ref="realName" v-if="info.type != 2">
<u-input v-model="info.realName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="学生班级" prop="gradeAndClass" borderBottom ref="gradeAndClass">
+ <u-form-item label="学生班级" prop="gradeAndClass" borderBottom ref="gradeAndClass" v-if="info.type != 2">
<u-input v-model="info.gradeAndClass" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
@@ -58,8 +76,18 @@
</view>
- <button class="submit-btn" @click="sumitInfo">提交</button>
+ <!-- <button class="submit-btn" @click="sumitInfo">提交</button> -->
<!-- <button class="list-btn" @click="navigatorPage">我上报的事件</button> -->
+
+ <footer-btn @click="sumitInfo"></footer-btn>
+
+
+ <u-picker :defaultIndex="clockInRoleTypeIndex" :closeOnClickOverlay="true" :show="showPicker"
+ :columns="[statusList]" @close="showPicker = false" @cancel="showPicker = false" keyName="name"
+ @confirm="confirmPicker"></u-picker>
+
+
+
</view>
</template>
@@ -69,17 +97,24 @@
import {
addClockIn
} from "@/api/school/school.js";
+
+
+ import {
+ getQrCodeDetail
+ } from "@/api/system/index"
export default {
mixins: [uploadMixin],
data() {
return {
info: {
+ type: "",
name: "",
phone: "",
location: "",
gradeAndClass: "",
lat: "",
- lng: ""
+ lng: "",
+ houseCode: ""
},
rules: {
'name': {
@@ -111,14 +146,41 @@
},
desc: "",
title: "",
- curSelectSite: {}
+ curSelectSite: {},
+ statusList: [{
+ name: "家长",
+ id: 2
+ },
+ {
+ name: "老师",
+ id: 3
+ },
+
+ {
+ name: "志愿者",
+ id: 4
+ }
+ ],
+ clockInRoleTypeList: [],
+ clockInRoleTypeIndex: [0],
+ clockInRoleTypeValue: "",
+ showPicker: false,
+ roleName: ""
}
},
onLoad(option) {
if (option.type) {
this.info.type = option.type
}
-
+ let {
+ roleAlias
+ } = uni.getStorageSync("activeRole");
+ this.roleName = roleAlias
+ if (roleAlias == "mj") {
+ this.info.type = 1;
+ } else {
+ this.info.houseCode = uni.getStorageSync("siteInfo").houseCode;
+ }
},
// onShow() {
@@ -126,6 +188,7 @@
// this.info.addressCode = this.curSelectSite.houseCode
// },
methods: {
+
getLocation() {
uni.chooseLocation({
@@ -139,7 +202,6 @@
sumitInfo() {
-
this.$refs.form.validate().then(valid => {
if (this.form.images.length > 0) {
let urls = []
@@ -148,6 +210,7 @@
})
this.info.images = urls.join(",")
}
+
addClockIn(this.info).then(res => {
this.$showTips("提交成功", "success")
setTimeout(() => {
@@ -156,10 +219,69 @@
})
})
},
+
+ //选择隐患类型
+ confirmPicker(e) {
+ this.clockInRoleTypeIndex = e.indexs;
+ this.clockInRoleTypeValue = e.value[0].name;
+ this.info.type = e.value[0].value;
+ this.showPicker = false;
+ },
+
+
navigatorPage() {
let url = "/subPackage/bs/views/repairList" + "?title=" + this.title + "&type=" + this.info.type
this.$u.func.globalNavigator(url, "navTo")
- }
+ },
+
+
+ onScan() {
+ uni.scanCode({
+ success: (res) => {
+ let obj = this.getUrlParams(res.result);
+ this.getHouseType(obj.stdId);
+ }
+ })
+ },
+
+ getUrlParams(url) {
+ let urlStr = url.split('?')[1]
+ let obj = {};
+ let paramsArr = urlStr.split('&')
+ for (let i = 0, len = paramsArr.length; i < len; i++) {
+ let arr = paramsArr[i].split('=')
+ obj[arr[0]] = arr[1];
+ }
+ return obj
+ },
+
+ getHouseType(code) {
+ getQrCodeDetail({
+ roleName: uni.getStorageSync("activeRole").roleName,
+ addressCode: code
+ }).then(res => {
+ let {
+ isJur,
+ doorplateType,
+ addressLevel
+ } = res.data;
+ if (isJur == 1) {
+ if (doorplateType == "中门牌" || doorplateType == "小门牌") {
+ this.info.houseCode = code;
+ }
+ } else {
+ uni.showModal({
+ title: "提示!",
+ content: "该区域不是您管辖范围",
+ showCancel: false
+ })
+ }
+
+ })
+ },
+
+
+
}
}
</script>
@@ -169,6 +291,11 @@
background-color: #F5F5F5;
}
+ .top {
+ padding: 20rpx;
+ margin: 20rpx 30rpx 0;
+ }
+
.content {
margin: 20rpx 30rpx;
padding: 0 30rpx;
diff --git a/subPackage/school/securityDetail.vue b/subPackage/school/securityDetail.vue
index e357cf4..3a34183 100644
--- a/subPackage/school/securityDetail.vue
+++ b/subPackage/school/securityDetail.vue
@@ -147,7 +147,7 @@
<!-- <block v-if="info.rectificationFlag == 2">
</block> -->
- <audit-action v-if="roleType == 1 && info.status == 1 && info.rectificationFlag != 3" @handle="submitAudit" />
+ <audit-action v-if="roleType == 1 && info.status == 1 && info.rectificationFlag == 2" @handle="submitAudit" />
<block v-if="info.rectificationFlag == 1">
<footer-btn v-if="roleType == 2 &&( info.status == 3 || info.status == 1)" text="提交"
@click="submitInfo()" />
diff --git a/subPackage/school/trouble.vue b/subPackage/school/trouble.vue
index 52b8779..67d0c18 100644
--- a/subPackage/school/trouble.vue
+++ b/subPackage/school/trouble.vue
@@ -72,8 +72,7 @@
required: true,
message: '请输入家长姓名',
trigger: ['blur', 'change']
- },
-
+ }
},
desc: "",
title: "",
diff --git a/subPackage/school/troubleAuditList.vue b/subPackage/school/troubleAuditList.vue
index cff0f9e..12903f1 100644
--- a/subPackage/school/troubleAuditList.vue
+++ b/subPackage/school/troubleAuditList.vue
@@ -23,8 +23,8 @@
<view class="list">
<view class="list-item bgc-ff mb-20" v-for="item in siteList" :key="item.id" @click="pushPage(item.id)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
- <text class="f-32 fw" v-if="item.type == 1">校园安全隐患排查</text>
- <text class="f-32 fw" v-if="item.type == 2">校园矛盾纠纷排查</text>
+ <text class="f-32 fw">{{item.placeName}}</text>
+
<!-- <u-tag text="待审批" type="warning" plain plainFill></u-tag> -->
<u-tag class="u_tag" size="mini" :text="findObjValue(item.confirmFlag, tabList).name"
:type="findObjValue(item.confirmFlag, tabList).type" plain plainFill></u-tag>
diff --git a/subPackage/school/troubleDetail.vue b/subPackage/school/troubleDetail.vue
index b9597d8..aedc1b5 100644
--- a/subPackage/school/troubleDetail.vue
+++ b/subPackage/school/troubleDetail.vue
@@ -73,7 +73,7 @@
<audit-action @handle="submit"
v-if="roleType == 2 && info.confirmFlag == 1 && roleTypeName == 'mj' "></audit-action>
<footer-btn v-if="roleType == 1 && info.confirmFlag == 3" text="编辑" @click="navToEdit" />
- <footer-btn v-if="roleTypeName == 'xyzt'" text="上报" @click="submitInfo" />
+ <footer-btn v-if="roleTypeName == 'xyzt'" @click="submitInfo" />
</view>
</template>
@@ -105,7 +105,8 @@
id: 2
}
],
- roleTypeName: ""
+ roleTypeName: "",
+
}
},
diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index a681124..35d4e54 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -235,6 +235,12 @@
i.count = data.cssh;
} else if (i.name.trim() == "无诈申请") {
i.count = data.wztj;
+ } else if (i.name.trim() == "校园安全隐患排查") {
+ i.count = data.xyaqyhpc;
+ } else if (i.name.trim() == "校园纠纷矛盾") {
+ i.count = data.xyjfmd;
+ } else if (i.name.trim() == "校园安保检查") {
+ i.count = data.xyyh;
} else {
i.count = data.qbhs;
}
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index d1799a6..4e7d150 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -22,7 +22,8 @@
<view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k"
@click="navTo(i.id,i.reportType,i.status,i.type)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
- <text class="f-32 fw">{{i.name}}</text>
+ <text class="f-32 fw" v-if="i.reportType == 4">{{i.placeName}}</text>
+ <text class="f-32 fw" v-else>{{i.name}}</text>
<u-tag v-if="i.status == 4" text="待完成" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.status == 2" text="审核通过" type="success" plain plainFill></u-tag>
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 9d76a39..404d133 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -257,7 +257,7 @@
</u-form-item>
</view>
- <view class="item" v-if="firstId == 1601">
+ <view class="item" v-if="form.label == 160102 || form.label == 160103">
<view class="flex j-c-s-b a-i-c">
<view class="box-title" style="width:50%;">
<box-title title="学校信息"></box-title>
@@ -276,35 +276,39 @@
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
- label="专职保安:" prop="securityNumoer">
- <u--input border="none" type="number" v-model="form.placeExtEntity.securityNumoer"
+ label="专职保安:" prop="securityNumber">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.securityNumber"
placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
- label="专职门卫:" prop="gusrdNumber">
- <u--input border="none" v-model="form.placeExtEntity.gusrdNumber" placeholder="请输入">
+ label="专职门卫:" prop="guardNumber">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.guardNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="专兼职保卫人员:" prop="temporarySecurityNumber">
- <u--input border="none" v-model="form.placeExtEntity.temporarySecurityNumber" placeholder="请输入">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.temporarySecurityNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
- label="走读/寄宿:" prop="daystudentsNumber">
- <u--input border="none" v-model="form.placeExtEntity.daystudentsNumber" placeholder="请输入">
+ label="走读/寄宿:" prop="dayStudentsNumber">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.dayStudentsNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="住校生人数:" prop="residentialStudentsNumber">
- <u--input border="none" v-model="form.placeExtEntity.residentialStudentsNumber"
+ <u--input border="none" type="number" v-model="form.placeExtEntity.residentialStudentsNumber"
placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="宿舍管理人员:" prop="housemasterNumber">
- <u--input border="none" v-model="form.placeExtEntity.housemasterNumber" placeholder="请输入">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.housemasterNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
</view>
@@ -533,10 +537,10 @@
studentNumber: "",
workersNumber: "",
- securityNumoer: "",
- gusrdNumber: "",
+ securityNumber: "",
+ guardNumber: "",
temporarySecurityNumber: "",
- daystudentsNumber: "",
+ dayStudentsNumber: "",
residentialStudentsNumber: "",
housemasterNumber: ""
}
@@ -1001,6 +1005,15 @@
legalTel: "",
legalIdCard: "",
placeId: "",
+
+ studentNumber: "",
+ workersNumber: "",
+ securityNumber: "",
+ guardNumber: "",
+ temporarySecurityNumber: "",
+ dayStudentsNumber: "",
+ residentialStudentsNumber: "",
+ housemasterNumber: ""
}
}
} else {
@@ -1236,6 +1249,10 @@
this.form.placeExtEntity.legalIdCard = this.form.principalIdCard;
}
+
+ console.log("======>", this.form)
+ return;
+
add(this.form).then(res => {
uni.showToast({
icon: 'success',
diff --git a/subPackage/workbench/views/editCscj.vue b/subPackage/workbench/views/editCscj.vue
index 7e3d4ab..9efc7bc 100644
--- a/subPackage/workbench/views/editCscj.vue
+++ b/subPackage/workbench/views/editCscj.vue
@@ -218,7 +218,7 @@
</u-form-item>
</view>
- <view class="item" v-if="false">
+ <view class="item" v-if="form.label == 160102 || form.label == 160103">
<view class="flex j-c-s-b a-i-c">
<view class="box-title" style="width:50%;">
<box-title title="学校信息"></box-title>
@@ -237,35 +237,39 @@
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
- label="专职保安:" prop="securityNumoer">
- <u--input border="none" type="number" v-model="form.placeExtEntity.securityNumoer"
+ label="专职保安:" prop="securityNumber">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.securityNumber"
placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
- label="专职门卫:" prop="gusrdNumber">
- <u--input border="none" v-model="form.placeExtEntity.gusrdNumber" placeholder="请输入">
+ label="专职门卫:" prop="guardNumber">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.guardNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="专兼职保卫人员:" prop="temporarySecurityNumber">
- <u--input border="none" v-model="form.placeExtEntity.temporarySecurityNumber" placeholder="请输入">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.temporarySecurityNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
- label="走读/寄宿:" prop="daystudentsNumber">
- <u--input border="none" v-model="form.placeExtEntity.daystudentsNumber" placeholder="请输入">
+ label="走读/寄宿:" prop="dayStudentsNumber">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.dayStudentsNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="住校生人数:" prop="residentialStudentsNumber">
- <u--input border="none" v-model="form.placeExtEntity.residentialStudentsNumber"
+ <u--input border="none" type="number" v-model="form.placeExtEntity.residentialStudentsNumber"
placeholder="请输入">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
label="宿舍管理人员:" prop="housemasterNumber">
- <u--input border="none" v-model="form.placeExtEntity.housemasterNumber" placeholder="请输入">
+ <u--input border="none" type="number" v-model="form.placeExtEntity.housemasterNumber"
+ placeholder="请输入">
</u--input>
</u-form-item>
</view>
@@ -492,10 +496,10 @@
studentNumber: "",
workersNumber: "",
- securityNumoer: "",
- gusrdNumber: "",
+ securityNumber: "",
+ guardNumber: "",
temporarySecurityNumber: "",
- daystudentsNumber: "",
+ dayStudentsNumber: "",
residentialStudentsNumber: "",
housemasterNumber: ""
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index afd8a38..4cf3752 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -123,6 +123,56 @@
</u-form-item>
</view>
</u-form>
+
+ <view class="item bgc-ff mt-20" v-if="cateId == 160102 || cateId == 160103">
+ <view class="flex j-c-s-b a-i-c">
+ <view class="box-title" style="width:50%;">
+ <box-title title="学校信息"></box-title>
+ </view>
+ </view>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="学生人数:" prop="studentNumber">
+ <u--input border="none" type="number" v-model="form.studentNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="教职工人数:" prop="workersNumber">
+ <u--input border="none" type="number" v-model="form.workersNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="专职保安:" prop="securityNumber">
+ <u--input border="none" type="number" v-model="form.securityNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="专职门卫:" prop="guardNumber">
+ <u--input border="none" type="number" v-model="form.guardNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="专兼职保卫人员:" prop="temporarySecurityNumber">
+ <u--input border="none" type="number" v-model="form.temporarySecurityNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="走读/寄宿:" prop="dayStudentsNumber">
+ <u--input border="none" type="number" v-model="form.dayStudentsNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="住校生人数:" prop="residentialStudentsNumber">
+ <u--input border="none" type="number" v-model="form.residentialStudentsNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
+ label="宿舍管理人员:" prop="housemasterNumber">
+ <u--input border="none" type="number" v-model="form.housemasterNumber" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+ </view>
+
+
<view class="license">
<box-title title="营业执照"></box-title>
<view class="upload-img">
@@ -262,7 +312,16 @@
landlordName: "",
landlordPhone: "",
landlordIdCard: "",
- landlordWxAccount: ""
+ landlordWxAccount: "",
+
+ studentNumber: "",
+ workersNumber: "",
+ securityNumber: "",
+ guardNumber: "",
+ temporarySecurityNumber: "",
+ dayStudentsNumber: "",
+ residentialStudentsNumber: "",
+ housemasterNumber: ""
},
rules: {
"location": {
@@ -318,6 +377,7 @@
showNationPicker: false,
showGenderPicker: false,
personNumArr: [],
+ cateId: ""
}
},
onShow() {
@@ -417,7 +477,7 @@
this.jwd = `${Number(data.lng).toFixed(6)},${Number(data.lat).toFixed(6)}`
}
-
+ this.cateId = data.poiCode;
const placePractitioner = data?.placePractitioner || []
// Object.keys(this.form).forEach(key => {
// this.form[key] = data[key]
diff --git a/utils/func.js b/utils/func.js
index 949da3d..dfca499 100644
--- a/utils/func.js
+++ b/utils/func.js
@@ -38,6 +38,7 @@
uni.switchTab({
url: '/pages/home/index'
})
+
}
// 退出登录
@@ -49,6 +50,10 @@
})
vm.$u.vuex('accessToken', '')
vm.$u.vuex('isLogin', false)
+ if (uni.getStorageSync("pageType")) {
+ uni.removeStorageSync("pageType")
+ }
+
uni.redirectTo({
url: '/pages/login/login-account'
})
--
Gitblit v1.9.3