From 30234c9c3c7824c23627827366f39ac060b9e59f Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Mon, 2 Mar 2026 17:30:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E4=BD=8D=E7=BD=AE=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/select/BusinessSelect.vue |  2 +-
 src/views/business/resource/sj/comps/Bj.vue        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/business/comps/select/BusinessSelect.vue b/src/views/business/comps/select/BusinessSelect.vue
index 1bd2878..378af11 100644
--- a/src/views/business/comps/select/BusinessSelect.vue
+++ b/src/views/business/comps/select/BusinessSelect.vue
@@ -94,7 +94,7 @@ export default {
         listData(this.queryParams).then(response => {
           this.list = response.rows
           this.list.forEach(item => {
-            item.dictLabel = item.bh
+            item.dictLabel = item.location + '/' + item.name + '/' + item.shelfPlacement
             item.dictCode = item.id
           })
         })
diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue
index c8b379e..0572020 100644
--- a/src/views/business/resource/sj/comps/Bj.vue
+++ b/src/views/business/resource/sj/comps/Bj.vue
@@ -41,17 +41,17 @@
         </template>
         <el-row>
           <el-col :span="12">
-            <!-- 存储条件 -->
-            <el-form-item :label="$t('page.business.resource.sj.cctj')" prop="cctj">
-              <BusinessSelect dictType="business_cctj" v-model="form.cctj" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <!-- 存储位置 -->
             <el-form-item :label="$t('page.business.resource.sj.ccwz')" prop="ccwz">
               <BusinessSelect dictType="business_ccwz" v-model="form.ccwz" @change="onChangeCcwz"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <!-- 存储条件 -->
+            <el-form-item :label="$t('page.business.resource.sj.cctj')" prop="cctj">
+              <BusinessSelect dictType="business_cctj" v-model="form.cctj" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -164,7 +164,7 @@ export default {
       })
     },
     onChangeCcwz(val) {
-      console.log(val)
+      this.form.cctj = val.wc
     }
   }
 }