Browse Source

fix:部分导出新增导出类型

confidence
杜贤金 3 years ago
parent
commit
a3a61cd5ff
  1. 7
      src/api/communication/outbound.js
  2. 60
      src/api/informationmanage/sim.js
  3. 9
      src/views/communicationmanage/basiccard/basiccard.vue
  4. 1
      src/views/communicationmanage/device/device.vue
  5. 42
      src/views/communicationmanage/outbound/outbound.vue
  6. 666
      src/views/informationmanage/sim/index.vue

7
src/api/communication/outbound.js

@ -62,4 +62,11 @@ export const user = () => {
method: 'get', method: 'get',
}) })
} }
//导出类型
export const exporttype = () => {
return request({
url: '/api/iot-system/dict/dictionary?code=exportType',
method: 'get',
})
}

60
src/api/informationmanage/sim.js

@ -0,0 +1,60 @@
import request from '@/router/axios';
//列表
export const getList = (current, size, params) => {
return request({
url: '/api/iot-sim/sim/page',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/api/iot-sim/sim/detail',
method: 'get',
params: {
id
}
})
}
//新增
export const add = (row) => {
return request({
url: '/api/iot-sim/simcarddeliver/save',
method: 'post',
data: row
})
}
//删除
export const remove = (ids) => {
return request({
url: '/api/iot-sim/simcarddeliver/remove',
method: 'post',
params: {
ids,
}
})
}
//修改
export const update = (row) => {
return request({
url: '/api/iot-sim/simcarddeliver/update',
method: 'post',
data: row
})
}
//导出类型
export const exporttype = () => {
return request({
url: '/api/iot-system/dict/dictionary?code=exportType',
method: 'get',
})
}

9
src/views/communicationmanage/basiccard/basiccard.vue

