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

1
src/filters/commFilter.js
View File

@ -187,6 +187,7 @@ export function orderPayType(type) {
'10': '对公转账',
'11': '微信收银',
'12': '现金收款',
'13': '支付宝条码',
}
return typeMap[type]
}

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

@ -98,8 +98,9 @@
<el-row>
<el-col :span="12">
<el-form-item label="审核状态：" prop="status"
:rules="{ required: (auditForm.status == 2 && title == '审核') , message: '审核状态不能为空', trigger: 'change' }">
<el-radio-group v-model="auditForm.status" @change="radioChange" :disabled="(title == '查看' || title == '修改')">
:rules="{ required: (title == '审核'), message: '审核状态不能为空', trigger: 'change' }">
<el-radio-group v-model="auditForm.status" @change="radioChange"
:disabled="(title == '查看' || title == '修改')">
<el-radio :label="1" class="radio">通过</el-radio>
<el-radio :label="2">拒绝</el-radio>
</el-radio-group>
@ -109,37 +110,43 @@
<el-col :span="24">
<el-form-item label="原因：" prop="fail_msg"
: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-col>
<el-col :span="12">
<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-col>
<el-col :span="12">
<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-col>
<el-col :span="12">
<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-col>
<el-col :span="12">
<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-col>
<el-col :span="12">
<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-col>
</el-row>
@ -245,10 +252,13 @@ export default {
// 审核
transferReview(id) {
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.auditForm.id = this.transferData.id;
this.auditForm.financial_account = this.transferData.financial_account;
this.auditForm.mer_id = this.transferData.mer_id;
if (this.title == '修改') {
editApi(this.auditForm).then(res => {
this.$message.success(res.message);
@ -259,6 +269,7 @@ export default {
this.$message.error(res.message)
})
} else {
if (!this.auditForm.status) return this.$message.error("请选择审核状态!");
bandAuditApi(this.auditForm).then(res => {
this.$message.success(res.message);
this.dialogVisible = false;

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

@ -24,13 +24,7 @@
</div>
<cards-data v-if="cardLists.length > 0" :card-lists="cardLists" />
<el-card>
<el-table
v-loading="listLoading"
:data="tableData.data"
size="small"
class="table"
highlight-current-row
>
<el-table v-loading="listLoading" :data="tableData.data" size="small" class="table" highlight-current-row>
<el-table-column label="编号" min-width="80">
<template slot-scope="scope">
<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.purchase_target" label="其他店铺采购目标金额" min-width="150" />
<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">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@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>
<el-button v-if="scope.row.send_status == 0" type="text" size="small"
@click="handleStatus(scope.row.id, scope.$index)">审核</el-button>
<el-button type="text" size="small" class="mr10" @click="showDialog(scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
background
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
<el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
@current-change="pageChange" />
</div>
</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> -->
</div>
</template>
@ -94,6 +100,7 @@ export default {
data: [],
total: 0
},
dialogVisible: false,
roterPre: roterPre,
listLoading: true,
tableFrom: {
@ -106,12 +113,39 @@ export default {
fromList: fromList,
options: [],
cardLists: [],
formData: {
extra: {}
},
rules: {
amount: [{
required: true,
message: '请输入补贴金额',
tigger: 'blur'
}]
}
}
},
mounted() {
this.getList()
},
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() {
this.timeVal = []
@ -183,5 +217,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>

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

@ -54,6 +54,7 @@
@change="getList(1), getCardList()">
<el-option label="余额支付" value="0" />
<el-option label="微信支付" value="1" />
<el-option label="支付宝" value="2" />
<el-option label="商户余额支付" value="9" />
<el-option label="对公转账" value="10" />
<el-option label="微信收银" value="11" />
@ -176,7 +177,9 @@
</el-table-column>
<el-table-column label="支付类型" min-width="80">
<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>
</template>
</el-table-column>

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

@ -221,14 +221,22 @@
<el-form-item label="排序：">
<el-input-number v-model="formValidate.rank" size="small" placeholder="请输入排序序号" style="width: 200px;" />
</el-form-item>
<el-col :span="24">
<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-col>
<el-form-item style="margin-top:30px;">
<el-button type="primary" class="submission" size="small" @click="handleSubmit('formValidate')">提交</el-button>
</el-form-item>
<el-button style="margin-left:22px;" type="primary" class="submission" size="small"
@click="handleSubmit('formValidate')">提交</el-button>
</el-form>
</el-dialog>
<!--预览商品-->
@ -444,6 +452,17 @@ export default {
this.getLabelLst()
},
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 }) {
if (this.product_id == row.product_id) {
@ -562,7 +581,7 @@ export default {
content: info.content,
store_name: info.store_name,
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_hot === 1) this.checkboxGroup.push('is_hot')
@ -586,7 +605,6 @@ export default {
},
// 提交
handleSubmit(name) {
console.log(this.formValidate)
this.$refs[name].validate((valid) => {
if (valid) {
productUpdateApi(this.productId, this.formValidate).then(async res => {
@ -783,6 +801,20 @@ export default {
</script>
<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 {
max-width: 350px !important;
}