Merge branch 'master' of http://47.92.161.104:10080/yanliming/making_friends-portal

src/views/base/memberInfoDel-list.vue

@@ -20,13 +20,13 @@
         <el-collapse-item>
           <template slot="title">
             <div style="line-height:10px;margin-top:10px">
-              <el-form-item label="真实姓名" prop="realName">
+             <el-form-item label="真实姓名" prop="realName">
                 <el-input type="text" size="mini" v-model="queryModel.realName" style="width:250px;"></el-input>
               </el-form-item>
               <el-form-item label="身份证号" prop="idCard">
                 <el-input type="text" size="mini" v-model="queryModel.idCard" style="width:250px;"></el-input>
               </el-form-item>
-              <el-form-item label="所属工会" prop="orgId">
+              <el-form-item label="所属工会" prop="orgIdArr">
                     <el-multi-tree-select
                       style="width:250px;"
                       size="mini"
@@ -38,7 +38,7 @@
             </div>
           </template>
           <div>      
-            <el-form-item label="审核状态" prop="status">
+            <el-form-item label="审核状态" prop="statusArr">
               <el-select v-model="queryModel.statusArr" multiple placeholder="请选择" size="mini" clearable style="width:250px;">
                 <el-option
                   v-for="item in statusList"
@@ -58,20 +58,21 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="户口所在地" prop="status">
-              <el-select v-model="queryModel.statusArr" multiple placeholder="请选择" size="mini" clearable style="width:250px;">
-                <el-option
-                  v-for="item in statusList"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+            <el-form-item label="户口所在地" prop="registeredResidenceArr">
+                <el-cascader
+                :props="props1"
+                v-model="queryModel.registeredResidenceArr"
+                :options="cityList"
+                size="mini"
+                clearable 
+                style="width:250px;"
+                >
+                </el-cascader>
             </el-form-item>
           </div>
           <div>      
-            <el-form-item label="学历" prop="education">
-              <el-select v-model="queryModel.education" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
+            <el-form-item label="学历" prop="educationArr">
+              <el-select v-model="queryModel.educationArr" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
               <el-option
                     v-for="result in eduList"
                     :key="result.id"
@@ -80,8 +81,8 @@
                   ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="行业" prop="industry">
-              <el-select v-model="queryModel.industry" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
+            <el-form-item label="行业" prop="industryArr">
+              <el-select v-model="queryModel.industryArr" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
               <el-option
                     v-for="result in industryList"
                     :key="result.id"
@@ -90,8 +91,8 @@
                   ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="月薪" prop="salaryRange">
-              <el-select v-model="queryModel.salaryRange" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
+            <el-form-item label="月薪" prop="salaryRangeArr">
+              <el-select v-model="queryModel.salaryRangeArr" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
               <el-option
                     v-for="result in salaryRangeList"
                     :key="result.id"
@@ -102,8 +103,8 @@
             </el-form-item>
           </div>
           <div>      
-            <el-form-item label="住房" prop="housingSituation">
-              <el-select v-model="queryModel.housingSituation" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
+            <el-form-item label="住房" prop="housingSituationArr">
+              <el-select v-model="queryModel.housingSituationArr" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
               <el-option
                     v-for="result in housingSituationList"
                     :key="result.id"
@@ -112,8 +113,8 @@
                   ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="婚姻" prop="maritalStatus">
-              <el-select v-model="queryModel.maritalStatus" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
+            <el-form-item label="婚姻" prop="maritalStatusArr">
+              <el-select v-model="queryModel.maritalStatusArr" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
               <el-option
                     v-for="result in maritalStatusList"
                     :key="result.id"
@@ -122,8 +123,8 @@
                   ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="子女" prop="childStatus">
-              <el-select v-model="queryModel.childStatus" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
+            <el-form-item label="子女" prop="childStatusArr">
+              <el-select v-model="queryModel.childStatusArr" multiple filterable placeholder="请选择" size="mini" clearable style="width:250px;">
               <el-option
                     v-for="result in childStatusList"
                     :key="result.id"