@ -203,6 +203,7 @@ import { getToken } from "@/util/auth";
export default { export default {
data() { data() {
var reg = /[A-Za-z]/i;
var starts = (rule, value, callback) => { var starts = (rule, value, callback) => {
if ( if (
this.distribution.numEnd == "" || this.distribution.numEnd == "" ||
@ -218,7 +219,12 @@ export default {
Number(this.distribution.numStart) > Number(this.distribution.numEnd) Number(this.distribution.numStart) > Number(this.distribution.numEnd)
) { ) {
callback(new Error("开始号码必须小于结束号码")); callback(new Error("开始号码必须小于结束号码"));
} else { } else if (
reg.test(this.distribution.numStart) == true|| reg.test(this.distribution.numEnd) == true
) {
callback(new Error("开始结束号码中包含字母,请选择其他导出类型"));
}
else {
callback(); callback();
} }
}; };
@ -392,6 +398,7 @@ export default {
dialogDrag: true, // dialogDrag: true, //
addBtn: true, addBtn: true,
viewBtn: true, viewBtn: true,
searchIcon: true,
delBtn: true, delBtn: true,
excelBtn: false, excelBtn: false,
columnBtn: false, columnBtn: false,

1
src/views/communicationmanage/device/device.vue

@ -96,6 +96,7 @@ export default {
border: true, border: true,
index: true, index: true,
addBtn: true, addBtn: true,
searchIcon: true,
viewBtn: true, viewBtn: true,
dialogDrag: true, // dialogDrag: true, //
delBtn: true, delBtn: true,

42
src/views/communicationmanage/outbound/outbound.vue

@ -46,12 +46,13 @@
append-to-body append-to-body
width="35%" width="35%"
:before-close="handleClose" :before-close="handleClose"
> >
<el-form <el-form
ref="distribution" ref="distribution"
:model="distribution" :model="distribution"
:rules="distrules" :rules="distrules"
label-width="80px" label-width="120px"
> >
<el-form-item label="客户" prop="tenantId"> <el-form-item label="客户" prop="tenantId">
<el-select <el-select
@ -68,8 +69,22 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="导出类型" prop="exportType">
<el-form-item label="iccid" prop="numbers"> <el-select
v-model="distribution.exportType"
placeholder="请选择客户"
size="mini"
style="width: 90%"
>
<el-option
v-for="(item, index) in exportTypelist"
:label="item.dictValue"
:value="item.dictKey"
:key="item.dictKey"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="开始/结束号码" prop="numbers">
<el-col :span="10"> <el-col :span="10">
<el-form-item prop="numStart"> <el-form-item prop="numStart">
<el-input <el-input
@ -114,11 +129,13 @@ import {
update, update,
tenant, tenant,
user, user,
exporttype
} from "@/api/communication/outbound"; } from "@/api/communication/outbound";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getToken } from "@/util/auth"; import { getToken } from "@/util/auth";
export default { export default {
data() { data() {
var reg = /[A-Za-z]/i;
var starts = (rule, value, callback) => { var starts = (rule, value, callback) => {
if ( if (
this.distribution.numEnd == "" || this.distribution.numEnd == "" ||
@ -134,6 +151,10 @@ export default {
Number(this.distribution.numStart) > Number(this.distribution.numEnd) Number(this.distribution.numStart) > Number(this.distribution.numEnd)
) { ) {
callback(new Error("开始号码必须小于结束号码")); callback(new Error("开始号码必须小于结束号码"));
}else if (
reg.test(this.distribution.numStart) == true|| reg.test(this.distribution.numEnd) == true
) {
callback(new Error("开始结束号码中包含字母,请选择其他导出类型"));
}else { }else {
callback(); callback();
} }
@ -156,6 +177,7 @@ export default {
tenantId: "", //id tenantId: "", //id
numStart: "", // numStart: "", //
numEnd: "", // numEnd: "", //
exportType:"",//
}, },
loading: true, loading: true,
distrules: { distrules: {
@ -163,6 +185,9 @@ export default {
{ required: true, message: "请选择客户", trigger: "change" }, { required: true, message: "请选择客户", trigger: "change" },
], ],
numbers: [{ required: true, validator: starts, trigger: "blur" }], numbers: [{ required: true, validator: starts, trigger: "blur" }],
exportType: [
{ required: true, message: "请选择导出类型", trigger: "change" },
],
}, },
page: { page: {
pageSize: 10, pageSize: 10,
@ -175,6 +200,7 @@ export default {
searchMenuSpan: 6, searchMenuSpan: 6,
border: true, border: true,
index: true, index: true,
searchIcon: true,
addBtn: true, addBtn: true,
viewBtn: true, viewBtn: true,
delBtn: true, delBtn: true,
@ -188,6 +214,7 @@ export default {
label: "id", label: "id",
prop: "id", prop: "id",
search: true, search: true,
width:180,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
}, },
@ -566,6 +593,7 @@ export default {
created() { created() {
this.tenantlists(); // this.tenantlists(); //
this.userlists(); // this.userlists(); //
this.exportTypelistlists(); //
}, },
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
@ -740,6 +768,14 @@ export default {
this.userlist = res.data.data; this.userlist = res.data.data;
} }
}); });
},
//
exportTypelistlists() {
exporttype().then((res) => {
if (res.data.code == 200) {
this.exportTypelist = res.data.data;
}
});
}, },
// //
handleChange(e) { handleChange(e) {

666
src/views/informationmanage/sim/index.vue

@ -0,0 +1,666 @@
<template>
<basic-container>
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
:page.sync="page"
:permission="permissionList"
:before-open="beforeOpen"
v-model="form"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@selection-change="selectionChange"
@search-reset="searchReset"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template slot="menuLeft">
<el-button
size="small"
type="primary"
icon="el-icon-download"
@click="handleAllocate"
>导出
</el-button>
<!-- <el-button
type="danger"
size="small"
icon="el-icon-delete"
plain
@click="handleDelete"
>
</el-button> -->
</template>
</avue-crud>
<!-- 导出弹窗 -->
<el-dialog
title="导出"
:visible.sync="dialogVisible"
append-to-body
width="35%"
:before-close="handleClose"
>
<el-form
ref="distribution"
:model="distribution"
:rules="distrules"
label-width="120px"
>
<el-form-item label="导出类型" prop="exportType">
<el-select
v-model="distribution.exportType"
placeholder="请选择客户"
size="mini"
style="width: 90%"
>
<el-option
v-for="(item, index) in exportTypelist"
:label="item.dictValue"
:value="item.dictKey"
:key="item.dictKey"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="开始/结束号码" prop="numbers">
<el-col :span="10">
<el-form-item prop="numStart">
<el-input
v-model="distribution.numStart"
placeholder="请输入开始号码"
size="mini"
></el-input>
</el-form-item>
</el-col>
<el-col style="text-align: center" :span="2">-</el-col>
<el-col :span="10">
<el-form-item prop="numEnd">
<el-input
v-model="distribution.numEnd"
placeholder="请输入结束号码"
size="mini"
></el-input>
</el-form-item>
</el-col>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="onSubmit" size="small">
<i class="el-icon-circle-plus-outline" style="padding-right: 5px"></i>
</el-button
>
<el-button @click="handleClose" size="small">
<i class="el-icon-circle-close" style="padding-right: 5px"></i>
</el-button
>
</span>
</el-dialog>
</basic-container>
</template>
<script>
import { getList, getDetail,exporttype } from "@/api/informationmanage/sim.js";
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
export default {
data() {
var reg = /[A-Za-z]/i;
var starts = (rule, value, callback) => {
if (this.distribution.numEnd == "" || this.distribution.numStart == "") {
callback(new Error("开始号码结束号码均不能为空"));
} else if (
this.distribution.numEnd < 0 ||
this.distribution.numStart < 0
) {
callback(new Error("开始号码结束号码均不能为负数"));
} else if (
Number(this.distribution.numStart) > Number(this.distribution.numEnd)
) {
callback(new Error("开始号码必须小于结束号码"));
}
else if (
reg.test(this.distribution.numStart) == true|| reg.test(this.distribution.numEnd) == true
) {
callback(new Error("开始结束号码中包含字母,请选择其他导出类型"));
}
else {
callback();
}
};
return {
form: {},
query: {},
iform: {
type: null, ///
tenantId: null, //
userId: null, //
},
dialogVisible: false, //
selectionList: [],
exportTypelist : [], //
// userlist: [], //
//
distribution: {
exportType: "", //
numStart: "", //
numEnd: "", //
},
loading: true,
distrules: {
exportType: [
{ required: true, message: "请选择导出类型", trigger: "change" },
],
numbers: [{ required: true, validator: starts, trigger: "blur" }],
},
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
addBtn: false,
editBtn: false,
viewBtn: true,
delBtn: false,
searchIcon: true,
dialogDrag: true,
columnBtn: false,
selection: false,
menuWidth: 120,
dialogClickModal: false,
dialogWidth: "60%",
column: [
{
label: "id",
prop: "id",
search: true,
addDisplay: false,
editDisplay: false,
},
{
label: "基础套餐",
prop: "dataPlanId",
type: "select",
dicUrl: "/api/iot-sim/dataplan/fillData?isSource=" + 2,
props: {
label: "name",
value: "id",
},
dataType: "String",
span: 12,
labelWidth: 130,
searchLabelWidth: 110,
search: true,
rules: [
{
required: true,
message: "请选择基础套餐",
trigger: "change",
},
],
},
{
label: "生命周期状态",
prop: "lifecycleStatus",
type: "select",
dicUrl: "/api/iot-system/dict/dictionary?code=lifecycleStatus",
props: {
label: "dictValue",
value: "dictKey",
},
dataType: "number",
span: 12,
labelWidth: 130,
searchLabelWidth: 110,
search: true,
rules: [
{
required: true,
message: "请选择生命周期状态",
trigger: "change",
},
],
},
{
label: "卡类型",
prop: "cardType",
type: "select",
dicUrl: "/api/iot-system/dict/dictionary?code=card_type",
props: {
label: "dictValue",
value: "dictKey",
},
dataType: "number",
span: 12,
labelWidth: 130,
search: true,
rules: [
{ required: true, message: "请选择卡类型", trigger: "change" },
],
},
{
label: "是否断网",
prop: "offNetStatus",
type: "select",
dicUrl: "/api/iot-system/dict/dictionary?code=off_netStatus",
props: {
label: "dictValue",
value: "dictKey",
},
dataType: "number",
span: 12,
labelWidth: 130,
search: false,
rules: [
{ required: true, message: "请选择是否断网", trigger: "change" },
],
},
{
label: "断网类型",
prop: "offNetType",
type: "select",
dicUrl: "/api/iot-system/dict/dictionary?code=off_netType",
props: {
label: "dictValue",
value: "dictKey",
},
dataType: "number",
display: true,
span: 12,
formatter: (val, value, label) => {
if (value == -1) {
return "-";
} else {
return `${label}`;
}
},
labelWidth: 130,
width: 70,
search: false,
rules: [
{ required: true, message: "请选择断网类型", trigger: "change" },
],
},
{
label: "实名状态",
prop: "realNameStats",
type: "select",
dicUrl: "/api/iot-system/dict/dictionary?code=real_nameStats",
props: {
label: "dictValue",
value: "dictKey",
},
dataType: "number",
span: 12,
labelWidth: 130,
search: false,
rules: [
{ required: true, message: "请选择实名状态", trigger: "change" },
],
},
{
label: "达量断网阙值(M)",
prop: "offNetThreshold",
span: 12,
labelWidth: 130,
searchLabelWidth: 124,
search: false,
rules: [
{
required: true,
message: "请输入达量断网阙值",
trigger: "blur",
},
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的阙值",
trigger: "blur",
},
],
},
{
label: "批次号",
prop: "batchNum",
span: 12,
labelWidth: 130,
search: true,
hide: true,
addDisplay: false,
rules: [
{
required: true,
message: "请输入批次号",
trigger: "blur",
},
],
},
// {
// label: "iccid",
// prop: "iccid",
// width: 150,
// span: 12,
// labelWidth: 130,
// search: true,
// rules: [
// {
// required: true,
// message: "iccid",
// trigger: "blur",
// },
// ],
// },
// {
// label: "imsi",
// prop: "imsi",
// span: 12,
// width: 150,
// labelWidth: 130,
// search: true,
// addDisplay: false,
// rules: [
// {
// required: true,
// message: "imsi",
// trigger: "blur",
// },
// ],
// },
// {
// label: "msisdn",
// prop: "msisdn",
// span: 12,
// width: 150,
// labelWidth: 130,
// addDisplay: false,
// search: true,
// rules: [
// {
// required: true,
// message: "msisdn",
// trigger: "blur",
// },
// ],
// },
{
label: "总量(M)",
prop: "total",
span: 12,
labelWidth: 130,
type: "number",
hide: true,
rules: [
{ required: true, message: "请输入总量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的总量",
trigger: "blur",
},
],
},
{
label: "剩余流量(M)",
prop: "surplus",
span: 12,
type: "number",
labelWidth: 130,
hide: true,
rules: [
{ required: true, message: "请输入剩余流量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的剩余流量",
trigger: "blur",
},
],
},
{
label: "使用量(M)",
prop: "usage",
span: 12,
labelWidth: 130,
type: "number",
hide: true,
rules: [
{ required: true, message: "请输入使用量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的使用量",
trigger: "blur",
},
],
},
],
},
data: [],
};
},
watch: {
"form.$channelId"() {
const columns = this.findObject(this.option.column, "flowPoolId");
if (this.form.$channelId != undefined) {
if (this.form.$channelId.indexOf("电信") != -1) {
columns.display = false;
this.form.flowPoolId = "";
} else {
columns.display = true;
}
}
},
"form.$offNetStatus"() {
const columns = this.findObject(this.option.column, "offNetType");
if (this.form.$offNetStatus != undefined) {
if (this.form.$offNetStatus == "未断网") {
columns.display = false;
this.form.offNetType = "";
} else {
columns.display = true;
}
}
},
},
created() {
this.exportTypelistlists(); //
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
// viewBtn: this.vaildData(this.permission.sourceApi_view, false),
// editBtn: this.vaildData(this.permission.sourceApi_edit, false),
// delBtn: this.vaildData(this.permission.sourceApi_delete, false),
};
},
// ids() {
// let ids = [];
// this.selectionList.forEach((ele) => {
// ids.push(ele.id);
// });
// return ids.join(",");
// },
},
methods: {
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then((res) => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
//
rowSave(row, done, loading) {
console.log(this.form);
add(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!",
});
done();
},
(error) => {
window.console.log(error);
loading();
}
);
},
//
rowUpdate(row, index, done, loading) {
update(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!",
});
done();
},
(error) => {
window.console.log(error);
loading();
}
);
},
//
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!",
});
});
},
//
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!",
});
this.$refs.crud.toggleSelection();
});
},
//
selectionChange(list) {
this.selectionList = list;
},
//
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
//
handleAllocate() {
this.dialogVisible = true;
},
//
handleClose() {
this.dialogVisible = false;
this.$refs.distribution.resetFields();
},
//
onSubmit() {
this.$refs.distribution.validate((valid) => {
if (valid) {
//
window.open(
`${this.baseUrl}/${this.apis}iot-sim/sim/export-sim?${
this.website.tokenHeader
}=${getToken()}&numStart=${this.distribution.numStart}&numEnd=${
this.distribution.numEnd
}&exportType=${this.distribution.exportType}`
);
this.dialogVisible = false;
this.$refs.distribution.resetFields();
}
});
},
//
exportTypelistlists() {
exporttype().then((res) => {
if (res.data.code == 200) {
this.exportTypelist = res.data.data;
}
});
},
onLoad(page, params = {}) {
this.loading = true;
getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
).then((res) => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
});
},
},
};
</script>
<style></style>
Loading…
Cancel
Save