修改bug

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -963,6 +963,17 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template
+            slot="enjoyOfficeTreatmentForm"
+            slot-scope="{ column, disabled }"
+          >
+            <avue-radio
+              v-model="crudForm.enjoyOfficeTreatment"
+              :dic="dic"
+              :disabled="disabled"
+              @change="salaryAdd(crudForm)"
+            ></avue-radio>
+          </template>
           <template slot-scope="{ row, index }" slot="menu">
             <el-button
               type="text"
@@ -1168,6 +1179,16 @@ export default {
         ]
       },
       drawer: false,
+      dic: [
+        {
+          label: "是",
+          value: "是"
+        },
+        {
+          label: "否",
+          value: "否"
+        }
+      ],
       option: {
         menuBtn: false,
         labelWidth: 40,
@@ -1264,7 +1285,7 @@ export default {
           }
         ]
       },
-      optionList:{},
+      optionList: {},
       exportUrl: "/api/blade-school/salaryitem/export/workloadExcel",
       annexData: [],
       annexOption: {
@@ -1348,7 +1369,7 @@ export default {
       this.getDetail(this.detailData.id);
     }
     if (this.detailData.status == 1) {
-      this.option.disabled = true;
+      this.$set(this.option, "disabled", true);
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
@@ -1819,7 +1840,7 @@ export default {
         numCal(row.ribbonNine) +
         numCal(row.pauseNoPay);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险（个人部分）+公积金(个人部分）.. 大于800 保险（个人部分） 不加
-      if (row.insurancePersonage > 700) {
+      if (row.enjoyOfficeTreatment == "是") {
         row.salary =
           numCal(row.basicsSalary) +
           numCal(row.workloadSalary) +
@@ -2287,9 +2308,8 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
-               case "28":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/maternityPay";
+          case "28":
+            this.exportUrl = "/api/blade-school/salaryitem/export/maternityPay";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/maternityPay";
             this.findObject(
@@ -2298,8 +2318,7 @@ export default {
             ).disabled = false;
             break;
           case "29":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/woChenGeld";
+            this.exportUrl = "/api/blade-school/salaryitem/export/woChenGeld";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/woChenGeld";
             this.findObject(
@@ -2317,6 +2336,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "31":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/staffInformation";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/staffInformation";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -963,6 +963,17 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template
+            slot="enjoyOfficeTreatmentForm"
+            slot-scope="{ column, disabled }"
+          >
+            <avue-radio
+              v-model="crudForm.enjoyOfficeTreatment"
+              :dic="dic"
+              :disabled="disabled"
+              @change="salaryAdd(crudForm)"
+            ></avue-radio>
+          </template>
           <template slot-scope="{ row, index }" slot="menu">
             <el-button
               type="text"
@@ -1168,6 +1179,16 @@ export default {
         ]
       },
       drawer: false,
+      dic: [
+        {
+          label: "是",
+          value: "是"
+        },
+        {
+          label: "否",
+          value: "否"
+        }
+      ],
       option: {
         menuBtn: false,
         labelWidth: 40,
@@ -1264,7 +1285,7 @@ export default {
           }
         ]
       },
-      optionList:{},
+      optionList: {},
       exportUrl: "/api/blade-school/salaryitem/export/workloadExcel",
       annexData: [],
       annexOption: {
@@ -1339,7 +1360,7 @@ export default {
   components: {
     reportDialog
   },
-    async created() {
+  async created() {
     this.optionList = await this.getColumnData(
       this.getColumnName(111),
       optionList
@@ -1348,7 +1369,7 @@ export default {
       this.getDetail(this.detailData.id);
     }
     if (this.detailData.status == 1) {
-      this.option.disabled = true;
+      this.$set(this.option, "disabled", true);
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
@@ -1819,7 +1840,7 @@ export default {
         numCal(row.ribbonNine) +
         numCal(row.pauseNoPay);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险（个人部分）+公积金(个人部分）.. 大于800 保险（个人部分） 不加
-      if (row.insurancePersonage > 700) {
+      if (row.enjoyOfficeTreatment == "是") {
         row.salary =
           numCal(row.basicsSalary) +
           numCal(row.workloadSalary) +
@@ -1983,7 +2004,7 @@ export default {
         }=${getToken()}&pid=${this.form.id}`
       );
     },
-        async saveColumn() {
+    async saveColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(111),
         this.optionList
@@ -2287,9 +2308,8 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
-               case "28":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/maternityPay";
+          case "28":
+            this.exportUrl = "/api/blade-school/salaryitem/export/maternityPay";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/maternityPay";
             this.findObject(
@@ -2298,8 +2318,7 @@ export default {
             ).disabled = false;
             break;
           case "29":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/woChenGeld";
+            this.exportUrl = "/api/blade-school/salaryitem/export/woChenGeld";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/woChenGeld";
             this.findObject(
@@ -2317,6 +2336,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "31":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/staffInformation";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/staffInformation";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -963,6 +963,17 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template
+            slot="enjoyOfficeTreatmentForm"
+            slot-scope="{ column, disabled }"
+          >
+            <avue-radio
+              v-model="crudForm.enjoyOfficeTreatment"
+              :dic="dic"
+              :disabled="disabled"
+              @change="salaryAdd(crudForm)"
+            ></avue-radio>
+          </template>
           <template slot-scope="{ row, index }" slot="menu">
             <el-button
               type="text"
@@ -1168,6 +1179,16 @@ export default {
         ]
       },
       drawer: false,
+      dic: [
+        {
+          label: "是",
+          value: "是"
+        },
+        {
+          label: "否",
+          value: "否"
+        }
+      ],
       option: {
         menuBtn: false,
         labelWidth: 40,
@@ -1203,22 +1224,7 @@ export default {
                 message: "",
                 trigger: "blur"
               }
-            ],
-            change: ({ value }) => {
-              if (value) {
-                this.optionList.column.forEach(e => {
-                  if (e.prop == "monthHour") {
-                    e.label = value + "月份工作量";
-                  }
-                  if (e.prop == "monthPrice") {
-                    e.label = value + "月课时费";
-                  }
-                  if (e.prop == "momthWorkloadSalary") {
-                    e.label = value + "月工作量工资";
-                  }
-                });
-              }
-            }
+            ]
           },
           {
             label: "人数",
@@ -1264,7 +1270,7 @@ export default {
           }
         ]
       },
-      optionList:{},
+      optionList: {},
       exportUrl: "/api/blade-school/salaryitem/export/workloadExcel",
       annexData: [],
       annexOption: {
@@ -1339,7 +1345,7 @@ export default {
   components: {
     reportDialog
   },
-    async created() {
+  async created() {
     this.optionList = await this.getColumnData(
       this.getColumnName(115),
       optionList
@@ -1348,7 +1354,7 @@ export default {
       this.getDetail(this.detailData.id);
     }
     if (this.detailData.status == 1) {
-      this.option.disabled = true;
+      this.$set(this.option, "disabled", true);
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
@@ -1819,7 +1825,7 @@ export default {
         numCal(row.ribbonNine) +
         numCal(row.pauseNoPay);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险（个人部分）+公积金(个人部分）.. 大于800 保险（个人部分） 不加
-      if (row.insurancePersonage > 700) {
+      if (row.enjoyOfficeTreatment == "是") {
         row.salary =
           numCal(row.basicsSalary) +
           numCal(row.workloadSalary) +
@@ -2287,9 +2293,8 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
-               case "28":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/maternityPay";
+          case "28":
+            this.exportUrl = "/api/blade-school/salaryitem/export/maternityPay";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/maternityPay";
             this.findObject(
@@ -2298,8 +2303,7 @@ export default {
             ).disabled = false;
             break;
           case "29":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/woChenGeld";
+            this.exportUrl = "/api/blade-school/salaryitem/export/woChenGeld";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/woChenGeld";
             this.findObject(
@@ -2317,6 +2321,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "31":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/staffInformation";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/staffInformation";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -966,7 +966,17 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-
+          <template
+            slot="enjoyOfficeTreatmentForm"
+            slot-scope="{ column, disabled }"
+          >
+            <avue-radio
+              v-model="crudForm.enjoyOfficeTreatment"
+              :dic="dic"
+              :disabled="disabled"
+              @change="salaryAdd(crudForm)"
+            ></avue-radio>
+          </template>
           <template slot-scope="{ row, index }" slot="menu">
             <el-button
               type="text"
@@ -1172,6 +1182,16 @@ export default {
         ]
       },
       drawer: false,
+      dic: [
+        {
+          label: "是",
+          value: "是"
+        },
+        {
+          label: "否",
+          value: "否"
+        }
+      ],
       option: {
         menuBtn: false,
         labelWidth: 40,
@@ -1207,22 +1227,7 @@ export default {
                 message: "",
                 trigger: "blur"
               }
-            ],
-            change: ({ value }) => {
-              if (value) {
-                this.optionList.column.forEach(e => {
-                  if (e.prop == "monthHour") {
-                    e.label = value + "月份工作量";
-                  }
-                  if (e.prop == "monthPrice") {
-                    e.label = value + "月课时费";
-                  }
-                  if (e.prop == "momthWorkloadSalary") {
-                    e.label = value + "月工作量工资";
-                  }
-                });
-              }
-            }
+            ]
           },
           {
             label: "人数",
@@ -1352,7 +1357,7 @@ export default {
       this.getDetail(this.detailData.id);
     }
     if (this.detailData.status == 1) {
-      this.option.disabled = true;
+      this.$set(this.option, "disabled", true);
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
@@ -1822,7 +1827,7 @@ export default {
         numCal(row.ribbonNine) +
         numCal(row.pauseNoPay);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险（个人部分）+公积金(个人部分）.. 大于800 保险（个人部分） 不加
-      if (row.insurancePersonage > 700) {
+      if (row.enjoyOfficeTreatment == "是") {
         row.salary =
           numCal(row.basicsSalary) +
           numCal(row.workloadSalary) +
@@ -2291,8 +2296,7 @@ export default {
             ).disabled = false;
             break;
           case "28":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/maternityPay";
+            this.exportUrl = "/api/blade-school/salaryitem/export/maternityPay";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/maternityPay";
             this.findObject(
@@ -2301,8 +2305,7 @@ export default {
             ).disabled = false;
             break;
           case "29":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/woChenGeld";
+            this.exportUrl = "/api/blade-school/salaryitem/export/woChenGeld";
             this.findObject(this.excelOption.column, "excelFile").action =
               "/api/blade-school/salaryitem/import/woChenGeld";
             this.findObject(
@@ -2320,6 +2323,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "31":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/staffInformation";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/staffInformation";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,