Skip to content

T
template_vue
Commit 99b5b95e authored by 刘宇扬's avatar 刘宇扬
Browse files
Options

设备领用申请3

parent 47c1be68
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 139 deletions
src/views/equipment/draw.vue
View file @ 99b5b95e
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
</el-form> </el-form>
<div class="placeholder" /> <div class="placeholder" />
<<<<<<< HEAD
<div style="padding:5px 10px"> <div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备领用列表</div> <div class="mb12 font-small-bold">设备领用列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
...@@ -104,53 +103,6 @@ ...@@ -104,53 +103,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
=======
<div style="padding:10px">
<div class="mb12 font-small-bold">设备可领用列表</div>
<template>
<div>
<el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" width="55" label="序号" align="center" />
<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="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">
<el-button
type="text"
size="small"
@click="handleDelete(scope.row.businessId)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<el-button
type="primary"
size="small"
:disabled="selection.length === 0"
@click="handleSubmit"
>提交</el-button>
</div>
</template>
>>>>>>> d9c9cd2dfbc570857f618b12c49edf61e0993800
</div> </div>
<pagination <pagination
v-show="total>0" v-show="total>0"
...@@ -219,7 +171,6 @@ export default { ...@@ -219,7 +171,6 @@ export default {
components: { Coolbutton }, components: { Coolbutton },
data() { data() {
return { return {
<<<<<<< HEAD
typeParent: 'text', typeParent: 'text',
typePrimary: 'primary', typePrimary: 'primary',
typeSuccess: 'success', typeSuccess: 'success',
...@@ -227,22 +178,6 @@ export default { ...@@ -227,22 +178,6 @@ export default {
resetName: '重置', resetName: '重置',
addName: '新增', addName: '新增',
application: '申请领用', application: '申请领用',
=======
loading: false,
list: [],
selection: [],
endDatePicker: this.handelFixDate(),
// 自定义按钮
deletetypePrimary: 'danger',
textPrimary: 'text',
deleteName: '删除',
deleteSize: 'mini',
deleteDisabled: 'multiple',
cleantypePrimary: 'danger',
cleanName: '清空',
cleanSize: 'small',
exporttypePrimary: 'success',
>>>>>>> d9c9cd2dfbc570857f618b12c49edf61e0993800
exportName: '导出', exportName: '导出',
updataName: '修改', updataName: '修改',
size: 'mini', size: 'mini',
...@@ -351,7 +286,6 @@ export default { ...@@ -351,7 +286,6 @@ export default {
deptOptions: [] deptOptions: []
} }
}, },
<<<<<<< HEAD
/** 路由离开前存储筛选条件*/ /** 路由离开前存储筛选条件*/
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
this.$store.dispatch('searchSave/searchParamsSet', { this.$store.dispatch('searchSave/searchParamsSet', {
...@@ -362,8 +296,6 @@ export default { ...@@ -362,8 +296,6 @@ export default {
}) })
next() next()
}, },
=======
>>>>>>> d9c9cd2dfbc570857f618b12c49edf61e0993800
created() { created() {
if (this.$store.getters.searchParams[this.$route.path]) { if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route const { searchParams } = this.$store.getters; const { path } = this.$route
...@@ -375,42 +307,6 @@ export default { ...@@ -375,42 +307,6 @@ export default {
// this.statusOptions = response.data; // this.statusOptions = response.data;
// }); // });
}, },
// 多选提交操作
methods: {
handleSelectionChange(selection) {
this.selectedRows = selection
},
submitSelectedRows() {
if (this.selectedRows.length === 0) {
return // 如果没有选中行，不进行提交操作
}
axios
.post('/api/submit', this.selectedRows) // 将选中的行数据提交到服务器的接口地址
.then(response => {
// 提交成功处理
console.log(response.data)
// 清空选中的行
this.selectedRows = []
})
.catch(error => {
// 提交失败处理
console.error(error)
})
}
},
/** 路由离开前存储筛选条件*/
beforeRouteLeave(to, from, next) {
this.$store.dispatch('searchSave/searchParamsSet', {
path: this.$route.path,
param: {
...this.queryParams
}
})
next()
},
methods: { methods: {
/** 查询角色列表 */ /** 查询角色列表 */
getList() { getList() {
......
src/views/equipment/management.vue
View file @ 99b5b95e
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备编码" prop="roleKey"> <el-form-item label="设备来源" prop="roleKey">
<el-input <el-input
v-model="queryParams.roleKey" v-model="queryParams.roleKey"
placeholder="请输入设备编码" placeholder="请输入设备来源"
clearable clearable
size="small" size="small"
style="width: 150px" style="width: 150px"
...@@ -27,11 +27,7 @@ ...@@ -27,11 +27,7 @@
</el-form-item> </el-form-item>
<div style="float: right"> <div style="float: right">
<el-form-item> <el-form-item>
<coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="addName" :size="smallSize" :icon="addIcon" :haspermi="addHaspermi" @btn-click="handleAdd" /> <coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="addName" :size="smallSize" :icon="addIcon" :haspermi="addHaspermi" @btn-click="handleAdd" /><coolbutton style="padding: 8px 7px;" :type="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" />
<<<<<<< HEAD
<coolbutton style="padding: 8px 7px;" :type="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" />
=======
>>>>>>> d9c9cd2dfbc570857f618b12c49edf61e0993800
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -39,32 +35,18 @@ ...@@ -39,32 +35,18 @@
<div style="padding:5px 10px"> <div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备管理列表</div> <div class="mb12 font-small-bold">设备管理列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true"> <el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.roleName || '-' }} {{ scope.row.roleName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="编码" prop="roleKey"> <el-table-column label="设备来源" prop="roleKey">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.roleKey || '-' }} {{ scope.row.roleKey || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="lot" prop="roleSort"> <el-table-column label="显示顺序" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column>
<el-table-column label="创建人" prop="roleSort">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.roleSort || '-' }} {{ scope.row.roleSort || '-' }}
</template> </template>
...@@ -112,22 +94,40 @@ ...@@ -112,22 +94,40 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="名称" prop="roleName"> <el-form-item label="名称" prop="roleName">
<el-input show-word-limit :maxlength="30" placeholder="请输入设备名称" /> <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
</el-form-item> </el-form-item>
<el-form-item label="编码" prop="roleKey"> <el-form-item label="设备来源" prop="roleKey">
<el-input show-word-limit :maxlength="30" placeholder="请输入设备编码" /> <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入设备来源" />
</el-form-item> </el-form-item>
<el-form-item label="lot" prop="roleSort"> <el-form-item label="排序" prop="roleSort">
<el-input-number style="width: 100%" controls-position="right" :min="0" /> <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
<el-form-item label="位置" prop="roleName"> <el-form-item label="状态">
<el-input show-word-limit :maxlength="30" placeholder="请输入设备位置" /> <!-- <el-radio-group v-model="form.flag">-->
<!-- <el-radio :label="1">启用</el-radio>-->
<!-- <el-radio :label="0">停用</el-radio>-->
<!-- </el-radio-group>-->
<el-radio v-model="form.flag" label="1">启用</el-radio>
<el-radio v-model="form.flag" label="0">停用</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="厚度" prop="roleName"> <el-form-item label="设备批次">
<el-input show-word-limit :maxlength="30" placeholder="请输入设备厚度" /> <!-- <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>
<el-form-item label="备注"> <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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -528,7 +528,7 @@ export default { ...@@ -528,7 +528,7 @@ export default {
if (valid) { if (valid) {
this.form.menuCheckStrictly = false this.form.menuCheckStrictly = false
if (this.form.businessId !== undefined) { if (this.form.businessId !== undefined) {
// this.form.menuIds = this.getMenuAllCheckedKeys() this.form.menuIds = this.getMenuAllCheckedKeys()
updateRole(this.form).then(response => { updateRole(this.form).then(response => {
this.msgSuccess('修改成功') this.msgSuccess('修改成功')
this.open = false this.open = false
......
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