|
@@ -37,7 +37,11 @@
|
|
<span>{{ scope.$index + 1 }}</span>
|
|
<span>{{ scope.$index + 1 }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="头像" align="center" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" width="90" />
|
|
|
|
|
|
+ <el-table-column label="头像" align="center" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" width="90" >
|
|
|
|
+ <template>
|
|
|
|
+ <span></span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column label="姓名" align="center" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" width="120" />
|
|
<el-table-column label="姓名" align="center" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" width="120" />
|
|
<el-table-column label="公司部门" align="center" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" width="160" />
|
|
<el-table-column label="公司部门" align="center" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" width="160" />
|
|
<el-table-column label="级别职务" align="center" prop="phonenumber" v-if="columns[4].visible" width="160" />
|
|
<el-table-column label="级别职务" align="center" prop="phonenumber" v-if="columns[4].visible" width="160" />
|
|
@@ -69,7 +73,7 @@
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="序号" prop="nickName">
|
|
<el-form-item label="序号" prop="nickName">
|
|
- <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
|
|
|
|
|
|
+ <el-input v-model="form.nickName" placeholder="请输入序号" maxlength="30" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
@@ -156,12 +160,12 @@
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="QQ号" prop="phonenumber">
|
|
<el-form-item label="QQ号" prop="phonenumber">
|
|
- <el-input v-model="form.phonenumber" placeholder="请输入姓名" maxlength="11" />
|
|
|
|
|
|
+ <el-input v-model="form.phonenumber" placeholder="请输入QQ号" maxlength="11" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="企业微信号" prop="email">
|
|
<el-form-item label="企业微信号" prop="email">
|
|
- <el-input v-model="form.email" placeholder="请输入手机号" />
|
|
|
|
|
|
+ <el-input v-model="form.email" placeholder="请输入企业微信号" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -509,8 +513,8 @@
|
|
</el-row>
|
|
</el-row>
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
- <el-button size="mini" @click="cancel">取 消</el-button>
|
|
|
|
- <el-button size="mini" type="primary" @click="submitForm">确 定</el-button>
|
|
|
|
|
|
+ <el-button size="small" @click="cancel">取 消</el-button>
|
|
|
|
+ <el-button size="small" type="primary" @click="submitForm">确 定</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
@@ -537,8 +541,8 @@
|
|
</div>
|
|
</div>
|
|
</el-upload>
|
|
</el-upload>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
- <el-button size="mini" type="primary" @click="submitFileForm">确 定</el-button>
|
|
|
|
- <el-button size="mini" @click="upload.open = false">取 消</el-button>
|
|
|
|
|
|
+ <el-button size="small" type="primary" @click="submitFileForm">确 定</el-button>
|
|
|
|
+ <el-button size="small" @click="upload.open = false">取 消</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
@@ -549,8 +553,8 @@
|
|
<el-table-column label="描述" align="center"></el-table-column>
|
|
<el-table-column label="描述" align="center"></el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
- <el-button size="mini" @click="cancalRolePermissions">取 消</el-button>
|
|
|
|
- <el-button size="mini" type="primary" @click="saveRolePermissions">保 存</el-button>
|
|
|
|
|
|
+ <el-button size="small" @click="cancalRolePermissions">取 消</el-button>
|
|
|
|
+ <el-button size="small" type="primary" @click="saveRolePermissions">保 存</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
@@ -685,6 +689,9 @@ export default {
|
|
basicsShow: false // 基础信息
|
|
basicsShow: false // 基础信息
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ mounted() {
|
|
|
|
+ console.log(this.$store)
|
|
|
|
+ },
|
|
created() {
|
|
created() {
|
|
this.getList()
|
|
this.getList()
|
|
this.getTreeselect()
|
|
this.getTreeselect()
|
|
@@ -905,7 +912,10 @@ export default {
|
|
border: 1px solid #dfe6ec;
|
|
border: 1px solid #dfe6ec;
|
|
border-bottom: none;
|
|
border-bottom: none;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+.basics_form{
|
|
|
|
+ overflow: auto;
|
|
|
|
+ height: 600px;
|
|
|
|
+}
|
|
.el-col-lg-4-8 {
|
|
.el-col-lg-4-8 {
|
|
width: 20%;
|
|
width: 20%;
|
|
}
|
|
}
|