Merge branch '4.26-增加字段'

src/views/modules/partymember/icpartyorgtree.vue

@@ -86,17 +86,23 @@
               <el-form-item label="负责人"
                             label-width="150px"
                             prop="principal">
-                  <el-select v-model="editPrincipalData.principal"
+                  <el-input v-model="editPrincipalData.principal"
-                             placeholder="请选择"
+                             placeholder="请输入"
                              clearable
                              style="width: 200px"
                              class="item_width_4">
-                      <el-option v-for="item in staffs"
+                  </el-input>
-                                 :key="item.value"
+              </el-form-item>
-                                 :label="item.label"
+              <el-form-item label="联系电话"
-                                 :value="item.value">
+                            label-width="150px"
-                      </el-option>
+                            prop="principalMobile">
-                  </el-select>
+                  <el-input v-model="editPrincipalData.principalMobile"
+                             placeholder="请输入"
+                             clearable
+                             style="width: 200px"
+                             class="item_width_4">
+                     
+                  </el-input>
               </el-form-item>
           </el-form>
           <span slot="footer" class="dialog-footer">
@@ -121,7 +127,8 @@
               principal: '',
               principalMobile: '',
               partyOrgId: '',
-              principalStaffId: ''
+              // principalStaffId: '',
+              principalMobile:''
           },
         searchH: 0,
         dataForm: {
@@ -135,27 +142,27 @@
           partyOrgTypes: [
               {
                   value: '0',
-                  label: '省委'
+                  label: '省委书记'
               },
               {
                   value: '1',
-                  label: '市委'
+                  label: '市委书记'
               },
               {
                   value: '2',
-                  label: '区委'
+                  label: '区委书记'
               },
               {
                   value: '3',
-                  label: '党工委'
+                  label: '党工委书记'
               },
               {
                   value: '4',
-                  label: '党委'
+                  label: '党委书记'
               },
               {
                   value: '5',
-                  label: '支部'
+                  label: '支部书记'
               },
               {
                   value: '6',
@@ -209,6 +216,7 @@
             })
             this.editPrincipalData.partyOrgId = row.id
             this.editPrincipalData.principal = row.principal
+            this.editPrincipalData.principalMobile = row.principalMobile
             this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
                 if (res.code !== 0) {
                     return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
@@ -221,7 +229,7 @@
             this.staffs.forEach(s => {
                 if (this.editPrincipalData.principal === s.value){
                     this.editPrincipalData.principal = s.name
-                    this.editPrincipalData.principalStaffId = s.value
+                    // this.editPrincipalData.principalStaffId = s.value
                     this.editPrincipalData.principalMobile = s.mobile
                 }
             })
@@ -249,7 +257,7 @@
                 principal: '',
                 principalMobile: '',
                 partyOrgId: '',
-                principalStaffId: ''
+                // principalStaffId: ''
             }
         },
       // 查询列表