Skip to content

C
car-database-web
Commit bd476e53 authored by baiyanhao's avatar baiyanhao
Browse files
Options

Merge branch 'master' of http://gitlab.91isoft.com:90/car-database/car-database-web

parents 57dff67b ee341259
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 88 deletions
src/api/system/dept.js
View file @ bd476e53
import request from '@/utils/request'
// 查询部门列表
// 查询单位列表
export function listDept(query) {
return request({
url: '/system/dept/list',
......@@ -9,7 +9,7 @@ export function listDept(query) {
})
}
// 查询部门列表（排除节点）
// 查询单位列表（排除节点）
export function listDeptExcludeChild(deptId) {
return request({
url: '/system/dept/list/exclude/' + deptId,
......@@ -17,7 +17,7 @@ export function listDeptExcludeChild(deptId) {
})
}
// 查询部门详细
// 查询单位详细
export function getDept(deptId) {
return request({
url: '/system/dept/' + deptId,
......@@ -25,7 +25,7 @@ export function getDept(deptId) {
})
}
// 新增部门
// 新增单位
export function addDept(data) {
return request({
url: '/system/dept',
......@@ -34,7 +34,7 @@ export function addDept(data) {
})
}
// 修改部门
// 修改单位
export function updateDept(data) {
return request({
url: '/system/dept',
......@@ -43,7 +43,7 @@ export function updateDept(data) {
})
}
// 删除部门
// 删除单位
export function delDept(deptId) {
return request({
url: '/system/dept/' + deptId,
......
src/api/system/role.js
View file @ bd476e53
......@@ -110,7 +110,7 @@ export function authUserSelectAll(data) {
})
}
// 根据角色ID查询部门树结构
// 根据角色ID查询单位树结构
export function deptTreeSelect(roleId) {
return request({
url: '/system/role/deptTree/' + roleId,
......
src/api/system/user.js
View file @ bd476e53
......@@ -135,7 +135,7 @@ export function updateAuthRole(data) {
})
}
// 查询部门下拉树结构
// 查询单位下拉树结构
export function deptTreeSelect() {
return request({
url: '/system/user/deptTree',
......
src/components/Page/chapterOption.vue
View file @ bd476e53
......@@ -128,6 +128,7 @@ export default {
if (this.standardList.length > 0) {
this.selectStandard(this.standardList[0])
}
this.loadData()
},
computed: {
...mapGetters(['standard', 'standardList'])
......@@ -160,8 +161,8 @@ export default {
this.$store.dispatch('standard/setStandardList', this.queryParams.name)
},
selectStandard(value) {
this.$store.dispatch('standard/setStandard', '')
//this.loadData()
this.$store.dispatch('standard/setStandard',value)
this.loadData()
},
handleNodeClick(node,data){
if(data.isCurrent){
......@@ -176,7 +177,16 @@ export default {
type:node.type,
chapter: data.level == 1 ? ' ' : node.label
}
this.$store.dispatch('standard/setStandard', standard)
}
if(data.level == 2){
this.queryParams.type = node.type
let standard = {
id:node.id,
name:node.label,
type:node.type,
chapter: ''
}
this.$store.dispatch('standard/setStandard', standard)
}
//this.$store.dispatch('standard/setStandard', standard)
......@@ -221,6 +231,7 @@ export default {
async loadData(){
this.loading = true
this.tableData = []
console.log(this.standardList)
for(let i = 0; i < this.standardList.length ; i++ ){
let data = {
standardId: this.standardList[i].id,
......@@ -229,8 +240,9 @@ export default {
await getReviewStandardList(data).then(res=>{
if(res.code === 200){
let typeList = res.data.typeList
forEach(typeList,(item)=>{
item.isCurrent = false,
forEach(typeList,(item,index)=>{
item.isCurrent = false,
item.id = this.standardList[i].id
item.children = item.reviewStandardChapterListResponses
forEach(item.children,(c)=>{
c.label = c.chapter
......@@ -251,6 +263,7 @@ export default {
}
})
item.children = cache
switch(item.type){
case 'system':
item.label='体系审查'
......@@ -271,7 +284,6 @@ export default {
isCurrent:false
}
this.tableData.push(obj)
//let chapters = res.rows
......
src/views/monitor/online/index.vue
View file @ bd476e53
......@@ -58,7 +58,7 @@
prop="userName"
:show-overflow-tooltip="true"
/>
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="单位名称" align="center" prop="deptName" />
<el-table-column
label="主机"
align="center"
......
src/views/setting/review/index.vue
View file @ bd476e53
......@@ -7,7 +7,7 @@
<el-form-item label="评审主检" prop="deptName">
<el-input
v-model="model.user"
placeholder="请输入部门名称"
placeholder="请输入单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
......
src/views/setting/standardTerms/index.vue
View file @ bd476e53
......@@ -271,7 +271,7 @@ export default {
pageNum:1,
pageSize:10,
standardId: this.$store.getters.standard,
type:this.$store.getters.standard_type
type:this.$store.getters.standard_type || 'system'
},
searchQueryParams:{
chapter:'',
......@@ -312,21 +312,14 @@ export default {
'$store.getters.standard': {
handler(newVal, oldVal) {
this.queryParams.standardId = newVal
this.count++
if(this.count>2){
this.loadData()
}
console.log(newVal)
this.loadData()
}
},
'$store.getters.standard_type': {
handler(newVal, oldVal) {
this.queryParams.type = newVal
this.count++
if(this.count>3){
this.loadData()
}
this.loadData()
}
},
'$store.getters.standard_chapter': {
......@@ -371,6 +364,7 @@ export default {
console.log(data);
},
async loadData() {
console.log(this.queryParams)
this.loading = true
await request({
url: this.listUrl,
......@@ -470,6 +464,7 @@ export default {
},
reset() {
this.$store.dispatch('standard/setStandard','')
this.searchQueryParams.chapter = ''
this.searchQueryParams.text = ''
this.queryParams.chapter = ''
......@@ -478,8 +473,6 @@ export default {
this.queryParams.name = ''
this.queryParams.standardNo = ''
this.queryParams.type = ''
this.$store.dispatch('standard/setStandard','')
console.log(this.queryParams)
this.loadData()
},
handleQuery(){
......
src/views/system/dept/index.vue
View file @ bd476e53
......@@ -7,10 +7,10 @@
size="small"
:inline="true"
>
<el-form-item label="部门名称" prop="deptName">
<el-form-item label="单位名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入部门名称"
placeholder="请输入单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -18,7 +18,7 @@
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="部门状态"
placeholder="单位状态"
clearable
>
<el-option
......@@ -171,7 +171,7 @@
</el-table-column>
</el-table>
<!-- 添加或修改部门对话框 -->
<!-- 添加或修改单位对话框 -->
<el-dialog
:title="title"
:close-on-click-modal="false"
......@@ -183,20 +183,20 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col v-if="form.parentId !== 0" :span="24">
<el-form-item label="上级部门" prop="parentId">
<el-form-item label="上级单位" prop="parentId">
<treeselect
v-model="form.parentId"
:options="deptOptions"
:normalizer="normalizer"
placeholder="选择上级部门"
placeholder="选择上级单位"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
<el-form-item label="单位名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入单位名称" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -241,7 +241,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门状态">
<el-form-item label="单位状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
......@@ -266,9 +266,10 @@
</el-form-item>
</el-col>
</el-row>
<el-col :span="12">
<el-form-item label="单位类型" prop="deptType">
<el-select v-model="form.deptType" :disabled="title == '修改部门'" placeholder="请选择单位类型">
<el-row>
<el-col :span="24">
<el-form-item label="单位类型" prop="deptType" v-if="form.parentId !== 0">
<el-select v-model="form.deptType" placeholder="请选择单位类型">
<el-option
v-for="item in typeOptions"
:key="item.value"
......@@ -278,6 +279,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -311,7 +313,7 @@ export default {
showSearch: true,
// 表格树数据
deptList: [],
// 部门树选项
// 单位树选项
deptOptions: [],
// 弹出层标题
title: '',
......@@ -331,14 +333,10 @@ export default {
// 表单校验
rules: {
parentId: [
{ required: true, message: '上级部门不能为空', trigger: 'blur' }
],
address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
postcode: [
{ required: true, message: '邮政编码不能为空', trigger: 'blur' }
{ required: true, message: '上级单位不能为空', trigger: 'blur' }
],
deptName: [
{ required: true, message: '部门名称不能为空', trigger: 'blur' }
{ required: true, message: '单位名称不能为空', trigger: 'blur' }
],
orderNum: [
{ required: true, message: '显示排序不能为空', trigger: 'blur' }
......@@ -363,7 +361,7 @@ export default {
},
typeOptions:[
{
label:'政府部门',
label:'政府单位',
value:'government'
},
{
......@@ -379,10 +377,10 @@ export default {
methods: {
formatteDeptType(val){
return val.deptType === "enterprise" ? '企业' : val.deptType === "government" ? '政府部门' : val.deptType === "testing_institution" ? '检测机构' : ''
return val.deptType === "enterprise" ? '企业' : val.deptType === "government" ? '政府单位' : val.deptType === "testing_institution" ? '检测机构' : ''
},
/** 查询部门列表 */
/** 查询单位列表 */
getList() {
this.loading = true
listDept(this.queryParams).then(response => {
......@@ -390,7 +388,7 @@ export default {
this.loading = false
})
},
/** 转换部门数据结构 */
/** 转换单位数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children
......@@ -438,7 +436,7 @@ export default {
this.form.parentId = row.deptId
}
this.open = true
this.title = '添加部门'
this.title = '添加单位'
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, 'deptId')
})
......@@ -458,7 +456,7 @@ export default {
this.form = response.data
console.log(response.data)
this.open = true
this.title = '修改部门'
this.title = '修改单位'
listDeptExcludeChild(row.deptId).then(response => {
this.deptOptions = this.handleTree(response.data, 'deptId')
if (this.deptOptions.length === 0) {
......@@ -475,6 +473,7 @@ export default {
/** 提交按钮 */
submitForm: function () {
this.$refs['form'].validate(valid => {
console.log(valid)
if (valid) {
if (this.form.deptId !== undefined) {
updateDept(this.form).then(response => {
......
src/views/system/role/index.vue
View file @ bd476e53
......@@ -428,11 +428,11 @@ export default {
},
{
value: '3',
label: '本部门数据权限'
label: '本单位数据权限'
},
{
value: '4',
label: '本部门及以下数据权限'
label: '本单位及以下数据权限'
},
{
value: '5',
......@@ -441,7 +441,7 @@ export default {
],
// 菜单列表
menuOptions: [],
// 部门列表
// 单位列表
deptOptions: [],
// 查询参数
queryParams: {
......@@ -501,11 +501,11 @@ export default {
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return checkedKeys
},
// 所有部门节点数据
// 所有单位节点数据
getDeptAllCheckedKeys() {
// 目前被选中的部门节点
// 目前被选中的单位节点
const checkedKeys = this.$refs.dept.getCheckedKeys()
// 半选中的部门节点
// 半选中的单位节点
const halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys()
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return checkedKeys
......@@ -517,7 +517,7 @@ export default {
return response
})
},
/** 根据角色ID查询部门树结构 */
/** 根据角色ID查询单位树结构 */
getDeptTree(roleId) {
return deptTreeSelect(roleId).then(response => {
this.deptOptions = response.depts
......
src/views/system/user/index.vue
View file @ bd476e53
<template>
<div class="app-container">
<el-row :gutter="20">
<!--部门数据-->
<!--单位数据-->
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
placeholder="请输入单位名称"
clearable
size="small"
prefix-icon="el-icon-search"
......@@ -203,7 +203,7 @@
<el-table-column
v-if="columns[3].visible"
key="deptName"
label="部门"
label="单位"
align="center"
prop="dept.deptName"
:show-overflow-tooltip="true"
......@@ -317,12 +317,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<el-form-item label="归属单位" prop="deptId">
<treeselect
v-model="form.deptId"
:options="deptOptions"
:show-count="true"
placeholder="请选择归属部门"
placeholder="请选择归属单位"
/>
</el-form-item>
</el-col>
......@@ -449,14 +449,14 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<el-form-item label="签字图片" prop="signaturePicture">
<ImageUpload
v-model="form.signaturePicture"
:limit="1"
></ImageUpload>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -546,11 +546,11 @@ export default {
userList: null,
// 弹出层标题
title: '',
// 部门树选项
// 单位树选项
deptOptions: undefined,
// 是否显示弹出层
open: false,
// 部门名称
// 单位名称
deptName: undefined,
// 默认密码
initPassword: undefined,
......@@ -595,7 +595,7 @@ export default {
{ key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true },
{ key: 2, label: `用户昵称`, visible: true },
{ key: 3, label: `部门`, visible: true },
{ key: 3, label: `单位`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true }
......@@ -644,7 +644,7 @@ export default {
}
},
watch: {
// 根据名称筛选部门树
// 根据名称筛选单位树
deptName(val) {
this.$refs.tree.filter(val)
}
......@@ -668,7 +668,7 @@ export default {
}
)
},
/** 查询部门下拉树结构 */
/** 查询单位下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.deptOptions = response.data
......
src/views/system/user/profile/index.vue
View file @ bd476e53
......@@ -24,7 +24,7 @@
<div class="pull-right">{{ user.email || '--' }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<svg-icon icon-class="tree" />所属单位
<div v-if="user.dept" class="pull-right">
{{ user.dept.deptName || '--' }} / {{ postGroup || '--' }}
</div>
......
src/views/task/edit/index.vue
View file @ bd476e53
......@@ -217,7 +217,7 @@
<span v-else-if="row.isLeader === 0"> 检验员 </span>
</template>
</el-table-column>
<el-table-column label="所属部门" align="left" prop="dept">
<el-table-column label="所属单位" align="left" prop="dept">
<template slot-scope="{ row }">
<span v-if="row.userId === ''">-</span>
<span v-else-if="row.dept === null"> - </span>
......@@ -383,7 +383,7 @@ export default {
userId: '', // 审核人id
name: '', // 审核人姓名
isLeader: '', // 是否是主检
deptName: '' // 部门名称
deptName: '' // 单位名称
}
],
// 整车样品信息
......
src/views/task/new/index.vue
View file @ bd476e53
......@@ -225,7 +225,7 @@
<span v-else-if="row.isLeader === 0"> 检验员 </span>
</template>
</el-table-column>
<el-table-column label="所属部门" align="left" prop="dept">
<el-table-column label="所属单位" align="left" prop="dept">
<template slot-scope="{ row, $index }">
<span v-if="row.userId === ''">-</span>
<span v-else-if="row.dept === null"> - </span>
......@@ -403,7 +403,7 @@ export default {
userId: '', // 审核人id
name: '', // 审核人姓名
isLeader: '', // 是否是主检
deptName: '' // 部门名称
deptName: '' // 单位名称
}
],
// 整车样品信息
......@@ -466,9 +466,9 @@ export default {
loading: false,
// 小组成员回显数据
tableData: [
// { nickName: '老二', role: '检验员', dept: '第一部门', disabled: true },
// { nickName: '老三', role: '检验员', dept: '第一部门', disabled: true },
// { nickName: '老大', role: '主检', dept: '第一部门', disabled: true }
// { nickName: '老二', role: '检验员', dept: '第一单位', disabled: true },
// { nickName: '老三', role: '检验员', dept: '第一单位', disabled: true },
// { nickName: '老大', role: '主检', dept: '第一单位', disabled: true }
],
inspectionItemList: [
// { value: 0, label: '汽车信息安全管理体系要求', check: false },
......@@ -563,11 +563,11 @@ export default {
},
mainUserList: [],
userList: [
// { nickName: '老大', role: '主检', dept: '第一部门', disabled: true },
// { nickName: '老二', role: '检验员', dept: '第一部门', disabled: true },
// { nickName: '老三', role: '检验员', dept: '第一部门', disabled: true },
// { nickName: '老四', role: '检验员', dept: '第一部门', disabled: false },
// { nickName: '老五', role: '检验员', dept: '第一部门', disabled: false }
// { nickName: '老大', role: '主检', dept: '第一单位', disabled: true },
// { nickName: '老二', role: '检验员', dept: '第一单位', disabled: true },
// { nickName: '老三', role: '检验员', dept: '第一单位', disabled: true },
// { nickName: '老四', role: '检验员', dept: '第一单位', disabled: false },
// { nickName: '老五', role: '检验员', dept: '第一单位', disabled: false }
],
imageUrl: '',
productionEnterpriseList: [
......
src/views/task/task-detail/index.vue
View file @ bd476e53
......@@ -218,7 +218,7 @@
<span v-else-if="row.isLeader === 0"> 检验员 </span>
</template>
</el-table-column>
<el-table-column label="所属部门" align="left" prop="dept">
<el-table-column label="所属单位" align="left" prop="dept">
<template slot-scope="{ row }">
<span v-if="row.userId === ''">-</span>
<span v-else>{{ row.deptName || '-' }}</span>
......@@ -308,7 +308,7 @@ export default {
userId: '', // 审核人id
name: '', // 审核人姓名
isLeader: '', // 是否是主检
deptName: '' // 部门名称
deptName: '' // 单位名称
}
],
// 整车样品信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment