会员信息后台功能

src/api/base/city.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function treeList(){
+    return request.post(constant.serverUrl + "/base/city/treeList");
+}
+
+
+export default {
+    treeList
+}

src/api/base/hobbyInfo.js

@@ -5,9 +5,9 @@ function pageList(formData){
   return request.post(constant.serverUrl + "/base/hobbyInfo/pageList", formData);
 }
 
-function list(){
-    return request.post(constant.serverUrl + "/base/hobbyInfo/list");
-  }
+function list(formData){
+    return request.post(constant.serverUrl + "/base/hobbyInfo/list",formData);
+}
 
 function create(){
   return request.get(constant.serverUrl + "/base/hobbyInfo/create");

src/routers/modules/base.js

@@ -64,6 +64,19 @@ var routers = [
                 title: '会员管理'
         }
 },
+{
+        //会员详情
+        path: '/base/memberInfo/view',
+        name: 'BaseMemberInfoView',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/memberInfo-view.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '会员详情'
+        }
+},
 ]
 
 export default routers;

src/views/base/memberInfo-list.vue

@@ -121,7 +121,7 @@
             </template>
         </el-table-column>
         <el-table-column
-            prop="registeredResidence"
+            prop="registeredResidenceN"
             label="户口所在地"
             width="200"
         ></el-table-column>
@@ -312,10 +312,26 @@ export default {
       this.businessKey = record.id;
       this.showModal = true;
     },
