From 29bd7a0b274967282a671d97066559c62b76b0db Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 12 Mar 2025 16:34:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking1.vue              | 2 +-
 src/views/store/poleConfig/poleConfig.vue                | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 370403b..3408d85 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -188,7 +188,7 @@
             <el-table-column type="expand">
                 <template slot-scope="props">
                     <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="deviceAscription" />
                         <el-table-column label="预领数量" prop="deviceNum" align="center" />
diff --git a/src/views/store/poleConfig/poleConfig.vue b/src/views/store/poleConfig/poleConfig.vue
index 06a7252..ea5deee 100644
--- a/src/views/store/poleConfig/poleConfig.vue
+++ b/src/views/store/poleConfig/poleConfig.vue
@@ -97,14 +97,14 @@
                 <el-form-item label="成套名称" prop="completeSetName">
                     <el-input v-model="addCompleteForm.completeSetName" disabled />
                 </el-form-item>
-                <el-form-item label="抱杆设备" prop="mainDevice" class="is-required">
+                <el-form-item label="成套设备" prop="mainDevice" class="is-required">
                     <el-cascader
                         clearable
                         filterable
                         ref="mainDeviceRef"
                         @change="selMainDevice"
                         :show-all-levels="false"
-                        placeholder="请选择抱杆设备"
+                        placeholder="请选择成套设备"
                         :options="deviceTypeTreeNew"
                         :props="deviceTypeTreeProps"
                         :disabled="mainDeviceDisabled"
@@ -398,6 +398,11 @@ export default {
             this.$message.closeAll()
             const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
 
+            if (checkNode[0].data.isStorage == 0) {
+                this.$modal.msgError('当前设备非管理库存，无法作为主设备，请重新选择！')
+                return
+            }
+
             console.log('checkNode', checkNode)
             this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
             if (checkNode.length < 1) return