iSnail/CTPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2

Browse Source
This commit is contained in:
isnail
2025-05-28 23:25:48 +08:00
parent 9a18ef2691
commit 6cd3268908
38 changed files with 1245 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-ui/src/api/ct/agentOrder.js
View File

@@ -17,6 +17,27 @@ export function getAgentOrder(id) {
})
}
export function syncOrder(id) {
return request({
url: '/ct/agentOrder/syncOrder/' + id,
method: 'get'
})
}
export function syncExpress(id) {
return request({
url: '/ct/agentOrder/syncExpress/' + id,
method: 'get'
})
}
export function syncOffer(id) {
return request({
url: '/ct/agentOrder/syncOffer/' + id,
method: 'get'
})
}
// 新增订单
export function addAgentOrder(data) {
return request({

2
ruoyi-ui/src/utils/request.js
View File

@@ -19,7 +19,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 10000
timeout: 600000
})
// request拦截器

14
ruoyi-ui/src/views/ct/agentAccount/index.vue
View File

@@ -17,7 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</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>
@@ -79,8 +79,8 @@
{{props.row.ipList}}
</el-form-item>
<el-form-item label="商品">
<el-tag type="success"
v-for="goods in props.row.agentAccountGoodVoList"
<el-tag type="success"
v-for="goods in props.row.agentAccountGoodVoList"
:key="goods.id"
style="margin-right: 10px"
>{{goods.title}}</el-tag>
@@ -92,7 +92,7 @@
</template>
</el-table-column>
<el-table-column label="代理商名称" fixed align="center" prop="agentName" />
<el-table-column label="电信ID" width="100" align="center" prop="personnelId" />
<el-table-column label="别名" width="100" align="center" prop="personnelId" />
<el-table-column label="APP ID" width="290" align="center" prop="appId" />
<el-table-column label="APP Secret" width="290" align="center" prop="appSecret" />
<el-table-column label="公钥" width="80" align="center" prop="appSecret">
@@ -176,8 +176,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="电信ID" prop="personnelId">
<el-input v-model="form.personnelId" :readonly="form.id!=null" placeholder="请输入电信ID" />
<el-form-item label="别名" prop="personnelId">
<el-input v-model="form.personnelId" placeholder="请输入别名" />
</el-form-item>
</el-col>
</el-row>
@@ -232,7 +232,7 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>

16
ruoyi-ui/src/views/ct/agentAccountGood/index.vue
View File

@@ -2,10 +2,10 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="代理商" prop="agentId">
<el-select v-model="queryParams.agentId" clearable>
<el-select v-model="queryParams.agentAccountId" filterable clearable>
<el-option
v-for="item in agentList" :key="item.id"
:label="item.name"
v-for="item in agentAccountList" :key="item.value"
:label="item.agentName+'('+item.personnelId+')'"
:value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -273,7 +273,6 @@ export default {
this.agentAccountList.forEach(item=>{
if (item.id == val) {
this.form.agentId = item.agentId
this.form.personnelId = item.personnelId
}
})
},
@@ -281,14 +280,15 @@ export default {
this.goodsList.forEach(item=>{
if (item.id == val) {
this.form.saleId = item.saleId
this.form.personnelId = item.personnelId
}
})
},
getAgentName(row) {
let name = ''
this.agentList.forEach(item=>{
if (row.agentId == item.id) {
name = item.name
this.agentAccountList.forEach(item=>{
if (row.agentAccountId == item.id) {
name = item.agentName+'('+item.personnelId+')'
}
})
return name
@@ -416,7 +416,7 @@ export default {
});
},
save() {
if (this.form.id != null) {
updateAgentAccountGood(this.form).then(response => {
this.$modal.msgSuccess("修改成功");

373
ruoyi-ui/src/views/ct/agentOrder/index.vue
View File

@@ -41,7 +41,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="serialNumber">
<el-input
v-model="queryParams.serialNumber"
@@ -106,6 +106,30 @@
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item label="办理完成时间">
<el-date-picker
v-model="daterangeActiveTime"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item label="首冲时间">
<el-date-picker
v-model="daterangeRechargeTime"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item label="下单类型" prop="isExpress">
<el-select v-model="queryParams.isExpress" placeholder="请选择下单类型" clearable>
<el-option
@@ -116,6 +140,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="异常订单" prop="hasError">
<el-select v-model="queryParams.hasError" placeholder="异常订单" clearable>
<el-option
v-for="dict in dict.type.has_error"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
@@ -123,7 +157,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="primary"
plain
@@ -133,6 +167,7 @@
v-hasPermi="['ct:agentOrder:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
@@ -165,6 +200,16 @@
v-hasPermi="['ct:agentOrder:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleBill"
v-hasPermi="['ct:agentOrder:add']"
>对账单</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -211,7 +256,7 @@
</el-timeline-item>
</el-timeline>
</el-form-item> -->
</el-form>
</template>
</el-table-column>
@@ -225,13 +270,18 @@
<el-table-column label="商品ID" align="center" prop="saleId" />
<el-table-column label="商品名称" align="center" prop="title" />
<el-table-column label="代理商电信ID" align="center" prop="personnelId" />
<el-table-column label="订单号" align="center" prop="serialNumber" />
<el-table-column label="平台订单状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.platform_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="办理完成时间" align="center" prop="activeTime" width="180">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="电信订单号" align="center" prop="orderNum" />
<el-table-column label="电信订单状态" align="center" prop="orderStatus">
<template slot-scope="props">
@@ -247,6 +297,11 @@
</template>
</el-table-column>
<el-table-column label="首冲类型" align="center" prop="chargeTitle" />
<el-table-column label="首冲时间" align="center" prop="rechargeTime" width="180">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="下单时间" align="center" prop="createTime" width="180">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -264,24 +319,34 @@
<dict-tag :options="dict.type.order_type" :value="scope.row.isExpress"/>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ct:agentOrder:edit']"
>修改</el-button>
@click="syncOrder(scope.row)"
v-hasPermi="['ct:agentOrder:query']"
v-if="scope.row.status==0"
>同步订单状态</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ct:agentOrder:remove']"
>删除</el-button>
icon="el-icon-edit"
@click="syncExpress(scope.row)"
v-hasPermi="['ct:agentOrder:query']"
v-if="scope.row.status==0"
>同步物流</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="syncOffer(scope.row)"
v-hasPermi="['ct:agentOrder:query']"
v-if="scope.row.status==1"
>同步首冲</el-button>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<pagination
@@ -292,26 +357,26 @@
@pagination="getList"
/>
<el-dialog title="更新对账单" :visible.sync="billOpen" width="800px" append-to-body>
<el-form ref="billForm" :model="billForm" label-width="160px">
<el-form-item label="文件名">
<fileUpload v-model="billForm.file" :fileType="['xlsx']" :fileSize="10" :limit="1"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitBillForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="代理商ID" prop="agentId">
<el-input v-model="form.agentId" placeholder="请输入代理商ID" />
</el-form-item>
<el-form-item label="代理商名称" prop="agentName">
<el-input v-model="form.agentName" placeholder="请输入代理商名称" />
</el-form-item>
<el-form-item label="代理商账号ID" prop="agentAccountId">
<el-input v-model="form.agentAccountId" placeholder="请输入代理商账号ID" />
</el-form-item>
<el-form-item label="商品ID" prop="saleId">
<el-input v-model="form.saleId" placeholder="请输入商品ID" />
</el-form-item>
<el-form-item label="厅店ID，默认13" prop="storeId">
<el-input v-model="form.storeId" placeholder="请输入厅店ID，默认13" />
</el-form-item>
<el-form-item label="代理商电信ID" prop="personnelId">
<el-input v-model="form.personnelId" placeholder="请输入代理商电信ID" />
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="160px">
<el-form-item label="代理商商品" prop="agentAccountGoodId">
<el-select v-model="form.agentAccountGoodId" style="width: 100%;" @change="selectAgentAccountGood">
<el-option
v-for="item in agentGoodList" :key="item.id"
:label="item.label"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="用户姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入用户姓名" />
@@ -334,44 +399,41 @@
<el-form-item label="区" prop="county">
<el-input v-model="form.county" placeholder="请输入区" />
</el-form-item>
<el-form-item label="下单流水号" prop="serialNumber">
<el-input v-model="form.serialNumber" placeholder="请输入下单流水号" />
</el-form-item>
<el-form-item label="入网号码" prop="number">
<el-input v-model="form.number" placeholder="请输入入网号码" />
</el-form-item>
<el-form-item label="物流备注" prop="logiRemark">
<el-input v-model="form.logiRemark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="业务办理页面url" prop="pageUrl">
<el-input v-model="form.pageUrl" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="宽带安装地址" prop="installAddress">
<el-input v-model="form.installAddress" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="第二发展人工号" prop="ynumber2">
<el-input v-model="form.ynumber2" placeholder="请输入第二发展人工号" />
</el-form-item>
<el-form-item label="上传过的站牌类型，逗号分隔" prop="images">
<el-input v-model="form.images" placeholder="请输入上传过的站牌类型，逗号分隔" />
</el-form-item>
<el-form-item label="电信订单号" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入电信订单号" />
</el-form-item>
<el-form-item label="快递单号" prop="expressNum">
<el-input v-model="form.expressNum" placeholder="请输入快递单号" />
<el-form-item label="平台订单状态" prop="status">
<el-select v-model="form.status" placeholder="请选择平台订单状态">
<el-option
v-for="dict in dict.type.platform_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物流信息" prop="expressRoutes">
<el-input v-model="form.expressRoutes" type="textarea" placeholder="请输入内容" />
<el-form-item label="是否异常订单" prop="hasError">
<el-radio-group v-model="form.hasError">
<el-radio
v-for="dict in dict.type.has_error"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="物流状态码" prop="statusCd">
<el-input v-model="form.statusCd" placeholder="请输入物流状态码" />
</el-form-item>
<el-form-item label="订单路由信息" prop="routeArr">
<el-input v-model="form.routeArr" type="textarea" placeholder="请输入内容" />
<el-form-item label="下单时间" prop="createTime">
<el-date-picker clearable
v-model="form.createTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -383,12 +445,14 @@
</template>
<script>
import { listAgentOrder, getAgentOrder, delAgentOrder, addAgentOrder, updateAgentOrder } from "@/api/ct/agentOrder";
import { listAgentOrder, getAgentOrder, delAgentOrder, addAgentOrder, updateAgentOrder, syncOrder, syncOffer, syncExpress } from "@/api/ct/agentOrder";
import { listAgent } from "@/api/ct/agent";
import { listGood } from "@/api/ct/good";
import { listAgentAccountGood } from "@/api/ct/agentAccountGood";
import { listByIds } from "@/api/system/oss";
export default {
name: "AgentOrder",
dicts: ['platform_order_status', 'is_recharge', 'order_type'],
dicts: ['platform_order_status', 'is_recharge', 'order_type', 'has_error'],
data() {
return {
// 按钮loading
@@ -411,6 +475,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
billOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -428,47 +493,21 @@ export default {
province: undefined,
city: undefined,
county: undefined,
serialNumber: undefined,
number: undefined,
logiRemark: undefined,
pageUrl: undefined,
installAddress: undefined,
ynumber2: undefined,
images: undefined,
orderNum: undefined,
orderStatus: undefined,
status: undefined,
expressNum: undefined,
expressRoutes: undefined,
statusCd: undefined,
routeArr: undefined,
isExpress: undefined
hasError: undefined
},
// 表单参数
form: {},
billForm: {},
// 表单校验
rules: {
id: [
{ required: true, message: "不能为空", trigger: "blur" }
],
agentId: [
{ required: true, message: "代理商ID不能为空", trigger: "blur" }
],
agentName: [
{ required: true, message: "代理商名称不能为空", trigger: "blur" }
],
agentAccountId: [
{ required: true, message: "代理商账号ID不能为空", trigger: "blur" }
],
saleId: [
{ required: true, message: "商品ID不能为空", trigger: "blur" }
],
storeId: [
{ required: true, message: "厅店ID，默认13不能为空", trigger: "blur" }
],
personnelId: [
{ required: true, message: "代理商电信ID不能为空", trigger: "blur" }
agentAccountGoodId: [
{ required: true, message: "代理商商品不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "用户姓名不能为空", trigger: "blur" }
],
@@ -490,30 +529,9 @@ export default {
county: [
{ required: true, message: "区不能为空", trigger: "blur" }
],
serialNumber: [
{ required: true, message: "下单流水号不能为空", trigger: "blur" }
],
number: [
{ required: true, message: "入网号码不能为空", trigger: "blur" }
],
logiRemark: [
{ required: true, message: "物流备注不能为空", trigger: "blur" }
],
pageUrl: [
{ required: true, message: "业务办理页面url不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
installAddress: [
{ required: true, message: "宽带安装地址不能为空", trigger: "blur" }
],
ynumber2: [
{ required: true, message: "第二发展人工号不能为空", trigger: "blur" }
],
images: [
{ required: true, message: "上传过的站牌类型，逗号分隔不能为空", trigger: "blur" }
],
orderNum: [
{ required: true, message: "电信订单号不能为空", trigger: "blur" }
],
@@ -523,32 +541,52 @@ export default {
status: [
{ required: true, message: "平台订单状态不能为空", trigger: "change" }
],
expressNum: [
{ required: true, message: "快递单号不能为空", trigger: "blur" }
],
expressRoutes: [
{ required: true, message: "物流信息不能为空", trigger: "blur" }
],
statusCd: [
{ required: true, message: "物流状态码不能为空", trigger: "blur" }
],
routeArr: [
{ required: true, message: "订单路由信息不能为空", trigger: "blur" }
hasError: [
{ required: true, message: "是否异常订单不能为空", trigger: "change" }
],
},
routeStatus: {"S101405": "超时取消", "S100402": "无纸化归档中", "S102407": "实名待审核", "S101403": "用户取消", "S100529": "客户信息创建失败", "S1030": "已发货", "S100521": "客户信息创建成功", "S100508": "订单待认领", "S100524": "重新推送下单", "S101404": "系统取消", "S101702": "预审失败需重传", "S102401": "待实名", "S1027": "订单受理失败", "S104013": "甩单退单", "S104012": "甩单办结", "S104015": "二次甩单", "S101303": "无需处理", "S100522": "补录激活", "S102405": "审核失败取消", "S101401": "受理人员取消", "HTSG001": "正在派送途中", "S101715": "预审失败", "S104016": "已甩单", "HTSG002": "您的订单已经打包完毕，准备出库", "S102408": "活体上传成功", "S102406": "审核成功", "S101704": "订单信息待审核", "S102404": "审核失败需重传", "HTSG004": "用户签收", "HTSG003": "物料打包中", "S101302": "维持原套餐", "S100506": "受理中", "S101714": "预审通过", "S100523": "补录失败需重试", "S104014": "甩单异常办结", "S1024": "实名证件审核", "S1017": "订单信息预审", "S1014": "已取消", "S100519": "异常已干预", "T100078": "订单状态（主）", "S1000": "已提交", "S100000": "用户已取消", "S1001": "待支付", "S1002": "已支付", "S1004": "无纸化归档", "S100401": "无纸化归档成功", "S100400": "无纸化归档失败", "S1005": "订单受理中", "S100500": "订单已认领", "S100501": "下单中", "S1006": "订单受理完成", "S1007": "已派配", "S1008": "配送中", "S1009": "已签收", "S1013": "已完成", "S101301": "已完成", "S1050": "客户信息创建", "S1040": "甩单受理中", "S105001": "客户信息创建成功", "S105002": "新建客户创建失败", "S105003": "分账序号创建成功", "S105004": "分账序号创建失败", "S105005": "新建地址创建成功", "S105006": "新建地址创建失败", "S100530": "订单异常", "S100531": "等待CRM报竣", "S1010": "拒收", "S100403": "无纸化推送失败", "S100404": "无纸化推送成功", "S100532": "物流受理中", "S100533": "已报障", "S100534": "受理失败需报障", "S101602": "退款完成", "S101601": "退款待审核", "S100535": "物流单创建成功", "S100601": "订单受理完成"},
expressStatus: {"100005": "新建", "100015": "待提交", "100021": "推送中", "100014": "已提交", "100010": "已接单", "100004": "已打包", "100002": "已发货", "100029": "派送准备", "100030": "已派送", "100026": "已签收"},
daterangeCreateTime: [],
daterangeActiveTime: [],
daterangeRechargeTime: [],
agentList: [],
goodsList: [],
agentGoodList: []
};
},
created() {
this.getAgentList();
this.getGoodsList();
this.getAgentAccountGood();
this.getList();
},
methods: {
getAgentAccountGood() {
this.loading = true;
listAgentAccountGood({pageNum: 1, pageSize: 10000000, status: 1}).then(res=>{
let data = []
res.rows.forEach(item=>{
this.agentList.forEach(a=>{
if(a.id == item.agentId) {
item.agentName = a.name
}
})
this.goodsList.forEach(a=>{
if(a.id == item.goodId) {
item.goodName = a.name
item.goodContent = a.content
}
})
item.label = item.agentName+'-'+item.goodName+'('+item.saleId+')'
console.log(item)
data.push(item)
})
this.agentGoodList = data
this.loading = false;
})
},
getAgentList() {
this.loading = true;
listAgent({pageNum: 1, pageSize: 10000000, status: 1}).then(res=>{
@@ -568,6 +606,21 @@ export default {
this.goodsList = res.rows
})
},
selectAgentAccountGood(val) {
let item = null;
this.agentGoodList.forEach(r=>{
if (r.id == val) {
item = r
}
})
this.form.agentId = item.agentId
this.form.agentName = item.agentName
this.form.agentAccountId = item.agentAccountId
this.form.saleId = item.saleId
this.form.title = item.goodName
this.form.content = item.goodContent
this.form.storeId = '13'
},
/** 查询订单列表 */
getList() {
this.loading = true;
@@ -576,13 +629,21 @@ export default {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeActiveTime && '' != this.daterangeActiveTime) {
this.queryParams.params["beginActiveTime"] = this.daterangeActiveTime[0];
this.queryParams.params["endActiveTime"] = this.daterangeActiveTime[1];
}
if (null != this.daterangeRechargeTime && '' != this.daterangeRechargeTime) {
this.queryParams.params["beginRechargeTime"] = this.daterangeRechargeTime[0];
this.queryParams.params["endRechargeTime"] = this.daterangeRechargeTime[1];
}
listAgentOrder(this.queryParams).then(response => {
response.rows.forEach(item=>{
item.routeArrs = item.routeArr != undefined && item.routeArr != null ? JSON.parse(item.routeArr) : []
console.log(item);
})
this.agentOrderList = response.rows;
this.total = response.total;
this.loading = false;
});
@@ -596,10 +657,13 @@ export default {
reset() {
this.form = {
id: undefined,
agentAccountGoodId: undefined,
agentId: undefined,
agentName: undefined,
agentAccountId: undefined,
saleId: undefined,
title: undefined,
content: undefined,
storeId: undefined,
personnelId: undefined,
name: undefined,
@@ -619,11 +683,24 @@ export default {
images: undefined,
orderNum: undefined,
orderStatus: undefined,
status: undefined,
activeTime: undefined,
status: '-2',
expressNum: undefined,
expressVendor: undefined,
expressRoutes: undefined,
statusCd: undefined,
routeArr: undefined,
isRecharge: undefined,
chargeTitle: undefined,
hasError: 1,
rechargeTime: undefined,
orderType: undefined,
apiVersion: undefined,
isExpress: undefined,
idCardFront: undefined,
idCardBack: undefined,
frontFace: undefined,
uploadMsgId: undefined,
delFlag: undefined,
createBy: undefined,
createTime: undefined,
@@ -637,6 +714,27 @@ export default {
this.queryParams.pageNum = 1;
this.getList();
},
syncOrder(row) {
syncOrder(row.id).then(res=>{
console.log("同步结果")
console.log(res)
})
this.getList()
},
syncOffer(row) {
syncOffer(row.id).then(res=>{
console.log("同步结果")
console.log(res)
})
this.getList()
},
syncExpress(row) {
syncExpress(row.id).then(res=>{
console.log("同步结果")
console.log(res)
})
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
@@ -648,6 +746,10 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
handleBill() {
this.billForm = {}
this.billOpen = true
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
@@ -711,6 +813,25 @@ export default {
this.download('/ct/agentOrder/export', {
...this.queryParams
}, `agentOrder_${new Date().getTime()}.xlsx`)
},
submitBillForm() {
console.log(this.billForm)
if (this.billForm.file == undefined) {
this.$message.error('请选择文件');
return
}
let file = {}
listByIds(this.billForm.file).then(res => {
console.log(res)
file = res.data[0]
let now = new Date();
now = now.toISOString().substring(0, 19).replace("T", " ")
this.download("/ct/agentOrder/updateBill", {
ossId: file.ossId,
originalName: file.originalName
}, `${now}-${file.originalName}`)
});
}
}
};

16
ruoyi-ui/src/views/ct/good/index.vue
View File

@@ -17,6 +17,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="电信ID" prop="personnelId">
<el-input
v-model="queryParams.personnelId"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
@@ -84,6 +92,7 @@
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="商品描述" align="center" prop="content" />
<el-table-column label="SaleID" align="center" prop="saleId" />
<el-table-column label="电信ID" width="100" align="center" prop="personnelId" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.good_status" :value="scope.row.status"/>
@@ -141,6 +150,9 @@
<el-form-item label="saleId" prop="saleId">
<el-input v-model="form.saleId" placeholder="请输入" />
</el-form-item>
<el-form-item label="电信ID" prop="personnelId">
<el-input v-model="form.personnelId" placeholder="请输入电信ID" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
@@ -198,6 +210,7 @@ export default {
content: undefined,
saleId: undefined,
status: undefined,
personnelId: undefined
},
// 表单参数
form: {},
@@ -209,6 +222,9 @@ export default {
saleId: [
{ required: true, message: "saleId不能为空", trigger: "blur" }
],
personnelId: [
{ required: true, message: "电信ID不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "blur" }
]

2
ruoyi-ui/vue.config.js
View File

@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8180`,
target: `http://127.0.0.1:8180/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''