From 3e9053766c26adb43f25b7d734c02bc6561bf920 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 26 Oct 2022 15:57:47 +0800 Subject: [PATCH 01/17] 11 --- .../ninePlaces/places/places.vue | 121 +++++++++++++++++- .../ninePlaces/places/placesDetail.vue | 6 +- .../ninePlaces/places/placesForm.vue | 81 +++++++++--- 3 files changed, 184 insertions(+), 24 deletions(-) diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index f97837131..89e039c28 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -45,6 +45,17 @@ + + + + + + + + + + + + @@ -90,6 +116,10 @@ 新增 + 导出 + + { + console.log("res----dddd", res); + // this.download(res.data, title + '.xls') + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI( + res.headers["content-disposition"].split(";")[1].split("=")[1] + ); + console.log("filename", fileName); + let blob = new Blob([res.data], { + type: "application/vnd.ms-excel", + }); + var url = window.URL.createObjectURL(blob); + var aLink = document.createElement("a"); + aLink.style.display = "none"; + aLink.href = url; + aLink.setAttribute("download", fileName); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + } else this.$message.error("下载失败"); + }) + .catch((err) => { + console.log("err", err); + return this.$message.error("网络错误"); + }); + }, + // 下载文件 + download (data, fileName) { + if (!data) { + return; + } + + var csvData = new Blob([data]); + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(csvData, fileName); + } + // for Non-IE (chrome, firefox etc.) + else { + var a = document.createElement("a"); + document.body.appendChild(a); + a.style = "display: none"; + var url = window.URL.createObjectURL(csvData); + a.href = url; + a.download = fileName; + a.click(); + a.remove(); + window.URL.revokeObjectURL(url); + } + }, diaClose () { @@ -456,16 +569,18 @@ export default { //重置搜索条件 resetSearch () { this.formData = { + placeCategory: '',//0九小场所、1企事业单位 placeOrgName: '',//场所名称 mobile: '',//联系电话 - scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 + // scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 + scaleTotal: '', gridId: '',//场所区域【网格Id】 ninePlaceVal: '',//场所类型【九小场所Value值】 isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是 } this.pageSize = 10 this.pageNo = 0 - this.loadTable() + // this.loadTable() }, diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue index 7aab0f801..2a828d80e 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue @@ -8,6 +8,10 @@ 场所类型： {{ formData.ninePlaceName||'--' }} +
+ 场所类别： + {{ formData.placeCategory ||'--' }} +
场所区域： @@ -25,7 +29,7 @@
规模： - {{ formData.scaleName||'--' }} + {{ formData.scaleTotal||'--' }}
负责人： diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue index ae7bb8e0c..e5d816dde 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue @@ -6,11 +6,25 @@ :inline="true" :model="formData" :rules="dataRule" + label-width="150px" :disabled="formType === 'detail'" class="form"> + + + + + + - + --> + + + + Date: Wed, 26 Oct 2022 17:27:21 +0800 Subject: [PATCH 02/17] 111 --- src/assets/scss/pages/staffRegister.scss | 168 +++++++ src/router/index.js | 9 + .../ninePlaces/places/places.vue | 2 +- src/views/pages/staffRegister.vue | 441 ++++++++++++++++++ 4 files changed, 619 insertions(+), 1 deletion(-) create mode 100644 src/assets/scss/pages/staffRegister.scss create mode 100644 src/views/pages/staffRegister.vue diff --git a/src/assets/scss/pages/staffRegister.scss b/src/assets/scss/pages/staffRegister.scss new file mode 100644 index 000000000..d9ce9aac4 --- /dev/null +++ b/src/assets/scss/pages/staffRegister.scss @@ -0,0 +1,168 @@ +.bg-caiji { + + // background-color: rgba(189, 214, 255, 0.89); + height: 100%; + width: 100vw; + padding: 20px; + + .title { + text-align: center; + font-size: 20px; + } + + .main { + padding-top: 20px; + // font-size: 40px; + + .div_tab{ + display: flex; + justify-content: center; + + .div_option{ + text-align: center; + color:#3e8ef7; + height:35px; + width:150px; + line-height: 35px; + padding:0 0; + border:1px solid #3e8ef7 ; + } + + .option_left{ + border-radius: 5px 0 0 5px; + } + .option_right{ + border-radius: 0 5px 5px 0; + } + + .option_select{ + color:#ffffff; + background-color:#3e8ef7 ; + } + } + + .content { + margin-top:10px; + border-radius: 5px; + background-color: rgba(255, 255, 255, 0.787); + + .member_title { + padding: 10px; + font-size: 14px; + } + } + .content1 { + margin-top: 20px; + } + + .line { + border: 1px solid #e4e4e48e; + } + } + + .div-btn { + margin-top: 30px; + padding-bottom: 20px; + display: flex; + justify-content: center; + + .btn { + width: 150px; + font-size: 16px; + } + } +} + +.picker_content { + color: rgb(59, 59, 59); +} + +.bg-caiji-success { + background: url("../../assets/img/caiji-bc.png") no-repeat; + background-size: 100% 100%; + height: 100vh; + width: 100vw; + text-align: center; + + .title { + // background-color: rgba(189, 214, 255, 0.89); + padding-top:30px; + font-size: 18px; + font-family: PingFang SC; + font-weight: 800; + color: #333333; + display: flex; + height:25px; + align-items: center; + justify-content: center; + + >img{ + width:27px; + height:25px; + } + .title_name{ + margin-left:5px; + margin-top:5px; + } + } + + .div_tip{ + text-align: center; + margin-top:35px; + font-size: 18px; + font-family: PingFang SC; + font-weight: 800; + color: #2E78E2; + line-height: 26px; + } + + .div_content{ + + margin:20px 10px 30px 10px; + padding:20px 16px; + background: #FFFFFF; + border-radius: 10px; + font-size: 16px; + font-family: Source Han Serif SC; + font-weight: 400; + color: #333333; + + text-align: left; + + .content_long{ + display: flex; + justify-content: left; + align-items: flex-start; + + .content_title{ + min-width: 85px; + // flex:0 0 85px; + flex-shrink: 0; + text-align: right; + } + } + + .marginT10{ + margin-top:10px; + } + } + + .main { + margin-top: 100px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + + .icon-success { + font-size: 40px; + // width: 20px; + // height: 20px; + } + + .success-content { + margin-top: 10px; + font-size: 25px; + } + } +} diff --git a/src/router/index.js b/src/router/index.js index de595a814..d4c051b97 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -62,6 +62,15 @@ export const pageRoutes = [ title: "居民信息填报", }, }, + { + path: "/staffRegister", + props: true, + name: "staffRegister", + component: () => import("@/views/pages/staffRegister"), + meta: { + title: "员工登记", + }, + }, ]; // 模块路由(基于主入口布局页面) diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 89e039c28..20f51f65a 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -414,7 +414,7 @@ export default { async handleExport () { let title = "员工登记码"; - const url = "/epmetuser/icVaccine/export"; + const url = "/gov/org/enterprise/qrCodeExport"; await this.$http({ method: "POST", diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue new file mode 100644 index 000000000..cf70bc34e --- /dev/null +++ b/src/views/pages/staffRegister.vue @@ -0,0 +1,441 @@ + + + + From bd1466dcfb80dbf6a8788c09dc9c9fde4d0a2ece Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 27 Oct 2022 11:11:38 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AFh5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 + src/views/pages/staffRegister.vue | 235 +++++++++++++---------- src/views/pages/staffRegisterSuccess.vue | 147 ++++++++++++++ 3 files changed, 289 insertions(+), 102 deletions(-) create mode 100644 src/views/pages/staffRegisterSuccess.vue diff --git a/src/router/index.js b/src/router/index.js index d4c051b97..04c4dbdf2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -71,6 +71,15 @@ export const pageRoutes = [ title: "员工登记", }, }, + { + path: "/staffRegisterSuccess", + props: true, + name: "staffRegisterSuccess", + component: () => import("@/views/pages/staffRegisterSuccess"), + meta: { + title: "员工登记", + }, + }, ]; // 模块路由(基于主入口布局页面) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index cf70bc34e..2fcf393dc 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -6,15 +6,18 @@
-
员工登记
-
受众群体登记
+
员工登记
+
受众群体登记
-
+
- {{shequName}} + {{placeOrgName}}
@@ -35,14 +38,14 @@ :disableClear="true" :label="'*身份证'" placeholder="请输入" - v-model="formData.idNum"> + v-model="formData.idCard">
-
- + {{formData.detNumName}} + v-if="formData.ymjzCount">{{formData.ymjzCountName}} 请选择
@@ -51,13 +54,45 @@ {{formData.detDataName}} + v-if="formData.latestNatTime">{{formData.latestNatTime}} 请选择
+
+ + + + {{placeOrgName}} + +
+
+ + {{formData2.natTime}} + 请选择 + +
+
+ +
+ +
+ +
@@ -113,23 +148,35 @@ export default { pickerVisible: '', startDate: new Date(), + //二维码带来数据 + enterpriseId: '',//场所Id + customerId: '',//客户Id + placeOrgName: '',//场所名称 + formData: { + enterpriseId: '',//场所ID + customerId: '',//客户id name: '', - idNum: '', + idCard: '', mobile: '', - detNum: null, - detNumName: '', - detData: '', - detDataName: '' + ymjzCount: null, + ymjzCountName: '', + latestNatTime: '', + }, + formData2: { + enterpriseId: '',//场所ID + customerId: '',//客户id + natTime: '',//受众人数 + szTotal: '',//核酸检测人数 + hsjcTotal: '',//客户ID + }, btnDisabled: false, popupVisible: false, - //二维码带来数据 - shequId: '',//社区id 6e511da6816e53af4cda952365a26eb9 德兴路 1202807601961984002 + shequName: '',//社区名称 - customerId: '',//客户id 45687aa479955f9d06204d415238f7cc selType: 'community',//弹出框所显示的数据类型：community、building、unit、room pickerData: [], @@ -156,37 +203,21 @@ export default { created () { console.log(this.$route) - this.shequId = this.$route.params.id this.customerId = this.$route.query.customerId - this.shequName = this.$route.query.name - document.title = this.shequName + '信息管理平台' + this.enterpriseId = this.$route.query.enterpriseId + this.placeOrgName = this.$route.query.placeOrgName + document.title = this.placeOrgName + '员工登记' }, mounted () { - let envShow = process.env.VUE_APP_NODE_ENV console.log('环境', envShow) - let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9', 'b058eb82d65d922fec9dc84f0348fc6a', '630c3c2dd1cd7a4d198c8558bce88324'] - // let internalShequId = ['1202807601961984002',] - // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 - // internalShequId = '6e511da6816e53af4cda952365a26eb9' - // } else if (envShow === 'prod:uat') { // 体验 - // internalShequId = '6e511da6816e53af4cda952365a26eb9' - // } else if (envShow === 'prod') { // 生产 - // 微笑崂山下的小寨子社区：b058eb82d65d922fec9dc84f0348fc6a - // 亿联街道下的亿联社区：630c3c2dd1cd7a4d198c8558bce88324 - // internalShequId = '1202807601961984002' - // } else if (envShow === 'shibei_prod') { // 生产 - // internalShequId = '1202807601961984002' - // } - this.formData.customerId = this.customerId - if (internalShequId.indexOf(this.shequId) > -1) { - this.formData.origin = 'internal' - } else { - this.formData.origin = 'external' - } + this.formData.enterpriseId = this.enterpriseId + + this.formData2.customerId = this.customerId + this.formData2.enterpriseId = this.enterpriseId this.detNumList = [] for (let i = 0; i < 5; i++) { @@ -197,10 +228,12 @@ export default { this.detNumList.push(obj) } - }, methods: { + handleChangeTab (val) { + this.selectTab = val + }, handelSelData () { this.$refs.pickerData.open(); // 触发 // this.$refs.pickerData.close() ; // 关闭 @@ -210,15 +243,20 @@ export default { let time = new Date(val); let year = time.getFullYear() - console.log(year) + let month = time.getMonth() + 1 + let day = time.getDate() + if (this.selectTab === '1') { + this.formData.latestNatTime = year + '-' + month + '-' + day + } else if (this.selectTab === '2') { + this.formData2.natTime = year + '-' + month + '-' + day + } }, handelSel (selType) { this.selType = selType - if (selType === 'detNum') { - + if (selType === 'ymjzCount') { this.pickerData = this.detNumList } @@ -252,26 +290,32 @@ export default { }, async submit () { - - - - - - console.log(this.formData) - + let url = "/gov/org/icEmployeeRegister/add" + let params = {} + if (this.selectTab === '1') { + url = '/gov/org/icEmployeeRegister/add' + params = this.formData + } else if (this.selectTab === '2') { + url = '/gov/org/icGroupPeopleRegister/add' + params = this.formData2 + } + console.log(params) + // return false this.btnDisabled = true this.startLoading() - const url = "/epmetuser/icresicollect/save" - const { data, code, msg } = await requestPost(url, this.formData) + + const { data, code, msg } = await requestPost(url, params) this.endLoading() this.btnDisabled = false if (code === 0) { - this.formData.shequName = this.shequName + this.$router.replace({ - name: 'caijisuccess', + name: 'staffRegisterSuccess', query: { - formData: this.formData + selectTab: this.selectTab, + placeOrgName: this.placeOrgName, + formData: this.selectTab === '1' ? this.formData : this.formData2 } }) // Toast({ @@ -293,73 +337,60 @@ export default { let aletMessage = '' this.showMessagsBox = false - if (this.formData.origin === 'internal') {//内部 - if (!this.selVillage) { - aletMessage = '请选择小区' + if (this.selectTab === '1') {//员工 + if (!this.formData.name) { + aletMessage = '请填写姓名' return aletMessage } - if (!this.selBuild) { - aletMessage = '请选择楼栋' + if (!this.formData.mobile) { + aletMessage = '请填写手机号' return aletMessage } - if (!this.selUnit) {//没有选择单元 - aletMessage = '请选择单元' + if (!this.formData.idCard) {// + aletMessage = '请填写证件号' return aletMessage - } else {//选择了单元 - if (this.selUnit.value === 'other') {//单元选择了其他 - if (!this.unitContent) { - aletMessage = '请填写单元号' - return aletMessage - } - - if (!this.homeContent) {//房屋必须填写内容 - aletMessage = '请填写房屋' - return aletMessage - } - - } else {//单元没有选择其他 - if (!this.selHome) { - aletMessage = '请选择房屋' - return aletMessage - - } else if (this.selHome.value === 'other' && !this.homeContent) { - aletMessage = '请填写房屋' - return aletMessage - } - } + } + if (!this.formData.ymjzCount) {// + aletMessage = '请选择疫苗接种次数' + return aletMessage } + if (!this.formData.latestNatTime) {// + aletMessage = '请选择最近一次核酸检测时间' + return aletMessage + } + + + } else if (this.selectTab === '2') {//企业 + if (!this.formData2.natTime) { + aletMessage = '请选择核酸检测时间' - } else { - if (!this.formData.address) { - aletMessage = '请填写地址' return aletMessage } - } - - if (!this.selHomeType) { - aletMessage = '请选择房屋类型' - return aletMessage - } - if (!this.formData.houseHolderName) { - aletMessage = '请填写户主姓名' - return aletMessage - } + if (!this.formData2.szTotal) { + aletMessage = '请填写受众人数' + return aletMessage + } + if (!this.formData2.hsjcTotal) {// + aletMessage = '核酸检测人数' + return aletMessage + } + } }, popupOk () { - if (this.selType === 'detNum') { - this.formData.detNum = this.selObj.value - this.formData.detNumName = this.selObj.label + if (this.selType === 'ymjzCount') { + this.formData.ymjzCount = this.selObj.value + this.formData.ymjzCountName = this.selObj.label } this.popupVisible = false @@ -390,7 +421,7 @@ export default { }, beforeDestroy () { - document.title = messages[val].brand.lg + // document.title = messages[val].brand.lg }, } diff --git a/src/views/pages/staffRegisterSuccess.vue b/src/views/pages/staffRegisterSuccess.vue new file mode 100644 index 000000000..f9f4dcb15 --- /dev/null +++ b/src/views/pages/staffRegisterSuccess.vue @@ -0,0 +1,147 @@ + + + + From 4c38e1bd8eded715e216ced47a624e3d651ea7f4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 27 Oct 2022 15:03:37 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/staffRegister.scss | 6 +++--- src/views/pages/staffRegister.vue | 3 ++- src/views/pages/staffRegisterSuccess.vue | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/assets/scss/pages/staffRegister.scss b/src/assets/scss/pages/staffRegister.scss index d9ce9aac4..85683800c 100644 --- a/src/assets/scss/pages/staffRegister.scss +++ b/src/assets/scss/pages/staffRegister.scss @@ -126,8 +126,8 @@ font-family: Source Han Serif SC; font-weight: 400; color: #333333; - text-align: left; + .content_long{ display: flex; @@ -135,8 +135,8 @@ align-items: flex-start; .content_title{ - min-width: 85px; - // flex:0 0 85px; + // min-width: 85px; + flex:0 0 115px; flex-shrink: 0; text-align: right; } diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 2fcf393dc..88b038565 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -124,6 +124,7 @@ {{formData.ymjzCountName}}
-
最近一次核酸检测时间：
+
核酸检测时间：
{{formData.latestNatTime}}
@@ -143,5 +143,5 @@ export default { From 01a21c79ff493f8f600d6464a7c3ea48de16f57b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 28 Oct 2022 10:33:46 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemic/unitEpid/staffEpidDetail.vue | 204 +++++ .../base/epidemic/unitEpid/staffEpidList.vue | 842 ++++++++++++++++++ .../ninePlaces/places/places.vue | 121 +-- .../ninePlaces/places/placesDetail.vue | 6 +- .../ninePlaces/places/placesForm.vue | 77 +- src/views/modules/cpts/base/index.vue | 550 ++++++------ .../shequzhili/tuceng/anquan/xuncha/index.vue | 108 ++- 7 files changed, 1411 insertions(+), 497 deletions(-) create mode 100644 src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue create mode 100644 src/views/modules/base/epidemic/unitEpid/staffEpidList.vue diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue new file mode 100644 index 000000000..69224e2a8 --- /dev/null +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue new file mode 100644 index 000000000..3533da1b2 --- /dev/null +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue @@ -0,0 +1,842 @@ + + + + + + diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 20f51f65a..f97837131 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -45,17 +45,6 @@ - - - - - - - - - - - - @@ -116,10 +90,6 @@ 新增 - 导出 - - { - console.log("res----dddd", res); - // this.download(res.data, title + '.xls') - if (res.headers["content-disposition"]) { - let fileName = window.decodeURI( - res.headers["content-disposition"].split(";")[1].split("=")[1] - ); - console.log("filename", fileName); - let blob = new Blob([res.data], { - type: "application/vnd.ms-excel", - }); - var url = window.URL.createObjectURL(blob); - var aLink = document.createElement("a"); - aLink.style.display = "none"; - aLink.href = url; - aLink.setAttribute("download", fileName); - document.body.appendChild(aLink); - aLink.click(); - document.body.removeChild(aLink); //下载完成移除元素 - window.URL.revokeObjectURL(url); //释放掉blob对象 - } else this.$message.error("下载失败"); - }) - .catch((err) => { - console.log("err", err); - return this.$message.error("网络错误"); - }); - }, - // 下载文件 - download (data, fileName) { - if (!data) { - return; - } - - var csvData = new Blob([data]); - - if (window.navigator && window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveOrOpenBlob(csvData, fileName); - } - // for Non-IE (chrome, firefox etc.) - else { - var a = document.createElement("a"); - document.body.appendChild(a); - a.style = "display: none"; - var url = window.URL.createObjectURL(csvData); - a.href = url; - a.download = fileName; - a.click(); - a.remove(); - window.URL.revokeObjectURL(url); - } - }, diaClose () { @@ -569,18 +456,16 @@ export default { //重置搜索条件 resetSearch () { this.formData = { - placeCategory: '',//0九小场所、1企事业单位 placeOrgName: '',//场所名称 mobile: '',//联系电话 - // scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 - scaleTotal: '', + scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 gridId: '',//场所区域【网格Id】 ninePlaceVal: '',//场所类型【九小场所Value值】 isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是 } this.pageSize = 10 this.pageNo = 0 - // this.loadTable() + this.loadTable() }, diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue index 2a828d80e..7aab0f801 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue @@ -8,10 +8,6 @@ 场所类型： {{ formData.ninePlaceName||'--' }} -
- 场所类别： - {{ formData.placeCategory ||'--' }} -
场所区域： @@ -29,7 +25,7 @@
规模： - {{ formData.scaleTotal||'--' }} + {{ formData.scaleName||'--' }}
负责人： diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue index e5d816dde..068a57a18 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue @@ -6,25 +6,11 @@ :inline="true" :model="formData" :rules="dataRule" - label-width="150px" :disabled="formType === 'detail'" class="form"> - - - - - - - - - - -
-
- +
+
- + - 查询 - 重置 + 查询 + 重置
-
+
- 新增 - - 下载模板 - - - 导入 + 新增 + + 下载模板 + + + 导入 - 导出 - 批量删除 - + 导出 + 导出员工登记码 + 批量删除 +
- - @@ -255,7 +259,7 @@ export default { const url = "/gov/org/icGroupPeopleRegister/delete" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del" - let params = [...row.id] + let params = [row.id] const { data, code, msg } = await requestPost(url, params) @@ -316,7 +320,7 @@ export default { computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420 + return this.$store.state.inIframe ? this.clientHeight - 320 + this.iframeHeight : this.clientHeight - 320 }, diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue index 4281cf926..c2ee17cf9 100644 --- a/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue @@ -1,8 +1,17 @@ @@ -199,7 +203,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="'详情'" - width="850px" + width="1350px" top="5vh" class="dialog-h" @closed="diaDetailClose"> @@ -386,7 +390,7 @@ export default { const url = "/gov/org/icEmployeeRegister/delete" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del" - let params = [...row.registerId] + let params = [row.registerId] const { data, code, msg } = await requestPost(url, params) @@ -450,7 +454,7 @@ export default { computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420 + return this.$store.state.inIframe ? this.clientHeight - 370 + this.iframeHeight : this.clientHeight - 370 }, From 9d545feec2058ae0656d837dc0f54641c93c4af4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 09:46:31 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/staffRegister.scss | 2 +- src/views/pages/staffRegister.vue | 13 ++++++++++--- src/views/pages/staffRegisterSuccess.vue | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/assets/scss/pages/staffRegister.scss b/src/assets/scss/pages/staffRegister.scss index 85683800c..21f41a4d0 100644 --- a/src/assets/scss/pages/staffRegister.scss +++ b/src/assets/scss/pages/staffRegister.scss @@ -136,7 +136,7 @@ .content_title{ // min-width: 85px; - flex:0 0 115px; + flex:0 0 125px; flex-shrink: 0; text-align: right; } diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 88b038565..0c9f903c3 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -109,6 +109,7 @@ closeOnClickModal="true" position="bottom"> @@ -124,6 +125,7 @@ 提交成功
请截图保存，方便核验人员查看
-
+
企业名称：
{{placeOrgName}}
From 0c4b0f937ac1dbe6d5ea501ad12170604c4ee771 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 09:55:24 +0800 Subject: [PATCH 11/17] 11 --- src/views/pages/staffRegisterSuccess.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/pages/staffRegisterSuccess.vue b/src/views/pages/staffRegisterSuccess.vue index 1af45575e..917c5b94f 100644 --- a/src/views/pages/staffRegisterSuccess.vue +++ b/src/views/pages/staffRegisterSuccess.vue @@ -9,7 +9,8 @@
提交成功
请截图保存，方便核验人员查看
-
+
企业名称：
{{placeOrgName}}
From 8495528a5284d0d0a483b572a218cb99d1bbef1f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 10:48:10 +0800 Subject: [PATCH 12/17] 11 --- src/views/modules/cpts/base/cpts/edit.vue | 462 ++++++++---------- .../shequzhili/tuceng/anquan/xuncha/index.vue | 30 +- 2 files changed, 231 insertions(+), 261 deletions(-) diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index f3989e228..aff0551d4 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -1,273 +1,237 @@ diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue index 8e7d3654a..f7fcb29eb 100644 --- a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue @@ -178,10 +178,10 @@ class="div-table-button--delete " size="small" @click="handleDelete(scope.row)">删除 - 删除 + @click="handleDelete(scope.row)">删除 --> diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 8f102348d..74a6e8c1b 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -35,8 +35,9 @@ v-model="formData.mobile">
@@ -288,6 +289,7 @@ export default { }); } } else { + return false this.submit() } @@ -356,7 +358,22 @@ export default { aletMessage = '请填写证件号' return aletMessage + } else { + + let reg = new RegExp("[\\u4E00-\\u9FFF]+", "g"); + if (escape(this.formData.idCard).indexOf("%u") > 0 || escape(this.formData.idCard).indexOf("%u") == 0) { + aletMessage = '证件号不能填写中文' + return aletMessage + } + + if (this.formData.idCard.length > 18) { + aletMessage = '请填写正确的证件号' + return aletMessage + } } + + + if (!this.formData.ymjzCount) {// aletMessage = '请选择疫苗接种次数' return aletMessage From 72518f6cae2bf0471fa58e9dbbb70774f957a78c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 14:57:59 +0800 Subject: [PATCH 15/17] 11 --- src/views/pages/staffRegister.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 74a6e8c1b..b0cafb8da 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -362,12 +362,12 @@ export default { let reg = new RegExp("[\\u4E00-\\u9FFF]+", "g"); if (escape(this.formData.idCard).indexOf("%u") > 0 || escape(this.formData.idCard).indexOf("%u") == 0) { - aletMessage = '证件号不能填写中文' + aletMessage = '请输入正确的身份证号或者护照号' return aletMessage } if (this.formData.idCard.length > 18) { - aletMessage = '请填写正确的证件号' + aletMessage = '请输入正确的身份证号或者护照号' return aletMessage } } From a88f256a96aa060f682b252e39a8efe35e2e862d Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 15:39:05 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/staffRegister.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index b0cafb8da..a4c9872f3 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -456,6 +456,9 @@ export default { text-align: right; margin-right: 20px; } +.my-field /deep/ .mint-cell-title { + width: 110px; +} /deep/ .mint-popup-bottom { height: 300px; From 6e18aa4b3532768d9fa7fa9cf7f74ccd9c8869ab Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 16:27:42 +0800 Subject: [PATCH 17/17] 11 --- src/views/pages/staffRegister.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index a4c9872f3..97db79617 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -289,7 +289,7 @@ export default { }); } } else { - return false + this.submit() }