From 32691bc4fbd73a291b4c68593de2914f5c6dc908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E8=B4=A4=E9=87=91?= <1960116313@qq.com> Date: Thu, 7 Jul 2022 11:54:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=85=8D=E5=90=88=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BB=A5=E5=89=8D=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20feat:=E5=BC=80=E5=8F=91=E5=95=86=E5=9F=8E=E6=96=B0?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 + public/index.html | 58 +- src/api/mallmanagement/banner.js | 50 ++ src/api/mallmanagement/classify.js | 50 ++ src/api/mallmanagement/expressage.js | 46 ++ src/api/mallmanagement/shopmanagement.js | 50 ++ src/api/operator/statisticalsms.js | 8 +- src/api/ordermanage/mallorders.js | 106 +++ src/api/wel/administrator.js | 23 + src/main.js | 29 +- src/util/global.js | 9 + src/util/them.js | 7 + src/util/util.js | 16 +- .../basiccard/basiccard.vue | 57 +- .../communicationmanage/channel/channel.vue | 52 +- .../communicationmanage/flowpool/flowpool.vue | 46 +- .../communicationmanage/outbound/outbound.vue | 3 +- .../targetflowpool/targetflowpool.vue | 52 +- src/views/informationmanage/sim/index.vue | 229 +++-- src/views/mallmanagement/banner/index.vue | 279 +++++++ src/views/mallmanagement/classify/index.vue | 203 +++++ src/views/mallmanagement/expressage/index.vue | 303 +++++++ .../mallmanagement/shopmanagement/index.vue | 465 +++++++++++ src/views/ordermanage/mallorders/index.vue | 782 ++++++++++++++++++ .../targetpackagegroupmanage/index.vue | 49 +- .../original/targetpackagemanage/index.vue | 55 +- src/views/package/basicpackage/index.vue | 46 +- src/views/package/packagegroup/index.vue | 46 +- src/views/util/test.vue | 103 ++- 29 files changed, 2742 insertions(+), 483 deletions(-) create mode 100644 src/api/mallmanagement/banner.js create mode 100644 src/api/mallmanagement/classify.js create mode 100644 src/api/mallmanagement/expressage.js create mode 100644 src/api/mallmanagement/shopmanagement.js create mode 100644 src/api/ordermanage/mallorders.js create mode 100644 src/api/wel/administrator.js create mode 100644 src/util/global.js create mode 100644 src/util/them.js create mode 100644 src/views/mallmanagement/banner/index.vue create mode 100644 src/views/mallmanagement/classify/index.vue create mode 100644 src/views/mallmanagement/expressage/index.vue create mode 100644 src/views/mallmanagement/shopmanagement/index.vue create mode 100644 src/views/ordermanage/mallorders/index.vue diff --git a/package.json b/package.json index c54ce1f..94c1be2 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dependencies": { "@antv/g2": "^4.1.30", "@smallwei/avue": "^2.9.11", + "ali-oss": "^6.17.1", "avue-plugin-ueditor": "^0.1.4", "axios": "^0.18.0", "babel-polyfill": "^6.26.0", @@ -34,7 +35,9 @@ "vue": "^2.6.10", "vue-axios": "^2.1.2", "vue-i18n": "^8.7.0", + "vue-json-viewer": "^2.2.22", "vue-router": "^3.0.1", + "vue-seamless-scroll": "^1.1.23", "vuex": "^3.1.1" }, "devDependencies": { diff --git a/public/index.html b/public/index.html index 64ad89a..d98ffee 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,7 @@ - + @@ -18,6 +18,7 @@ + 青鸟物联网平台 - -
-
-
- loading -
- 正在加载资源 + +
+
+
+ loading +
+ 正在加载资源 +
+
+ 初次加载资源可能需要较多时间 请耐心等待 +
-
- 初次加载资源可能需要较多时间 请耐心等待 +
+ + https://bladex.vip
-
- - https://bladex.vip -
-
- - - - - - - - + + + + + + + + diff --git a/src/api/mallmanagement/banner.js b/src/api/mallmanagement/banner.js new file mode 100644 index 0000000..b3dc27a --- /dev/null +++ b/src/api/mallmanagement/banner.js @@ -0,0 +1,50 @@ +import request from '@/router/axios'; +//列表 +export const getList = (current, size, params) => { + return request({ + url: '/api/iot-sim/banner/page', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +//删除 +export const remove = (ids) => { + return request({ + url: '/api/iot-sim/banner/remove', + method: 'post', + params: { + ids, + } + }) +} +//详情 +export const getDetail = (id) => { + return request({ + url: '/api/iot-sim/banner/detail', + method: 'get', + params: { + id + } + }) +} +//新增 +export const add = (row) => { + return request({ + url: '/api/iot-sim/banner/save', + method: 'post', + data: row + }) +} +//修改 +export const update = (row) => { + return request({ + url: '/api/iot-sim/banner/update', + method: 'post', + data: row + }) +} diff --git a/src/api/mallmanagement/classify.js b/src/api/mallmanagement/classify.js new file mode 100644 index 0000000..b5f48ea --- /dev/null +++ b/src/api/mallmanagement/classify.js @@ -0,0 +1,50 @@ +import request from '@/router/axios'; +//列表 +export const getList = (current, size, params) => { + return request({ + url: '/api/iot-sim/category/page', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +//删除 +export const remove = (ids) => { + return request({ + url: '/api/iot-sim/category/remove', + method: 'post', + params: { + ids, + } + }) +} +//详情 +export const getDetail = (id) => { + return request({ + url: '/api/iot-sim/category/detail', + method: 'get', + params: { + id + } + }) +} +//新增 +export const add = (row) => { + return request({ + url: '/api/iot-sim/category/save', + method: 'post', + data: row + }) +} +//修改 +export const update = (row) => { + return request({ + url: '/api/iot-sim/category/update', + method: 'post', + data: row + }) +} diff --git a/src/api/mallmanagement/expressage.js b/src/api/mallmanagement/expressage.js new file mode 100644 index 0000000..a71694b --- /dev/null +++ b/src/api/mallmanagement/expressage.js @@ -0,0 +1,46 @@ +import request from '@/router/axios'; +//列表 +export const getList = (current, size, params) => { + return request({ + url: '/api/iot-sim/parcel/page', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +//删除 +export const remove = (ids) => { + return request({ + url: '/api/iot-sim/parcel/remove', + method: 'post', + params: { + ids, + } + }) +} + +//详情 +export const getDetail = (id) => { + return request({ + url: '/api/iot-sim/parcel/detail', + method: 'get', + params: { + id + } + }) +} +//同步信息 +export const syncParcel = (id, parcelCode) => { + return request({ + url: '/api/iot-sim/parcel/syncParcel', + method: 'get', + params: { + id, + parcelCode + } + }) +} diff --git a/src/api/mallmanagement/shopmanagement.js b/src/api/mallmanagement/shopmanagement.js new file mode 100644 index 0000000..6675b6e --- /dev/null +++ b/src/api/mallmanagement/shopmanagement.js @@ -0,0 +1,50 @@ +import request from '@/router/axios'; +//列表 +export const getList = (current, size, params) => { + return request({ + url: '/api/iot-sim/product/page', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +//删除 +export const remove = (ids) => { + return request({ + url: '/api/iot-sim/product/remove', + method: 'post', + params: { + ids, + } + }) +} +//详情 +export const getDetail = (id) => { + return request({ + url: '/api/iot-sim/product/detail', + method: 'get', + params: { + id + } + }) +} +//新增 +export const add = (row) => { + return request({ + url: '/api/iot-sim/product/save', + method: 'post', + data: row + }) +} +//修改 +export const update = (row) => { + return request({ + url: '/api/iot-sim/product/update', + method: 'post', + data: row + }) +} diff --git a/src/api/operator/statisticalsms.js b/src/api/operator/statisticalsms.js index 43bd734..3f9ce2e 100644 --- a/src/api/operator/statisticalsms.js +++ b/src/api/operator/statisticalsms.js @@ -1,13 +1,9 @@ import request from '@/router/axios'; //列表 -export const getUserClick = (current, size, params) => { +export const getUserClick = () => { return request({ url: '/api/iot-sim/orders/getUserClick', method: 'get', - params: { - ...params, - current, - size, - } + }) } diff --git a/src/api/ordermanage/mallorders.js b/src/api/ordermanage/mallorders.js new file mode 100644 index 0000000..9207bd3 --- /dev/null +++ b/src/api/ordermanage/mallorders.js @@ -0,0 +1,106 @@ +import request from '@/router/axios'; +//列表 +export const getList = (current, size, params) => { + return request({ + url: '/api/iot-sim/orders/pageOrders', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} +//删除 +export const remove = (ids) => { + return request({ + url: '/api/iot-sim/orders/remove', + method: 'post', + params: { + ids, + } + }) +} +//详情 +export const getDetail = (id) => { + return request({ + url: '/api/iot-sim/orders/detail', + method: 'get', + params: { + id + } + }) +} +//新增 +export const add = (row) => { + return request({ + url: '/api/iot-sim/orders/save', + method: 'post', + data: row + }) +} +//修改 +export const update = (row) => { + return request({ + url: '/api/iot-sim/orders/update', + method: 'post', + data: row + }) +} +//生成发货单 +export const shipment = (parcel, orders, ids, dataPlanId) => { + return request({ + url: '/api/iot-sim/orders/shipment', + method: 'post', + params: { + ...parcel, + ...orders, + ids, + dataPlanId + } + }) +} + +//商品类型为流量卡，调取设备分页 +export const simcardList = (query) => { + return request({ + url: '/api/iot-sim/simcard/waitingDeliver', + method: 'get', + params: query + }) +} + +//商品类型为机卡，调取设备分页 +export const deviceDeliver = (query) => { + return request({ + url: '/api/iot-sim/device/waitingDeliver', + method: 'get', + params: query + }) +} +//接口类型 +export const interfaceType = (current, size) => { + return request({ + url: '/api/iot-system/dict/dictionary?code=interface_type', + method: 'get', + }) +} + +//基础套餐 +export const dataplan = () => { + return request({ + url: '/api/iot-sim/dataplan/fillData?isSource=' + 2, + method: 'get', + }) +} + +//物流信息 +export const getParcel = (id) => { + return request({ + url: '/api/iot-sim/orders/getParcel', + method: 'get', + params: { + id + } + }) +} diff --git a/src/api/wel/administrator.js b/src/api/wel/administrator.js new file mode 100644 index 0000000..d6b6b9f --- /dev/null +++ b/src/api/wel/administrator.js @@ -0,0 +1,23 @@ +import request from '@/router/axios'; +//卡总数 +export const cardTotal = () => { + return request({ + url: '/api/iot-sim/home/getDeliverNum', + method: 'get', + }) +} + +//运营商的卡数量 +export const operatorCard = () => { + return request({ + url: '/api/iot-sim/home/getOperatorSimNum', + method: 'get', + }) +} +//出库卡的状态 +export const cardStatus = () => { + return request({ + url: '/api/iot-sim/home/getSimStatus', + method: 'get', + }) +} diff --git a/src/main.js b/src/main.js index f75a90f..6e4393e 100644 --- a/src/main.js +++ b/src/main.js @@ -5,9 +5,15 @@ import App from './App'; import router from './router/router'; import './permission'; // 权限 import './error'; // 日志 -import './cache';//页面缓存 +import './cache'; //页面缓存 import store from './store'; -import {loadStyle} from './util/util' +import { + autoThemeFunc +} from '@/util/global'; + +import { + loadStyle +} from './util/util' import * as urls from '@/config/env'; import Element from 'element-ui'; import { @@ -22,7 +28,12 @@ import thirdRegister from './components/third-register/main'; import avueUeditor from 'avue-plugin-ueditor'; import website from '@/config/website'; import crudCommon from '@/mixins/crud'; -import {baseUrl,apis} from '@/config/env'; +import { + baseUrl, + apis +} from '@/config/env'; +import scroll from 'vue-seamless-scroll' +Vue.use(scroll) // 注册全局crud驱动 window.$crudCommon = crudCommon; // 加载Vue拓展 @@ -31,11 +42,20 @@ Vue.use(VueAxios, axios); Vue.use(Element, { i18n: (key, value) => i18n.t(key, value) }); +Vue.use(window.AVUE, { + ali: { + region: 'oss-cn-shanghai', + endpoint: 'oss-cn-shanghai.aliyuncs.com', + accessKeyId: autoThemeFunc().aliAccessKeyId, + accessKeySecret: autoThemeFunc().aliAccessKeySecret, + bucket: autoThemeFunc().aliBucket, + } +}); Vue.use(window.AVUE, { size: 'small', tableSize: 'small', calcHeight: 65, - i18n: (key, value) => i18n.t(key, value) + i18n: (key, value) => i18n.t(key, value), }); // 注册全局容器 Vue.component('basicContainer', basicContainer); @@ -56,7 +76,6 @@ Vue.prototype.apis = apis; iconfontVersion.forEach(ele => { loadStyle(iconfontUrl.replace('$key', ele)); }); - Vue.config.productionTip = false; // 开发环境打开调试工具 diff --git a/src/util/global.js b/src/util/global.js new file mode 100644 index 0000000..768f54b --- /dev/null +++ b/src/util/global.js @@ -0,0 +1,9 @@ +import autoTheme from "./them" + +// Vue.prototype.$autoTheme = () => { +// return autoThemeFunc(); +// } + +export const autoThemeFunc = () => { + return autoTheme.default +} diff --git a/src/util/them.js b/src/util/them.js new file mode 100644 index 0000000..7de3909 --- /dev/null +++ b/src/util/them.js @@ -0,0 +1,7 @@ +export default { + default: { + aliAccessKeyId: "LTAI5tKwjzw9QHDEYYhgt8TT", + aliAccessKeySecret: "BhY3Om78wj8XDSdKJ1XUUWUlNVShYl", + aliBucket: "qn-static-resource", + }, +} diff --git a/src/util/util.js b/src/util/util.js index 1180684..e35bc74 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -1,4 +1,6 @@ -import {validatenull} from './validate' +import { + validatenull +} from './validate' //表单序列化 export const serialize = data => { let list = []; @@ -201,7 +203,8 @@ export const diff = (obj1, obj2) => { delete obj1.close; var o1 = obj1 instanceof Object; var o2 = obj2 instanceof Object; - if (!o1 || !o2) { /* 判断不是对象 */ + if (!o1 || !o2) { + /* 判断不是对象 */ return obj1 === obj2; } @@ -369,3 +372,12 @@ export const downloadFileBase64 = (path, name) => { export const isEmptyObject = (obj) => { return Object.prototype.toString.call(obj) === '[object Object]' && Object.keys(obj).length === 0; }; +export const substr = (image) => { + + let result = ''; + result = image.substr( + image.lastIndexOf("/") + 1, + image.length + ); + return result; +} diff --git a/src/views/communicationmanage/basiccard/basiccard.vue b/src/views/communicationmanage/basiccard/basiccard.vue index d593717..43fe0a3 100644 --- a/src/views/communicationmanage/basiccard/basiccard.vue +++ b/src/views/communicationmanage/basiccard/basiccard.vue @@ -61,7 +61,7 @@ @@ -397,7 +397,6 @@ export default { searchMenuSpan: 6, border: true, index: true, - indexWidth: 70, dialogDrag: true, //表单窗口拖拽 addBtn: true, viewBtn: true, @@ -455,7 +454,7 @@ export default { display: true, dicUrl: "/api/iot-sim/flowpool/fillData?isSource=" + 1, formatter: (val, value, label) => { - if (value == -1) { + if (value == null) { return "-"; } else { return `${label}`; @@ -630,7 +629,7 @@ export default { ], }, data: [], - deliverId:"",//出库id + deliverId: "", //出库id }; }, computed: { @@ -734,22 +733,13 @@ export default { //新增 rowSave(row, done, loading) { add(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -760,22 +750,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -902,7 +883,7 @@ export default { }); }, //分拨弹窗开启 - handleAllocate(e,row) { + handleAllocate(e, row) { if (e == 1) { this.distitle = "分拨"; } else if (e == 2) { @@ -910,7 +891,6 @@ export default { } else if (e == 3) { this.distitle = "出库"; this.deliverId = row.row.id; - } this.dialogVisible = true; }, @@ -968,7 +948,6 @@ export default { } }); } else if (this.distitle == "出库") { - deliver( this.distribution.tenantId, this.distribution.dataPlanId, diff --git a/src/views/communicationmanage/channel/channel.vue b/src/views/communicationmanage/channel/channel.vue index 9bb0fc6..1ba5bd9 100644 --- a/src/views/communicationmanage/channel/channel.vue +++ b/src/views/communicationmanage/channel/channel.vue @@ -51,7 +51,7 @@ export default { border: true, index: true, addBtn: true, - dialogDrag:true,//表单窗口拖拽 + dialogDrag: true, //表单窗口拖拽 viewBtn: true, delBtn: true, columnBtn: false, @@ -117,7 +117,7 @@ export default { prop: "apiUrl", span: 12, labelWidth: 130, - formatter: (val, value, label) => { + formatter: (val, value, label) => { if (value == "") { return "-"; } else { @@ -125,7 +125,7 @@ export default { } }, rules: [ - { required: true, message: "请输入apiUrl", trigger: "blur" }, + { required: false, message: "请输入apiUrl", trigger: "blur" }, ], }, ], @@ -165,22 +165,13 @@ export default { //新增 rowSave(row, done, loading) { add(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -191,22 +182,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); diff --git a/src/views/communicationmanage/flowpool/flowpool.vue b/src/views/communicationmanage/flowpool/flowpool.vue index 5910231..fae650e 100644 --- a/src/views/communicationmanage/flowpool/flowpool.vue +++ b/src/views/communicationmanage/flowpool/flowpool.vue @@ -316,22 +316,13 @@ export default { //新增 rowSave(row, done, loading) { add(Object.assign(row, this.isSources)).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -342,22 +333,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); diff --git a/src/views/communicationmanage/outbound/outbound.vue b/src/views/communicationmanage/outbound/outbound.vue index 4165be4..11b17f9 100644 --- a/src/views/communicationmanage/outbound/outbound.vue +++ b/src/views/communicationmanage/outbound/outbound.vue @@ -253,10 +253,11 @@ export default { dialogClickModal: false, dialogWidth: "60%", menuType: "menu", + rowKey: "xx", menuWidth: "120", column: [ { - label: "主键id", + label: "id", prop: "id", width: 180, addDisplay: false, diff --git a/src/views/communicationmanage/targetflowpool/targetflowpool.vue b/src/views/communicationmanage/targetflowpool/targetflowpool.vue index 76bb3cd..d498a25 100644 --- a/src/views/communicationmanage/targetflowpool/targetflowpool.vue +++ b/src/views/communicationmanage/targetflowpool/targetflowpool.vue @@ -50,9 +50,7 @@ import { mapGetters } from "vuex"; export default { data() { return { - form: { - - }, + form: {}, query: {}, loading: false, page: { @@ -268,10 +266,10 @@ export default { label: "管理员名称", prop: "account", span: 12, - search: false, addDisplay: false, editDisplay: false, + viewDisplay: false, hide: true, formslot: true, rules: [ @@ -319,22 +317,13 @@ export default { //新增 rowSave(row, done, loading) { add(Object.assign(row, this.isSources)).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -345,22 +334,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); diff --git a/src/views/informationmanage/sim/index.vue b/src/views/informationmanage/sim/index.vue index 9e423c3..23446a3 100644 --- a/src/views/informationmanage/sim/index.vue +++ b/src/views/informationmanage/sim/index.vue @@ -229,6 +229,7 @@ export default { dialogWidth: "60%", menuType: "menu", menuWidth: "120", + rowKey: "xx", column: [ { label: "id", @@ -236,6 +237,40 @@ export default { search: true, addDisplay: false, editDisplay: false, + width: 150, + labelWidth: 130, + }, + { + label: "iccid", + prop: "iccid", + width: 150, + span: 12, + labelWidth: 130, + search: true, + rules: [ + { + required: true, + message: "请输入iccid", + trigger: "blur", + }, + ], + }, + + { + label: "msisdn", + prop: "msisdn", + span: 12, + width: 150, + labelWidth: 130, + addDisplay: false, + search: true, + rules: [ + { + required: true, + message: "请输入msisdn", + trigger: "blur", + }, + ], }, { label: "基础套餐", @@ -250,7 +285,6 @@ export default { span: 12, labelWidth: 130, searchLabelWidth: 110, - search: true, rules: [ { @@ -283,24 +317,24 @@ export default { }, ], }, - { - 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, + // { + // 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" }, - ], - }, + // search: true, + // rules: [ + // { required: true, message: "请选择卡类型", trigger: "change" }, + // ], + // }, { label: "是否断网", prop: "offNetStatus", @@ -319,32 +353,32 @@ export default { { 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: "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, + + // search: false, + // rules: [ + // { required: true, message: "请选择断网类型", trigger: "change" }, + // ], + // }, { label: "实名状态", prop: "realNameStats", @@ -363,27 +397,26 @@ export default { { 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: "达量断网阙值(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", @@ -400,53 +433,6 @@ export default { }, ], }, - // { - // 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", @@ -527,23 +513,7 @@ export default { 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)) { @@ -555,6 +525,7 @@ export default { }, searchReset() { this.query = {}; + console.log(this.query, "this.query999"); this.onLoad(this.page); }, searchChange(params, done) { diff --git a/src/views/mallmanagement/banner/index.vue b/src/views/mallmanagement/banner/index.vue new file mode 100644 index 0000000..c8179ca --- /dev/null +++ b/src/views/mallmanagement/banner/index.vue @@ -0,0 +1,279 @@ + + + + + diff --git a/src/views/mallmanagement/classify/index.vue b/src/views/mallmanagement/classify/index.vue new file mode 100644 index 0000000..9acd8bf --- /dev/null +++ b/src/views/mallmanagement/classify/index.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/src/views/mallmanagement/expressage/index.vue b/src/views/mallmanagement/expressage/index.vue new file mode 100644 index 0000000..88c047e --- /dev/null +++ b/src/views/mallmanagement/expressage/index.vue @@ -0,0 +1,303 @@ + + + + + diff --git a/src/views/mallmanagement/shopmanagement/index.vue b/src/views/mallmanagement/shopmanagement/index.vue new file mode 100644 index 0000000..c0dd1a5 --- /dev/null +++ b/src/views/mallmanagement/shopmanagement/index.vue @@ -0,0 +1,465 @@ + + + + + diff --git a/src/views/ordermanage/mallorders/index.vue b/src/views/ordermanage/mallorders/index.vue new file mode 100644 index 0000000..8f048ef --- /dev/null +++ b/src/views/ordermanage/mallorders/index.vue @@ -0,0 +1,782 @@ + + + + + +> diff --git a/src/views/original/targetpackagegroupmanage/index.vue b/src/views/original/targetpackagegroupmanage/index.vue index 928195d..bb1531b 100644 --- a/src/views/original/targetpackagegroupmanage/index.vue +++ b/src/views/original/targetpackagegroupmanage/index.vue @@ -86,8 +86,7 @@ export default { searchLabelWidth: 120, search: true, labelWidth: 130, - dicUrl: - "/api/iot-system/dict/dictionary?code=dataPlanGroupType", + dicUrl: "/api/iot-system/dict/dictionary?code=dataPlanGroupType", props: { label: "dictValue", value: "dictKey", @@ -138,22 +137,13 @@ export default { //新增 rowSave(row, done, loading) { add(Object.assign(row, this.isSources)).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -164,22 +154,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); diff --git a/src/views/original/targetpackagemanage/index.vue b/src/views/original/targetpackagemanage/index.vue index feea025..660fc55 100644 --- a/src/views/original/targetpackagemanage/index.vue +++ b/src/views/original/targetpackagemanage/index.vue @@ -98,7 +98,7 @@ export default { searchLabelWidth: 120, search: true, labelWidth: 130, - dicUrl: "/api/iot-sim/dataplangroup/fillData?isSource="+2, + dicUrl: "/api/iot-sim/dataplangroup/fillData?isSource=" + 2, props: { label: "name", value: "id", @@ -257,7 +257,7 @@ export default { search: false, rules: [ { required: true, message: "请输入订购数量", trigger: "blur" }, - { + { pattern: /^\d+?$/, message: "请输入正确的订购数量", trigger: "blur", @@ -336,22 +336,13 @@ export default { //新增 rowSave(row, done, loading) { add(Object.assign(row, this.isSources)).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -362,22 +353,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -414,13 +396,12 @@ export default { }, //导出 handleExport() { - window.open( + window.open( `${this.baseUrl}/${this.apis}bd-core/tenant/dailybill/export-excel?${ this.website.tokenHeader }=${getToken()}` ); - - }, + }, onLoad(page, params = {}) { this.loading = true; getList( diff --git a/src/views/package/basicpackage/index.vue b/src/views/package/basicpackage/index.vue index f3959e5..003b22e 100644 --- a/src/views/package/basicpackage/index.vue +++ b/src/views/package/basicpackage/index.vue @@ -313,22 +313,13 @@ export default { //新增 rowSave(row, done, loading) { add(Object.assign(row, this.isSources)).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -339,22 +330,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); diff --git a/src/views/package/packagegroup/index.vue b/src/views/package/packagegroup/index.vue index cd7de24..3c59c16 100644 --- a/src/views/package/packagegroup/index.vue +++ b/src/views/package/packagegroup/index.vue @@ -159,22 +159,13 @@ export default { //新增 rowSave(row, done, loading) { add(Object.assign(row, this.isSources)).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); @@ -185,22 +176,13 @@ export default { //修改 rowUpdate(row, index, done, loading) { update(row).then( - (res) => { - if (res.data.data == 1) { - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!", - }); - done(); - } else { - this.$message({ - type: "error", - message: "操作失败!", - }); - done(); //关闭表单 - loading(); // 按钮停止加载 - } + () => { + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!", + }); + done(); }, (error) => { window.console.log(error); diff --git a/src/views/util/test.vue b/src/views/util/test.vue index 3d1b320..3e8f498 100644 --- a/src/views/util/test.vue +++ b/src/views/util/test.vue @@ -18,28 +18,23 @@ @refresh-change="refreshChange" @on-load="onLoad" > - - - @@ -53,7 +48,6 @@ import { mapGetters } from "vuex"; export default { data() { return { - visible: false, form: {}, query: {}, // loading: true, @@ -88,7 +82,7 @@ export default { searchIcon: true, //搜索折叠 refreshBtn: true, //刷新按钮 filterBtn: false, //筛选按钮 - showColumnBtn: false, + showColumnBtn: false, //显隐字段按钮 dialogType: "dialog", //弹窗类型 dialog弹窗 drawer抽屉 dialogFullscreen: false, //弹窗是否全屏 dialogEscape: true, //弹窗esc关闭 @@ -109,43 +103,83 @@ export default { size: "mini", search: true, span: 12, - labelWidth: 130, - searchLabelWidth: 100, - search: true, + formatter: (val, value, label) => { + if (value == "") { + return "-"; + } else { + return `${value}`; + } + }, + control: (val, form) => { + //通过control meetType(当前字段)控制别的字段是否要再弹窗中显示 + if (val == "1" || val == "2") { + return { + auditingType: { + //这里就是其他的字段 + display: false, + }, + }; + } else { + return { + takePart: { + //这里就是其他的字段 + display: false, + }, + }; + } + }, }, { label: "年龄", prop: "age", - type: "input", search: true, span: 12, }, { - label: "年龄", - prop: "age", - type: "input", + label: "地区", + type: "select", + prop: "province", + multiple: true, + filterable: true, + props: { + label: "label", + value: "value", + }, + dicData: [ + { + label: "字典1", + value: 0, + }, + { + label: "字典2", + value: 1, + }, + ], search: true, span: 12, }, { - label: "年龄", - prop: "age", - type: "input", + label: "照片", + prop: "photo", + alone: true, + type: "img", search: true, span: 12, }, { - label: "年龄", - prop: "age", - type: "input", + label: "switch", + prop: "switch", + type: "switch", + slot: true, search: true, span: 12, }, { - label: "年龄", + label: "formslot", prop: "age", type: "input", search: true, + formslot: true, span: 12, }, { @@ -248,13 +282,12 @@ export default { // }, }, methods: { - //popper确定 - handleSure() { - this.visible = false; - this.$message.success("确定"); + handleswitch(e) { + console.log(e, 9999); }, beforeOpen(done, type) { if (["edit", "view"].includes(type)) { + console.log(done, type, 9988); getDetail(this.form.id).then((res) => { this.form = res.data.data; });