Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -2573,6 +2573,14 @@ export default {
       //     this.optionList.column,
       //     "positiveTime"
       //   ).disabled = false;
+      //       this.findObject(
+      //   this.optionList.column,
+      //   "virtualDailyAssessmentCriteria"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "dailyAssessmentSalary"
+      // ).disabled = false;
       //   this.findObject(this.optionList.column, "position").disabled = false;
       //   this.findObject(this.optionList.column, "cname").disabled = false;
       //   this.findObject(this.optionList.column, "idNumber").disabled = false;
@@ -2620,6 +2628,14 @@ export default {
           this.optionList.column,
           "rankSalaryName"
         ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "virtualDailyAssessmentCriteria"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dailyAssessmentSalary"
+        ).disabled = false;
         this.findObject(this.optionList.column, "rankSalary").disabled = false;
         this.findObject(this.optionList.column, "salaryBase").disabled = false;
         this.findObject(this.optionList.column, "monthHour").disabled = false;

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -2573,6 +2573,14 @@ export default {
       //     this.optionList.column,
       //     "positiveTime"
       //   ).disabled = false;
+      //       this.findObject(
+      //   this.optionList.column,
+      //   "virtualDailyAssessmentCriteria"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "dailyAssessmentSalary"
+      // ).disabled = false;
       //   this.findObject(this.optionList.column, "position").disabled = false;
       //   this.findObject(this.optionList.column, "cname").disabled = false;
       //   this.findObject(this.optionList.column, "idNumber").disabled = false;
@@ -2620,6 +2628,14 @@ export default {
           this.optionList.column,
           "rankSalaryName"
         ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "virtualDailyAssessmentCriteria"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dailyAssessmentSalary"
+        ).disabled = false;
         this.findObject(this.optionList.column, "rankSalary").disabled = false;
         this.findObject(this.optionList.column, "salaryBase").disabled = false;
         this.findObject(this.optionList.column, "monthHour").disabled = false;

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -2586,6 +2586,14 @@ export default {
       //   this.optionList.column,
       //   "positiveTime"
       // ).disabled = false;
+      //       this.findObject(
+      //   this.optionList.column,
+      //   "virtualDailyAssessmentCriteria"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "dailyAssessmentSalary"
+      // ).disabled = false;
       // this.findObject(this.optionList.column, "position").disabled = false;
       // this.findObject(this.optionList.column, "cname").disabled = false;
       // this.findObject(this.optionList.column, "idNumber").disabled = false;
@@ -2788,6 +2796,14 @@ export default {
           this.optionList.column,
           "dormitoryManagementFee"
         ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "virtualDailyAssessmentCriteria"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dailyAssessmentSalary"
+        ).disabled = false;
         this.findObject(this.optionList.column, "ribbonOne").disabled = false;
         this.findObject(this.optionList.column, "ribbonTwo").disabled = false;
         this.findObject(this.optionList.column, "ribbonThree").disabled = false;