所属工会编辑添加

src/views/base/memberCheck-list.vue

@@ -117,11 +117,15 @@
             label="身份证号"
             width="300"
         ></el-table-column>
-        <el-table-column
-            prop="orgName"
-            label="所属工会"
-            width="250"
-        ></el-table-column>
+        <el-table-column  prop="orgName"  label="所属工会" width="250">
+          <template slot-scope="{ row }">
+            <span v-if="row.memberUpdateLog!=null">
+              <span v-if="row.memberUpdateLog.orgId" style="color:red">{{row.orgName}}</span>
+              <span v-else>{{row.orgName}}</span>
+            </span>
+            <span v-else>{{row.orgName}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="status"  label="审核状态">
             <template slot-scope="{ row }">
                 <span v-if="row.status=='0'" style="color:red">未审核</span>

src/views/base/memberInfo-view.vue

@@ -120,20 +120,21 @@
                         </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
-                                <el-form-item label="行业：">
+                                <el-form-item label="所属工会：">
                                     <template v-if="formModel.status =='0'">
-                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.industry" style="color:red">
-                                            {{formModel.industryN}}
+                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.orgId" style="color:red">
+                                            {{formModel.orgName}}
                                         </span>
                                         <span class="grid-content-span" v-else>
-                                            {{formModel.industryN}}
+                                            {{formModel.orgName}}
                                         </span>
                                     </template>
                                     <template v-else>
-                                        <span class="grid-content-span" >{{formModel.industryN}}</span>
+                                        <span class="grid-content-span" >{{formModel.orgName}}</span>
                                     </template>
                                 </el-form-item>
                             </div>
+
                         </el-col>
                     </el-row>
                     <el-row>
@@ -163,17 +164,17 @@
                         </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
-                                <el-form-item label="岗位：">
+                                <el-form-item label="行业：">
                                     <template v-if="formModel.status =='0'">
-                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.post" style="color:red">
-                                            {{formModel.post}}
+                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.industry" style="color:red">
+                                            {{formModel.industryN}}
                                         </span>
                                         <span class="grid-content-span" v-else>
-                                            {{formModel.post}}
+                                            {{formModel.industryN}}
                                         </span>
                                     </template>
                                     <template v-else>
-                                        <span class="grid-content-span" >{{formModel.post}}</span>
+                                        <span class="grid-content-span" >{{formModel.industryN}}</span>
                                     </template>
                                 </el-form-item>
                             </div>
@@ -216,17 +217,17 @@
                         </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
-                                <el-form-item label="月薪：">
+                                <el-form-item label="岗位：">
                                     <template v-if="formModel.status =='0'">
-                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.salaryRange" style="color:red">
-                                            {{formModel.salaryRangeN}}
+                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.post" style="color:red">
+                                            {{formModel.post}}
                                         </span>
                                         <span class="grid-content-span" v-else>
-                                            {{formModel.salaryRangeN}}
+                                            {{formModel.post}}
                                         </span>
                                     </template>
                                     <template v-else>
-                                        <span class="grid-content-span" >{{formModel.salaryRangeN}}</span>
+                                        <span class="grid-content-span" >{{formModel.post}}</span>
                                     </template>
                                 </el-form-item>
                             </div>
@@ -251,7 +252,7 @@
                             </div>
                         </el-col>
                         <el-col :span="8">
-                            <div class="grid-content bg-purple">
+                             <div class="grid-content bg-purple">
                                 <el-form-item label="身高：">
                                     <template v-if="formModel.status =='0'">
                                         <span class="grid-content-span" v-if="formModel.memberUpdateLog.height" style="color:red">
@@ -269,17 +270,17 @@
                         </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
-                                <el-form-item label="工作单位：">
+                                <el-form-item label="月薪：">
                                     <template v-if="formModel.status =='0'">
-                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.workUnit" style="color:red">
-                                            {{formModel.workUnit}}
+                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.salaryRange" style="color:red">
+                                            {{formModel.salaryRangeN}}
                                         </span>
                                         <span class="grid-content-span" v-else>
-                                            {{formModel.workUnit}}
+                                            {{formModel.salaryRangeN}}
                                         </span>
                                     </template>
                                     <template v-else>
-                                        <span class="grid-content-span" >{{formModel.workUnit}}</span>
+                                        <span class="grid-content-span" >{{formModel.salaryRangeN}}</span>
                                     </template>
                                 </el-form-item>
                             </div>
@@ -322,17 +323,17 @@
                         </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
-                                <el-form-item label="住房状况：">
+                                <el-form-item label="工作单位：">
                                     <template v-if="formModel.status =='0'">
-                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.housingSituation" style="color:red">
-                                            {{formModel.housingSituationN}}
+                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.workUnit" style="color:red">
+                                            {{formModel.workUnit}}
                                         </span>
                                         <span class="grid-content-span" v-else>
-                                            {{formModel.housingSituationN}}
+                                            {{formModel.workUnit}}
                                         </span>
                                     </template>
                                     <template v-else>
-                                        <span class="grid-content-span" >{{formModel.housingSituationN}}</span>
+                                        <span class="grid-content-span" >{{formModel.workUnit}}</span>
                                     </template>
                                 </el-form-item>
                             </div>
@@ -373,6 +374,25 @@
                                 </el-form-item>
                             </div>
                         </el-col>
+                        <el-col :span="8">
+                             <div class="grid-content bg-purple">
+                                <el-form-item label="住房状况：">
+                                    <template v-if="formModel.status =='0'">
+                                        <span class="grid-content-span" v-if="formModel.memberUpdateLog.housingSituation" style="color:red">
+                                            {{formModel.housingSituationN}}
+                                        </span>
+                                        <span class="grid-content-span" v-else>
+                                            {{formModel.housingSituationN}}
+                                        </span>
+                                    </template>
+                                    <template v-else>
+                                        <span class="grid-content-span" >{{formModel.housingSituationN}}</span>
+                                    </template>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row>
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
                                 <el-form-item label="信息公开：">
@@ -610,6 +630,16 @@
                 <el-radio :label="true">女</el-radio>
             </el-radio-group>
         </el-form-item>
+        <el-form-item label="所属工会" :label-width="formLabelWidth">
+            <el-select-tree
+                :props="props"
+                :options="orgResult"
+                v-model="form.orgId"
+                height="200"
+                style="width:300px"
+                size="large"
+            ></el-select-tree>
+        </el-form-item>
         <el-form-item label="年龄" :label-width="formLabelWidth">
             <el-input v-model="formModel.age" disabled></el-input>
         </el-form-item>
@@ -784,6 +814,8 @@
 <script>
 import Constant from "@/constant";
 import memberInfoApi from "@/api/base/memberInfo";
+import orgInfoApi from "@/api/base/orgInfo";
+import SelectTree from "@/components/SelectTree";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import hobbyInfoApi from "@/api/base/hobbyInfo";
 import cityApi from "@/api/base/city";
@@ -810,7 +842,8 @@ export default {
         delivery: false,
         type: [],
         resource: '',
-        desc: ''
+        desc: '',
+        orgId:"",
       },
       disabledType:"",
       type:"",
@@ -832,6 +865,13 @@ export default {
       headers: {
         Authorization: getToken(),
       },
+      orgResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
     };
   },
   methods: {
@@ -859,9 +899,9 @@ export default {
             self.loading = false;
 
             if (jsonData.result) {
-            self.form = jsonData.data;
+                self.form = jsonData.data;
             } else {
-            self.$message.error(jsonData.message + "");
+                self.$message.error(jsonData.message + "");
             }
         })
         .catch((error) => {
@@ -1166,9 +1206,21 @@ export default {
         this.cityList = jsonData.data;
     });
 
+    orgInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.orgResult = jsonData.data;
+        }
+      }
+    });
+
 
 
     //self.loadTree();
+  },
+   components: {
+    "el-select-tree": SelectTree,
   },
   mounted: function () {
     this.initData();