From 5da740149944dc9d1121eeab26f2e6f90e50e667 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 29 Jul 2022 15:09:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=BB=BC=E5=90=88=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/regionalParty/units.vue | 4 +- .../modules/communityService/sqzzz/index.vue | 10 +- .../shequzhili/tuceng/zhonghe/baseTotal.vue | 901 ++++++++++++++++++ 3 files changed, 908 insertions(+), 7 deletions(-) create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index c389b9d03..775f53d0e 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -580,7 +580,7 @@ export default { }); this.loadTable() } else { - this.$message.error(msg) + this.$message.error(data.msg) } @@ -611,7 +611,7 @@ export default { }); this.loadTable() } else { - this.$message.error(msg) + this.$message.error(data.msg) } } else { this.$message.error(msg) diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index 679399354..63a96aeed 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -133,7 +133,7 @@ + width="220"> + + + + From b3ba52988a956ce32618a30be4211c615909c0e7 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 29 Jul 2022 16:04:10 +0800 Subject: [PATCH 2/7] 111 --- src/views/main-shuju/main-theme-tools.vue | 85 +++++++++++++++++++++++ src/views/main-shuju/main.vue | 35 +++++----- 2 files changed, 102 insertions(+), 18 deletions(-) create mode 100644 src/views/main-shuju/main-theme-tools.vue diff --git a/src/views/main-shuju/main-theme-tools.vue b/src/views/main-shuju/main-theme-tools.vue new file mode 100644 index 000000000..56d051517 --- /dev/null +++ b/src/views/main-shuju/main-theme-tools.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index d6d29c1b6..869cd5b9c 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -1,25 +1,22 @@ - -
+
关闭 提交
-
-
关闭
-
提交
-
+
@@ -941,6 +925,7 @@ export default { diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index f2925eae5..323d3ff17 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -90,12 +90,8 @@ 2、状态=未完成 （有操作id） -->
- 关闭 -
关闭
@@ -128,8 +124,7 @@ -
+
关闭 确定
-
-
关闭
-
确认
-
-
+
关闭 确定
-
-
关闭
-
确认
-
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 815da6103..b63b4fbf6 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -54,8 +54,7 @@ :eventId="eventId" :eventDetailData="eventDetailData"> -
+
关闭 确定
-
-
关闭
-
确认
-
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index ed76d7d09..07a2796be 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -367,16 +367,16 @@ :uid="selUserId" ref="ref_people"> - + @handleClose="handleClose" /> - + @handleClose="handleClose" /> -->
From b23c3e92df2df7eea95434a4c104a7aaaad17887 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 29 Jul 2022 16:25:22 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=9C=80=E6=B1=822?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/csgltc/csgl.vue | 66 +- .../modules/shequzhili/csgltc/csglDetail.vue | 19 +- .../modules/shequzhili/csgltc/csglForm.vue | 53 +- src/views/modules/shequzhili/ggfwtc/ggfw.vue | 70 +- .../modules/shequzhili/ggfwtc/ggfwDetail.vue | 339 ++++----- .../modules/shequzhili/ggfwtc/ggfwForm.vue | 648 +++++++++--------- 6 files changed, 643 insertions(+), 552 deletions(-) diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index 4fb809e53..23ed5ca4b 100644 --- a/src/views/modules/shequzhili/csgltc/csgl.vue +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -118,10 +118,24 @@ label="地址" mix-width="230"> + + + + @@ -270,31 +284,31 @@ export default { responseType: "blob", data: params, }) - .then((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("网络错误"); - }); + .then((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("网络错误"); + }); }, //获取服务事项下拉框 diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue index af3dff975..4c652e19f 100644 --- a/src/views/modules/shequzhili/csgltc/csglDetail.vue +++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue @@ -35,13 +35,26 @@ style="display: block"> {{formData.capacity}} + + {{formData.principal}} + + + {{formData.mobile}} +
{{formData.address}} -
+
@@ -76,7 +89,7 @@ export default { }, components: {}, async mounted () { - await this.initMap() + await this.initMap() }, methods: { @@ -100,7 +113,7 @@ export default { initMap () { // 定义地图中心点坐标 let { latitude, longitude } = this.$store.state.user; - console.log('lat'+latitude+',lon'+longitude) + console.log('lat' + latitude + ',lon' + longitude) if (!latitude || latitude == "" || latitude == "0") { latitude = 39.9088810666821; longitude = 116.39743841556731; diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index a39a2b949..a8cf3b8a2 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -78,22 +78,39 @@ :max="9999" label="容纳人数"> + + + + + + + +
- + - 查询 -
+ 查询 +
@@ -141,7 +158,9 @@ export default { capacity: 0,//容纳人数 address: '', //详细地址 longitude: 36.0722275, //经度 - latitude: 120.38945519 //纬度 + latitude: 120.38945519, //纬度 + principal: '', + mobile: '' }, cityManagement: { @@ -205,14 +224,14 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - if (null != data){ - data : this.cityManagement + if (null != data) { + data: this.cityManagement } this.formData = { ...data } // let { latitude, longitude } = this.$store.state.user; // const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude; // const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude; - if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){ + if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') { map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) this.setMarker(this.formData.latitude, this.formData.longitude) } @@ -243,9 +262,9 @@ export default { }, async addUnit () { let url = '' - if (this.formType === 'add'){ + if (this.formType === 'add') { url = '/gov/org/icCityManagement/add' - }else { + } else { url = '/gov/org/icCityManagement/edit' } const { data, code, msg, internalMsg } = await requestPost(url, this.formData) @@ -273,7 +292,7 @@ export default { initMap () { // 定义地图中心点坐标 let { latitude, longitude } = this.$store.state.user; - console.log('lat'+latitude+',lon'+longitude) + console.log('lat' + latitude + ',lon' + longitude) if (!latitude || latitude == "" || latitude == "0") { latitude = 39.9088810666821; longitude = 116.39743841556731; diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index 9e781de2b..f1c7e7fad 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -116,9 +116,23 @@ label="地址" mix-width="230"> + + + + @@ -276,31 +290,31 @@ export default { responseType: "blob", data: params, }) - .then((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("网络错误"); - }); + .then((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("网络错误"); + }); }, //获取服务事项下拉框 @@ -619,8 +633,8 @@ export default { } diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 53de80d47..11ccaa900 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -60,22 +60,38 @@ :max="9999" label="容纳人数"> + + + + + + +
- + - 查询 -
+ 查询 +
@@ -94,357 +110,359 @@ From c4478aa92cf7a0bc8df725862f41233dbb97cfd4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 29 Jul 2022 16:42:05 +0800 Subject: [PATCH 5/7] 1111 --- src/assets/scss/modules/visual/people.scss | 2 +- src/views/modules/communityService/measure/info.vue | 2 +- src/views/modules/shequzhili/event/cpts/event-detail.vue | 2 +- .../modules/shequzhili/event/cpts/process-form-project.vue | 4 ++-- src/views/modules/shequzhili/xiangmu/cpts/project-info.vue | 2 +- .../modules/visual/communityGovern/fivelayers/eventInfo.vue | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index 747b9218c..1d0bc4fa8 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -184,7 +184,7 @@ .wrap { position: relative; - margin: 120px auto; + margin: 60px auto; width: 1180px; .title { diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue index 4aa287f0d..6fa66fcb3 100644 --- a/src/views/modules/communityService/measure/info.vue +++ b/src/views/modules/communityService/measure/info.vue @@ -365,7 +365,7 @@ export default { // }, source: {//展示来源：manage 管理平台 visiual 可视化平台 type: String, - default: 'visiual' + default: 'manage' } }, diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 323d3ff17..acb18f05f 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -224,7 +224,7 @@ export default { }, source: {//展示来源：manage 管理平台 visiual 可视化平台 type: String, - default: 'visiual' + default: 'manage' } }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue index 71fef5e66..16a8fee6c 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue @@ -75,7 +75,7 @@ - @@ -90,7 +90,7 @@
- + --> Date: Fri, 29 Jul 2022 17:21:31 +0800 Subject: [PATCH 6/7] 11 --- src/assets/img/file-add.png | Bin 0 -> 15610 bytes .../event/cpts/process-form-project.vue | 6 +++++- src/views/modules/workSys/role/role.vue | 5 ++--- src/views/modules/workSys/role/roleForm.vue | 7 +++++-- 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 src/assets/img/file-add.png diff --git a/src/assets/img/file-add.png b/src/assets/img/file-add.png new file mode 100644 index 0000000000000000000000000000000000000000..77435e3e402fdf5096a5b1e23f5eb1226d0c0a5c GIT binary patch literal 15610 zcmeI3Yj7LY701_c;>OQB>J*blBNXy*h_t(US=z`7wxwVt$Z>23+q8h!yDMw4q*bJ~ zEsLhHShx9vdkoHDWVNdnRr5gbV?zRkQB-g%uG%1O130l z%Xd5joqoBR(c|3zJ?Gs0-FuGq%kHhMxuq~~X&ylkh0bbw9r!jW@A*04^M1$OZ-TGf zKy`D7Ao9Piyt9bMep*5hmdj#8licLGmEk0xmgS{ZK^yi3z-)rBZVCrju3eB-twNjV zFIQjv&5&9p^5yDAql zcw7ejR)$HnDn3PSFIQJ62~|z5T2+-46jVm7NyE{4v#QLZrHvM|&agqHqi7RJSxDNT zp=gG(Fchttc&Tl9;FmSXyO}!s=81H`Dpz}CIlz!)S67#|ORtrJZ6s~6SV&4o>U0_~ zLlf%u%WPQV53NcBnT%r>LR?S`$fD#|DRJ3WsY5PTtCd8_*Ti-C0?9=F&;&a`kqol| zlGajWCMTXt`UEkj;74cl3wR`13VEa%QYPgY6N5c*xstgvuGi*_cEpf_fClRWus+3bzrdro1`gy4h!441@+lR-QJP%#?<5)2xQ31zuxmHS0CJful^E*$gu2CKIIvo0e!>Py~IC^`^~H zu7wB53`Pqlm?)EmHnHHtY+yC5Za1ZImzf2Q*YO6yV3|yjAGVI!nc1@RI*OccDzbM;4n~N_L z8cy?4{y`J%y&l}`2{x0_s5e?kco_Dm6~ltJ$u5FE98&s;(JJ9aiRG@ zD#ir?L7NyCnh&I6To4eniE*L%Kq|%s0YRG>7n%>GVq6dqw25({`9Lbh1pz^u7#Erk zq+(nU5VVPLq4_{6#svXEn-~|G52RvT5D>J9aiRG@D#ir?L7NyCnh&I6To4eniE*L% zKq|%s0YRG>7n%>GVq6dqw25({`9Lbh1pz^u7#Erkq+(nU5VVPLq4_{6#svXEn-~|G z52RvT5D>J9aiRG@D#ir?L7NyCnh&I6To4eniNuwcdW2K(gXcE8zyq46?>fE?Jlv_` zs_R??5m`+TJ$(c*_67KUpCCFYg7~0?AeerFxK4Wbu2Y){V$OX|dqqR|+&hnL^3-oH zzISM4<#5I0d5bolIJupk-?4D}Lf=z=a4_qBzHfhj(QT(+=3jeCd+f9`P#c)s6~|pBPRq(e^1e^x^LJ0xZ(ZlW3g`%2TE!z zBjW9y^Ynv1iGEn{wO{63p8KiWqbH9ZS{jS3>ACLuqLzxf($R5ZdF)SDmOZ)d=vd=G zpyqYmTO$u{y*>BSSEA1q_})GsTM9=vPzOGW+?SgZs2mC2GH_wd>*{dv3&V$;%$Y)O zQU3!2eW!A=&1ZwZ8z=JbjA-^$y+ID_aNhey@0-LGI}`dmD<`mJ5m`Cq$ zp55Jdu(_yd?V(Tdy{?ho8%Mh@Jd{oKSZk%;9le7!(Jj%+{L8Bb-p(DJQ+s!>k2qWt zeJ1*=n0MK~R(-tW@DnXk?_u3wdGz=rD|hrfdS_&7&x%VsqxI2a#gPsbsoyyFx7+@` zZ?$W|2e*mt!_lXUxBe{ma-i_t&h?+4x1RT3duxH`xc1R+tsQ;u*r^X4XYTPt+o-jM z&+>=9pYuf4nbQ}^lPi|)TC@74{N3V_lUsN19s1s$p$1>2ShD}p66Zg)-1vj9+_3o1 z<9SVsSAKSr<(&MNvGt4F|MA_i(o5~!k?1d;8F5;RTRW+XPs=99+U(NKaSL(rrHVoA S(Fm - + + diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index 13a5aba1f..4168a3e85 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -95,8 +95,7 @@ class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看 - 修改 @@ -262,7 +261,7 @@ export default { this.formTitle = '修改' this.formShow = true this.$nextTick(() => { - this.$refs.ref_form.initForm('edit', row.id) + this.$refs.ref_form.initForm('edit', row.id, row.defaultRole) }) }, handleDetail (row) { diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index 0e0304a2a..8b21186db 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -14,6 +14,7 @@ label-width="150px" style="display: block"> @@ -27,6 +28,7 @@ style="display: block"> Date: Mon, 1 Aug 2022 11:06:51 +0800 Subject: [PATCH 7/7] 111 --- .../modules/base/organization/organization.vue | 17 +++++++++++------ .../communityParty/regionalParty/units.vue | 4 +--- .../modules/communityService/sqzzz/index.vue | 2 +- .../modules/shequzhili/csgltc/csglDetail.vue | 8 ++++---- .../modules/shequzhili/csgltc/csglForm.vue | 2 +- .../shequzhili/event/cpts/event-info.vue | 4 ++-- .../shequzhili/xiangmu/cpts/project-info.vue | 8 ++++---- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index a04859423..88be90743 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1016,8 +1016,9 @@ export default { typeList: [], // 性别字典 genderList: [ - { value: '1', label: '男' }, - { value: '2', label: '女' }, + { value: 1, label: '男' }, + { value: 2, label: '女' }, + { value: 0, label: '未知' }, ], // 专兼职字典 postList: [ @@ -1413,7 +1414,8 @@ export default { staffId: this.userStaffId, name: this.peoForm.name, mobile: this.peoForm.mobile, - gender: this.peoForm.gender === '男' ? 1 : 0, + // gender: this.peoForm.gender === '男' ? 1 : 0, + gender: this.peoForm.gender, workType: this.peoForm.post, roles: this.peoForm.duty, newRoles: this.peoForm.newRoles, @@ -1744,7 +1746,8 @@ export default { this.peoForm.name = data.name this.peoForm.mobile = data.mobile - this.peoForm.gender = data.gender === 1 ? '男' : '女' + // this.peoForm.gender = data.gender === 1 ? '男' : '女' + this.peoForm.gender = data.gender this.peoForm.post = data.workType // 已有的权限（职责） let existedDutyArr = [] @@ -1786,7 +1789,8 @@ export default { this.peoForm.name = data.name this.peoForm.mobile = data.mobile this.peoForm.post = data.workType - this.peoForm.gender = data.gender === 1 ? '男' : '女' + // this.peoForm.gender = data.gender === 1 ? '男' : '女' + this.peoForm.gender = data.gender // 已有的权限（职责） let existedDutyArr = [] data.roleList.forEach(function (sysDuty) { @@ -1828,7 +1832,8 @@ export default { if (code === 0) { this.peoForm.name = data.name this.peoForm.mobile = data.mobile - this.peoForm.gender = data.gender === 1 ? '男' : '女' + // this.peoForm.gender = data.gender === 1 ? '男' : '女' + this.peoForm.gender = data.gender this.peoForm.post = data.workType // 已有的权限（职责） let existedDutyArr = [] diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 775f53d0e..5666675ac 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -526,7 +526,7 @@ export default { async handleSync (row) { - this.$confirm("确认同步?", "提示", { + this.$confirm("确认同步到通讯录？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" @@ -583,8 +583,6 @@ export default { this.$message.error(data.msg) } - - } else { this.$message.error(msg) } diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index 63a96aeed..312ef51c0 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -472,7 +472,7 @@ export default { async handleSync (row) { - this.$confirm("确认同步?", "提示", { + this.$confirm("确认同步到通讯录？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue index 4c652e19f..39a61f484 100644 --- a/src/views/modules/shequzhili/csgltc/csglDetail.vue +++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue @@ -26,26 +26,26 @@ prop="areaCovered" label-width="150px" style="display: block"> - {{formData.areaCovered}} + {{formData.areaCovered+' '}}平方公里 - {{formData.capacity}} + {{formData.capacity+' '}}人 - {{formData.principal}} + {{formData.principal?formData.principal:'无'}} - {{formData.mobile}} + {{formData.mobile?formData.mobile:'无'}} + label="容纳人数">人 {{ item.departmentName }} -
协办单位：
{{ item.assistanceUnitName }}
-
+ -->
说 明：
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index 0128d843f..28e4ffcfc 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -229,7 +229,7 @@ - - + --> {{ item.departmentName }}
-
协办单位：
{{ item.assistanceUnitName }}
-
+ -->