From 742d0ec5cd9df517bb95ae8350430c0c3705eb7e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 1 Aug 2022 11:06:51 +0800
Subject: [PATCH] 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 a0485942..88be9074 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 775f53d0..5666675a 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 63a96aee..312ef51c 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 4c652e19..39a61f48 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">
-          <span>{{formData.areaCovered}}</span>
+          <span>{{formData.areaCovered+' '}}</span>平方公里
 
         </el-form-item>
         <el-form-item label="容纳人数："
                       prop="capacity"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.capacity}}</span>
+          <span>{{formData.capacity+' '}}</span>人
         </el-form-item>
         <el-form-item label="负责人："
                       prop="principal"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.principal}}</span>
+          <span>{{formData.principal?formData.principal:'无'}}</span>
         </el-form-item>
         <el-form-item label="联系电话："
                       prop="mobile"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.mobile}}</span>
+          <span>{{formData.mobile?formData.mobile:'无'}}</span>
         </el-form-item>
         <el-form-item label="地址："
                       style="display: block"
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index a8cf3b8a..be715825 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -76,7 +76,7 @@
                            v-model="formData.capacity"
                            :min="0"
                            :max="9999"
-                           label="容纳人数"></el-input-number>
+                           label="容纳人数"></el-input-number>人
         </el-form-item>
 
         <el-form-item label="负责人"
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index b63b4fbf..b4acb9e0 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -114,13 +114,13 @@
                       <div class="detail-value">{{ item.departmentName }}</div>
                     </div>
 
-                    <div class="detail"
+                    <!-- <div class="detail"
                          v-if="item.assistanceUnitName">
                       <div class="detail-field">协办单位：</div>
                       <div class="detail-value">
                         <fold-text :row="3">{{ item.assistanceUnitName }}</fold-text>
                       </div>
-                    </div>
+                    </div> -->
                     <div class="detail"
                          v-if="item.processName != '转项目' && item.publicReply">
                       <div class="detail-field">说 明：</div>
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 0128d843..28e4ffcf 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 @@
                 </el-popover>
               </el-form-item>
 
-              <el-form-item v-if="fmData.operateType != 'back'"
+              <!-- <el-form-item v-if="fmData.operateType != 'back'"
                             label="协办单位："
                             prop="assistanceUnitIndex">
                 <el-select v-model.trim="fmData.assistanceUnitIndex"
@@ -241,7 +241,7 @@
                              :value="index">
                   </el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
 
               <el-form-item v-if="fmData.operateType == 'back'"
                             label="退回到："
@@ -368,11 +368,11 @@
                   <div class="detail-value">{{ item.departmentName }}</div>
                 </div>
 
-                <div class="detail"
+                <!-- <div class="detail"
                      v-if="item.assistanceUnitName">
                   <div class="detail-field">协办单位：</div>
                   <div class="detail-value">{{ item.assistanceUnitName }}</div>
-                </div>
+                </div> -->
 
                 <div class="detail"
                      v-if="item.processName != '转项目' && item.publicReply">