mkm/new_shop_admin_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-10 17:08:41 +08:00
parent df2ea82957
commit b219ac36ed
5 changed files with 245 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
src/filters/commFilter.js
View File

@ -173,27 +173,28 @@ export function cancelOrderStatusFilter(status) {
*/ */
export function orderPayType(type) { export function orderPayType(type) {
const typeMap = { const typeMap = {
'0': '余额支付', '0': '余额支付',
'1': '微信支付', '1': '微信支付',
'2': '小程序', '2': '小程序',
'3': '微信支付', '3': '微信支付',
'4': '支付宝', '4': '支付宝',
'5': '支付宝扫码', '5': '支付宝扫码',
'6': '微信扫码', '6': '微信扫码',
'7': '四川农信', '7': '四川农信',
'8': '信用购', '8': '信用购',
'9': '商户余额支付', '9': '商户余额支付',
'10': '对公转账', '10': '对公转账',
'11': '微信收银', '11': '微信收银',
'12': '现金收款', '12': '现金收款',
} '13': '支付宝条码',
return typeMap[type]
} }
/** return typeMap[type]
* }
* 付费会员支付方式 /**
*/ *
* 付费会员支付方式
*/
export function svipPayType(type) { export function svipPayType(type) {
const typeMap = { const typeMap = {
@ -212,12 +213,12 @@ export function svipPayType(type) {
* @description 订单活动状态 * @description 订单活动状态
*/ */
export function activityOrderStatus(status) { export function activityOrderStatus(status) {
const statusMap = { const statusMap = {
'-1': '未完成', '-1': '未完成',
'10': '已完成', '10': '已完成',
'0': '进行中' '0': '进行中'
} }
return statusMap[status] return statusMap[status]
} }
/** /**
* @description 自提订单状态 * @description 自提订单状态
@ -259,13 +260,13 @@ export function reconciliationStatusFilter(status) {
* @description 商品状态 * @description 商品状态
*/ */
export function productStatusFilter(status) { export function productStatusFilter(status) {
const statusMap = { const statusMap = {
'0': '下架', '0': '下架',
'1': '上架显示', '1': '上架显示',
'-1': '平台关闭' '-1': '平台关闭'
}
return statusMap[status]
} }
return statusMap[status]
}
/** /**
* @description 优惠券类型 * @description 优惠券类型
*/ */
@ -380,93 +381,93 @@ export function seckillStatusFilter(status) {
} }
return statusMap[status] return statusMap[status]
} }
/** /**
* @description 导出订单类型 * @description 导出订单类型
*/ */
export function exportOrderTypeFilter(type) { export function exportOrderTypeFilter(type) {
const typeMap = { const typeMap = {
'order': '订单', 'order': '订单',
'financial': '流水', 'financial': '流水',
'delivery': '发货单', 'delivery': '发货单',
'importDelivery': '导入记录', 'importDelivery': '导入记录',
'exportFinancial': '账单信息', 'exportFinancial': '账单信息',
'searchLog': '用户搜索' 'searchLog': '用户搜索'
}
return typeMap[type]
} }
return typeMap[type]
}
/** /**
* @description 主体类型 * @description 主体类型
*/ */
export function organizationType(type) { export function organizationType(type) {
const typeMap = { const typeMap = {
2401: '小微商户', 2401: '小微商户',
2500: '个人卖家', 2500: '个人卖家',
4: '个体工商户', 4: '个体工商户',
2: '企业', 2: '企业',
3: '党政、机关及事业单位', 3: '党政、机关及事业单位',
1708: '其他组织' 1708: '其他组织'
}
return typeMap[type]
} }
return typeMap[type]
}
/** /**
* @description 证件类型 * @description 证件类型
*/ */
export function id_docType(type) { export function id_docType(type) {
const typeMap = { const typeMap = {
1: '中国大陆居民-身份证', 1: '中国大陆居民-身份证',
2: '其他国家或地区居民-护照', 2: '其他国家或地区居民-护照',
3: '中国香港居民–来往内地通行证', 3: '中国香港居民–来往内地通行证',
4: '中国澳门居民–来往内地通行证', 4: '中国澳门居民–来往内地通行证',
5: '中国台湾居民–来往大陆通行证' 5: '中国台湾居民–来往大陆通行证'
}
return typeMap[type]
} }
/** return typeMap[type]
* @description 证件类型 }
*/ /**
* @description 证件类型
*/
export function purchaseType(type) { export function purchaseType(type) {
const typeMap = { const typeMap = {
'sms': '短信', 'sms': '短信',
'copy': '商品采集', 'copy': '商品采集',
'dump': '电子面单', 'dump': '电子面单',
'query': '物流查询' 'query': '物流查询'
}
return typeMap[type]
} }
return typeMap[type]
}
/** /**
* @description 证件类型 * @description 证件类型
*/ */
export function communityStatus(status) { export function communityStatus(status) {
const statusMap = { const statusMap = {
'0': '待审核', '0': '待审核',
'1': '审核通过', '1': '审核通过',
'-1': '审核失败', '-1': '审核失败',
'-2': '强制下架' '-2': '强制下架'
}
return statusMap[status]
} }
return statusMap[status]
}
/** /**
* @description 订单配送状态 * @description 订单配送状态
*/ */
export function runErrandStatus(status) { export function runErrandStatus(status) {
const statusMap = { const statusMap = {
'0': '待接单', '0': '待接单',
'-1': '已取消', '-1': '已取消',
'2': '待取货', '2': '待取货',
'3': '配送中', '3': '配送中',
'4': '已完成', '4': '已完成',
'9': '物品返回中', '9': '物品返回中',
'10': '物品返回完成', '10': '物品返回完成',
'100': '骑士到店' '100': '骑士到店'
}
return statusMap[status]
} }
/** return statusMap[status]
* @description 发送方式 }
*/ /**
* @description 发送方式
*/
export function sendWay(type) { export function sendWay(type) {
const typesMap = { const typesMap = {
null: '-', null: '-',

59
src/views/accounts/auditRecord/index.vue
View File

@ -98,8 +98,9 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="审核状态：" prop="status" <el-form-item label="审核状态：" prop="status"
:rules="{ required: (auditForm.status == 2 && title == '审核') , message: '审核状态不能为空', trigger: 'change' }"> :rules="{ required: (title == '审核'), message: '审核状态不能为空', trigger: 'change' }">
<el-radio-group v-model="auditForm.status" @change="radioChange" :disabled="(title == '查看' || title == '修改')"> <el-radio-group v-model="auditForm.status" @change="radioChange"
:disabled="(title == '查看' || title == '修改')">
<el-radio :label="1" class="radio">通过</el-radio> <el-radio :label="1" class="radio">通过</el-radio>
<el-radio :label="2">拒绝</el-radio> <el-radio :label="2">拒绝</el-radio>
</el-radio-group> </el-radio-group>
@ -109,37 +110,43 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="原因：" prop="fail_msg" <el-form-item label="原因：" prop="fail_msg"
:rules="{ required: (auditForm.status == 2 && title == '审核') ? true : false, message: '拒绝原因不能为空', trigger: 'change' }"> :rules="{ required: (auditForm.status == 2 && title == '审核') ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
<el-input type="textarea" v-model="auditForm.fail_msg" :rows="3" :disabled="title == '查看' || title == '修改'"></el-input> <el-input type="textarea" v-model="auditForm.fail_msg" :rows="3"
:disabled="title == '查看' || title == '修改'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="商户名称："> <el-form-item label="商户名称：">
<el-input v-model="transferData.merchantInfo.mer_name" placeholder="请输入商户名称" :disabled="title == '查看'"></el-input> <el-input v-model="transferData.merchantInfo.mer_name" placeholder="请输入商户名称"
:disabled="title == '查看'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开户银行："> <el-form-item label="开户银行：">
<el-input v-model="transferData.financial_account.bank" placeholder="请输入开户银行" :disabled="title == '查看'"></el-input> <el-input v-model="transferData.financial_account.bank" placeholder="请输入开户银行"
:disabled="title == '查看'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="银行账号："> <el-form-item label="银行账号：">
<el-input v-model="transferData.financial_account.bank_code" placeholder="请输入银行账号" :disabled="title == '查看'"></el-input> <el-input v-model="transferData.financial_account.bank_code" placeholder="请输入银行账号"
:disabled="title == '查看'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开户户名："> <el-form-item label="开户户名：">
<el-input v-model="transferData.financial_account.name" placeholder="请输入开户户名" :disabled="title == '查看'"></el-input> <el-input v-model="transferData.financial_account.name" placeholder="请输入开户户名"
:disabled="title == '查看'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开户网点："> <el-form-item label="开户网点：">
<el-input v-model="transferData.financial_account.bank_branch" placeholder="请输入开户网点" :disabled="title == '查看'"></el-input> <el-input v-model="transferData.financial_account.bank_branch" placeholder="请输入开户网点"
:disabled="title == '查看'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -165,7 +172,7 @@
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import { merSelectApi } from '@/api/product' import { merSelectApi } from '@/api/product'
import { bankListApi, bandAuditApi ,editApi} from "@/api/accounts"; import { bankListApi, bandAuditApi, editApi } from "@/api/accounts";
import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts' import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
import createWorkBook from '@/utils/newToExcel.js'; import createWorkBook from '@/utils/newToExcel.js';
import timeOptions from '@/utils/timeOptions'; import timeOptions from '@/utils/timeOptions';
@ -245,28 +252,32 @@ export default {
// 审核 // 审核
transferReview(id) { transferReview(id) {
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if (valid) { if (valid) {
this.auditForm.id = this.transferData.id; this.auditForm.id = this.transferData.id;
this.auditForm.financial_account = this.transferData.financial_account; this.auditForm.financial_account = this.transferData.financial_account;
if(this.title == '修改') { this.auditForm.mer_id = this.transferData.mer_id;
editApi(this.auditForm).then(res=>{
if (this.title == '修改') {
editApi(this.auditForm).then(res => {
this.$message.success(res.message); this.$message.success(res.message);
this.dialogVisible = false; this.dialogVisible = false;
this.getList(1); this.getList(1);
}).catch(res => { }).catch(res => {
this.listLoading = false; this.listLoading = false;
this.$message.error(res.message) this.$message.error(res.message)
}) })
} else { } else {
bandAuditApi(this.auditForm).then(res => { if (!this.auditForm.status) return this.$message.error("请选择审核状态!");
this.$message.success(res.message); bandAuditApi(this.auditForm).then(res => {
this.dialogVisible = false; this.$message.success(res.message);
this.getList(1); this.dialogVisible = false;
}).catch(res => { this.getList(1);
this.listLoading = false; }).catch(res => {
this.$message.error(res.message) this.listLoading = false;
}) this.$message.error(res.message)
})
} }
} }
}) })

99
src/views/accounts/subsidy/index.vue
View File

@ -22,15 +22,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<cards-data v-if="cardLists.length>0" :card-lists="cardLists" /> <cards-data v-if="cardLists.length > 0" :card-lists="cardLists" />
<el-card> <el-card>
<el-table <el-table v-loading="listLoading" :data="tableData.data" size="small" class="table" highlight-current-row>
v-loading="listLoading"
:data="tableData.data"
size="small"
class="table"
highlight-current-row
>
<el-table-column label="编号" min-width="80"> <el-table-column label="编号" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.id }}</span> <span>{{ scope.row.id }}</span>
@ -44,33 +38,45 @@
<el-table-column prop="extra.official_purchase_target" label="里海云仓采购目标金额" min-width="150" /> <el-table-column prop="extra.official_purchase_target" label="里海云仓采购目标金额" min-width="150" />
<el-table-column prop="extra.purchase_target" label="其他店铺采购目标金额" min-width="150" /> <el-table-column prop="extra.purchase_target" label="其他店铺采购目标金额" min-width="150" />
<el-table-column prop="create_time" label="创建时间" min-width="150" sortable /> <el-table-column prop="create_time" label="创建时间" min-width="150" sortable />
<el-table-column prop="reason" label="备注" min-width="150" sortable />
<el-table-column label="操作" min-width="150" fixed="right"> <el-table-column label="操作" min-width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button v-if="scope.row.send_status == 0" type="text" size="small"
type="text" @click="handleStatus(scope.row.id, scope.$index)">审核</el-button>
size="small" <el-button type="text" size="small" class="mr10" @click="showDialog(scope.row)">修改</el-button>
@click="handleStatus(scope.row.id, scope.$index)"
>审核</el-button>
</template>
<template slot-scope="scope">
<router-link v-if="scope.row.send_status == 0" :to=" { path:`${roterPre}` + '/order/list?order_sn='+scope.row.order_sn } ">
<el-button type="text" size="small" class="mr10">修改</el-button>
</router-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
background layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
:page-size="tableFrom.limit" @current-change="pageChange" />
:current-page="tableFrom.page"
layout="total, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
</div> </div>
</el-card> </el-card>
<el-dialog title="修改数据" :visible.sync="dialogVisible">
<el-form ref="editForm" :model="formData" label-width="160px" :rules="rules">
<el-form-item label="销售目标金额">
<el-input type="number" readonly v-model="formData.extra.sale_target" placeholder="销售目标金额" />
</el-form-item>
<el-form-item label="里海云仓采购目标金额">
<el-input type="number" readonly v-model="formData.extra.official_purchase_target" placeholder="里海云仓采购目标金额" />
</el-form-item>
<el-form-item label="其他店铺采购目标金额">
<el-input type="number" readonly v-model="formData.extra.purchase_target" placeholder="其他店铺采购目标金额" />
</el-form-item>
<el-form-item label="重新审核说明">
<el-input type="number" readonly v-model="formData.reason" placeholder="重新审核说明" />
</el-form-item>
<el-form-item label="补贴金额" prop="amount">
<el-input type="number" v-model="formData.amount" placeholder="请输入补贴金额" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="updateInfo" type="primary">确 认</el-button>
</div>
</el-dialog>
<!-- <editForm ref="editForm" @complete="fetchData"></editForm> --> <!-- <editForm ref="editForm" @complete="fetchData"></editForm> -->
</div> </div>
</template> </template>
@ -94,6 +100,7 @@ export default {
data: [], data: [],
total: 0 total: 0
}, },
dialogVisible: false,
roterPre: roterPre, roterPre: roterPre,
listLoading: true, listLoading: true,
tableFrom: { tableFrom: {
@ -106,14 +113,41 @@ export default {
fromList: fromList, fromList: fromList,
options: [], options: [],
cardLists: [], cardLists: [],
formData: {
extra: {}
},
rules: {
amount: [{
required: true,
message: '请输入补贴金额',
tigger: 'blur'
}]
}
} }
}, },
mounted() { mounted() {
this.getList() this.getList()
}, },
methods: { methods: {
showDialog(row) {
this.formData = { ...row };
this.dialogVisible = true;
},
updateInfo() {
this.$refs.editForm.validate((valid) => {
if (valid) {
subsidyUpdateApi(this.formData).then(res => {
this.$message.success(res.message);
this.dialogVisible = false;
this.getList()
}).catch(res => {
this.$message.error(res.message);
})
}
})
},
/**重置 */ /**重置 */
searchReset(){ searchReset() {
this.timeVal = [] this.timeVal = []
this.tableFrom.type = "" this.tableFrom.type = ""
this.tableFrom.status = "" this.tableFrom.status = ""
@ -134,13 +168,13 @@ export default {
let lebData = {}; let lebData = {};
for (let i = 0; i < pageCount; i++) { for (let i = 0; i < pageCount; i++) {
lebData = await this.downData(excelData) lebData = await this.downData(excelData)
pageCount = Math.ceil(lebData.count/excelData.limit) pageCount = Math.ceil(lebData.count / excelData.limit)
if (lebData.export.length) { if (lebData.export.length) {
data = data.concat(lebData.export) data = data.concat(lebData.export)
excelData.page++ excelData.page++
} }
} }
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
return return
}, },
// 列表 // 列表
@ -165,7 +199,7 @@ export default {
// 审核 // 审核
handleStatus(id, idx) { handleStatus(id, idx) {
this.$modalSure('确定审核通过当前数据？').then(() => { this.$modalSure('确定审核通过当前数据？').then(() => {
subsidyStatusApi({id: id}) subsidyStatusApi({ id: id })
.then(({ message }) => { .then(({ message }) => {
this.$message.success(message); this.$message.success(message);
this.getList(1) this.getList(1)
@ -183,5 +217,4 @@ export default {
} }
</script> </script>
<style scoped> <style scoped></style>
</style>

7
src/views/order/list/index.vue
View File

@ -54,6 +54,7 @@
@change="getList(1), getCardList()"> @change="getList(1), getCardList()">
<el-option label="余额支付" value="0" /> <el-option label="余额支付" value="0" />
<el-option label="微信支付" value="1" /> <el-option label="微信支付" value="1" />
<el-option label="支付宝" value="2" />
<el-option label="商户余额支付" value="9" /> <el-option label="商户余额支付" value="9" />
<el-option label="对公转账" value="10" /> <el-option label="对公转账" value="10" />
<el-option label="微信收银" value="11" /> <el-option label="微信收银" value="11" />
@ -137,7 +138,7 @@
<el-table-column label="订单来源" min-width="80"> <el-table-column label="订单来源" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.order_type == 2 ? '扫码付款':'平台下单' }}</span> <span>{{ scope.row.order_type == 2 ? '扫码付款' : '平台下单' }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -176,7 +177,9 @@
</el-table-column> </el-table-column>
<el-table-column label="支付类型" min-width="80"> <el-table-column label="支付类型" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span> <span v-if="scope.row.pay_type == 10">对公转账</span>
<span v-else-if="scope.row.pay_type != 10 && scope.row.paid == 1">{{ scope.row.pay_type | orderPayType
}}</span>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
</el-table-column> </el-table-column>

44
src/views/product/productExamine/index.vue
View File

@ -221,14 +221,22 @@
<el-form-item label="排序："> <el-form-item label="排序：">
<el-input-number v-model="formValidate.rank" size="small" placeholder="请输入排序序号" style="width: 200px;" /> <el-input-number v-model="formValidate.rank" size="small" placeholder="请输入排序序号" style="width: 200px;" />
</el-form-item> </el-form-item>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="商品详情："> <el-form-item label="商品详情：">
<ueditor-from v-model="formValidate.content" :content="formValidate.content" /> <div class="upLoadPicBox" title="750*750px" style="display: flex;" @click="modalPicTap">
<div v-for="(item, index) in formValidate.content.image" class="pictrue details_pictrue"
@click.stop="deleteContentImg(index)" :key="index + item">
<img :src="item" :key="index" />
</div>
<div class="upLoad details_pictrue">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item style="margin-top:30px;"> <el-button style="margin-left:22px;" type="primary" class="submission" size="small"
<el-button type="primary" class="submission" size="small" @click="handleSubmit('formValidate')">提交</el-button> @click="handleSubmit('formValidate')">提交</el-button>
</el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
<!--预览商品--> <!--预览商品-->
@ -444,6 +452,17 @@ export default {
this.getLabelLst() this.getLabelLst()
}, },
methods: { methods: {
// 点击商品图
modalPicTap() {
let that = this;
this.$modalUpload(function (img) {
that.formValidate.content.image = that.formValidate.content.image.concat(img);
}, 10);
},
// 删除详情图片
deleteContentImg(index) {
this.formValidate.content.image.splice(index, 1)
},
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (this.product_id == row.product_id) { if (this.product_id == row.product_id) {
@ -562,7 +581,7 @@ export default {
content: info.content, content: info.content,
store_name: info.store_name, store_name: info.store_name,
rank: info.rank, rank: info.rank,
star: info.star star: info.star ? info.star : 0
} }
if (info.is_benefit === 1) this.checkboxGroup.push('is_benefit') if (info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
if (info.is_hot === 1) this.checkboxGroup.push('is_hot') if (info.is_hot === 1) this.checkboxGroup.push('is_hot')
@ -586,7 +605,6 @@ export default {
}, },
// 提交 // 提交
handleSubmit(name) { handleSubmit(name) {
console.log(this.formValidate)
this.$refs[name].validate((valid) => { this.$refs[name].validate((valid) => {
if (valid) { if (valid) {
productUpdateApi(this.productId, this.formValidate).then(async res => { productUpdateApi(this.productId, this.formValidate).then(async res => {
@ -783,6 +801,20 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pictrue {
width: 60px;
height: 60px;
border: 1px dotted rgba(0, 0, 0, 0.1);
margin-right: 10px;
position: relative;
cursor: pointer;
img {
width: 100%;
height: 100%;
}
}
/deep/.el-select-dropdown__item { /deep/.el-select-dropdown__item {
max-width: 350px !important; max-width: 350px !important;
} }