Merge remote-tracking branch 'origin/dev' into dev

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -10,7 +10,7 @@
           >返回列表
         </el-button>
       </div>
-      <div class="add-customer-btn">
+      <div class="add-customer-btn" v-if="permission.highSchool_edit">
         <el-button
           type="primary"
           size="small"
@@ -1105,6 +1105,7 @@ import {
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
+import { mapGetters } from "vuex";
 export default {
   name: "detailsPage",
   data() {
@@ -2445,6 +2446,9 @@ export default {
         this.findObject(this.excelOption.column, "excelFile").disabled = true;
       }
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

src/views/salaryManagement/highSchool/index.vue

@@ -44,6 +44,7 @@
             size="small"
             @click.stop="rowDel(row, index)"
             :disabled="row.status > 0"
+            v-if="permission.highSchool_edit"
           >
             删除
           </el-button>
@@ -68,6 +69,7 @@ import {
   remove,
   gainUser
 } from "@/api/salaryManagement/primarySchool";
+import { mapGetters } from "vuex";
 export default {
   name: "index",
   components: {
@@ -347,6 +349,9 @@ export default {
       this.onLoad(this.page, this.search);
       this.isShow = true;
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

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

@@ -899,10 +899,12 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
+      
       index: 22,
       span: 4
     },
@@ -1126,6 +1128,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1162,6 +1165,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1294,6 +1298,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1426,6 +1431,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1582,6 +1588,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1690,6 +1697,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1882,6 +1890,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2098,6 +2107,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2158,6 +2168,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2182,6 +2193,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -10,7 +10,7 @@
           >返回列表
         </el-button>
       </div>
-      <div class="add-customer-btn">
+      <div class="add-customer-btn" v-if="permission.juniorhighSchool_edit">
         <el-button
           type="primary"
           size="small"
@@ -1105,6 +1105,7 @@ import {
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
+import { mapGetters } from "vuex";
 export default {
   name: "detailsPage",
   data() {
@@ -2445,6 +2446,9 @@ export default {
         this.findObject(this.excelOption.column, "excelFile").disabled = true;
       }
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

src/views/salaryManagement/juniorhighSchool/index.vue

@@ -44,6 +44,7 @@
             size="small"
             @click.stop="rowDel(row, index)"
             :disabled="row.status > 0"
+            v-if="permission.juniorhighSchool_edit"
           >
             删除
           </el-button>
@@ -68,6 +69,7 @@ import {
   remove,
   gainUser
 } from "@/api/salaryManagement/primarySchool";
+import { mapGetters } from "vuex";
 export default {
   name: "index",
   components: {
@@ -348,6 +350,9 @@ export default {
       this.onLoad(this.page, this.search);
       this.isShow = true;
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

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

@@ -899,10 +899,12 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
+      
       index: 22,
       span: 4
     },
@@ -1126,6 +1128,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1162,6 +1165,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1294,6 +1298,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1426,6 +1431,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1582,6 +1588,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1690,6 +1697,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1882,6 +1890,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2098,6 +2107,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2158,6 +2168,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2182,6 +2193,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -10,7 +10,7 @@
           >返回列表
         </el-button>
       </div>
-      <div class="add-customer-btn">
+      <div class="add-customer-btn" v-if="permission.logisticsDepartment_edit">
         <el-button
           type="primary"
           size="small"
@@ -1105,6 +1105,7 @@ import {
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
+import { mapGetters } from "vuex";
 export default {
   name: "detailsPage",
   data() {
@@ -2445,6 +2446,9 @@ export default {
         this.findObject(this.excelOption.column, "excelFile").disabled = true;
       }
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

src/views/salaryManagement/logisticsDepartment/index.vue

@@ -44,6 +44,7 @@
             size="small"
             @click.stop="rowDel(row, index)"
             :disabled="row.status > 0"
+            v-if="permission.logisticsDepartment_edit"
           >
             删除
           </el-button>
@@ -68,6 +69,7 @@ import {
   remove,
   gainUser
 } from "@/api/salaryManagement/primarySchool";
+import { mapGetters } from "vuex";
 export default {
   name: "index",
   components: {
@@ -348,6 +350,9 @@ export default {
       this.onLoad(this.page, this.search);
       this.isShow = true;
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

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

@@ -899,10 +899,12 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
+      
       index: 22,
       span: 4
     },
@@ -1126,6 +1128,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1162,6 +1165,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1294,6 +1298,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1426,6 +1431,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1582,6 +1588,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1690,6 +1697,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1882,6 +1890,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2098,6 +2107,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2158,6 +2168,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2182,6 +2193,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -10,7 +10,7 @@
           >返回列表
         </el-button>
       </div>
-      <div class="add-customer-btn">
+      <div class="add-customer-btn" v-if="permission.primary_edit">
         <el-button
           type="primary"
           size="small"
@@ -1108,6 +1108,7 @@ import {
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
+import { mapGetters } from "vuex";
 export default {
   name: "detailsPage",
   data() {
@@ -2448,6 +2449,9 @@ export default {
         this.findObject(this.excelOption.column, "excelFile").disabled = true;
       }
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

src/views/salaryManagement/primarySchool/index.vue

@@ -47,6 +47,7 @@
             size="small"
             @click.stop="rowDel(row, index)"
             :disabled="row.status > 0"
+            v-if="permission.primary_edit"
           >
             删除
           </el-button>
@@ -71,6 +72,7 @@ import {
   remove,
   gainUser
 } from "@/api/salaryManagement/primarySchool";
+import { mapGetters } from "vuex";
 export default {
   name: "index",
   components: {
@@ -241,6 +243,9 @@ export default {
       this.onLoad(this.page, this.search);
       this.isShow = true;
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

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

@@ -899,10 +899,12 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
+      
       index: 22,
       span: 4
     },
@@ -1126,6 +1128,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1162,6 +1165,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1294,6 +1298,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1426,6 +1431,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1582,6 +1588,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1690,6 +1697,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1882,6 +1890,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2098,6 +2107,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2158,6 +2168,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2182,6 +2193,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
+      disabled:true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"