Merge remote-tracking branch 'origin/feature/dev_point_manage' into feature/dev_point_manage

3 years ago · 780559b367
4 changed files with 150 additions and 129 deletions
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height:600px;overflow:auto;padding: 20px;" class="form-class">
    <el-form
      :model="dataForm"
      :rules="dataRule"
@ -427,4 +427,10 @@ export default {
  text-align: center;
  margin: auto;
 }
+.form-class .el-input{
+  width: 75%;
+}
+.form-class .el-textarea{
+  width: 75%!important;
+}
 </style>
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@ -90,10 +90,13 @@
            >导入</el-button
          >
        </el-upload>
-        <el-button style="float:left;margin-left:10px"
+        <el-button
+          style="float: left; margin-left: 10px"
          class="diy-button--reset"
          size="small"
-                   @click="handleExport">导出</el-button>
+          @click="handleExport"
+          >导出</el-button
+        >
        <!--<el-button class="diy-button&#45;&#45;reset" style="float:left;margin-left:10px"-->
        <!--size="small" @click="exportHandle()">{{ $t('export') }}</el-button>-->
        <el-button
@ -167,7 +170,7 @@
              type="text"
              size="small"
              @click="addOrUpdateHandle(scope.row.id, '修改')"
-              >{{ scope.row.longitude === null ? '待完善' : '修改' }}</el-button
+              >{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button
            >
            <el-button
              type="text"
@ -196,6 +199,9 @@
      :close-on-click-modal="false"
      :close-on-press-escape="false"
      :destroy-on-close="true"
+      width="850px"
+      top="5vh"
+      custom-class="dialog-h"
    >
      <add-or-update
        ref="addOrUpdate"
@ -263,65 +269,60 @@ export default {
    this.getFormInfo();
  },
  methods: {
-      async handleDelete (id) {
-
+    async handleDelete(id) {
      this.$confirm("确认删除?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
-              type: "warning"
+        type: "warning",
      })
        .then(() => {
-                  this.deleteNat(id)
+          this.deleteNat(id);
        })
-              .catch(err => {
+        .catch((err) => {
          if (err == "cancel") {
-
          }
-
        });
    },
-      async deleteNat (id) {
-          const url = "/epmetuser/icPointNucleicMonitoring/delete"
-          let params = [id]
-          const { data, code, msg } = await requestPost(url, params)
+    async deleteNat(id) {
+      const url = "/epmetuser/icPointNucleicMonitoring/delete";
+      let params = [id];
+      const { data, code, msg } = await requestPost(url, params);
      if (code === 0) {
        this.$message({
          type: "success",
-                  message: "删除成功"
+          message: "删除成功",
        });
-              this.getDataList()
+        this.getDataList();
      } else {
-              this.$message.error(msg)
+        this.$message.error(msg);
      }
    },
    //导出表格
-      async handleExport () {
-          let title = '核酸检测点'
+    async handleExport() {
+      let title = "核酸检测点";

-          const url = "/epmetuser/icPointNucleicMonitoring/point-export"
+      const url = "/epmetuser/icPointNucleicMonitoring/point-export";

      app.ajax.exportFilePost(
        url,
        this.dataForm,
        (data, rspMsg) => {
-
-                  this.download(data, title + '.xlsx')
+          this.download(data, title + ".xlsx");
        },
        (rspMsg, data) => {
          this.$message.error(rspMsg);
        }
      );
-
    },
    //重置搜索条件
-      resetSearch () {
+    resetSearch() {
      this.dataForm = {
-              name: '',
-              mobile: '',
-              orgId: ''
-          }
-          this.pageNo = 1
-          this.orgIds = []
+        name: "",
+        mobile: "",
+        orgId: "",
+      };
+      this.pageNo = 1;
+      this.orgIds = [];
    },
    // 发送通知
    handleSendNotice() {
@ -506,4 +507,7 @@ export default {
  border-radius: 5px;
  padding: 10px;
 }
+.dialog-h >>> .el-dialog__body{
+  overflow: scroll;
+}
 </style>
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height:600px;overflow:auto;padding: 20px;" class="form-class">
    <el-form
      :model="dataForm"
      :rules="dataRule"
@ -532,4 +532,11 @@ export default {
  text-align: center;
  margin: auto;
 }
+.form-class .el-input{
+  width: 75%;
+}
+.form-class .el-textarea{
+  width: 75%!important;
+}
+
 </style>
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@ -82,10 +82,13 @@
            >导入</el-button
          >
        </el-upload>
-        <el-button style="float:left;margin-left:10px"
+        <el-button
+          style="float: left; margin-left: 10px"
          class="diy-button--reset"
          size="small"
-                   @click="handleExport">导出</el-button>
+          @click="handleExport"
+          >导出</el-button
+        >
        <el-button
          style="margin-left: 15px"
          class="diy-button--more"
@ -187,7 +190,7 @@
              type="text"
              size="small"
              @click="addOrUpdateHandle(scope.row.id, '修改')"
-              >{{ scope.row.longitude === null ? '待完善' : '修改' }}</el-button
+              >{{ scope.row.longitude === null ? "待完善" : "修改" }}</el-button
            >
            <el-button
              type="text"
@ -216,6 +219,9 @@
      :close-on-click-modal="false"
      :close-on-press-escape="false"
      :destroy-on-close="true"
+      width="850px"
+      top="5vh"
+      custom-class="dialog-h"
    >
      <add-or-update
        ref="addOrUpdate"
@ -268,7 +274,7 @@ export default {
      sendNoticeFormShow: false,
      noticeVisible: false,
      noticeOrigin: "4",
-      dialogTitle: '',
+      dialogTitle: "",
    };
  },
  components: {
@ -279,63 +285,58 @@ export default {
    this.noticeFun();
  },
  methods: {
-      async handleDelete (id) {
-
+    async handleDelete(id) {
      this.$confirm("确认删除?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
-              type: "warning"
+        type: "warning",
      })
        .then(() => {
-                  this.deleteNat(id)
+          this.deleteNat(id);
        })
-              .catch(err => {
+        .catch((err) => {
          if (err == "cancel") {
-
          }
-
        });
    },
-      async deleteNat (id) {
-          const url = "/epmetuser/icPointVaccinesInoculation/delete"
-          let params = [id]
-          const { data, code, msg } = await requestPost(url, params)
+    async deleteNat(id) {
+      const url = "/epmetuser/icPointVaccinesInoculation/delete";
+      let params = [id];
+      const { data, code, msg } = await requestPost(url, params);
      if (code === 0) {
        this.$message({
          type: "success",
-                  message: "删除成功"
+          message: "删除成功",
        });
-              this.getDataList()
+        this.getDataList();
      } else {
-              this.$message.error(msg)
+        this.$message.error(msg);
      }
    },
    //导出表格
-      async handleExport () {
-          let title = '疫苗接种点'
+    async handleExport() {
+      let title = "疫苗接种点";

-          const url = "/epmetuser/icPointVaccinesInoculation/point-export"
+      const url = "/epmetuser/icPointVaccinesInoculation/point-export";

      app.ajax.exportFilePost(
        url,
        this.dataForm,
        (data, rspMsg) => {
-
-                  this.download(data, title + '.xlsx')
+          this.download(data, title + ".xlsx");
        },
        (rspMsg, data) => {
          this.$message.error(rspMsg);
        }
      );
-
    },
    //重置搜索条件
-      resetSearch () {
+    resetSearch() {
      this.dataForm = {
-              name: '',
-              mobile: ''
-          }
-          this.pageNo = 1
+        name: "",
+        mobile: "",
+      };
+      this.pageNo = 1;
    },
    // 发送通知
    handleSendNotice() {
@ -357,7 +358,7 @@ export default {
        .catch(() => {});
    },
    // 新增 / 修改
-    addOrUpdateHandle(id,title) {
+    addOrUpdateHandle(id, title) {
      this.dialogTitle = title;
      this.$nextTick(() => {
        this.$refs.addOrUpdate.dataForm.id = id;
@ -368,7 +369,7 @@ export default {
    // 关闭弹窗
    closeDialog() {
      this.addOrUpdateVisible = false;
-      this.dialogTitle = '';
+      this.dialogTitle = "";
    },
    handleExportModule() {
      let title = "疫苗接种点模板";
@ -490,4 +491,7 @@ export default {
  border-radius: 5px;
  padding: 10px;
 }
+.dialog-h{
+  overflow: scroll;
+}
 </style>