修改bug

src/components/details-select/main.vue

@@ -0,0 +1,94 @@
+<template>
+  <div>
+    <div style="display:flex">
+      <el-input
+        v-model="value"
+        placeholder="请点右边按钮"
+        :readonly="true"
+        :disabled="disabled"
+      ></el-input>
+      <el-button
+        icon="el-icon-search"
+        size="mini"
+        :disabled="disabled"
+        @click="openDialog()"
+      ></el-button>
+    </div>
+    <el-dialog
+      title="详细信息"
+      class="el-dialogDeep"
+      :visible.sync="dialogVisible"
+      append-to-body
+      :close-on-click-modal="false"
+      width="50%"
+      v-dialog-drag
+    >
+      <span>
+        <avue-form ref="form" v-model="obj" :option="option"></avue-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="importDate">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      option: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "客户名称",
+            prop: "client",
+            span: 24
+          },
+          {
+            label: "联系人",
+            prop: "clientAddress",
+            span: 24
+          },
+          {
+            label: "地址",
+            prop: "clientAttn",
+            type: "textarea",
+            minRows: 2,
+            span: 24
+          }
+        ]
+      }
+    };
+  },
+  props: {
+    value: String,
+    disabled: Boolean,
+    obj: Object
+  },
+  model: {
+    prop: "value",
+    event: "balabala"
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    openDialog() {
+      this.dialogVisible = true;
+    },
+    importDate() {
+      // this.value =
+      //   (this.obj.client ? this.obj.client + ";" : null) +
+      //   (this.obj.clientAttn ? this.obj.clientAttn + ";" : null) +
+      //   (this.obj.clientAddress ? this.obj.clientAddress + ";" : null);
+      this.$emit("detailsDate", this.obj);
+      this.dialogVisible = false;
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss"></style>

src/styles/variables.scss

@@ -86,3 +86,12 @@ p{
 .el-table__expanded-cell {
   padding-left: 90px !important;
 }
+::-webkit-scrollbar {
+  width: 7px !important;
+  height: 10px !important;
+  background-color: transparent !important;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 6px !important;
+  background-color: hsla(226, 12%, 71%, 0.25) !important;
+}

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -70,6 +70,14 @@
               :disabled="detailData.status == 1"
             ></crop-select>
           </template>
+          <template slot="corpId2">
+            <details-select
+              :value="form.clientMessage"
+              :obj="form"
+              @detailsDate="detailsDate"
+              :disabled="detailData.status == 1"
+            ></details-select>
+          </template>
           <template slot="corpAttn">
             <el-select
               size="small"
@@ -612,6 +620,7 @@ import { getAllBoxs } from "@/api/basicData/portinformation";
 import { getCorpsattn } from "@/api/basicData/customerInformation";
 import reportDialog from "@/components/report-dialog/main";
 import priceLibrary from "@/components/price-Library/main";
+import detailsSelect from "@/components/details-select/main";
 import {
   isDiscount,
   isPercentage,
@@ -664,10 +673,15 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 16,
+            span: 8,
             slot: true
           },
           {
+            label: "详情信息",
+            prop: "corpId2",
+            span: 8
+          },
+          {
             label: "系统号",
             prop: "sysNo",
             span: 8,
@@ -984,7 +998,8 @@ export default {
     customerDialog,
     partDialog,
     priceLibrary,
-    propertyDialog
+    propertyDialog,
+    detailsSelect
   },
   async created() {
     if (this.detailData.id) {
@@ -1113,8 +1128,8 @@ export default {
           }
         });
     },
-    refreshChange(){
-      this.onLoad(this.page)
+    refreshChange() {
+      this.onLoad(this.page);
     },
     businesDateChange() {
       if (this.form.currency && this.form.businesDate) {
@@ -1949,6 +1964,13 @@ export default {
         }
       });
     },
+    detailsDate(obj) {
+      this.form = obj;
+      this.form.clientMessage =
+        (this.form.client ? this.form.client + ";" :"") +
+        (this.form.clientAttn ? this.form.clientAttn + ";" :"") +
+        (this.form.clientAddress ? this.form.clientAddress + ";" :"");
+    },
     //返回列表
     backToList() {
       let orderFeesList = this.$refs.feeInfo.submitData();

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -82,7 +82,6 @@
           @row-update="rowUpdate"
           :cell-style="cellStyle"
           :header-cell-class-name="headerCellClassName"
-          class="primarySchoolClass"
         >
           <template slot="menuLeft">
             <el-button
@@ -318,6 +317,14 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.pauseNoPayTwo"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <template
             slot="virtualDailyAssessmentCriteriaForm"
             slot-scope="{ column, disabled }"
@@ -1863,7 +1870,8 @@ export default {
             numCal(row.classTeacherSubsidy) +
             numCal(row.subsidy) -
             numCal(row.deductions) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage) +
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       } else {
         row.salary = Number(
@@ -2406,6 +2414,26 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "36":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/customPerformance";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/customPerformance";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "37":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/adjustmentExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/adjustmentExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,
@@ -2444,13 +2472,4 @@ export default {
 .abnormal ::v-deep .el-dialog__body {
   padding: 10px 20px;
 }
-.primarySchoolClass ::v-deep ::-webkit-scrollbar {
-  width: 7px;
-  height: 10px;
-  background-color: transparent;
-}
-.primarySchoolClass ::v-deep ::-webkit-scrollbar-thumb {
-  border-radius: 6px;
-  background-color: hsla(226, 12%, 71%, 0.2);
-}
 </style>

src/views/salaryManagement/highSchool/js/optionList.js

@@ -150,7 +150,6 @@ export const optionList = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  // refreshBtn: false,
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
@@ -666,6 +665,18 @@ export const optionList = {
       span: 4
     },
     {
+      label: "日常考核工资调整",
+      prop: "pauseNoPayTwo",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 45,
+      span: 4
+    },
+    {
       label: "绩效工资标准",
       prop: "termPerformanceSalaryName",
       width: 100,
@@ -674,7 +685,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 45,
+      index: 46,
       span: 4
     },
     {
@@ -686,7 +697,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 46,
+      index: 47,
       span: 4
     },
     {
@@ -698,7 +709,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 47,
+      index: 48,
       span: 4
     },
     {
@@ -710,7 +721,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 48,
+      index: 49,
       span: 4
     },
     {
@@ -722,7 +733,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 49,
+      index: 50,
       span: 4
     },
     {
@@ -734,7 +745,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 50,
+      index: 51,
       span: 4
     },
     {
@@ -746,7 +757,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 51,
+      index: 52,
       span: 4
     },
     {
@@ -758,7 +769,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 52,
+      index: 53,
       span: 4
     },
     {
@@ -770,7 +781,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 53,
+      index: 54,
       span: 4
     },
     {
@@ -782,7 +793,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 54,
+      index: 55,
       span: 4
     },
     {
@@ -794,7 +805,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 55,
+      index: 56,
       span: 4
     },
     {
@@ -806,7 +817,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 56,
+      index: 57,
       span: 4
     },
     {
@@ -818,7 +829,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 57,
+      index: 58,
       span: 4
     },
     {
@@ -830,7 +841,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 58,
+      index: 59,
       span: 4
     },
     {
@@ -842,7 +853,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 59,
+      index: 60,
       span: 4
     },
     {
@@ -854,7 +865,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 60,
+      index: 61,
       span: 4
     },
     {
@@ -866,7 +877,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 61,
+      index: 62,
       span: 4
     },
     {
@@ -878,7 +889,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 62,
+      index: 63,
       span: 4
     },
     {
@@ -890,7 +901,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 63,
+      index: 64,
       span: 4
     },
     {
@@ -902,7 +913,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 64,
+      index: 65,
       span: 4
     },
     {
@@ -914,7 +925,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 65,
+      index: 66,
       span: 4
     },
     {
@@ -926,7 +937,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 66,
+      index: 67,
       span: 4
     },
     {
@@ -938,7 +949,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 67,
+      index: 68,
       span: 4
     },
     {
@@ -950,7 +961,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 68,
+      index: 69,
       span: 4
     },
     {
@@ -962,7 +973,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 69,
+      index: 70,
       span: 4
     },
     {
@@ -974,7 +985,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 70,
+      index: 71,
       span: 4
     },
     {
@@ -986,7 +997,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 71,
+      index: 72,
       span: 4
     },
     {
@@ -998,7 +1009,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 72,
+      index: 73,
       span: 4
     },
     {
@@ -1010,7 +1021,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 73,
+      index: 74,
       span: 4
     },
     {
@@ -1022,7 +1033,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 74,
+      index: 75,
       span: 4
     },
     {
@@ -1034,7 +1045,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 75,
+      index: 76,
       span: 4
     },
     {
@@ -1046,7 +1057,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 76,
+      index: 77,
       span: 4
     },
     {
@@ -1058,7 +1069,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 77,
+      index: 78,
       span: 4
     },
     {
@@ -1070,7 +1081,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 78,
+      index: 79,
       span: 4
     },
     {
@@ -1082,7 +1093,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 79,
+      index: 80,
       span: 4
     },
     {
@@ -1094,7 +1105,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 80,
+      index: 81,
       span: 4
     },
     {
@@ -1106,7 +1117,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 81,
+      index: 82,
       span: 4
     },
     {
@@ -1118,7 +1129,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 82,
+      index: 83,
       span: 4
     },
     {
@@ -1130,7 +1141,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 83,
+      index: 84,
       span: 4
     },
     {
@@ -1142,7 +1153,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 84,
+      index: 85,
       span: 4
     },
     {
@@ -1154,7 +1165,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 85,
+      index: 86,
       span: 4
     },
     {
@@ -1166,7 +1177,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 86,
+      index: 87,
       span: 4
     },
     {
@@ -1178,7 +1189,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 87,
+      index: 88,
       span: 4
     },
     {
@@ -1190,7 +1201,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 88,
+      index: 89,
       span: 4
     },
     {
@@ -1202,7 +1213,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 89,
+      index: 90,
       span: 4
     },
     {
@@ -1214,7 +1225,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 90,
+      index: 91,
       span: 4
     },
     {
@@ -1226,7 +1237,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 91,
+      index: 92,
       span: 4
     },
     {
@@ -1238,7 +1249,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 92,
+      index: 93,
       span: 4
     },
     {
@@ -1250,7 +1261,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 93,
+      index: 94,
       span: 4
     },
     {
@@ -1262,7 +1273,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 94,
+      index: 95,
       span: 4
     },
     {
@@ -1274,7 +1285,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 95,
+      index: 96,
       span: 4
     },
     {
@@ -1286,7 +1297,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 96,
+      index: 97,
       span: 4
     },
     {
@@ -1298,7 +1309,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 97,
+      index: 98,
       span: 4
     },
     {
@@ -1310,7 +1321,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 98,
+      index: 99,
       span: 4
     },
     {
@@ -1322,7 +1333,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 99,
+      index: 100,
       span: 4
     },
     {
@@ -1334,7 +1345,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 100,
+      index: 101,
       span: 4
     },
     {
@@ -1346,7 +1357,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 101,
+      index: 102,
       span: 4
     },
     {
@@ -1358,7 +1369,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 102,
+      index: 103,
       span: 4
     },
     {
@@ -1370,7 +1381,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 103,
+      index: 104,
       span: 4
     },
     {
@@ -1382,7 +1393,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 104,
+      index: 105,
       span: 4
     },
     {
@@ -1394,7 +1405,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 105,
+      index: 106,
       span: 4
     },
     {
@@ -1406,7 +1417,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 107,
       span: 4
     },
     {
@@ -1418,7 +1429,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 108,
       span: 4
     },
     {
@@ -1430,7 +1441,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 109,
       span: 4
     },
     {
@@ -1442,7 +1453,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 110,
       span: 4
     },
     {
@@ -1454,7 +1465,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 111,
       span: 4
     },
     {
@@ -1466,7 +1477,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 112,
       span: 4
     },
     {
@@ -1478,7 +1489,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 113,
       span: 4
     },
     {
@@ -1490,7 +1501,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 114,
       span: 4
     },
     {
@@ -1502,7 +1513,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 115,
       span: 4
     },
     {
@@ -1514,7 +1525,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 116,
       span: 4
     },
     {
@@ -1526,7 +1537,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 117,
       span: 4
     },
     {
@@ -1538,7 +1549,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 118,
       span: 4
     },
     {
@@ -1550,7 +1561,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 119,
       span: 4
     },
     {
@@ -1562,7 +1573,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 120,
       span: 4
     },
     {
@@ -1574,7 +1585,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 121,
       span: 4
     },
     {
@@ -1586,7 +1597,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 122,
       span: 4
     },
     {
@@ -1598,7 +1609,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 123,
       span: 4
     },
     {
@@ -1610,7 +1621,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 124,
       span: 4
     },
     {
@@ -1622,7 +1633,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 125,
       span: 4
     },
     {
@@ -1634,7 +1645,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 126,
       span: 4
     },
     {
@@ -1646,7 +1657,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 127,
       span: 4
     },
     {
@@ -1658,7 +1669,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 128,
       span: 4
     },
     {
@@ -1670,7 +1681,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 129,
       span: 4
     },
     {
@@ -1682,7 +1693,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 130,
       span: 4
     },
     {
@@ -1690,7 +1701,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 130,
+      index: 131,
       span: 4
     },
     {
@@ -1698,7 +1709,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 131,
+      index: 132,
       span: 4
     },
     {
@@ -1706,7 +1717,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 133,
       span: 4
     },
     {
@@ -1714,7 +1725,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 134,
       span: 4
     },
     {
@@ -1722,7 +1733,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 135,
       span: 4
     }
   ]

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -82,7 +82,6 @@
           @row-update="rowUpdate"
           :cell-style="cellStyle"
           :header-cell-class-name="headerCellClassName"
-          class="primarySchoolClass"
         >
           <template slot="menuLeft">
             <el-button
@@ -318,6 +317,14 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.pauseNoPayTwo"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <template
             slot="virtualDailyAssessmentCriteriaForm"
             slot-scope="{ column, disabled }"
@@ -1863,7 +1870,8 @@ export default {
             numCal(row.classTeacherSubsidy) +
             numCal(row.subsidy) -
             numCal(row.deductions) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage) +
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       } else {
         row.salary = Number(
@@ -2406,6 +2414,26 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "36":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/customPerformance";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/customPerformance";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "37":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/adjustmentExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/adjustmentExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,
@@ -2444,13 +2472,4 @@ export default {
 .abnormal ::v-deep .el-dialog__body {
   padding: 10px 20px;
 }
-.primarySchoolClass ::v-deep ::-webkit-scrollbar {
-  width: 7px;
-  height: 10px;
-  background-color: transparent;
-}
-.primarySchoolClass ::v-deep ::-webkit-scrollbar-thumb {
-  border-radius: 6px;
-  background-color: hsla(226, 12%, 71%, 0.2);
-}
 </style>

src/views/salaryManagement/juniorhighSchool/js/optionList.js

@@ -150,7 +150,6 @@ export const optionList = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  // refreshBtn: false,
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
@@ -666,6 +665,18 @@ export const optionList = {
       span: 4
     },
     {
+      label: "日常考核工资调整",
+      prop: "pauseNoPayTwo",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 45,
+      span: 4
+    },
+    {
       label: "绩效工资标准",
       prop: "termPerformanceSalaryName",
       width: 100,
@@ -674,7 +685,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 45,
+      index: 46,
       span: 4
     },
     {
@@ -686,7 +697,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 46,
+      index: 47,
       span: 4
     },
     {
@@ -698,7 +709,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 47,
+      index: 48,
       span: 4
     },
     {
@@ -710,7 +721,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 48,
+      index: 49,
       span: 4
     },
     {
@@ -722,7 +733,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 49,
+      index: 50,
       span: 4
     },
     {
@@ -734,7 +745,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 50,
+      index: 51,
       span: 4
     },
     {
@@ -746,7 +757,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 51,
+      index: 52,
       span: 4
     },
     {
@@ -758,7 +769,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 52,
+      index: 53,
       span: 4
     },
     {
@@ -770,7 +781,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 53,
+      index: 54,
       span: 4
     },
     {
@@ -782,7 +793,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 54,
+      index: 55,
       span: 4
     },
     {
@@ -794,7 +805,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 55,
+      index: 56,
       span: 4
     },
     {
@@ -806,7 +817,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 56,
+      index: 57,
       span: 4
     },
     {
@@ -818,7 +829,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 57,
+      index: 58,
       span: 4
     },
     {
@@ -830,7 +841,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 58,
+      index: 59,
       span: 4
     },
     {
@@ -842,7 +853,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 59,
+      index: 60,
       span: 4
     },
     {
@@ -854,7 +865,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 60,
+      index: 61,
       span: 4
     },
     {
@@ -866,7 +877,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 61,
+      index: 62,
       span: 4
     },
     {
@@ -878,7 +889,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 62,
+      index: 63,
       span: 4
     },
     {
@@ -890,7 +901,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 63,
+      index: 64,
       span: 4
     },
     {
@@ -902,7 +913,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 64,
+      index: 65,
       span: 4
     },
     {
@@ -914,7 +925,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 65,
+      index: 66,
       span: 4
     },
     {
@@ -926,7 +937,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 66,
+      index: 67,
       span: 4
     },
     {
@@ -938,7 +949,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 67,
+      index: 68,
       span: 4
     },
     {
@@ -950,7 +961,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 68,
+      index: 69,
       span: 4
     },
     {
@@ -962,7 +973,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 69,
+      index: 70,
       span: 4
     },
     {
@@ -974,7 +985,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 70,
+      index: 71,
       span: 4
     },
     {
@@ -986,7 +997,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 71,
+      index: 72,
       span: 4
     },
     {
@@ -998,7 +1009,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 72,
+      index: 73,
       span: 4
     },
     {
@@ -1010,7 +1021,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 73,
+      index: 74,
       span: 4
     },
     {
@@ -1022,7 +1033,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 74,
+      index: 75,
       span: 4
     },
     {
@@ -1034,7 +1045,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 75,
+      index: 76,
       span: 4
     },
     {
@@ -1046,7 +1057,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 76,
+      index: 77,
       span: 4
     },
     {
@@ -1058,7 +1069,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 77,
+      index: 78,
       span: 4
     },
     {
@@ -1070,7 +1081,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 78,
+      index: 79,
       span: 4
     },
     {
@@ -1082,7 +1093,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 79,
+      index: 80,
       span: 4
     },
     {
@@ -1094,7 +1105,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 80,
+      index: 81,
       span: 4
     },
     {
@@ -1106,7 +1117,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 81,
+      index: 82,
       span: 4
     },
     {
@@ -1118,7 +1129,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 82,
+      index: 83,
       span: 4
     },
     {
@@ -1130,7 +1141,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 83,
+      index: 84,
       span: 4
     },
     {
@@ -1142,7 +1153,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 84,
+      index: 85,
       span: 4
     },
     {
@@ -1154,7 +1165,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 85,
+      index: 86,
       span: 4
     },
     {
@@ -1166,7 +1177,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 86,
+      index: 87,
       span: 4
     },
     {
@@ -1178,7 +1189,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 87,
+      index: 88,
       span: 4
     },
     {
@@ -1190,7 +1201,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 88,
+      index: 89,
       span: 4
     },
     {
@@ -1202,7 +1213,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 89,
+      index: 90,
       span: 4
     },
     {
@@ -1214,7 +1225,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 90,
+      index: 91,
       span: 4
     },
     {
@@ -1226,7 +1237,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 91,
+      index: 92,
       span: 4
     },
     {
@@ -1238,7 +1249,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 92,
+      index: 93,
       span: 4
     },
     {
@@ -1250,7 +1261,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 93,
+      index: 94,
       span: 4
     },
     {
@@ -1262,7 +1273,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 94,
+      index: 95,
       span: 4
     },
     {
@@ -1274,7 +1285,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 95,
+      index: 96,
       span: 4
     },
     {
@@ -1286,7 +1297,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 96,
+      index: 97,
       span: 4
     },
     {
@@ -1298,7 +1309,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 97,
+      index: 98,
       span: 4
     },
     {
@@ -1310,7 +1321,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 98,
+      index: 99,
       span: 4
     },
     {
@@ -1322,7 +1333,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 99,
+      index: 100,
       span: 4
     },
     {
@@ -1334,7 +1345,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 100,
+      index: 101,
       span: 4
     },
     {
@@ -1346,7 +1357,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 101,
+      index: 102,
       span: 4
     },
     {
@@ -1358,7 +1369,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 102,
+      index: 103,
       span: 4
     },
     {
@@ -1370,7 +1381,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 103,
+      index: 104,
       span: 4
     },
     {
@@ -1382,7 +1393,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 104,
+      index: 105,
       span: 4
     },
     {
@@ -1394,7 +1405,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 105,
+      index: 106,
       span: 4
     },
     {
@@ -1406,7 +1417,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 107,
       span: 4
     },
     {
@@ -1418,7 +1429,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 108,
       span: 4
     },
     {
@@ -1430,7 +1441,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 109,
       span: 4
     },
     {
@@ -1442,7 +1453,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 110,
       span: 4
     },
     {
@@ -1454,7 +1465,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 111,
       span: 4
     },
     {
@@ -1466,7 +1477,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 112,
       span: 4
     },
     {
@@ -1478,7 +1489,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 113,
       span: 4
     },
     {
@@ -1490,7 +1501,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 114,
       span: 4
     },
     {
@@ -1502,7 +1513,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 115,
       span: 4
     },
     {
@@ -1514,7 +1525,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 116,
       span: 4
     },
     {
@@ -1526,7 +1537,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 117,
       span: 4
     },
     {
@@ -1538,7 +1549,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 118,
       span: 4
     },
     {
@@ -1550,7 +1561,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 119,
       span: 4
     },
     {
@@ -1562,7 +1573,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 120,
       span: 4
     },
     {
@@ -1574,7 +1585,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 121,
       span: 4
     },
     {
@@ -1586,7 +1597,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 122,
       span: 4
     },
     {
@@ -1598,7 +1609,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 123,
       span: 4
     },
     {
@@ -1610,7 +1621,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 124,
       span: 4
     },
     {
@@ -1622,7 +1633,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 125,
       span: 4
     },
     {
@@ -1634,7 +1645,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 126,
       span: 4
     },
     {
@@ -1646,7 +1657,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 127,
       span: 4
     },
     {
@@ -1658,7 +1669,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 128,
       span: 4
     },
     {
@@ -1670,7 +1681,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 129,
       span: 4
     },
     {
@@ -1682,7 +1693,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 130,
       span: 4
     },
     {
@@ -1690,7 +1701,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 130,
+      index: 131,
       span: 4
     },
     {
@@ -1698,7 +1709,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 131,
+      index: 132,
       span: 4
     },
     {
@@ -1706,7 +1717,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 133,
       span: 4
     },
     {
@@ -1714,7 +1725,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 134,
       span: 4
     },
     {
@@ -1722,7 +1733,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 135,
       span: 4
     }
   ]

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -82,7 +82,6 @@
           @row-update="rowUpdate"
           :cell-style="cellStyle"
           :header-cell-class-name="headerCellClassName"
-          class="primarySchoolClass"
         >
           <template slot="menuLeft">
             <el-button
@@ -318,6 +317,14 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.pauseNoPayTwo"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <template
             slot="virtualDailyAssessmentCriteriaForm"
             slot-scope="{ column, disabled }"
@@ -1863,7 +1870,8 @@ export default {
             numCal(row.classTeacherSubsidy) +
             numCal(row.subsidy) -
             numCal(row.deductions) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage) +
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       } else {
         row.salary = Number(
@@ -2406,6 +2414,26 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "36":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/customPerformance";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/customPerformance";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "37":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/adjustmentExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/adjustmentExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,
@@ -2444,13 +2472,4 @@ export default {
 .abnormal ::v-deep .el-dialog__body {
   padding: 10px 20px;
 }
-.primarySchoolClass ::v-deep ::-webkit-scrollbar {
-  width: 7px;
-  height: 10px;
-  background-color: transparent;
-}
-.primarySchoolClass ::v-deep ::-webkit-scrollbar-thumb {
-  border-radius: 6px;
-  background-color: hsla(226, 12%, 71%, 0.2);
-}
 </style>

src/views/salaryManagement/logisticsDepartment/js/optionList.js

@@ -150,7 +150,6 @@ export const optionList = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  // refreshBtn: false,
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
@@ -666,6 +665,18 @@ export const optionList = {
       span: 4
     },
     {
+      label: "日常考核工资调整",
+      prop: "pauseNoPayTwo",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 45,
+      span: 4
+    },
+    {
       label: "绩效工资标准",
       prop: "termPerformanceSalaryName",
       width: 100,
@@ -674,7 +685,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 45,
+      index: 46,
       span: 4
     },
     {
@@ -686,7 +697,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 46,
+      index: 47,
       span: 4
     },
     {
@@ -698,7 +709,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 47,
+      index: 48,
       span: 4
     },
     {
@@ -710,7 +721,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 48,
+      index: 49,
       span: 4
     },
     {
@@ -722,7 +733,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 49,
+      index: 50,
       span: 4
     },
     {
@@ -734,7 +745,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 50,
+      index: 51,
       span: 4
     },
     {
@@ -746,7 +757,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 51,
+      index: 52,
       span: 4
     },
     {
@@ -758,7 +769,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 52,
+      index: 53,
       span: 4
     },
     {
@@ -770,7 +781,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 53,
+      index: 54,
       span: 4
     },
     {
@@ -782,7 +793,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 54,
+      index: 55,
       span: 4
     },
     {
@@ -794,7 +805,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 55,
+      index: 56,
       span: 4
     },
     {
@@ -806,7 +817,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 56,
+      index: 57,
       span: 4
     },
     {
@@ -818,7 +829,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 57,
+      index: 58,
       span: 4
     },
     {
@@ -830,7 +841,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 58,
+      index: 59,
       span: 4
     },
     {
@@ -842,7 +853,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 59,
+      index: 60,
       span: 4
     },
     {
@@ -854,7 +865,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 60,
+      index: 61,
       span: 4
     },
     {
@@ -866,7 +877,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 61,
+      index: 62,
       span: 4
     },
     {
@@ -878,7 +889,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 62,
+      index: 63,
       span: 4
     },
     {
@@ -890,7 +901,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 63,
+      index: 64,
       span: 4
     },
     {
@@ -902,7 +913,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 64,
+      index: 65,
       span: 4
     },
     {
@@ -914,7 +925,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 65,
+      index: 66,
       span: 4
     },
     {
@@ -926,7 +937,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 66,
+      index: 67,
       span: 4
     },
     {
@@ -938,7 +949,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 67,
+      index: 68,
       span: 4
     },
     {
@@ -950,7 +961,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 68,
+      index: 69,
       span: 4
     },
     {
@@ -962,7 +973,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 69,
+      index: 70,
       span: 4
     },
     {
@@ -974,7 +985,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 70,
+      index: 71,
       span: 4
     },
     {
@@ -986,7 +997,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 71,
+      index: 72,
       span: 4
     },
     {
@@ -998,7 +1009,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 72,
+      index: 73,
       span: 4
     },
     {
@@ -1010,7 +1021,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 73,
+      index: 74,
       span: 4
     },
     {
@@ -1022,7 +1033,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 74,
+      index: 75,
       span: 4
     },
     {
@@ -1034,7 +1045,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 75,
+      index: 76,
       span: 4
     },
     {
@@ -1046,7 +1057,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 76,
+      index: 77,
       span: 4
     },
     {
@@ -1058,7 +1069,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 77,
+      index: 78,
       span: 4
     },
     {
@@ -1070,7 +1081,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 78,
+      index: 79,
       span: 4
     },
     {
@@ -1082,7 +1093,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 79,
+      index: 80,
       span: 4
     },
     {
@@ -1094,7 +1105,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 80,
+      index: 81,
       span: 4
     },
     {
@@ -1106,7 +1117,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 81,
+      index: 82,
       span: 4
     },
     {
@@ -1118,7 +1129,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 82,
+      index: 83,
       span: 4
     },
     {
@@ -1130,7 +1141,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 83,
+      index: 84,
       span: 4
     },
     {
@@ -1142,7 +1153,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 84,
+      index: 85,
       span: 4
     },
     {
@@ -1154,7 +1165,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 85,
+      index: 86,
       span: 4
     },
     {
@@ -1166,7 +1177,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 86,
+      index: 87,
       span: 4
     },
     {
@@ -1178,7 +1189,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 87,
+      index: 88,
       span: 4
     },
     {
@@ -1190,7 +1201,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 88,
+      index: 89,
       span: 4
     },
     {
@@ -1202,7 +1213,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 89,
+      index: 90,
       span: 4
     },
     {
@@ -1214,7 +1225,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 90,
+      index: 91,
       span: 4
     },
     {
@@ -1226,7 +1237,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 91,
+      index: 92,
       span: 4
     },
     {
@@ -1238,7 +1249,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 92,
+      index: 93,
       span: 4
     },
     {
@@ -1250,7 +1261,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 93,
+      index: 94,
       span: 4
     },
     {
@@ -1262,7 +1273,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 94,
+      index: 95,
       span: 4
     },
     {
@@ -1274,7 +1285,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 95,
+      index: 96,
       span: 4
     },
     {
@@ -1286,7 +1297,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 96,
+      index: 97,
       span: 4
     },
     {
@@ -1298,7 +1309,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 97,
+      index: 98,
       span: 4
     },
     {
@@ -1310,7 +1321,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 98,
+      index: 99,
       span: 4
     },
     {
@@ -1322,7 +1333,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 99,
+      index: 100,
       span: 4
     },
     {
@@ -1334,7 +1345,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 100,
+      index: 101,
       span: 4
     },
     {
@@ -1346,7 +1357,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 101,
+      index: 102,
       span: 4
     },
     {
@@ -1358,7 +1369,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 102,
+      index: 103,
       span: 4
     },
     {
@@ -1370,7 +1381,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 103,
+      index: 104,
       span: 4
     },
     {
@@ -1382,7 +1393,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 104,
+      index: 105,
       span: 4
     },
     {
@@ -1394,7 +1405,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 105,
+      index: 106,
       span: 4
     },
     {
@@ -1406,7 +1417,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 107,
       span: 4
     },
     {
@@ -1418,7 +1429,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 108,
       span: 4
     },
     {
@@ -1430,7 +1441,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 109,
       span: 4
     },
     {
@@ -1442,7 +1453,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 110,
       span: 4
     },
     {
@@ -1454,7 +1465,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 111,
       span: 4
     },
     {
@@ -1466,7 +1477,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 112,
       span: 4
     },
     {
@@ -1478,7 +1489,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 113,
       span: 4
     },
     {
@@ -1490,7 +1501,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 114,
       span: 4
     },
     {
@@ -1502,7 +1513,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 115,
       span: 4
     },
     {
@@ -1514,7 +1525,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 116,
       span: 4
     },
     {
@@ -1526,7 +1537,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 117,
       span: 4
     },
     {
@@ -1538,7 +1549,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 118,
       span: 4
     },
     {
@@ -1550,7 +1561,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 119,
       span: 4
     },
     {
@@ -1562,7 +1573,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 120,
       span: 4
     },
     {
@@ -1574,7 +1585,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 121,
       span: 4
     },
     {
@@ -1586,7 +1597,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 122,
       span: 4
     },
     {
@@ -1598,7 +1609,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 123,
       span: 4
     },
     {
@@ -1610,7 +1621,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 124,
       span: 4
     },
     {
@@ -1622,7 +1633,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 125,
       span: 4
     },
     {
@@ -1634,7 +1645,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 126,
       span: 4
     },
     {
@@ -1646,7 +1657,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 127,
       span: 4
     },
     {
@@ -1658,7 +1669,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 128,
       span: 4
     },
     {
@@ -1670,7 +1681,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 129,
       span: 4
     },
     {
@@ -1682,7 +1693,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 130,
       span: 4
     },
     {
@@ -1690,7 +1701,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 130,
+      index: 131,
       span: 4
     },
     {
@@ -1698,7 +1709,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 131,
+      index: 132,
       span: 4
     },
     {
@@ -1706,7 +1717,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 133,
       span: 4
     },
     {
@@ -1714,7 +1725,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 134,
       span: 4
     },
     {
@@ -1722,7 +1733,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 135,
       span: 4
     }
   ]

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -82,7 +82,6 @@
           @row-update="rowUpdate"
           :cell-style="cellStyle"
           :header-cell-class-name="headerCellClassName"
-          class="primarySchoolClass"
         >
           <template slot="menuLeft">
             <el-button
@@ -321,6 +320,14 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.pauseNoPayTwo"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <template
             slot="virtualDailyAssessmentCriteriaForm"
             slot-scope="{ column, disabled }"
@@ -1866,7 +1873,8 @@ export default {
             numCal(row.classTeacherSubsidy) +
             numCal(row.subsidy) -
             numCal(row.deductions) +
-            numCal(row.reservedFundsPersonage)
+            numCal(row.reservedFundsPersonage) +
+            numCal(row.pauseNoPayTwo)
         ).toFixed(2);
       } else {
         row.salary = Number(
@@ -2409,6 +2417,26 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "36":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/customPerformance";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/customPerformance";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "37":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/adjustmentExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/adjustmentExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,
@@ -2447,13 +2475,4 @@ export default {
 .abnormal ::v-deep .el-dialog__body {
   padding: 10px 20px;
 }
-.primarySchoolClass ::v-deep ::-webkit-scrollbar {
-  width: 7px;
-  height: 10px;
-  background-color: transparent;
-}
-.primarySchoolClass ::v-deep ::-webkit-scrollbar-thumb {
-  border-radius: 6px;
-  background-color: hsla(226, 12%, 71%, 0.2);
-}
 </style>

src/views/salaryManagement/primarySchool/js/optionList.js

@@ -150,7 +150,6 @@ export const optionList = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  // refreshBtn: false,
   menuWidth: 100,
   labelWidth: 100,
   stripe: true,
@@ -666,6 +665,18 @@ export const optionList = {
       span: 4
     },
     {
+      label: "日常考核工资调整",
+      prop: "pauseNoPayTwo",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 45,
+      span: 4
+    },
+    {
       label: "绩效工资标准",
       prop: "termPerformanceSalaryName",
       width: 100,
@@ -674,7 +685,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 45,
+      index: 46,
       span: 4
     },
     {
@@ -686,7 +697,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 46,
+      index: 47,
       span: 4
     },
     {
@@ -698,7 +709,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 47,
+      index: 48,
       span: 4
     },
     {
@@ -710,7 +721,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 48,
+      index: 49,
       span: 4
     },
     {
@@ -722,7 +733,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 49,
+      index: 50,
       span: 4
     },
     {
@@ -734,7 +745,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 50,
+      index: 51,
       span: 4
     },
     {
@@ -746,7 +757,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 51,
+      index: 52,
       span: 4
     },
     {
@@ -758,7 +769,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 52,
+      index: 53,
       span: 4
     },
     {
@@ -770,7 +781,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 53,
+      index: 54,
       span: 4
     },
     {
@@ -782,7 +793,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 54,
+      index: 55,
       span: 4
     },
     {
@@ -794,7 +805,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 55,
+      index: 56,
       span: 4
     },
     {
@@ -806,7 +817,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 56,
+      index: 57,
       span: 4
     },
     {
@@ -818,7 +829,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 57,
+      index: 58,
       span: 4
     },
     {
@@ -830,7 +841,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 58,
+      index: 59,
       span: 4
     },
     {
@@ -842,7 +853,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 59,
+      index: 60,
       span: 4
     },
     {
@@ -854,7 +865,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 60,
+      index: 61,
       span: 4
     },
     {
@@ -866,7 +877,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 61,
+      index: 62,
       span: 4
     },
     {
@@ -878,7 +889,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 62,
+      index: 63,
       span: 4
     },
     {
@@ -890,7 +901,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 63,
+      index: 64,
       span: 4
     },
     {
@@ -902,7 +913,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 64,
+      index: 65,
       span: 4
     },
     {
@@ -914,7 +925,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 65,
+      index: 66,
       span: 4
     },
     {
@@ -926,7 +937,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 66,
+      index: 67,
       span: 4
     },
     {
@@ -938,7 +949,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 67,
+      index: 68,
       span: 4
     },
     {
@@ -950,7 +961,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 68,
+      index: 69,
       span: 4
     },
     {
@@ -962,7 +973,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 69,
+      index: 70,
       span: 4
     },
     {
@@ -974,7 +985,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 70,
+      index: 71,
       span: 4
     },
     {
@@ -986,7 +997,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 71,
+      index: 72,
       span: 4
     },
     {
@@ -998,7 +1009,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 72,
+      index: 73,
       span: 4
     },
     {
@@ -1010,7 +1021,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 73,
+      index: 74,
       span: 4
     },
     {
@@ -1022,7 +1033,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 74,
+      index: 75,
       span: 4
     },
     {
@@ -1034,7 +1045,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 75,
+      index: 76,
       span: 4
     },
     {
@@ -1046,7 +1057,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 76,
+      index: 77,
       span: 4
     },
     {
@@ -1058,7 +1069,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 77,
+      index: 78,
       span: 4
     },
     {
@@ -1070,7 +1081,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 78,
+      index: 79,
       span: 4
     },
     {
@@ -1082,7 +1093,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 79,
+      index: 80,
       span: 4
     },
     {
@@ -1094,7 +1105,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 80,
+      index: 81,
       span: 4
     },
     {
@@ -1106,7 +1117,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 81,
+      index: 82,
       span: 4
     },
     {
@@ -1118,7 +1129,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 82,
+      index: 83,
       span: 4
     },
     {
@@ -1130,7 +1141,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 83,
+      index: 84,
       span: 4
     },
     {
@@ -1142,7 +1153,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 84,
+      index: 85,
       span: 4
     },
     {
@@ -1154,7 +1165,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 85,
+      index: 86,
       span: 4
     },
     {
@@ -1166,7 +1177,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 86,
+      index: 87,
       span: 4
     },
     {
@@ -1178,7 +1189,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 87,
+      index: 88,
       span: 4
     },
     {
@@ -1190,7 +1201,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 88,
+      index: 89,
       span: 4
     },
     {
@@ -1202,7 +1213,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 89,
+      index: 90,
       span: 4
     },
     {
@@ -1214,7 +1225,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 90,
+      index: 91,
       span: 4
     },
     {
@@ -1226,7 +1237,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 91,
+      index: 92,
       span: 4
     },
     {
@@ -1238,7 +1249,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 92,
+      index: 93,
       span: 4
     },
     {
@@ -1250,7 +1261,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 93,
+      index: 94,
       span: 4
     },
     {
@@ -1262,7 +1273,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 94,
+      index: 95,
       span: 4
     },
     {
@@ -1274,7 +1285,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 95,
+      index: 96,
       span: 4
     },
     {
@@ -1286,7 +1297,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 96,
+      index: 97,
       span: 4
     },
     {
@@ -1298,7 +1309,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 97,
+      index: 98,
       span: 4
     },
     {
@@ -1310,7 +1321,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 98,
+      index: 99,
       span: 4
     },
     {
@@ -1322,7 +1333,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 99,
+      index: 100,
       span: 4
     },
     {
@@ -1334,7 +1345,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 100,
+      index: 101,
       span: 4
     },
     {
@@ -1346,7 +1357,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 101,
+      index: 102,
       span: 4
     },
     {
@@ -1358,7 +1369,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 102,
+      index: 103,
       span: 4
     },
     {
@@ -1370,7 +1381,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 103,
+      index: 104,
       span: 4
     },
     {
@@ -1382,7 +1393,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 104,
+      index: 105,
       span: 4
     },
     {
@@ -1394,7 +1405,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 105,
+      index: 106,
       span: 4
     },
     {
@@ -1406,7 +1417,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 107,
       span: 4
     },
     {
@@ -1418,7 +1429,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 108,
       span: 4
     },
     {
@@ -1430,7 +1441,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 109,
       span: 4
     },
     {
@@ -1442,7 +1453,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 110,
       span: 4
     },
     {
@@ -1454,7 +1465,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 111,
       span: 4
     },
     {
@@ -1466,7 +1477,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 112,
       span: 4
     },
     {
@@ -1478,7 +1489,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 113,
       span: 4
     },
     {
@@ -1490,7 +1501,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 114,
       span: 4
     },
     {
@@ -1502,7 +1513,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 115,
       span: 4
     },
     {
@@ -1514,7 +1525,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 116,
       span: 4
     },
     {
@@ -1526,7 +1537,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 117,
       span: 4
     },
     {
@@ -1538,7 +1549,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 118,
       span: 4
     },
     {
@@ -1550,7 +1561,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 119,
       span: 4
     },
     {
@@ -1562,7 +1573,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 120,
       span: 4
     },
     {
@@ -1574,7 +1585,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 121,
       span: 4
     },
     {
@@ -1586,7 +1597,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 122,
       span: 4
     },
     {
@@ -1598,7 +1609,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 123,
       span: 4
     },
     {
@@ -1610,7 +1621,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 124,
       span: 4
     },
     {
@@ -1622,7 +1633,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 125,
       span: 4
     },
     {
@@ -1634,7 +1645,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 126,
       span: 4
     },
     {
@@ -1646,7 +1657,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 127,
       span: 4
     },
     {
@@ -1658,7 +1669,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 128,
       span: 4
     },
     {
@@ -1670,7 +1681,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 129,
       span: 4
     },
     {
@@ -1682,7 +1693,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 130,
       span: 4
     },
     {
@@ -1690,7 +1701,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 130,
+      index: 131,
       span: 4
     },
     {
@@ -1698,7 +1709,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 131,
+      index: 132,
       span: 4
     },
     {
@@ -1706,7 +1717,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 133,
       span: 4
     },
     {
@@ -1714,7 +1725,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 134,
       span: 4
     },
     {
@@ -1722,7 +1733,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 135,
       span: 4
     }
   ]

src/views/wel/home/tongjiSchool.vue

@@ -70,7 +70,7 @@
     </basic-container>
     <basic-container>
       <index-card
-        title="工资环比走势图"
+        title="工资总额环比走势图"
         iconName="el-icon-s-fold"
         style="height:500px;margin-bottom: 30px"
       >
@@ -108,7 +108,7 @@
     </basic-container>
     <basic-container>
       <index-card
-        title="工资同比走势图"
+        title="工资总额同比走势图"
         iconName="el-icon-s-fold"
         style="height:500px;margin-bottom: 30px"
       >