From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并

---
 admin/src/components/business/OperaGoodsInfoWindow.vue |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/admin/src/components/business/OperaGoodsInfoWindow.vue b/admin/src/components/business/OperaGoodsInfoWindow.vue
index 98c0757..38ed54c 100644
--- a/admin/src/components/business/OperaGoodsInfoWindow.vue
+++ b/admin/src/components/business/OperaGoodsInfoWindow.vue
@@ -2,11 +2,12 @@
   <GlobalWindow
     v-loading="isUploading"
     :title="title"
+    width="70%"
     :visible.sync="visible"
     :confirm-working="isWorking"
     @confirm="confirm"
   >
-    <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�" inline>
+    <el-form :model="form" ref="form" :rules="rules" label-width="110px" label-suffix="锛�"  >
       <el-form-item label="鍟嗗搧鍚嶇О" prop="name">
         <el-input v-model="form.name" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" disabled v-trim/>
       </el-form-item>
@@ -86,17 +87,11 @@
         </el-select>
       </el-form-item>
       <div v-if="form.brandIdList && form.brandIdList.length" style="border:1px solid #f2f2f2; margin-left: 150px;width: 700px;padding: 20px 0 0px 0;margin-bottom: 20px;"  class="el-form-item__content">
-<!--
-        <span style="line-height: 32px;font-size: 14px;"><b style="color: #F56C6C;margin-right: 4px;font-size: 11px;">*</b>{{'銆�'+(item.name)+'銆戠郴鍒楋細'}}</span>
--->
-        <el-form-item  v-for="(item,index) in applyBrands.filter(item=>item.show)"   :key="'warning_'+index" style="display: block;width: 100%;"  :label="'銆�'+(item.name)+'銆戠郴鍒�'"  >
+        <el-form-item  v-for="(item,index) in applyBrands.filter(item=>item.show)"   :key="'warning_'+index" style=" width: 100%;" label-width="250px"  :label="'銆�'+(item.name)+'銆戠郴鍒�'"  >
           <el-select v-model="item.childIdList" filterable disabled    multiple   style=" width: 500px;"  clearable  placeholder="璇烽�夋嫨鍝佺墝绯诲垪" >
             <el-option v-for="item in item.childList"   :label="item.name" :value="item.id" :key="'brand_'+index+item.id">  </el-option>
           </el-select>
         </el-form-item>
-<!--
-        <el-button type="danger" style="margin-left: 10px;height: 32px; " @click="delDo(index)" v-if="index>0 || form.detailList.length>1">鍒犻櫎</el-button>
--->
       </div>
       <el-form-item label="鍟嗗搧璇︽儏" prop="content">
         <div  class="agree-list"   v-html="form.content"></div>
@@ -251,21 +246,10 @@
 
 <style lang="scss" scoped>
 @import "@/assets/style/alertstyle.scss";
-::v-deep .el-form-item__content {
-  flex: 0.6;
-}
 ::v-deep .el-select {
   width: 100%;
   .el-input__inner {
     width: 100%;
   }
-}
-::v-deep  .el-form-item__label{
-  width: 150px !important;
-}
-.agree-list{
-  height: 550px;
-  //max-height: 50%;
-  overflow: auto;
 }
 </style>

--
Gitblit v1.9.3