-    handleView(record) {
-      this.modalTitle2 = "会员详情";
-      this.businessKey = record.id;
-      this.showModal2 = true;
+    // handleView(record) {
+    //   this.modalTitle2 = "会员详情";
+    //   this.businessKey = record.id;
+    //   this.showModal2 = true;
+    // },
+    handleView(row){
+      var path = "/base/memberInfo/view";
+
+      this.$store.dispatch("tagsView/delView", {
+          name: "baseMemberInfoView",
+          path: path,
+          })
+          .then(({ visitedViews }) => {
+          this.$router.push({
+              path: path,
+              query: {
+                businessKey: row.id,
+              },
+          });
+      });
     },
     handleDelete(record) {
       var self = this;

src/views/base/memberInfo-view.vue

@@ -1,6 +1,19 @@
 
 <template>
-  <el-dialog
+  <div style="padding-left: 5px;text-align: left" >
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/memberInfo">会员管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+
+
+  <!-- <el-dialog
     :visible.sync="showDialog"
     :title="title"
     :modal-append-to-body="true"
@@ -9,11 +22,11 @@
     width="1250px"
     :close-on-click-modal="false"
     @close="closeDialog"
-  >
+  > -->
     <div class="user-panel" v-loading="loading">
-        <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'100px'">
+        <el-form ref="form" :model="formModel" inline :label-width="'100px'">
             <el-container>
-                <el-aside width="900px">
+                <el-aside width="1000px">
                     <span class="span-realName">{{formModel.realName}}</span> 
                     <el-row>
                         <el-col :span="8">
@@ -52,7 +65,7 @@
                             <div class="grid-content bg-purple">
                                 <el-form-item label="性别：">
                                     <span class="grid-content-span" v-if="formModel.gender">女</span>
-                                    <span class="grid-content-span" v-else>男</span>
+                                    <span class="grid-content-span" v-else-if="!formModel.gender">男</span>
                                 </el-form-item>
                             </div>
                         </el-col>
@@ -81,8 +94,8 @@
                         </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
-                                <el-form-item label="职业：">
-                                    <span class="grid-content-span">{{formModel.birthday}}</span>
+                                <el-form-item label="岗位：">
+                                    <span class="grid-content-span">{{formModel.post}}</span>
                                 </el-form-item>
                             </div>
                         </el-col>
@@ -91,7 +104,7 @@
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
                                 <el-form-item label="出生地：">
-                                    <span class="grid-content-span">{{formModel.birthplace}}</span>
+                                    <span class="grid-content-span">{{formModel.birthplaceN}}</span>
                                 </el-form-item>
                             </div>
                         </el-col>
@@ -114,7 +127,7 @@
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
                                 <el-form-item label="户口所在地：">
-                                    <span class="grid-content-span">{{formModel.registeredResidence}}</span>
+                                    <span class="grid-content-span">{{formModel.registeredResidenceN}}</span>
                                 </el-form-item>
                             </div>
                         </el-col>
@@ -137,7 +150,7 @@
                         <el-col :span="8">
                             <div class="grid-content bg-purple">
                                 <el-form-item label="工作所在地：">
-                                    <span class="grid-content-span">{{formModel.workplace}}</span>
+                                    <span class="grid-content-span">{{formModel.workplaceN}}</span>
                                 </el-form-item>
                             </div>
                         </el-col>
@@ -182,20 +195,20 @@
                     </el-row>
                     <el-divider></el-divider>
                     <div class="hobby-div">
-                        <h1>兴趣爱好</h1>
-                        <el-tag type="danger" v-for="item in formModel.hobbyInfoList" v-bind:key="item">
+                        <h3>兴趣爱好</h3>
+                        <el-tag type="danger" v-for="(item,i) in formModel.hobbyInfoList" :key="i">
                             {{item.name}}
                         </el-tag>
                     </div>
                     <el-divider></el-divider>
-                    <h1>自我评价</h1> 
+                    <h3>自我评价</h3> 
                     <p class="p-content">
                         {{formModel.selfEvaluation}}
                     </p>
                     <el-divider></el-divider>
-                    <h1>择偶标准</h1> 
+                    <h3>择偶标准</h3> 
                     <div>
-                        <el-form ref="form2" :model="formModel2" inline :rules="ruleValidate" :label-width="'100px'">
+                        <el-form ref="form2" :model="formModel2" inline  :label-width="'100px'">
                         <el-row>
                             <el-col :span="8">
                                 <div class="grid-content bg-purple">
@@ -230,7 +243,7 @@
                             <el-col :span="8">
                                 <div class="grid-content bg-purple">
                                     <el-form-item label="工作地区：">
-                                        <span class="grid-content-span">{{formModel.taWorkplace}}</span>
+                                        <span class="grid-content-span">{{formModel.taWorkplaceN}}</span>
                                     </el-form-item>
                                 </div>
                             </el-col>
@@ -244,6 +257,7 @@
                         </el-row>
                         </el-form>
                     </div>
+                    <el-divider></el-divider>
                 </el-aside>
             <el-main>
                 <div class="right-main">
@@ -256,7 +270,7 @@
                 <div class="right-button-group">
                     <el-row class="right-button-group-row">
                         <el-col :span="12">
-                            <el-button type="primary" plain @click="dialog = true">编辑资料</el-button>
+                            <el-button type="primary" plain @click="handleOpen">编辑资料</el-button>
                         </el-col>
                         <el-col :span="12">
                             <el-button type="warning" plain>删除档案</el-button>
@@ -275,33 +289,221 @@
             </el-container>
         </el-form>
     </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog">取 消</el-button>
-    </span>
-  </el-dialog>
+    
+    <el-drawer
+    title="编辑会员信息"
+    :before-close="handleClose"
+    :visible.sync="dialog"
+    direction="rtl"
+    custom-class="demo-drawer"
+    ref="drawer"
+    :open="handleOpen"
+    >
+    <el-divider></el-divider>
+    <div class="demo-drawer__content">
+        <el-form :model="form" ref="form" :label-width="'150px'">
+        <el-form-item label="真实姓名" :label-width="formLabelWidth">
+            <el-input v-model="form.realName" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号" :label-width="formLabelWidth">
+            <el-input v-model="form.idCard" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号码" :label-width="formLabelWidth">
+            <el-input v-model="form.phone" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="性别" :label-width="formLabelWidth">
+            <el-radio-group v-model="form.gender">
+                <el-radio :label="false">男</el-radio>
+                <el-radio :label="true">女</el-radio>
+            </el-radio-group>
+        </el-form-item>
+        <el-form-item label="年龄" :label-width="formLabelWidth">
+            <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="身高" :label-width="formLabelWidth">
+            <el-input v-model="form.height" autocomplete="off">
+                <template slot="append">厘米/cm</template>
+            </el-input>
+        </el-form-item>
+         <el-form-item label="体重" :label-width="formLabelWidth">
+            <el-input v-model="form.weight" autocomplete="off">
+                <template slot="append">公斤/kg</template>
+            </el-input>
+        </el-form-item>
+        <el-form-item label="出生地" :label-width="formLabelWidth">
+            <el-cascader
+            v-model="form.birthplaceArr"
+            :options="cityList"
+            >
+            </el-cascader>
+        </el-form-item>
+        <el-form-item label="户口地" :label-width="formLabelWidth">
+            <el-cascader
+            v-model="form.registeredResidenceArr"
+            :options="cityList"
+            >
+            </el-cascader>
+        </el-form-item>
+        <el-form-item label="工作地" :label-width="formLabelWidth">
+            <el-cascader
+            v-model="form.workplaceArr"
+            :options="cityList"
+            >
+            </el-cascader>
+        </el-form-item>
+        <el-form-item label="学历" :label-width="formLabelWidth" prop="education">
+            <el-select v-model="form.education" filterable placeholder="请选择">
+             <el-option
+                  v-for="result in eduList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="行业" :label-width="formLabelWidth" prop="industry">
+            <el-select v-model="form.industry" filterable placeholder="请选择">
+             <el-option
+                  v-for="result in industryList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="工作单位" :label-width="formLabelWidth">
+            <el-input v-model="form.workUnit" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="岗位" :label-width="formLabelWidth">
+            <el-input v-model="form.post" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="月薪" :label-width="formLabelWidth" prop="salaryRange">
+            <el-select v-model="form.salaryRange" filterable placeholder="请选择">
+             <el-option
+                  v-for="result in salaryRangeList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="住房状况" :label-width="formLabelWidth" prop="housingSituation">
+            <el-select v-model="form.housingSituation" filterable placeholder="请选择" >
+             <el-option
+                  v-for="result in housingSituationList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="婚姻状况" :label-width="formLabelWidth"  prop="maritalStatus">
+            <el-select v-model="form.maritalStatus" filterable placeholder="请选择">
+             <el-option
+                  v-for="result in maritalStatusList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="子女状况" :label-width="formLabelWidth" prop="childStatus">
+            <el-select v-model="form.childStatus" filterable placeholder="请选择" >
+             <el-option
+                  v-for="result in childStatusList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="兴趣爱好" :label-width="formLabelWidth">
+            <el-button  v-for="(item,index) in hobbyInfoList" :type="item.isMemberSelect?'danger':'info'" v-bind:key="index" class="btnHobbys" size="mini" @click="handleHobbys(item)">
+                {{item.name}}
+            </el-button>
+        </el-form-item>
+        <el-form-item label="自我评价" :label-width="formLabelWidth">
+            <el-input type="textarea" v-model="form.selfEvaluation" :rows="5"></el-input>
+        </el-form-item>
+        <h3>择偶标准</h3>
+        <el-form-item label="年龄范围" :label-width="formLabelWidth" prop="taAgeRange">
+            <el-select v-model="form.taAgeRange" filterable placeholder="请选择" >
+             <el-option
+                  v-for="result in taAgeRangeList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="月薪" :label-width="formLabelWidth">
+            <el-select v-model="form.taIncomeRange" filterable placeholder="请选择">
+             <el-option
+                  v-for="result in salaryRangeList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+            <el-form-item label="学历" :label-width="formLabelWidth" prop="taEdu">
+            <el-select v-model="form.taEdu" filterable placeholder="请选择" >
+             <el-option
+                  v-for="result in eduList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+                <el-form-item label="职业" :label-width="formLabelWidth">
+            <el-select v-model="form.taOccupation" filterable placeholder="请选择">
+             <el-option
+                  v-for="result in industryList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="工作地" :label-width="formLabelWidth">
+            <el-cascader
+            v-model="form.taWorkplaceArr"
+            :options="cityList"
+            >
+            </el-cascader>
+        </el-form-item>
+        <el-form-item label="其他要求" :label-width="formLabelWidth">
+            <el-input type="textarea" v-model="form.taOther" :rows="5"></el-input>
+        </el-form-item>
+        <el-form-item label="是否公开" :label-width="formLabelWidth">
+            <el-radio-group v-model="form.publicNot">
+                <el-radio :label="true">公开</el-radio>
+                <el-radio :label="false">不公开</el-radio>
+            </el-radio-group>
+        </el-form-item>
+        </el-form>
+        
+        <div class="demo-drawer__footer">
+        <el-button @click="cancelForm">取 消</el-button>
+        <el-button type="primary" @click="$refs.drawer.closeDrawer()" :loading="loading">{{ loading ? '提交中 ...' : '确 定' }}</el-button>
+        </div>
+    </div>
+    </el-drawer>
+    
+</div>
+  
+  <!-- </el-dialog> -->
 </template>
 <script>
 import memberInfoApi from "@/api/base/memberInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import hobbyInfoApi from "@/api/base/hobbyInfo";
+import cityApi from "@/api/base/city";
 
 export default {
-  props: ["businessKey", "title","companyResult"],
-  computed: {
-      ruleValidate (){
-        var rules = null;
-        rules = {
-            realName: [
-                { required: true, message: "真实姓名不能为空", trigger: "blur" }
-            ],
-            idCard: [
-                { required: true, message: "身份证号不能为空", trigger: "blur" }
-            ],
-            orgId: [
-                { required: true, message: "所属工会不能为空", trigger: "blur" }
-            ],
-        };
-        return rules;
-      }
-  },
+  name:"baseMemberInfoView",
+
   data() {
     return {
       showDialog: true,
@@ -309,12 +511,85 @@ export default {
       submitting: false,
       formModel: {},
       formModel2: {},
+      formLabelWidth: '80px',
+      timer: null,
+      dialog: false,
+      form: {
+        name: '',
+        region: '',
+        date1: '',
+        date2: '',
+        delivery: false,
+        type: [],
+        resource: '',
+        desc: ''
+      },
+      eduList:[],
+      industryList:[],
+      salaryRangeList:[],
+      housingSituationList:[],
+      maritalStatusList:[],
+      childStatusList:[],
+      taAgeRangeList:[],
+      hobbyInfoList:[],
+      cityList:[],
     };
   },
   methods: {
     closeDialog() {
       this.$emit("close", false);
     },
+    handleOpen(){
+        var self = this;
+
+        self.dialog = true;
+
+        self.businessKey = this.$route.query.businessKey;
+
+        var formData = new FormData();
+
+        formData.append("memberInfoId", self.businessKey);
+
+        hobbyInfoApi.list(formData).then((response) => {
+            var jsonData = response.data;
+            this.hobbyInfoList = jsonData.data;
+        });
+
+        (function () {
+            return memberInfoApi.view(self.businessKey);
+        })()
+        .then((response) => {
+            var jsonData = response.data;
+            self.loading = false;
+
+            if (jsonData.result) {
+            self.form = jsonData.data;
+            } else {
+            self.$message.error(jsonData.message + "");
+            }
+        })
+        .catch((error) => {
+            self.$message.error(error + "");
+        });
+        
+    },
+    handleClose() {
+      this.loading = false;
+      this.dialog = false;
+      clearTimeout(this.timer);
+    },
+    cancelForm() {
+      this.loading = false;
+      this.dialog = false;
+      clearTimeout(this.timer);
+    },
+    handleHobbys(item){
+        if(item.isMemberSelect==null){
+            item.isMemberSelect=false
+        }
+        item.isMemberSelect= !item.isMemberSelect;
+        this.$forceUpdate()
+    },
     handleSubmit() {
       var self = this;
 
@@ -354,11 +629,85 @@ export default {
   created() {
     var self = this;
 
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "学历",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.eduList = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "行业",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.industryList = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "月薪",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.salaryRangeList = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "住房情况",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.housingSituationList = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "婚姻情况",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.maritalStatusList = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "子女情况",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.childStatusList = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "年龄范围",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.taAgeRangeList = jsonData.data;
+      });
+
+    cityApi.treeList().then((response) => {
+        var jsonData = response.data;
+        this.cityList = jsonData.data;
+    });
+
+
+
     //self.loadTree();
   },
   mounted: function () {
     var self = this;
 
+    self.loading = true;
+
+    self.businessKey = this.$route.query.businessKey;
+
     (function () {
         return memberInfoApi.view(self.businessKey);
     })()
@@ -383,6 +732,25 @@ export default {
 .user-panel {
   margin: 10px auto;
 }
+
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
 .span-realName{
     font-weight: bold;
     font-size: 24px;
@@ -398,7 +766,7 @@ export default {
   .row-bg {
     padding: 10px 0;
   }
-  .el-form-item{
+  .user-panel .el-form-item{
       margin-bottom: 0px;
       
       .el-form-item__label{
@@ -428,6 +796,22 @@ export default {
   }
   .p-content{
       line-height: 30px;
+      font-size: 12px;
   }
 
+  .demo-drawer__content{
+      margin:40px;
+  }
+  .demo-drawer__footer{
+      text-align: right;
+  }
+  .btnHobbys{
+      margin: 5px;
+  }
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+  .el-drawer.rtl{
+      overflow: scroll;
+  }
 </style>

src/views/base/newsInfo-detail.vue

@@ -57,7 +57,14 @@
                 style="width: 90%"
             ></mce-editor>
         </el-form-item>
+        <el-form-item label="是否显示" prop="isShow">
+          <el-radio-group v-model="formModel.isShow">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+      </el-form-item>
       </el-form>
+
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
@@ -103,6 +110,7 @@ export default {
         content:"",
         images:"",
         author:"",
+        isShow:false
       },
       newsTypeList: [],
       //上传地址

src/views/base/newsInfo-list.vue

@@ -102,12 +102,25 @@
         prop="author"
         label="新闻作者"
       ></el-table-column>
+      <el-table-column prop="status" label="审核状态">
+          <template slot-scope="{ row }">
+              <span v-if="row.status=='0'" style="color:red">未审核</span>
+              <span v-else-if="row.status=='1'" style="color:green">已审核</span>
+              <span v-else-if="row.status=='2'">审核不通过</span>
+          </template>
+      </el-table-column>
+      <el-table-column prop="isShow" label="是否显示">
+          <template slot-scope="{ row }">
+              <span v-if="row.isShow" style="color:green">是</span>
+              <span v-else style="color:red">否</span>
+          </template>
+      </el-table-column>
       <el-table-column
         prop="createTime"
         label="创建时间"
         width="150"
       ></el-table-column>
-      <el-table-column label="操作" fixed="right">
+      <el-table-column label="操作" fixed="right" width="110">
         <template slot-scope="{ row }">
           <el-row>
             <el-col>

src/views/base/newsType-detail.vue

@@ -15,6 +15,9 @@
         <el-form-item label="类别名称" prop="name">
           <el-input v-model="formModel.name" placeholder="请输入新闻类别名称" style="width:300px"></el-input>
         </el-form-item>
+        <el-form-item label="类型简称" prop="shortName">
+          <el-input v-model="formModel.shortName" placeholder="请输入类型简称" style="width:300px"></el-input>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -35,6 +38,9 @@ export default {
             name: [
                 { required: true, message: "类别名称不能为空", trigger: "blur" }
             ],
+            shortName: [
+                { required: true, message: "类型简称不能为空", trigger: "blur" }
+            ],
         };
         return rules;
       }

src/views/base/newsType-list.vue

@@ -72,6 +72,11 @@
         label="新闻类别名称"
         width="200"
       ></el-table-column>
+      <el-table-column
+        prop="shortName"
+        label="类型简称"
+        width="200"
+      ></el-table-column>
       <el-table-column
         prop="createTime"
         label="创建时间"

src/views/base/orgInfo-detail.vue

@@ -12,6 +12,16 @@
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="所属区域" prop="area">
+          <el-select v-model="formModel.area" filterable placeholder="请选择" >
+            <el-option
+                v-for="result in areaList"
+                :key="result.id"
+                :label="result.name"
+                :value="result.value"
+              ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="上级工会" prop="parentId">
           <el-select-tree
             :props="props"
@@ -24,6 +34,12 @@
         <el-form-item label="工会名称" prop="name">
           <el-input v-model="formModel.name" placeholder="请输入工会名称" style="width:300px"></el-input>
         </el-form-item>
+        <el-form-item label="单位名称" prop="unit">
+          <el-input v-model="formModel.unit" placeholder="请输入单位名称" style="width:300px"></el-input>
+        </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="formModel.remark" :rows="5" style="width:300px"></el-input>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -35,6 +51,7 @@
 <script>
 import orgInfoApi from "@/api/base/orgInfo";
 import SelectTree from "@/components/SelectTree";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 
 export default {
   props: ["businessKey", "title","companyResult"],
@@ -61,7 +78,7 @@ export default {
       },
       templateList: [],
       defaultPriceList:[],
-      chargingStationResult:[],
+      areaList:[],
       orgResult:[],
       treeData: [],
       props: {
@@ -152,6 +169,15 @@ export default {
       }
     });
 
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "所属区域",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.areaList = jsonData.data;
+      });
+
     //self.loadTree();
   },
   mounted: function () {

src/views/base/orgInfo-list.vue

@@ -67,6 +67,11 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="areaN"
+        label="所属区域"
+        width="200"
+      ></el-table-column>
       <el-table-column
         prop="parentName"
         label="上级工会"
@@ -77,11 +82,21 @@
         label="工会名称"
         width="200"
       ></el-table-column>
+      <el-table-column
+        prop="unit"
+        label="单位名称"
+        width="200"
+      ></el-table-column>
+            <el-table-column
+        prop="remark"
+        label="备注"
+        width="200"
+      ></el-table-column>
       <el-table-column
         prop="createTime"
         label="创建时间"
       ></el-table-column>
-      <el-table-column label="操作" width="350" fixed="right">
+      <el-table-column label="操作" fixed="right">
         <template slot-scope="{ row }">
           <el-row>
             <el-col>