faiz
/
hy-shop-mer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-05-15 18:33:31 +08:00
parent a13c57febe
commit e34a8dd8da
6 changed files with 147 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/order.js
View File

@ -7,6 +7,12 @@ import request from './request'
export function orderListApi(data) { export function orderListApi(data) {
return request.get('store/order/lst', data) return request.get('store/order/lst', data)
} }
/**
* @description 订单 -- 下载物流公司对照表
*/
export function downloadLogisticsApi() {
return request.get('/excel/download/express')
}
/** /**
* @description 开启退款 * @description 开启退款
*/ */

6
src/api/setting.js
View File

@ -14,6 +14,12 @@ export function menuRoleApi(data) {
export function serviceCodeApi() { export function serviceCodeApi() {
return request.get(`service/code`) return request.get(`service/code`)
} }
/**
* @description 签署 -- 签署链接
*/
export function contactApi() {
return request.get(`contact`)
}
/** /**
* @description 商品上架费用 -- 列表 * @description 商品上架费用 -- 列表
* @param {Object} param params {Object} 传值参数 * @param {Object} param params {Object} 传值参数

6
src/views/order/index.vue
View File

@ -128,6 +128,7 @@
<el-button size="small">导入批量发货</el-button> <el-button size="small">导入批量发货</el-button>
</el-upload> </el-upload>
<el-button size="small" @click="getDeliveryList">批量发货记录</el-button> <el-button size="small" @click="getDeliveryList">批量发货记录</el-button>
<el-button size="small" @click="downloadLogistics">导出全部物流公司</el-button>
<!-- <el-button size="small" @click="batchSend">批量发送货</el-button> --> <!-- <el-button size="small" @click="batchSend">批量发送货</el-button> -->
</div> </div>
<el-table v-loading="listLoading" :data="tableData.data" size="small" class="table mt20" highlight-current-row :cell-class-name="addTdClass"> <el-table v-loading="listLoading" :data="tableData.data" size="small" class="table mt20" highlight-current-row :cell-class-name="addTdClass">
@ -477,7 +478,8 @@ import {
exprTempsLst, exprTempsLst,
getEleTempData, getEleTempData,
getDeliveryStoreLst, getDeliveryStoreLst,
openRefundApi openRefundApi,
downloadLogisticsApi
} from '@/api/order' } from '@/api/order'
import createWorkBook from '@/utils/newToExcel.js' import createWorkBook from '@/utils/newToExcel.js'
import { serveInfoApi } from '@/api/setting' import { serveInfoApi } from '@/api/setting'
@ -1013,7 +1015,7 @@ export default {
}, },
// 下载物流公司对照表 // 下载物流公司对照表
downloadLogistics() { downloadLogistics() {
window.open(SettingMer.https + `/excel/download/express?token=` + getToken()) window.open(`${location.origin}/statics/express.xlsx`)
}, },
// 订单核销 // 订单核销
orderCancellation(code) { orderCancellation(code) {

153
src/views/product/addProduct/index.vue
View File

@ -538,7 +538,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="助农文件及其他资质：" prop="qualification.otherList"> <el-form-item label="其他资质：" prop="qualification.otherList">
<el-upload <el-upload
class="upload-demo" class="upload-demo"
ref="otherList" ref="otherList"
@ -572,7 +572,6 @@
</span> </span>
</div> </div>
<el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button> <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
<!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -1059,6 +1058,14 @@
class="priceBox" class="priceBox"
disabled disabled
/> />
<el-select @change="proportionChange(scope.row,iii,$event)" v-else-if="formThead[iii].title === '占比'" v-model="scope.row[iii]" placeholder="请选择">
<el-option
v-for="item in proportionList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-input <el-input
v-else v-else
v-model="scope.row[iii]" v-model="scope.row[iii]"
@ -1221,6 +1228,14 @@
@input="handleCost(scope.row,iii,$event)" @input="handleCost(scope.row,iii,$event)"
class="priceBox" class="priceBox"
/> />
<el-select @change="proportionChange(scope.row,iii,$event)" v-else-if="formThead[iii].title === '占比'" v-model="scope.row[iii]" placeholder="请选择">
<el-option
v-for="item in proportionList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-input-number <el-input-number
v-else v-else
v-model="scope.row[iii]" v-model="scope.row[iii]"
@ -1234,22 +1249,6 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<!-- <template v-if="formValidate.type == 2">
<el-table-column
align="center"
label="卡密设置"
min-width="120"
>
<template slot-scope="scope">
<el-button
v-if="scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock"
size="small"
@click="addVirtual(0, 'OneattrValue')"
>添加卡密</el-button>
<span v-else class="seeCatMy" @click="seeVirtual(OneattrValue[0], 'OneattrValue', 0)">已设置</span>
</template>
</el-table-column>
</template> -->
<template v-if="formValidate.extension_type === 1"> <template v-if="formValidate.extension_type === 1">
<el-table-column <el-table-column
align="center" align="center"
@ -1345,13 +1344,6 @@
class="priceBox" class="priceBox"
controls-position="right" controls-position="right"
/> />
<!-- <el-input
v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
v-model="scope.row[iii]"
type="text"
size="small"
class="priceBox"
/> -->
<el-input <el-input
v-if="isSpecification(iii)" v-if="isSpecification(iii)"
v-model="scope.row[iii]" v-model="scope.row[iii]"
@ -1388,13 +1380,6 @@
/> />
</div> </div>
<div v-else> <div v-else>
<!-- <el-input
v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
v-model="scope.row[iii]"
type="text"
size="small"
class="priceBox"
/> -->
<el-input <el-input
v-if="isSpecification(iii)" v-if="isSpecification(iii)"
v-model="scope.row[iii]" v-model="scope.row[iii]"
@ -1413,6 +1398,14 @@
class="priceBox" class="priceBox"
disabled disabled
/> />
<el-select @change="proportionChange(scope.row,iii,$event)" v-else-if="formThead[iii].title === '占比'" v-model="scope.row[iii]" placeholder="请选择">
<el-option
v-for="item in proportionList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-input-number <el-input-number
v-else v-else
v-model="scope.row[iii]" v-model="scope.row[iii]"
@ -2116,6 +2109,7 @@ const defaultObj = {
svip_price: null, svip_price: null,
select: false, select: false,
proportion:0.6, proportion:0.6,
coupon:'',
growth:0, growth:0,
stock: null, stock: null,
cdkey: {}, cdkey: {},
@ -2174,6 +2168,9 @@ const objTitle = {
proportion: { proportion: {
title: '占比' title: '占比'
}, },
coupon:{
title:'抵扣卷'
},
stock: { stock: {
title: '库存' title: '库存'
}, },
@ -2233,6 +2230,74 @@ export default {
children: 'children', children: 'children',
emitPath: false emitPath: false
}, },
proportionList:[
{
value: '0.60',
label: '0.60',
coupon:0.3,
growth:0.5
},
{
value: '0.55',
label: '0.55',
coupon:0.35,
growth:0.55
},
{
value: '0.50',
label: '0.50',
coupon:0.4,
growth:0.6
},
{
value: '0.45',
label: '0.45',
coupon:0.45,
growth:0.65
},
{
value: '0.40',
label: '0.40',
coupon:0.5,
growth:0.7
},
{
value: '0.35',
label: '0.35',
coupon:0.55,
growth:0.75
},
{
value: '0.30',
label: '0.30',
coupon:0.6,
growth:0.8
},
{
value: '0.25',
label: '0.25',
coupon:0.65,
growth:0.85
},
{
value: '0.20',
label: '0.20',
coupon:0.7,
growth:0.9
},
// {
// value: '0.15',
// label: '0.15',
// coupon:0.75,
// growth:0.95
// },
// {
// value: '0.1',
// label: '0.10',
// coupon:0.8,
// growth:1
// },
],
businessList: [], businessList: [],
fileList: [], fileList: [],
roterPre: roterPre, roterPre: roterPre,
@ -2481,6 +2546,7 @@ export default {
cost: null, cost: null,
ot_price: null, ot_price: null,
proportion:0.6, proportion:0.6,
coupon:'',
stock: null, stock: null,
// growth:0, // growth:0,
bar_code: '', bar_code: '',
@ -2518,6 +2584,7 @@ export default {
ot_price: '', ot_price: '',
svip_price: '', svip_price: '',
proportion:'0.6', proportion:'0.6',
coupon:'',
gist_url:'', gist_url:'',
growth:0, growth:0,
stock: '', stock: '',
@ -2633,7 +2700,7 @@ export default {
return this.virStatus&&arr.includes(this.formThead[iii].title) return this.virStatus&&arr.includes(this.formThead[iii].title)
}, },
isForbidden(iii){ isForbidden(iii){
let arr = ['成本价','占比','成长值'] let arr = ['成本价','抵扣卷','成长值']
let forbidden = ['库存','重量（KG）','体积(m³)'] let forbidden = ['库存','重量（KG）','体积(m³)']
return arr.includes(this.formThead[iii].title) || (this.virStatus&&forbidden.includes(this.formThead[iii].title)) return arr.includes(this.formThead[iii].title) || (this.virStatus&&forbidden.includes(this.formThead[iii].title))
}, },
@ -2647,6 +2714,13 @@ export default {
resetForm(){ resetForm(){
this.dialogVisible = false this.dialogVisible = false
}, },
// 占比值变化处理
proportionChange(val,i,e){
val.cost = (val.price * e).toFixed(2)
let obj = this.proportionList.find(item=>item.value==e)
val.coupon = Math.floor(val.price*obj.coupon)
val.growth = Math.floor(val.price*obj.growth)
},
// 规格值变化 // 规格值变化
handleCost(val,i,e,type){ handleCost(val,i,e,type){
if(type == 'batchAdd'){ if(type == 'batchAdd'){
@ -2655,8 +2729,10 @@ export default {
if(i=='price'){ if(i=='price'){
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1') val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
val.cost = (e * val.proportion).toFixed(2) val.cost = (e * val.proportion).toFixed(2)
// val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
val.growth = parseInt(val.price*0.5) let obj = this.proportionList.find(item=>item.value==val.proportion)
val.coupon = Math.floor(val.price*obj.coupon)
val.growth = Math.floor(val.price*obj.growth)
} }
if(i=='bar_code'){ if(i=='bar_code'){
val.bar_code = val.bar_code.replace(/[\W]/g,'') val.bar_code = val.bar_code.replace(/[\W]/g,'')
@ -3142,6 +3218,7 @@ export default {
volume: 0, volume: 0,
growth:0, growth:0,
proportion:'0.6', proportion:'0.6',
coupon:'',
extension_one: 0, extension_one: 0,
extension_two: 0 extension_two: 0
} }
@ -3181,6 +3258,7 @@ export default {
volume: 0, volume: 0,
growth:0, growth:0,
proportion:'0.6', proportion:'0.6',
coupon:'',
extension_one: 0, extension_one: 0,
extension_two: 0, extension_two: 0,
detail: { [v['value']]: vv } detail: { [v['value']]: vv }
@ -3207,6 +3285,7 @@ export default {
res[i]['growth'] = v.growth res[i]['growth'] = v.growth
res[i]['gist_url'] = v.gist_url res[i]['gist_url'] = v.gist_url
res[i]['proportion'] = v.proportion res[i]['proportion'] = v.proportion
res[i]['coupon'] = v.coupon
res[i]['extension_one'] = v.extension_one res[i]['extension_one'] = v.extension_one
res[i]['extension_two'] = v.extension_two res[i]['extension_two'] = v.extension_two
res[i]['cdkey'] = v.cdkey && v.cdkey.length && v.cdkey[0] || null res[i]['cdkey'] = v.cdkey && v.cdkey.length && v.cdkey[0] || null
@ -3447,6 +3526,7 @@ export default {
svip_price: null, svip_price: null,
stock: null, stock: null,
proportion:0.6, proportion:0.6,
coupon:'',
growth:0, growth:0,
bar_code: '', bar_code: '',
weight: null, weight: null,
@ -3473,6 +3553,7 @@ export default {
weight: null, weight: null,
volume: null, volume: null,
proportion:0.6, proportion:0.6,
coupon:'',
growth:0, growth:0,
gist_url:'' gist_url:''
} }
@ -3523,6 +3604,7 @@ export default {
if (this.oneFormBatch[0].volume != null && this.oneFormBatch[0].volume != '') this.$set(val, 'volume', this.oneFormBatch[0].volume) if (this.oneFormBatch[0].volume != null && this.oneFormBatch[0].volume != '') this.$set(val, 'volume', this.oneFormBatch[0].volume)
if (this.oneFormBatch[0].growth != null && this.oneFormBatch[0].growth != '') this.$set(val, 'growth', this.oneFormBatch[0].growth) if (this.oneFormBatch[0].growth != null && this.oneFormBatch[0].growth != '') this.$set(val, 'growth', this.oneFormBatch[0].growth)
if (this.oneFormBatch[0].proportion != null && this.oneFormBatch[0].proportion != '') this.$set(val, 'proportion', this.oneFormBatch[0].proportion) if (this.oneFormBatch[0].proportion != null && this.oneFormBatch[0].proportion != '') this.$set(val, 'proportion', this.oneFormBatch[0].proportion)
if (this.oneFormBatch[0].coupon != null && this.oneFormBatch[0].coupon != '') this.$set(val, 'coupon', this.oneFormBatch[0].coupon)
if (this.oneFormBatch[0].gist_url != null && this.oneFormBatch[0].gist_url != '') this.$set(val, 'gist_url', this.oneFormBatch[0].gist_url) if (this.oneFormBatch[0].gist_url != null && this.oneFormBatch[0].gist_url != '') this.$set(val, 'gist_url', this.oneFormBatch[0].gist_url)
if (this.oneFormBatch[0].extension_one != null && this.oneFormBatch[0].extension_one != '') this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one) if (this.oneFormBatch[0].extension_one != null && this.oneFormBatch[0].extension_one != '') this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
if (this.oneFormBatch[0].extension_two != null && this.oneFormBatch[0].extension_two != '') this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two) if (this.oneFormBatch[0].extension_two != null && this.oneFormBatch[0].extension_two != '') this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
@ -3733,6 +3815,7 @@ export default {
svip_price: null, svip_price: null,
stock: null, stock: null,
proportion:0.6, proportion:0.6,
coupon:'',
growth:0, growth:0,
// cdkey: {}, // cdkey: {},
bar_code: "", bar_code: "",

2
src/views/product/productList/proDetails.vue
View File

@ -520,7 +520,7 @@
</div> </div>
</span> </span>
<span class="upload"> <span class="upload">
<div class="upload_left">助农文件及其他资质：</div> <div class="upload_left">其他资质：</div>
<div class="upload_right"> <div class="upload_right">
<div <div
v-for="(item,index) in qualification.otherList" v-for="(item,index) in qualification.otherList"

13
src/views/systemForm/setSystem/modifyStoreInfo.vue
View File

@ -192,6 +192,10 @@
<span class="mr10 spanBtn" @click="viewOffRecords">查看记录</span> <span class="mr10 spanBtn" @click="viewOffRecords">查看记录</span>
</div> </div>
</div> </div>
<div class="basic-information">
<span class="basic-label"> 签署电子合同：</span>
<span class="mr10 spanBtn" @click="handleSign">去签署</span>
</div>
<!--申请退回保障金银行信息弹窗--> <!--申请退回保障金银行信息弹窗-->
<el-dialog <el-dialog
v-if="modalBank" v-if="modalBank"
@ -549,7 +553,7 @@
<script> <script>
import { serviceCodeApi,goodsCodeApi,storeGetInfoApi, marginCode, marginMakeCode, marginRecordLst,offlineRecordLst, marginRefund, marginRefundApply,offlinePayApi } from '@/api/setting' import { serviceCodeApi,goodsCodeApi,storeGetInfoApi, marginCode, marginMakeCode, marginRecordLst,offlineRecordLst, marginRefund, marginRefundApply,offlinePayApi,contactApi } from '@/api/setting'
import { getBaseInfo, merchantUpdate } from '@/api/user.js' import { getBaseInfo, merchantUpdate } from '@/api/user.js'
import Maps from '@/components/map/map.vue' import Maps from '@/components/map/map.vue'
@ -791,6 +795,13 @@ export default {
this.getInfo() this.getInfo()
}, },
methods: { methods: {
// 去签署
handleSign(){
contactApi().then((res)=>{
window.open(res.message)
// console.log(res.message);
})
},
handleShow(){ handleShow(){
console.log(this.merData.offline.includes('30')); console.log(this.merData.offline.includes('30'));
}, },