From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
company_admin/src/components/business/OperaGoodsWindow.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/company_admin/src/components/business/OperaGoodsWindow.vue b/company_admin/src/components/business/OperaGoodsWindow.vue
index e22ce7f..f54453e 100644
--- a/company_admin/src/components/business/OperaGoodsWindow.vue
+++ b/company_admin/src/components/business/OperaGoodsWindow.vue
@@ -31,7 +31,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item :label="name1" prop="attrFirstIds" v-if="name1">
+ <!-- <el-form-item :label="name1" prop="attrFirstIds" v-if="name1">
<el-select v-model="form.attrFirstIds" multiple placeholder="璇烽�夋嫨锛屾敮鎸佸閫�">
<el-option
v-for="item in form.attrFirstList"
@@ -50,7 +50,7 @@
:value="item.id">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鎸囧浠凤紙鍏冿級" prop="zdPrice">
<el-input v-model="form.zdPrice" @input="priceCHANEG(form.zdPrice, 1)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓" v-trim/>
</el-form-item>
@@ -61,7 +61,7 @@
<el-upload
:action="action"
:file-list="form.ztList"
- :data="{ folder: 'projects' }"
+ :data="{ folder: 'goods_img' }"
list-type="picture-card"
:limit="1"
:on-success="fileSuccess"
@@ -76,7 +76,7 @@
:action="action"
:file-list="form.files"
:multiple="true"
- :data="{ folder: 'projects' }"
+ :data="{ folder: 'goods_img' }"
list-type="picture-card"
:on-success="fileSuccess1"
:on-remove="handleRemove1">
@@ -84,10 +84,12 @@
<div slot="tip" class="el-upload__tip">鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�600*600px</div>
</el-upload>
</el-form-item>
- <div style="font-size: 18px;font-weight: bold;">鍙傛暟灞炴�у�奸厤缃� <span style="font-size: 13px; font-weight: 500;">鎸夐渶閰嶇疆褰撳墠鍟嗗搧鐨勪骇鍝佸弬鏁板�硷紝鍗曚釜鍙傛暟鍊间笉瓒呰繃30涓瓧</span></div>
- <el-form-item :label="item.name" v-for="(item, index) in form.goodsParamList" :key="index">
- <el-input v-model="item.val" maxlength="30" type="text" placeholder="璇疯緭鍏�" v-trim/>
- </el-form-item>
+ <template v-if="form.goodsParamList && form.goodsParamList.length > 0">
+ <div style="font-size: 18px;font-weight: bold;">鍙傛暟灞炴�у�奸厤缃� <span style="font-size: 13px; font-weight: 500;">鎸夐渶閰嶇疆褰撳墠鍟嗗搧鐨勪骇鍝佸弬鏁板�硷紝鍗曚釜鍙傛暟鍊间笉瓒呰繃30涓瓧</span></div>
+ <el-form-item :label="item.name" v-for="(item, index) in form.goodsParamList" :key="index">
+ <el-input v-model="item.val" maxlength="30" type="text" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ </template>
</el-form>
</GlobalWindow>
</template>
@@ -96,14 +98,14 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { brand } from '@/api/system/common.js'
- import { findListForGoodsId, create, updateById } from '@/api/business/goods.js'
+ import { findListForGoodsId, create, updateById, companyCreate, companyUpdateById } from '@/api/business/goods.js'
export default {
name: 'OperaGoodsWindow',
extends: BaseOpera,
components: { GlobalWindow },
data () {
return {
- action: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
+ action: process.env.VUE_APP_API_PREFIX + '/public/upload',
name1: '',
name2: '',
// 琛ㄥ崟鏁版嵁
@@ -259,7 +261,7 @@
this.form.attrSecodIds = ''
}
if (!this.form.id) {
- create(this.form)
+ companyCreate({...this.form, type: 0})
.then(() => {
this.visible = false
this.$tip.apiSuccess('鏂板缓鎴愬姛')
@@ -272,7 +274,7 @@
this.isWorking = false
})
} else {
- updateById(this.form)
+ companyUpdateById({...this.form, type: 0})
.then(() => {
this.visible = false
this.$tip.apiSuccess('缂栬緫鎴愬姛')
--
Gitblit v1.9.3