修改bug

src/views/basicData/facultyManagement/detailsPage.vue

@@ -76,7 +76,7 @@
               type="text"
               @click="rowCell(row, index)"
               :disabled="detailData.status == 1"
-              >编辑</el-button
+              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
             >
             <el-button
               size="small"
@@ -307,6 +307,32 @@ export default {
             span: 6
           },
           {
+            label: "日常考核等级",
+            prop: "dailyGrade",
+            type: "select",
+            dataType: "string",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=daily_assessment_level",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "学期绩效等级",
+            prop: "performanceGrade",
+            type: "select",
+            dataType: "string",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=daily_assessment_level",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
             label: "班主任",
             prop: "doubleTeachers",
             type: "select",
@@ -722,6 +748,7 @@ export default {
     },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
+        this.editCustomer();
         this.$set(row, "$cellEdit", false);
       } else {
         this.$set(row, "$cellEdit", true);
@@ -785,6 +812,11 @@ export default {
     },
     //返回列表
     backToList() {
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataList[i].$cellEdit) {
+          return this.$message.error(`请保存明细表数据`);
+        }
+      }
       this.$emit("goBack");
     }
   }

src/views/basicData/salaryConfiguration/detailsPage.vue

@@ -100,7 +100,7 @@
               type="text"
               @click="rowCell(row, index)"
               :disabled="detailData.status == 1"
-              >编辑</el-button
+              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
             >
             <el-button
               size="small"
@@ -208,6 +208,7 @@
 
 <script>
 import { detail, submit, delItem } from "@/api/basicData/salaryConfiguration";
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
   name: "index",
   data() {
@@ -297,6 +298,17 @@ export default {
             span: 6
           },
           {
+            label: "授课类别",
+            prop: "classType",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=class_type",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
             label: "创建时间",
             prop: "createTime",
             disabled: true,
@@ -307,11 +319,11 @@ export default {
             prop: "remarks",
             type: "textarea",
             minRows: 2,
-            span: 12
+            span: 24
           }
         ]
       },
-      tableOption:{
+      tableOption: {
         align: "center",
         addBtn: false,
         refreshBtn: false,
@@ -516,6 +528,7 @@ export default {
     },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
+        this.editCustomer()
         this.$set(row, "$cellEdit", false);
       } else {
         this.$set(row, "$cellEdit", true);
@@ -598,6 +611,12 @@ export default {
     },
     //返回列表
     backToList() {
+      for(let i=0;i<this.dataList.length;i++){
+        if(this.dataList[i].$cellEdit){
+          return this.$message.error(`请保存明细表数据`);
+        }
+       
+      }
       this.$emit("goBack");
     }
   }

src/views/basicData/salaryConfiguration/index.vue

@@ -93,7 +93,7 @@ export default {
       },
       option: {
         searchShow: true,
-        searchMenuSpan: 8,
+        searchMenuSpan: 24,
         align: "center",
         searchSpan: 8,
         tip: false,
@@ -189,6 +189,20 @@ export default {
             span: 8
           },
           {
+            label: "授课类别",
+            prop: "classType",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=class_type",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            filterable: true,
+            width: "100",
+            search: true,
+            span: 8
+          },
+          {
             label: "创建人",
             prop: "createUserName",
             width: "100",

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({inSection: "高中部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({inSection: "初中部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({inSection: "后勤部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({ inSection: "小学部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {