Merge remote-tracking branch 'origin/dev'

src/api/system/testItems.js

@@ -8,6 +8,13 @@ export function listTestItems(query) {
         params: query
     })
 }
+//查看分类
+export function getTestCategoryItemInfo(itemId) {
+    return request({
+        url: `/system/testItems/getTestCategoryItemInfo/?itemId=${itemId}`,
+        method: 'get'
+    })
+}
 
 // 查询测试项目详细
 export function getTestItems(id) {

src/views/system/action/index.vue

@@ -78,7 +78,7 @@
             align="center"
           >
           </el-table-column>
-          <el-table-column prop="remark" label="测试目的" align="center">
+          <el-table-column prop="remark" label="测试目的" align="center" show-overflow-tooltip>
           </el-table-column>
         </el-table>
       </div>

src/views/system/classconstitution/index.vue

@@ -305,9 +305,7 @@ export default {
         classId: "",
         // batchCode: "PC202208030005",
         // kindergartenId: "18",
-        // classId: "2",
+        // classId: "2"
-        pageNum: 1,
-        pageSize: 10,
       },
       categoryTableNameList: [],
       categoryAgeFractionList: [],

src/views/system/comprehensive/index.vue

@@ -53,7 +53,7 @@
                 性别:{{ sythesizestudent.studentSex == "MALE" ? "男" : "女" }}
               </div>
               <div class="cell" style="width: 20%">
-                年龄:{{ sythesizestudent.studentAge }}
+                年龄:{{ sythesizestudent.studentAge }}岁
               </div>
               <div class="cell" style="width: 20%">
                 民族:{{ sythesizestudent.nationName }}

src/views/system/personalecharts/index.vue

@@ -32,7 +32,7 @@
                 性别:{{ sythesizestudent.studentSex == "MALE" ? "男" : "女" }}
               </div>
               <div class="cell" style="width: 20%">
-                年龄:{{ sythesizestudent.studentAge }}
+                年龄:{{ sythesizestudent.studentAge }}岁
               </div>
               <div class="cell" style="width: 20%">
                 民族:{{ sythesizestudent.nationName }}

src/views/system/survey/index.vue

@@ -192,8 +192,6 @@ export default {
       studentlistqueryParams: {
         kindergartenId: "",
         batchCode: "",
-        pageNum: 1,
-        pageSize: 10,
         // kindergartenId: "2",
         // batchCode: "PC202208260011",
       },

src/views/system/testItems/index.vue

@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item
+      <!-- <el-form-item
         label="所属项目分类"
         prop="itemCategoryId"
         label-width="100px"
@@ -20,7 +20,7 @@
           v-model="queryParams.itemCategoryId"
           style="width: 208px"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="项目名称" prop="itemName">
         <el-input
           v-model="queryParams.itemName"
@@ -50,7 +50,6 @@
         >
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -103,18 +102,19 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
     <el-table
       v-loading="loading"
       :data="testItemsList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
+      <el-table-column label="项目所属分类" align="center" prop="categoryName">
-        label="项目所属分类"
+        <template slot-scope="scope">
-        align="center"
+          <el-button size="mini" type="text" @click="looktype(scope.row)"
-        prop="categoryName"
+            >查看</el-button
-      />
+          >
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="字典类型" align="center" prop="resultDictType">
         <template slot-scope="scope">
           {{
@@ -130,7 +130,12 @@
       </el-table-column> -->
       <el-table-column label="项目名称" align="center" prop="itemName" />
       <el-table-column label="项目编号" align="center" prop="itemCode" />
-      <el-table-column label="项目内容" align="center" prop="itemContent" />
+      <el-table-column
+        label="项目内容"
+        align="center"
+        prop="itemContent"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="项目概述" align="center" prop="remark" /> -->
       <el-table-column label="项目度量单位" align="center" prop="measureUnit" />
       <el-table-column
@@ -179,7 +184,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total > 0"
       :total="total"
@@ -187,7 +191,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <!-- 添加或修改测试项目对话框 -->
     <el-dialog
       :title="title"
@@ -203,13 +206,16 @@
         :inline="true"
       >
         <div style="border-bottom: 1px solid #f1f1f1; margin-bottom: 20px">
-          <el-form-item label="所属分类" prop="itemCategoryId">
+          <el-form-item label="所属分类" prop="testCategoryItemList">
             <treeselect
               :normalizer="normalizer"
               :options="itemCategoryList"
               placeholder="请选择所属项目分类"
-              v-model="form.itemCategoryId"
+              v-model="form.testCategoryItemList"
-              style="width: 300px"
+              style="width: 500px"
+              :multiple="true"
+              :disable-branch-nodes="true"
+              search-nested
             />
           </el-form-item>
         </div>
@@ -261,7 +267,7 @@
               v-model.number="form.itemContent"
               placeholder="项目内容"
               maxlength="200"
-              style="width: 500px"
+              style="width: 600px"
             />
 
             <!-- <editor
@@ -272,16 +278,15 @@
           /> -->
           </el-form-item>
         </div>
-
         <el-form-item label="排序" prop="sorting">
           <el-input
             v-model="form.sorting"
             placeholder="请输入排序"
-            maxlength="10"
+            type="number"
+            oninput=" if(value.length>10){value=value.slice(0,10)}"
             style="width: 300px"
           />
         </el-form-item>
-
         <el-form-item label="度量单位" prop="measureUnit">
           <el-select
             v-model="form.measureUnit"
@@ -388,7 +393,6 @@
             placeholder="请输入统一标准最高得分"
           />
         </el-form-item>
-
         <el-form-item label="级别描述" prop="levelDescription">
           <el-input
             style="width: 300px"
@@ -407,25 +411,27 @@
               v-model="item.levelName"
               placeholder="级别名"
               maxlength="10"
-              style="width: 75px; margin-right: 10px"
+              style="width: 100px; margin-right: 10px"
             />
             <el-input
               v-model.number="item.levelMinScore"
               placeholder="最低分"
-              maxlength="10"
+              type="number"
-              style="width: 75px; margin-right: 5px"
+              oninput=" if(value.length>10){value=value.slice(0,10)}"
+              style="width: 100px; margin-right: 5px"
             /><el-input
               v-model.number="item.levelMaxScore"
               placeholder="最高分"
-              maxlength="10"
+              type="number"
-              style="width: 75px; margin-right: 5px"
+              oninput=" if(value.length>10){value=value.slice(0,10)}"
+              style="width: 100px; margin-right: 5px"
             />
 
             <el-select
               v-model="item.standardFlag"
               clearable
               placeholder="请选择是否达标"
-              style="width: 145px; margin-right: 8px"
+              style="width: 160px; margin-right: 8px"
             >
               <el-option
                 v-for="item in list"
@@ -455,12 +461,37 @@
           </div>
         </el-form-item>
       </el-form>
-
       <div slot="footer" class="dialog-footer" style="margin-right: 80px">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- //查看所属分类 -->
+    <el-dialog
+      title="项目所属分类"
+      :visible.sync="itemtypeopen"
+      width="1050px"
+      append-to-body
+    >
+      <el-table v-loading="loading" :data="categorynamelist">
+        <el-table-column label="分类名称" align="center" prop="categoryName" />
+        <el-table-column label="分类编号" align="center" prop="categoryCode" />
+        <!-- <el-table-column
+          label="分类名称"
+          align="center"
+          prop="categoryName"
+        />
+         <el-table-column
+          label="分类名称"
+          align="center"
+          prop="categoryName"
+        /> -->
+      </el-table>
+      <div slot="footer" class="dialog-footer" style="">
+        <el-button type="primary" @click="itemtypeopen = false">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -471,6 +502,7 @@ import {
   delTestItems,
   addTestItems,
   updateTestItems,
+  getTestCategoryItemInfo,
 } from "@/api/system/testItems";
 import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
 import { listItemCategory } from "@/api/system/itemCategory";
@@ -721,7 +753,6 @@ export default {
       //   }
       // });
     };
-
     let minScore = (rule, value, callback) => {
       if (!value) {
         callback();
@@ -739,14 +770,10 @@ export default {
         callback();
       }
     };
-
     const validateVin = (rule, value, callback) => {
       const containAlpha = /[a-zA-Z]/; //含有字母
-
       const containLowerCase = /[a-z]/; //匹配小写字母
       value = value.slice(0, 1);
-      console.log(value);
-
       if (!value) {
         callback(new Error("不能为空"));
       } else if (!containAlpha.test(value)) {
@@ -811,7 +838,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        itemCategoryId: null,
+        testCategoryItemList: null,
         itemName: null,
         itemCode: null,
       },
@@ -877,7 +904,7 @@ export default {
         itemContent: [
           { required: true, message: "项目内容不能为空", trigger: "blur" },
         ],
-        itemCategoryId: [
+        testCategoryItemList: [
           { required: true, message: "请选择项目所属分类", trigger: "blur" },
         ],
         itemCode: [
@@ -914,6 +941,8 @@ export default {
           },
         ],
       },
+      categorynamelist: [],
+      itemtypeopen: false,
     };
   },
   created() {
@@ -1032,12 +1061,16 @@ export default {
     },
     addInput() {
       console.log(this.form);
+      if (this.form.itemLevelList.length >= 5) {
+        this.$message.error("最多5个级别");
+      } else {
         this.form.itemLevelList.push({
           levelName: "",
           levelMinScore: "",
           levelMaxScore: "",
           standardFlag: "",
         });
+      }
     },
     /** 查询测试项目列表 */
     getList() {
@@ -1049,8 +1082,6 @@ export default {
       tKindergartenInfo(this.itemResultType).then((res) => {
         // console.log(res);
         this.itemResultTypelist = res.data;
-        console.log(this.itemResultTypelist);
-
         this.ResultType1 = this.itemResultTypelist[0];
         this.ResultType2 = this.itemResultTypelist[1];
         // console.log(this.ResultType1);
@@ -1061,7 +1092,6 @@ export default {
       });
       tKindergartenInfo(this.standardType).then((res) => {
         this.standardTypelist = res.data;
-        console.log(this.standardTypelist);
       });
       listTestItems(this.queryParams).then((response) => {
         this.testItemsList = response.rows;
@@ -1082,6 +1112,7 @@ export default {
         itemName: "",
         itemCode: null,
         itemContent: "",
+        testCategoryItemList: null,
         measureUnit: "",
         standardType: null,
         largeStandardScore: "",
@@ -1126,6 +1157,15 @@ export default {
       this.open = true;
       this.title = "添加测试项目";
     },
+    //查看所属分类
+    looktype(row) {
+      this.categorynamelist = [];
+      getTestCategoryItemInfo(row.id).then((res) => {
+        this.categorynamelist = res.data;
+        this.itemtypeopen = true;
+        console.log(this.categorynamelist);
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -1206,3 +1246,17 @@ export default {
   },
 };
 </script>
+<style scoped>
+::v-deep .vue-treeselect__multi-value-item-container {
+  padding: 2px 5px 2px 0;
+}
+::v-deep .vue-treeselect__multi-value {
+  margin: 0;
+}
+::v-deep .vue-treeselect__multi-value-item {
+  line-height: 23px;
+}
+/* ::v-deep .el-form-item__content {
+  line-height: 23px;
+} */
+</style>