Skip to content

T
template_vue
Commit 6482517e authored by 吴志坤's avatar 吴志坤
Browse files
Options

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

parents 41bf994d e61b32f2
Show whitespace changes
Inline Side-by-side
Showing with 829 additions and 242 deletions
src/api/magnagement.js 0 → 100644
View file @ 6482517e
import request from '@/utils/request'
// 查询设备列表
export function listdevice(query) {
return request({
url: '/wbwarehouse/queryWbWarehouseByPagination',
method: 'get',
params: query
})
}
src/components/Table/AllTableArguments/BaseTableArguments.js
View file @ 6482517e
......@@ -80,9 +80,8 @@ export function BaseTableArguments(selection, loading, processList, queryParams,
this.processList = processList
}
// TODO: 组件表单所需的所有参数
export function BaseTableArgumentsTest(selection, loading, processList, queryParams, columnData) {
export function BaseTableArgumentsTest(nIndex, selection, loading, processList, queryParams, columnData) {
// TODO: 选择框是否需要存在 (selection判断表单选择框是否需要存在)
if (typeof selection !== 'boolean') {
console.warn('selection下拉框参数的type类型错误!请检查后重新赋值')
......@@ -109,8 +108,7 @@ export function BaseTableArgumentsTest(selection, loading, processList, queryPar
this.queryParams = queryParamsType
}
this.nIndex = nIndex
this.columnData = columnData
this.processList = processList
}
src/components/Table/BaseTable/index.vue
View file @ 6482517e
......@@ -52,6 +52,7 @@
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
<!-- TODO: 选择框是否开启，selectable控制是否单行禁用 -->
<el-table-column v-if="allTableArguments.columObj.selection" type="selection" :selectable="allTableArguments.columObj.selectable" width="50px" />
......@@ -77,6 +78,7 @@
<span v-if="column.status && row[column.prop]">{{ row[column.prop].msg }}</span>
<!-- 自定义内容 -->
<span v-if="column.ownDefined">{{ column.ownDefinedReturn(row,$index) }}</span>
<!-- TODO: 时间数据 -->
<span v-if="column.time">{{ row[column.prop] | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<!-- switch开关 -->
......
src/views/equipment/boundManagement.vue 0 → 100644
View file @ 6482517e
<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="roleName">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入设备名称"
clearable
:maxlength="30"
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备编码" prop="roleKey">
<el-input
v-model="queryParams.deviceId"
placeholder="请输入设备编码"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="handleAdd">
{{ application }}
</el-button>
</el-form-item>
</div>
</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="LOT" prop="LOT">
<template slot-scope="scope">
{{ scope.row.deviceId || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="location">
<template slot-scope="scope">
{{ scope.row.location || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="ply">
<template slot-scope="scope">
{{ scope.row.ply || '-' }}
</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>
</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>
</el-dialog>
</div>
</template>
<script>
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: ''
},
// TODO: 表单里的单项详情参数
singleDetails: {
deviceName: '',
deviceId: '',
LOT: '',
location: '',
ply: '',
state: '',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
},
// 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: []
}
},
/** 路由离开前存储筛选条件*/
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()
},
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
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
// TODO: 将模拟数据的空对象赋值给表单对象，达成清空填写表单的效果
this.form = {
deviceName: '',
deviceId: '',
location: '',
ply: '',
state: '',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
}
},
/** TODO: 查询按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** TODO: 重置按钮操作 */
resetQuery() {},
// 多选框选中数据
handleSelectionChange(selection) {},
/** TODO: 新增按钮操作 */
handleAdd() {
// TODO: 初始化新增对话框的状态
this.reset()
this.title = '申请领用设备'
this.open = !this.open
},
// 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 => {
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 {
if (this.form !== undefined && this.form !== null) {
this.simulateDeviceList.push(this.form)
this.msgSuccess('申请成功')
this.getList()
this.reset()
this.open = !this.open
return
}
}
}
}
})
},
/** 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
}
}
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: '已取消删除'
})
})
}
}
}
</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;
}
.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%;
}
}
}
</style>
src/views/equipment/boundinout.vue
View file @ 6482517e
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="68px">
<!-- <el-form-item label="登录地址" prop="ipaddr">-->
<!-- <el-input-->
<!-- v-model="queryParams.ipaddr"-->
<!-- placeholder="请输入登录地址"-->
<!-- clearable-->
<!-- :maxlength="30"-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="设备名称" prop="userName">
<el-input
v-model="queryParams.username"
......@@ -22,180 +13,77 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="登录状态" prop="status">-->
<!-- <el-select-->
<!-- v-model="queryParams.status"-->
<!-- placeholder="请选择登录状态"-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 240px"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in statusOptions"-->
<!-- :key="dict.dictValue"-->
<!-- :label="dict.dictLabel"-->
<!-- :value="dict.dictValue"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="登录时间">
<el-date-picker
v-model="queryParams.loginTime"
type="month"
<el-form-item label="Pn" prop="userName">
<el-input
v-model="queryParams.username"
placeholder="Pn"
clearable
:maxlength="30"
style="width: 240px;"
size="small"
style="width: 170px"
value-format="yyyy-MM"
placeholder="请选择月份"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</el-form-item>
<el-form-item label="编码" prop="userName">
<el-input
v-model="queryParams.username"
placeholder="请输入编码"
clearable
:maxlength="30"
style="width: 240px;"
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备名称" prop="userName">
<el-input
v-model="queryParams.username"
placeholder="请输入设备名称"
clearable
:maxlength="30"
style="width: 240px;"
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<!-- v-hasPermi="['zt:loginlog:delete']"-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- size="small"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- >删除</el-button>-->
<!-- <coolbutton :type="deletetypePrimary" :name="deleteName" :size="deleteSize" :disabled="multiple" @btn-click="handleDelete" />-->
<!-- v-hasPermi="['zt:loginlog:clear']"-->
<!-- <el-button
type="danger"
size="small"
:icon="delIcon"
@click="handleClean"
>清空</el-button> -->
<!-- <coolbutton :type="cleantypePrimary" :name="cleanName" :haspermi="clearHaspermi" :icon="delIcon" :size="cleanSize" @btn-click="handleClean" />-->
<!-- v-hasPermi="['zt:loginlog:export']"-->
<el-button
type="success"
size="small"
icon="el-icon-download"
@click="handleExport"
>盘点</el-button>
<!-- <coolbutton :type="exporttypePrimary" :name="exportName" :icon="exportIcon" :size="exportSize" @btn-click="handleExport" />-->
<!-- <el-button size="mini" @click="resetQuery">重置</el-button>-->
<el-button
type="success"
size="small"
icon="el-icon-download"
@click="handleExport"
>导出</el-button>
</el-form-item>
</div>
</el-form>
<div class="placeholder" />
<div style="padding:10px">
<div class="mb12 font-small-bold">log列表</div>
<!-- <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange"> -->
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- &lt;!&ndash; <el-table-column type="index" label="序号" width="50" />&ndash;&gt;-->
<!-- <el-table-column label="访问编号" width="100" align="center" prop="infoId" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.infoId || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.userName || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="登录地址" align="center" prop="ipaddr" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.ipaddr || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作信息" align="center" prop="msg" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.msg || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />&ndash;&gt;-->
<!-- <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
<!-- &lt;!&ndash; <el-table-column label="浏览器" align="center" prop="browser" show-overflow-tooltip>&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; {{ scope.row.browser || '-' }}&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip>&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; {{ scope.row.os || '-' }}&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
<!-- <el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="访问编号" align="center" prop="businessId" />-->
<!-- <el-table-column label="设备名称" align="center" prop="username" />
<el-table-column label="XXXX" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="XXXX" align="center" prop="loginLocation" :show-overflow-tooltip="true" /> -->
<!-- <el-table-column label="浏览器" align="center" prop="browser" />
<el-table-column label="操作系统" align="center" prop="os" />-->
<!-- <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
<!-- <el-table-column label="XXXX" align="center" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === '0'">失败</span>
<span v-if="scope.row.status === '1'">成功</span>
</template>
</el-table-column>
<el-table-column label="提示信息" align="center">
<template slot-scope="scope">
{{ scope.row.msg || '-' }}
</template>
</el-table-column>
<el-table-column label="时间" align="center" prop="loginTime" width="180" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) | transformDateByFormat('YYYY-MM-DD HH:mm:ss') }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<coolbutton :type="textPrimary" :name="deleteName" :size="deleteSize" @btn-click="handleDelete(scope.row.businessId)" />
<el-button
type="text"
size="small"
@click="handleDelete(scope.row.businessId)"
>删除</el-button>
</template>
</el-table-column> -->
<!-- </el-table> -->
<el-table v-loading="loading" border :data="processList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="工序名称" prop="processCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.remarks || '-' }}
</template>
</el-table-column>
<el-table-column label="编码" prop="lot">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="location">
<template slot-scope="scope">
{{ scope.row.updateBy || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="location">
<template slot-scope="scope">
{{ scope.row.delFlag || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="thickness">
<template slot-scope="scope">
{{ scope.row.flag|| '-' }}
</template>
</el-table-column>
<el-table-column label="创建人" prop="createBy">
<template slot-scope="scope">
{{ scope.row.businessId || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ scope.row.ptype }}</span>
</template>
</el-table-column>
</el-table>
</div>
<transition name="fade-transform" mode="out-in">
<component
:is="BaseTable"
:key="queryParams.pageNum"
:all-table-arguments="allTableArguments"
@handle-detail="handleDetail"
@handle-update="handleUpdate"
@handle-delete="handleDelete"
/>
</transition>
<pagination
v-show="total>0"
:total="total"
......@@ -203,6 +91,7 @@
:limit.sync="queryParams.rows"
@pagination="getList"
/>
<!-- 清空弹窗-->
<el-dialog
title="选择清空月份"
......@@ -259,11 +148,14 @@
</template>
<script>
import {cleanLogininfo, delLogininfo, exportLogininfo} from '@/api/monitor/loginInfo'
import {listLog} from '@/api/processLibrary/InventoryRecord'
import BaseTable from '@/components/Table/BaseTable/index.vue'
export default {
name: 'LoginInfo',
components: [
BaseTable
],
data() {
return {
processList: [],
......@@ -329,6 +221,140 @@ export default {
username: undefined,
status: undefined,
loginTime: ''
},
// TODO: 用来说明每一列的类型
columObj: {
// 选择框
selection: false,
// 选择框根据条件是否可选
selectable: (row, index) => {
if (row.switchs) {
return true
}
},
lazy: 'true',
// column列,columType(列类型,可选text(默认为普通文字模式),input(input可编辑框),switch(switch开关),image(图片),operation(操作按钮))
// prop(参数),label(列名),width(宽度),align(对齐方式),sortable(是否支持排序)
columnData: [{
ownDefined: true,
prop: 'ptype',
label: '库类型',
ownDefinedReturn: (row, $index) => {
switch (row.poperate) {
case '1':
return '设备库'
case '2':
return '工序库'
default:
return ''
}
}
},
{
ownDefined: true,
prop: 'poperate',
label: 'poperate',
width: '',
ownDefinedReturn: (row, $index) => {
switch (row.poperate) {
case '1':
return '入库'
case '2':
return '出库'
case '3':
return '修正'
case '4':
return '废弃'
default:
return ''
}
}
},
{
text: true,
prop: 'pn',
label: 'pn'
},
{
time: true,
prop: 'updateDate',
label: '操作时间',
align: 'center'
},
{
text: true,
prop: 'createBy',
label: '操作人',
sortable: false,
width: '210px'
},
// 如果为操作列,则需要填写需要的操作按钮,类型为Object。operation(操作类型,可选edit,delete,see),type(按钮样式,参考el—botton类型),label(按钮文字)icon(参考el-icon),color(字体颜色)
{
isOperation: true,
label: '操作',
width: '180px',
align: 'center',
sortable: false,
operation: [{
type: this.typeParent,
label: '详情',
icon: '',
color: '',
size: this.size,
buttonClick: this.handleDetail,
isShow: (row, $index) => {
return true
}
}, {
type: this.typeParent,
label: '修改',
icon: '',
color: '',
size: this.size,
buttonClick: this.handleUpdate,
isShow: (row, $index) => {
return true
}
}, {
type: this.typeParent,
label: '删除',
icon: '',
color: '',
size: this.size,
buttonClick: this.handleDelete,
isShow: (row, $index) => {
return true
}
}]
}
]
}
}
},
computed: {
BaseTable() {
return BaseTable
},
// TODO:自定义分页索引，实现索引继承
nIndex(index) {
// TODO: 当前页数 - 1 * 每页数据条数 + 1
const page = this.queryParams.pageNum // TODO: 当前页码
const pageSize = this.queryParams.pageSize // TODO: 每页条数
return index + 1 + (page - 1) * pageSize
},
// TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
allTableArguments() {
return {
listName: '出入库记录列表',
nIndex: this.nIndex,
loading: this.loading,
processList: this.processList,
queryParams: this.queryParams,
columObj: this.columObj
}
}
},
......@@ -350,11 +376,9 @@ export default {
}
// this.queryParams.loginTime = this.$parseDate(new Date(), 'YYYY-MM-DD HH:mm:ss')
this.getList()
// this.getDicts(dictCons['COMMON_STATUS']).then(response => {
// this.statusOptions = response.data
// })
},
methods: {
// 清空和导出弹出框的日期选择器禁用当前月份之后的月份
handelFixDate() {
return {
......
src/views/equipment/check.vue
View file @ 6482517e
......@@ -178,7 +178,6 @@ import {
delRole,
exportRole,
getRole,
listRole,
updateRole
} from '@/api/system/role'
import {listCheck} from '@/api/equipment/check'
......
src/views/equipment/draw.vue
View file @ 6482517e
......@@ -29,7 +29,7 @@
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @btn-click="handleAdd">
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="handleAdd">
{{ application }}
</el-button>
</el-form-item>
......
src/views/equipment/management.vue
View file @ 6482517e
......@@ -35,22 +35,15 @@
<el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" :haspermi="addHaspermi" @click="handleAdd">
{{ addName }}
</el-button>
</el-form-item>
</div>
</el-form>
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备管理列表</div>
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="编码" prop="equipmentCode" width="120">
<el-table-column label="编码" prop="pn" width="120">
<template slot-scope="scope">
{{ scope.row.equipmentCode || '-' }}
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" width="120">
......@@ -58,9 +51,9 @@
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="location">
<el-table-column label="位置" prop="plocation">
<template slot-scope="scope">
{{ scope.row.location || '-' }}
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="thickness">
......@@ -68,14 +61,14 @@
{{ scope.row.thickness || '-' }}
</template>
</el-table-column>
<el-table-column label="操作员" prop="createBy">
<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">
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
......@@ -83,40 +76,54 @@
<el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情
</el-button>
<el-button
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.page"
:limit.sync="queryParams.rows"
@pagination="getList"
/>
<!-- 添加或修改设备配置对话框 -->
<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="roleKey">
<el-input show-word-limit :maxlength="30" placeholder="请输入设备编码" />
<el-form-item label="名称" prop="roleName">
<el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="lot" prop="roleSort">
<el-input-number style="width: 100%" controls-position="right" :min="0" />
<el-form-item label="设备来源" prop="roleKey">
<el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入设备来源" />
</el-form-item>
<el-form-item label="位置" prop="roleName">
<el-input show-word-limit :maxlength="30" placeholder="请输入设备位置" />
<el-form-item label="排序" prop="roleSort">
<el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="厚度" prop="roleName">
<el-input show-word-limit :maxlength="30" placeholder="请输入设备厚度" />
<el-form-item label="设备批次">
<!-- <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>-->
<!-- <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>-->
<!-- <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>-->
<el-tree
ref="menu"
class="tree-border"
:data="menuOptions"
show-checkbox
node-key="id"
check-strictly
empty-text="加载中，请稍后"
:props="defaultProps"
@check-change="handleMenuCheckChange"
/>
</el-form-item>
<el-form-item label="备注">
<el-input maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
<el-input
v-model.trim="form.remark"
maxlength="200"
show-word-limit
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -127,20 +134,20 @@
<!-- 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="processName">
<el-input v-model.trim="singleDetails.equipmentCode" :readonly="true" />
<el-form-item label="编码：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
<el-form-item label="lot：" prop="workshop">
<el-input v-model.trim="singleDetails.lot" :readonly="true" />
</el-form-item>
<el-form-item label="位置：" prop="location">
<el-input v-model.trim="singleDetails.location" :readonly="true" />
<el-form-item label="位置：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="true" />
</el-form-item>
<el-form-item label="厚度：" prop="thickness">
<el-input v-model.trim="singleDetails.thickness" :readonly="true" />
</el-form-item>
<el-form-item label="操作时间：" prop="createTime">
{{ singleDetails.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
<el-form-item label="操作员：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="true" />
......@@ -151,9 +158,18 @@
</template>
<script>
import {addRole, changeRoleStatus, dataScope, delRole, exportRole, getRole, updateRole} from '@/api/system/role'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
import {
addRole,
changeRoleStatus,
dataScope,
delRole,
exportRole,
getRole,
updateRole
} from '@/api/system/role'
import { listdevice } from '@/api/magnagement'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default {
name: 'Role',
......@@ -171,14 +187,15 @@ export default {
},
// 是否显示弹出层（数据详情）
openDetails: false,
// TODO: 模拟测试数据
equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
// // TODO: 模拟测试数据
// equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
// check: '开始盘点',
typeParent: 'text',
typePrimary: 'primary',
typeSuccess: 'success',
nameParent: '删除',
resetName: '重置',
addName: '入库',
addName: '新增',
exportName: '导出',
updataName: '修改',
size: 'mini',
......@@ -258,11 +275,12 @@ export default {
tOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
page: 1,
rows: 10,
roleName: undefined,
roleKey: undefined,
flag: undefined
flag: undefined,
ptype: 1
},
// 表单参数
form: {
......@@ -275,16 +293,17 @@ export default {
// 表单校验
rules: {
roleName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' }
{ required: true, message: '请输入角色名称', trigger: 'blur' }
],
roleKey: [
{ required: true, message: '请输入设备来源', trigger: 'blur' }
{ required: true, message: '请输入权限字符', trigger: 'blur' }
],
roleSort: [
{ required: true, message: '请输入设备排序', trigger: 'blur' }
{ required: true, message: '请输入角色排序', trigger: 'blur' }
]
},
deptOptions: []
deptOptions: [],
formData: {}
}
},
/** 路由离开前存储筛选条件*/
......@@ -316,10 +335,27 @@ export default {
this.title = '详情信息'
this.openDetails = !this.openDetails
},
handelTab(i, e) {
const that = this
if (!that.$refs['input' + i]) {
return
}
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
},
/** 查询角色列表 */
getList() {
this.loading = true
listdevice(this.queryParams).then(
response => {
this.equipmentList = response.rows
this.total = response.total
this.loading = false
}
)
},
/** 查询菜单树结构 */
getMenuTreeselect() {
......@@ -452,7 +488,7 @@ export default {
},
/** 查询按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.queryParams.page = 1
this.getList()
},
/** 重置按钮操作 */
......@@ -502,7 +538,7 @@ export default {
this.reset()
this.getMenuTreeselect()
this.open = true
this.title = '设备入库'
this.title = '添加角色'
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -518,7 +554,7 @@ export default {
this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
})
})
this.title = '修改设备'
this.title = '修改角色'
})
},
/** 分配数据权限操作 选择菜单 */
......@@ -553,7 +589,7 @@ export default {
if (valid) {
this.form.menuCheckStrictly = false
if (this.form.businessId !== undefined) {
// this.form.menuIds = this.getMenuAllCheckedKeys()
this.form.menuIds = this.getMenuAllCheckedKeys()
updateRole(this.form).then(response => {
this.msgSuccess('修改成功')
this.open = false
......@@ -657,7 +693,8 @@ export default {
margin-left: 15px;
}
}
.el-divider--vertical{
.el-divider--vertical {
height: 12em;
width: 4px;
}
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ 6482517e
......@@ -390,15 +390,15 @@ export default {
this.open = !this.open
},
// TODO: 获取所选行详情信息操作
handleDetail(row) {
handleDetail(row, $index) {
this.singleDetails = this.formReset
this.singleDetails = row
this.title = '详情信息'
this.openDetails = !this.openDetails
},
/** TODO: 修改按钮操作 */
handleUpdate(row) {
this.reset()
handleUpdate(row, $index) {
this.form = { ...this.formReset }
this.title = '修改工序'
const updProcessName = row.processName
for (const pd of this.simulateProcessList) {
......@@ -449,7 +449,7 @@ export default {
return tip
},
/** TODO:删除按钮操作 */
handleDelete(row) {
handleDelete(row, $index) {
this.$confirm('是否确认操作？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......
src/views/system/role/index.vue
View file @ 6482517e
......@@ -267,8 +267,8 @@ import {
listRole,
updateRole
} from '@/api/system/role'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default {
name: 'Role',
......
vue.config.js
View file @ 6482517e
......@@ -79,11 +79,10 @@ module.exports = {
// }
// },
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.1.29:8088/`,
target: `http://localhost:8088/`,
// target: `http://10.5.87.231:10010/internal`,
// target: `http://117.122.212.91:32012/`,
// target: `http://192.144.239.97:20070/`,
target: `http://127.0.0.1:8088/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
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