From a80ce50d3b8c2dd8cae64b715a80eea0382158dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E8=B4=A4=E9=87=91?= <1960116313@qq.com>
Date: Wed, 27 Apr 2022 17:15:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E7=BB=84=E7=AE=A1=E7=90=86=20fix:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A5=97=E9=A4=90=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basiccard/basiccard.vue                   |   2 +-
 .../targetpackagegroupmanage/index.vue        | 251 ++++++++++++++++++
 .../original/targetpackagemanage/index.vue    |  21 +-
 src/views/package/basicpackage/index.vue      |  40 +--
 src/views/package/packagegroup/index.vue      |  56 ++--
 5 files changed, 321 insertions(+), 49 deletions(-)
 create mode 100644 src/views/original/targetpackagegroupmanage/index.vue

diff --git a/src/views/communicationmanage/basiccard/basiccard.vue b/src/views/communicationmanage/basiccard/basiccard.vue
index f88579d..a834357 100644
--- a/src/views/communicationmanage/basiccard/basiccard.vue
+++ b/src/views/communicationmanage/basiccard/basiccard.vue
@@ -829,7 +829,7 @@ export default {
             } else {
               const h = this.$createElement;
               this.$notify.error({
-                title: "错误号码",
+                title: "出库失败号码",
                 message: h(
                   "i",
                   { style: "color: teal; word-break: break-all;" },
diff --git a/src/views/original/targetpackagegroupmanage/index.vue b/src/views/original/targetpackagegroupmanage/index.vue
new file mode 100644
index 0000000..0a1c01b
--- /dev/null
+++ b/src/views/original/targetpackagegroupmanage/index.vue
@@ -0,0 +1,251 @@
+<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"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import {
+  getDetail,
+  getList,
+  add,
+  remove,
+  update,
+} from "@/api/packagemanage/packgegroup";
+import { mapGetters } from "vuex";
+import { getToken } from "@/util/auth";
+import { number } from "mathjs";
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      isSources: {
+        isSource: 2,
+      },
+      option: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        addBtn: true,
+        viewBtn: true,
+        dialogDrag: true, //表单窗口拖拽
+        delBtn: true,
+        editBtn: true,
+        columnBtn: false,
+        selection: false,
+        dialogClickModal: false,
+        dialogWidth: "60%",
+        column: [
+          {
+            label: "目标套餐组名称",
+            prop: "name",
+            span: 12,
+            labelWidth: 130,
+            searchLabelWidth: 120,
+            search: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入目标套餐组名称",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "目标套餐组类型",
+            prop: "type",
+            span: 12,
+            type: "select",
+            searchLabelWidth: 120,
+            search: true,
+            labelWidth: 130,
+            dicUrl:
+              "/api/iot-system/dict/dictionary?code=dataPlanGroupType",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+            dataType: "number",
+            rules: [
+              {
+                required: true,
+                message: "请选择目标套餐组类型",
+                trigger: "change",
+              },
+            ],
+          },
+        ],
+      },
+      data: [],
+    };
+  },
+  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),
+      };
+    },
+  },
+  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) {
+      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(); // 按钮停止加载
+          }
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    //修改
+    rowUpdate(row, index, done, loading) {
+      update(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(); // 按钮停止加载
+          }
+        },
+        (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: "操作成功!",
+          });
+        });
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    //导出
+    handleExport() {
+      if (process.env.NODE_ENV === "production") {
+        window.open(
+          `http://223.99.228.240:18081/bd-core/tenant/dailybill/export-excel?${
+            this.website.tokenHeader
+          }=${getToken()}`
+        );
+      } else {
+        window.open(
+          `/api/iot-sim/simcard/export-simCard?${
+            this.website.tokenHeader
+          }=${getToken()}`
+        );
+      }
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query, this.isSources)
+      ).then((res) => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+      });
+    },
+  },
+};
+</script>
+
+<style></style>
diff --git a/src/views/original/targetpackagemanage/index.vue b/src/views/original/targetpackagemanage/index.vue
index 2c31002..f2e3ef3 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,
@@ -98,7 +98,7 @@ export default {
             searchLabelWidth: 120,
             search: true,
             labelWidth: 130,
-            dicUrl: "/api/iot-sim/dataplangroup/fillData",
+            dicUrl: "/api/iot-sim/dataplangroup/fillData?isSource="+2,
             props: {
               label: "name",
               value: "id",
@@ -247,6 +247,23 @@ export default {
               },
             ],
           },
+          {
+            label: "订购数量",
+            prop: "orderCount",
+            span: 12,
+            type: "number",
+            labelWidth: 130,
+            searchLabelWidth: 100,
+            search: false,
+            rules: [
+              { required: true, message: "请输入订购数量", trigger: "blur" },
+                {
+                pattern: /^\d+?$/,
+                message: "请输入正确的订购数量",
+                trigger: "blur",
+              },
+            ],
+          },
           {
             label: "停机多少天后注销账户",
             prop: "stopClose",
diff --git a/src/views/package/basicpackage/index.vue b/src/views/package/basicpackage/index.vue
index adf77a2..2c38b76 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,
@@ -72,24 +72,24 @@ export default {
         dialogClickModal: false,
         dialogWidth: "60%",
         column: [
-          {
-            label: "租户名称",
-            prop: "tenantId",
-            type: "select",
-            dicUrl: "/api/iot-system/tenant/fillData",
-            props: {
-              label: "tenantName",
-              value: "tenantId",
-            },
-            dataType: "String",
-            span: 12,
-            labelWidth: 130,
-            width: 140,
-            search: true,
-            rules: [
-              { required: true, message: "请选择租户名称", trigger: "change" },
-            ],
-          },
+          // {
+          //   label: "租户名称",
+          //   prop: "tenantId",
+          //   type: "select",
+          //   dicUrl: "/api/iot-system/tenant/fillData",
+          //   props: {
+          //     label: "tenantName",
+          //     value: "tenantId",
+          //   },
+          //   dataType: "String",
+          //   span: 12,
+          //   labelWidth: 130,
+          //   width: 140,
+          //   search: true,
+          //   rules: [
+          //     { required: true, message: "请选择租户名称", trigger: "change" },
+          //   ],
+          // },
           {
             label: "套餐组名称",
             prop: "dataPlanGroupId",
@@ -98,7 +98,7 @@ export default {
             searchLabelWidth: 120,
             search: true,
             labelWidth: 130,
-            dicUrl: "/api/iot-sim/dataplangroup/fillData",
+            dicUrl: "/api/iot-sim/dataplangroup/fillData?isSource=" + 1,
             props: {
               label: "name",
               value: "id",
diff --git a/src/views/package/packagegroup/index.vue b/src/views/package/packagegroup/index.vue
index daf09a7..1c6145c 100644
--- a/src/views/package/packagegroup/index.vue
+++ b/src/views/package/packagegroup/index.vue
@@ -45,6 +45,9 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      isSources: {
+        isSource: 1,
+      },
       option: {
         tip: false,
         searchShow: true,
@@ -53,7 +56,7 @@ export default {
         index: true,
         addBtn: true,
         viewBtn: true,
-        dialogDrag:true,//表单窗口拖拽
+        dialogDrag: true, //表单窗口拖拽
         delBtn: true,
         editBtn: true,
         columnBtn: false,
@@ -84,7 +87,8 @@ export default {
             searchLabelWidth: 120,
             search: true,
             labelWidth: 130,
-            dicUrl: "/api/iot-system/dict/dictionary?code=dataPlanGroupType",
+            dicUrl:
+              "/api/iot-system/dict/dictionary?code=sourcedataPlanGroupType",
             props: {
               label: "dictValue",
               value: "dictKey",
@@ -98,27 +102,27 @@ export default {
               },
             ],
           },
-          {
-            label: "订购数量",
-            prop: "orderCount",
-            span: 12,
-            labelWidth: 130,
-            searchLabelWidth: 100,
-            search: false,
-            type: "number",
-            rules: [
-              {
-                required: true,
-                message: "请输入订购数量",
-                trigger: "blur",
-              },
-              {
-                pattern: /^\d+?$/,
-                message: "请输入正确的订购数量",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "订购数量",
+          //   prop: "orderCount",
+          //   span: 12,
+          //   labelWidth: 130,
+          //   searchLabelWidth: 100,
+          //   search: false,
+          //   type: "number",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入订购数量",
+          //       trigger: "blur",
+          //     },
+          //     {
+          //       pattern: /^\d+?$/,
+          //       message: "请输入正确的订购数量",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
         ],
       },
       data: [],
@@ -155,7 +159,7 @@ export default {
     },
     //新增
     rowSave(row, done, loading) {
-      add(row).then(
+      add(Object.assign(row, this.isSources)).then(
         (res) => {
           if (res.data.data == 1) {
             this.onLoad(this.page);
@@ -181,7 +185,7 @@ export default {
     },
     //修改
     rowUpdate(row, index, done, loading) {
-      update(row).then(
+      update(Object.assign(row, this.isSources)).then(
         (res) => {
           if (res.data.data == 1) {
             this.onLoad(this.page);
@@ -253,7 +257,7 @@ export default {
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(params, this.query)
+        Object.assign(params, this.query, this.isSources)
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;