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. 385
      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 = ''

385
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="组织名称 "
> prop="organizationName"
<el-form-item label-width="150px"
label="组织名称 " style="display: block">
prop="organizationName" <el-input class="item_width_1"
label-width="150px" maxlength="50"
style="display: block" show-word-limit
> placeholder="请输入组织名称 "
<el-input v-model="dataForm.organizationName">
class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入组织名称 "
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"
> placeholder="请选择"
<el-select clearable>
v-model="dataForm.categoryCode" <el-option v-for="item in categoryList"
placeholder="请选择" :key="item.value"
clearable :label="item.label"
> :value="item.value">
<el-option
v-for="item in categoryList"
:key="item.value"
:label="item.label"
: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"
> type="number"
<el-input maxlength="50"
class="item_width_1" show-word-limit
type="number" placeholder="请输入组织人数 "
maxlength="50" v-model="dataForm.organizationPersonCount">
show-word-limit
placeholder="请输入组织人数 "
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"
> maxlength="50"
<el-input show-word-limit
class="item_width_1" placeholder="成员姓名"
maxlength="50" v-model="item.personName" />
show-word-limit
placeholder="成员姓名" <el-input style="margin-left: 10px"
v-model="item.personName" class="item_width_1"
/> maxlength="50"
show-word-limit
<el-input placeholder="联系电话"
style="margin-left: 10px" v-model="item.personPhone" />
class="item_width_1"
maxlength="50" <el-button style="margin-left: 10px"
show-word-limit size="small"
placeholder="联系电话" @click="handleDelStaff(index)">删除</el-button>
v-model="item.personPhone"
/>
<el-button
style="margin-left: 10px"
size="small"
@click="handleDelStaff(index)"
>删除</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"
> type="textarea"
<el-input maxlength="1000"
class="item_width_1" show-word-limit
type="textarea" :rows="3"
maxlength="1000" placeholder="请输入服务事项，不超过1000字"
show-word-limit v-model="dataForm.serviceItem"></el-input>
:rows="3"
placeholder="请输入服务事项，不超过1000字"
v-model="dataForm.serviceItem"
></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"
> maxlength="50"
<el-input show-word-limit
class="item_width_1" placeholder="请输入负责人 "
maxlength="50" v-model="dataForm.principalName">
show-word-limit
placeholder="请输入负责人 "
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"
> maxlength="50"
<el-input show-word-limit
class="item_width_1" placeholder="请输入联系电话 "
maxlength="50" v-model="dataForm.principalPhone">
show-word-limit
placeholder="请输入联系电话 "
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"
> placeholder="创建时间"
<el-date-picker value-format="yyyy-MM-dd">
v-model="dataForm.organizationCreatedTime"
placeholder="创建时间"
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">查询</el-button>
@click="handleSearchMap" <div id="app"
>查询</el-button 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"
> type="textarea"
<el-input maxlength="500"
class="item_width_1" show-word-limit
type="textarea" :rows="3"
maxlength="500" placeholder="请输入备注，不超过500字"
show-word-limit v-model="dataForm.remark"></el-input>
:rows="3"
placeholder="请输入备注，不超过500字"
v-model="dataForm.remark"
></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>
@ -255,7 +197,7 @@ var infoWindowList;
let loading; // 加载动画 let loading; // 加载动画
export default { export default {
data() { data () {
return { return {
formType: "add", //表单操作类型 add新增，edit编辑，detail详情 formType: "add", //表单操作类型 add新增，edit编辑，detail详情
@ -281,7 +223,7 @@ export default {
}, },
components: {}, components: {},
computed: { computed: {
dataRule() { dataRule () {
return { return {
organizationName: [ organizationName: [
{ required: true, message: "组织名称 不能为空", trigger: "blur" }, { required: true, message: "组织名称 不能为空", trigger: "blur" },
@ -316,15 +258,15 @@ export default {
props: {}, props: {},
watch: {}, watch: {},
async created() { async created () {
this.getCategoryList(); this.getCategoryList();
}, },
async mounted() { async mounted () {
this.initMap(); this.initMap();
}, },
methods: { methods: {
async getCategoryList() { async getCategoryList () {
const url = "/sys/dict/data/dictlist"; const url = "/sys/dict/data/dictlist";
const params = { const params = {
dictType: "self_org_category", dictType: "self_org_category",
@ -336,19 +278,19 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
handleAddStaff() { handleAddStaff () {
this.dataForm.organizationPersonnel = [ this.dataForm.organizationPersonnel = [
...this.dataForm.organizationPersonnel, ...this.dataForm.organizationPersonnel,
{ personName: "", personPhone: "" }, { personName: "", personPhone: "" },
]; ];
}, },
handleDelStaff(index) { handleDelStaff (index) {
const { organizationPersonnel } = this.dataForm; const { organizationPersonnel } = this.dataForm;
organizationPersonnel.splice(index, 1); organizationPersonnel.splice(index, 1);
this.dataForm.organizationPersonnel = organizationPersonnel; this.dataForm.organizationPersonnel = organizationPersonnel;
}, },
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义 // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() { initMap () {
// 定义地图中心点坐标 // 定义地图中心点坐标
var center = new window.TMap.LatLng(36.0722275, 120.38945519); var center = new window.TMap.LatLng(36.0722275, 120.38945519);
// 定义map变量，调用 TMap.Map() 构造函数创建地图 // 定义map变量，调用 TMap.Map() 构造函数创建地图
@ -374,7 +316,7 @@ export default {
this.handleMoveCenter(); this.handleMoveCenter();
}, },
setMarker(lat, lng) { setMarker (lat, lng) {
markers.setGeometries([]); markers.setGeometries([]);
markers.add([ markers.add([
{ {
@ -388,7 +330,7 @@ export default {
]); ]);
}, },
handleSearchMap() { handleSearchMap () {
infoWindowList.forEach((infoWindow) => { infoWindowList.forEach((infoWindow) => {
infoWindow.close(); infoWindow.close();
}); });
@ -416,7 +358,7 @@ export default {
}); });
}, },
handleMoveCenter() { handleMoveCenter () {
//修改地图中心点 //修改地图中心点
const center = map.getCenter(); const center = map.getCenter();
const lat = center.getLat(); const lat = center.getLat();
@ -426,7 +368,7 @@ export default {
this.setMarker(lat, lng); this.setMarker(lat, lng);
}, },
async initForm(type, row) { async initForm (type, row) {
this.$refs.ref_form.resetFields(); this.$refs.ref_form.resetFields();
this.formType = type; this.formType = type;
@ -438,7 +380,7 @@ export default {
} }
}, },
async handleComfirm() { async handleComfirm () {
this.btnDisable = true; this.btnDisable = true;
setTimeout(() => { setTimeout(() => {
this.btnDisable = false; this.btnDisable = false;
@ -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();
@ -475,7 +416,7 @@ export default {
}); });
}, },
async submit() { async submit () {
let url = ""; let url = "";
if (this.formType === "add") { if (this.formType === "add") {
url = "/heart/iccommunityselforganization/addcommunityselforganization"; url = "/heart/iccommunityselforganization/addcommunityselforganization";
@ -503,11 +444,11 @@ export default {
} }
}, },
handleCancle() { handleCancle () {
this.resetData(); this.resetData();
this.$emit("dialogCancle"); this.$emit("dialogCancle");
}, },
resetData() { resetData () {
this.orgId = ""; this.orgId = "";
this.dataForm = { this.dataForm = {
organizationName: "", organizationName: "",
@ -525,7 +466,7 @@ export default {
}; };
}, },
// 开启加载动画 // 开启加载动画
startLoading() { startLoading () {
loading = Loading.service({ loading = Loading.service({
lock: true, // 是否锁定 lock: true, // 是否锁定
text: "正在加载……", // 加载中需要显示的文字 text: "正在加载……", // 加载中需要显示的文字
@ -533,7 +474,7 @@ export default {
}); });
}, },
// 结束加载动画 // 结束加载动画
endLoading() { endLoading () {
// clearTimeout(timer); // clearTimeout(timer);
if (loading) { if (loading) {
loading.close(); loading.close();

Write Preview
Loading…
Cancel
Save