Merge branch 'lisu_V4' into dev

src/views/modules/base/smartImport/cpts/createdTask.vue

@@ -280,7 +280,7 @@ export default {
       const url = "/oper/customize/icformitemgroup/list";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {
-        formCode: "resident_base_info",
+        formCode: "resident_base_info,community_info",
         policyFlag: "1",
       };
 

src/views/modules/communityParty/regionalParty/unitsForm.vue

@@ -76,26 +76,13 @@
             class="u-item-width-normal"
           ></el-cascader>
         </el-form-item>
-        <!-- <el-form-item
-          label="联系人"
-          prop="contact"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model.trim="formData.contact"
-          >
-          </el-input>
-        </el-form-item> -->
         <el-form-item label="联系人" prop="contact">
           <el-select v-model.trim="formData.contact" class="u-item-width-normal" size="small" clearable
-            placeholder="请选择联系人">
+            placeholder="请选择联系人" @change="handelChangeStaff">
             <el-option v-for="item in dicts.stafflist"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"></el-option>
+                  :value="item.staffId"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -254,16 +241,19 @@ export default {
   },
 
   methods: {
+    handelChangeStaff(val){
+      if(val){
+        this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile
+      }else{
+        this.formData.contactMobile = ''
+      }
+    },
     getStafflist() {
       let parms = {
-        orgId: this.agencyId,
-        orgType: "agency",
-        pageNo: 1,
-        pageSize: 100,
+        roleKey:'party_unit_director'
       };
-      this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
-        this.dicts.stafflist = resp.data.data.staffList;
-        console.log("stafflist", resp.data);
+      this.$http.post("data/aggregator/epmetuser/getRoleUserInfo", parms).then((resp) => {
+        this.dicts.stafflist = resp.data.data;
       });
     },
     async initForm(type, unitId) {

src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue

@@ -37,7 +37,13 @@
 
 						<el-col :span="6">
 							<el-form-item label="负责人" prop="principalName">
-								<el-input v-model.trim="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-select v-model.trim="formData.principalName" class="u-item-width-normal" size="small" clearable
+									placeholder="请选择联系人" @change="handelChangeStaff">
+									<el-option v-for="item in stafflist"
+										:key="item.value"
+										:label="item.name"
+										:value="item.name"></el-option>
+								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -298,7 +304,8 @@ export default {
 			//地图
 			loading: false,
 			searchValue: '',
-			searchOptions: []
+			searchOptions: [],
+			stafflist:[]
 		};
 	},
 	watch: {},
@@ -312,7 +319,7 @@ export default {
 		this.getVolunteerList();
 		this.loadplaceType();
 		this.getDemandOptions()
-
+		this.getStafflist()
 		// this.loadserviceList();
 		// this.loadGrid();
 		// this.loadplaceType();
@@ -326,18 +333,21 @@ export default {
 	},
 
 	methods: {
-		// async loadserviceList() {
-		// 	const url = '/actual/base/serviceitem/dict-list';
-		// 	const params = {
-		// 		type: 'usable'
-		// 	};
-		// 	const { data, code, msg } = await requestPost(url, params);
-		// 	if (code === 0) {
-		// 		this.serviceList = data;
-		// 	} else {
-		// 		this.$message.error(msg);
-		// 	}
-		// },
+		getStafflist() {
+			let parms = {
+				roleKey:'community_org_director'
+			};
+			this.$http.post("data/aggregator/epmetuser/getRoleUserInfo", parms).then((resp) => {
+				this.stafflist = resp.data.data;
+			});
+		},
+		handelChangeStaff(val){
+			if(val){
+				this.formData.principalPhone = this.stafflist.filter(item=>item.name === val)[0].mobile
+			}else{
+				this.formData.principalPhone = ''
+			}
+		},
 		async getDemandOptions() {
 			this.$http
 				.post("/actual/base/serviceitem/listAllCategory")