Browse Source

修改bug

QuKatie 3 years ago
parent
commit
5d0cc9f39b

+ 45 - 44
src/views/basicData/facultyManagement/detailsPage.vue

@@ -317,8 +317,8 @@ export default {
             span: 6
           },
           {
-            label: "工资基数标准",
-            prop: "salaryBase",
+            label: "工资拨付标准",
+            prop: "salaryWithdrawalStandard",
             precision: 2,
             type: "number",
             controls: false,
@@ -333,8 +333,16 @@ export default {
             span: 6
           },
           {
-            label: "工资拨付标准",
-            prop: "salaryWithdrawalStandard",
+            label: "工资基数标准",
+            prop: "salaryBase",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
+          {
+            label: "工资基数",
+            prop: "salaryBaseName",
             precision: 2,
             type: "number",
             controls: false,
@@ -356,25 +364,33 @@ export default {
             controls: false,
             span: 6
           },
-
           {
-            label: "日常考核标准",
-            prop: "dailyAssessmentCriteriaName",
+            label: "双休日工作量工资标准",
+            prop: "doubleCease",
             precision: 2,
             type: "number",
             controls: false,
             span: 6
           },
           {
-            label: "双休日工作量工资标准",
-            prop: "doubleCease",
+            label: "工作量工资",
+            prop: "workloadSalary",
             precision: 2,
             type: "number",
             controls: false,
             span: 6
           },
           {
-            label: "虚拟双休日工作量工资标准",
+            label: "日常考核工资标准",
+            prop: "dailyAssessmentCriteriaName",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
+
+          {
+            label: "虚拟日常考核工资标准",
             prop: "virtualDoubleCease",
             precision: 2,
             type: "number",
@@ -382,7 +398,15 @@ export default {
             span: 6
           },
           {
-            label: "学期绩效标准",
+            label: "日常考核工资",
+            prop: "dailyAssessmentCriteria",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
+          {
+            label: "学期绩效工资标准",
             prop: "termPerformanceSalaryName",
             type: "number",
             controls: false,
@@ -390,6 +414,14 @@ export default {
             span: 6
           },
           {
+            label: "学期绩效工资",
+            prop: "termPerformanceSalary",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
+          {
             label: "虚拟日常考核标准",
             prop: "virtualDailyAssessmentCriteria",
             precision: 2,
@@ -478,14 +510,7 @@ export default {
             row: true,
             span: 6
           },
-          {
-            label: "工资基数",
-            prop: "salaryBaseName",
-            precision: 2,
-            type: "number",
-            controls: false,
-            span: 6
-          },
+
           {
             label: "职级工资",
             prop: "rankWithdrawalStandard",
@@ -503,23 +528,6 @@ export default {
             span: 6
           },
           {
-            label: "工作量工资",
-            prop: "workloadSalary",
-            precision: 2,
-            type: "number",
-            controls: false,
-            span: 6
-          },
-
-          {
-            label: "日常考核工资",
-            prop: "dailyAssessmentCriteria",
-            precision: 2,
-            type: "number",
-            controls: false,
-            span: 6
-          },
-          {
             label: "日常考核等级工资",
             prop: "dailyAssessmentSalary",
             precision: 2,
@@ -527,14 +535,7 @@ export default {
             controls: false,
             span: 6
           },
-          {
-            label: "学期绩效工资",
-            prop: "termPerformanceSalary",
-            precision: 2,
-            type: "number",
-            controls: false,
-            span: 6
-          },
+
           {
             label: "校龄工资",
             prop: "schoolAgeSalary",

+ 17 - 15
src/views/basicData/facultyManagement/index.vue

@@ -141,7 +141,11 @@
 <script>
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
-import { getList, remove,allcalculate } from "@/api/basicData/facultyManagement";
+import {
+  getList,
+  remove,
+  allcalculate
+} from "@/api/basicData/facultyManagement";
 export default {
   name: "index",
   data() {
@@ -415,6 +419,12 @@ export default {
             overHidden: true
           },
           {
+            label: "工作量工资标准",
+            prop: "workloadSalaryName",
+            width: "120",
+            overHidden: true
+          },
+          {
             label: "工作量工资",
             prop: "workloadSalary",
             width: "100",
@@ -523,14 +533,6 @@ export default {
             width: "100",
             overHidden: true
           },
-
-          {
-            label: "工作量工资标准",
-            prop: "workloadSalaryName",
-            width: "100",
-            overHidden: true
-          },
-
           {
             label: "日常考核标准",
             prop: "dailyAssessmentCriteriaName",
@@ -708,15 +710,15 @@ export default {
       );
     },
     calculate() {
-      const ids=[]
-      this.selectionList.forEach(e=>{
-        ids.push(e.id)
-      })
+      const ids = [];
+      this.selectionList.forEach(e => {
+        ids.push(e.id);
+      });
       this.loading = true;
-      allcalculate({idList:ids})
+      allcalculate({ idList: ids })
         .then(res => {
           if (res.data.code == "200") {
-            this.$message.success('计算成功')
+            this.$message.success("计算成功");
             this.onLoad(this.page, this.search);
           }
         })

+ 14 - 13
src/views/salaryManagement/highSchool/detailsPage.vue

@@ -1572,19 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      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({ pid: this.form.id })
+      //   .then(res => {
+      //     if (res.data.code == "200") {
+      //       this.getItemDetail();
+      //     }
+      //   })
+      //   .finally(() => {
+      //     this.loading = false;
+      //   });
     },
     importExcel() {
       if (!this.form.id) {

+ 15 - 14
src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -1571,20 +1571,21 @@ export default {
           this.loading = false;
         });
     },
-    calculate2() {
-      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;
-        });
+   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;
+      //   });
     },
     importExcel() {
       if (!this.form.id) {

+ 15 - 14
src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -1571,20 +1571,21 @@ export default {
           this.loading = false;
         });
     },
-    calculate2() {
-      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;
-        });
+   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;
+      //   });
     },
     importExcel() {
       if (!this.form.id) {

+ 15 - 14
src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1571,20 +1571,21 @@ export default {
           this.loading = false;
         });
     },
-    calculate2(){
-      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;
-        });
+    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;
+      //   });
     },
     importExcel() {
       if (!this.form.id) {