Skip to content

Y
yongxinda-admin
提交 9d3f1cb6 authored 作者: 刘旭's avatar 刘旭
浏览文件
操作

添加商品配件

上级 c30530c4
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 81 行增加 和 171 行删除
src/components/richTextEditor.vue
浏览文件 @ 9d3f1cb6
...@@ -50,7 +50,8 @@ const handleCreated = (editor: any) => { ...@@ -50,7 +50,8 @@ const handleCreated = (editor: any) => {
} }
const handleChange = (editor: any) => { const handleChange = (editor: any) => {
emits('htmlChange', editor.children) const html = editor.getHtml()
emits('htmlChange', html)
} }
</script> </script>
\ No newline at end of file
src/layout/menu/MenuBar.vue
浏览文件 @ 9d3f1cb6
...@@ -28,133 +28,6 @@ const menuList = computed(() => { ...@@ -28,133 +28,6 @@ const menuList = computed(() => {
return store.getters['menu/getMenuList'] return store.getters['menu/getMenuList']
}) })
// let menuList = reactive([
// {
// path: '/dashboard',
// component: "Layout",
// meta: {
// title: "首页",
// icon: "HomeFilled",
// roles: ["sys:manage"]
// },
// children: []
// },
// {
// path: "/system",
// component: "Layout",
// alwaysShow: true,
// name: "system",
// meta: {
// title: "系统管理",
// icon: "Menu",
// roles: ["sys:manage"],
// parentId: 0,
// },
// children: [
// {
// path: "/department",
// component: "/system/department/department",
// alwaysShow: false,
// name: "department",
// meta: {
// title: "机构管理",
// icon: "Platform",
// roles: ["sys:dept"],
// parentId: 17,
// },
// },
// {
// path: "/userList",
// component: "/system/User/UserList",
// alwaysShow: false,
// name: "userList",
// meta: {
// title: "用户管理",
// icon: "el-icon-s-custom",
// roles: ["sys:user"],
// parentId: 17,
// },
// },
// {
// path: "/roleList",
// component: "/system/Role/RoleList",
// alwaysShow: false,
// name: "roleList",
// meta: {
// title: "角色管理",
// icon: "el-icon-s-tools",
// roles: ["sys:role"],
// parentId: 17,
// },
// },
// {
// path: "/menuList",
// component: "/system/Menu/MenuList",
// alwaysShow: false,
// name: "menuList",
// meta: {
// title: "权限管理",
// icon: "el-icon-document",
// roles: ["sys:menu"],
// parentId: 17,
// },
// },
// ],
// },
// {
// path: "/goods",
// component: "Layout",
// alwaysShow: true,
// name: "goods",
// meta: {
// title: "商品管理",
// icon: "el-icon-document",
// roles: ["sys:goods"],
// parentId: 0,
// },
// children: [
// {
// path: "/goodCategory",
// component: "/goods/goodsCategory/goodsCategoryList",
// alwaysShow: false,
// name: "goodCategory",
// meta: {
// title: "商品分类",
// icon: "el-icon-document",
// roles: ["sys:goodsCategory"],
// parentId: 34,
// },
// },
// ],
// },
// {
// path: "/systenConfig",
// component: "Layout",
// alwaysShow: true,
// name: "systenConfig",
// meta: {
// title: "系统工具",
// icon: "el-icon-document",
// roles: ["sys:systenConfig"],
// parentId: 0,
// },
// children: [
// {
// path: "/document",
// component: "/system/config/systemDocument",
// alwaysShow: false,
// name: "http://42.193.158.170:8089/swagger-ui/index.html",
// meta: {
// title: "接口文档",
// icon: "el-icon-document",
// roles: ["sys:document"],
// parentId: 42,
// },
// },
// ],
// },
// ]);
const isCollapse = computed(() => { const isCollapse = computed(() => {
// return store.getters['getCollapse'] // return store.getters['getCollapse']
return store.getters['menu/getCollapse'] return store.getters['menu/getCollapse']
......
src/views/commodityManage/edit.vue
浏览文件 @ 9d3f1cb6
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<el-upload :action="uploadPath" :show-file-list="false" :headers="headers" <el-upload :action="uploadPath" :show-file-list="false" :headers="headers"
:on-success="uploadPicUrl" class="avatar-uploader" accept=".jpg,.jpeg,.png,.gif"> :on-success="uploadPicUrl" class="avatar-uploader" accept=".jpg,.jpeg,.png,.gif">
<img v-if="goods.picUrl" :src="goods.picUrl" class="avatar" /> <img v-if="goods.picUrl" :src="goods.picUrl" class="avatar" />
<!-- <img v-if="goods.picUrl" :src="'http://192.168.0.23' + goods.picUrl" class="avatar" /> -->
<el-icon v-else class="avatar-uploader-icon"> <el-icon v-else class="avatar-uploader-icon">
<Plus /> <Plus />
</el-icon> </el-icon>
...@@ -66,6 +67,21 @@ ...@@ -66,6 +67,21 @@
<el-button v-else class="button-new-keyword" type="primary" @click="showInput">+ 增加</el-button> <el-button v-else class="button-new-keyword" type="primary" @click="showInput">+ 增加</el-button>
</el-form-item> </el-form-item>
<el-form-item label="商品配件">
<el-select v-model="goods.parts" multiple collapse-tags collapse-tags-tooltip style="width: 240px">
<el-option v-for="item in partsList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<!-- <el-form-item label="商品配件">
<el-tag v-for="tag in parts" :key="tag" closable type="primary" @close="handlePartsClose(tag)">
{{ tag }}
</el-tag>
<el-input v-if="newPartsVisible" ref="newKeywordInput" v-model="newPart" class="input-new-keyword"
@keyup.enter.native="handlePartsConfirm" @blur="handlePartsConfirm" />
<el-button v-else class="button-new-keyword" type="primary" @click="showPartsInput">+ 增加</el-button>
</el-form-item> -->
<el-form-item label="所属分类"> <el-form-item label="所属分类">
<el-cascader v-model="categoryIds" :options="categoryList" expand-trigger="hover" clearable <el-cascader v-model="categoryIds" :options="categoryList" expand-trigger="hover" clearable
@change="handleCategoryChange" /> @change="handleCategoryChange" />
...@@ -94,8 +110,8 @@ ...@@ -94,8 +110,8 @@
<el-row :gutter="20" type="flex" align="middle" style="padding: 20px 0"> <el-row :gutter="20" type="flex" align="middle" style="padding: 20px 0">
<el-col :span="10"> <el-col :span="10">
<el-radio-group v-model="multipleSpec" @change="specChanged"> <el-radio-group v-model="multipleSpec" @change="specChanged">
<el-radio-button :label="false">默认标准规格</el-radio-button> <!-- <el-radio-button :label="false">默认标准规格</el-radio-button> -->
<el-radio-button :label="true">多规格支持</el-radio-button> <el-radio-button :label="false">多规格支持</el-radio-button>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
<el-col v-if="multipleSpec" :span="10"> <el-col v-if="multipleSpec" :span="10">
...@@ -243,15 +259,19 @@ ...@@ -243,15 +259,19 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed, nextTick } from "vue"; import { ref, computed, nextTick } from "vue";
import { detailGoods, editGoods, listCatAndBrand } from "@/services/api/commodityManage/list"; import { detailGoods, editGoods, listCatAndBrand } from "@/services/api/commodityManage/list";
import { createStorage, uploadPath } from "@/services/api/storage"; import { uploadPath } from "@/services/api/storage";
import { ElMessageBox, ElMessage, ElNotification } from "element-plus"; import { ElMessageBox, ElMessage, ElNotification } from "element-plus";
import richTextEditor from '@/components/richTextEditor.vue' import richTextEditor from '@/components/richTextEditor.vue'
import router from '@/router' import router from '@/router'
import { listGoods } from "@/services/api/commodityManage/list";
let route: any = router let route: any = router
let newKeywordVisible = ref(false); let newKeywordVisible = ref(false);
let newPartsVisible = ref(false);
let newKeyword = ref(""); let newKeyword = ref("");
let keywords = ref([] as any); let keywords = ref([] as any);
let parts = ref([] as any);
let newPart = ref("");
let galleryFileList = ref([] as any); let galleryFileList = ref([] as any);
let categoryIds = ref([] as any); let categoryIds = ref([] as any);
let categoryList = ref([] as any); let categoryList = ref([] as any);
...@@ -270,13 +290,13 @@ let goods = ref({ ...@@ -270,13 +290,13 @@ let goods = ref({
brief: "", brief: "",
detail: '<p>你好啊！！</p>', detail: '<p>你好啊！！</p>',
categoryId: undefined, categoryId: undefined,
keywords: undefined,
parts: undefined
} as any); } as any);
let specVisiable = ref(false); let specVisiable = ref(false);
let specForm = ref({ specification: "", value: "", picUrl: "" } as any); let specForm = ref({ specification: "", value: "", picUrl: "" } as any);
let multipleSpec = ref(false); let multipleSpec = ref(false);
let specifications = ref([ let specifications = ref([] as any);
{ specification: "规格", value: "标准", picUrl: "" },
]);
let productVisiable = ref(false); let productVisiable = ref(false);
let productForm = ref({ let productForm = ref({
id: 0, id: 0,
...@@ -298,9 +318,23 @@ let rules = ref({ ...@@ -298,9 +318,23 @@ let rules = ref({
}); });
let headers = computed(() => { let headers = computed(() => {
return { Authorization: localStorage.getItem("token") }; return { Authorization: sessionStorage.getItem("token") };
}); });
let partsList = ref()
let initList = () => {
listGoods({
page: 1,
limit: 10,
sort: "add_time",
order: "desc",
}).then((res: any) => {
if (res.code === 200) {
partsList.value = res.data.list;
}
})
}
initList()
let init = () => { let init = () => {
// if (route.options.history.location.split('=').length > 1) { // if (route.options.history.location.split('=').length > 1) {
// var goodsId = route.options.history.location.split('=')[1] // var goodsId = route.options.history.location.split('=')[1]
...@@ -322,7 +356,6 @@ let init = () => { ...@@ -322,7 +356,6 @@ let init = () => {
products.value = res.data.products; products.value = res.data.products;
attributes.value = res.data.attributes; attributes.value = res.data.attributes;
categoryIds.value = res.data.categoryIds; categoryIds.value = res.data.categoryIds;
console.log(categoryIds.value, 'categoryIds.value');
galleryFileList.value = []; galleryFileList.value = [];
for (var i = 0; i < goods.value?.gallery.length; i++) { for (var i = 0; i < goods.value?.gallery.length; i++) {
...@@ -343,17 +376,14 @@ let init = () => { ...@@ -343,17 +376,14 @@ let init = () => {
} }
init() init()
let htmlChange = (value: any) => { let htmlChange = (value: any) => goods.value.detail = value
// console.log('富文本value', value);
}
let handleCategoryChange = (value: any) => { let handleCategoryChange = (value: any) => {
goods.value.categoryId = value[value.length - 1]; goods.value.categoryId = value[value.length - 1];
} }
let handleCancel = () => { let handleCancel = () => {
// $store.dispatch("tagsView/delView", $route); route.push({ path: "/commodity/list" });
// $router.push({ path: "/goods/list" });
} }
let handleEdit = () => { let handleEdit = () => {
const finalGoods = { const finalGoods = {
...@@ -369,8 +399,7 @@ let handleEdit = () => { ...@@ -369,8 +399,7 @@ let handleEdit = () => {
title: "成功", title: "成功",
message: "编辑成功", message: "编辑成功",
}); });
// $store.dispatch("tagsView/delView", $route); router.push({ path: "/commodity/list" });
router.push({ path: "/goods/list" });
}) })
.catch((res: any) => { .catch((res: any) => {
ElMessageBox.alert("业务错误：" + res.data.errmsg, "警告", { ElMessageBox.alert("业务错误：" + res.data.errmsg, "警告", {
...@@ -384,11 +413,15 @@ let handleClose = (tag: any) => { ...@@ -384,11 +413,15 @@ let handleClose = (tag: any) => {
goods.value.keywords = keywords.value.toString(); goods.value.keywords = keywords.value.toString();
} }
let handlePartsClose = (tag: any) => {
parts.value.splice(parts.value.indexOf(tag), 1);
goods.value.parts = keywords.value.toString();
}
let showInput = () => { let showInput = () => {
newKeywordVisible.value = true; newKeywordVisible.value = true;
nextTick(() => { }
// $refs.newKeywordInput.$refs.input.focus(); let showPartsInput = () => {
}); newPartsVisible.value = true;
} }
let handleInputConfirm = () => { let handleInputConfirm = () => {
const newKeywords: string = newKeyword.value; const newKeywords: string = newKeyword.value;
...@@ -399,6 +432,15 @@ let handleInputConfirm = () => { ...@@ -399,6 +432,15 @@ let handleInputConfirm = () => {
newKeywordVisible.value = false; newKeywordVisible.value = false;
newKeyword.value = ""; newKeyword.value = "";
} }
let handlePartsConfirm = () => {
const newParts: string = newPart.value;
if (newParts) {
parts.value.push(newParts);
goods.value.parts = parts.value.toString();
}
newPartsVisible.value = false;
newPart.value = "";
}
let uploadPicUrl = (res: any) => { let uploadPicUrl = (res: any) => {
goods.value.picUrl = res.data.url; goods.value.picUrl = res.data.url;
} }
...@@ -409,9 +451,9 @@ let uploadOverrun = () => { ...@@ -409,9 +451,9 @@ let uploadOverrun = () => {
}); });
} }
let handleGalleryUrl = (res: any, file: any, fileList: any) => { let handleGalleryUrl = (res: any, file: any, fileList: any) => {
if (res.errno === 0) { // if (res.errno === 0) {
goods.value.gallery.push(res.data.url); goods.value.gallery.push(res.data.url);
} // }
} }
let handleRemove = (file: any, fileList: any) => { let handleRemove = (file: any, fileList: any) => {
for (let i = 0; i < goods.value.gallery.length; i++) { for (let i = 0; i < goods.value.gallery.length; i++) {
...@@ -448,7 +490,7 @@ let uploadSpecPicUrl = (res: any) => { ...@@ -448,7 +490,7 @@ let uploadSpecPicUrl = (res: any) => {
specForm.value.picUrl = res.data.url; specForm.value.picUrl = res.data.url;
} }
let handleSpecificationShow = () => { let handleSpecificationShow = () => {
specForm = { specification: "", value: "", picUrl: "" }; specForm.value = { specification: "", value: "", picUrl: "" };
specVisiable.value = true; specVisiable.value = true;
} }
let handleSpecificationAdd = () => { let handleSpecificationAdd = () => {
......
src/views/commodityManage/list.vue
浏览文件 @ 9d3f1cb6
...@@ -51,7 +51,10 @@ ...@@ -51,7 +51,10 @@
<el-table-column align="center" property="iconUrl" label="图片"> <el-table-column align="center" property="iconUrl" label="图片">
<template #default="scope"> <template #default="scope">
<el-image :src="scope.row.picUrl" style="width: 40px; height: 40px"></el-image> <el-image v-if="scope.row.picUrl.split('http').length > 1" :src="scope.row.picUrl"
style="width: 40px; height: 40px"></el-image>
<img v-else :src="'http://192.168.0.23' + scope.row.picUrl" style="width: 40px; height: 40px" />
<!-- <el-image :src="thumbnail(scope.row.picUrl)" <!-- <el-image :src="thumbnail(scope.row.picUrl)"
:preview-src-list="toPreview(scope.row, scope.row.picUrl)" style="width: 40px; height: 40px" /> --> :preview-src-list="toPreview(scope.row, scope.row.picUrl)" style="width: 40px; height: 40px" /> -->
</template> </template>
...@@ -102,17 +105,14 @@ ...@@ -102,17 +105,14 @@
<el-table-column align="center" label="操作" width="200" class-name="small-padding fixed-width"> <el-table-column align="center" label="操作" width="200" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button> <el-button type="primary" link @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button> <el-button type="danger" link @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<litemall-page :page-data="listQuery" :total="total" @size-change="sizeChange" <litemall-page :page-data="listQuery" :total="total" @size-change="sizeChange"
@current-change="currentChange" /> @current-change="currentChange" />
<!-- <el-tooltip placement="top" content="返回顶部">
<back-to-top :visibility-height="100" />
</el-tooltip> -->
</div> </div>
</template> </template>
...@@ -175,9 +175,6 @@ let handleCreate = () => { ...@@ -175,9 +175,6 @@ let handleCreate = () => {
router.push({ path: "/commodity/shelves" }); router.push({ path: "/commodity/shelves" });
}; };
let handleUpdate = (row: any) => { let handleUpdate = (row: any) => {
console.log(row.id);
let commodityId = row.id
localStorage.setItem('commodityId', commodityId)
router.push({ path: "/commodity/edit", query: { id: row.id } }); router.push({ path: "/commodity/edit", query: { id: row.id } });
}; };
let showDetail = (detail: any) => { let showDetail = (detail: any) => {
......
src/views/marketManage/auxiliary.vue
浏览文件 @ 9d3f1cb6
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-table-column align="center" label="操作" width="200"> <el-table-column align="center" label="操作" width="200">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" link @click="handleEdit(scope.row)">编辑</el-button> <el-button type="primary" size="small" link @click="handleEdit(scope.row)">编辑</el-button>
<el-button type="primary" size="small" link @click="handleConfigure(scope.row.id)">商品配置</el-button> <el-button type="primary" size="small" link @click="handleConfigure(scope.row.id)">规格配置</el-button>
<el-button type="danger" size="small" link @click="handleDelete(scope.row.id)">删除</el-button> <el-button type="danger" size="small" link @click="handleDelete(scope.row.id)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/marketManage/category.vue
浏览文件 @ 9d3f1cb6
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="200" class-name="small-padding fixed-width"> <el-table-column align="center" label="操作" width="200px" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button> <el-button type="primary" link @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button> <el-button type="danger" link @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -146,11 +146,7 @@ let rules = reactive({ ...@@ -146,11 +146,7 @@ let rules = reactive({
name: [{ required: true, message: "类目名不能为空", trigger: "blur" }], name: [{ required: true, message: "类目名不能为空", trigger: "blur" }],
}); });
let headers = computed(() => { let headers = ref({ 'Authorization': sessionStorage.getItem("token") })
return {
'Authorization': localStorage.getItem("token"),
};
});
let getList = () => { let getList = () => {
listLoading.value = true; listLoading.value = true;
......
src/views/marketManage/order.vue
浏览文件 @ 9d3f1cb6
...@@ -95,10 +95,10 @@ ...@@ -95,10 +95,10 @@
<el-table-column align="center" label="物流渠道" prop="shipChannel" /> <el-table-column align="center" label="物流渠道" prop="shipChannel" />
<el-table-column align="center" label="操作" width="100" class-name="oper"> <el-table-column align="center" label="操作" width="150" class-name="oper">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" @click="handleDetail(scope.row)">详情</el-button> <el-button type="primary" link @click="handleDetail(scope.row)">详情</el-button>
<el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button> <el-button type="danger" link @click="handleDelete(scope.row)">删除</el-button>
<!-- <el-button type="warning" size="small" @click="handlePay(scope.row)">收款</el-button> <!-- <el-button type="warning" size="small" @click="handlePay(scope.row)">收款</el-button>
<el-button type="primary" size="small" @click="handleShip(scope.row)">发货</el-button> <el-button type="primary" size="small" @click="handleShip(scope.row)">发货</el-button>
<el-button type="danger" size="small" @click="handleRefund(scope.row)">退款</el-button> --> <el-button type="danger" size="small" @click="handleRefund(scope.row)">退款</el-button> -->
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论