Commit 0a0537ad by zhangmengjie

23.4.6接口对接

parent abc12ee2
......@@ -17,10 +17,58 @@ export function createPayPOST(data) {
})
}
// 订单列表详情
export function particularsPOST(data) {
export function particularsGET(query) {
return request({
url: '/xinrenli/order/particulars',
method: 'get',
params: query
})
}
// 修改订单
export function editPOST(data) {
return request({
url: '/xinrenli/order/edit',
method: 'post',
data: data
})
}
// 用户反馈列表
export function userFeedbackGET(query) {
return request({
url: '/xinrenli/userFeedback/list',
method: 'get',
params: query
})
}
// 动态列表列表
export function articleGET(query) {
return request({
url: '/xinrenli/article/list',
method: 'get',
params: query
})
}
// 动态列表新增
export function articlePOST(data) {
return request({
url: '/xinrenli/article',
method: 'post',
data: data
})
}
// 动态列表详情
export function articlesGET(query) {
return request({
url: `/xinrenli/article/${query}`,
method: 'get',
// params: query
})
}
// 动态列表修改
export function articlePUT(data) {
return request({
url: '/xinrenli/article',
method: 'put',
data: data
})
}
\ No newline at end of file
<template>
<div class="app-container">
<el-dialog :title=title :visible.sync="dialogVisibl" width="30%" :before-close="dialog" center>
<!-- 图片说明 -->
<el-image style="width:100%; " :src="url" :preview-src-list="srcList">
</el-image>
<!-- 图片说明 -->
<el-image style="width:100%; " :src="control" :preview-src-list="srcList">
</el-image>
</el-dialog>
</div>
</template>
......@@ -20,6 +20,10 @@ export default {
dialogVisibl: {
type: Boolean
},
control: {
type: String,
default: "",
}
},
data() {
return {
......
......@@ -2,21 +2,21 @@
<div class="app-container">
<el-dialog :title='title' :visible.sync="dialogVisibl" width="60%" :before-close="dialog">
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-form-item label="动态标题" class="customer" prop="name">
<el-input v-model="form.name"></el-input>
<el-form-item label="动态标题" class="customer" prop="title">
<el-input v-model="form.title" :disabled="disabled"></el-input>
</el-form-item>
<el-form-item label="动态内容" prop="desc">
<Editor v-model="currentInfo.content" :height="300"></Editor>
<el-form-item label="动态内容" prop="content">
<Editor v-model="form.content" :height="300" :disabled="disabled"></Editor>
</el-form-item>
<el-form-item label="添加图片" class="customer" prop="name">
<ImageUpload></ImageUpload>
<ImageUpload :disabled="disabled"></ImageUpload>
</el-form-item>
<el-form-item>
</el-form-item>
<!-- <quillEditor></quillEditor> -->
</el-form>
<el-button type="primary" @click="onSubmit">确认修改</el-button>
<el-button type="primary" :disabled="disabled" @click="onSubmit">确认修改</el-button>
</el-dialog>
</div>
</template>
......@@ -35,6 +35,10 @@ export default {
},
title: {
type: String
},
disabled:{
type:Boolean,
default:false
}
},
data() {
......@@ -47,16 +51,16 @@ export default {
],
value1: '',
form: {
name: '',
desc: ''
title: '',
content: ''
},
currentInfo:{},
rules: {
name: [
title: [
{ required: true, message: '请输入活动名称', trigger: 'blur' },
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
],
desc: [
content: [
{ required: true, message: '请填写活动形式', trigger: 'blur' }
]
}
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="94px">
<el-form-item label="联系人姓名" prop="dataName">
<el-form-item label="动态标题" prop="dataName">
<el-input v-model="queryParams.dataName" placeholder="请输入联系人姓名" clearable />
</el-form-item>
<el-form-item label="联系电话" prop="tableName">
<!-- <el-form-item label="联系电话" prop="tableName">
<el-input v-model="queryParams.tableName" placeholder="请输入联系电话" clearable />
</el-form-item>
<el-form-item label="维修时间" prop="tableComment">
......@@ -16,27 +16,27 @@
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleGenTable">导出订单</el-button>
<el-button type="primary" plain size="mini" @click="handleGenTable">新增发布</el-button>
<el-button type="primary" plain size="mini" @click="modify(0, '3')">新增发布</el-button>
</el-form-item>
</el-form>
<el-table :data="tableData" border style="width: 100%">
<el-table-column type="index" width="50" label="序号" align="center">
</el-table-column>
<el-table-column prop="date" label="动态标题" :show-overflow-tooltip="true" align="center">
<el-table-column prop="title" label="动态标题" :show-overflow-tooltip="true" align="center">
</el-table-column>
<el-table-column prop="name" label="动态内容" :show-overflow-tooltip="true" align="center">
<el-table-column prop="content" label="动态内容" :show-overflow-tooltip="true" align="center">
</el-table-column>
<el-table-column prop="address" label="图片展示" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="imageCaption(scope)">查看详情</el-button>
<el-button type="text" size="small" @click="imageCaption(scope.row)">查看详情</el-button>
</template>
</el-table-column>
<el-table-column label="操作" width="150">
......@@ -49,7 +49,8 @@
<!-- 其他 -->
<comindex :dialogVisibl="dialogVisible" @visivie='visivie' :control="control"></comindex>
<!-- 修改 详情 -->
<commodify :title="title" :dialogVisibl="dialogVi" @diaisibl="diaisibl" @onSubmit="onSubmit"></commodify>
<commodify ref="refModify" :disabled="disabled" :title="title" :dialogVisibl="dialogVi" @diaisibl="diaisibl" @onSubmit="onSubmit">
</commodify>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
......@@ -58,16 +59,17 @@
<script>
import comindex from './components/index'
import commodify from './components/modify'
import { articleGET, articlePOST, articlesGET,articlePUT } from '@/api/orderform/index'
export default {
name: "orderform",
data() {
return {
dialogVisible: false,
dialogVi: false,
control: 0,
total: 5,
value1:'',
disabled:false,
control: '',
total: 0,
value1: '',
title: '修改订单',
options: [{
value: '选项1',
......@@ -138,19 +140,33 @@ export default {
comindex,
commodify
},
created() { },
created() {
this.artic()
},
methods: {
// 搜索
handleQuery() {
this.artic()
},
//列表接口
artic() {
articleGET({ ...this.queryParams }).then((res) => {
this.total = res.total
this.tableData = res.rows
})
},
// 重置
resetQuery() {
this.queryParams.dataName = '';
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10;
this.artic()
},
// 导出订单
handleGenTable() {
this.download('/xinrenli/article/export', {
...this.queryParams
}, `role_${new Date().getTime()}.xlsx`)
},
// 页码切换
getList() {
......@@ -158,29 +174,58 @@ export default {
},
// 打开查看详情
imageCaption(sta) {
this.control = sta.fileVos[0].url
this.dialogVisible = true
},
// 修改详情
modify(sta, val) {
if (val == '1') {
this.title = '修改订单'
} else {
this.articles(sta.id)
this.disabled = false
} else if (val == '2') {
this.articles(sta.id)
this.disabled = true
this.title = '订单详情'
} else if (val == '3') {
this.title = '新增订单'
}
this.dialogVi = true
},
articles(val) {
articlesGET(val).then((res) => {
this.$refs['refModify'].form.content = res.data.content
this.$refs['refModify'].form.title = res.data.title
})
},
// 其他 弹窗关闭
visivie() {
this.dialogVisible = false
},
// 详情 修改 弹窗关闭
diaisibl() {
this.$refs['refModify'].form.content = ''
this.$refs['refModify'].form.title = ''
this.dialogVi = false
},
// 详情 修改 确认修改
onSubmit() {
this.dialogVi = false
if (this.title = '新增订单') {
articlePOST({ ...this.$refs['refModify'].form }).then((res) => {
this.$refs['refModify'].form.content = ''
this.$refs['refModify'].form.title = ''
this.dialogVi = false
})
}else if(this.title = '修改订单'){
articlePUT({ ...this.$refs['refModify'].form }).then((res)=>{
console.log(res,'res===========')
this.$refs['refModify'].form.content = ''
this.$refs['refModify'].form.title = ''
this.dialogVi = false
})
}
}
}
};
......
......@@ -3,34 +3,18 @@
<el-table :data="tableData" border style="width: 100%">
<el-table-column type="index" width="50" label="序号" align="center">
</el-table-column>
<el-table-column
prop="title"
label="标题"
:show-overflow-tooltip="true"
align="center"
width="300px"
>
<el-table-column prop="title" label="标题" :show-overflow-tooltip="true" align="center" width="300px">
</el-table-column>
<el-table-column
prop="describe"
label="描述"
:show-overflow-tooltip="true"
width="300"
align="center"
>
<el-table-column prop="content" label="描述" :show-overflow-tooltip="true" width="300" align="center">
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import { userFeedbackGET } from '@/api/orderform/index'
export default {
data() {
return {
......@@ -38,7 +22,7 @@ export default {
pageNum: 1,
pageSize: 10,
},
total: 10,
total: 0,
tableData: [
{
title: "不断实现人民对美好生活的向往",
......@@ -48,8 +32,17 @@ export default {
],
};
},
methods:{
getList(){}
created() {
this.getList()
},
methods: {
getList() {
userFeedbackGET({ ...this.queryParams }).then((res) => {
this.total = res.total
this.tableData = res.rows
console.log(res, 'ppppppppppppppppppppp')
})
}
}
};
</script>
......
<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="url" :preview-src-list="srcList">
......@@ -15,21 +15,21 @@
<!-- 沟通后金额 -->
<div v-if="control == '4'">
<el-form :model="form">
<el-form-item label="沟通后金额" >
<el-input v-model="form.name" placeholder="请输入沟通后金额"></el-input>
<el-form-item label="沟通后金额">
<el-input v-model="form.money" placeholder="请输入沟通后金额"></el-input>
</el-form-item>
</el-form>
</div>
<!-- 驳回 -->
<div v-if="control == '5'">
<el-form :model="form">
<el-form-item label="驳回理由" >
<el-form-item label="驳回理由">
<el-input v-model="form.name" type="textarea" placeholder="请输入驳回理由"></el-input>
</el-form-item>
</el-form>
</div>
<span v-if="control == '4' || control == '5'" slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialog">确 定</el-button>
<el-button type="primary" @click="clickDialog">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -49,6 +49,12 @@ export default {
},
control: {
type: String
},
bindex: {
type: Array
},
idt: {
type: [String, Number]
}
},
data() {
......@@ -59,27 +65,44 @@ export default {
'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
],
form: {
name: ''
name: '',
money:''
},
title: ''
};
},
watch: {
control(st, old) {
console.log(st, old)
let self = this
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 = '订单驳回'
}
},
bindex(st, old) {
console.log(st, old,this.idt, '000000000000')
}
},
created() { },
methods: {
dialog() {
this.$emit('visivie')
},
clickDialog() {
this.$emit('clickDialog')
}
}
};
......
......@@ -5,29 +5,32 @@
<span class="description">客户基本信息</span>
<div class="customer">
<el-form-item label="联系人" class="customer-lab">
<el-input v-model="form.name"></el-input>
<el-input v-model="particulars.linkman" :disabled="disabled"></el-input>
</el-form-item>
<el-form-item label="联系电话" class="customer-lab">
<el-input v-model="form.name"></el-input>
<el-input v-model="particulars.phone" :disabled="disabled"></el-input>
</el-form-item>
<el-form-item label="订单标题" class="customer-lab">
<el-input v-model="form.name"></el-input>
<el-input v-model="particulars.title" :disabled="disabled"></el-input>
</el-form-item>
<el-form-item label="联系人" class="customer-lab">
<el-date-picker v-model="value1" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
class="customer-lab-icke">
<el-form-item label="维修时间" class="customer-lab">
<el-date-picker v-model="particulars.repairTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
class="customer-lab-icke" :disabled="disabled">
</el-date-picker>
</el-form-item>
<el-form-item label="维修地址" class="customer-lab">
<el-input v-model="form.name"></el-input>
<el-input v-model="particulars.repairAddress" :disabled="disabled"></el-input>
</el-form-item>
</div>
<div class="description">
<span>图片说明</span>
<div class="imgdiv">
<el-image class="imgdiv-img" :src="url" :preview-src-list="srcList">
</el-image>
<div style="display: flex;">
<div class="imgdiv" v-for="v in particulars.pictureList">
<el-image class="imgdiv-img" :src="v.url" :preview-src-list="srcList">
</el-image>
</div>
</div>
</div>
<div class="description">
<span>视频说明</span>
......@@ -46,7 +49,7 @@
<div class="description">
<span>备注说明</span>
<div class="imgdiv">
<el-input type="textarea" v-model="form.desc"></el-input>
<el-input type="textarea" v-model="particulars.remark" :disabled="disabled"></el-input>
</div>
</div>
<el-form-item>
......@@ -54,13 +57,14 @@
</el-form-item>
</el-form>
<el-button @click="dialog">返回</el-button>
<el-button type="primary" @click="onSubmit">确认修改</el-button>
<el-button v-if="title == '修改订单'" type="primary" @click="onSubmit">确认修改</el-button>
</el-dialog>
</div>
</template>
<script>
import comvideo from './video.vue'
import { particularsGET ,editPOST} from '@/api/orderform/index'
export default {
name: "modify",
......@@ -74,8 +78,9 @@ export default {
title: {
type: String
},
ids:{
type:String
disabled:{
type:Boolean,
default: false,
}
},
data() {
......@@ -96,15 +101,29 @@ export default {
type: [],
resource: '',
desc: ''
}
},
particulars: {}
};
},
created() { },
methods: {
partic(val) {
let self = this
particularsGET({ id: val }).then((res) => {
if (res.code == 200) {
self.particulars = res.data
}
})
},
dialog() {
this.$emit('diaisibl')
},
onSubmit(){
onSubmit() {
editPOST({...this.particulars}).then((res)=>{
console.log(res,'res===========')
})
this.$emit('onSubmit')
}
}
......
......@@ -40,7 +40,8 @@
</el-table-column>
<el-table-column prop="actualAmount" label="沟通后金额(元)" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-input v-if="!scope.row.actualAmount" v-model="scope.row.dataName" placeholder="请输入联系人姓名" clearable />
<el-input v-if="!scope.row.actualAmount" class="delInput"
type='number' v-model="scope.row.dataName" @change="cc( scope.row)" placeholder="请输入联系人姓名" clearable />
<div v-else>{{ scope.row.actualAmount }}</div>
</template>
</el-table-column>
......@@ -63,7 +64,7 @@
</el-table-column>
<el-table-column prop="status" label="订单状态" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<div>{{scope.row.status | filtersList }}</div>
<div>{{ scope.row.status | filtersList }}</div>
</template>
</el-table-column>
<el-table-column prop="reasonsForRejection" label="驳回理由" :show-overflow-tooltip="true" align="center">
......@@ -72,17 +73,21 @@
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0 || scope.row.status == 5" @click="imageCaption(scope.row, '4')" type="text" size="small">生成支付订单</el-button>
<el-button v-if="scope.row.status == 0" type="text" size="small" @click="imageCaption(scope.row, '5')">驳回</el-button>
<el-button v-if="scope.row.status == 0 || scope.row.status == 2" type="text" size="small" @click="modify(scope.row, '1')">修改</el-button>
<el-button type="text" size="small" @click="modify(scope.row, '2')">详情</el-button>
<el-button v-if="scope.row.status == 0 || scope.row.status == 5" @click="imageCaption(scope.row, '4')"
type="text" size="small">生成支付订单</el-button>
<el-button v-if="scope.row.status == 0" type="text" size="small"
@click="imageCaption(scope.row, '5')">驳回</el-button>
<el-button v-if="scope.row.status == 0 || scope.row.status == 2" type="text" size="small"
@click="modify(scope.row, '1')">修改</el-button>
<el-button type="text" size="small" @click="modify(scope.row, '2')">详情</el-button>
</template>
</el-table-column>
</el-table>
<!-- 其他 -->
<comindex :dialogVisibl="dialogVisible" @visivie='visivie' :control="control" ref="refIndex"></comindex>
<comindex :dialogVisibl="dialogVisible" :idt="id" @visivie='visivie' @clickDialog="clickDialog" :control="control" ref="refIndex" :bindex="bb"></comindex>
<!-- 修改 详情 -->
<commodify :title="title" :dialogVisibl="dialogVi" @diaisibl="diaisibl" @onSubmit="onSubmit" ids="ids"></commodify>
<commodify :title="title" :dialogVisibl="dialogVi" @diaisibl="diaisibl" @onSubmit="onSubmit" :disabled="disabled"
ref="refModify" ></commodify>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
......@@ -91,7 +96,7 @@
<script>
import comindex from './components/index'
import commodify from './components/modify'
import { listGET ,createPayPOST} from '@/api/orderform/index'
import { listGET, createPayPOST } from '@/api/orderform/index'
export default {
name: "orderform",
filters: {
......@@ -144,6 +149,8 @@ export default {
value: '6',
label: '已退款'
}],
disabled:false,
particulars: {},
tableData: [],
// 日期范围
dateRange: "",
......@@ -159,9 +166,10 @@ export default {
linkman: '',
phone: ''
},
id:'',
ids:'',
id: '',
ids: '',
// 预览参数
bb: [],
preview: {
open: false,
title: "代码预览",
......@@ -174,6 +182,16 @@ export default {
comindex,
commodify
},
watch:{
//监听器的作用就是用来监听数据是否发生了变化,变化后可以进行一些其他操作
//只要没有发生变化,就没有办法进行其他的操作
bb: function (newData, oldData) {
//newData是更新后的数据
//oldData是旧数据
// newData.tel = 1111;
console.log("监听变化:", newData, oldData);
},
},
created() {
this.listth()
},
......@@ -205,10 +223,6 @@ export default {
},
// 导出订单
handleGenTable() {
const tableNames = 'db_Inviter'
let params = {
...this.queryParams
}
this.download('/xinrenli/order/export', {
...this.queryParams
}, `role_${new Date().getTime()}.xlsx`)
......@@ -231,6 +245,7 @@ export default {
this.control = val
break;
case '4':
this.id = sta.id
this.control = val
break;
case '5':
......@@ -240,31 +255,56 @@ export default {
}
this.dialogVisible = true
},
cc(index) {
console.log("更改后的值:", index);
this.bb.push(index)
},
// 修改详情
modify(sta, val) {
let self = this
if (val == '1') {
this.ids = sta.id
this.title = '修改订单'
self.disabled = false
self.title = '修改订单'
self.$refs['refModify'].partic(sta.id)
} else {
this.title = '订单详情'
self.disabled = true
self.$refs['refModify'].partic(sta.id)
self.title = '订单详情'
}
this.dialogVi = true
self.dialogVi = true
},
// 其他 弹窗关闭
visivie() {
if(this.control == '5'){
let params = {
reasonsForRejection:this.$refs['refIndex'].form.name,
status:1,
id:this.id
this.dialogVisible = false
},
// 其他 确认
clickDialog(){
if (this.control == '5') {
var params = {
reasonsForRejection: this.$refs['refIndex'].form.name,
status: 1,
id: this.id
}
createPayPOST(params).then((res) => {
if (res.code == 200) {
this.$refs['refIndex'].form.name = ''
this.dialogVisible = false
this.listth()
}
})
} else if (this.control == '4') {
var params = {
reasonsForRejection: this.$refs['refIndex'].form.money,
status: 2,
id: this.id
}
createPayPOST(params).then((res)=>{
if(res.code == 200){
this.$refs['refIndex'].form.name = ''
this.dialogVisible = false
this.listth()
}
createPayPOST(params).then((res) => {
if (res.code == 200) {
this.$refs['refIndex'].form.money = ''
this.dialogVisible = false
this.listth()
}
})
}
},
......@@ -279,3 +319,15 @@ export default {
}
};
</script>
<style scoped lang="scss">
::v-deep .delInput input::-webkit-outer-spin-button,
::v-deep .delInput input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
::v-deep .delInput input[type="number"] {
-moz-appearance: textfield;
}
</style>
......@@ -44,7 +44,7 @@
</el-card>
</el-col>
<el-col :span="12" class="card-box">
<el-button type="primary" size="medium ">导出报表(PDF)</el-button>
<el-button type="primary" size="medium ">导出报表</el-button>
</el-col>
</el-row>
</div>
......
......@@ -35,8 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://xinrenli.nyinhong.com/api`,
target: `http://192.168.0.175:7001`,
target: `http://xinrenli.nyinhong.com/api`,
// target: `http://192.168.0.175:7001`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
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