Skip to content

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

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

parents ad062412 f307658c
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 176 deletions
src/api/equipment/basicInfo.js
View file @ bfb8c00b
......@@ -20,6 +20,13 @@ export function add(data) {
})
}
// 根据id查询基础信息接口
export function getDetailById(id) {
return request({
url: '/wbbaseinfo/detail/' + id,
method: 'get'
})
}
// 修改基础信息接口
export function updataInfo(data) {
return request({
......@@ -32,33 +39,11 @@ export function updataInfo(data) {
})
}
// 角色状态修改
export function changeRoleStatus(businessId, flag) {
const data = {
businessId,
flag
}
return request({
url: '/system/role/changeStatus',
method: 'put',
params: data
})
}
// 删除角色
export function delRole(roleId) {
// 逻辑删除基础信息接口
export function deleteLogical(id) {
return request({
url: '/system/role/deleteLogical/' + roleId,
url: '/wbbaseinfo/deleteLogical/' + id,
method: 'delete'
})
}
// 导出角色
export function exportRole(query) {
return request({
url: '/system/role/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/api/equipment/check.js
View file @ bfb8c00b
......@@ -20,3 +20,28 @@ export function abandon(data) {
}
})
}
export function checkType(data){
return request({
url: '/wbwarehouseinventorytemp/checkType/' + data,
method:'get'
})
}
export function addList(data){
return request({
url: '/wbwarehouseinventorytemp/addList',
method:'post',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
export function deleteByType(data){
return request({
url: '/wbwarehouseinventorytemp/deleteByType/' + data,
method:'delete'
})
}
\ No newline at end of file
src/views/equipment/basicInfo.vue
View file @ bfb8c00b
......@@ -92,9 +92,9 @@
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
......@@ -170,7 +170,7 @@
</template>
<script>
import { add, listBasicInfo, updataInfo} from '@/api/equipment/basicInfo'
import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/api/equipment/basicInfo'
import { parseTime } from '@/utils'
export default {
name: 'Role',
......@@ -306,7 +306,7 @@ export default {
getList() {
this.loading = true
listBasicInfo(this.queryParams).then(res => {
res.rows.createDate = parseTime(res.rows.createDate,'{y}-{m}-{d}')
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.total = res.total
this.basicInfoList = res.rows
this.loading = false
......@@ -435,19 +435,11 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const roleId = row.businessId || this.ids
const roleMenu = this.getRoleMenuTreeselect(roleId)
getRole(roleId).then(response => {
this.form = response.data
this.title = '编辑基础信息表单'
const id = row.businessId
getDetailById(id).then(res => {
this.form = res.data
this.open = true
this.getMenuTreeselect(roleId)
this.$nextTick(() => {
roleMenu.then(res => {
this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
})
})
this.title = '修改角色'
})
},
/** 提交按钮 */
......@@ -483,25 +475,24 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const roleIds = row.businessId || this.ids
this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
const id = row.businessId
this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return delRole(roleIds)
}).then(() => {
this.getList()
this.$message({
message: '删除成功',
type: 'success'
}).then(res => {
deleteLogical(id).then(res => {
if (res.code === 200) {
this.$message.success('操作成功')
this.getList()
}
})
}).catch(function() {
})
}
}
}
</script>
<style lang="scss" scoped>
.app-container {
font-size: 18px;
......
src/views/equipment/check.vue
View file @ bfb8c00b
......@@ -38,19 +38,13 @@
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="handleAdd">开始盘点 {{ check }} </el-button>
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点 {{ check }} </el-button>
</el-form-item>
<!-- 这俩都没写接口以及方法 -->
<el-form-item>
<el-button
style="padding: 8px 7px;"
type="danger"
:size="smallSize"
icon="el-icon-minus"
>结束盘点
{{ check }}
</el-button>
<el-button style="padding: 8px 7px;" type="danger" :size="smallSize" @click="deleteByType" icon="el-icon-minus">结束盘点 {{ check }}</el-button>
</el-form-item>
</div>
</el-form>
<div class="placeholder" />
......@@ -229,7 +223,7 @@ import {
getRole,
updateRole
} from '@/api/system/role'
import { listCheck} from '@/api/equipment/check'
import { checkType, listCheck,addList,deleteByType} from '@/api/equipment/check'
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'
......@@ -237,6 +231,13 @@ export default {
name: 'Role',
data() {
return {
// 需要盘点的list
checkFrom: {
Ptype: '',
checkList: [],
},
// 选中的列表
selectList:[],
// TODO: 表单里的单项详情参数
singleDetails: {
equipmentName: '',
......@@ -400,6 +401,37 @@ export default {
this.title = '详情信息'
this.openDetails = !this.openDetails
},
deleteByType(){
deleteByType(1).then(flag => {
if(flag.data > 0){
this.$message.success("结束盘点成功")
}else{
this.$message.error("结束盘点失败")
}
})
},
checkType(){
checkType(1).then(total => {
if(total.data !== 0){
this.$message.error("请先结束盘点")
}else{
let data = []
if(this.selectList.length === 0){
data = this.equipmentList
}else{
data = this.selectList
}
addList(data).then(flag => {
if(flag.data.influence > 0){
this.$message.success("盘点成功")
}else{
this.$message.error("盘点失败")
}
})
}
})
},
handelTab(i, e) {
const that = this
if (!that.$refs['input' + i]) {
......@@ -565,6 +597,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.roleId)
this.selectList = selection
this.single = selection.length !== 1
this.multiple = !selection.length
},
......
src/views/equipment/checkProcess.vue
View file @ bfb8c00b
......@@ -38,24 +38,11 @@
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button
style="padding: 8px 7px;"
:type="typePrimary"
:size="smallSize"
:icon="addIcon"
>开始盘点
{{ check }}
</el-button>
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点 {{ check }} </el-button>
</el-form-item>
<el-form-item>
<el-button
style="padding: 8px 7px;"
type="danger"
:size="smallSize"
icon="el-icon-minus"
>结束盘点
{{ check }}
</el-button>
<el-button style="padding: 8px 7px;" type="danger" :size="smallSize" @click="deleteByType" icon="el-icon-minus">结束盘点 {{ check }}</el-button>
</el-form-item>
</div>
</el-form>
......@@ -236,7 +223,8 @@ import {
listRole,
updateRole
} from '@/api/system/role'
import {listCheck} from '@/api/equipment/check'
import {listCheck } from '@/api/equipment/checkProcess'
import { checkType, addList,deleteByType} from '@/api/equipment/check'
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'
......@@ -403,6 +391,36 @@ export default {
this.title = '详情信息'
this.openDetails = !this.openDetails
},
deleteByType(){
deleteByType(2).then(flag => {
if(flag.data > 0){
this.$message.success("结束盘点成功")
}else{
this.$message.error("结束盘点失败")
}
})
},
checkType(){
checkType(2).then(total => {
if(total.data !== 0){
this.$message.error("请先结束盘点")
}else{
let data = []
if(this.selectList.length === 0){
data = this.equipmentList
}else{
data = this.selectList
}
addList(data).then(flag => {
if(flag.data.influence > 0){
this.$message.success("盘点成功")
}else{
this.$message.error("盘点失败")
}
})
}
})
},
handelTab(i, e) {
const that = this
if (!that.$refs['input' + i]) {
......
src/views/equipment/draw.vue
View file @ bfb8c00b
......@@ -79,9 +79,9 @@
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
......
src/views/processManagement/draw.vue
View file @ bfb8c00b
......@@ -79,9 +79,9 @@
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
......
src/views/sample/sampleType/index.vue
View file @ bfb8c00b
......@@ -31,6 +31,7 @@
<el-form-item>
<el-button
type="primary"
style="padding: 8px 7px;"
size="small"
icon="el-icon-plus"
@click="handleAdd"
......
src/views/system/dept/index.vue
View file @ bfb8c00b
......@@ -10,16 +10,16 @@
size="small"
/>
</el-form-item>
<el-form-item label="部门状态">
<el-select v-model="queryParams.flag" placeholder="请选择部门状态" clearable size="small">
<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-select v-model="queryParams.flag" placeholder="请选择部门状态" clearable size="small">-->
<!-- <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-button
style="padding: 8px 7px;"
......@@ -81,7 +81,7 @@
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:edit']"-->
......@@ -222,7 +222,7 @@ export default {
// 是否显示弹出层
open: false,
// 状态数据字典
statusOptions: [],
// statusOptions: [],
// 查询参数
queryParams: {
deptName: undefined,
......@@ -275,9 +275,9 @@ export default {
this.queryParams = { ...param }
}
this.getList()
this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
this.statusOptions = response.data
})
// this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
// this.statusOptions = response.data
// })
},
methods: {
/** 查询部门列表 */
......@@ -317,9 +317,9 @@ export default {
}
},
// 字典状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.flag)
},
// statusFormat(row, column) {
// return this.selectDictLabel(this.statusOptions, row.flag)
// },
// 取消按钮
cancel() {
this.open = false
......
src/views/system/dict/index.vue
View file @ bfb8c00b
......@@ -23,22 +23,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="flag">
<el-select
v-model="queryParams.flag"
placeholder="字典状态"
clearable
size="small"
style="width: 200px"
>
<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="状态" prop="flag">-->
<!-- <el-select-->
<!-- v-model="queryParams.flag"-->
<!-- placeholder="字典状态"-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 200px"-->
<!-- >-->
<!-- <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="dateRange"
......@@ -52,12 +52,25 @@
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
<el-button
type="primary"
style="padding: 8px 7px;"
icon="el-icon-search"
size="small"
@click="handleQuery"
>搜索</el-button>
<el-button
style="padding: 8px 7px;"
icon="el-icon-refresh"
size="small"
@click="resetQuery"
>重置
</el-button>
</el-form-item>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
style="padding: 8px 7px;"
type="primary"
icon="el-icon-plus"
size="small"
......@@ -66,9 +79,10 @@
</el-col>
<el-col :span="1.5">
<el-button
style="padding: 8px 7px;"
type="success"
icon="el-icon-edit"
size="mini"
size="small"
:disabled="single"
@click="handleUpdate"
>修改
......@@ -76,9 +90,10 @@
</el-col>
<el-col :span="1.5">
<el-button
style="padding: 8px 7px;"
type="danger"
icon="el-icon-delete"
size="mini"
size="small"
:disabled="multiple"
@click="handleDelete"
>删除
......@@ -86,6 +101,7 @@
</el-col>
<el-col :span="1.5">
<el-button
style="padding: 8px 7px;"
type="success"
icon="el-icon-download"
size="small"
......@@ -161,8 +177,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.page"
:limit.sync="queryParams.rows"
@pagination="getList"
/>
<!-- 添加或修改参数配置对话框 -->
......@@ -174,14 +190,21 @@
<el-form-item label="字典类型" prop="dictType">
<el-input v-model.trim="form.dictType" :maxlength="30" placeholder="请输入字典类型" />
</el-form-item>
<el-form-item label="状态" prop="flag">
<!-- <el-form-item label="状态" prop="flag">-->
<!-- <el-radio-group v-model="form.flag">-->
<!-- <el-radio-->
<!-- v-for="dict in statusOptions"-->
<!-- :key="dict.dictValue"-->
<!-- :label="dict.dictValue"-->
<!-- >{{ dict.dictLabel }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-radio-group v-model="form.flag">
<el-radio
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>{{ dict.dictLabel }}
</el-radio>
<el-radio label="1">启用</el-radio>
<el-radio label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="父字典名称">
......@@ -313,14 +336,14 @@ export default {
title: '',
// 是否显示弹出层
open: false,
// 状态数据字典
statusOptions: [],
// // 状态数据字典
// statusOptions: [],
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
page: 1,
rows: 10,
dictName: undefined,
dictType: undefined,
flag: undefined
......@@ -364,9 +387,9 @@ export default {
this.queryParams = { ...param }
}
this.getList()
this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
this.statusOptions = response.data
})
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data
// })
optionselect().then(response => {
this.options = response.data
})
......@@ -419,9 +442,9 @@ export default {
})
},
// 字典状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.flag)
},
// statusFormat(row, column) {
// return this.selectDictLabel(this.statusOptions, row.flag)
// },
// 取消按钮
cancel() {
this.open = false
......@@ -442,7 +465,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.queryParams.page = 1
this.getList()
},
/** 重置按钮操作 */
......
src/views/system/role/index.vue
View file @ bfb8c00b
......@@ -22,24 +22,15 @@
@keyup.enter.native="handleQuery"
/>
</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-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button
style="padding: 8px 7px;"
type="primary"
icon="el-icon-search"
size="small"
@click="handleQuery">
查询
</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
......@@ -128,8 +119,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.page"
:limit.sync="queryParams.rows"
@pagination="getList"
/>
......@@ -510,7 +501,7 @@ export default {
},
/** 查询按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.queryParams.page = 1
this.getList()
},
/** 重置按钮操作 */
......
src/views/system/user/index.vue
View file @ bfb8c00b
......@@ -22,22 +22,6 @@
style="width: 150px"
/>
</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-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment