From a40553b4192d6d9d7a76e0058a5af54978723925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E8=B4=A4=E9=87=91?= <1960116313@qq.com>
Date: Mon, 25 Apr 2022 19:15:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=B5=8B=E8=AF=95=20=20=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basiccard/basiccard.vue                   | 26 +++++++--
 .../communicationmanage/channel/channel.vue   |  1 +
 .../communicationmanage/device/device.vue     | 16 ++++++
 .../communicationmanage/flowpool/flowpool.vue | 53 ++++++++++++++++---
 .../communicationmanage/outbound/outbound.vue | 22 +++++++-
 .../original/targetpackagemanage/index.vue    | 22 +++++++-
 src/views/package/basicpackage/index.vue      | 22 +++++++-
 src/views/package/packagegroup/index.vue      |  8 +++
 8 files changed, 155 insertions(+), 15 deletions(-)

diff --git a/src/views/communicationmanage/basiccard/basiccard.vue b/src/views/communicationmanage/basiccard/basiccard.vue
index c2fb6ff..ced430e 100644
--- a/src/views/communicationmanage/basiccard/basiccard.vue
+++ b/src/views/communicationmanage/basiccard/basiccard.vue
@@ -51,7 +51,7 @@
       </template>
     </avue-crud>
     <!-- 导出    :upload-after="uploadAfter"-->
-    <el-dialog title="导入" append-to-body :visible.sync="excelBox" width="40%">
+    <el-dialog title="导入" append-to-body :visible.sync="excelBox" width="40%" :before-close="handleCloses">
       <avue-form
         :option="excelOption"
         v-model="excelForm"
@@ -212,7 +212,7 @@ export default {
             prop: "excelFile",
             type: "upload",
             drag: true,
-            disabled: true,
+            display: false,
             loadText: "模板上传中，请稍等",
             span: 24,
             propsHttp: {
@@ -291,6 +291,7 @@ export default {
         border: true,
         index: true,
         indexWidth: 70,
+        dialogDrag:true,//表单窗口拖拽
         addBtn: true,
         viewBtn: true,
         delBtn: true,
@@ -511,14 +512,24 @@ export default {
       const column = this.findObject(this.excelOption.column, "excelFile");
       if (this.excelForm.tenantId != "") {
         if (process.env.NODE_ENV === "production") {
-          column.disabled = false;
+          column.display = true;
           column.action = `http://223.99.228.240:18081/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
         } else {
-          column.disabled = false;
+          column.display = true;
           column.action = `/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
         }
       } else {
-        column.disabled = true;
+        column.display = false;
+      }
+    },
+    "excelForm.isCovered"() {
+      const column = this.findObject(this.excelOption.column, "excelFile");
+      if (this.excelForm.isCovered !== "") {
+        if (process.env.NODE_ENV === "production") {
+          column.action = `http://223.99.228.240:18081/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
+        } else {
+          column.action = `/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
+        }
       }
     },
     "form.$channelId"() {
@@ -682,6 +693,11 @@ export default {
       this.excelBox = false;
       this.refreshChange();
       done();
+    },
+       //导入弹窗关闭
+    handleCloses() {
+      this.excelBox = false;
+      this.$refs.excelForm.resetFields();
     },
     //下载模板
     handleTemplate() {
diff --git a/src/views/communicationmanage/channel/channel.vue b/src/views/communicationmanage/channel/channel.vue
index 9b68ddb..3f323e0 100644
--- a/src/views/communicationmanage/channel/channel.vue
+++ b/src/views/communicationmanage/channel/channel.vue
@@ -51,6 +51,7 @@ export default {
         border: true,
         index: true,
         addBtn: true,
+        dialogDrag:true,//表单窗口拖拽
         viewBtn: true,
         delBtn: true,
         columnBtn: false,
diff --git a/src/views/communicationmanage/device/device.vue b/src/views/communicationmanage/device/device.vue
index 4a9c5b4..3d32f05 100644
--- a/src/views/communicationmanage/device/device.vue
+++ b/src/views/communicationmanage/device/device.vue
@@ -61,6 +61,7 @@ export default {
         index: true,
         addBtn: true,
         viewBtn: true,
+        dialogDrag: true, //表单窗口拖拽
         delBtn: true,
         columnBtn: false,
         selection: false,
@@ -81,6 +82,21 @@ export default {
               },
             ],
           },
+          {
+            label: "imei",
+            prop: "imei",
+            span: 12,
+            labelWidth: 130,
+            searchLabelWidth: 90,
+            search: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入imei",
+                trigger: "blur",
+              },
+            ],
+          },
           {
             label: "租户名称",
             prop: "tenantId",
diff --git a/src/views/communicationmanage/flowpool/flowpool.vue b/src/views/communicationmanage/flowpool/flowpool.vue
index 3449ace..f73f8ad 100644
--- a/src/views/communicationmanage/flowpool/flowpool.vue
+++ b/src/views/communicationmanage/flowpool/flowpool.vue
@@ -19,6 +19,20 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
     >
+      <template slot-scope="{ disabled, size, value }" slot="activationNumForm">
+        <el-input
+          :disabled="disabled"
+          :size="size"
+          v-model="value == -1 ? '-' : value"
+        ></el-input>
+      </template>
+      <template slot-scope="{ disabled, size, value }" slot="accountForm">
+        <el-input
+          :disabled="disabled"
+          :size="size"
+          v-model="value == '' ? '-' : value"
+        ></el-input>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -51,6 +65,7 @@ export default {
         border: true,
         index: true,
         addBtn: true,
+        dialogDrag: true, //表单窗口拖拽
         viewBtn: true,
         delBtn: true,
         columnBtn: false,
@@ -85,7 +100,7 @@ export default {
             span: 12,
             labelWidth: 130,
             searchLabelWidth: 90,
-            search: true,
+            search: false,
             rules: [
               {
                 required: true,
@@ -117,13 +132,18 @@ export default {
             searchLabelWidth: 90,
             search: false,
             hide: false,
-
+            type: "number",
             rules: [
               {
                 required: true,
                 message: "请输入流量池总量",
                 trigger: "blur",
               },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的流量池总量",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -134,12 +154,18 @@ export default {
             searchLabelWidth: 90,
             search: false,
             hide: false,
+            type: "number",
             rules: [
               {
                 required: true,
                 message: "请输入提醒阈值",
                 trigger: "blur",
               },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的提醒阈值",
+                trigger: "blur",
+              },
             ],
           },
 
@@ -178,7 +204,7 @@ export default {
             prop: "type",
             labelWidth: 130,
             searchLabelWidth: 140,
-            search: true,
+            search: false,
             rules: [
               {
                 required: true,
@@ -200,7 +226,7 @@ export default {
             prop: "isSource",
             labelWidth: 130,
             searchLabelWidth: 110,
-            search: true,
+            search: false,
             rules: [
               {
                 required: true,
@@ -211,16 +237,22 @@ export default {
           },
 
           {
-            label: "单卡最大使用量（单位M）",
+            label: "单卡最大使用量（M）",
             prop: "maxUsage",
             span: 12,
             labelWidth: 130,
             search: false,
             hide: true,
+            type: "number",
             rules: [
               {
                 required: true,
-                message: "请输入管理员账号",
+                message: "请输入单卡最大使用量（M）",
+                trigger: "blur",
+              },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的使用量",
                 trigger: "blur",
               },
             ],
@@ -234,10 +266,16 @@ export default {
             hide: true,
             addDisplay: false,
             editDisplay: false,
+            formslot: true,
             rules: [
               {
                 required: true,
-                message: "请输入管理员账号",
+                message: "请输入已激活数量",
+                trigger: "blur",
+              },
+              {
+                pattern: /^\d+?$/,
+                message: "请输入正确的已激活数量",
                 trigger: "blur",
               },
             ],
@@ -251,6 +289,7 @@ export default {
             addDisplay: false,
             editDisplay: false,
             hide: true,
+            formslot: true,
             rules: [
               {
                 required: true,
diff --git a/src/views/communicationmanage/outbound/outbound.vue b/src/views/communicationmanage/outbound/outbound.vue
index 7bfef43..5655177 100644
--- a/src/views/communicationmanage/outbound/outbound.vue
+++ b/src/views/communicationmanage/outbound/outbound.vue
@@ -62,6 +62,7 @@ export default {
         addBtn: true,
         viewBtn: true,
         delBtn: true,
+        dialogDrag:true,
         columnBtn: false,
         selection: false,
         dialogClickModal: false,
@@ -255,10 +256,16 @@ export default {
             label: "剩余流量(M)",
             prop: "surplus",
             span: 12,
+            type: "number",
             labelWidth: 130,
             hide: true,
             rules: [
               { required: true, message: "请输入剩余流量", trigger: "blur" },
+               {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的剩余流量",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -266,9 +273,15 @@ export default {
             prop: "usage",
             span: 12,
             labelWidth: 130,
+            type: "number",
             hide: true,
             rules: [
               { required: true, message: "请输入使用量", trigger: "blur" },
+                 {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的使用量",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -276,8 +289,15 @@ export default {
             prop: "total",
             span: 12,
             labelWidth: 130,
+            type: "number",
             hide: true,
-            rules: [{ required: true, message: "请输入总量", trigger: "blur" }],
+            rules: [{ required: true, message: "请输入总量", trigger: "blur" },
+               {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的总量",
+                trigger: "blur",
+              },
+            ],
           },
         ],
       },
diff --git a/src/views/original/targetpackagemanage/index.vue b/src/views/original/targetpackagemanage/index.vue
index a13921a..0a16760 100644
--- a/src/views/original/targetpackagemanage/index.vue
+++ b/src/views/original/targetpackagemanage/index.vue
@@ -59,7 +59,7 @@ export default {
       option: {
         tip: false,
         searchShow: true,
-        // dialogDrag:true,//表单窗口拖拽
+        dialogDrag:true,//表单窗口拖拽
         searchMenuSpan: 6,
         border: true,
         index: true,
@@ -204,6 +204,11 @@ export default {
             search: false,
             rules: [
               { required: true, message: "请输入套餐总量", trigger: "blur" },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的套餐总量",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -217,6 +222,11 @@ export default {
             hide: true,
             rules: [
               { required: true, message: "请输入成本价", trigger: "blur" },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的成本价",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -230,6 +240,11 @@ export default {
             hide: true,
             rules: [
               { required: true, message: "请输入代理价", trigger: "blur" },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的代理价",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -247,6 +262,11 @@ export default {
                 message: "请输入停机多少天后注销账户",
                 trigger: "blur",
               },
+              {
+                pattern: /^\d+?$/,
+                message: "请输入正确的天数",
+                trigger: "blur",
+              },
             ],
           },
           {
diff --git a/src/views/package/basicpackage/index.vue b/src/views/package/basicpackage/index.vue
index 326189b..713a2f2 100644
--- a/src/views/package/basicpackage/index.vue
+++ b/src/views/package/basicpackage/index.vue
@@ -59,7 +59,7 @@ export default {
       option: {
         tip: false,
         searchShow: true,
-        // dialogDrag:true,//表单窗口拖拽
+       dialogDrag:true,//表单窗口拖拽
         searchMenuSpan: 6,
         border: true,
         index: true,
@@ -204,6 +204,11 @@ export default {
             search: false,
             rules: [
               { required: true, message: "请输入套餐总量", trigger: "blur" },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的套餐总量",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -217,6 +222,11 @@ export default {
             hide: true,
             rules: [
               { required: true, message: "请输入成本价", trigger: "blur" },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的成本价",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -230,6 +240,11 @@ export default {
             hide: true,
             rules: [
               { required: true, message: "请输入代理价", trigger: "blur" },
+              {
+                pattern: /^\d+(\.\d+)?$/,
+                message: "请输入正确的代理价",
+                trigger: "blur",
+              },
             ],
           },
           {
@@ -247,6 +262,11 @@ export default {
                 message: "请输入停机多少天后注销账户",
                 trigger: "blur",
               },
+              {
+                pattern: /^\d+?$/,
+                message: "请输入正确的天数",
+                trigger: "blur",
+              },
             ],
           },
           {
diff --git a/src/views/package/packagegroup/index.vue b/src/views/package/packagegroup/index.vue
index 244424a..daf09a7 100644
--- a/src/views/package/packagegroup/index.vue
+++ b/src/views/package/packagegroup/index.vue
@@ -33,6 +33,7 @@ import {
 } from "@/api/packagemanage/packgegroup";
 import { mapGetters } from "vuex";
 import { getToken } from "@/util/auth";
+import { number } from "mathjs";
 export default {
   data() {
     return {
@@ -52,6 +53,7 @@ export default {
         index: true,
         addBtn: true,
         viewBtn: true,
+        dialogDrag:true,//表单窗口拖拽
         delBtn: true,
         editBtn: true,
         columnBtn: false,
@@ -103,12 +105,18 @@ export default {
             labelWidth: 130,
             searchLabelWidth: 100,
             search: false,
+            type: "number",
             rules: [
               {
                 required: true,
                 message: "请输入订购数量",
                 trigger: "blur",
               },
+              {
+                pattern: /^\d+?$/,
+                message: "请输入正确的订购数量",
+                trigger: "blur",
+              },
             ],
           },
         ],