bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
BianLzhaoMin 2025-03-12 16:34:40 +08:00
parent 2ab271b14a
commit 29bd7a0b27
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
View File

@ -188,7 +188,7 @@
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="props"> <template slot-scope="props">
<el-table :data="props.row.childrenList"> <el-table :data="props.row.childrenList">
<el-table-column align="center" prop="typeName" label="设备名称" /> <el-table-column align="center" prop="typeName" label="机具名称" />
<el-table-column align="center" label="规格型号" prop="deviceType" /> <el-table-column align="center" label="规格型号" prop="deviceType" />
<el-table-column align="center" label="设备所属" prop="deviceAscription" /> <el-table-column align="center" label="设备所属" prop="deviceAscription" />
<el-table-column label="预领数量" prop="deviceNum" align="center" /> <el-table-column label="预领数量" prop="deviceNum" align="center" />

9
src/views/store/poleConfig/poleConfig.vue
View File

@ -97,14 +97,14 @@
<el-form-item label="成套名称" prop="completeSetName"> <el-form-item label="成套名称" prop="completeSetName">
<el-input v-model="addCompleteForm.completeSetName" disabled /> <el-input v-model="addCompleteForm.completeSetName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="抱杆设备" prop="mainDevice" class="is-required"> <el-form-item label="成套设备" prop="mainDevice" class="is-required">
<el-cascader <el-cascader
clearable clearable
filterable filterable
ref="mainDeviceRef" ref="mainDeviceRef"
@change="selMainDevice" @change="selMainDevice"
:show-all-levels="false" :show-all-levels="false"
placeholder="请选择抱杆设备" placeholder="请选择成套设备"
:options="deviceTypeTreeNew" :options="deviceTypeTreeNew"
:props="deviceTypeTreeProps" :props="deviceTypeTreeProps"
:disabled="mainDeviceDisabled" :disabled="mainDeviceDisabled"
@ -398,6 +398,11 @@ export default {
this.$message.closeAll() this.$message.closeAll()
const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes() const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
if (checkNode[0].data.isStorage == 0) {
this.$modal.msgError('当前设备非管理库存，无法作为主设备，请重新选择！')
return
}
console.log('checkNode', checkNode) console.log('checkNode', checkNode)
this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2]) this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
if (checkNode.length < 1) return if (checkNode.length < 1) return