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

关注名单

shibei_master
jiangyy 3 years ago
parent
ada0404ee8
commit
50dee4c6a6
4 changed files with 103 additions and 42 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. 77
      src/views/modules/base/epidemic/natInfo/natList.vue
  2. 9
      src/views/modules/communityService/ninePlaces/inspect/inspect.vue
  3. 2
      src/views/modules/visual/basicinfo/basicInfoMain.vue
  4. 57
      src/views/pages/caiji.vue

77
src/views/modules/base/epidemic/natInfo/natList.vue
View File

@ -124,6 +124,7 @@
</div> </div>
<el-table class="table" <el-table class="table"
ref="ref_table"
:data="tableData" :data="tableData"
border border
:height="tableHeight" :height="tableHeight"
@ -174,12 +175,12 @@
label="检测结果" label="检测结果"
width="100"> width="100">
</el-table-column> </el-table-column>
<el-table-column v-if="formData.orgType==='current'" <el-table-column v-if="isResiUser"
prop="isResiUserShow" prop="isResiUserShow"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
label="是否本辖区居民" label="本辖区居民"
width="120"> width="120">
</el-table-column> </el-table-column>
@ -196,29 +197,29 @@
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="formData.orgType==='all'" <el-button v-if="!isResiUser"
type="text" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleAttention(scope.row)">同步</el-button> @click="handleAttention(scope.row)">同步</el-button>
<el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId" <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="formData.orgType==='current'&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId" <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text" type="text"
class="div-table-button--delete " class="div-table-button--delete "
size="small" size="small"
@click="handleDelete(scope.row,'delete')">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
<el-button v-if="formData.orgType==='current'&&scope.row.userType==='synchro'&&scope.row.agencyId===agencyId" <el-button v-if="isResiUser&&scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
type="text" type="text"
class="div-table-button--delete " class="div-table-button--delete "
size="small" size="small"
@click="handleDelete(scope.row,'attention')">取消同步</el-button> @click="handleCancelAttention(scope.row)">取消同步</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -269,6 +270,7 @@ export default {
pageSize: 20, pageSize: 20,
pageNo: 0, pageNo: 0,
tableLoading: false, tableLoading: false,
isResiUser: true,
agencyId: '', agencyId: '',
orgTypeList: [ orgTypeList: [
@ -330,8 +332,16 @@ export default {
}, },
methods: { methods: {
handleSearch () {
this.loadTable() async handleSearch () {
this.isResiUser = this.formData.orgType === 'current'
await this.loadTable()
this.$nextTick(() => {
this.$refs.ref_table.doLayout() // 解决表格错位
})
}, },
async loadTable () { async loadTable () {
@ -363,6 +373,10 @@ export default {
} }
}); });
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -418,8 +432,8 @@ export default {
}, },
async handleDelete (row, type) { async handleDelete (row) {
let message = type === 'delete' ? '确认删除?' : '取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？' let message = '确认删除?'
this.$confirm(message, "提示", { this.$confirm(message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -456,6 +470,43 @@ export default {
} }
}, },
async handleCancelAttention (row) {
let message = '取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？'
this.$confirm(message, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.cancelAttention(row)
})
.catch(err => {
});
},
async cancelAttention (row) {
const url = "/epmetuser/icNat/cancelsynchro"
let params = {
icNatId: row.icNatId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message({
type: "success",
message: "操作成功"
});
this.loadTable()
} else {
this.$message.error(msg)
}
},
async handleAttention (row) { async handleAttention (row) {
this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", { this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", {
@ -475,7 +526,7 @@ export default {
}, },
async attentionNat (row) { async attentionNat (row) {
const url = "/epmetuser/icNat/synchro" const url = "/epmetuser/icNat/cancelsynchro"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
let params = { let params = {

9
src/views/modules/communityService/ninePlaces/inspect/inspect.vue
View File

@ -150,8 +150,8 @@
<el-table-column prop="firstResult" <el-table-column prop="firstResult"
header-align="center" header-align="center"
align="center" align="center"
label="首次检查结果" label="首次结果"
width="110"> width="80">
</el-table-column> </el-table-column>
<el-table-column prop="reviewTime" <el-table-column prop="reviewTime"
header-align="center" header-align="center"
@ -174,7 +174,7 @@
<el-table-column label="操作" <el-table-column label="操作"
fixed="right" fixed="right"
width="180" width="140"
header-align="center" header-align="center"
align="center" align="center"
class="operate"> class="operate">
@ -186,7 +186,6 @@
<el-button type="text" <el-button type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
:disabled="true"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-popover popper-class="btn-popper" <el-popover popper-class="btn-popper"
@ -454,7 +453,7 @@ export default {
this.formTitle = '编辑' this.formTitle = '编辑'
this.formShow = true this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form.initForm('edit', row) this.$refs.ref_form.initForm('edit', row.placePatrolRecordId)
}) })
}, },

2
src/views/modules/visual/basicinfo/basicInfoMain.vue
View File

@ -251,7 +251,7 @@ const vueGis = {
name: 'HomeMap', name: 'HomeMap',
data () { data () {
return { return {
showAgencyList: true, showAgencyList: false,
agencyFadeIn: true, agencyFadeIn: true,
centerPoint: [],//中心点位置 centerPoint: [],//中心点位置
zoom: 14,//缩放范围：区14 zoom: 14,//缩放范围：区14

57
src/views/pages/caiji.vue
View File

@ -44,7 +44,7 @@
</div> </div>
<div class="line"></div> <div class="line"></div>
<mt-field v-if="selUnit && selUnit.value==='else'" <mt-field v-if="selUnit && selUnit.value==='other'"
class="my-field" class="my-field"
:disableClear="true" :disableClear="true"
label="单元号" label="单元号"
@ -52,7 +52,7 @@
v-model="unitContent"></mt-field> v-model="unitContent"></mt-field>
<div class="line"></div> <div class="line"></div>
<div v-if="!selUnit || selUnit.value!=='else'" <div v-if="!selUnit || selUnit.value!=='other'"
@click="handelSel('room')"> @click="handelSel('room')">
<mt-cell title="房屋" <mt-cell title="房屋"
is-link> is-link>
@ -63,7 +63,7 @@
<div class="line"></div> <div class="line"></div>
</div> </div>
<mt-field v-if="(selUnit&&selUnit.value==='else')||(selHome&&selHome.value==='else')" <mt-field v-if="(selUnit&&selUnit.value==='other')||(selHome&&selHome.value==='other')"
class="my-field" class="my-field"
:disableClear="true" :disableClear="true"
label="房屋" label="房屋"
@ -248,6 +248,10 @@ export default {
houseHolderName: '',//户主姓名 houseHolderName: '',//户主姓名
totalResi: 4,//居住成员人数 totalResi: 4,//居住成员人数
customerId: '',//customerId customerId: '',//customerId
villageName: '',//
buildName: '',//
unitName: '',//
homeName: '',//
}, },
showMessagsBox: false,//是否显示人员未填写提示弹出框 showMessagsBox: false,//是否显示人员未填写提示弹出框
@ -445,7 +449,7 @@ export default {
this.unitList = data this.unitList = data
this.unitList.push({ this.unitList.push({
label: '其他', label: '其他',
value: 'else' value: 'other'
}) })
let obj = { let obj = {
values: this.unitList values: this.unitList
@ -479,7 +483,7 @@ export default {
this.roomList = data this.roomList = data
this.roomList.push({ this.roomList.push({
label: '其他', label: '其他',
value: 'else' value: 'other'
}) })
let obj = { let obj = {
values: this.roomList values: this.roomList
@ -566,7 +570,6 @@ export default {
async handleSubmit () { async handleSubmit () {
let message = this.validataFormData() let message = this.validataFormData()
if (message) { if (message) {
if (this.showMessagsBox) { if (this.showMessagsBox) {
MessageBox.confirm(message).then(action => { MessageBox.confirm(message).then(action => {
@ -588,20 +591,22 @@ export default {
if (this.formData.origin === 'internal') { if (this.formData.origin === 'internal') {
this.formData.villageId = this.selVillage.value if (this.selUnit.value === 'other') {
this.formData.buildId = this.selBuild.value this.formData.homeId = 'other'
if (this.selUnit.value === 'else') { this.formData.unitName = this.unitContent
this.formData.unitId = this.unitContent this.formData.homeName = this.homeContent//没有选择房屋，不存在这个对象，直接赋值
this.formData.homeId = this.homeContent//没有选择房屋，不存在这个对象，直接赋值
} else { } else {
this.formData.unitId = this.selUnit.value
this.unitContent = this.selUnit.label this.unitContent = this.selUnit.label
this.formData.unitName = this.unitContent
if (this.selHome.value === 'other') {
if (this.selHome.value === 'else') { this.formData.homeName = this.homeContent
this.formData.homeId = this.homeContent
} else { } else {
this.formData.homeId = this.selHome.value
this.homeContent = this.selHome.label this.homeContent = this.selHome.label
this.formData.homeName = this.homeContent
} }
} }
@ -609,6 +614,7 @@ export default {
this.formData.address = this.selVillage.label + this.selBuild.label + this.unitContent + this.homeContent this.formData.address = this.selVillage.label + this.selBuild.label + this.unitContent + this.homeContent
} }
this.formData.houseType = this.selHomeType.value this.formData.houseType = this.selHomeType.value
let memberListTemp = [] let memberListTemp = []
@ -632,6 +638,7 @@ export default {
}); });
this.formData.memberList = memberListTemp this.formData.memberList = memberListTemp
console.log(this.formData) console.log(this.formData)
this.btnDisabled = true this.btnDisabled = true
this.startLoading() this.startLoading()
const url = "/epmetuser/icresicollect/save" const url = "/epmetuser/icresicollect/save"
@ -677,7 +684,7 @@ export default {
return aletMessage return aletMessage
} else {//选择了单元 } else {//选择了单元
if (this.selUnit.value === 'else') {//单元选择了其他 if (this.selUnit.value === 'other') {//单元选择了其他
if (!this.unitContent) { if (!this.unitContent) {
aletMessage = '请填写单元号' aletMessage = '请填写单元号'
return aletMessage return aletMessage
@ -693,7 +700,7 @@ export default {
aletMessage = '请选择房屋' aletMessage = '请选择房屋'
return aletMessage return aletMessage
} else if (this.selHome.value === 'else' && !this.homeContent) { } else if (this.selHome.value === 'other' && !this.homeContent) {
aletMessage = '请填写房屋' aletMessage = '请填写房屋'
return aletMessage return aletMessage
} }
@ -725,7 +732,7 @@ export default {
return aletMessage return aletMessage
} }
if (this.memberList[0].length > 1) { if (this.memberList.length > 1) {
for (let i = 1; i < this.memberList.length; i++) { for (let i = 1; i < this.memberList.length; i++) {
let item = this.memberList[i] let item = this.memberList[i]
@ -751,28 +758,31 @@ export default {
popupOk () { popupOk () {
if (this.selType === 'community') { if (this.selType === 'community') {
this.selVillage = this.selObj this.selVillage = this.selObj
this.formData.villageId = this.selObj.value
this.formData.villageName = this.selObj.label
this.selBuild = null this.selBuild = null
this.selUnit = null this.selUnit = null
this.selHome = null this.selHome = null
this.formData.unitContent = '' this.unitContent = ''
this.formData.homeContent = '' this.homeContent = ''
this.loadBuild() this.loadBuild()
} }
if (this.selType === 'building') { if (this.selType === 'building') {
this.selBuild = this.selObj this.selBuild = this.selObj
this.formData.buildContent = this.selObj.label
this.formData.buildId = this.selObj.value this.formData.buildId = this.selObj.value
this.formData.buildName = this.selObj.label
this.selUnit = null this.selUnit = null
this.selHome = null this.selHome = null
this.formData.unitContent = '' this.unitContent = ''
this.formData.homeContent = '' this.homeContent = ''
this.loadUnit() this.loadUnit()
} }
if (this.selType === 'unit') { if (this.selType === 'unit') {
this.selUnit = this.selObj this.selUnit = this.selObj
this.formData.unitId = this.selObj.value
this.selHome = null this.selHome = null
this.unitContent = '' this.unitContent = ''
@ -783,6 +793,7 @@ export default {
} }
if (this.selType === 'room') { if (this.selType === 'room') {
this.selHome = this.selObj this.selHome = this.selObj
this.formData.homeId = this.selObj.value
this.homeContent = '' this.homeContent = ''
} }

Write Preview
Loading…
Cancel
Save