链属新增；角色，部门新增与列表；用户新增

front-vue/src/views/service/rel/companyRel.vue

@@ -184,6 +184,7 @@
       <el-form-item label="社会统一代码" prop="scySocialCode" >
         <el-input
           maxlength="30"
+          style="width: 230px"
           v-model="spareParams.scySocialCode"
           placeholder="请输入社会统一代码"
           clearable
@@ -733,6 +734,7 @@ export default {
     clearRemote(){
       let query = '';
       this.form.scyId = '';
+      this.form.scyName = '';
       this.form.scySocialCode = '';
       this.idShow = true;
       this.remoteMethod(query);
@@ -863,6 +865,13 @@ submitForm() {
             spinner: "el-icon-loading",
             background: "rgba(0, 0, 0, 0.7)",
           })
+          for (var company of this.companyList) {
+            if (company.value == self.form.scyId) {
+              self.form.scyName = company.label;
+              break;
+            }
+          }
+          console.log(self.form,"提交表单")
           addRel(self.form).then(response => {
             this.msgSuccess("新增成功");
             this.open = false;

front-vue/src/views/system/dept/index.vue

@@ -101,7 +101,7 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-form-item label="公司名称" prop="payroll" v-show="companyId == '000000'">
+          <!-- <el-form-item label="公司名称" prop="payroll" v-show="companyId == '000000'">
             <el-select v-model="form.companyId">
               <el-option
                 v-for="(item,index) in companyList"
@@ -110,7 +110,7 @@
                 :value="item.scyId"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />

front-vue/src/views/system/role/index.vue

@@ -165,7 +165,7 @@
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="公司名称" prop="payroll" v-show="companyId == '000000'">
+        <!-- <el-form-item label="公司名称" prop="payroll" v-show="companyId == '000000'">
             <el-select v-model="form.companyId">
               <el-option
                 v-for="(item,index) in companyList"
@@ -174,7 +174,7 @@
                 :value="item.scyId"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model.trim="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>

front-vue/src/views/system/user/index.vue

@@ -46,7 +46,8 @@
                 </el-card>
 
                 <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5" v-show="companyId != '000000'">
+                    <!-- <el-col :span="1.5" v-show="companyId != '000000'"> -->
+                    <el-col :span="1.5">
                         <el-button type="primary" icon="el-icon-plus" size="mini" 
                         @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
                     </el-col>
@@ -92,7 +93,7 @@
         <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-row>
-                    <el-form-item label="公司名称" prop="payroll" v-show="companyId == '000000'">
+                    <!-- <el-form-item label="公司名称" prop="payroll" v-show="companyId == '000000'">
                         <el-select v-model="form.companyId" @change="getRodept">
                             <el-option 
                             v-for="(item, index) in companyList" 
@@ -100,13 +101,14 @@
                             :value="item.scyId">
                             </el-option>
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-col :span="12">
                         <el-form-item label="用户姓名" prop="nickName">
                             <el-input v-model="form.nickName" placeholder="请输入用户姓名" maxlength="50" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="rodeptShow">
+                    <!-- <el-col :span="12" v-if="rodeptShow"> -->
+                    <el-col :span="12">
                         <el-form-item label="归属部门" prop="deptId">
                             <treeselect v-model="form.deptId" :options="rodeptOptions" :show-count="true" 
                             placeholder="请选择归属部门"/>
@@ -127,7 +129,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row v-if="rodeptShow">
+                <el-row>
                     <el-col :span="12">
                         <el-form-item label="角色" prop="roleIds">
                             <el-select v-model="form.roleIds" multiple placeholder="请选择">