elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_shequzhili'

shibei_master
jiangyy 3 years ago
parent
8fe2e3fced b29566833f
commit
09eab177c8
3 changed files with 181 additions and 240 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/views/modules/communityParty/regionalParty/unitsForm.vue
  2. 18
      src/views/modules/communityService/ninePlaces/places/placesForm.vue
  3. 203
      src/views/modules/communityService/sqzzz/cpts/edit.vue

18
src/views/modules/communityParty/regionalParty/unitsForm.vue
View File

@ -287,15 +287,15 @@ export default {
}, },
async addUnit () { async addUnit () {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
if (regPhone.test(this.formData.contactMobile) === false) { // if (regPhone.test(this.formData.contactMobile) === false) {
this.btnDisable = false // this.btnDisable = false
this.$message({ // this.$message({
type: 'warning', // type: 'warning',
message: '请输入正确的手机号码' // message: '请输入正确的手机号码'
}) // })
return false; // return false;
} // }
let url = '/heart/icpartyunit/save' let url = '/heart/icpartyunit/save'
// let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save" // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"

18
src/views/modules/communityService/ninePlaces/places/placesForm.vue
View File

@ -197,15 +197,15 @@ export default {
}, },
async addPlace () { async addPlace () {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
if (regPhone.test(this.formData.mobile) === false) { // if (regPhone.test(this.formData.mobile) === false) {
this.btnDisable = false // this.btnDisable = false
this.$message({ // this.$message({
type: 'warning', // type: 'warning',
message: '请输入正确的手机号码' // message: '请输入正确的手机号码'
}) // })
return false; // return false;
} // }
let url = '' let url = ''

203
src/views/modules/communityService/sqzzz/cpts/edit.vue
View File

@ -1,243 +1,185 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form <el-form ref="ref_form"
ref="ref_form"
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
:disabled="formType === 'detail'" :disabled="formType === 'detail'"
class="form" class="form">
> <el-form-item label="组织名称 "
<el-form-item
label="组织名称 "
prop="organizationName" prop="organizationName"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入组织名称 " placeholder="请输入组织名称 "
v-model="dataForm.organizationName" v-model="dataForm.organizationName">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="分类名称 "
label="分类名称 "
prop="categoryCode" prop="categoryCode"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-select v-model="dataForm.categoryCode"
<el-select
v-model="dataForm.categoryCode"
placeholder="请选择" placeholder="请选择"
clearable clearable>
> <el-option v-for="item in categoryList"
<el-option
v-for="item in categoryList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="组织人数 "
label="组织人数 "
prop="organizationPersonCount" prop="organizationPersonCount"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
type="number" type="number"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入组织人数 " placeholder="请输入组织人数 "
v-model="dataForm.organizationPersonCount" v-model="dataForm.organizationPersonCount">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="组织成员 "
label="组织成员 "
prop="organizationPersonnel" prop="organizationPersonnel"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
>
<div class="m-staffs"> <div class="m-staffs">
<div <div class="item"
class="item"
:key="'staff' + index" :key="'staff' + index"
v-for="(item, index) in dataForm.organizationPersonnel" v-for="(item, index) in dataForm.organizationPersonnel">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="成员姓名" placeholder="成员姓名"
v-model="item.personName" v-model="item.personName" />
/>
<el-input <el-input style="margin-left: 10px"
style="margin-left: 10px"
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="联系电话" placeholder="联系电话"
v-model="item.personPhone" v-model="item.personPhone" />
/>
<el-button <el-button style="margin-left: 10px"
style="margin-left: 10px"
size="small" size="small"
@click="handleDelStaff(index)" @click="handleDelStaff(index)">删除</el-button>
>删除</el-button
>
</div> </div>
<div class="item-add"> <div class="item-add">
<el-button size="small" @click="handleAddStaff">添加</el-button> <el-button size="small"
@click="handleAddStaff">添加</el-button>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务事项"
label="服务事项"
prop="serviceItem" prop="serviceItem"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
type="textarea" type="textarea"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
:rows="3" :rows="3"
placeholder="请输入服务事项，不超过1000字" placeholder="请输入服务事项，不超过1000字"
v-model="dataForm.serviceItem" v-model="dataForm.serviceItem"></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="负责人 "
label="负责人 "
prop="principalName" prop="principalName"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入负责人 " placeholder="请输入负责人 "
v-model="dataForm.principalName" v-model="dataForm.principalName">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="联系电话 "
label="联系电话 "
prop="principalPhone" prop="principalPhone"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入联系电话 " placeholder="请输入联系电话 "
v-model="dataForm.principalPhone" v-model="dataForm.principalPhone">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="创建时间"
label="创建时间"
prop="organizationCreatedTime" prop="organizationCreatedTime"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-date-picker v-model="dataForm.organizationCreatedTime"
<el-date-picker
v-model="dataForm.organizationCreatedTime"
placeholder="创建时间" placeholder="创建时间"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="位置坐标"
label="位置坐标"
prop="longitude" prop="longitude"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
>
<div style="width: 500px"> <div style="width: 500px">
<el-input <el-input class="item_width_4"
class="item_width_4"
maxlength="50" maxlength="50"
placeholder="请输入关键字" placeholder="请输入关键字"
v-model="dataForm.address" v-model="dataForm.address">
>
</el-input> </el-input>
<el-button <el-button style="margin-left: 10px"
style="margin-left: 10px"
type="primary" type="primary"
size="small" size="small"
@click="handleSearchMap" @click="handleSearchMap">查询</el-button>
>查询</el-button <div id="app"
> class="div_map"></div>
<div id="app" class="div_map"></div>
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<span>经度</span> <span>经度</span>
<el-input <el-input class="item_width_3"
class="item_width_3"
maxlength="50" maxlength="50"
placeholder="请输入经度" placeholder="请输入经度"
v-model="dataForm.longitude" v-model="dataForm.longitude">
>
</el-input> </el-input>
<span style="margin-left: 20px">纬度</span> <span style="margin-left: 20px">纬度</span>
<el-input <el-input class="item_width_3"
class="item_width_3"
maxlength="50" maxlength="50"
placeholder="请输入纬度" placeholder="请输入纬度"
v-model="dataForm.latitude" v-model="dataForm.latitude">
>
</el-input> </el-input>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="备注"
label="备注"
prop="remark" prop="remark"
label-width="150px" label-width="150px"
style="display: block" style="display: block">
> <el-input class="item_width_1"
<el-input
class="item_width_1"
type="textarea" type="textarea"
maxlength="500" maxlength="500"
show-word-limit show-word-limit
:rows="3" :rows="3"
placeholder="请输入备注，不超过500字" placeholder="请输入备注，不超过500字"
v-model="dataForm.remark" v-model="dataForm.remark"></el-input>
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="div_btn resi-btns"> <div class="div_btn resi-btns">
<el-button size="small" @click="handleCancle">取 消</el-button> <el-button size="small"
<el-button @click="handleCancle">取 消</el-button>
v-if="formType != 'detail'" <el-button v-if="formType != 'detail'"
type="primary" type="primary"
size="small" size="small"
:disabled="btnDisable" :disabled="btnDisable"
@click="handleComfirm" @click="handleComfirm">确 定</el-button>
>确 定</el-button
>
</div> </div>
</div> </div>
</template> </template>
@ -448,26 +390,25 @@ export default {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
this.btnDisable = false; this.btnDisable = false;
} else { } else {
if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) { // if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) {
return this.$message({ // return this.$message({
type: "error", // type: "error",
message: "手机号格式有误", // message: "手机号格式有误",
}); // });
} // }
const { const {
dataForm: { organizationPersonnel }, dataForm: { organizationPersonnel },
} = this; } = this;
let vlt = organizationPersonnel.every((item) => { let vlt = organizationPersonnel.every((item) => {
return ( return (
item.personName && item.personName &&
item.personPhone && item.personPhone
formVltHelper.userOrMobile(item.personPhone)
); );
}); });
if (!vlt) { if (!vlt) {
return this.$message({ return this.$message({
type: "error", type: "error",
message: "成员姓名/手机号为空或格式有误", message: "成员姓名/手机号为空",
}); });
} }
this.submit(); this.submit();

Write Preview
Loading…
Cancel
Save