Commit 440e9806 by ‘巴博尔’

修改

parent b232e4cf
No preview for this file type
......@@ -91,9 +91,9 @@ export function exportReportFormsPOST(data) {
// 报表接口
export function reportFormsGET(query) {
return request({
url: '/xinrenli/order/reportForms',
url: `/xinrenli/order/reportForms?startTime=${query.startTime}&endTime=${query.endTime}`,
method: 'get',
params: query
// params: query
})
}
// 营销活动列表
......@@ -135,4 +135,12 @@ export function couponlePUT(data) {
method: 'put',
data: data
})
}
// 累计成交额
export function accumulatedTransactionVolumeGET(query) {
return request({
url: `/xinrenli/order/accumulatedTransactionVolume?year=${query.year}`,
method: 'get',
// params: query
})
}
\ No newline at end of file

5.53 KB | W: | H:

16.8 KB | W: | H:

src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
  • 2-up
  • Swipe
  • Onion skin
<template>
<div class="app-container">
<el-dialog :title='title' :visible.sync="dialogVisibl" width="30%" :before-close="dialog" center>
<el-dialog
:title="title"
:visible.sync="dialogVisibl"
width="30%"
:before-close="dialog"
center
>
<div v-if="control != 4">
<!-- 图片说明 -->
<el-image v-if="control == '1'" style="width:100%;" :src="idt" >
<el-image v-if="control == '1'" style="width: 100%" :src="idt">
</el-image>
<!-- 视频说明 -->
<comvideo v-if="control == '2'" :videoUrl="idt" :videoCover="videoCover"></comvideo>
<comvideo
v-if="control == '2'"
:videoUrl="idt"
:videoCover="videoCover"
></comvideo>
<!-- 语音说明 -->
<audio v-if="control == '3'" controls ref="audio" class="aud">
<source :src="idt" />
</audio>
</div>
<!-- 沟通后金额 -->
<div v-if="control == '4' || control == '9' ">
<div v-if="control == '4' || control == '9'">
<el-form :model="form">
<el-form-item label="沟通后金额">
<el-input class="delInput" type='number' v-model="form.money" placeholder="请输入沟通后金额"></el-input>
<el-input
class="delInput"
type="number"
v-model="form.money"
placeholder="请输入沟通后金额"
></el-input>
</el-form-item>
<el-form-item label="管理员备注" v-if="control == '4'">
<el-input
type="textarea"
:rows="2"
placeholder="请输入管理员备注"
v-model="form.adminRemark"
maxlength="500"
show-word-limit
:autosize="{ minRows: 4}"
>
</el-input>
</el-form-item>
</el-form>
</div>
......@@ -24,11 +51,19 @@
<div v-if="control == '5'">
<el-form :model="form">
<el-form-item label="驳回理由">
<el-input v-model="form.name" type="textarea" placeholder="请输入驳回理由"></el-input>
<el-input
v-model="form.name"
type="textarea"
placeholder="请输入驳回理由"
></el-input>
</el-form-item>
</el-form>
</div>
<span v-if="control == '4' || control == '5' || control == '9' " slot="footer" class="dialog-footer">
<span
v-if="control == '4' || control == '5' || control == '9'"
slot="footer"
class="dialog-footer"
>
<el-button type="primary" @click="clickDialog">确 定</el-button>
</span>
</el-dialog>
......@@ -36,97 +71,104 @@
</template>
<script>
import comvideo from './video.vue'
import comvideo from "./video.vue";
export default {
name: "orderform",
components: {
comvideo
comvideo,
},
props: {
dialogVisibl: {
type: Boolean
type: Boolean,
},
control: {
type: String
type: String,
},
bindex: {
type: Array
type: Array,
},
idt: {
type: [String, Number]
type: [String, Number],
},
videoCover: {
type: [String, Number],
},
videoCover:{
type: [String, Number]
}
},
data() {
return {
url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
// srcList: [
// 'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
// 'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
// ],
form: {
name: '',
money:''
name: "",
money: "",
},
title: '',
id:''
title: "",
id: "",
};
},
watch: {
control(st, old) {
let self = this
let self = this;
if (st == '4') {
this.title = '生成支付订单'
if (st == "4") {
this.title = "生成支付订单";
if (self.dialogVisibl) {
this.bindex.forEach(element => {
if(self.idt == element.id){
self.form.money = element.dataName
console.log(self.form.money,element.dataName,'element.dataName')
}
});
}
} else if (st == '1') {
this.title = ''
} else if (st == '5') {
this.title = '订单驳回'
}else if(st == '9'){
this.title = '生成退款订单'
this.bindex.forEach((element) => {
if (self.idt == element.id) {
self.form.money = element.dataName;
console.log(
self.form.money,
element.dataName,
"element.dataName"
);
}
});
}
} else if (st == "1") {
this.title = "";
} else if (st == "5") {
this.title = "订单驳回";
} else if (st == "9") {
this.title = "生成退款订单";
if (self.dialogVisibl) {
this.bindex.forEach(element => {
if(self.idt == element.id){
self.form.money = element.dataName
console.log(self.form.money,element.dataName,'element.dataName')
}
});
}
this.bindex.forEach((element) => {
if (self.idt == element.id) {
self.form.money = element.dataName;
console.log(
self.form.money,
element.dataName,
"element.dataName"
);
}
});
}
}
},
idt(val,old){
this.$nextTick(() => {
this.$refs.audio.src = val;
});
idt(val, old) {
this.$nextTick(() => {
this.$refs.audio.src = val;
});
},
bindex(st, old) {
console.log(st, old,this.idt, '000000000000')
}
console.log(st, old, this.idt, "000000000000");
},
},
created() { },
created() {},
methods: {
dialog() {
this.$emit('visivie')
this.$emit("visivie");
},
clickDialog() {
this.$emit('clickDialog')
}
}
this.$emit("clickDialog");
},
},
};
</script>
<style scoped lang="scss">
<style scoped lang="scss">
::v-deep .delInput input::-webkit-outer-spin-button,
::v-deep .delInput input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
......@@ -135,4 +177,4 @@ export default {
::v-deep .delInput input[type="number"] {
-moz-appearance: textfield;
}
</style>
\ No newline at end of file
</style>
......@@ -71,6 +71,8 @@
</el-table-column>
<el-table-column prop="remark" label="备注说明" :show-overflow-tooltip="true" align="center">
</el-table-column>
<el-table-column prop="adminRemark" label="管理员备注" :show-overflow-tooltip="true" align="center">
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" @click="imageCaption(scope.row, '4')" type="text"
......@@ -343,12 +345,14 @@ export default {
if (this.$refs['refIndex'].form.money) {
var params = {
actualAmount: this.$refs['refIndex'].form.money,
adminRemark: this.$refs['refIndex'].form.adminRemark,
status: 2,
id: this.id
}
createPayPOST(params).then((res) => {
if (res.code == 200) {
this.$refs['refIndex'].form.money = ''
this.$refs['refIndex'].form.adminRemark = ''
this.dialogVisible = false
this.listth()
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment