diff --git a/src/api/communication/outbound.js b/src/api/communication/outbound.js index c5c9fed..7fca5ff 100644 --- a/src/api/communication/outbound.js +++ b/src/api/communication/outbound.js @@ -62,4 +62,11 @@ export const user = () => { method: 'get', }) } +//导出类型 +export const exporttype = () => { + return request({ + url: '/api/iot-system/dict/dictionary?code=exportType', + method: 'get', + }) +} diff --git a/src/api/informationmanage/sim.js b/src/api/informationmanage/sim.js new file mode 100644 index 0000000..8729e72 --- /dev/null +++ b/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', + }) +} + + + diff --git a/src/views/communicationmanage/basiccard/basiccard.vue b/src/views/communicationmanage/basiccard/basiccard.vue index ecda327..27a67cd 100644 --- a/src/views/communicationmanage/basiccard/basiccard.vue +++ b/src/views/communicationmanage/basiccard/basiccard.vue @@ -203,6 +203,7 @@ import { getToken } from "@/util/auth"; export default { data() { + var reg = /[A-Za-z]/i; var starts = (rule, value, callback) => { if ( this.distribution.numEnd == "" || @@ -218,7 +219,12 @@ export default { Number(this.distribution.numStart) > Number(this.distribution.numEnd) ) { callback(new Error("开始号码必须小于结束号码")); - } else { + } else if ( + reg.test(this.distribution.numStart) == true|| reg.test(this.distribution.numEnd) == true + ) { + callback(new Error("开始结束号码中包含字母,请选择其他导出类型")); + } + else { callback(); } }; @@ -392,6 +398,7 @@ export default { dialogDrag: true, //表单窗口拖拽 addBtn: true, viewBtn: true, + searchIcon: true, delBtn: true, excelBtn: false, columnBtn: false, diff --git a/src/views/communicationmanage/device/device.vue b/src/views/communicationmanage/device/device.vue index 829bf15..90bc4a1 100644 --- a/src/views/communicationmanage/device/device.vue +++ b/src/views/communicationmanage/device/device.vue @@ -96,6 +96,7 @@ export default { border: true, index: true, addBtn: true, + searchIcon: true, viewBtn: true, dialogDrag: true, //表单窗口拖拽 delBtn: true, diff --git a/src/views/communicationmanage/outbound/outbound.vue b/src/views/communicationmanage/outbound/outbound.vue index da55bcc..5f132ed 100644 --- a/src/views/communicationmanage/outbound/outbound.vue +++ b/src/views/communicationmanage/outbound/outbound.vue @@ -46,12 +46,13 @@ append-to-body width="35%" :before-close="handleClose" + > - - + + + + + + { if ( this.distribution.numEnd == "" || @@ -134,7 +151,11 @@ export default { Number(this.distribution.numStart) > Number(this.distribution.numEnd) ) { callback(new Error("开始号码必须小于结束号码")); - } else { + }else if ( + reg.test(this.distribution.numStart) == true|| reg.test(this.distribution.numEnd) == true + ) { + callback(new Error("开始结束号码中包含字母,请选择其他导出类型")); + }else { callback(); } }; @@ -156,6 +177,7 @@ export default { tenantId: "", //租户id numStart: "", //开始号码 numEnd: "", //结束号码 + exportType:"",//导出类型 }, loading: true, distrules: { @@ -163,6 +185,9 @@ export default { { required: true, message: "请选择客户", trigger: "change" }, ], numbers: [{ required: true, validator: starts, trigger: "blur" }], + exportType: [ + { required: true, message: "请选择导出类型", trigger: "change" }, + ], }, page: { pageSize: 10, @@ -175,6 +200,7 @@ export default { searchMenuSpan: 6, border: true, index: true, + searchIcon: true, addBtn: true, viewBtn: true, delBtn: true, @@ -188,6 +214,7 @@ export default { label: "id", prop: "id", search: true, + width:180, addDisplay: false, editDisplay: false, }, @@ -566,6 +593,7 @@ export default { created() { this.tenantlists(); //租户下拉 this.userlists(); //用户下拉 + this.exportTypelistlists(); //导出类型 }, computed: { ...mapGetters(["permission"]), @@ -740,6 +768,14 @@ export default { this.userlist = res.data.data; } }); + }, + //导出类型 + exportTypelistlists() { + exporttype().then((res) => { + if (res.data.code == 200) { + this.exportTypelist = res.data.data; + } + }); }, //选租户还是客户 handleChange(e) { diff --git a/src/views/informationmanage/sim/index.vue b/src/views/informationmanage/sim/index.vue new file mode 100644 index 0000000..5f32b6f --- /dev/null +++ b/src/views/informationmanage/sim/index.vue @@ -0,0 +1,666 @@ + + + + +