@@ -136,6 +137,7 @@
                     <div>      
             <el-form-item label="出生地" prop="birthplaceArr">
               <el-cascader
+              :props="props1"
               v-model="queryModel.birthplaceArr"
               :options="cityList"
               size="mini"
@@ -144,15 +146,16 @@
               >
               </el-cascader>
             </el-form-item>
-            <el-form-item label="工作地" prop="status">
-              <el-select v-model="queryModel.statusArr" multiple placeholder="请选择" size="mini" clearable style="width:250px;">
-                <el-option
-                  v-for="item in statusList"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+            <el-form-item label="工作地" prop="workplaceArr">
+                <el-cascader
+                :props="props1"
+                v-model="queryModel.workplaceArr"
+                :options="cityList"
+                size="mini"
+                clearable 
+                style="width:250px;"
+                >
+                </el-cascader>
             </el-form-item>
             <el-form-item label="兴趣爱好" prop="hobbyArr">
               <el-select v-model="queryModel.hobbyArr" multiple placeholder="请选择" size="mini" clearable style="width:250px;">
@@ -341,6 +344,7 @@
 </template>
 <script>
 
+import Constant from "@/constant";
 import memberInfoDetail from "./memberInfo-detail";
 import memberInfoApi from "@/api/base/memberInfo";
 import memberInfoView from './memberInfo-view.vue';
@@ -349,6 +353,7 @@ import MultiSelectTree from "@/components/MultiSelectTree";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import cityApi from "@/api/base/city";
 import hobbyInfoApi from "@/api/base/hobbyInfo";
+import { getToken } from "@/utils/auth"; // get token from cookie
 
 export default {
   name: "BaseMemberInfoDelList",
@@ -358,8 +363,19 @@ export default {
       queryModel: {
         realName: "",
         idCard:"",
+        gender:"",
         orgIdArr:[],
         statusArr:[],
+        registeredResidenceArr:[],
+        educationArr:[],
+        industryArr:[],
+        salaryRangeArr:[],
+        housingSituationArr:[],
+        maritalStatusArr:[],
+        childStatusArr:[],
+        birthplaceArr:[],
+        workplaceArr:[],
+        hobbyArr:[],
       },
       loading: false,
       tableData: [],
@@ -386,9 +402,9 @@ export default {
         label: "name",
         children: "children",
       },
-      batchImportVisible: false,
-      batchImportFileList: [],
-      xlsLoading: false,
+      props1:{
+        multiple: true
+      },
       sceneData: [],
       typeData: [],
       deviceRelationTitle: "",
@@ -426,7 +442,17 @@ export default {
       childStatusList:[],
       taAgeRangeList:[],
       hobbyInfoList:[],
-      
+      cityList:[],
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/memberInfo/importXls",
+      uploadXlsData: {
+        subFolder: "memberInfo",
+        memberInfoId: "",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
     };
   },
   created() {
@@ -534,9 +560,24 @@ export default {
 
       formData.append("realName", self.queryModel.realName);
       formData.append("idCard", self.queryModel.idCard);
+      if(self.queryModel.orgIdArr==null){
+        self.queryModel.orgIdArr = [];
+      }
       formData.append("orgIdArr", self.queryModel.orgIdArr);
+      
       formData.append("statusArr", self.queryModel.statusArr);
 
+      formData.append("registeredResidenceArr", self.queryModel.registeredResidenceArr);
+      formData.append("educationArr", self.queryModel.educationArr);
+      formData.append("industryArr", self.queryModel.industryArr);
+      formData.append("salaryRangeArr", self.queryModel.salaryRangeArr);
+      formData.append("housingSituationArr", self.queryModel.housingSituationArr);
+      formData.append("maritalStatusArr", self.queryModel.maritalStatusArr);
+      formData.append("childStatusArr", self.queryModel.childStatusArr);
+      formData.append("birthplaceArr", self.queryModel.birthplaceArr);
+      formData.append("workplaceArr", self.queryModel.workplaceArr);
+      formData.append("hobbyArr", self.queryModel.hobbyArr);
+
       memberInfoApi
         .pageListDel(formData)
         .then(function (response) {