Skip to content

T
template_vue
Commit 82b3a3ab authored by 刘宇扬's avatar 刘宇扬
Browse files
Options

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

parents 74a7b997 1d384521
Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 618 deletions
src/api/equipment/application.js 0 → 100644
View file @ 82b3a3ab
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/views/equipment/application.vue
View file @ 82b3a3ab
<template>
<div class="app-container">
<!-- TODO: 基础设备管理-->
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="申请状态" prop="state">
<el-select
v-model="queryParams.state"
placeholder="请选择状态"
clearable
size="small"
style="width: 150px"
@change="handleQuery"
>
<el-option label="所有" value="all" />
<el-option label="驳回" value="rejected" />
<el-option label="待审核" value="pending" />
<el-option label="通过" value="approved" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
</el-form>
<div class="placeholder" />
<!-- TODO: 中间的分隔符号 -->
<div style="padding:5px 10px">
<!-- TODO: 以下为基础设备管理列表 -->
<div class="mb12 font-small-bold">设备领用列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="设备名称" prop="deviceName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.deviceName || '-' }}
</template>
</el-table-column>
<el-table-column label="设备编码" prop="deviceId">
<template slot-scope="scope">
{{ scope.row.deviceId || '-' }}
</template>
</el-table-column>
<el-table-column label="申请人" prop="createBy">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="state">
<template slot-scope="scope">
<span :style="getFontColor(scope.row.state)">{{ scope.row.state || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="140px">
<template slot-scope="scope">
<el-button v-if="scope.row.state !== ' '" :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情
</el-button>
<!-- <el-button v-if="scope.row.state !== ' '" type="typeParent" :size="size" @click="handleUpdate(scope.row)">
{{ updataName }}
</el-button>
<el-button v-if="scope.row.state !== ' '" type="typeParent" :size="size" @click="handleDelete(scope.row)"
>删除</el-button> -->
</template>
</el-table-column>
</el-table>
</div>
<el-pagination
background
layout="prev, pager, next"
:total="1000"
/>
<!-- TODO: 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model.trim="form.deviceName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备编码" prop="deviceId">
<el-input v-model.trim="form.deviceId" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
</el-form-item>
<el-form-item label="LOT" prop="LOT">
<el-input v-model.trim="form.LOT" show-word-limit :maxlength="30" placeholder="请输入LOT" />
</el-form-item>
<el-form-item label="位置" prop="location">
<el-input v-model.trim="form.location" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
</el-form-item>
<el-form-item label="厚度" prop="ply">
<el-input v-model.trim="form.ply" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
</el-form-item>
<el-form-item label="操作员" prop="createBy">
<el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入创建人" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-form ref="form" :model="form" :rules="rule" label-width="80px">
<div class="info"><span class="title">设备申请</span></div>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 16%;">
<el-form-item label="pn" style="flex-basis: 50%;" prop="pn">
<el-input v-model="form.pn" placeholder="请输入pn" :style="{ width: '400px', height: '30px' }" :maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="phd" style="flex-basis: 50%;" prop="phd">
<el-input v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 16%;">
<el-form-item label="prank" style="flex-basis: 50%;" prop="prank">
<el-input v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="pgx" style="flex-basis: 50%;" prop="pgx">
<el-select
v-model="form.pgx"
clearable
placeholder="请选择pgx"
:style="{ width: '400px', height: '30px' }"
>
<el-option
v-for="(dict,index) in pissbList"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="padding-left: 15.1%;">
<el-form-item label="pissb" style="flex-basis: 50%;" prop="pissb">
<el-select
v-model="form.pissb"
clearable
placeholder="请选择pissb"
:style="{ width: '400px', height: '30px' }"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div class="button">
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</el-dialog>
<!-- TODO: 单项详情信息表单配置 -->
<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-form-item label="名称：" prop="deviceName">
<el-input v-model.trim="singleDetails.deviceName" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="设备编码：" prop="deviceId">
<el-input v-model.trim="singleDetails.deviceId" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="LOT: " prop="LOT">
<el-input v-model.trim="singleDetails.LOT" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="位置：" prop="location">
<el-input v-model.trim="singleDetails.location" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="位置：" prop="ply">
<el-input v-model.trim="singleDetails.ply" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="创建时间：" prop="createTime">
<el-input v-model.trim="singleDetails.createTime" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="创建人：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="状态" prop="state">
<el-input v-model.trim="singleDetails.state" :readonly="isReadOnly" />
</el-form-item>
<el-form-item>
<el-button type="success" @click="handleApprove">通过</el-button>
<el-button type="primary" @click="handleReject">驳回</el-button>
</el-form-item>
</el-form>
</el-dialog>
</el-form>
</div>
</template>
<script>
import { getDictData, addApplication } from '@/api/equipment/application'
export default {
name: 'Role',
data() {
return {
typeParent: 'text',
typePrimary: 'primary',
typeSuccess: 'success',
nameParent: '删除',
resetName: '重置',
addName: '新增',
application: '申请领用',
updataName: '修改',
size: 'mini',
smallSize: 'small',
delicon: 'el-icon-delete',
addIcon: 'el-icon-plus',
exportIcon: 'el-icon-download',
resetIcon: '',
// TODO: 控制只读
isReadOnly: true,
// 遮罩层
loading: true,
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总条数
total: 0,
// 角色表格数据
roleList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 是否显示弹出层（数据详情）
openDetails: false,
// 日期范围
// dateRange: [],
// 菜单表格数据
menuList: [],
menuExpand: false,
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceName: undefined,
deviceId: undefined,
LOT: undefined,
location: undefined,
ply: undefined,
state: undefined,
flag: undefined
},
defaultProps: {},
// TODO: 表单参数
form: {
deviceName: '',
deviceId: '',
LOT: '',
location: '',
ply: '',
state: '',
flag: '1',
remark: '',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
},
// TODO: 表单初始参数
formReset: {
deviceName: '',
deviceId: '',
LOT: '',
location: '',
ply: '',
state: '',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
pn: '',
phd: '',
prank: '',
pgx: '',
pissb: ''
},
// TODO: 表单里的单项详情参数
singleDetails: {
deviceName: '',
deviceId: '',
LOT: '',
location: '',
ply: '',
state: '',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
rule: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
phd: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
prank: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }]
},
// TODO: 模拟测试数据
simulateDeviceList: [{
deviceName: '设备1', deviceId: '0001', flag: 1, LOT: '0001', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '已驳回'
}, {
deviceName: '设备2', deviceId: '0002', flag: 2, LOT: '0002', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '已驳回'
}, {
deviceName: '设备3', deviceId: '0003', flag: 2, LOT: '0003', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '已驳回'
}, {
deviceName: '设备4', deviceId: '0004', flag: 2, LOT: '0004', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '已驳回'
}, {
deviceName: '设备5', deviceId: '0005', flag: 2, LOT: '0005', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
}, {
deviceName: '设备6', deviceId: '0006', flag: 2, LOT: '0006', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
}, {
deviceName: '设备7', deviceId: '0007', flag: 2, LOT: '0007', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
}, {
deviceName: '设备8', deviceId: '0008', flag: 2, LOT: '0008', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
}, {
deviceName: '设备9', deviceId: '0009', flag: 2, LOT: '0009', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '已通过'
}, {
deviceName: '设备10', deviceId: '00010', flag: 2, LOT: '0010', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '已通过'
}
],
// 表单校验
rules: {
deviceName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' }
],
deviceId: [
{ required: true, message: '请输入设备编码', trigger: 'blur' }
],
LOT: [
{ required: true, message: '请输入LOT', trigger: 'blur' }
],
createBy: [
{ required: true, message: '请输入申请人', trigger: 'blur' }
]
},
deptOptions: []
pissbList: [],
pgxList: [
{
label: '否',
value: '0'
},
{
label: '是',
value: '1'
}
]
}
},
/** 路由离开前存储筛选条件*/
beforeRouteLeave(to, from, next) {
this.$store.dispatch('searchSave/searchParamsSet', {
path: this.$route.path,
param: {
...this.queryParams
}
})
next()
},
created() {
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
}
this.getList()
this.init()
},
methods: {
getFontColor(state) {
if (state === '已驳回') {
return 'color: red;'
} else if (state === '待审核') {
return 'color: orange;'
} else if (state === '已通过') {
return 'color: green;'
} else {
return ''
}
},
/** 查询角色列表 */
getList() {
this.loading = true
this.roleList = this.simulateDeviceList
console.log(this.roleList)
this.loading = false
},
handleReject() {
this.$message({
message: '操作完成',
type: 'warning'
})
this.openDetails = false
this.reset()
},
handleApprove() {
this.$message({
message: '操作完成',
type: 'success'
})
this.openDetails = false
this.reset()
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
// TODO: 将模拟数据的空对象赋值给表单对象，达成清空填写表单的效果
// 重置
resetFrom() {
this.form = {
deviceName: '',
deviceId: '',
location: '',
ply: '',
state: '',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
pn: '',
phd: '',
prank: '',
pgx: '',
pissb: ''
}
this.$refs.form.clearValidate()
},
/** TODO: 查询按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** TODO: 重置按钮操作 */
resetQuery() {},
// 多选框选中数据
handleSelectionChange(selection) {},
/** TODO: 新增按钮操作 */
handleAdd() {
// TODO: 初始化新增对话框的状态
this.reset()
this.title = '申请领用设备'
this.open = !this.open
// 初始化要调的接口
init() {
this.getDict()
},
// TODO: 获取所选行详情信息操作
handleDetail(row) {
this.singleDetails = this.formReset
this.singleDetails = row
this.title = '详情信息'
this.openDetails = !this.openDetails
},
/** TODO: 修改按钮操作 */
handleUpdate(row) {
this.reset()
this.title = '修改申请'
const upddeviceName = row.deviceName
for (const pd of this.simulateDeviceList) {
if (pd.deviceName === upddeviceName) {
this.form = pd
}
}
this.open = true
},
/** TODO: 修改或增加list列表里的数据 */
submitForm: function() {
this.$refs['form'].validate(valid => {
// 提价时要调的接口
submitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
// TODO: 模拟测试数据的修改，可删除
for (const p of this.simulateDeviceList) {
if (p.deviceName === this.form.deviceName) {
this.simulateDeviceList = this.simulateDeviceList.map(obj =>
obj.deviceName === this.form.deviceName ? this.form : obj
)
this.msgSuccess('申请成功')
this.getList()
this.reset()
this.open = !this.open
return
} else {
this.simulateDeviceList.push(this.form)
this.msgSuccess('申请成功')
this.getList()
this.reset()
this.open = !this.open
return
addApplication(this.form).then(res => {
console.log('res', res)
if (res.code === 200) {
this.$message.success('操作成功')
this.resetFrom()
} else if (res.code === null) {
this.$message.success(res.message)
}
}
})
}
})
},
/** TODO: 关于模拟数据的 删除list数组所调用的删除方法,封装的函数如下 */
delDevice(delDeviceName) {
let tip = false
for (const pd0 of this.simulateDeviceList) {
console.log('This is pd0:', pd0)
if (pd0.deviceName === delDeviceName) {
this.simulateDeviceList = this.simulateDeviceList.filter(item => item.deviceName !== delDeviceName)
tip = true
break
}
// 调数据字典查询
getDict() {
const obj = {
key: 'GX_CODE'
}
return tip
},
/** TODO:删除按钮操作 */
handleDelete(row) {
this.$confirm('是否确认操作？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return this.delDevice(row.deviceName)
}).then(() => {
this.getList()
this.$message({
message: '删除成功',
type: 'success'
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
getDictData(obj).then(res => {
if (res.code === 200 && res.data !== null) {
this.pissbList = res.data
}
})
}
}
}
</script>
......@@ -465,37 +151,19 @@ export default {
font-size: 18px;
padding: 0;
.placeholder {
height: 1.3vh;
background-color: #F4F4F4;
margin-bottom: 10px
.info{
height: 100px;
display: flex;
align-items: center;
justify-content: center;
.title{
color: #333;
font-weight: 700;
}
}
.table-drop {
vertical-align: 2px;
line-height: 20px;
margin-left: 15px
}
.el-switch {
margin-left: 15px;
}
}
.el-divider--vertical{
height: 12em;
width: 4px;
}
.aboutSingleDetails{
.el-form-item{
.el-input >>> .el-input__inner {
-webkit-appearance: none;
background-color: #ffffff;
background-image: none;
border-radius: 4px;
border: 0;
width: 100%;
}
.button{
margin-top: 7%;
margin-left: 20%;
}
}
......
src/views/equipment/check.vue
View file @ 82b3a3ab
......@@ -349,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 @ 82b3a3ab
......@@ -346,8 +346,9 @@ export default {
queryParams: {
page: 1,
rows: 10,
ptype: 2
ptype: 2,
pstatus:0,
delFlag:0
},
// 表单参数
form: {
......
src/views/equipment/equipmentAbandonment.vue
View file @ 82b3a3ab
......@@ -346,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 @ 82b3a3ab
......@@ -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/inventoryRecord/index.vue
View file @ 82b3a3ab
......@@ -36,7 +36,6 @@
/>
</el-form-item>
<el-form-item label="库类型" prop="ptype">
<el-select
v-model="queryParams.ptype"
......@@ -114,7 +113,7 @@
<component
:is="BaseTable"
:key="queryParams.rows"
:nIndex="nIndex"
:n-index="nIndex"
:all-table-arguments="allTableArguments"
@handle-detail="handleDetail"
/>
......@@ -133,7 +132,7 @@
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row :gutter="10" justify="start" align="middle">
<el-col :span="8">
<el-col :span="12">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" />
</el-form-item>
......@@ -143,23 +142,36 @@
<el-form-item label="plocation：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="操作员：" prop="user">
<el-input v-model.trim="singleDetails.user" :readonly="isReadOnly" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="库类型：" prop="ptype">
<el-input v-model.trim="singleDetails.ptype" :readonly="isReadOnly" />
{{ selectedPtype(singleDetails.ptype) }}
</el-form-item>
<el-form-item label="库状态：" prop="poperate">
<el-input v-model.trim="singleDetails.poperate" :readonly="isReadOnly" />
{{ selectedPoperate(singleDetails.poperate) }}
</el-form-item>
<el-form-item label="fqYs：" prop="fqYs">
{{ singleDetails.fqYs }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="操作员：" prop="user">
<el-input v-model.trim="singleDetails.user" :readonly="isReadOnly" />
</el-col>
</el-row>
<el-row v-if=" singleDetails.poperate==='4' ">
<el-col :span="12">
<el-form-item label="创建人：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
</el-form-item>
</el-col>
</el-row>
......@@ -175,7 +187,7 @@ import { listLog } from '@/api/processLibrary/InventoryRecord'
import BaseTable from '@/components/Table/BaseTable/index.vue'
export default {
name: 'LoginInfo',
name: 'InventoryRecord',
components: [
BaseTable
],
......@@ -279,14 +291,7 @@ export default {
prop: 'ptype',
label: '库类型',
ownDefinedReturn: (row, $index) => {
switch (row.ptype) {
case '1':
return '设备库'
case '2':
return '工序库'
default:
return ''
}
return this.selectedPtype(row.ptype)
}
},
{
......@@ -295,18 +300,7 @@ export default {
label: '库状态',
width: '180px',
ownDefinedReturn: (row, $index) => {
switch (row.poperate) {
case '1':
return '入库'
case '2':
return '出库'
case '3':
return '修正'
case '4':
return '废弃'
default:
return ''
}
return this.selectedPoperate(row.poperate)
}
},
{
......@@ -348,7 +342,6 @@ export default {
]
},
title: '',
openDetails: false,
isReadOnly: true,
......@@ -373,7 +366,6 @@ export default {
BaseTable() {
return BaseTable
},
/* TODO:自定义分页索引，实现索引继承 */
nIndex(index) {
// TODO: 当前页数 - 1 * 每页数据条数 + 1
......@@ -381,7 +373,6 @@ export default {
const rows = this.queryParams.rows // TODO: 每页条数
return index + 1 + (page - 1) * rows
},
// TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
allTableArguments() {
return {
......@@ -419,6 +410,33 @@ export default {
this.loading = false
})
},
/* TODO: ptype 库类型判断的公用方法 */
selectedPtype(ptype) {
switch (ptype) {
case '1':
return '设备库'
case '2':
return '工序库'
default:
return ''
}
},
/* TODO: poperate的库状态判断的公用方法 */
selectedPoperate(poperate) {
switch (poperate) {
case '1':
return '入库'
case '2':
return '出库'
case '3':
return '修正'
case '4':
return '废弃'
default:
return ''
}
},
handleClose() {
this.clearVisible = false
this.exportVisible = false
......@@ -458,8 +476,6 @@ export default {
margin-bottom:10px
}
/*TODO: 这里是调整ToolBar的样式的噢！*/
.ToolBar{
.el-form{
......@@ -475,19 +491,21 @@ export default {
}
}
/* TODO: 专门用来解决el-input边框的问题 */
.aboutSingleDetails{
.el-form-item{
.el-input >>> .el-input__inner {
-webkit-appearance: none;
background-color: #FFF;
background-image: none;
border-radius: 4px;
border: 0;
width: 100%;
.el-form{
.el-form-item{
.el-input >>> .el-input__inner {
-webkit-appearance: none;
background-color: #FFF;
background-image: none;
border-radius: 4px;
border: 0;
width: 100%;
}
}
}
}
</style>
......
src/views/system/dept/index.vue
View file @ 82b3a3ab
<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 @ 82b3a3ab
......@@ -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 @ 82b3a3ab
......@@ -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