修改

src/api/baseurl.js

@@ -1,3 +1,3 @@
-var baseurl = "http://192.168.16.64:8080";
+var baseurl = "http://192.168.16.62:8080";
 
 export default baseurl

src/api/system/info.js

@@ -41,4 +41,22 @@ export function delinfo(id) {
         url: '/system/info/' + id,
         method: 'delete'
     })
+}
+
+
+//    省集合
+export function getProvinceInfo() {
+    return request({
+        url: `/system/area/getProvinceInfo`,
+        method: 'get'
+    })
+}
+
+
+//    所属下级区域信息集合
+export function getSubordinateInfo(id) {
+    return request({
+        url: `/system/area/getSubordinateInfo?id=${id}`,
+        method: 'get'
+    })
 }

src/api/system/kindergartenCheckReport.js

@@ -9,10 +9,13 @@ export function listKindergartenCheckReport(query) {
     })
 }
 
+
+
+
 // 查询幼儿园检测报告详细
-export function getKindergartenCheckReport(id) {
+export function existKindergartenCheckReport(kindergartenId, batchCode) {
     return request({
-        url: '/system/kindergartenCheckReport/' + id,
+        url: `/system/kindergartenCheckReport/existKindergartenCheckReport?kindergartenId=${kindergartenId}&batchCode=${batchCode}`,
         method: 'get'
     })
 }

src/api/system/personalCheckReport.js

@@ -9,45 +9,46 @@ export function listPersonalCheckReport(query) {
     })
 }
 
-// 查询个人体质检测报告详细
-export function getPersonalCheckReport(id) {
-    return request({
-        url: '/system/personalCheckReport/' + id,
-        method: 'get'
-    })
-}
 
-// 新增个人体质检测报告
+// 个人详细
-export function addPersonalCheckReport(data) {
+export function existCheckReport(studentId, batchCode) {
     return request({
-        url: '/system/personalCheckReport',
+        url: `/system/personalCheckReport/existCheckReport?studentId=${studentId}&batchCode=${batchCode}`,
-        method: 'post',
+        method: 'get'
-        data: data
     })
 }
 
 // 修改个人体质检测报告
 export function updatePersonalCheckReport(data) {
     return request({
-        url: '/system/personalCheckReport',
+        url: '/system/personalCheckReport/edit',
-        method: 'put',
+        method: 'post',
         data: data
     })
 }
 
-// 删除个人体质检测报告
+// // 删除个人体质检测报告
-export function delPersonalCheckReport(id) {
+// export function delPersonalCheckReport(id) {
+//     return request({
+//         url: '/system/personalCheckReport/' + id,
+//         method: 'delete'
+//     })
+// }
+
+
+// 幼儿报告预览
+export function checkReportreport(studentId, batchCode) {
     return request({
-        url: '/system/personalCheckReport/' + id,
+        url: `/system/checkReport/report?studentId=${studentId}&batchCode=${batchCode}`,
-        method: 'delete'
+        method: 'POST'
     })
 }
 
 
-// 幼儿报告下载/预览
+// 幼儿报告下载
 export function report(id) {
     return request({
-        url: `/system/personalCheckReport/download/report?id=${id}`,
+        url: `/system/personalCheckReport/download?id=${id}`,
         method: 'POST',
         responseType: 'blob'
     })

src/views/system/info/index.vue

@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="90px"
     >
       <el-form-item label="组织名称" prop="parentId">
         <treeselect
@@ -155,7 +155,13 @@
 
     <!-- 添加或修改区域管理对话框 -->
 
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="530px"
+      append-to-body
+      :before-close="cancel"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item
           label="所属上级组织"
@@ -169,15 +175,72 @@
             v-model="form.parentId"
           />
         </el-form-item>
-        <el-form-item label="所属区域" prop="areaId">
+        <el-form-item
-          <treeselect
+          label="所属区域"
-            :normalizer="normalizer"
+          prop="areaId"
-            :options="areaList"
+          v-if="List.length != 0 && form.parentId != 0"
-            placeholder="请选择所属区域"
+        >
-            v-model="form.areaId"
+          <el-select
-          />
+            v-model="value"
+            placeholder="请选择省"
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item in provincelist"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+              @click.native="province(item)"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="value1"
+            placeholder="请选择市"
+            style="width: 120px; margin-left: 10px"
+          >
+            <el-option
+              v-for="item in citylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+              @click.native="clickcity(item)"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="value2"
+            placeholder="请选择区"
+            style="width: 120px; margin-left: 10px"
+          >
+            <el-option
+              v-for="item in arealist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+              @click.native="clickarea(item)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
 
+        <el-form-item label="所属区域" prop="areaId" v-else>
+          <el-select
+            v-model="form.areaName"
+            placeholder="请选择省"
+            style="width: 380px"
+            disabled
+          >
+            <el-option
+              v-for="item in provincelist"
+              :key="item.areaId"
+              :label="item.name"
+              :value="item.areaId"
+              @click.native="province(item)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="组织名称" prop="organizeName">
           <el-input
             v-model="form.organizeName"
@@ -217,7 +280,15 @@
 </template>
 
 <script>
-import { list, getinfo, delinfo, add, edit } from "@/api/system/info.js";
+import {
+  list,
+  getinfo,
+  delinfo,
+  add,
+  edit,
+  getProvinceInfo,
+  getSubordinateInfo,
+} from "@/api/system/info.js";
 import { listArea } from "@/api/system/area.js";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -246,6 +317,12 @@ export default {
       cb(new Error("请输入正确的联系电话"));
     };
     return {
+      value2: "",
+      value1: "",
+      value: "",
+      provincelist: [],
+      citylist: [],
+      arealist: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -303,7 +380,7 @@ export default {
           { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
         ],
         areaId: [
-          { required: true, message: "请选择所属上级区域", trigger: "blur" },
+          { required: true, message: "请选择市或者区", trigger: "blur" },
         ],
         parentId: [
           { required: true, message: "请选择所属上级区域", trigger: "blur" },
@@ -316,8 +393,35 @@ export default {
   },
   created() {
     this.getList();
+    this.getProvince();
   },
   methods: {
+    //点击区县城
+    clickarea(item) {
+      this.form.areaId = item.id;
+      getSubordinateInfo(item.id).then((res) => {
+        this.streetlist = res.data;
+      });
+    },
+    //点击市
+    clickcity(item) {
+      this.value2 = "";
+      this.form.areaId = item.id;
+      console.log(item);
+      getSubordinateInfo(item.id).then((res) => {
+        this.arealist = res.data;
+      });
+    },
+    //点击省
+    province(item) {
+      this.value1 = "";
+      this.value2 = "";
+      this.form.areaId = "";
+      getSubordinateInfo(item.id).then((res) => {
+        this.citylist = res.data;
+      });
+    },
+
     toggleExpandAll() {
       this.refreshTable = false;
       this.isExpandAll = !this.isExpandAll;
@@ -385,6 +489,9 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.value = "";
+      this.value1 = "";
+      this.value2 = "";
       this.reset();
     },
     // 表单重置
@@ -456,6 +563,10 @@ export default {
         if (response.data.phone == 0) {
           response.data.phone = "";
         }
+        this.value = response.data.provinceCode;
+        this.value1 = response.data.cityName;
+        this.value2 = response.data.regionName;
+        console.log(this.value);
         this.form = response.data;
         this.open = true;
         this.title = "修改区域管理";
@@ -464,6 +575,7 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       if (this.List.length == 0) {
         this.form.parentId = 0;
       }
@@ -509,6 +621,12 @@ export default {
         `area_${new Date().getTime()}.xlsx`
       );
     },
+
+    getProvince() {
+      getProvinceInfo().then((res) => {
+        this.provincelist = res.data;
+      });
+    },
   },
 };
 </script>

src/views/system/kindergartenCheckReport/index.vue

@@ -62,7 +62,7 @@
       <el-table-column label="批次名称" align="center" prop="batchName" />
       <el-table-column label="报告名称" align="center" prop="reportName" />
       <el-table-column label="报告编号" align="center" prop="reportCode" />
-      <el-table-column label="审核人" align="center" prop="checkUserId" />
+      <el-table-column label="审核人" align="center" prop="checkUserName" />
       <el-table-column label="审核状态" align="center" prop="checkStatus">
         <template slot-scope="scope">
           {{ scope.row.checkStatus == 0 ? "未审核" : "" }}
@@ -89,6 +89,7 @@
             size="mini"
             type="text"
             icon="el-icon-search"
+            v-hasPermi="['system:kindergartenCheckReport:preview']"
             @click="lookhand(scope.row)"
             >预览</el-button
           >
@@ -105,7 +106,7 @@
             type="text"
             icon="el-icon-download"
             @click="handleExport(scope.row)"
-            v-hasPermi="['system:kindergartenCheckReport:export']"
+            v-hasPermi="['system:kindergartenCheckReport:download']"
             >下载</el-button
           >
         </template>
@@ -128,10 +129,10 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="审批状态" prop="checkStatus">
+        <el-form-item label="审核状态" prop="checkStatus">
           <el-radio-group v-model="form.checkStatus">
-            <el-radio :label="0">未审批</el-radio>
+            <el-radio :label="0">未审核</el-radio>
-            <el-radio :label="1">已审批</el-radio>
+            <el-radio :label="1">已审核</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="报告内容" prop="reportName">
@@ -185,12 +186,12 @@
 <script>
 import {
   listKindergartenCheckReport,
-  getKindergartenCheckReport,
+  existKindergartenCheckReport,
-  addKindergartenCheckReport,
   updateKindergartenCheckReport,
   report,
 } from "@/api/system/kindergartenCheckReport";
 import kindergarten from "../../assembly/kindergarten.vue";
+import baseurl from "@/api/baseurl.js";
 
 export default {
   components: { kindergarten },
@@ -289,19 +290,28 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 修改按钮操作 */
+    /** 审核按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      report(row.id).then((res) => {
+      existKindergartenCheckReport(row.kindergartenId, row.batchCode).then(
-        this.pdfurl = window.URL.createObjectURL(res);
+        (response) => {
-        // window.open(this.pdfurl);
+          console.log(response);
-      });
+          if (response.code == 200) {
-      getKindergartenCheckReport(id).then((response) => {
+            this.title = "修改幼儿园检测报告审批状态";
-        this.form = response.data;
+            this.pdfurl = baseurl + response.data.downloadAddress;
-        this.open = true;
+            this.open = true;
-        this.title = "修改幼儿园检测报告审批状态";
+          } else if (response.code == 500) {
-      });
+            report(row.id).then((res) => {
+              this.pdfurl = baseurl + res.data.downloadAddress;
+              this.form.id = res.data.id;
+              // this.pdfurl = window.URL.createObjectURL(res);
+              // window.open(this.pdfurl);
+              this.open = true;
+            });
+          }
+        }
+      );
     },
     /** 提交按钮 */
     submitForm() {
@@ -311,12 +321,12 @@ export default {
             updateKindergartenCheckReport(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              this.queryParams = {
-            });
+                pageNum: 1,
-          } else {
+                pageSize: 10,
-            addKindergartenCheckReport(this.form).then((response) => {
+                kindergartenId: null,
-              this.$modal.msgSuccess("新增成功");
+                batchCode: null,
-              this.open = false;
+              };
               this.getList();
             });
           }
@@ -337,11 +347,15 @@ export default {
       // report(row.id).then((res) => {
       //   console.log(res);
       // });
-      this.download(
+      if (row.checkStatus == 0) {
-        `/system/kindergartenCheckReport/download/report?id=${row.id}`,
+        this.$message.error("未审核,不可下载");
-        {},
+      } else if (row.checkStatus == 1) {
-        `幼儿园检测报告.pdf`
+        this.download(
-      );
+          `/system/kindergartenCheckReport/download?id=${row.id}`,
+          {},
+          `幼儿园检测报告.pdf`
+        );
+      }
     },
     kinbatlist(kindergartenId, batchCode) {
       console.log(kindergartenId, batchCode);

src/views/system/personalCheckReport/index.vue

@@ -58,7 +58,7 @@
       <el-table-column label="批次名称" align="center" prop="batchName" />
       <el-table-column label="报告名称" align="center" prop="reportName" />
       <el-table-column label="报告编号" align="center" prop="reportCode" />
-      <el-table-column label="审核人" align="center" prop="checkUserId" />
+      <el-table-column label="审核人" align="center" prop="checkUserName" />
       <el-table-column
         label="审核时间"
         align="center"
@@ -86,6 +86,7 @@
             type="text"
             icon="el-icon-search"
             @click="lookhand(scope.row)"
+            v-hasPermi="['system:checkReport:report']"
             >预览</el-button
           >
           <el-button
@@ -101,7 +102,7 @@
             type="text"
             icon="el-icon-download"
             @click="handleExport(scope.row)"
-            v-hasPermi="['system:personalCheckReport:export']"
+            v-hasPermi="['system:personalCheckReport:download']"
             >下载</el-button
           >
         </template>
@@ -124,20 +125,18 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="审批状态" prop="checkStatus">
+        <el-form-item label="审核状态" prop="checkStatus">
           <el-radio-group v-model="form.checkStatus">
-            <el-radio :label="0">未审批</el-radio>
+            <el-radio :label="0">未审核</el-radio>
-            <el-radio :label="1">已审批</el-radio>
+            <el-radio :label="1">已审核</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="报告内容" prop="reportName">
+        <iframe
-          <iframe
+          ref="pdfCotainer"
-            ref="pdfCotainer"
+          :src="pdfurl"
-            :src="pdfurl"
+          width="1150px"
-            width="1000px"
+          height="550px"
-            height="550px"
+        ></iframe>
-          ></iframe>
-        </el-form-item>
         <!-- <el-form-item label="学生姓名" prop="studentId">
           <el-input v-model="form.studentId" placeholder="请输入学生姓名" />
         </el-form-item>
@@ -181,14 +180,12 @@
 <script>
 import {
   listPersonalCheckReport,
-  getPersonalCheckReport,
-  delPersonalCheckReport,
-  addPersonalCheckReport,
   updatePersonalCheckReport,
-  report,
+  checkReportreport,
+  existCheckReport,
 } from "@/api/system/personalCheckReport";
 import student from "../../assembly/student.vue";
-
+import baseurl from "@/api/baseurl.js";
 export default {
   components: { student },
   name: "PersonalCheckReport",
@@ -291,15 +288,25 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      report(row.id).then((res) => {
+      this.form = row;
-        this.pdfurl = window.URL.createObjectURL(res);
+      console.log(this.form);
-        // window.open(this.pdfurl);
+      // this.form = row;
-      });
+      this.title = "修改个人体质检测报告";
-      getPersonalCheckReport(id).then((response) => {
+      existCheckReport(row.studentId, row.batchCode).then((res) => {
-        this.form = response.data;
+        if (res.code == 200) {
-        this.open = true;
+          this.pdfurl = baseurl + res.data.downloadAddress;
-        this.title = "修改个人体质检测报告";
+          this.open = true;
+        } else {
+          checkReportreport(row.studentId, row.batchCode).then((res) => {
+            // this.pdfurl = window.URL.createObjectURL(res);
+            this.pdfurl = baseurl + res.data.downloadAddress;
+            this.form.id = res.data.id;
+            this.open = true;
+            // window.open(this.pdfurl);
+          });
+        }
       });
+      console.log(this.form);
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -311,57 +318,68 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updatePersonalCheckReport(this.form).then((response) => {
+            var obj = {
+              id: this.form.id,
+              checkStatus: this.form.checkStatus,
+            };
+            updatePersonalCheckReport(obj).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              this.queryParams = {
-            });
+                pageNum: 1,
-          } else {
+                pageSize: 10,
-            addPersonalCheckReport(this.form).then((response) => {
+                studentId: null,
-              this.$modal.msgSuccess("新增成功");
+                batchCode: null,
-              this.open = false;
+              };
               this.getList();
             });
           }
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删除个人体质检测报告编号为"' + ids + '"的数据项？')
-        .then(function () {
-          return delPersonalCheckReport(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
 
     //预览
     lookhand(item) {
-      report(item.id).then((res) => {
+      console.log(item);
-        this.pdfurl = window.URL.createObjectURL(res);
+      checkReportreport(item.studentId, item.batchCode).then((res) => {
+        // this.pdfurl = window.URL.createObjectURL(res);
+        this.pdfurl = baseurl + res.data.downloadAddress;
         this.openiframe = true;
         // window.open(this.pdfurl);
       });
     },
     /** 导出按钮操作 */
     handleExport(row) {
-      this.download(
+      if (row.checkStatus == 0) {
-        `/system/personalCheckReport/download/report?id=${row.id}`,
+        this.$message.error("未审核,不可下载");
-        {},
+      } else if (row.checkStatus == 1) {
-        `幼儿检测报告.pdf`
+        this.download(
-      );
+          `/system/personalCheckReport/download?id=${row.id}`,
+          {},
+          `个人体质检测报告.pdf`
+        );
+      }
     },
     itemlists(studentId, batchCode) {
       console.log(studentId, batchCode);
       this.queryParams.studentId = studentId;
       this.queryParams.batchCode = batchCode;
     },
+
+    // /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const ids = row.id || this.ids;
+    //   this.$modal
+    //     .confirm('是否确认删除个人体质检测报告编号为"' + ids + '"的数据项？')
+    //     .then(function () {
+    //       return delPersonalCheckReport(ids);
+    //     })
+    //     .then(() => {
+    //       this.getList();
+    //       this.$modal.msgSuccess("删除成功");
+    //     })
+    //     .catch(() => {});
+    // },
   },
 };
 </script>