From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并
---
admin/src/components/business/OperaGoodsWindow.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/admin/src/components/business/OperaGoodsWindow.vue b/admin/src/components/business/OperaGoodsWindow.vue
index cb55733..2f66a4f 100644
--- a/admin/src/components/business/OperaGoodsWindow.vue
+++ b/admin/src/components/business/OperaGoodsWindow.vue
@@ -2,11 +2,12 @@
<GlobalWindow
v-loading="isUploading"
:title="title"
+ width="60%"
: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="120px" label-suffix="锛�" >
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" v-trim/>
</el-form-item>
@@ -31,7 +32,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍟嗗搧涓诲浘" prop="imgurl">
- <div style="display: flex; align-items: center;justify-content: center; height: 100%; width: 100%">
+ <div style="display: flex; align-items: center; height: 100%; width: 100%">
<UploadAvatarImage
:file="{ 'imgurlfull': form.imgurlfull, 'imgurl': form.imgurl}"
:uploadData="{folder:'goods'}"
@@ -57,13 +58,13 @@
鏀寔png銆乯pg銆乯peg鏍煎紡锛屽ぇ灏忎笉瓒呰繃2M锛屼笂浼犲浘鐗囦笉鍏佽娑夊強鏀挎不鏁忔劅涓庤壊鎯�,
</p>
</el-form-item>
- <el-form-item label="鍑哄巶浠凤紙鍏冿級" prop="price">
+ <el-form-item label="鍑哄巶浠�" prop="price">
<el-input type="number" v-model="form.price" placeholder="璇疯緭鍏ュ嚭鍘備环" v-trim> <template slot="append"> 鍏�</template> </el-input>
</el-form-item>
- <el-form-item label="閿�鍞环锛堝厓锛�" prop="skuPrice">
+ <el-form-item label="閿�鍞环" prop="skuPrice">
<el-input type="number" v-model="form.skuPrice" placeholder="璇疯緭鍏ラ攢鍞环" v-trim> <template slot="append"> 鍏�</template> </el-input>
</el-form-item>
- <el-form-item label="鍒掔嚎浠凤紙鍏冿級" prop="showPrice">
+ <el-form-item label="鍒掔嚎浠�" prop="showPrice">
<el-input type="number" v-model="form.showPrice" placeholder="璇疯緭鍏ョ嚎浠�" v-trim> <template slot="append"> 鍏�</template> </el-input>
</el-form-item>
<el-form-item label="绉垎鎶垫墸棰濆害" prop="deductRata">
@@ -92,7 +93,7 @@
<el-radio :value="0" :label="0" >涓嬫灦</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="浣跨敤鍟嗗搧鍝佺墝" prop="brandIdList">
+ <el-form-item label="閫傜敤鍟嗗搧鍝佺墝" prop="brandIdList">
<el-select v-model="form.brandIdList" placeholder="璇烽�夋嫨鍟嗗搧鍝佺墝" clearable multiple @change="changeBrand">
<el-option
v-for="item in applyBrands"
@@ -106,7 +107,7 @@
<!--
<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" v-if="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="display: block;width: 100%;" :label="'銆�'+(item.name)+'銆戠郴鍒�'" >
<el-select v-model="item.childIdList" filterable 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>
@@ -210,6 +211,13 @@
this.applyBrands = res
this.applyBrands.forEach(item => {
item.show = this.isSeletedBrand(item)
+ if(this.form.id && this.form.brandList && this.form.brandList.length){
+ this.form.brandList.forEach(item1 => {
+ if (item1.id === item.id) {
+ item.childIdList = item1.childIdList
+ }
+ })
+ }
})
})
},
@@ -221,8 +229,8 @@
this.visible = true
this.form.brandIdList = []
this.form.fileList = []
- this.form.imgurl=''
- this.form.imgurlfull=''
+ this.form.imgurl = ''
+ this.form.imgurlfull = ''
// debugger
// 鏂板缓
if (target == null) {
@@ -247,8 +255,8 @@
})
},
loadInfo () {
- this.form.brandIdList =[]
- this.form.fileList =[]
+ this.form.brandIdList = []
+ this.form.fileList = []
this.api.detail(this.form.id).then(res => {
if (res && res.brandList) {
this.form.brandList = res.brandList
@@ -294,16 +302,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;
}
</style>
--
Gitblit v1.9.3