From 2193f1e8240e2a0ed5900dddc6347a1d9db081cf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 21 九月 2023 14:38:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
platform/src/components/business/OperaGoodsWindow.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/platform/src/components/business/OperaGoodsWindow.vue b/platform/src/components/business/OperaGoodsWindow.vue
index 4bbcc37..b4d0072 100644
--- a/platform/src/components/business/OperaGoodsWindow.vue
+++ b/platform/src/components/business/OperaGoodsWindow.vue
@@ -2,18 +2,18 @@
<GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm" width="800px"
v-loading="isUploading">
<el-form :model="form" ref="form" label-width="120px" :rules="rules">
- <div style="font-size: 18px;font-weight: bold;">鍩烘湰淇℃伅</div>
+ <div style="font-size: 18px;font-weight: bold; margin-bottom: 10px;">鍩烘湰淇℃伅</div>
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
<el-input v-model="form.name" maxlength="50" placeholder="璇疯緭鍏ュ晢鍝佸悕绉帮紝涓嶈秴杩�50涓瓧" v-trim />
</el-form-item>
<el-form-item label="鍟嗗搧鍝佺墝" prop="brandId">
- <el-select v-model="form.brandId" placeholder="璇烽�夋嫨锛屽崟閫�">
+ <el-select v-model="form.brandId" filterable placeholder="璇烽�夋嫨锛屽崟閫�">
<el-option v-for="item in brandList()" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍟嗗搧绫诲埆" prop="categoryId">
- <el-select v-model="form.categoryId" placeholder="璇烽�夋嫨锛屽崟閫�" @change="categorySelect">
+ <el-select v-model="form.categoryId" filterable placeholder="璇烽�夋嫨锛屽崟閫�" @change="categorySelect">
<el-option v-for="item in categoryList()" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -37,7 +37,7 @@
鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�600*600px
</el-form-item>
<template v-if="form.baseGoodsParamList && form.baseGoodsParamList.length > 0">
- <div style="font-size: 18px;font-weight: bold;">鍙傛暟灞炴�у�奸厤缃� <span
+ <div style="font-size: 18px;font-weight: bold; margin-bottom: 10px;">鍙傛暟灞炴�у�奸厤缃� <span
style="font-size: 13px; font-weight: 500;">鎸夐渶閰嶇疆褰撳墠鍟嗗搧鐨勪骇鍝佸弬鏁板�硷紝鍗曚釜鍙傛暟鍊间笉瓒呰繃30涓瓧</span></div>
<el-form-item :label="item.name" v-for="(item, index) in form.baseGoodsParamList" :key="index">
<el-input v-model="item.val" maxlength="30" type="text" placeholder="璇疯緭鍏�" v-trim />
--
Gitblit v1.9.3