+
+
+
+
+
From 238feec4b3a8434547d1f8428538afc24f093d73 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 26 Aug 2022 18:22:28 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/sys/icvaccineprarmeter-check.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/sys/icvaccineprarmeter-check.vue b/src/views/modules/sys/icvaccineprarmeter-check.vue
index e91393ca7..fefd848f0 100644
--- a/src/views/modules/sys/icvaccineprarmeter-check.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-check.vue
@@ -364,7 +364,11 @@ export default {
checkState: type, // 0-未审核 1-未通过 2-已通过
checkReason: '',
unitId: this.unitId || '',
- homeName: this.dataForm.homeName || ''
+ homeName: this.agencyObj.homeName || '',
+ villageId: this.agencyObj.villageId || '',
+ buildId: this.agencyObj.buildId || '',
+ unitId: this.agencyObj.unitId || '',
+ homeId: this.agencyObj.homeId || ''
}
if (type == '1') {
this.$prompt('请输入不通过的原因', '提示', {
From 4983e4225c991be5af4e5ec7a93f9de60dad5bcd Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 26 Aug 2022 20:04:47 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sys/icvaccineprarmeter-add-or-update.vue | 17 ++++---
.../modules/sys/icvaccineprarmeter-check.vue | 45 ++++++++++++++-----
src/views/modules/sys/icvaccineprarmeter.vue | 17 ++++---
3 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index 7c52db1e9..7527c1d79 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -5,7 +5,7 @@
+
+
+
+ {{ agencyObj.neighborHoodName }}-{{agencyObj.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 生成
+
+
+
+
+ 楼房
+ 平房
+ 别墅
+
+
+
+
+
+
+ 住宅
+ 商业
+ 办公
+ 工业
+ 仓储
+ 商住混用
+ 其他
+
+
+
+
+
+
+ 出租
+ 闲置
+ 自住
+ 未出售
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ 下载
+
+
+ 取 消
+ 确 定
+
+
-
+
{{ $t('cancel') }}
- {{ $t('confirm') }}
+ {{ $t('confirm') }}
@@ -280,6 +293,14 @@ export default {
},
isAdd: '',
unitId: '',
+ household: [
+ { value: '0', label: '户籍' },
+ { value: '1', label: '外来' },
+ ],
+ isVaccinationOption: [
+ { value: '0', label: '否' },
+ { value: '1', label: '是' },
+ ],
// 审核
formShow: false,
agencyObj: {}
@@ -423,7 +444,7 @@ export default {
computed: {
dataRule () {
return {
-
+
}
},
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index cc6d02fe6..6000b8d82 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -201,12 +201,12 @@
+
{{ $t('update') }}
- {{ $t('delete') }}
- 审核
+ {{ $t('delete') }}
+ 审核
+ 查看
@@ -436,6 +436,13 @@ export default {
this.$message.success("操作失败！");
}
},
+
+ async handleLook(rowIndex) {
+ this.formTitle = "查看";
+ this.checkVisible = true;
+ await nextTick();
+ this.$refs.add_parameter.init(this.dataList[rowIndex],true);
+ },
handleClearVillage() {
this.dataForm.buildId = ''
this.dataForm.homeId = ''
@@ -488,7 +495,7 @@ export default {
this.$http
.post('/gov/org/customergrid/gridoption', {
agencyId: user.agencyId,
- purpose: 'query'
+ purpose: 'addorupdate'
})
.then(({ data: res }) => {
if (res.code !== 0) {
From b8f755dfd79b73701f59b92ba63c2264c4dcb0ca Mon Sep 17 00:00:00 2001
From: wangxianzhang
Date: Mon, 29 Aug 2022 11:03:25 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7-=E6=8A=A4?=
=?UTF-8?q?=E7=85=A7=E5=8F=B7-=E6=AD=A3=E5=88=99=E9=99=90=E5=88=B6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/validate.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils/validate.js b/src/utils/validate.js
index c9e98d3e9..04f6a0efb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -37,7 +37,7 @@ export function isURL(s) {
* @param {*} s
*/
export function isCard(s) {
- return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s);
+ return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z0-9]{8,9}$/.test(s);
}
/**
* 护照
From 184d884f6bbe315a9f0e357af55d3d95ab18d120 Mon Sep 17 00:00:00 2001
From: wangxianzhang
Date: Mon, 29 Aug 2022 13:53:20 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/editResi.vue | 2 +-
src/views/components/resiForm.vue | 2 +-
src/views/modules/base/epidemic/travelForm.vue | 2 +-
src/views/modules/base/huji/chusheng/cpts/edit.vue | 2 +-
src/views/modules/base/huji/immigration/edit.vue | 2 +-
src/views/modules/shequzhili/xiangmu/cpts/edit.vue | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index c9e6d7201..aac17e458 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -336,7 +336,7 @@ export default {
callback(new Error('请输入证件号'))
} else {
if (!isCard(value)) {
- callback(new Error('证件号格式不正确'))
+ callback(new Error('证件号格式不正确，支持身份证和护照'))
}
callback()
}
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 014216e24..40f9f8aed 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -316,7 +316,7 @@ export default {
callback(new Error('请输入证件号码'))
} else {
if (!isCard(value) && !isPassport(value)) {
- callback(new Error('证件号码格式不正确'))
+ callback(new Error('请输入正确的身份证号或护照号'))
}
callback()
}
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 20a5fdbb1..30ca0369e 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -248,7 +248,7 @@ export default {
callback(new Error('证件号不能为空'))
} else {
if (!isCard(value)) {
- callback(new Error('证件号格式不正确'))
+ callback(new Error('请输入正确的身份证号或护照号'))
}
callback()
}
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 9edea79ba..d1c07dc94 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -447,7 +447,7 @@ export default {
callback(new Error("请输入证件号"));
} else {
if (!isCard(value)) {
- callback(new Error("证件号格式不正确"));
+ callback(new Error("请输入正确的身份证号或护照号"));
}
callback();
}
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 764b7a8b9..f90baa11b 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -442,7 +442,7 @@ export default {
callback(new Error('请输入证件号'))
} else {
if (!isCard(value)) {
- callback(new Error('证件号格式不正确'))
+ callback(new Error('请输入正确的身份证号或护照号'))
}
callback()
}
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
index 552c7f50c..d5ccd4b33 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
@@ -447,7 +447,7 @@ export default {
callback(new Error("请输入证件号"));
} else {
if (!isCard(value)) {
- callback(new Error("证件号格式不正确"));
+ callback(new Error("请输入正确的身份证号或护照号"));
}
callback();
}
From e144906b5d3b6f4ff62e849009eb52e8d166edca Mon Sep 17 00:00:00 2001
From: wangxianzhang
Date: Mon, 29 Aug 2022 13:54:21 +0800
Subject: [PATCH 15/19] -
---
src/views/components/editResi.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index aac17e458..d01d2e4e3 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -336,7 +336,7 @@ export default {
callback(new Error('请输入证件号'))
} else {
if (!isCard(value)) {
- callback(new Error('证件号格式不正确，支持身份证和护照'))
+ callback(new Error('请输入正确的身份证号或护照号'))
}
callback()
}
From 8da75e067b8e746e3c655238eb28fec8a46c4ea5 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 29 Aug 2022 15:11:32 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/sys/icvaccineprarmeter.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index 6000b8d82..6ed228b78 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -181,15 +181,15 @@
{{scope.$index+1}}
-
+
+
+
+
+
+
+
+
+
Date: Tue, 30 Aug 2022 10:40:39 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sys/icvaccineprarmeter-add-or-update.vue | 16 ++++++++++++++++
src/views/modules/sys/icvaccineprarmeter.vue | 1 +
2 files changed, 17 insertions(+)
diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index 1da25ea10..8a1c73255 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -738,6 +738,22 @@
})
return false;
}
+ if(this.dataForm.isVaccination === '1'){
+ if(this.dataForm.firstVacTime === ''){
+ this.$message({
+ type: 'warning',
+ message: '请选择第一次接种时间'
+ })
+ return false;
+ }
+ if(this.dataForm.firstVacSite === ''){
+ this.$message({
+ type: 'warning',
+ message: '请输入第一次接种地点'
+ })
+ return false;
+ }
+ }
await this.$refs['dataForm'].validate((valid) => {
if (!valid) {
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index 6ed228b78..a2b1e8241 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -592,6 +592,7 @@ export default {
isVaccination: ''
};
this.pageNo = 1
+ this.getDataList()
},
// 上传文件之前的钩子
beforeUpload(file) {
From 609e0e79329e5b797c99b76da3a59d32656d4116 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Tue, 30 Aug 2022 15:19:55 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/shequzhili/csgltc/csglDetail.vue | 2 +-
src/views/modules/shequzhili/csgltc/csglForm.vue | 4 ++--
.../shequzhili/tuceng/zhonghe/baseTotal.vue | 16 +++++++++++-----
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index 39a61f484..f47ae68d7 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -143,7 +143,7 @@ export default {
this.handleMoveCenter()
})
this.handleMoveCenter()
- this.convert()
+ // this.convert()
},
setMarker (lat, lng) {
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index be715825f..4d3fe5195 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -322,8 +322,8 @@ export default {
map.on('panend', () => {
this.handleMoveCenter()
})
- // this.handleMoveCenter()
- this.convert()
+ this.handleMoveCenter()
+ // this.convert()
},
setMarker (lat, lng) {
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
index b0bd49d61..b834b26e3 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -490,12 +490,18 @@ export default {
this.jmlbOptions = []
this.jmlbOptions = data
if (this.jmlbOptions.length > 0) {
- this.fmData.category = this.jmlbOptions[0].value
+ this.fmData.category = 'anzhibangjiao'
+ // let temp = {
+ // queryType: this.jmlbOptions[0].queryType,
+ // tableName: this.jmlbOptions[0].tableName,
+ // columnName: this.jmlbOptions[0].columnName,
+ // columnValue: [this.jmlbOptions[0].columnValue],
+ // }
let temp = {
- queryType: this.jmlbOptions[0].queryType,
- tableName: this.jmlbOptions[0].tableName,
- columnName: this.jmlbOptions[0].columnName,
- columnValue: [this.jmlbOptions[0].columnValue],
+ queryType: 'list_equal',
+ tableName: 'ic_special',
+ columnName: 'SPECIAL_RQLB',
+ columnValue: ["anzhibangjiao"],
}
this.elseParams.push(temp)