From 31530e0813f617e2a574d763012b0ef51157e60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 1 Sep 2022 14:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assembly/kindergarten.vue  | 29 ++++++++++++++++------------
 src/views/assembly/student.vue       | 23 ++++++++++++++--------
 src/views/system/info/index.vue      | 22 ++++++++++++++-------
 src/views/system/testItems/index.vue |  2 +-
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/views/assembly/kindergarten.vue b/src/views/assembly/kindergarten.vue
index 607545a..e23d11f 100644
--- a/src/views/assembly/kindergarten.vue
+++ b/src/views/assembly/kindergarten.vue
@@ -58,7 +58,7 @@
             <el-button
               type="primary"
               style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
+              v-if="batchCode == scope.row.batchCode"
               circle
               @click="batchCodeclick(scope.row)"
             ></el-button>
@@ -206,8 +206,6 @@ export default {
       kindergartenId: "",
       //批次名称
       batchCode: "请选择批次",
-      //批次ID
-      batchCodeId: "",
       //批次list
       testScorelist: [],
       //批次编号
@@ -224,8 +222,11 @@ export default {
   },
   methods: {
     onshow() {
+      this.batchCode = localStorage.getItem("batchCode2");
+      this.kindergartenId = localStorage.getItem("kindergartenId");
       if (localStorage.getItem("kindergartenName") == null) {
         this.kindergartenName = "请选择幼儿园";
+        this.batchCode = "请选择批次";
       } else {
         this.kindergartenName = localStorage.getItem("kindergartenName");
       }
@@ -234,9 +235,7 @@ export default {
       } else {
         this.batchCode = localStorage.getItem("batchCode2");
       }
-      this.batchCode = localStorage.getItem("batchCode2");
-      this.kindergartenId = localStorage.getItem("kindergartenId");
-      this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 0);
+      this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
     },
 
     //幼儿园左侧点击
@@ -251,7 +250,6 @@ export default {
 
     //点击批次左边
     batchCodeclick(row) {
-      this.batchCodeId = row.id;
       this.batchCode = row.batchCode;
       this.batchCodeshow = false;
       localStorage.setItem("batchCode2", this.batchCode);
@@ -281,23 +279,30 @@ export default {
     },
 
     getList() {
-      tKindergartenInfo(this.kindergartenType).then((res) => {
-        this.type = res.data[0];
-        this.type2 = res.data[1];
-      });
       //用户权限
-      // this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
       getRoleInfo().then((res) => {
         var user = res.data.roleKeys;
         console.log(user);
         if (user.includes("enchou")) {
           return;
         } else if (user.includes("teacher")) {
+          if (res.data != 999999) {
+            this.kindergartenId = res.data.kindergartenId;
+            this.kindergartenName = res.data.kindergartenName;
+            this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 0);
+            localStorage.setItem("kindergartenName", res.data.kindergartenName);
+            localStorage.setItem("kindergartenId", res.data.kindergartenId);
+          }
           return;
         } else if (user.includes("parent")) {
           return;
         }
       });
+      tKindergartenInfo(this.kindergartenType).then((res) => {
+        this.type = res.data[0];
+        this.type2 = res.data[1];
+      });
+
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {
         this.kindergartenList = response.rows;
diff --git a/src/views/assembly/student.vue b/src/views/assembly/student.vue
index 1ac6efa..bc0ff2b 100644
--- a/src/views/assembly/student.vue
+++ b/src/views/assembly/student.vue
@@ -145,13 +145,13 @@
 
     <!-- //幼儿园 -->
     <el-dialog
-      width="850px"
+      width="860px"
       title="选择所属幼儿园"
       :visible.sync="kindergartenshow"
       append-to-body
       :before-close="kindergartencancel"
     >
-      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
+      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick" >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -218,7 +218,7 @@
 
     <!-- //班级 -->
     <el-dialog
-      width="1000px"
+      width="1050px"
       title="选择所属班级"
       :visible.sync="classshow"
       append-to-body
@@ -400,6 +400,7 @@ export default {
         cardNumber: null,
         onceName: null,
         homeAddress: null,
+        kindergartenId: null,
       },
       //班级查询
       classqueryParams: {
@@ -505,10 +506,6 @@ export default {
     },
     // 点击学生按钮
     studentshowclick() {
-      this.kindergartenName = "请选择幼儿园";
-      this.kindergartenId = "";
-      this.className = "请选择班级";
-      this.classId = "";
       this.studentshow = true;
       this.studentlist();
     },
@@ -552,6 +549,10 @@ export default {
     //学生关闭
     studentcancel() {
       this.studentshow = false;
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.className = "请选择班级";
+      this.classId = "";
     },
     //幼儿园关闭
     kindergartencancel() {
@@ -605,13 +606,19 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
-        this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
+          this.classqueryParams.kindergartenId = res.data.kindergartenId;
+          this.studentqueryParams.kindergartenId = res.data.kindergartenId;
           return;
         } else if (user.includes("teacher")) {
+          this.kindergartenId = res.data.kindergartenId;
+          this.classqueryParams.kindergartenId = res.data.kindergartenId;
+          this.kindergartenName = String(res.data.kindergartenName);
+          console.log(1, this.kindergartenName);
           return;
         } else if (user.includes("parent")) {
+          
           return;
         }
       });
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index dc7cdf6..d7c7504 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -14,7 +14,7 @@
           :options="List2"
           placeholder="请选择所属组织"
           v-model="queryParams.id"
-          style="width: 300px"
+          style="width: 208px"
         />
       </el-form-item>
       <el-form-item label="区域名称" prop="">
@@ -23,7 +23,7 @@
           :options="areaList"
           placeholder="请选择所属区域"
           v-model="queryParams.areaId"
-          style="width: 300px"
+          style="width: 208px"
         />
       </el-form-item>
       <el-form-item label="组织地址" prop="">
@@ -179,17 +179,25 @@
         </el-form-item>
 
         <el-form-item label="组织名称" prop="organizeName">
-          <el-input v-model="form.organizeName" placeholder="请输入组织名称" maxlength="50"/>
+          <el-input
+            v-model="form.organizeName"
+            placeholder="请输入组织名称"
+            maxlength="50"
+          />
         </el-form-item>
         <el-form-item label="组织地址" prop="organizeAddress">
           <el-input
             v-model="form.organizeAddress"
             placeholder="请输入组织地址"
-             maxlength="100"
+            maxlength="100"
           />
         </el-form-item>
         <el-form-item label="联系人" prop="contacts">
-          <el-input v-model="form.contacts" placeholder="请输入联系人姓名" maxlength="10" />
+          <el-input
+            v-model="form.contacts"
+            placeholder="请输入联系人姓名"
+            maxlength="10"
+          />
         </el-form-item>
         <el-form-item label="联系人电话" prop="phone">
           <el-input
@@ -221,8 +229,8 @@ export default {
     var checkMobile = (rule, value, cb) => {
       // 验证手机号的正则表达式
       const regMobile =
-      /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
-        // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+        /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
+      // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
       const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
       const isTel = reg.test(value);
 
diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue
index 988f6e6..bb678eb 100644
--- a/src/views/system/testItems/index.vue
+++ b/src/views/system/testItems/index.vue
@@ -18,7 +18,7 @@
           :options="itemCategoryList"
           placeholder="请选择所属项目"
           v-model="queryParams.itemCategoryId"
-          style="width: 300px"
+          style="width: 208px"
         />
       </el-form-item>
       <el-form-item label="项目名称" prop="itemName">