diff --git a/src/assets/img/shuju/grid/IS_KC.png b/src/assets/img/shuju/grid/IS_KC.png new file mode 100644 index 000000000..48bd3208c Binary files /dev/null and b/src/assets/img/shuju/grid/IS_KC.png differ diff --git a/src/assets/img/shuju/grid/sr_gc.png b/src/assets/img/shuju/grid/sr_gc.png new file mode 100644 index 000000000..c5a00bb7e Binary files /dev/null and b/src/assets/img/shuju/grid/sr_gc.png differ diff --git a/src/router/index.js b/src/router/index.js index fb66b869c..de595a814 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -112,20 +112,20 @@ function cookApiDataItem(item) { function n2one(v) { let ret = []; for (let i = 0; i < v.length; i++) { - console.log("xxxxx", v[i]); + // console.log("xxxxx", v[i]); ret.push(v[i]); if (Array.isArray(v[i].children) && v[i].children.length > 0) { ret.push(...n2one(v[i].children)); } } - console.log("aaaa", ret); + // console.log("aaaa", ret); return ret; } let allChildrenUrl = n2one(item.children) .filter((i) => i.url != "" && i.showFlag == 1) .map((i) => i.url); - console.log("))))))))))))", allChildrenUrl); + // console.log("))))))))))))", allChildrenUrl); if (item.children.length > 0) { if (item.url == "" || !allChildrenUrl.find((i) => i.url == item.url)) { diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue index 2562d8bb7..1912e820b 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue @@ -159,15 +159,16 @@ :inline="true" :model="formDataSearch" ref="ref_formSearch" - :label-width="'90px'" + label-width="90px" > - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + console.log("获取查询详情成功", res.data); + this.optionsV = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getBuildList() { + this.$http + .post("/gov/org/icbuilding/buildingoption", { + neighborHoodId: this.formDataSearch.neighborId, + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + console.log("获取查询详情成功", res.data); + this.optionsB = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getUniList() { + this.$http + .post("/gov/org/icbuildingunit/unitoption", { + buildingId: this.formDataSearch.buildingId, + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + console.log("获取查询详情成功", res.data); + this.optionsD = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getHouseList() { + this.$http + .post("/gov/org/ichouse/houseoption", { + unitId: this.formDataSearch.unitId, + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + console.log("获取查询详情成功", res.data); + this.optionsH = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + handleComfirm() { if (this.activeName === "first") { this.$refs["ref_form1"].validate((valid, messageObj) => { diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue index 8cf1bcb1b..79b06db74 100644 --- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue +++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue @@ -25,7 +25,7 @@
检测结果： - {{ formData.natResult==='0'?'阴性':'阳性' }} + {{ formData.natResult==='0'?'阴性':formData.natResult==='1'?'阳性':'--' }}
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue index 0d11f7407..f2e2874d7 100644 --- a/src/views/modules/base/epidemic/vaccin.vue +++ b/src/views/modules/base/epidemic/vaccin.vue @@ -100,7 +100,8 @@ class="diy-button--export" size="small" @click="handleExportModule">下载模板 - + @dialogCancle="diaClose"> -
+
+
+
+
+ 姓名： + {{ formData.name||'--' }} +
+ +
+ 手机号： + {{ formData.mobile||'--' }} +
+ +
+ 证件号： + {{ formData.idCard||'--' }} +
+ +
+ 接种时间： + {{ formData.inoculateTime||'--' }} +
+
+ 接种地点： + {{ formData.inoculateAddress||'--' }} +
+
+ 疫苗厂家： + {{ formData.manufacturer||'--' }} +
+ +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+
取 消 - 确 定 -
+ @click="handleCancle">关 闭 +
@@ -108,23 +56,7 @@ let loading // 加载动画 export default { data () { return { - formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 - hideUploadEdit: false, // 隐藏'上传按钮' - limitNum: 1, - enterType: '1',//录入方式1 手动输入 2 选择居民 - isFromResi: false,//是否从已有居民信息中选择 - - gridList: [], - personList: [], - pickerOptions: { //控制时间范围 - disabledDate (time) { - return time.getTime() > (Date.now()) - } - }, - - btnDisable: false, - - icNatId: '', + initLoading: false, formData: { agencyId: '',//当前网格所属组织Id userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 @@ -137,11 +69,7 @@ export default { manufacturer: '' }, - fileList: [], - uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile', - dialogImageUrl: '', - dialogVisible: false, - imgLoading: false, + } }, @@ -149,8 +77,7 @@ export default { async mounted () { const { user } = this.$store.state this.agencyId = user.agencyId - //获取网格下拉框数据 - // await this.loadGrid() + }, methods: { @@ -158,79 +85,16 @@ export default { this.formData.content = '' }, - async initForm (type, row) { - // this.startLoading() - this.formData.agencyId = this.agencyId + async initForm (row) { - // this.$refs['ref_form'].resetFields(); - this.isFromResi = false - this.enterType = '1' - this.formType = type this.formData = { ...row } // this.endLoading() console.log('formData----', this.formData) - - }, - - handleChangeEnterType (value) { - this.formData.name = '' - this.formData.mobile = '' - this.formData.idCard = '' - this.formData.gridId = '' - this.formData.userId = '' - - this.$refs['ref_form'].resetFields(); - if (value === '2') { - this.isFromResi = true - } else { - this.isFromResi = false - } - + this.initLoading = true }, - async loadGrid () { - const url = "/gov/org/customergrid/gridoption" - let params = { - agencyId: this.agencyId - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.gridList = data - - } else { - this.$message.error(msg) - } - - }, - async handleSelGrid (value) { - - const url = "/epmetuser/icresiuser/demandusers" - - let params = { - agencyId: this.agencyId, - gridId: value - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.personList = data - - } else { - this.$message.error(msg) - } - - }, - async handleSelPerson (personItem) { - this.formData.userId = personItem.demandUserId - this.formData.name = personItem.demandUserName - this.formData.mobile = personItem.demandUserMobile - this.formData.idCard = personItem.idCard - }, async loadFormData () { @@ -284,164 +148,15 @@ export default { } }, - handleComfirm () { - this.$refs['ref_form'].validate((valid, messageObj) => { - if (!valid) { - app.util.validateRule(messageObj) - - } else { - this.addNat() - } - - }) - }, - - async addNat () { - // if (this.imgLoading) { - // this.$message({ - // type: 'warning', - // message: '正在上传图片，请稍候重试' - // }) - // return false; - // } - const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - if (regPhone.test(this.formData.mobile) === false) { - this.btnDisable = false - this.$message({ - type: 'warning', - message: '请输入正确的手机号码' - }) - return false; - } - const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z0-9]{8,9}$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X - if (regCard.test(this.formData.idCard) === false) { - this.btnDisable = false - this.$message({ - type: 'warning', - message: '请输入正确的证件号码' - }) - return false; - } - - if (this.formData.isSelChannel) { - if (!this.formData.content) { - this.$message({ - type: 'warning', - message: '请填写通知内容' - }) - return false; - } else { - this.formData.channel = ['0'] - } - - } else { - this.formData.channel = [] - this.formData.content = '' - } - - this.btnDisable = true - setTimeout(() => { - this.btnDisable = false - }, 5000) - - let url = '' - if (this.formType === 'add') { - url = '/epmetuser/icNat/add' - // url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add" - this.formData.icNatId = '' - - } else { - url = '/epmetuser/icNat/edit' - // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit" - } - - - const { data, code, msg } = await requestPost(url, this.formData) - - if (code === 0) { - this.$message({ - type: 'success', - message: '操作成功' - }) - this.resetData() - this.$emit('dialogOk') - this.btnDisable = false - - } else { - this.btnDisable = false - this.$message.error(msg) - } - - }, handleCancle () { - this.resetData() + // this.resetData() this.$emit('dialogCancle') }, - handleRemove (file, fileList) { - this.hideUploadEdit = fileList.length >= this.limitNum; - this.formData.fileName = '' - this.formData.attachmentUrl = '' - this.formData.attachmentType = '' - this.fileList = [] - - }, - handlePictureCardPreview (file) { - this.dialogImageUrl = file.url; - this.dialogVisible = true; - }, - - handleEditChange (file, fileList) { - this.hideUploadEdit = fileList.length >= this.limitNum; - - }, - - beforeUpload (file) { - const array = file.name.split('.') - const extension = array[array.length - 1] - // const isLt1M = (file.size / 1024 / 1024) < 5 - if (extension !== 'jpg' - && extension !== 'png' - && extension !== 'gif' - ) { - this.$message.error('只能上传jpg、png、gif文件！') - return false - } else { - this.btnDisable = true - } - // if (!isLt1M) { - // this.$message.error('上传文件大小不能超过 5MB!') - // } - // return isLt1M - - }, - - handleFileSuccess (res, file) { - - if (res.code === 0 && res.msg === 'success') { - const array = file.name.split('.') - const fileType = array[array.length - 1] - - this.formData.fileName = file.name - this.formData.attachmentUrl = res.data.url - this.formData.attachmentType = 'image' - - file.attachmentFormat = fileType - file.attachmentSize = file.size - - - } else { - this.$message.error(res.msg) - } - this.btnDisable = false - }, resetData () { - this.icNatId = '' - this.fileList = [] - this.hideUploadEdit = false this.formData = { icNatId: '', @@ -481,40 +196,6 @@ export default { } }, computed: { - dataRule () { - return { - name: [ - { required: true, message: '姓名不能为空', trigger: 'blur' } - ], - idCard: [ - { required: true, message: '证件号不能为空', trigger: 'blur' } - ], - mobile: [ - { required: true, message: '手机号不能为空', trigger: 'blur' }, - ], - natTime: [ - { required: true, message: '检测时间不能为空', trigger: 'blur' }, - ], - - natAddress: [ - { required: false }, - ], - natResult: [ - { required: true, message: '检测结果不能为空', trigger: 'blur' }, - ], - - isSelChannel: [ - { required: false }, - ], - channel: [ - { required: false }, - ], - content: [ - { required: false }, - ], - - } - }, }, props: { @@ -530,19 +211,8 @@ export default { - - - diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue index 2c0a3e1e8..7aab0f801 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue @@ -134,11 +134,7 @@ export default { } }, - - handleCancle () { - - this.$emit('diaDetailClose') }, diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue index 9584d9954..6e7ad42ef 100644 --- a/src/views/modules/communityService/worklog/workLog.vue +++ b/src/views/modules/communityService/worklog/workLog.vue @@ -10,6 +10,7 @@ prop="gridId"> + width="100"> + min-width="130"> + min-width="150"> + width="110"> + width="100">
- + + + + + + + +