Commit db3670e5 authored by xinzhedeai's avatar xinzhedeai

fix: 商户校验、提示语优化。v-model重复代码处理。 隐患检查单页面校验优化。

parent d52b9951
...@@ -291,8 +291,8 @@ ...@@ -291,8 +291,8 @@
<van-action-sheet v-model="bohui.show4modal" title=" "> <van-action-sheet v-model="bohui.show4modal" title=" ">
<div class="content" style="padding:0.5rem 0.4rem 0.5rem; text-align: center;"> <div class="content" style="padding:0.5rem 0.4rem 0.5rem; text-align: center;">
<h5 style="text-align: left;font-size: .3rem;">驳回原因</h5> <h5 style="text-align: left;font-size: .3rem;">驳回原因</h5>
<textarea class="textareaEle" v-model="bohui.reason" name="" id="" cols="24" rows="3" <textarea maxlength="100" class="textareaEle" v-model="bohui.reason" name="" id="" cols="24" rows="3"
style="resize: none;"></textarea> style="resize: none;" placeholder="请输入驳回原因(最多100字)"></textarea>
<div class="footer-bar"> <div class="footer-bar">
<van-button type="info" plain size="small" @click="bohui.show4modal=false">取消</van-button> <van-button type="info" plain size="small" @click="bohui.show4modal=false">取消</van-button>
...@@ -307,8 +307,8 @@ ...@@ -307,8 +307,8 @@
<van-action-sheet v-model="jujue.show4modal" title=" "> <van-action-sheet v-model="jujue.show4modal" title=" ">
<div class="content" style="padding:0.5rem 0.4rem 0.5rem; text-align: center;"> <div class="content" style="padding:0.5rem 0.4rem 0.5rem; text-align: center;">
<h5 style="text-align: left;font-size: .3rem;">拒绝原因</h5> <h5 style="text-align: left;font-size: .3rem;">拒绝原因</h5>
<textarea class="textareaEle" v-model="jujue.reason" name="" id="" cols="24" rows="3" <textarea maxlength="100" class="textareaEle" v-model="jujue.reason" name="" id="" cols="24" rows="3"
style="resize: none;"></textarea> style="resize: none;" placeholder="请输入拒绝原因(最多100字)"></textarea>
<div class="shangbao-wrapper" v-if="jujue.pushFlag"> <div class="shangbao-wrapper" v-if="jujue.pushFlag">
<!-- <h5 style="text-align: left;font-size: .3rem;">整改上报</h5> --> <!-- <h5 style="text-align: left;font-size: .3rem;">整改上报</h5> -->
......
...@@ -60,10 +60,12 @@ ...@@ -60,10 +60,12 @@
<span class="form-label">商家名称</span> <span class="form-label">商家名称</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
maxlength="25"
type="text" type="text"
v-model="formData.unitName" v-model="formData.unitName"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入商家名称"
/> />
</div> </div>
</div> </div>
...@@ -72,10 +74,12 @@ ...@@ -72,10 +74,12 @@
<span class="form-label">负责人</span> <span class="form-label">负责人</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
maxlength="4"
type="text" type="text"
v-model="formData.merchantName" v-model="formData.merchantName"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入负责人"
/> />
</div> </div>
</div> </div>
...@@ -84,10 +88,11 @@ ...@@ -84,10 +88,11 @@
<span class="form-label">电话</span> <span class="form-label">电话</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
type="text" type="number" maxlength="11"
v-model="formData.merchantPhone" v-model="formData.merchantPhone"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入电话"
/> />
</div> </div>
</div> </div>
...@@ -96,10 +101,12 @@ ...@@ -96,10 +101,12 @@
<span class="form-label">地址</span> <span class="form-label">地址</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
maxlength="100"
type="text" type="text"
v-model="formData.businessAddress" v-model="formData.businessAddress"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入地址"
/> />
</div> </div>
</div> </div>
...@@ -161,10 +168,12 @@ ...@@ -161,10 +168,12 @@
<span class="form-label">联系方式</span> <span class="form-label">联系方式</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
type="text" maxlength="11"
type="number"
v-model="formData.gridMemberPhone" v-model="formData.gridMemberPhone"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入联系方式"
/> />
</div> </div>
</div> </div>
...@@ -363,10 +372,12 @@ ...@@ -363,10 +372,12 @@
<span class="form-label">建筑面积(㎡)</span> <span class="form-label">建筑面积(㎡)</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
type="text" maxlength="4"
type="number"
v-model="formData.area" v-model="formData.area"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入建筑面积(㎡)"
/> />
</div> </div>
</div> </div>
...@@ -375,10 +386,12 @@ ...@@ -375,10 +386,12 @@
<span class="form-label">建筑结构</span> <span class="form-label">建筑结构</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
maxlength="25"
type="text" type="text"
v-model="formData.buildingStructure" v-model="formData.buildingStructure"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入建筑结构"
/> />
</div> </div>
</div> </div>
...@@ -387,10 +400,12 @@ ...@@ -387,10 +400,12 @@
<span class="form-label">产权人</span> <span class="form-label">产权人</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
maxlength="4"
type="text" type="text"
v-model="formData.owner" v-model="formData.owner"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入产权人"
/> />
</div> </div>
</div> </div>
...@@ -399,11 +414,12 @@ ...@@ -399,11 +414,12 @@
<span class="form-label">联系方式</span> <span class="form-label">联系方式</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
type="text" maxlength="11"
type="number"
v-model="formData.ownerPhone" v-model="formData.ownerPhone"
v-model="formData.merchantPhone"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入联系方式"
/> />
</div> </div>
</div> </div>
...@@ -412,11 +428,12 @@ ...@@ -412,11 +428,12 @@
<span class="form-label">经营人</span> <span class="form-label">经营人</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
maxlength="4"
type="text" type="text"
v-model="formData.operator" v-model="formData.operator"
v-model="formData.merchantPhone"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入经营人"
/> />
</div> </div>
</div> </div>
...@@ -425,10 +442,12 @@ ...@@ -425,10 +442,12 @@
<span class="form-label">联系方式</span> <span class="form-label">联系方式</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
type="text" maxlength="11"
type="number"
v-model="formData.operatorPhone" v-model="formData.operatorPhone"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入联系方式"
/> />
</div> </div>
</div> </div>
...@@ -471,10 +490,12 @@ ...@@ -471,10 +490,12 @@
<span class="form-label">房东姓名</span> <span class="form-label">房东姓名</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
maxlength="4"
type="text" type="text"
v-model="formData.landlordName" v-model="formData.landlordName"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入房东姓名"
/> />
</div> </div>
</div> </div>
...@@ -482,10 +503,12 @@ ...@@ -482,10 +503,12 @@
<span class="form-label">联系方式</span> <span class="form-label">联系方式</span>
<div class="form-input-wrap"> <div class="form-input-wrap">
<input <input
type="text" maxlength="11"
type="number"
v-model="formData.landlordContact" v-model="formData.landlordContact"
class="form-input" class="form-input"
:disabled="flag=='XQ'" :disabled="flag=='XQ'"
placeholder="请输入联系方式"
/> />
</div> </div>
</div> </div>
......
...@@ -462,18 +462,88 @@ window.addEventListener('load', function () { ...@@ -462,18 +462,88 @@ window.addEventListener('load', function () {
}) })
return return
} }
if (!reqParam.area) {
if (!reqParam.merchantName) {
vant.Toast({ vant.Toast({
message: '建筑面积不能为空', message: '负责人不能为空',
}) })
return return
} }
if (!reqParam.merchantName) { if (!gemhoUtil.validateChineseName(reqParam.merchantName)) {
vant.Dialog.alert({
message: '负责人格式不正确,请输入中文',
})
return;
}
// 具体格式有待确认 是否支持座机!
if (reqParam.merchantPhone && !/^1[3-9]\d{9}$/.test(reqParam.merchantPhone)) {
vant.Dialog.alert({
message: '电话格式不正确,请输入11位数字的手机号码',
})
return;
}
if (!reqParam.area) {
vant.Toast({ vant.Toast({
message: '负责人不能为空', message: '建筑面积不能为空',
}) })
return return
} }
if (!gemhoUtil.validateNumber999(reqParam.area)) {
vant.Dialog.alert({
message: '建筑面积格式不正确,请输入大于0且小于9999的数字',
})
return;
}
if (reqParam.owner && !gemhoUtil.validateChineseName(reqParam.owner)) {
vant.Dialog.alert({
message: '产权人格式不正确,请输入中文',
})
return;
}
// 具体格式有待确认 是否支持座机!
if (reqParam.ownerPhone && !/^1[3-9]\d{9}$/.test(reqParam.ownerPhone)) {
vant.Dialog.alert({
message: '产权人联系方式格式不正确,请输入11位数字的手机号码',
})
return;
}
if (reqParam.operator && !gemhoUtil.validateChineseName(reqParam.operator)) {
vant.Dialog.alert({
message: '经营人格式不正确,请输入中文',
})
return;
}
// 具体格式有待确认 是否支持座机!
if (reqParam.operatorPhone && !/^1[3-9]\d{9}$/.test(reqParam.operatorPhone)) {
vant.Dialog.alert({
message: '经营人联系方式格式不正确,请输入11位数字的手机号码',
})
return;
}
if (reqParam.landlordName && !gemhoUtil.validateChineseName(reqParam.landlordName)) {
vant.Dialog.alert({
message: '房东姓名格式不正确,请输入中文',
})
return;
}
// 具体格式有待确认 是否支持座机!
if (reqParam.landlordContact && !/^1[3-9]\d{9}$/.test(reqParam.landlordContact)) {
vant.Dialog.alert({
message: '房东联系方式格式不正确,请输入11位数字的手机号码',
})
return;
}
if (!reqParam.community) { if (!reqParam.community) {
vant.Toast({ vant.Toast({
message: '所属社区不能为空', message: '所属社区不能为空',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment