From 33f2124599f7a37dadac12340c337ab7bdbe5a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 9 Aug 2022 16:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/itemCategory/index.vue      | 140 ++++++++++++++++---
 src/views/system/testItemCityScore/index.vue |  18 +--
 2 files changed, 120 insertions(+), 38 deletions(-)

diff --git a/src/views/system/itemCategory/index.vue b/src/views/system/itemCategory/index.vue
index 9fb1926..ff25a21 100644
--- a/src/views/system/itemCategory/index.vue
+++ b/src/views/system/itemCategory/index.vue
@@ -22,7 +22,6 @@
           v-model="queryParams.categoryName"
           placeholder="请输入分类名称"
           @keyup.enter.native="handleQuery"
-         
         />
       </el-form-item>
       <el-form-item
@@ -127,7 +126,6 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="itemCategoryList"
-      
       @selection-change="handleSelectionChange"
       row-key="id"
       :default-expand-all="isExpandAll"
@@ -188,8 +186,7 @@
             v-hasPermi="['system:itemCategory:remove']"
             >删除</el-button
           >
-            <!-- v-if="scope.row.categoryName != '跳不'" -->
-
+          <!-- v-if="scope.row.categoryName != '跳不'" -->
         </template>
       </el-table-column>
     </el-table>
@@ -226,18 +223,56 @@
             placeholder="请输入分类名称简写"
           />
         </el-form-item>
+
+        <el-form-item label="项目成绩级别" prop="testItemLevelList">
+          <div
+            v-for="(item, index) in form.testItemLevelList"
+            :key="item.id"
+            style="margin-bottom: 10px"
+          >
+            <el-input
+              v-model="item.levelName"
+              placeholder="级别名"
+              style="width: 75px; margin-right: 20px"
+            />
+            <el-input
+              v-model.number="item.levelMinScore"
+              placeholder="最低分"
+              style="width: 75px; margin-right: 10px"
+            /><el-input
+              v-model.number="item.levelMaxScore"
+              placeholder="最高分"
+              style="width: 75px; margin-right: 9px"
+            />
+            <el-button
+              type="info"
+              circle
+              plain
+              icon="el-icon-circle-plus-outline"
+              @click="addInput"
+              v-if="index == 0"
+            ></el-button>
+
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              circle
+              plain
+              @click="delInput(index)"
+              v-if="index != 0"
+            ></el-button>
+          </div>
+        </el-form-item>
+
         <el-form-item label="分类排序" prop="sorting">
-          <el-input v-model.number="form.sorting" placeholder="请输入分类排序" />
+          <el-input
+            v-model.number="form.sorting"
+            placeholder="请输入分类排序"
+          />
         </el-form-item>
         <el-form-item label="备注信息" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注信息" />
         </el-form-item>
-        <!-- <el-form-item label="是否删除，0：否，1：是" prop="delFlag">
-          <el-input
-            v-model="form.delFlag"
-            placeholder="请输入是否删除，0：否，1：是"
-          />
-        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -262,6 +297,39 @@ export default {
   name: "ItemCategory",
   components: { Treeselect },
   data() {
+    let testItemLevelList = (rule, value, callback) => {
+      console.log(value);
+      if (
+        value.map((e) => {
+          return e.levelName;
+        }) == ""
+      ) {
+        callback();
+      } else if (
+        value.map((e) => {
+          return e.levelMinScore;
+        }) == ""
+      ) {
+        callback();
+      } else if (
+        value.map((e) => {
+          return e.levelMaxScore;
+        }) == ""
+      ) {
+        callback();
+      } else if (
+        value.map((e) => {
+          return e.levelMaxScore;
+        }) <=
+        value.map((e) => {
+          return e.levelMinScore;
+        })
+      ) {
+        callback(new Error("级别最高分必须大于最低分,请重新填写！"));
+      } else {
+        callback();
+      }
+    };
     return {
       // 重新渲染表格状态
       refreshTable: true,
@@ -298,23 +366,30 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        testItemLevelList: [
+          {
+            // required: true,
+            validator: testItemLevelList,
+            trigger: "blur",
+          },
+        ],
         parentId: [
           { required: true, message: "父级id不能为空", trigger: "blur" },
         ],
-         categoryName: [
-          { required: true, message: "分类名称不能为空",trigger: "blur" },
+        categoryName: [
+          { required: true, message: "分类名称不能为空", trigger: "blur" },
           // { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
         ],
-             categoryNameAbbreviate: [
-          { required: true, message: "分类名称简写不能为空",trigger: "blur" },
+        categoryNameAbbreviate: [
+          { required: true, message: "分类名称简写不能为空", trigger: "blur" },
           // { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
         ],
         sorting: [
-          { required: true, message: "排序不能为空",trigger: "blur" },
+          { required: true, message: "排序不能为空", trigger: "blur" },
           { type: "number", message: "排序必须为数字值", trigger: "blur" },
         ],
-               remark: [
-          { required: true, message: "备注信息不能为空",trigger: "blur" },
+        remark: [
+          { required: true, message: "备注信息不能为空", trigger: "blur" },
           // { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
         ],
         // parentId: [
@@ -328,6 +403,18 @@ export default {
     this.getList();
   },
   methods: {
+    delInput(index) {
+      this.form.testItemLevelList.splice(index, 1);
+      console.log(this.form.testItemLevelList);
+    },
+    addInput() {
+      console.log(this.form);
+      this.form.testItemLevelList.push({
+        levelName: "",
+        levelMinScore: "",
+        levelMaxScore: "",
+      });
+    },
     /** 转换部门数据结构 */
     normalizer(node) {
       // console.log(node);
@@ -353,8 +440,7 @@ export default {
       this.loading = true;
       listItemCategory(this.queryParams).then((response) => {
         this.itemCategoryList = this.handleTree(response.data);
-        console.log(this.itemCategoryList);
-
+        // console.log(this.itemCategoryList);
         // this.total = response.data.length;
         // console.log(this.total);
         this.loading = false;
@@ -379,6 +465,9 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        testItemLevelList: [
+          { levelName: "", levelMinScore: "", levelMaxScore: "" },
+        ],
       };
       this.resetForm("form");
     },
@@ -419,15 +508,20 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getItemCategory(id).then((response) => {
+        if (response.data.testItemLevelList == null) {
+          response.data.testItemLevelList = [
+            { levelName: "", levelMinScore: "", levelMaxScore: "" },
+          ];
+        }
         this.form = response.data;
         this.open = true;
         this.title = "修改测试项目分类";
-      console.log(this.form)
-
+        console.log(this.form);
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -450,7 +544,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除测试项目的数据项？')
+        .confirm("是否确认删除测试项目的数据项？")
         .then(function () {
           return delItemCategory(ids);
         })
diff --git a/src/views/system/testItemCityScore/index.vue b/src/views/system/testItemCityScore/index.vue
index 95cd8e7..c9c911e 100644
--- a/src/views/system/testItemCityScore/index.vue
+++ b/src/views/system/testItemCityScore/index.vue
@@ -193,7 +193,7 @@
 
         <el-form-item
           label="平均成绩"
-          v-else-if="form.resultDictType == ResultType1.dictValue"
+          v-else-if="form.dictValue == ResultType1.dictValue"
           key="itemAvgScore"
           prop="itemAvgScore"
         >
@@ -205,25 +205,12 @@
 
         <el-form-item
           label="平均成绩"
-          v-else-if="form.resultDictType == ResultType2.dictValue"
+          v-else-if="form.dictValue == ResultType2.dictValue"
           key="itemAvgText"
           prop="itemAvgText"
         >
           <el-input v-model="form.itemAvgText" placeholder="请输入平均成绩" />
         </el-form-item>
-
-        <el-form-item
-          label="平均成绩"
-          v-if="form.dictValue == 'number'"
-          key="itemAvgScore"
-          prop="itemAvgScore"
-        >
-          <el-input
-            v-model.number="form.itemAvgScore"
-            placeholder="请输入平均成绩"
-          />
-        </el-form-item>
-
         <el-form-item
           label="平均成绩"
           v-else-if="form.dictValue == 'text'"
@@ -584,6 +571,7 @@ export default {
       this.xmname = item.itemName;
       this.form.itemId = item.id;
       this.xmid = item.id;
+      console.log(this.ResultType1, this.ResultType2);
       if (item.resultDictType == this.ResultType1.dictCode) {
         this.form.resultDictType = this.ResultType1.dictValue;
         this.form.dictValue = this.ResultType1.dictValue;