From 293bdee572c9d51a93656f98da441ce31ac38d6e Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 15:30:37 +0800
Subject: [PATCH] #联调修改
---
platform/src/components/business/OperaGoodsWindow.vue | 327 ++++++++++++------------------------------------------
1 files changed, 75 insertions(+), 252 deletions(-)
diff --git a/platform/src/components/business/OperaGoodsWindow.vue b/platform/src/components/business/OperaGoodsWindow.vue
index 440f444..4bbcc37 100644
--- a/platform/src/components/business/OperaGoodsWindow.vue
+++ b/platform/src/components/business/OperaGoodsWindow.vue
@@ -1,94 +1,46 @@
<template>
- <GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- width="800px"
- >
+ <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>
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
- <el-input v-model="form.name" maxlength="50" placeholder="璇疯緭鍏ュ晢鍝佸悕绉帮紝涓嶈秴杩�50涓瓧" v-trim/>
+ <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-option
- v-for="item in brandList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <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">
- <!-- @change="changeCategory(form.categoryId)" -->
- <el-select v-model="form.categoryId" placeholder="璇烽�夋嫨锛屽崟閫�">
- <el-option
- v-for="item in categoryList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select v-model="form.categoryId" placeholder="璇烽�夋嫨锛屽崟閫�" @change="categorySelect">
+ <el-option v-for="item in categoryList()" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <!-- <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"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item :label="name2" prop="attrSecodIds" v-if="name2">
- <el-select v-model="form.attrSecodIds" multiple placeholder="璇烽�夋嫨锛屾敮鎸佸閫�">
- <el-option
- v-for="item in form.attrSecodList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </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-input v-model="form.zdPrice" @input="priceCHANEG(form.zdPrice, 1)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓"
+ v-trim />
</el-form-item>
<el-form-item label="鍏ユ墜浠凤紙鍏冿級" prop="price">
- <el-input v-model="form.price" @input="priceCHANEG(form.price, 2)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓" v-trim/>
+ <el-input v-model="form.price" @input="priceCHANEG(form.price, 2)" type="number" placeholder="寤鸿褰曞叆鏁存暟锛屽崟浣嶅厓"
+ v-trim />
</el-form-item>
<el-form-item label="鍟嗗搧涓诲浘">
- <el-upload
- :action="action"
- :file-list="form.ztList"
- :data="{ folder: 'goods_img' }"
- list-type="picture-card"
- :limit="1"
- :on-success="fileSuccess"
- :on-exceed="exceed"
- :on-remove="handleRemove">
- <i class="el-icon-plus"></i>
- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�140*140px</div>
- </el-upload>
+ <UploadAvatarImage :file="{ 'imgurlfull': form.imgfullurl, 'imgurl': form.imgurl }" :uploadData="uploadData"
+ tipsLabel="" @uploadSuccess="uploadReverseSuccess" @uploadEnd="isUploading = false"
+ @uploadBegin="isUploading = true" />
+ 鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�140px*140px
</el-form-item>
- <el-form-item label="鍟嗗搧鍥剧墖">
- <el-upload
- :action="action"
- :file-list="form.files"
- :multiple="true"
- :data="{ folder: 'goods_img' }"
- list-type="picture-card"
- :on-success="fileSuccess1"
- :on-remove="handleRemove1">
- <i class="el-icon-plus"></i>
- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�600*600px</div>
- </el-upload>
+ <el-form-item label="鍟嗗搧鍥剧墖">
+ <UploadImage :fileList="form.multifileList" :uploadData="uploadData" @beginUpload="isUploading = true" @endUpload="isUploading = false" />
+ 鍙兘涓婁紶鍥剧墖鏍煎紡锛宲ng鏍煎紡锛屽缓璁昂瀵�600*600px
</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/>
+ <template v-if="form.baseGoodsParamList && form.baseGoodsParamList.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.baseGoodsParamList" :key="index">
+ <el-input v-model="item.val" maxlength="30" type="text" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
</template>
</el-form>
@@ -98,18 +50,21 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import { brand } from '@/api/system/common.js'
-import { findListForGoodsId, create, updateById, companyCreate, companyUpdateById } from '@/api/business/goods.js'
+import UploadAvatarImage from '@/components/common/UploadAvatarImage.vue'
+import UploadImage from '@/components/common/UploadImage.vue'
+import { baseCategory, brand } from '@/api/system/common.js'
+import { companyCreate, companyUpdateById } from '@/api/business/goods.js'
export default {
name: 'OperaGoodsWindow',
extends: BaseOpera,
- components: { GlobalWindow },
- data () {
+ components: { GlobalWindow, UploadAvatarImage, UploadImage },
+ data() {
return {
action: process.env.VUE_APP_API_PREFIX + '/public/upload',
name1: '',
name2: '',
// 琛ㄥ崟鏁版嵁
+ isUploading: false,
form: {
id: null,
name: '',
@@ -117,17 +72,13 @@
brandId: '',
zdPrice: '',
price: '',
- attrFirstIds: [],
- attrFirstNames: '',
- attrSecodIds: [],
- attrSecodNames: '',
imgurl: '',
+ imgfullurl: '',
multifileList: [],
- files: [],
- ztList: [],
- goodsParamList: [],
- attrFirstList: [],
- attrSecodList: []
+ baseGoodsParamList: [],
+ },
+ uploadData: {
+ folder: 'goods_img'
},
// 楠岃瘉瑙勫垯
rules: {
@@ -147,77 +98,44 @@
{ required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
]
},
- options: [],
- categoryList: [],
- brandList: []
+ options: []
}
},
- created () {
+ inject: ['categoryList', 'brandList'],
+ created() {
this.config({
api: '/business/goods',
'field.id': 'id'
})
- this.getbrand()
- this.getcategory()
- },
- watch: {
- 'form.categoryId': {
- immediate: true,
- handler(news, old) {
- if (news) {
- this.name1 = ''
- this.name2 = ''
- if (old) {
- this.form.attrFirstIds = []
- this.form.attrSecodIds = []
- this.form.goodsParamList = []
- }
- this.categoryList.forEach(item => {
- if (item.id === news) {
- this.name1 = item.attrFirst
- this.name2 = item.attrSecond
- this.form.attrFirstList = item.attrFirstList.length > 0 ? item.attrFirstList : []
- this.form.attrSecodList = item.attrSecondList.length > 0 ? item.attrSecondList : []
- this.form.goodsParamList = JSON.parse(JSON.stringify(item.paramList))
- this.form.goodsParamList.forEach(item => {
- item.pramaId = item.id
- })
- console.log(this.form.goodsParamList)
- }
- })
- this.getcategory(1)
- }
- }
- },
- visible: {
- handler(news, old) {
- if (!news) {
- this.name1 = ''
- this.name2 = ''
- this.form = {
- id: null,
- name: '',
- categoryId: '',
- brandId: '',
- zdPrice: '',
- price: '',
- attrFirstIds: [],
- attrFirstNames: '',
- attrSecodIds: [],
- attrSecodNames: '',
- imgurl: '',
- multifileList: [],
- files: [],
- ztList: [],
- goodsParamList: [],
- attrFirstList: [],
- attrSecodList: []
- }
- }
- }
- }
+ // this.getbrand()
+ // this.getcategory()
},
methods: {
+ open(title, target) {
+ this.title = title
+ this.visible = true
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form.imgurl = ''
+ this.form.imgfullurl = ''
+ this.form.multifileList = []
+ this.form.baseGoodsParamList = []
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ this.form.multifileList.forEach(item => {
+ item.url = item.filefullurl
+ })
+ })
+ },
priceCHANEG(val, type) {
if (!/^[1-9]+[0-9]*$/.test(val)) {
this.$message.warning('鍙兘杈撳叆姝ｆ暣鏁�')
@@ -228,115 +146,20 @@
}
}
},
- confirm() {
- this.$refs.form.validate((valid) => {
- if (valid) {
- if (this.form.attrFirstIds.length > 0) {
- let arr = []
- this.form.attrFirstIds.forEach(element => {
- this.form.attrFirstList.forEach(item => {
- if (element === item.id) {
- arr.push(item.name)
- }
- })
- })
- this.form.attrFirstNames = arr.join(',')
- this.form.attrFirstIds = this.form.attrFirstIds.join(',')
- } else {
- this.form.attrFirstNames = ''
- this.form.attrFirstIds = ''
- }
- if (this.form.attrSecodIds.length > 0) {
- let arr = []
- this.form.attrSecodIds.forEach(element => {
- this.form.attrSecodList.forEach(item => {
- if (element === item.id) {
- arr.push(item.name)
- }
- })
- })
- this.form.attrSecodNames = arr.join(',')
- this.form.attrSecodIds = this.form.attrSecodIds.join(',')
- } else {
- this.form.attrSecodNames = ''
- this.form.attrSecodIds = ''
- }
- if (!this.form.id) {
- companyCreate({...this.form, type: 0})
- .then(() => {
- this.visible = false
- this.$tip.apiSuccess('鏂板缓鎴愬姛')
- this.$emit('success')
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- } else {
- companyUpdateById({...this.form, type: 0})
- .then(() => {
- this.visible = false
- this.$tip.apiSuccess('缂栬緫鎴愬姛')
- this.$emit('success')
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- }
- } else {
- return false;
+ categorySelect(v) {
+ this.categoryList().forEach(item => {
+ if (item.id === v) {
+ this.form.baseGoodsParamList = JSON.parse(JSON.stringify(item.baseCateParamList))
+ this.form.baseGoodsParamList.forEach(item => {
+ item.pramaId = item.id
+ })
}
- });
- },
- exceed() {
- this.$message.warning({
- message: '鍙兘涓婁紶涓�涓浘鏍�'
})
},
- fileSuccess1(response, file, fileList) {
- this.form.files = fileList
- this.form.multifileList.push({ fileurl: response.data.imgaddr, name: response.data.imgname, url: response.data.url })
- },
- handleRemove1(file, fileList) {
- this.form.files = fileList
- this.form.multifileList = fileList
- },
- fileSuccess(response) {
- this.form.ztList.push({ imgaddr: response.data.imgaddr, url: response.data.url })
- this.form.imgurl = response.data.imgaddr
- },
- handleRemove() {
- this.form.ztList = []
- this.form.imgurl = ''
- },
- getbrand() {
- brand({})
- .then(res => {
- this.brandList = res
- })
- },
- getcategory(type) {
- findListForGoodsId(this.form.id || '')
- .then(res => {
- this.categoryList = res
- if (type === 1) {
- this.categoryList.forEach(item => {
- if (item.id === this.form.categoryId) {
- this.form.goodsParamList = JSON.parse(JSON.stringify(item.paramList))
- this.form.goodsParamList.forEach(item => {
- item.pramaId = item.id
- })
- console.log(this.form.goodsParamList)
- }
- })
- }
- })
- }
+ uploadReverseSuccess(file) {
+ this.form.imgurl = file.imgurl;
+ this.form.imgfullurl = file.imgurlfull;
+ }
}
}
</script>
--
Gitblit v1.9.3