Skip to content

S
shop-new
提交 54f35034 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

Merge branch '1.1.13-new'

上级 3734b9fd ccf7ffbe
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 914 行增加 和 14 行删除
src/api/invoiceManagement.js 0 → 100644
浏览文件 @ 54f35034
import request from '@/utils/request'
// 可开发票列表
export function invoiceListStatics(params) {
return request({
url: '/receipt/openOrderList',
method: 'get',
params
})
}
// 可开发票-订单详情
export function orderListInvo(params) {
return request({
url: '/receipt/orderList',
method: 'get',
params
})
}
// 可开发票-订单详情-导出列表
export function getOrderListExport(params) {
return request({
url: '/receipt/orderListExport',
method: 'get',
params
})
}
// 可开发票-申请开票-发票抬头
export function receipt(params) {
return request({
url: '/operate/receipt/getReceipt',
method: 'get',
params
})
}
// 可开发票-申请开票-保存发票抬头
export function updateReceipt(data) {
return request({
url: '/operate/receipt/updateReceipt',
method: 'post',
data
})
}
// 可开发票-申请开票-领取方式
export function addressList(params) {
return request({
url: '/operate/receipt/getAddressList',
method: 'get',
params
})
}
// 可开发票-申请开票-领取方式-设为默认
export function setAddress(data) {
return request({
url: '/operate/receipt/setAddress',
method: 'post',
data
})
}
// 可开发票-申请开票-领取方式-编辑
export function updateAddress(data) {
return request({
url: '/operate/receipt/updateAddress',
method: 'post',
data
})
}
// 可开发票-申请开票-领取方式-删除
export function delAddress(data) {
return request({
url: '/operate/receipt/delAddress',
method: 'post',
data
})
}
// 可开发票-申请开票-领取方式-添加
export function addAddress(data) {
return request({
url: '/operate/receipt/addAddress',
method: 'post',
data
})
}
// 可开发票-申请开票-提交开票
export function saveReceipt(data) {
return request({
url: '/receipt/invoice',
method: 'post',
data
})
}
// 可开发票-申请开票-去支付
export function createReceipt(data) {
return request({
url: '/receipt/createReceipt',
method: 'post',
data
})
}
// 可开发票-申请开票-验证是否设置密码
export function accountSafePwd(params) {
return request({
url: '/accountSafePwd',
method: 'get',
params
})
}
// 可开发票-申请开票-余额支付
export function notifyReceipt(data) {
return request({
url: '/receipt/balanceNotify',
method: 'post',
data
})
}
// 可开发票-申请开票-支付宝支付
export function pay(data) {
return request({
url: '/receipt/pay',
method: 'post',
data
})
}
// 支付验证
export function checkNotify(params) {
return request({
url: '/checkNotify',
method: 'get',
params
})
}
// 开票记录列表
export function invoiceList(params) {
return request({
url: '/invoicesmanagement/invoiceList',
method: 'get',
params
})
}
// 开票记录-发票详情
export function invoiceInfo(params) {
return request({
url: '/invoicesmanagement/getInvoiceInfo',
method: 'get',
params
})
}
// 【new】发票用户信息详情
export function receiptUserInfo(params) {
return request({
url: '/receipt/receiptUserInfo',
method: 'get',
params
})
}
// 【new】发票用户信息编辑
export function addUserReceiptInfo(data) {
return request({
url: '/receipt/receiptUserInfoEdit',
method: 'post',
data
})
}
src/api/module/goods.js
浏览文件 @ 54f35034
......@@ -29,13 +29,22 @@ export function GetCategory(query) {
// 经营类目-12-23-bak
export function NewGetCategory(query) {
return request({
url: '/system/goodsNew/businessList',
url: 'goodsNew/BusinessList',
method: 'get',
params: query
})
}
// 营业类目
export function NewGetCategoryDataall(query) {
return request({
url: 'system/goodsNew/businessList',
method: 'get',
params: query
})
}
// 营业类目动态获取
export function NewGetCategoryData(data) {
return request({
url: '/local/getCategoryList',
......@@ -43,7 +52,6 @@ export function NewGetCategoryData(data) {
data: data
})
}
// 查询运费模板
export function GetFreight(query) {
return request({
......@@ -156,3 +164,11 @@ export function synthesisList(data) {
data: data
})
}
//商品复制
export function goodsNewcopy(query) {
return request({
url: '/system/goodsNew/copy',
method: 'get',
params: query
})
}
src/api/msgtemplate.js 0 → 100644
浏览文件 @ 54f35034
import request from '@/utils/request'
//获取系统公告列表
export function msgMessageList(params) {
return request({
url: '/operate/system/messageList',
method: 'get',
params
})
}
//删除全部已读
export function delIsRead(params) {
return request({
url: '/message/delIsRead',
method: 'get',
params
})
}
//全部已读
export function readingNotes(params) {
return request({
url: '/message/readingNotes',
method: 'get',
params
})
}
// 查看消息详情
export function GetMessageDetail(params) {
return request({
url: '/operate/system/messageDetail',
method: 'get',
params
})
}
//是否为paas账号
export function GetIsPaas(data) {
return request({
url: '/operate/system/getIsPaas',
method: 'post',
data
})
}
//转发
export function Forward(data) {
return request({
url: '/operate/system/messageFor',
method: 'post',
data
})
}
\ No newline at end of file
src/views/system/goods/add/components/goodsaftersale.vue
浏览文件 @ 54f35034
......@@ -75,7 +75,7 @@
</el-form-item>
<el-form-item label="邮费模板：" prop="freight_id">
<el-select v-model="goodsAfterSaleForm.freight_id" placeholder="请选择邮费模板" @change="diupfont" style="width:400px;">
<el-select v-model="goodsAfterSaleForm.freight_id" filterable placeholder="请选择邮费模板" @change="diupfont" style="width:400px;">
<el-option v-for="(item,index) in freightOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
......@@ -498,7 +498,7 @@
if (this.option == 0) {
for (let i = 0; i < res.data.length; i++) {
if (res.data[i].is_default == 1) {
this.goodsAfterSaleForm.freight_id = res.data[i].id
// this.goodsAfterSaleForm.freight_id = res.data[i].id
}
}
}
......
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @ 54f35034
<template>
<div :class="['goods-parameter']">
<div v-if="parameterdata.isradioguide === 1">
<div v-show="parameterdata.isradioguide === 1">
<!-- <p style="margin: 10px 0;color: #333;font-size: 14px;font-weight: 400;">默认</p> -->
<el-table
border
size="small"
:data="singleSpecTable"
style="width: 100%;margin-right:10%;"
:key="keyvalue"
>
<el-table-column align="center" prop="sc_price" label="市场划线价" class-name="spe-cell-icon">
<template slot-scope="scope">
......@@ -431,9 +432,31 @@ export default {
mounted() {
this.getSpanArr(this.parameterdata);
this.keyvalue++
// debugger
debugger
if (this.parameterdata.singleSpecTable && this.parameterdata.singleSpecTable.length === 1) {
this.singleSpecTable = this.parameterdata.singleSpecTable
}else{
if(localStorage.getItem('SpecTable')){
this.singleSpecTable =JSON.parse(localStorage.getItem('SpecTable'))
}else{
this.singleSpecTable = [
{
sc_price: '', // 市场划线价
price: '', // 销售指导价
js_price: '', // 供货结算价
prime_cost: '', // 成本核算价
stock: '', // 库存
stock_warning: '', // 库存预警
weight: '', // 重量 g
volume: '', // 体积
goods_code: '', // 编码
bar_code: '', // 条码
}
]
}
}
// 接受 多规格是否启用阶梯定价
......
src/views/system/goods/add/index.vue
浏览文件 @ 54f35034
......@@ -10,8 +10,18 @@
<p class="goods-type-tip">为商品设置正确的类目，能让商品快速的被搜索到</p>
</div>
<div class="goods-type-options">
类目搜索： <el-cascader
placeholder="请输入"
:options="option"
v-model="SSQLists"
:props='propsOptions'
@change="searchChange"
style="width:300px;"
filterable></el-cascader>
</div>
<div class="goods-type-options">
<!-- <el-cascader-panel v-model="SSQList" :props='props' @change="SSQChange" ref="ssqCascader"></el-cascader-panel>-->
<el-cascader-panel v-model="SSQList" :props='propsOptions' @change="SSQChange" ref="ssqCascader"></el-cascader-panel>
<el-cascader-panel :key="optionnew" v-model="SSQList" :options="option" :props='propsOptions' @change="SSQChange" ref="ssqCascader"></el-cascader-panel>
</div>
<el-button type="primary" class="next-step" :disabled="isNextStep" @click="nextStep">下一步</el-button>
</div>
......@@ -115,7 +125,7 @@
</template>
<script>
import { NewGetCategory,NewGetCategoryData,addGoods,getGoodsNew,updateGoodsNew } from '@/api/module/goods';
import { NewGetCategory,NewGetCategoryDataall,NewGetCategoryData,addGoods,getGoodsNew,updateGoodsNew } from '@/api/module/goods';
import Goodsinfomation from './components/goodsinfomation';
import GoodsSpecifications from './components/goodsspecifications';
import GoodsParameter from './components/goodsparameter';
......@@ -132,20 +142,21 @@
},
data() {
return {
optionnew:1,
isViewPriceExp:false,
radioguide:1,
keyvalue:1,
goodsLoading: false,
SSQLists:[],
SSQList: [], // 省市区
SSQStr: '', // 省市区 拼接
propsOptions: {
expandTrigger: 'click',
lazy: true,
lazyLoad: this.lazyLoad,
value: "id",
label: 'title',
label: 'label',
leaf: 'leaf'
},
option:[],
isNextStep: true,
isShowGoodsDetails: false,
isFIActive: 0,
......@@ -191,7 +202,7 @@
goods_brand: '', // 品牌
brand_id: '', // 品牌、
stags: [],
freight_id: 310,
freight_id: '',
delay_compensate: 24,
aftersale_time: 7
},
......@@ -204,6 +215,7 @@
},
created() {
this.getalloption()
// option 商品的id
//debugger
this.option = Number(this.$route.query.goods_id) || 0
......@@ -390,13 +402,34 @@
console.log("售后数据：",this.goodsaftersale)
}else {
this.isShowGoodsDetails = false;
localStorage.removeItem('SpecTable')
}
},
mounted() {
},
methods: {
searchChange(){
this.optionnew++
this.SSQList = this.SSQLists
if(this.SSQList && this.SSQList.length > 0) {
this.isNextStep = false
}else {
this.SSQList = []
this.isNextStep = true
}
},
getalloption(){
NewGetCategoryDataall().then(res=>{
if(res.code==1){
this.option = res.data
}
})
},
radiochange(val){
this.parameterdata.isradioguide = this.radioguide
if(val===2){
localStorage.setItem('SpecTable',JSON.stringify(this.$refs.goodsparameter.singleSpecTable))
}
this.keyvalue++
},
// 查看各类价格说明
......
src/views/system/goodsimport/goodsgement.vue
浏览文件 @ 54f35034
......@@ -268,6 +268,17 @@
@click="editgoods(scope.row)"
>编辑
</el-button>
<el-divider
direction="vertical"
v-if="radiomodel != 1"
></el-divider>
<el-button
v-if="radiomodel != 4 && radiomodel != 1"
size="mini"
type="text"
@click="copylist(scope.row)"
>商品复制
</el-button>
<el-divider
direction="vertical"
v-if="radiomodel != 4"
......@@ -427,7 +438,7 @@
<script>
import goodDetail from "./components/goodsdetail";
import editGood from "@/views/system/goods/add/index";
import { GetFreight, getGoodsNew } from "@/api/module/goods";
import { GetFreight, getGoodsNew, goodsNewcopy} from "@/api/module/goods";
import {
getlistGoods,
shelvesStatus,
......@@ -541,6 +552,19 @@ export default {
// }
},
methods: {
copylist(row){
debugger
let data = {
goods_id:row.goods_id
}
goodsNewcopy(data).then(res=>{
if(res.code==1){
this.getList();
}else{
this.$message.error(res.message);
}
})
},
// 运费模板
getFreightData() {
let params = {
......
src/views/system/messageCenter/components/msgtemplateInfo.vue 0 → 100644
浏览文件 @ 54f35034
<template>
<div class="box-drawer">
<div>
<div style="display: inline-block">
<h4>{{ messageDetailInfo.title }}</h4>
</div>
<div style="float: right; margin-top: 20px; padding-right: 30px">
<el-button
type="primary"
plain
size="mini"
icon="el-icon-arrow-left"
@click="goBack"
>返回</el-button
>
<el-button
type="primary"
plain
size="mini"
v-if="ispaas==1"
@click="redeposit"
>转存为系统公告</el-button
>
<el-button
type="primary"
plain
size="mini"
icon="el-icon-delete"
@click="delRead"
>删除</el-button
>
</div>
</div>
<div class="button-text">
<i class="el-icon-message-solid" style="color: #fbaf2d"></i>
<span class="left-text"
>消息类型：{{
messageDetailInfo.type == 1 ? "系统公告" : "活动公告"
}}</span
>
<span class="right-text"
>发布时间：{{ formatter(messageDetailInfo.add_time) }}</span
>
</div>
<div class="Info-text" v-html="messageDetailInfo.content"></div>
</div>
</template>
<script>
import { delIsRead, GetMessageDetail, Forward,GetIsPaas } from "@/api/msgtemplate";
import { dateFormat } from '@/utils'
export default {
name: "messageDetail",
props: ["messageDetailIds"],
data() {
return {
messageDetailInfo: {},
ispaas: 0,
};
},
created() {
this.getMessageInfos();
// this.getIsPaas();
},
methods: {
//获取详情信息
getMessageInfos() {
let data = {
id: this.messageDetailIds,
};
GetMessageDetail(data).then((res) => {
if (res.code == 1) {
this.messageDetailInfo = res.data;
}
});
},
//删除单个
delRead() {
let data = {
id: this.messageDetailIds,
};
delIsRead(data).then((res) => {
if (res.code == 1) {
this.$message({ message: "删除成功", type: "success" });
this.$emit("closeOrderDetailDialog");
}
});
},
//返回
goBack() {
this.$emit("closeOrderDetailDialog");
},
redeposit() {
let data = {
id: this.messageDetailIds,
};
Forward(data).then((res) => {
if (res.code == 1) {
this.$message({ message: "转存成功", type: "success" });
this.$emit("closeOrderDetailDialog");
}
});
},
getIsPaas() {
GetIsPaas().then((res) => {
if (res.code == 1) {
this.ispaas = res.data.ispaas;
}
});
},
//日期转换
/** 时间格式化 */
formatter(time) {
return dateFormat(time * 1000, 'Y-m-d H:i:s')
},
},
};
</script>
<style scoped>
.Info-text {
width: 100%;
height: 470px;
/* border: 1px solid black; */
overflow: auto;
}
.box-drawer {
/* border: 1px solid black; */
width: 96%;
margin: 0 auto;
}
.button-text {
line-height: 48px;
width: 100%;
height: 48px;
background: #f8f8f8;
padding-left: 15px;
}
.left-text {
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #666666;
}
.right-text {
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #999999;
float: right;
padding-right: 20px;
}
</style>
\ No newline at end of file
src/views/system/messageCenter/msgtemplate.vue 0 → 100644
浏览文件 @ 54f35034
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论