Skip to content

T
template_vue
Commit 852e93e0 authored by wdy's avatar wdy
Browse files
Options

Merge remote-tracking branch 'origin/project1' into project1

parents 2fb6c7b0 f201124b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 583 additions and 893 deletions
src/api/equipment/application.js 0 → 100644
View file @ 852e93e0
import request from '@/utils/request'
// 根据key值查询数据字典数据
export function getDictData(params) {
return request({
url: '/wbapply/queryDict',
method: 'get',
params
})
}
// 新增设备新增
export function addApplication(data) {
return request({
url: '/wbapply/add',
method: 'post',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
src/api/equipment/basicInfo.js
View file @ 852e93e0
import request from '@/utils/request'
import Qs from 'qs'
// 查询基础信息列表
export function listBasicInfo(query) {
return request({
......@@ -8,57 +7,27 @@ export function listBasicInfo(query) {
params: query
})
}
export function getlistRole() {
return request({
url: 'system/role/listAll',
method: 'get'
})
}
// 查询角色详细
export function getRole(businessId) {
return request({
url: '/system/role/detail/' + businessId,
method: 'get'
})
}
// 新增角色
export function addRole(data) {
data = Qs.stringify(data)
// 新增设备基本信息
export function add(data) {
return request({
url: '/system/role/add',
url: '/wbbaseinfo/add',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 修改角色
export function updateRole(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/system/role/update/' + businessId,
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
// 角色数据权限
export function dataScope(data) {
data = Qs.stringify(data)
// 修改基础信息接口
export function updataInfo(data) {
return request({
url: '/system/role/dataScope',
url: '/wbbaseinfo/update',
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
......
src/components/Table/AllTableArguments/BaseTableArguments.js
View file @ 852e93e0
......@@ -107,8 +107,6 @@ export function BaseTableArgumentsTest(nIndex, selection, loading, processList,
if (queryParams instanceof queryParamsType) {
this.queryParams = queryParamsType
}
this.nIndex = nIndex
this.columnData = columnData
this.processList = processList
}
src/components/Table/BaseTable/index.vue
View file @ 852e93e0
......@@ -12,7 +12,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
<el-table-column type="index" label="序号" width="50" :index="nIndex" />
<!-- TODO: 选择框是否开启，selectable控制是否单行禁用 -->
<el-table-column v-if="allTableArguments.columObj.selection" type="selection" :selectable="allTableArguments.columObj.selectable" width="50px" />
......@@ -30,7 +30,7 @@
:index="columIndex"
show-overflow-tooltip
>
<template v-slot="{row,$index}">
<template slot-scope="{row,$index}">
<!-- 默认展示 -->
<span v-if="column.text && column.editRow !== $index">{{ row[column.prop] || '-' }}</span>
......@@ -60,9 +60,9 @@
<!-- 操作按钮 -->
<span v-if="column.isOperation" class="processListBtns">
<span v-for="(operations, index) in column.operation" :key="index">
<el-button v-if=" operations.clickType === '1' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDetail">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '2' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleUpdate">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '3' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDelete">{{ operations.label }}</el-button>
<el-button v-if=" operations.clickType === '1' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDetail(row,$index)">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '2' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleUpdate(row,$index)">{{ operations.label }}</el-button>
<el-button v-else-if=" operations.clickType === '3' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDelete(row,$index)">{{ operations.label }}</el-button>
</span>
</span>
</template>
......@@ -76,7 +76,7 @@
<script>
import {BaseTableArgumentsTest} from '@/components/Table/AllTableArguments/BaseTableArguments'
import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
export default {
name: 'BaseTable',
......@@ -93,16 +93,10 @@ export default {
}
}
},
allNamed: {
type: Object,
nIndex: {
type: Function,
default: () => {
return {
listName: String,
label: {
SerialNumberNamed: String
}
}
return Function
}
}
},
......@@ -131,7 +125,6 @@ export default {
/* TODO: 这里是控制内容列表的样式 */
.processListBtns {
.el-button {
margin: 0 12px;
}
}
......
src/views/equipment/application.vue
View file @ 852e93e0
This diff is collapsed.
src/views/equipment/basicInfo.vue
View file @ 852e93e0
......@@ -34,7 +34,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<div style="float: right;padding:3px 15px;">
<el-button
......@@ -49,7 +49,7 @@
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备基本信息列表</div>
<el-table v-loading="loading" border :data="basicInfoList" @selection-change="handleSelectionChange" >
<el-table v-loading="loading" border :data="basicInfoList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn">
<template slot-scope="scope">
......@@ -73,7 +73,8 @@
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<template slot-scope="scope">
{{ scope.row.prank || '-' }}
<span v-if="scope.row.pissb === '0'">否</span>
<span v-else>是</span>
</template>
</el-table-column>
<el-table-column label="psm" prop="psm">
......@@ -86,9 +87,9 @@
{{ scope.row.prank || '-' }}
</template>
</el-table-column>
<el-table-column label="操作员" prop="createBy">
<el-table-column label="操作员" prop="createName">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
......@@ -123,7 +124,7 @@
/>
<!-- 添加或修改设备基本信息配置对话框 -->
<el-dialog title="设备基本信息" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" show-word-limit :maxlength="30" placeholder="请输入pn" />
......@@ -132,10 +133,10 @@
<el-input v-model.trim="form.ptype" show-word-limit :maxlength="30" placeholder="请输入ptype" />
</el-form-item>
<el-form-item label="pgx" prop="pgx">
<el-input-number v-model="form.pgx" style="width: 100%" controls-position="right" :min="0" placeholder="请输入pgx" />
<el-input v-model.trim="form.pgx" show-word-limit :maxlength="30" placeholder="请输入pgx" />
</el-form-item>
<el-form-item label="prank" prop="prank">
<el-input-number v-model="form.prank" style="width: 100%" controls-position="right" :min="0" placeholder="请输入prank" />
<el-input v-model.trim="form.prank" show-word-limit :maxlength="30" placeholder="请输入prank" />
</el-form-item>
<el-form-item label="pissb" prop="pissb">
<el-select
......@@ -154,10 +155,10 @@
</el-select>
</el-form-item>
<el-form-item label="psm" prop="psm">
<el-input-number v-model="form.psm" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psm" />
<el-input v-model.trim="form.psm" show-word-limit :maxlength="30" placeholder="请输入psm" />
</el-form-item>
<el-form-item label="psy" prop="psy">
<el-input-number v-model="form.psy" style="width: 100%" controls-position="right" :min="0" placeholder="请输入psy" />
<el-input v-model.trim="form.psy" show-word-limit :maxlength="30" placeholder="请输入psy" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -169,20 +170,8 @@
</template>
<script>
// import {
// addRole,
// changeRoleStatus,
// dataScope,
// delRole,
// exportRole,
// getRole,
// listBasicInfo,
// updateRole
// } from '@/api/equipment/basicInfo'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
import { listBasicInfo } from '@/api/equipment/basicInfo'
// import { getRolesByInsId } from '../../../api/businessManage/template'
import { add, listBasicInfo, updataInfo} from '@/api/equipment/basicInfo'
import { parseTime } from '@/utils'
export default {
name: 'Role',
data() {
......@@ -255,7 +244,8 @@ export default {
rows: 10,
pn: undefined,
ptype: undefined,
pgx: undefined
pgx: undefined,
delFlag: 0
},
// 表单参数
form: {},
......@@ -315,33 +305,13 @@ export default {
/** 查询基础信息列表 */
getList() {
this.loading = true
listBasicInfo(this.queryParams).then(
response => {
this.basicInfoList = response.rows
this.total = response.total
this.loading = false
}
)
},
/** 查询菜单树结构 */
getMenuTreeselect() {
menuTreeselect().then(response => {
this.menuOptions = response.data
})
},
/** 查询菜单列表 */
getMenuList(roleId) {
roleMenuTreeselectMC(roleId).then(response => {
this.menuList = this.handleTree(response.data.menus, 'businessId')
listBasicInfo(this.queryParams).then(res => {
res.rows.createDate = parseTime(res.rows.createDate,'{y}-{m}-{d}')
this.total = res.total
this.basicInfoList = res.rows
this.loading = false
})
},
/** 查询部门树结构 */
getDeptTreeselect() {
deptTreeselect().then(response => {
this.deptOptions = response.data
})
},
// 所有菜单节点数据
getMenuAllCheckedKeys() {
// 目前被选中的菜单节点
......@@ -376,24 +346,6 @@ export default {
return response
})
},
// 角色状态修改
handleStatusChange(row) {
const text = row.flag === '1' ? '启用' : '停用'
this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return changeRoleStatus(row.businessId, row.flag)
}).then(() => {
this.$message({
message: text + '成功',
type: 'success'
})
}).catch(function() {
row.flag = row.flag === '0' ? '1' : '0'
})
},
// 取消按钮
cancel() {
this.open = false
......@@ -478,10 +430,8 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.getMenuTreeselect()
this.open = true
this.title = '添加角色'
this.title = '添加设备基础信息表单'
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -502,23 +452,30 @@ export default {
},
/** 提交按钮 */
submitForm: function() {
this.$refs['form'].validate(valid => {
this.$refs.form.validate((valid) => {
if (valid) {
if (this.form.businessId !== undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys()
// eslint-disable-next-line no-undef
updateBasicInfo(this.form).then(response => {
this.msgSuccess('修改成功')
this.open = false
this.getList()
updataInfo(this.form).then(res => {
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
this.getList()
this.reFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
} else {
this.form.menuIds = this.getMenuAllCheckedKeys()
// eslint-disable-next-line no-undef
addBasicInfo(this.form).then(response => {
this.msgSuccess('新增成功')
this.open = false
this.getList()
add(this.form).then(res => {
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
this.getList()
this.reFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
}
}
......
src/views/equipment/check.vue
View file @ 852e93e0
......@@ -156,6 +156,7 @@
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
......@@ -171,25 +172,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
......@@ -208,9 +198,29 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="厚度：" prop="phd">
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div>
......@@ -339,7 +349,10 @@ export default {
roleName: undefined,
roleKey: undefined,
flag: undefined,
ptype: 1
ptype: 1,
pstatus:0,
delFlag:0
},
// 表单参数
form: {
......
src/views/equipment/checkProcess.vue
View file @ 852e93e0
......@@ -171,25 +171,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
......@@ -208,9 +197,29 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="厚度：" prop="phd">
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div>
......@@ -337,8 +346,9 @@ export default {
queryParams: {
page: 1,
rows: 10,
ptype: 2
ptype: 2,
pstatus:0,
delFlag:0
},
// 表单参数
form: {
......
src/views/equipment/draw.vue
View file @ 852e93e0
......@@ -12,9 +12,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="phd" prop="phd">
<el-form-item label="phd" prop="phdStr">
<el-input
v-model="queryParams.phd"
v-model="queryParams.phdStr"
placeholder="请输入phd"
clearable
size="small"
......@@ -22,9 +22,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="prank" prop="prank">
<el-form-item label="prank" prop="prankStr">
<el-input
v-model="queryParams.prank"
v-model="queryParams.prankStr"
placeholder="请输入prank"
clearable
size="small"
......@@ -34,7 +34,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<div class="placeholder" />
......@@ -64,17 +64,8 @@
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<template slot-scope="scope">
{{ scope.row.pissb || '-' }}
</template>
</el-table-column>
<el-table-column label="pstatus" prop="pstatus">
<template slot-scope="scope">
{{ scope.row.pstatus || '-' }}
</template>
</el-table-column>
<el-table-column label="ptype" prop="ptype">
<template slot-scope="scope">
{{ scope.row.ptype || '-' }}
<span v-if="scope.row.pissb === '0'">否</span>
<span v-else >是</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="pstatus">
......@@ -83,9 +74,9 @@
<span v-else style="color: green">已完成</span>
</template>
</el-table-column>
<el-table-column label="操作员" prop="createBy">
<el-table-column label="操作员" prop="createName">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
......@@ -100,7 +91,7 @@
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
>处理</el-button>
<el-button
size="mini"
type="text"
......@@ -254,7 +245,8 @@ export default {
pn: undefined,
lot: undefined,
plocation: undefined,
ptype: 1
ptype: 1,
delFlag: 0
},
// 表单参数
form: {},
......
src/views/equipment/equipmentAbandonment.vue
View file @ 852e93e0
......@@ -167,25 +167,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
......@@ -204,9 +193,29 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="厚度：" prop="phd">
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div>
......@@ -337,7 +346,9 @@ export default {
roleName: undefined,
roleKey: undefined,
flag: undefined,
ptype:2
ptype:2,
pstatus:0,
delFlag:0
},
// 表单参数
form: {
......
src/views/login/login.vue
View file @ 852e93e0
......@@ -20,20 +20,20 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="code">
<el-input
v-model="loginForm.code"
auto-complete="off"
placeholder="验证码"
style="width: 63%"
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
<!--<div class="login-code">
<img :src="codeUrl" @click="getCode">
</div>-->
</el-form-item>
<!-- <el-form-item prop="code">-->
<!-- <el-input-->
<!-- v-model="loginForm.code"-->
<!-- auto-complete="off"-->
<!-- placeholder="验证码"-->
<!-- style="width: 63%"-->
<!-- @keyup.enter.native="handleLogin"-->
<!-- >-->
<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
<!-- </el-input>-->
<!-- &lt;!&ndash;<div class="login-code">-->
<!-- <img :src="codeUrl" @click="getCode">-->
<!-- </div>&ndash;&gt;-->
<!-- </el-form-item>-->
<el-form-item style="width:80%;margin-bottom: 20px">
<el-button
class="blue-btn"
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ 852e93e0
......@@ -698,6 +698,7 @@ export default {
}
</script>
<style lang="scss" scoped>
/* TODO: 专门用来解决input 的边框问题 */
.aboutSingleDetails{
.el-form-item{
.el-input >>> .el-input__inner {
......
src/views/processManagement/draw.vue
View file @ 852e93e0
......@@ -34,7 +34,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<div class="placeholder" />
......@@ -64,17 +64,8 @@
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<template slot-scope="scope">
{{ scope.row.pissb || '-' }}
</template>
</el-table-column>
<el-table-column label="pstatus" prop="pstatus">
<template slot-scope="scope">
{{ scope.row.pstatus || '-' }}
</template>
</el-table-column>
<el-table-column label="ptype" prop="ptype">
<template slot-scope="scope">
{{ scope.row.ptype || '-' }}
<span v-if="scope.row.pissb === '0'">否</span>
<span v-else >是</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="pstatus">
......@@ -83,9 +74,9 @@
<span v-else style="color: green">已完成</span>
</template>
</el-table-column>
<el-table-column label="操作员" prop="createBy">
<el-table-column label="操作员" prop="createName">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
......@@ -100,7 +91,7 @@
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
>处理</el-button>
<el-button
size="mini"
type="text"
......@@ -254,7 +245,8 @@ export default {
pn: undefined,
lot: undefined,
plocation: undefined,
ptype: 2
ptype: 2,
delFlag: 0
},
// 表单参数
form: {},
......
src/views/sample/basicInformation/index.vue
View file @ 852e93e0
......@@ -87,9 +87,9 @@
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" prop="createDate" :show-overflow-tooltip="true">
<el-table-column label="操作日期" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ parseTime(scope.row.createDate,'{y}-{m}-{d}') || '-' }}
{{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
</template>
</el-table-column>
<el-table-column label="操作">
......@@ -226,7 +226,6 @@ export default {
})
} else {
add(this.form).then(res => {
console.log('res', res)
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
......@@ -239,7 +238,6 @@ export default {
}
} else {
// 校验失败，显示错误信息或进行其他操作
console.log('22222')
}
})
},
......@@ -248,7 +246,6 @@ export default {
this.reFrom()
},
handleDelete(row) {
console.log('row', row)
const id = row.businessId
this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定',
......@@ -266,10 +263,9 @@ export default {
},
// 编辑
handleUpdate(row) {
console.log('row', row)
this.title = '编辑基础信息表单'
const id = row.businessId
getDetailById(id).then(res => {
console.log('res', res)
this.form = res.data
this.open = true
})
......
src/views/system/dept/index.vue
View file @ 852e93e0
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" :inline="true">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
......@@ -22,109 +22,119 @@
</el-form-item>
<el-form-item>
<el-button
style="padding: 8px 7px;"
icon="el-icon-search"
class="filter-item"
type="primary"
size="small"
@click="getList"
>查询</el-button>
<el-button
class="filter-item"
type="primary"
size="small"
@click="handleAdd"
>新增</el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button
style="padding: 8px 7px;"
icon="el-icon-plus"
class="filter-item"
type="primary"
size="small"
@click="handleAdd"
>新增</el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
</el-form-item>
</div>
</el-form>
<el-table
v-loading="Loading"
:data="deptList"
row-key="businessId"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<!-- <el-table-column-->
<!-- label="序号"-->
<!-- type="index"-->
<!-- width="50">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="部门编号">-->
<!-- <template v-slot:default="scope">-->
<!-- {{ scope.row.businessId }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="deptName" label="部门名称" width="260" />
<el-table-column :show-overflow-tooltip="true" prop="orderNum" label="排序" width="200" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createDate" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:edit']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:add']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleAdd(scope.row)"-->
<!-- >新增</el-button>-->
<!-- <el-button-->
<!-- v-if="scope.row.parentId != 0"-->
<!-- v-hasPermi="['system:dept:remove']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
<div style="padding:5px 10px">
<el-table
v-loading="Loading"
:data="deptList"
row-key="businessId"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<!-- <el-table-column-->
<!-- label="序号"-->
<!-- type="index"-->
<!-- width="50">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="部门编号">-->
<!-- <template v-slot:default="scope">-->
<!-- {{ scope.row.businessId }}-->
<!-- </template>-->
<template slot-scope="scope">
<el-button
size="mini"
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <el-switch-->
<!-- v-model="scope.row.flag"-->
<!-- v-hasPermi="['system:dept:toggle']"-->
<!-- active-value="0"-->
<!-- inactive-value="1"-->
<!-- @change="handleStatusChange(scope.row)"-->
<!-- />-->
<el-button
size="mini"
type="text"
@click="handleAdd(scope.row)"
>新增</el-button>
<el-button
v-if="scope.row.parentId !== 0"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- </el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="deptName" label="部门名称" width="260" />
<el-table-column :show-overflow-tooltip="true" prop="orderNum" label="排序" width="200" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createDate" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:edit']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:add']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleAdd(scope.row)"-->
<!-- >新增</el-button>-->
<!-- <el-button-->
<!-- v-if="scope.row.parentId != 0"-->
<!-- v-hasPermi="['system:dept:remove']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<template slot-scope="scope">
<el-button
size="mini"
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <el-switch-->
<!-- v-model="scope.row.flag"-->
<!-- v-hasPermi="['system:dept:toggle']"-->
<!-- active-value="0"-->
<!-- inactive-value="1"-->
<!-- @change="handleStatusChange(scope.row)"-->
<!-- />-->
<el-button
size="mini"
type="text"
@click="handleAdd(scope.row)"
>新增</el-button>
<el-button
v-if="scope.row.parentId !== 0"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 添加或修改部门对话框 -->
<el-dialog title="部门信息" :visible.sync="open" width="600px" append-to-body>
......@@ -190,7 +200,7 @@
</template>
<script>
import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from '@/api/system/dept'
import { addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept } from '@/api/system/dept'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
......@@ -426,3 +436,31 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.app-container {
font-size: 18px;
padding: 0;
.placeholder {
height: 1.3vh;
background-color: #F4F4F4;
margin-bottom: 10px
}
.table-drop {
vertical-align: 2px;
line-height: 20px;
margin-left: 15px
}
.el-switch {
margin-left: 15px;
}
}
.el-divider--vertical{
height: 12em;
width: 4px;
}
</style>
src/views/system/role/index.vue
View file @ 852e93e0
......@@ -39,12 +39,14 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button
style="padding: 8px 7px;"
type="primary"
icon="el-icon-plus"
size="small"
@click="handleAdd"
>新增</el-button>
......
src/views/system/user/index.vue
View file @ 852e93e0
......@@ -40,7 +40,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item style="float: right">
<!-- <el-button-->
......
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