bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:退料申请bug修改

This commit is contained in:
jackal 2024-04-20 14:10:33 +08:00
parent 0d457afa9d
commit 0da44483df
1 changed files with 212 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

423
sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
View File

@ -12,35 +12,25 @@
<el-form-item label="退料单位" prop="unitId"> <el-form-item label="退料单位" prop="unitId">
<el-select <el-select
v-model="queryParams.unitId" v-model="queryParams.unitId"
clearable filterable clearable
filterable
@change="GetProData" @change="GetProData"
style="width: 240px" style="width: 240px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
v-for="item in unitList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="退料工程" prop="proId"> <el-form-item label="退料工程" prop="proId">
<el-select <el-select
v-model="queryParams.proId" v-model="queryParams.proId"
clearable filterable clearable
filterable
@change="GetUnitData" @change="GetUnitData"
style="width: 240px" style="width: 240px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
v-for="item in proList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="协议号" prop="agreementCode"> <el-form-item label="协议号" prop="agreementCode">
@ -71,14 +61,14 @@
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择时间" placeholder="选择时间"
> ></el-date-picker>
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="退料人电话" prop="phone"> <el-form-item label="退料人电话" prop="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
placeholder="请输入退料人电话" placeholder="请输入退料人电话"
clearable maxlength="11" clearable
maxlength="11"
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
@ -99,24 +89,10 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" plain icon="el-icon-back" size="mini" @click="handleBack">退料管理</el-button>
type="success"
plain
icon="el-icon-back"
size="mini"
@click="handleBack"
>退料管理</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">保存</el-button>
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>保存</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -129,10 +105,7 @@
v-hasPermi="['system:role:export']" v-hasPermi="['system:role:export']"
>导出</el-button>--> >导出</el-button>-->
</el-col> </el-col>
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table <el-table
@ -142,50 +115,25 @@
> >
<el-table-column type="selection" min-width="55" align="center" :selectable="selectable" /> <el-table-column type="selection" min-width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" type="index" min-width="120" /> <el-table-column label="序号" type="index" min-width="120" />
<el-table-column <el-table-column label="类型名称" prop="typeName" min-width="200" :show-overflow-tooltip="true" />
label="类型名称" <el-table-column label="规格型号" prop="typeCode" min-width="200" :show-overflow-tooltip="true" />
prop="typeName"
min-width="200"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
prop="typeCode"
min-width="200"
:show-overflow-tooltip="true"
/>
<el-table-column label="计量单位" prop="unitNames" min-width="100" /> <el-table-column label="计量单位" prop="unitNames" min-width="100" />
<el-table-column <el-table-column label="当前在用量" align="center" prop="num" min-width="180"></el-table-column>
label="当前在用量" <el-table-column label="退料数量" align="center" prop="createTime" min-width="180">
align="center"
prop="useNum"
min-width="180"
>
</el-table-column>
<el-table-column
label="退料数量"
align="center"
prop="createTime"
min-width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model.number="scope.row.num" v-model.number="scope.row.num"
placeholder="请输入退料数量" placeholder="请输入退料数量"
type="number" type="number"
min="1" min="1"
clearable @input="checkNum(scope.row)" clearable
@input="checkNum(scope.row)"
style="width: 100%" style="width: 100%"
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="备注" align="center" prop="remark" min-width="180">
label="备注"
align="center"
prop="remark"
min-width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.remark" v-model="scope.row.remark"
@ -216,8 +164,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete({ ...scope.row, index: scope.$index })" @click="handleDelete({ ...scope.row, index: scope.$index })"
>删除</el-button >删除</el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -225,8 +172,8 @@
</template> </template>
<script> <script>
import { getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from '@/api/system/role'
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; import { treeselect as menuTreeselect, roleMenuTreeselect } from '@/api/system/menu'
import { import {
getProData, getProData,
getUnitData, getUnitData,
@ -234,28 +181,26 @@ import {
getAgreementInfoById, getAgreementInfoById,
submitLeaseApply, submitLeaseApply,
getUseTypeTreee, getUseTypeTreee,
getUseNumByTypeId getUseNumByTypeId,
} from '@/api/claimAndRefund/receive' } from '@/api/claimAndRefund/receive'
import { ApiSubmitBackApply } from "@/api/claimAndRefund/return" import { ApiSubmitBackApply } from '@/api/claimAndRefund/return'
import { submitBackApplyApi,materialReturnNoteByApply,submitRefuseBackApply } from "@/api/claimAndRefund/return.js" import { submitBackApplyApi, materialReturnNoteByApply, submitRefuseBackApply } from '@/api/claimAndRefund/return.js'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import { import { getInfo, h } from '@/api/login'
getInfo, h
} from "@/api/login";
export default { export default {
name: "ReturnApplyAdd", name: 'ReturnApplyAdd',
data() { data() {
const validatePhone = (rule, value, callback) => { const validatePhone = (rule, value, callback) => {
if (!value) { if (!value) {
callback(new Error("退料人电话不能为空")); callback(new Error('退料人电话不能为空'))
// this.$message.error("手机号不为空"); // this.$message.error("手机号不为空");
} else if (value.length < 11) { } else if (value.length < 11) {
callback(new Error("电话号码格式不正确")); callback(new Error('电话号码格式不正确'))
// this.$message.error("手机号格式不正确"); // this.$message.error("手机号格式不正确");
} else { } else {
callback(); callback()
}
} }
};
return { return {
// 遮罩层 // 遮罩层
loading: false, loading: false,
@ -272,7 +217,7 @@ export default {
// 角色表格数据 // 角色表格数据
roleList: [], roleList: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 是否显示弹出层（数据权限） // 是否显示弹出层（数据权限）
@ -286,25 +231,25 @@ export default {
// 数据范围选项 // 数据范围选项
dataScopeOptions: [ dataScopeOptions: [
{ {
value: "1", value: '1',
label: "全部数据权限" label: '全部数据权限',
}, },
{ {
value: "2", value: '2',
label: "自定数据权限" label: '自定数据权限',
}, },
{ {
value: "3", value: '3',
label: "本部门数据权限" label: '本部门数据权限',
}, },
{ {
value: "4", value: '4',
label: "本部门及以下数据权限" label: '本部门及以下数据权限',
}, },
{ {
value: "5", value: '5',
label: "仅本人数据权限" label: '仅本人数据权限',
} },
], ],
// 菜单列表 // 菜单列表
menuOptions: [], menuOptions: [],
@ -312,7 +257,6 @@ export default {
deptOptions: [], deptOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
types: 2, types: 2,
unitId: null, unitId: null,
@ -328,10 +272,10 @@ export default {
leaseApplyInfo: { leaseApplyInfo: {
backPerson: '', backPerson: '',
phone: '', phone: '',
remark: '' remark: '',
}, },
//退料详情集合 //退料详情集合
leaseApplyDetails: [] leaseApplyDetails: [],
}, },
leaseApplyDetails: [], leaseApplyDetails: [],
//退料详情单条模板 //退料详情单条模板
@ -343,7 +287,7 @@ export default {
typeName: '', //显示的设备类型 typeName: '', //显示的设备类型
typeCode: '', //显示的设备规格 typeCode: '', //显示的设备规格
unitNames: '', //显示的设备 单位 unitNames: '', //显示的设备 单位
useNum: '', //当前在用量 num: '', //当前在用量
remark: '', //单条备注 remark: '', //单条备注
preNum: 1, //预领数量 preNum: 1, //预领数量
}, },
@ -351,28 +295,38 @@ export default {
queryRules: { queryRules: {
unitId: [ unitId: [
{ {
required: true, message: '请选择退料单位', trigger: 'change', type: 'number' required: true,
} message: '请选择退料单位',
trigger: 'change',
type: 'number',
},
], ],
proId: [ proId: [
{ {
required: true, message: '请选择退料工程', trigger: 'change', type: 'number' required: true,
} message: '请选择退料工程',
trigger: 'change',
type: 'number',
},
], ],
backPerson: [ backPerson: [
{ {
required: true, message: '请输入退料人', trigger: 'blur', required: true,
} message: '请输入退料人',
trigger: 'blur',
},
], ],
backTime: [ backTime: [
{ {
required: true, message: '请选择退料时间', trigger: 'change', required: true,
} message: '请选择退料时间',
trigger: 'change',
},
], ],
phone: [ phone: [
{ required: true, message: '请输入退料人手机号', trigger: 'change' }, { required: true, message: '请输入退料人手机号', trigger: 'change' },
{ validator: validatePhone, trigger: "blur" }, { validator: validatePhone, trigger: 'blur' },
{ min: 11, message: "手机号不足11位", trigger: "blur" }, { min: 11, message: '手机号不足11位', trigger: 'blur' },
], ],
}, },
unitList: [], //单位 集合 unitList: [], //单位 集合
@ -383,7 +337,7 @@ export default {
children: 'children', children: 'children',
label: 'typeName', label: 'typeName',
// multiple: false, // multiple: false,
value: 'typeId' value: 'typeId',
}, },
// 选中的设备类型 // 选中的设备类型
deviceType: null, deviceType: null,
@ -396,29 +350,23 @@ export default {
// }, // },
// 表单校验 // 表单校验
rules: { rules: {
roleName: [ roleName: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
{ required: true, message: "角色名称不能为空", trigger: "blur" } roleKey: [{ required: true, message: '权限字符不能为空', trigger: 'blur' }],
], roleSort: [{ required: true, message: '角色顺序不能为空', trigger: 'blur' }],
roleKey: [
{ required: true, message: "权限字符不能为空", trigger: "blur" }
],
roleSort: [
{ required: true, message: "角色顺序不能为空", trigger: "blur" }
]
}, },
companyId: '', companyId: '',
createBy: '', createBy: '',
isEdit: 'true', isEdit: 'true',
rowId:'' rowId: '',
}; }
}, },
created() { created() {
this.GetUnitData() this.GetUnitData()
this.GetProData() this.GetProData()
this.GetDeviceTypeTreeFn() // this.GetDeviceTypeTreeFn()
// this.getList(); // this.getList();
// console.log('this.$route.query.isEdit', this.$route.query.isEdit) // console.log('this.$route.query.isEdit', this.$route.query.isEdit)
this.isEdit = this.$route.query.isEdit; this.isEdit = this.$route.query.isEdit
if (this.$route.query.Id) { if (this.$route.query.Id) {
this.rowId = this.$route.query.Id this.rowId = this.$route.query.Id
this.returnNoteByApply(this.$route.query.Id) this.returnNoteByApply(this.$route.query.Id)
@ -429,13 +377,14 @@ export default {
}) })
}, },
computed: { computed: {
...mapState(['user']) ...mapState(['user']),
}, },
methods: { methods: {
// 获取 来往单位 列表数据 // 获取 来往单位 列表数据
async GetUnitData() { async GetUnitData() {
this.leaseApplyDetails.splice(0, this.leaseApplyDetails.length)
const params = { const params = {
id: this.queryParams.proId/* */ id: this.queryParams.proId /* */,
} }
const res = await getUnitData(params) const res = await getUnitData(params)
this.unitList = res.data this.unitList = res.data
@ -444,8 +393,9 @@ export default {
}, },
// 获取 工程名称 列表数据 // 获取 工程名称 列表数据
async GetProData() { async GetProData() {
this.leaseApplyDetails.splice(0, this.leaseApplyDetails.length)
const params = { const params = {
id: this.queryParams.unitId id: this.queryParams.unitId,
} }
const res = await getProData(params) const res = await getProData(params)
this.proList = res.data this.proList = res.data
@ -455,12 +405,12 @@ export default {
// 获取 设备树结构数据 // 获取 设备树结构数据
async GetDeviceTypeTreeFn(agreementId) { async GetDeviceTypeTreeFn(agreementId) {
const params = { const params = {
agreementId: agreementId agreementId: agreementId,
// this.agreementId // this.agreementId
} }
const res = await getUseTypeTreee(params) const res = await getUseTypeTreee(params)
console.log("resgetUseTypeTreee==========", res) console.log('resgetUseTypeTreee==========', res)
this.deviceTypeTree = res.data this.deviceTypeTree = res.data
}, },
// 获取 协议id // 获取 协议id
@ -468,11 +418,11 @@ export default {
if (this.queryParams.unitId && this.queryParams.proId) { if (this.queryParams.unitId && this.queryParams.proId) {
const params = { const params = {
unitId: this.queryParams.unitId, unitId: this.queryParams.unitId,
projectId: this.queryParams.proId projectId: this.queryParams.proId,
} }
const res = await getAgreementInfoById(params) const res = await getAgreementInfoById(params)
if (!(res.data && res.data.agreementId)) { if (!(res.data && res.data.agreementId)) {
this.$message.error('当前单位和工程未上传'); this.$message.error('当前单位和工程未上传')
this.queryParams.unitId = null this.queryParams.unitId = null
this.queryParams.proId = null this.queryParams.proId = null
this.GetUnitData() this.GetUnitData()
@ -481,7 +431,6 @@ export default {
this.queryParams.agreementId = res.data.agreementId this.queryParams.agreementId = res.data.agreementId
this.queryParams.agreementCode = res.data.agreementCode this.queryParams.agreementCode = res.data.agreementCode
this.GetDeviceTypeTreeFn(res.data.agreementId) this.GetDeviceTypeTreeFn(res.data.agreementId)
} }
} }
}, },
@ -502,11 +451,10 @@ export default {
this.queryParams.remark = data.remark this.queryParams.remark = data.remark
this.leaseApplyDetails = res.data this.leaseApplyDetails = res.data
this.GetDeviceTypeTreeFn(data.agreementId) this.GetDeviceTypeTreeFn(data.agreementId)
}, },
//生成回显数据 //生成回显数据
handelEchoData(item) { handelEchoData(item) {
console.log('item======', item); console.log('item======', item)
const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem)) const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
template.createBy = item.createBy template.createBy = item.createBy
template.parentId = item.data.parentId template.parentId = item.data.parentId
@ -522,103 +470,97 @@ export default {
return template return template
}, },
/** 查询角色列表 */ /** 查询角色列表 */
async getList() { async getList() {},
},
/** 查询菜单树结构 */ /** 查询菜单树结构 */
getMenuTreeselect() { getMenuTreeselect() {
menuTreeselect().then(response => { menuTreeselect().then(response => {
this.menuOptions = response.data; this.menuOptions = response.data
}); })
}, },
// 所有菜单节点数据 // 所有菜单节点数据
getMenuAllCheckedKeys() { getMenuAllCheckedKeys() {
// 目前被选中的菜单节点 // 目前被选中的菜单节点
let checkedKeys = this.$refs.menu.getCheckedKeys(); let checkedKeys = this.$refs.menu.getCheckedKeys()
// 半选中的菜单节点 // 半选中的菜单节点
let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys(); let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys()
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys); checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return checkedKeys; return checkedKeys
}, },
// 所有部门节点数据 // 所有部门节点数据
getDeptAllCheckedKeys() { getDeptAllCheckedKeys() {
// 目前被选中的部门节点 // 目前被选中的部门节点
let checkedKeys = this.$refs.dept.getCheckedKeys(); let checkedKeys = this.$refs.dept.getCheckedKeys()
// 半选中的部门节点 // 半选中的部门节点
let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys(); let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys()
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys); checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return checkedKeys; return checkedKeys
}, },
/** 根据角色ID查询菜单树结构 */ /** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) { getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => { return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.menus; this.menuOptions = response.menus
return response; return response
}); })
}, },
/** 根据角色ID查询部门树结构 */ /** 根据角色ID查询部门树结构 */
getDeptTree(roleId) { getDeptTree(roleId) {
return deptTreeSelect(roleId).then(response => { return deptTreeSelect(roleId).then(response => {
this.deptOptions = response.depts; this.deptOptions = response.depts
return response; return response
}); })
}, },
// 角色状态修改 // 角色状态修改
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// 取消按钮（数据权限） // 取消按钮（数据权限）
cancelDataScope() { cancelDataScope() {
this.openDataScope = false; this.openDataScope = false
this.reset(); this.reset()
}, },
// 表单重置 // 表单重置
reset() { reset() {
if (this.$refs.menu != undefined) { if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([]); this.$refs.menu.setCheckedKeys([])
} }
this.menuExpand = false, ;(this.menuExpand = false),
this.menuNodeAll = false, (this.menuNodeAll = false),
this.deptExpand = true, (this.deptExpand = true),
this.deptNodeAll = false, (this.deptNodeAll = false),
this.form = { (this.form = {
roleId: undefined, roleId: undefined,
roleName: undefined, roleName: undefined,
roleKey: undefined, roleKey: undefined,
roleSort: 0, roleSort: 0,
status: "0", status: '0',
menuIds: [], menuIds: [],
deptIds: [], deptIds: [],
menuCheckStrictly: true, menuCheckStrictly: true,
deptCheckStrictly: true, deptCheckStrictly: true,
remark: undefined remark: undefined,
}; })
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = []; this.dateRange = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
//是否可用勾选框 //是否可用勾选框
selectable(row) { selectable(row) {
console.log(row) console.log(row)
if (row.useNum != 0) { if (row.num != 0) {
return true return true
} else { } else {
return false return false
} }
@ -630,37 +572,35 @@ export default {
// 更多操作触发 // 更多操作触发
handleCommand(command, row) { handleCommand(command, row) {
switch (command) { switch (command) {
case "handleDataScope": case 'handleDataScope':
this.handleDataScope(row); this.handleDataScope(row)
break; break
case "handleAuthUser": case 'handleAuthUser':
this.handleAuthUser(row); this.handleAuthUser(row)
break; break
default: default:
break; break
} }
}, },
/** 保存按钮操作 */ /** 保存按钮操作 */
handleAdd() { handleAdd() {
this.$refs.queryForm.validate(async (valid) => { this.$refs.queryForm.validate(async valid => {
if (!valid) { if (!valid) {
return false return false
} else { } else {
let backApplyInfo = [] let backApplyInfo = []
if (this.queryParams.leaseApplyDetails.length == 0) { if (this.queryParams.leaseApplyDetails.length == 0) {
this.$message.error('请添加数据'); this.$message.error('请添加数据')
return return
} }
// const isRemark = this.queryParams.leaseApplyDetails.some( // const isRemark = this.queryParams.leaseApplyDetails.some(
// (item) => item.remark == '' || item.remark == undefined // (item) => item.remark == '' || item.remark == undefined
// ); // );
const isNum = this.queryParams.leaseApplyDetails.some( const isNum = this.queryParams.leaseApplyDetails.some(item => item.num == '' || item.num == undefined)
(item) => item.num == '' || item.num == undefined
);
if (isNum) { if (isNum) {
this.$message.error('退料数量不能为空！'); this.$message.error('退料数量不能为空！')
return; return
} }
this.queryParams.createBy = this.user.name this.queryParams.createBy = this.user.name
this.queryParams.companyId = this.companyId this.queryParams.companyId = this.companyId
@ -684,7 +624,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.$message({ type: 'success', message: res.msg }) this.$message({ type: 'success', message: res.msg })
setTimeout(() => { setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"}); this.$tab.closeOpenPage({ path: '/claimAndRefund/return/returnApply' })
}, 1000) }, 1000)
} }
} else { } else {
@ -699,62 +639,59 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.$message({ type: 'success', message: res.msg }) this.$message({ type: 'success', message: res.msg })
setTimeout(() => { setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"}); this.$tab.closeOpenPage({ path: '/claimAndRefund/return/returnApply' })
}, 1000) }, 1000)
} }
} }
} }
}) })
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleBack(row) { handleBack(row) {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"}); this.$tab.closeOpenPage({ path: '/claimAndRefund/return/returnApply' })
}, },
/** 分配数据权限操作 */ /** 分配数据权限操作 */
handleDataScope(row) { handleDataScope(row) {
this.reset(); this.reset()
const deptTreeSelect = this.getDeptTree(row.roleId); const deptTreeSelect = this.getDeptTree(row.roleId)
getRole(row.roleId).then(response => { getRole(row.roleId).then(response => {
this.form = response.data; this.form = response.data
this.openDataScope = true; this.openDataScope = true
this.$nextTick(() => { this.$nextTick(() => {
deptTreeSelect.then(res => { deptTreeSelect.then(res => {
this.$refs.dept.setCheckedKeys(res.checkedKeys); this.$refs.dept.setCheckedKeys(res.checkedKeys)
}); })
}); })
this.title = "分配数据权限"; this.title = '分配数据权限'
}); })
}, },
/** 分配用户操作 */ /** 分配用户操作 */
handleAuthUser: function(row) { handleAuthUser: function(row) {
const roleId = row.roleId; const roleId = row.roleId
this.$router.push("/system/role-auth/user/" + roleId); this.$router.push('/system/role-auth/user/' + roleId)
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.roleId != undefined) { if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys()
updateRole(this.form).then(response => { updateRole(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys()
addRole(this.form).then(response => { addRole(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
@ -763,13 +700,17 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('system/role/export', { this.download(
...this.queryParams 'system/role/export',
}, `role_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`role_${new Date().getTime()}.xlsx`
)
}, },
checkNum(row) { checkNum(row) {
let maxNum = row.useNum let maxNum = row.num
if (row.num <= 1) { if (row.num <= 1) {
row.num = 1 row.num = 1
} else if (row.num >= maxNum) { } else if (row.num >= maxNum) {
@ -779,18 +720,24 @@ export default {
/////// 设备类型树 切换 /////// 设备类型树 切换
async deviceTypeChange(val) { async deviceTypeChange(val) {
let nodes = null; let nodes = null
console.log("vall1211221122", this.$refs.deviceTypeCascader.getCheckedNodes().length, this.$refs.deviceTypeCascader.getCheckedNodes(), [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]) // console.log(
nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)] // 'vall1211221122',
console.log("nodes", nodes) // this.$refs.deviceTypeCascader.getCheckedNodes().length,
const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId }) // this.$refs.deviceTypeCascader.getCheckedNodes(),
nodes[0].data.useNum = res.data // [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
// )
nodes =
this.$refs.deviceTypeCascader.getCheckedNodes().length > 0
? this.$refs.deviceTypeCascader.getCheckedNodes()
: [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
console.log('nodes', nodes)
// const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId })
// nodes[0].data.num = res.data
if (nodes[0].level != 4) { if (nodes[0].level != 4) {
return return
} }
this.leaseApplyDetails.push( this.leaseApplyDetails.push(this.handelTableItemData(nodes[0]))
this.handelTableItemData(nodes[0])
)
// this.$refs.cascader.$refs.panel.clearCheckedNodes() // this.$refs.cascader.$refs.panel.clearCheckedNodes()
// // 设置为空可以让节点不高亮显示 // // 设置为空可以让节点不高亮显示
// this.$refs.cascader.$refs.panel.activePath = [] // this.$refs.cascader.$refs.panel.activePath = []
@ -807,9 +754,9 @@ export default {
template.preNum = node.data.num template.preNum = node.data.num
template.typeName = node.pathLabels[2] template.typeName = node.pathLabels[2]
template.typeCode = node.pathLabels[3] template.typeCode = node.pathLabels[3]
template.useNum = node.data.useNum template.num = node.data.num
return template return template
},
},
} }
}
};
</script> </script>