Commit b2a938ab authored by kzy's avatar kzy

工艺

parent 2e6d06f9
...@@ -46,7 +46,7 @@ export function deleteMes(id) { ...@@ -46,7 +46,7 @@ export function deleteMes(id) {
export function deleteBatch(ids) { export function deleteBatch(ids) {
return request({ return request({
url: `/authority/messages/${ids}`, url: `/authority/messages/${ids}`,
method: 'delete', method: 'delete'
}) })
} }
......
...@@ -28,7 +28,7 @@ export function cleanLogininfo(query) { ...@@ -28,7 +28,7 @@ export function cleanLogininfo(query) {
return request({ return request({
url: '/monitor/loginInfo/clean', url: '/monitor/loginInfo/clean',
method: 'delete', method: 'delete',
params: query, params: query
}) })
} }
......
...@@ -89,7 +89,7 @@ export function updateMenu(data) { ...@@ -89,7 +89,7 @@ export function updateMenu(data) {
const businessId = data.businessId const businessId = data.businessId
data = Qs.stringify(data) data = Qs.stringify(data)
return request({ return request({
url: '/system/menu/update/'+ businessId, url: '/system/menu/update/' + businessId,
method: 'put', method: 'put',
data, data,
headers: { headers: {
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<i slot="suffix" class="el-icon-search el-input__icon" /> <i slot="suffix" class="el-icon-search el-input__icon" />
</el-input> </el-input>
<div class="icon-list"> <div class="icon-list">
<div class="icon__single" v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)"> <div v-for="(item, index) in iconList" :key="index" class="icon__single" @click="selectedIcon(item)">
<svg-icon :icon-class="item" style="height: 30px;width: 16px;display: block;margin-right: 5px" /> <svg-icon :icon-class="item" style="height: 30px;width: 16px;display: block;margin-right: 5px" />
<div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{item}}</div> <div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{ item }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -23,6 +23,8 @@ export default { ...@@ -23,6 +23,8 @@ export default {
iconList: icons iconList: icons
} }
}, },
mounted() {
},
methods: { methods: {
filterIcons() { filterIcons() {
this.iconList = icons this.iconList = icons
...@@ -38,8 +40,6 @@ export default { ...@@ -38,8 +40,6 @@ export default {
this.name = '' this.name = ''
this.iconList = icons this.iconList = icons
} }
},
mounted() {
} }
} }
</script> </script>
......
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
case 'getDepts': case 'getDepts':
return { value: 'id', label: 'label', emitPath: false } return { value: 'id', label: 'label', emitPath: false }
default: default:
return {emitPath: false} return { emitPath: false }
} }
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<Header /> <Header />
</div> </div>
<div class="nav-container-two"> <div class="nav-container-two">
<div class="placeholder"></div> <div class="placeholder" />
<tags-view /> <tags-view />
<navbar /> <navbar />
</div> </div>
......
This diff is collapsed.
...@@ -216,14 +216,14 @@ ...@@ -216,14 +216,14 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { list, delLogininfo, cleanLogininfo, exportLogininfo } from '@/api/monitor/loginInfo' import { list, delLogininfo, cleanLogininfo, exportLogininfo } from '@/api/monitor/loginInfo'
import dictCons from '@/utils/dictCons' import dictCons from '@/utils/dictCons'
import Template from '@/views/instance/Template' import Template from '@/views/instance/Template'
import Coolbutton from '@/components/coolbutton' import Coolbutton from '@/components/coolbutton'
export default { export default {
name: 'LoginInfo', name: 'LoginInfo',
components: { Template, Coolbutton }, components: { Template, Coolbutton },
data() { data() {
...@@ -447,8 +447,8 @@ ...@@ -447,8 +447,8 @@
// }).catch(function() {}) // }).catch(function() {})
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.app-container { .app-container {
padding: 0; padding: 0;
...@@ -461,4 +461,3 @@ ...@@ -461,4 +461,3 @@
} }
</style> </style>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -216,14 +216,14 @@ ...@@ -216,14 +216,14 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { list, delLogininfo, cleanLogininfo, exportLogininfo } from '@/api/monitor/loginInfo' import { list, delLogininfo, cleanLogininfo, exportLogininfo } from '@/api/monitor/loginInfo'
import dictCons from '@/utils/dictCons' import dictCons from '@/utils/dictCons'
import Template from '@/views/instance/Template' import Template from '@/views/instance/Template'
import Coolbutton from '@/components/coolbutton' import Coolbutton from '@/components/coolbutton'
export default { export default {
name: 'LoginInfo', name: 'LoginInfo',
components: { Template, Coolbutton }, components: { Template, Coolbutton },
data() { data() {
...@@ -447,8 +447,8 @@ ...@@ -447,8 +447,8 @@
// }).catch(function() {}) // }).catch(function() {})
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.app-container { .app-container {
padding: 0; padding: 0;
...@@ -461,4 +461,3 @@ ...@@ -461,4 +461,3 @@
} }
</style> </style>
\ No newline at end of file
...@@ -22,31 +22,12 @@ ...@@ -22,31 +22,12 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="flag">
<el-select
v-model="queryParams.flag"
placeholder="请选择设备状态"
clearable
size="small"
style="width: 150px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</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="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" />
<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" />
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -70,16 +51,6 @@ ...@@ -70,16 +51,6 @@
{{ scope.row.roleSort || '-' }} {{ scope.row.roleSort || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<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 label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime"> <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
...@@ -164,8 +135,6 @@ ...@@ -164,8 +135,6 @@
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -508,7 +477,7 @@ export default { ...@@ -508,7 +477,7 @@ export default {
this.reset() this.reset()
this.getMenuTreeselect() this.getMenuTreeselect()
this.open = true this.open = true
this.title = '添加角色' this.title = '添加设备'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -524,7 +493,7 @@ export default { ...@@ -524,7 +493,7 @@ export default {
this.$refs.menu.setCheckedKeys(res.data.checkedKeys) this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
}) })
}) })
this.title = '修改角色' this.title = '修改设备'
}) })
}, },
/** 分配数据权限操作 选择菜单 */ /** 分配数据权限操作 选择菜单 */
......
...@@ -2,29 +2,38 @@ ...@@ -2,29 +2,38 @@
<div class="app-container"> <div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="设备名称" prop="roleName"> <el-form-item label="设备名称" prop="roleName">
<el-input v-model="queryParams.roleName" placeholder="请输入设备名称" clearable :maxlength="30" size="small" <el-input
style="width: 150px" @keyup.enter.native="handleQuery" /> v-model="queryParams.roleName"
placeholder="请输入设备名称"
clearable
:maxlength="30"
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="设备来源" prop="roleKey"> <el-form-item label="设备编码" prop="roleKey">
<el-input v-model="queryParams.roleKey" placeholder="请输入设备来源" clearable size="small" style="width: 150px" <el-input
@keyup.enter.native="handleQuery" /> v-model="queryParams.roleKey"
</el-form-item> placeholder="请输入设备编码"
<el-form-item label="设备状态" prop="flag"> clearable
<el-select v-model="queryParams.flag" placeholder="请选择设备状态" clearable size="small" style="width: 150px"> size="small"
<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" style="width: 150px"
:value="dict.dictValue" /> @keyup.enter.native="handleQuery"
</el-select> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item> </el-form-item>
<div style="float: right"> <div style="float: right">
<el-form-item> <el-form-item>
<coolbutton
<coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="check" :size="smallSize" style="padding: 8px 7px;"
:icon="addIcon" /> :type="typePrimary"
<coolbutton style="padding: 8px 7px;" :type="typeSuccess" :name="exportName" :size="smallSize" :name="check"
:icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" /> :size="smallSize"
:icon="addIcon"
/>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -32,26 +41,34 @@ ...@@ -32,26 +41,34 @@
<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="显示顺序" prop="roleSort"> <el-table-column label="lot" 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>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" width="100"> <el-table-column label="创建人" prop="roleSort">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.flag" active-value="1" inactive-value="0" {{ scope.row.roleSort || '-' }}
@change="handleStatusChange(scope.row)" />
</template> </template>
</el-table-column> </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="createTime">
...@@ -62,8 +79,13 @@ ...@@ -62,8 +79,13 @@
</el-table> </el-table>
</div> </div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination
@pagination="getList" /> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改设备配置对话框 --> <!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
...@@ -77,24 +99,30 @@ ...@@ -77,24 +99,30 @@
<el-form-item label="排序" prop="roleSort"> <el-form-item label="排序" prop="roleSort">
<el-input-number v-model="form.roleSort" 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="状态">
<!-- <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 label="设备批次"> <el-form-item label="设备批次">
<!-- <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>--> <!-- <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="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>-->
<!-- <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($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 <el-tree
empty-text="加载中,请稍后" :props="defaultProps" @check-change="handleMenuCheckChange" /> 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 v-model.trim="form.remark" maxlength="200" show-word-limit type="textarea" <el-input
placeholder="请输入内容" /> 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">
...@@ -102,8 +130,6 @@ ...@@ -102,8 +130,6 @@
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -230,7 +256,8 @@ export default { ...@@ -230,7 +256,8 @@ export default {
{ required: true, message: '请输入角色排序', trigger: 'blur' } { required: true, message: '请输入角色排序', trigger: 'blur' }
] ]
}, },
deptOptions: [] deptOptions: [],
formData: {}
} }
}, },
/** 路由离开前存储筛选条件*/ /** 路由离开前存储筛选条件*/
...@@ -255,6 +282,17 @@ export default { ...@@ -255,6 +282,17 @@ export default {
// }); // });
}, },
methods: { methods: {
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() { getList() {
this.loading = true this.loading = true
...@@ -349,14 +387,14 @@ export default { ...@@ -349,14 +387,14 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function () { }).then(function() {
return changeRoleStatus(row.businessId, row.flag) return changeRoleStatus(row.businessId, row.flag)
}).then(() => { }).then(() => {
this.$message({ this.$message({
message: text + '成功', message: text + '成功',
type: 'success' type: 'success'
}) })
}).catch(function () { }).catch(function() {
row.flag = row.flag === '0' ? '1' : '0' row.flag = row.flag === '0' ? '1' : '0'
}) })
}, },
...@@ -493,7 +531,7 @@ export default { ...@@ -493,7 +531,7 @@ export default {
this.title = '分配数据权限' this.title = '分配数据权限'
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
this.form.menuCheckStrictly = false this.form.menuCheckStrictly = false
...@@ -516,7 +554,7 @@ export default { ...@@ -516,7 +554,7 @@ export default {
}) })
}, },
/** 提交按钮(数据权限) */ /** 提交按钮(数据权限) */
submitDataScope: function () { submitDataScope: function() {
if (this.form.businessId !== undefined && this.form.menuId !== undefined) { if (this.form.businessId !== undefined && this.form.menuId !== undefined) {
this.form.deptIds = this.getDeptAllCheckedKeys() this.form.deptIds = this.getDeptAllCheckedKeys()
dataScope(this.form).then(response => { dataScope(this.form).then(response => {
...@@ -533,7 +571,7 @@ export default { ...@@ -533,7 +571,7 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function () { }).then(function() {
return delRole(roleIds) return delRole(roleIds)
}).then(() => { }).then(() => {
this.getList() this.getList()
...@@ -541,7 +579,7 @@ export default { ...@@ -541,7 +579,7 @@ export default {
message: '删除成功', message: '删除成功',
type: 'success' type: 'success'
}) })
}).catch(function () { }).catch(function() {
}) })
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -551,7 +589,7 @@ export default { ...@@ -551,7 +589,7 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function () { }).then(function() {
return exportRole(queryParams).then(response => { return exportRole(queryParams).then(response => {
const blob = new Blob([response]) const blob = new Blob([response])
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
......
This diff is collapsed.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="header-container"> <div class="header-container">
<filter-fields <filter-fields
:filter-fields="filterFields" :filter-fields="filterFields"
:optionDic = "optionDic" :option-dic="optionDic"
@search="fileSearch" @search="fileSearch"
@reset="fileSearch" @reset="fileSearch"
/> />
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
width="50"> width="50"
</el-table-column> />
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column <el-table-column
...@@ -232,7 +232,7 @@ export default { ...@@ -232,7 +232,7 @@ export default {
processId: processId, processId: processId,
flowType: 4, flowType: 4,
instanceId: instanceId, instanceId: instanceId,
processName: this.processName, processName: this.processName
} }
}) })
}, },
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="instance-template-title-container-title"> <div class="instance-template-title-container-title">
{{ getTitle }} {{ getTitle }}
</div> </div>
<!-- <el-button v-show="showDownLoad" type="primary" class="download-btn" @click="downFile">下载</el-button>--> <!-- <el-button v-show="showDownLoad" type="primary" class="download-btn" @click="downFile">下载</el-button>-->
</div> </div>
<!-- 主容器 --> <!-- 主容器 -->
<div class="instance-template-main-container"> <div class="instance-template-main-container">
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
width="50"> width="50"
</el-table-column> />
<el-table-column prop="actName" label="操作步骤" /> <el-table-column prop="actName" label="操作步骤" />
<el-table-column prop="updateBy" label="操作人" /> <el-table-column prop="updateBy" label="操作人" />
<el-table-column prop="transition" label="操作" /> <el-table-column prop="transition" label="操作" />
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
// 需要提交的表单 // 需要提交的表单
submitForm: { submitForm: {
// 加签类型 // 加签类型
type: '1', type: '1'
}, },
// 多选选中的数据 // 多选选中的数据
multipleSelection: [] multipleSelection: []
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
class="instance-todo-list-search-param" class="instance-todo-list-search-param"
> >
<el-form-item label="申请人"> <el-form-item label="申请人">
<el-input v-model.trim="searchForm.user" :maxlength="30"/> <el-input v-model.trim="searchForm.user" :maxlength="30" />
</el-form-item> </el-form-item>
<el-form-item label="申请人所属部门"> <el-form-item label="申请人所属部门">
<el-cascader <el-cascader
......
<template> <template>
<div class="login"> <div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <img class="fy-logo" src="../../assets/image/denglu_logo.png">--> <!-- <img class="fy-logo" src="../../assets/image/denglu_logo.png">-->
<h3 class="title">信息化管理系统</h3> <h3 class="title">信息化管理系统</h3>
<div class="login-form-content"> <div class="login-form-content">
<el-form-item prop="username"> <el-form-item prop="username">
...@@ -20,20 +20,20 @@ ...@@ -20,20 +20,20 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" /> <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input> </el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="code">--> <!-- <el-form-item prop="code">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="loginForm.code"--> <!-- v-model="loginForm.code"-->
<!-- auto-complete="off"--> <!-- auto-complete="off"-->
<!-- placeholder="验证码"--> <!-- placeholder="验证码"-->
<!-- style="width: 63%"--> <!-- style="width: 63%"-->
<!-- @keyup.enter.native="handleLogin"--> <!-- @keyup.enter.native="handleLogin"-->
<!-- >--> <!-- >-->
<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />--> <!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- &lt;!&ndash;<div class="login-code">--> <!-- &lt;!&ndash;<div class="login-code">-->
<!-- <img :src="codeUrl" @click="getCode">--> <!-- <img :src="codeUrl" @click="getCode">-->
<!-- </div>&ndash;&gt;--> <!-- </div>&ndash;&gt;-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item style="width:80%;margin-bottom: 20px"> <el-form-item style="width:80%;margin-bottom: 20px">
<el-button <el-button
class="blue-btn" class="blue-btn"
...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
class="buttons-content" class="buttons-content"
> >
<el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox> <el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox>
<!-- <el-link--> <!-- <el-link-->
<!-- :underline="false"--> <!-- :underline="false"-->
<!-- @click="goDetail('/forgetPwd')"--> <!-- @click="goDetail('/forgetPwd')"-->
<!-- >--> <!-- >-->
<!-- <router-link to="/forgetPwd">忘记密码</router-link>--> <!-- <router-link to="/forgetPwd">忘记密码</router-link>-->
<!-- </el-link>--> <!-- </el-link>-->
</div> </div>
</div> </div>
</el-form> </el-form>
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<el-checkbox v-model="scope.row.isChecked" @change="(val) => { setOrRemoveUser(val, scope.row) }" /> <el-checkbox v-model="scope.row.isChecked" @change="(val) => { setOrRemoveUser(val, scope.row) }" />
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column type="selection" width="55" :reserve-selection="true" />--> <!-- <el-table-column type="selection" width="55" :reserve-selection="true" />-->
<el-table-column type="index" label="序号" width="55" /> <el-table-column type="index" label="序号" width="55" />
<!-- <el-table-column property="userId" label="人员编号" width="150" />--> <!-- <el-table-column property="userId" label="人员编号" width="150" />-->
<el-table-column label="姓名" width="200"> <el-table-column label="姓名" width="200">
......
...@@ -6,16 +6,16 @@ ...@@ -6,16 +6,16 @@
<el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline"> <el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline">
<el-form-item label="标题"> <el-form-item label="标题">
<el-input <el-input
placeholder="请输入消息标题"
v-model.trim="queryParams.TITLE" v-model.trim="queryParams.TITLE"
placeholder="请输入消息标题"
:maxlength="30" :maxlength="30"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="接收人"> <el-form-item label="接收人">
<el-input <el-input
placeholder="请输入接收人"
v-model.trim="queryParams.recipientName" v-model.trim="queryParams.recipientName"
placeholder="请输入接收人"
:maxlength="30" :maxlength="30"
clearable clearable
/> />
...@@ -33,19 +33,19 @@ ...@@ -33,19 +33,19 @@
border border
> >
<el-table-column type="index" width="50" label="序号" /> <el-table-column type="index" width="50" label="序号" />
<el-table-column :show-overflow-tooltip="true" prop="fromSystem" label="系统" > <el-table-column :show-overflow-tooltip="true" prop="fromSystem" label="系统">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.fromSystem || '-'}} {{ scope.row.fromSystem || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true" > <el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.title || '-'}} {{ scope.row.title || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true" > <el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.content || '-'}} {{ scope.row.content || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="类型"> <el-table-column prop="type" label="类型">
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="recipientName" label="接收人" > <el-table-column :show-overflow-tooltip="true" prop="recipientName" label="接收人">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.recipientName || '-'}} {{ scope.row.recipientName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createTime"> <el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createTime">
......
...@@ -24,29 +24,29 @@ ...@@ -24,29 +24,29 @@
style="width: 100%;" style="width: 100%;"
> >
<el-table-column type="index" width="50" label="序号" /> <el-table-column type="index" width="50" label="序号" />
<el-table-column prop="fromSystem" label="系统" > <el-table-column prop="fromSystem" label="系统">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.fromSystem || '-'}} {{ scope.row.fromSystem || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true" > <el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.title || '-'}} {{ scope.row.title || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true" > <el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.content || '-'}} {{ scope.row.content || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="receiveMail" label="接收人邮箱" show-overflow-tooltip> <el-table-column prop="receiveMail" label="接收人邮箱" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.receiveMail || '-'}} {{ scope.row.receiveMail || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" width="180" label="创建时间" show-overflow-tooltip> <el-table-column prop="createTime" width="180" label="创建时间" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm')}} {{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" width="250">--> <!-- <el-table-column label="操作" width="250">-->
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="pcIcon" label="PC图标" :show-overflow-tooltip="true"> <el-table-column prop="pcIcon" label="PC图标" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 图片预览--> <!-- 图片预览-->
<template v-if="scope.row.pcIcon"> <template v-if="scope.row.pcIcon">
<viewer :images="[]"> <viewer :images="[]">
<img style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.pcIcon"> <img style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.pcIcon">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="mobileIcon" label="mobile图标" width="150"> <el-table-column prop="mobileIcon" label="mobile图标" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 图片预览--> <!-- 图片预览-->
<template v-if="scope.row.mobileIcon"> <template v-if="scope.row.mobileIcon">
<viewer :images="[]"> <viewer :images="[]">
<img v-if="scope.row.mobileIcon" style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.mobileIcon"> <img v-if="scope.row.mobileIcon" style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.mobileIcon">
......
<template> <template>
<div class="user-manage"> <div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">--> <!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.name"--> <!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"--> <!-- placeholder="请输入用户类型"-->
<!-- clearable--> <!-- clearable-->
<!-- :maxlength="30"--> <!-- :maxlength="30"-->
<!-- size="small"--> <!-- size="small"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="登录名" prop="username"> <el-form-item label="登录名" prop="username">
<el-input <el-input
v-model="queryParams.username" v-model="queryParams.username"
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']" v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-plus" icon="el-icon-plus"
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
@click="handleImport" @click="handleImport"
>导入</el-button> >导入</el-button>
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']" v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success" type="success"
size="small" size="small"
icon="el-icon-download" icon="el-icon-download"
...@@ -213,10 +213,11 @@ ...@@ -213,10 +213,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
value="phone"
v-model.trim="form.phone" v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" /> maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
<template> <template>
<div class="user-manage"> <div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">--> <!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.name"--> <!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"--> <!-- placeholder="请输入用户类型"-->
<!-- clearable--> <!-- clearable-->
<!-- :maxlength="30"--> <!-- :maxlength="30"-->
<!-- size="small"--> <!-- size="small"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="登录名" prop="username"> <el-form-item label="登录名" prop="username">
<el-input <el-input
v-model="queryParams.username" v-model="queryParams.username"
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']" v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-plus" icon="el-icon-plus"
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
@click="handleImport" @click="handleImport"
>导入</el-button> >导入</el-button>
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']" v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success" type="success"
size="small" size="small"
icon="el-icon-download" icon="el-icon-download"
...@@ -213,10 +213,11 @@ ...@@ -213,10 +213,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
value="phone"
v-model.trim="form.phone" v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" /> maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
<template> <template>
<div class="user-manage"> <div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">--> <!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.name"--> <!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"--> <!-- placeholder="请输入用户类型"-->
<!-- clearable--> <!-- clearable-->
<!-- :maxlength="30"--> <!-- :maxlength="30"-->
<!-- size="small"--> <!-- size="small"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="登录名" prop="username"> <el-form-item label="登录名" prop="username">
<el-input <el-input
v-model="queryParams.username" v-model="queryParams.username"
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']" v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-plus" icon="el-icon-plus"
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
@click="handleImport" @click="handleImport"
>导入</el-button> >导入</el-button>
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']" v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success" type="success"
size="small" size="small"
icon="el-icon-download" icon="el-icon-download"
...@@ -213,10 +213,11 @@ ...@@ -213,10 +213,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
value="phone"
v-model.trim="form.phone" v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" /> maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
<template> <template>
<div class="user-manage"> <div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">--> <!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.name"--> <!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"--> <!-- placeholder="请输入用户类型"-->
<!-- clearable--> <!-- clearable-->
<!-- :maxlength="30"--> <!-- :maxlength="30"-->
<!-- size="small"--> <!-- size="small"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="登录名" prop="username"> <el-form-item label="登录名" prop="username">
<el-input <el-input
v-model="queryParams.username" v-model="queryParams.username"
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']" v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-plus" icon="el-icon-plus"
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
@click="handleImport" @click="handleImport"
>导入</el-button> >导入</el-button>
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']" v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success" type="success"
size="small" size="small"
icon="el-icon-download" icon="el-icon-download"
...@@ -213,10 +213,11 @@ ...@@ -213,10 +213,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
value="phone"
v-model.trim="form.phone" v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" /> maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
<template> <template>
<div class="user-manage"> <div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">--> <!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.name"--> <!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"--> <!-- placeholder="请输入用户类型"-->
<!-- clearable--> <!-- clearable-->
<!-- :maxlength="30"--> <!-- :maxlength="30"-->
<!-- size="small"--> <!-- size="small"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="登录名" prop="username"> <el-form-item label="登录名" prop="username">
<el-input <el-input
v-model="queryParams.username" v-model="queryParams.username"
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']" v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-plus" icon="el-icon-plus"
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
@click="handleImport" @click="handleImport"
>导入</el-button> >导入</el-button>
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']" v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success" type="success"
size="small" size="small"
icon="el-icon-download" icon="el-icon-download"
...@@ -213,10 +213,11 @@ ...@@ -213,10 +213,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
value="phone"
v-model.trim="form.phone" v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" /> maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
...@@ -24,22 +24,6 @@ ...@@ -24,22 +24,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="生产状态" prop="flag">
<el-select
v-model="queryParams.flag"
placeholder="请选择生产状态"
clearable
size="small"
style="width: 150px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item> </el-form-item>
...@@ -69,26 +53,11 @@ ...@@ -69,26 +53,11 @@
{{ scope.row.workshop || '-' }} {{ scope.row.workshop || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<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 label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime"> <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="修改时间" :show-overflow-tooltip="true" align="center" prop="updataTime">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" prop="createBy"> <el-table-column label="创建人" prop="createBy">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.createBy || '-' }} {{ scope.row.createBy || '-' }}
...@@ -96,7 +65,10 @@ ...@@ -96,7 +65,10 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="240px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="240px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button style="color: #49cec9" :type="typeParent" :size="size" @click="handleUpdate(scope.row)"> <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
详情
</el-button>
<el-button :type="typeParent" :size="size" @click="handleUpdate(scope.row)">
{{ updataName }} {{ updataName }}
</el-button> </el-button>
<el-button <el-button
...@@ -125,12 +97,8 @@ ...@@ -125,12 +97,8 @@
<el-form-item label="工厂车间" prop="workshop"> <el-form-item label="工厂车间" prop="workshop">
<el-input v-model.trim="form.workshop" show-word-limit :maxlength="30" placeholder="请输入工厂车间" /> <el-input v-model.trim="form.workshop" show-word-limit :maxlength="30" placeholder="请输入工厂车间" />
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="创建人" prop="createBy">
<el-radio v-model="form.flag" label="1">启用</el-radio> <el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入创建人" />
<el-radio v-model="form.flag" label="0">停用</el-radio>
</el-form-item>
<el-form-item label="备注">
<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">
...@@ -139,6 +107,24 @@ ...@@ -139,6 +107,24 @@
</div> </div>
</el-dialog> </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="processName">
<el-input v-model.trim="singleDetails.processName" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="工厂车间:" prop="workshop">
<el-input v-model.trim="singleDetails.workshop" :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>
</el-dialog>
</div> </div>
</template> </template>
...@@ -163,10 +149,10 @@ export default { ...@@ -163,10 +149,10 @@ export default {
addIcon: 'el-icon-plus', addIcon: 'el-icon-plus',
exportIcon: 'el-icon-download', exportIcon: 'el-icon-download',
resetIcon: '', resetIcon: '',
// TODO: 控制只读
isReadOnly: true,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
...@@ -179,8 +165,8 @@ export default { ...@@ -179,8 +165,8 @@ export default {
title: '', title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 是否显示弹出层(数据权限 // 是否显示弹出层(数据详情
openDataScope: false, openDetails: false,
// 日期范围 // 日期范围
// dateRange: [], // dateRange: [],
// 菜单表格数据 // 菜单表格数据
...@@ -189,40 +175,6 @@ export default { ...@@ -189,40 +175,6 @@ export default {
menuNodeAll: false, menuNodeAll: false,
deptExpand: true, deptExpand: true,
deptNodeAll: false, deptNodeAll: false,
// 状态数据字典
statusOptions: [
{
dictLabel: '启用',
dictValue: '1'
},
{
dictLabel: '停用',
dictValue: '0'
}
],
// 数据范围选项
dataScopeOptions: [
{
value: '1',
label: '全部数据权限'
},
{
value: '2',
label: '自定数据权限'
},
{
value: '3',
label: '本部门数据权限'
},
{
value: '4',
label: '本部门及以下数据权限'
},
{
value: '5',
label: '仅本人数据权限'
}
],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -232,7 +184,7 @@ export default { ...@@ -232,7 +184,7 @@ export default {
flag: undefined flag: undefined
}, },
defaultProps: {}, defaultProps: {},
// 表单参数 // TODO: 表单参数
form: { form: {
processName: '', processName: '',
workshop: '', workshop: '',
...@@ -242,6 +194,7 @@ export default { ...@@ -242,6 +194,7 @@ export default {
updataTime: new Date(), updataTime: new Date(),
createBy: '' createBy: ''
}, },
// TODO: 表单初始参数
formReset: { formReset: {
processName: '', processName: '',
workshop: '', workshop: '',
...@@ -250,6 +203,15 @@ export default { ...@@ -250,6 +203,15 @@ export default {
updataTime: new Date(), updataTime: new Date(),
createBy: '' createBy: ''
}, },
// TODO: 表单里的单项详情参数
singleDetails: {
processName: '',
workshop: '',
flag: '1',
createTime: new Date(),
updataTime: new Date(),
createBy: ''
},
// TODO: 模拟测试数据 // TODO: 模拟测试数据
simulateProcessList: [{ processName: '打磨', workshop: '车间1', flag: 1, createTime: new Date(), updataTime: new Date(), createBy: '张三' }, { processName: '焊接', workshop: '车间2', flag: 2, createTime: new Date(), updataTime: new Date(), createBy: '李四' }], simulateProcessList: [{ processName: '打磨', workshop: '车间1', flag: 1, createTime: new Date(), updataTime: new Date(), createBy: '张三' }, { processName: '焊接', workshop: '车间2', flag: 2, createTime: new Date(), updataTime: new Date(), createBy: '李四' }],
...@@ -262,8 +224,8 @@ export default { ...@@ -262,8 +224,8 @@ export default {
workshop: [ workshop: [
{ required: true, message: '请输入车间名称', trigger: 'blur' } { required: true, message: '请输入车间名称', trigger: 'blur' }
], ],
flag: [ createBy: [
{ required: true, trigger: 'blur' } { required: true, message: '请输入创建人姓名', trigger: 'blur' }
] ]
}, },
deptOptions: [] deptOptions: []
...@@ -295,22 +257,6 @@ export default { ...@@ -295,22 +257,6 @@ export default {
console.log(this.roleList) console.log(this.roleList)
this.loading = false this.loading = false
}, },
// 角色状态修改
handleStatusChange(row) {
const text = row.flag === '1' ? '启用' : '停用'
this.$confirm('是否确认操作?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
message: text + '成功',
type: 'success'
})
}).catch(function() {
row.flag = row.flag === '0' ? '1' : '0'
})
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.open = false
...@@ -326,18 +272,25 @@ export default { ...@@ -326,18 +272,25 @@ export default {
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
this.getList() this.getList()
}, },
/** 重置按钮操作 */ /** TODO: 重置按钮操作 */
resetQuery() {}, resetQuery() {},
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) {}, handleSelectionChange(selection) {},
/** 新增按钮操作 */ /** TODO: 新增按钮操作 */
handleAdd() { handleAdd() {
// TODO: 初始化新增对话框的状态 // TODO: 初始化新增对话框的状态
this.form = this.formReset this.form = this.formReset
this.title = '添加工序' this.title = '添加工序'
this.open = !this.open this.open = !this.open
}, },
/** 修改按钮操作 */ // TODO: 获取所选行详情信息操作
handleDetail(row) {
this.singleDetails = this.formReset
this.singleDetails = row
this.title = '详情信息'
this.openDetails = !this.openDetails
},
/** TODO: 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset() this.reset()
this.title = '修改工序' this.title = '修改工序'
...@@ -444,5 +397,19 @@ export default { ...@@ -444,5 +397,19 @@ export default {
width: 4px; 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> </style>
<template> <template>
<el-form ref="form" :model="form" label-width="80px" > <el-form ref="form" :model="form" label-width="80px">
<el-form-item label="活动区域"> <el-form-item label="活动区域">
<el-select v-model="form.region" placeholder="请选择活动区域"> <el-select v-model="form.region" placeholder="请选择活动区域">
<el-option label="区域一" value="shanghai"></el-option> <el-option label="区域一" value="shanghai" />
<el-option label="区域二" value="beijing"></el-option> <el-option label="区域二" value="beijing" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form style="display: flex; flex-wrap: wrap;"> <el-form style="display: flex; flex-wrap: wrap;">
<el-form-item label="文本框1" style="flex-basis: 50%;"> <el-form-item label="文本框1" style="flex-basis: 50%;">
<el-input ref="input1" v-model="form.name" @keyup.enter.native="handelTab(1,$event)" :style="{ width: '400px', height: '30px' }"></el-input> <el-input ref="input1" v-model="form.name" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="文本框2" style="flex-basis: 50%;"> <el-form-item label="文本框2" style="flex-basis: 50%;">
<el-input ref="input2" v-model="form.date1" @keyup.enter.native="handelTab(2,$event)" :style="{ width: '400px', height: '30px' }"></el-input> <el-input ref="input2" v-model="form.date1" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="文本框3" style="flex-basis: 50%;"> <el-form-item label="文本框3" style="flex-basis: 50%;">
<el-input ref="input3" v-model="form.date2" @keyup.enter.native="handelTab(3,$event)" :style="{ width: '400px', height: '30px' }"></el-input> <el-input ref="input3" v-model="form.date2" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item> </el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框4" style="flex-basis: 50%;"> <el-form-item v-if="form.region === 'beijing'" label="文本框4" style="flex-basis: 50%;">
<el-input ref="input4" v-model="form.type" @keyup.enter.native="handelTab(4,$event)" :style="{ width: '400px', height: '30px' }"></el-input> <el-input ref="input4" v-model="form.type" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item> </el-form-item>
<el-form-item v-if="form.region === 'beijing'" label="文本框5" style="flex-basis: 50%;"> <el-form-item v-if="form.region === 'beijing'" label="文本框5" style="flex-basis: 50%;">
<el-input ref="input5" v-model="form.resource" @keyup.enter.native="handelTab(5,$event)" :style="{ width: '400px', height: '30px' }"></el-input> <el-input ref="input5" v-model="form.resource" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="文本框6" style="flex-basis: 50%;"> <el-form-item label="文本框6" style="flex-basis: 50%;">
<el-input ref="input6" v-model="form.desc" @keyup.enter.native="handelTab(6,$event)" :style="{ width: '400px', height: '30px' }"></el-input> <el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form-item style="width: 100%;"> <el-form-item style="width: 100%;">
<el-button type="primary" @click="submitForm">提交</el-button> <el-button type="primary" @click="submitForm">提交</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
<script> <script>
...@@ -48,21 +47,21 @@ export default { ...@@ -48,21 +47,21 @@ export default {
resource: '', resource: '',
desc: '' desc: ''
} }
}; }
}, },
methods: { methods: {
handelTab(i, e) { handelTab(i, e) {
const that = this const that = this
if (!that.$refs['input' + i]) { if (!that.$refs['input' + i]) {
return return
} }
that.$nextTick(() => { that.$nextTick(() => {
e.target.blur() e.target.blur()
const index = i + 1 const index = i + 1
that.$refs['input' + index].focus() that.$refs['input' + index].focus()
}) })
}, }
} }
} }
</script> </script>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
width="120" width="120"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + 1}} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="deptId" label="部门编号"> <el-table-column :show-overflow-tooltip="true" prop="deptId" label="部门编号">
......
...@@ -266,7 +266,7 @@ import dictCons from '@/utils/dictCons' ...@@ -266,7 +266,7 @@ import dictCons from '@/utils/dictCons'
import Coolbutton from '@/components/coolbutton' import Coolbutton from '@/components/coolbutton'
export default { export default {
name: 'Menu', name: 'Menu',
components: { Treeselect, IconSelect,Coolbutton }, components: { Treeselect, IconSelect, Coolbutton },
data() { data() {
var trueGroupName = (rule, value, callback) => { var trueGroupName = (rule, value, callback) => {
if (!value.trim()) { if (!value.trim()) {
......
...@@ -113,8 +113,7 @@ ...@@ -113,8 +113,7 @@
inactive-value="0" inactive-value="0"
active-value="1" active-value="1"
@click.native="handleStatusChange(scope.row)" @click.native="handleStatusChange(scope.row)"
> />
</el-switch>
</template> </template>
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ scope.row.flag || '-' }}--> <!-- {{ scope.row.flag || '-' }}-->
...@@ -227,7 +226,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css' ...@@ -227,7 +226,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import dictCons from '@/utils/dictCons' import dictCons from '@/utils/dictCons'
import { listDept } from '@/api/system/dept' import { listDept } from '@/api/system/dept'
import { listRole } from '@/api/system/role' import { listRole } from '@/api/system/role'
import {updateType} from "@/api/system/dict/type"; import { updateType } from '@/api/system/dict/type'
export default { export default {
name: 'Post', name: 'Post',
components: { Treeselect }, components: { Treeselect },
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
width="50"> width="50"
</el-table-column> />
<el-table-column <el-table-column
prop="date" prop="date"
label="日期" label="日期"
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
<el-input <el-input
v-model.trim="form.name" v-model.trim="form.name"
:maxlength="30" :maxlength="30"
style="width: 10.3vw;min-width: 148px; height: 2.9vh; min-height:32px"/> style="width: 10.3vw;min-width: 148px; height: 2.9vh; min-height:32px"
/>
</el-form-item> </el-form-item>
<el-form-item label="选择分组" prop="groupId"> <el-form-item label="选择分组" prop="groupId">
<el-select <el-select
...@@ -20,15 +21,17 @@ ...@@ -20,15 +21,17 @@
<el-form-item class="right"> <el-form-item class="right">
<el-button <el-button
type="primary" type="primary"
@click="submitForm('2')"
style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px" style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px"
@click="submitForm('2')"
>{{ id ? '保存并发布' : '保存并发布' }}</el-button> >{{ id ? '保存并发布' : '保存并发布' }}</el-button>
<el-button <el-button
style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px" style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px"
@click="submitForm('1')">保存</el-button> @click="submitForm('1')"
>保存</el-button>
<el-button <el-button
style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px" style="width: 3.1vw; min-width: 60px; height: 2.9vh; min-height:32px"
@click="toBack">返回列表</el-button> @click="toBack"
>返回列表</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</header> </header>
......
...@@ -56,9 +56,9 @@ ...@@ -56,9 +56,9 @@
<div class="placeholder" /> <div class="placeholder" />
<!-- emementUI表格 --> <!-- emementUI表格 -->
<div class="template-list-table"> <div class="template-list-table">
<!-- <div class="mb12 font-small-bold"></div>--> <!-- <div class="mb12 font-small-bold"></div>-->
<div class="mb12 font-main-bold">表单模板列表</div> <div class="mb12 font-main-bold">表单模板列表</div>
<!-- <h5 style="margin: 1vh 0 1vh 0; font-size: 14px"></h5>--> <!-- <h5 style="margin: 1vh 0 1vh 0; font-size: 14px"></h5>-->
<el-table <el-table
ref="multipleTable" ref="multipleTable"
v-loading="queryLoading" v-loading="queryLoading"
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button v-else v-hasPermi="['zt:workflowTemplate:cancelPublish']" size="mini" @click.native="publish(scope.row.businessId, '1')" type="text">取消发布</el-button> <el-button v-else v-hasPermi="['zt:workflowTemplate:cancelPublish']" size="mini" type="text" @click.native="publish(scope.row.businessId, '1')">取消发布</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -126,10 +126,10 @@ ...@@ -126,10 +126,10 @@
<el-input v-model.trim="editForm.groupCode" style="width: 95%" :maxlength="30" auto-complete="off" show-word-limit placeholder="请输入业务编号" /> <el-input v-model.trim="editForm.groupCode" style="width: 95%" :maxlength="30" auto-complete="off" show-word-limit placeholder="请输入业务编号" />
</el-form-item> </el-form-item>
<el-form-item label="业务名称" prop="groupName"> <el-form-item label="业务名称" prop="groupName">
<el-input style="width: 95%" v-model.trim="editForm.groupName" :maxlength="30" auto-complete="off" show-word-limit placeholder="请输入业务名称" /> <el-input v-model.trim="editForm.groupName" style="width: 95%" :maxlength="30" auto-complete="off" show-word-limit placeholder="请输入业务名称" />
</el-form-item> </el-form-item>
<el-form-item label="业务排序" prop="sort"> <el-form-item label="业务排序" prop="sort">
<el-input-number style="width: 95%" v-model="editForm.sort" controls-position="right" :min="0" :max="100" /> <el-input-number v-model="editForm.sort" style="width: 95%" controls-position="right" :min="0" :max="100" />
</el-form-item> </el-form-item>
<el-form-item label="应用选择" prop="adhibitionId"> <el-form-item label="应用选择" prop="adhibitionId">
<el-select v-model="editForm.adhibitionId" style="width: 95%" clearable placeholder="请选择应用" @visible-change="clearClosed"> <el-select v-model="editForm.adhibitionId" style="width: 95%" clearable placeholder="请选择应用" @visible-change="clearClosed">
......
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