Skip to content

T
template_vue
Commit aa4027d9 authored by CenXinYi's avatar CenXinYi
Browse files
Options

Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

parents 3d3c555e 6b7c2147
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 343 deletions
src/api/equipment/draw.js
View file @ aa4027d9
import request from '@/utils/request' import request from '@/utils/request'
import Qs from 'qs'
// 查询基础信息列表 // 查询基础信息列表
export function listWbApply(query) { export function listWbApply(query) {
return request({ return request({
...@@ -8,88 +7,10 @@ export function listWbApply(query) { ...@@ -8,88 +7,10 @@ export function listWbApply(query) {
params: query params: query
}) })
} }
export function getlistRole() { // 逻辑删除基础信息接口
export function deleteLogical(id) {
return request({ return request({
url: 'system/role/listAll', url: '/wbapply/deleteLogical/' + id,
method: 'get'
})
}
// 查询角色详细
export function getRole(businessId) {
return request({
url: '/system/role/detail/' + businessId,
method: 'get'
})
}
// 新增角色
export function addRole(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/add',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 修改角色
export function updateRole(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/system/role/update/' + businessId,
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色数据权限
export function dataScope(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/dataScope',
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色状态修改
export function changeRoleStatus(businessId, flag) {
const data = {
businessId,
flag
}
return request({
url: '/system/role/changeStatus',
method: 'put',
params: data
})
}
// 删除角色
export function delRole(roleId) {
return request({
url: '/system/role/deleteLogical/' + roleId,
method: 'delete' method: 'delete'
}) })
} }
// 导出角色
export function exportRole(query) {
return request({
url: '/system/role/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/views/equipment/application.vue
View file @ aa4027d9
...@@ -117,18 +117,24 @@ export default { ...@@ -117,18 +117,24 @@ export default {
}, },
// 提价时要调的接口 // 提价时要调的接口
submitForm() { submitForm() {
this.$refs.form.validate((valid) => { this.$confirm('是否确认提交?', '提示', {
if (valid) { confirmButtonText: '确定',
addApplication(this.form).then(res => { cancelButtonText: '取消',
console.log('res', res) type: 'warning'
if (res.code === 200) { }).then(res => {
this.$message.success('操作成功') this.$refs.form.validate((valid) => {
this.resetFrom() if (valid) {
} else if (res.code === null) { addApplication(this.form).then(res => {
this.$message.success(res.message) console.log('res', res)
} if (res.code === 200) {
}) this.$message.success('操作成功')
} this.resetFrom()
} else if (res.code === null) {
this.$message.success(res.message)
}
})
}
})
}) })
}, },
// 调数据字典查询 // 调数据字典查询
......
src/views/equipment/basicInfo.vue
View file @ aa4027d9
...@@ -127,24 +127,21 @@ ...@@ -127,24 +127,21 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel"> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<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="pn" prop="pn"> <el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" show-word-limit :maxlength="30" placeholder="请输入pn" /> <el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
</el-form-item>
<el-form-item label="ptype" prop="ptype">
<el-input v-model.trim="form.ptype" show-word-limit :maxlength="30" placeholder="请输入ptype" />
</el-form-item> </el-form-item>
<el-form-item label="pgx" prop="pgx"> <el-form-item label="pgx" prop="pgx">
<el-input v-model.trim="form.pgx" show-word-limit :maxlength="30" placeholder="请输入pgx" /> <el-input v-model.trim="form.pgx" :maxlength="30" placeholder="请输入pgx" />
</el-form-item> </el-form-item>
<el-form-item label="prank" prop="prank"> <el-form-item label="prank" prop="prank">
<el-input v-model.trim="form.prank" show-word-limit :maxlength="30" placeholder="请输入prank" /> <el-input v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" />
</el-form-item> </el-form-item>
<el-form-item label="pissb" prop="pissb"> <el-form-item label="pissb" prop="pissb" >
<el-select <el-select
v-model="form.pissb" v-model="form.pissb"
placeholder="请选择pissb" placeholder="请选择pissb"
clearable clearable
size="small" size="small"
style="width: 150px" style="width: 341px"
> >
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
...@@ -155,10 +152,10 @@ ...@@ -155,10 +152,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="psm" prop="psm"> <el-form-item label="psm" prop="psm">
<el-input v-model.trim="form.psm" show-word-limit :maxlength="30" placeholder="请输入psm" /> <el-input v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" />
</el-form-item> </el-form-item>
<el-form-item label="psy" prop="psy"> <el-form-item label="psy" prop="psy">
<el-input v-model.trim="form.psy" show-word-limit :maxlength="30" placeholder="请输入psy" /> <el-input v-model.trim="form.psy" :maxlength="30" placeholder="请输入psy" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -213,31 +210,6 @@ export default { ...@@ -213,31 +210,6 @@ export default {
dictValue: '0' dictValue: '0'
} }
], ],
// 数据范围选项
dataScopeOptions: [
{
value: '1',
label: '全部数据权限'
},
{
value: '2',
label: '自定数据权限'
},
{
value: '3',
label: '本部门数据权限'
},
{
value: '4',
label: '本部门及以下数据权限'
},
{
value: '5',
label: '仅本人数据权限'
}
],
// 部门列表
tOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
...@@ -308,40 +280,6 @@ export default { ...@@ -308,40 +280,6 @@ export default {
this.loading = false this.loading = false
}) })
}, },
// 所有菜单节点数据
getMenuAllCheckedKeys() {
// 目前被选中的菜单节点
const checkedKeys = this.$refs.menu.getHalfCheckedKeys()
// 半选中的菜单节点
const halfCheckedKeys = this.$refs.menu.getCheckedKeys()
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return checkedKeys
},
// 所有部门节点数据
getDeptAllCheckedKeys() {
// 目前被选中的部门节点
const checkedKeys = this.$refs.dept.getHalfCheckedKeys()
// // 半选中的部门节点
const halfCheckedKeys = this.$refs.dept.getCheckedKeys()
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return this.$refs.dept.getCheckedKeys()
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.data.menus
return response
})
},
/** 根据角色ID和菜单ID查询部门树结构 */
getRoleDeptTreeselect(roleId, menuId) {
return roleDeptTreeselect(roleId, menuId).then(response => {
this.form.deptCheckStrictly = response.data.deptCheckStrictly
this.deptOptions = response.data.depts
this.form.dataScope = this.dataScopeOptions[response.data.dataScope - 1].value
return response
})
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.open = false
......
src/views/equipment/boundManagement.vue
View file @ aa4027d9
...@@ -303,7 +303,11 @@ export default { ...@@ -303,7 +303,11 @@ export default {
form: { form: {
pn: '', pn: '',
lot: '', lot: '',
plocation: '' plocation: '',
phd: '',
psm: '',
pzl: '',
prank: ''
}, },
defaultProps: { defaultProps: {
children: 'children', children: 'children',
......
src/views/equipment/check.vue
View file @ aa4027d9
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
/> />
</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" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<div style="float: right"> <div style="float: right">
<el-form-item> <el-form-item>
...@@ -401,36 +401,60 @@ export default { ...@@ -401,36 +401,60 @@ export default {
this.title = '详情信息' this.title = '详情信息'
this.openDetails = !this.openDetails this.openDetails = !this.openDetails
}, },
deleteByType(){ deleteByType() {
// 添加二次确认对话框
this.$confirm("确认要结束盘点吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
// 用户点击确定按钮时执行的回调函数
deleteByType(1).then(flag => { deleteByType(1).then(flag => {
if(flag.data > 0 && flag.code === 200){ if (flag.data > 0 && flag.code === 200) {
this.$message.success("结束盘点成功") this.$message.success("结束盘点成功");
}else{ } else {
this.$message.error("结束盘点失败") this.$message.error("结束盘点失败");
} }
});
})
.catch(() => {
// 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
});
},
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;
}
// 添加二次确认对话框
this.$confirm("确认要进行盘点吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}) })
}, .then(() => {
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 => { addList(data).then(flag => {
if(flag.data.influence > 0){ if (flag.data.influence > 0) {
this.$message.success("盘点成功") this.$message.success("盘点成功");
}else{ } else {
this.$message.error("盘点失败") this.$message.error("盘点失败");
} }
}) });
} })
}) .catch(() => {
}, // 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
});
}
});
},
handelTab(i, e) { handelTab(i, e) {
const that = this const that = this
......
src/views/equipment/checkProcess.vue
View file @ aa4027d9
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
/> />
</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" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<div style="float: right"> <div style="float: right">
<el-form-item> <el-form-item>
...@@ -392,36 +392,60 @@ export default { ...@@ -392,36 +392,60 @@ export default {
this.title = '详情信息' this.title = '详情信息'
this.openDetails = !this.openDetails this.openDetails = !this.openDetails
}, },
deleteByType(){ deleteByType() {
// 添加二次确认对话框
this.$confirm("确认要结束盘点吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
// 用户点击确定按钮时执行的回调函数
deleteByType(2).then(flag => { deleteByType(2).then(flag => {
if(flag.data > 0){ if (flag.data > 0) {
this.$message.success("结束盘点成功") this.$message.success("结束盘点成功");
}else{ } else {
this.$message.error("结束盘点失败") this.$message.error("结束盘点失败");
} }
}) });
}, })
checkType(){ .catch(() => {
// 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
});
},
checkType() {
// 添加二次确认对话框
this.$confirm("确认要盘点吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
// 用户点击确定按钮时执行的回调函数
checkType(2).then(total => { checkType(2).then(total => {
if(total.data !== 0){ if (total.data !== 0) {
this.$message.error("请先结束盘点") this.$message.error("请先结束盘点");
}else{ } else {
let data = [] let data = [];
if(this.selectList.length === 0){ if (this.selectList.length === 0) {
data = this.equipmentList data = this.equipmentList;
}else{ } else {
data = this.selectList data = this.selectList;
} }
addList(data).then(flag => { addList(data).then(flag => {
if(flag.data.influence > 0){ if (flag.data.influence > 0) {
this.$message.success("盘点成功") this.$message.success("盘点成功");
}else{ } else {
this.$message.error("盘点失败") this.$message.error("盘点失败");
} }
}) });
} }
}) });
}, })
.catch(() => {
// 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
});
},
handelTab(i, e) { handelTab(i, e) {
const that = this const that = this
if (!that.$refs['input' + i]) { if (!that.$refs['input' + i]) {
......
src/views/equipment/draw.vue
View file @ aa4027d9
...@@ -157,21 +157,7 @@ ...@@ -157,21 +157,7 @@
</template> </template>
<script> <script>
// import { import { listWbApply, deleteLogical } from '@/api/equipment/draw'
// addRole,
// changeRoleStatus,
// dataScope,
// delRole,
// exportRole,
// getRole,
// listBasicInfo,
// updateRole
// } from '@/api/equipment/basicInfo'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
import { listBasicInfo } from '@/api/equipment/basicInfo'
import { listWbApply } from '@/api/equipment/draw'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default { export default {
name: 'Role', name: 'Role',
data() { data() {
...@@ -486,22 +472,22 @@ export default { ...@@ -486,22 +472,22 @@ export default {
this.title = '添加角色' this.title = '添加角色'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { // handleUpdate(row) {
this.reset() // this.reset()
const roleId = row.businessId || this.ids // const roleId = row.businessId || this.ids
const roleMenu = this.getRoleMenuTreeselect(roleId) // const roleMenu = this.getRoleMenuTreeselect(roleId)
getRole(roleId).then(response => { // getRole(roleId).then(response => {
this.form = response.data // this.form = response.data
this.open = true // this.open = true
this.getMenuTreeselect(roleId) // this.getMenuTreeselect(roleId)
this.$nextTick(() => { // this.$nextTick(() => {
roleMenu.then(res => { // roleMenu.then(res => {
this.$refs.menu.setCheckedKeys(res.data.checkedKeys) // this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
}) // })
}) // })
this.title = '修改角色' // this.title = '修改角色'
}) // })
}, // },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
...@@ -528,20 +514,18 @@ export default { ...@@ -528,20 +514,18 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.businessId || this.ids const id = row.businessId
this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', { this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(res => {
return delRole(roleIds) deleteLogical(id).then(res => {
}).then(() => { if (res.code === 200) {
this.getList() this.$message.success('操作成功')
this.$message({ this.getList()
message: '删除成功', }
type: 'success'
}) })
}).catch(function() {
}) })
} }
} }
......
src/views/equipment/equipmentAbandonment.vue
View file @ aa4027d9
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
/> />
</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" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" style="padding: 8px 7px;" size="small" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<div style="float: right"> <div style="float: right">
<!-- <el-form-item> <!-- <el-form-item>
...@@ -214,22 +214,22 @@ ...@@ -214,22 +214,22 @@
<el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false"> <el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px"> <el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
<el-form-item label="fq_bz" prop="fq_bz"> <el-form-item label="fq_bz" prop="fq_bz">
<el-input v-model.trim="abandonFrom.fq_bz" show-word-limit :maxlength="30" placeholder="请输入fq_bz" /> <el-input v-model.trim="abandonFrom.fq_bz" :maxlength="30" placeholder="请输入fq_bz" />
</el-form-item> </el-form-item>
<el-form-item label="fq_dd" prop="fq_dd"> <el-form-item label="fq_dd" prop="fq_dd">
<el-input v-model.trim="abandonFrom.fq_dd" show-word-limit :maxlength="30" placeholder="请输入fq_dd" /> <el-input v-model.trim="abandonFrom.fq_dd" :maxlength="30" placeholder="请输入fq_dd" />
</el-form-item> </el-form-item>
<el-form-item label="fq_mcode" prop="fq_mcode"> <el-form-item label="fq_mcode" prop="fq_mcode">
<el-input v-model.trim="abandonFrom.fq_mcode" show-word-limit :maxlength="30" placeholder="请输入fq_mcode" /> <el-input v-model.trim="abandonFrom.fq_mcode" :maxlength="30" placeholder="请输入fq_mcode" />
</el-form-item> </el-form-item>
<el-form-item label="fq_ys" prop="fq_ys"> <el-form-item label="fq_ys" prop="fq_ys">
<el-input v-model.trim="abandonFrom.fq_ys" show-word-limit :maxlength="30" placeholder="请输入fq_ys" /> <el-input v-model.trim="abandonFrom.fq_ys" :maxlength="30" placeholder="请输入fq_ys" />
</el-form-item> </el-form-item>
<el-form-item label="fq_dbxi" prop="fq_dbxi"> <el-form-item label="fq_dbxi" prop="fq_dbxi">
<el-input v-model.trim="abandonFrom.fq_dbxi" show-word-limit :maxlength="30" placeholder="请输入fq_dbxi" /> <el-input v-model.trim="abandonFrom.fq_dbxi" :maxlength="30" placeholder="请输入fq_dbxi" />
</el-form-item> </el-form-item>
<el-form-item label="fq_yy" prop="fq_yy"> <el-form-item label="fq_yy" prop="fq_yy">
<el-input v-model.trim="abandonFrom.fq_yy" show-word-limit :maxlength="30" placeholder="请输入fq_yy" /> <el-input v-model.trim="abandonFrom.fq_yy" :maxlength="30" placeholder="请输入fq_yy" />
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -276,7 +276,7 @@ export default { ...@@ -276,7 +276,7 @@ export default {
}, },
abandonFromRules: { abandonFromRules: {
fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }]
}, },
// TODO: 表单里的单项详情参数 // TODO: 表单里的单项详情参数
singleDetails: { singleDetails: {
...@@ -586,7 +586,7 @@ export default { ...@@ -586,7 +586,7 @@ export default {
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.abandonOpen = false
this.reset() this.reset()
}, },
// 取消按钮（数据权限） // 取消按钮（数据权限）
...@@ -756,6 +756,7 @@ export default { ...@@ -756,6 +756,7 @@ export default {
this.abandonTitle = "废弃表单信息" this.abandonTitle = "废弃表单信息"
this.abandonFrom.businessId = row.businessId this.abandonFrom.businessId = row.businessId
this.abandonOpen = true this.abandonOpen = true
// const EquipmentIds = row.businessId || this.ids; // const EquipmentIds = row.businessId || this.ids;
// const vm = this; // 保存当前上下文 // const vm = this; // 保存当前上下文
......
src/views/equipment/income.vue
View file @ aa4027d9
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
<script> <script>
import { add, updatadevice } from '@/api/magnagement' import { add, updatadevice } from '@/api/magnagement'
export default { export default {
name: 'Role', name: 'Role',
data() { data() {
...@@ -105,36 +104,40 @@ export default { ...@@ -105,36 +104,40 @@ export default {
}, },
// 提交时要调的接口 // 提交时要调的接口
submitForm() { submitForm() {
this.$refs.form.validate((valid) => { this.$confirm('是否确认操作?', '提示', {
if (valid) { confirmButtonText: '确定',
console.log('form', this.form) cancelButtonText: '取消',
// 校验通过，提交表单或进行其他操作 type: 'warning'
if (this.form.businessId !== undefined) { }).then(() => {
updatadevice(this.form).then(res => { this.$refs.form.validate((valid) => {
if (res.code === 200) { if (valid) {
this.open = false console.log('form', this.form)
this.$message.success('操作成功') // 校验通过，提交表单或进行其他操作
this.getList() if (this.form.businessId !== undefined) {
this.reFrom() updatadevice(this.form).then(res => {
} else if (res.code === null) { if (res.code === 200) {
this.$message.error(res.message) this.open = false
} this.$message.success('操作成功')
}) this.resetFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
} else {
add(this.form).then(res => {
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
this.resetFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
}
} else { } else {
add(this.form).then(res => { // 校验失败，显示错误信息或进行其他操作
if (res.code === 200) {
this.open = false
this.$message.success('操作成功')
this.getList()
this.reFrom()
} else if (res.code === null) {
this.$message.error(res.message)
}
})
} }
} else { })
// 校验失败，显示错误信息或进行其他操作
}
}) })
}, },
// 调数据字典查询 // 调数据字典查询
...@@ -161,7 +164,7 @@ export default { ...@@ -161,7 +164,7 @@ export default {
} }
.button{ .button{
margin-top: 7%; margin-top: 7%;
margin-left: 48%; margin-left: 11%;
} }
} }
......
src/views/processManagement/draw.vue
View file @ aa4027d9
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="phd" prop="phd"> <el-form-item label="phd" prop="phdStr">
<el-input <el-input
v-model="queryParams.phd" v-model="queryParams.phdStr"
placeholder="请输入phd" placeholder="请输入phd"
clearable clearable
size="small" size="small"
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="prank" prop="prank"> <el-form-item label="prank" prop="prankStr">
<el-input <el-input
v-model="queryParams.prank" v-model="queryParams.prankStr"
placeholder="请输入prank" placeholder="请输入prank"
clearable clearable
size="small" size="small"
...@@ -157,21 +157,7 @@ ...@@ -157,21 +157,7 @@
</template> </template>
<script> <script>
// import { import { listWbApply, deleteLogical } from '@/api/equipment/draw'
// addRole,
// changeRoleStatus,
// dataScope,
// delRole,
// exportRole,
// getRole,
// listBasicInfo,
// updateRole
// } from '@/api/equipment/basicInfo'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
import { listBasicInfo } from '@/api/equipment/basicInfo'
import { listWbApply } from '@/api/equipment/draw'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default { export default {
name: 'Role', name: 'Role',
data() { data() {
...@@ -486,22 +472,22 @@ export default { ...@@ -486,22 +472,22 @@ export default {
this.title = '添加角色' this.title = '添加角色'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { // handleUpdate(row) {
this.reset() // this.reset()
const roleId = row.businessId || this.ids // const roleId = row.businessId || this.ids
const roleMenu = this.getRoleMenuTreeselect(roleId) // const roleMenu = this.getRoleMenuTreeselect(roleId)
getRole(roleId).then(response => { // getRole(roleId).then(response => {
this.form = response.data // this.form = response.data
this.open = true // this.open = true
this.getMenuTreeselect(roleId) // this.getMenuTreeselect(roleId)
this.$nextTick(() => { // this.$nextTick(() => {
roleMenu.then(res => { // roleMenu.then(res => {
this.$refs.menu.setCheckedKeys(res.data.checkedKeys) // this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
}) // })
}) // })
this.title = '修改角色' // this.title = '修改角色'
}) // })
}, // },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
...@@ -528,20 +514,18 @@ export default { ...@@ -528,20 +514,18 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.businessId || this.ids const id = row.businessId
this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', { this.$confirm('是否确认操作?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(res => {
return delRole(roleIds) deleteLogical(id).then(res => {
}).then(() => { if (res.code === 200) {
this.getList() this.$message.success('操作成功')
this.$message({ this.getList()
message: '删除成功', }
type: 'success'
}) })
}).catch(function() {
}) })
} }
} }
......
src/views/sample/sampleType/index.vue
View file @ aa4027d9
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作时间" prop="createDate" :show-overflow-tooltip="true"> <el-table-column label="操作时间" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.createDate || '-' }} {{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}') || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
......
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