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

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -631,6 +631,17 @@ export default {
               }
             ]
           },
+           {
+            label: "装箱量",
+            prop: "ctn",
+            rules: [
+              {
+                required: false,
+                message: " ",
+                trigger: "blur"
+              }
+            ]
+          },
           {
             label: "包装描述",
             prop: "packageDescription",

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -2447,173 +2447,173 @@ export default {
       }
     },
     optionList: function() {
-      if (localStorage.getItem("roleName") == "GZXBKJ") {
-        this.optionList.column.forEach(el => {
-          el.disabled = true;
-        });
-        this.findObject(
-          this.optionList.column,
-          "salaryWithdrawalStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "rankWithdrawalStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "performanceAwardName"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "schoolAge").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "capitalIncreaseName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryBaseName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "workloadSalaryCritertion"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualWorkloadSalary"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "doubleCease").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualDoubleCease"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "dailyAssessmentCriteria"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualDailyAssessmentCriteria"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "termPerformanceSalaryName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "leadingCadreSubsidyName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessLeadingCadreSubsidyName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "prepareLessonsName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessPrepareLessonsName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teachingResearchName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teachingResearch"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessTeachingResearchName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teacherSubsidy"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "classes").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "adjustTheBalance"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "payrollCredit"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "paid").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teacherAssessSubsidy"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "wx").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "maternityLeaveSalary"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "inspectorFines"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "telephoneBill"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "learningPower"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "childbirthAllowance"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "androidIt").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "insuranceUnit"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "insurancePersonage"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "reservedFundsUnit"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "reservedFundsPersonage"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "personageTaxes"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryRemark"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "pauseNoPayRemark"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "remarks").disabled = false;
-        this.findObject(this.optionList.column, "remarksOne").disabled = false;
-        this.findObject(this.optionList.column, "discipline").disabled = false;
-        this.findObject(this.optionList.column, "itemType").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "positiveTime"
-        ).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;
-        this.findObject(this.optionList.column, "code").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "enjoyOfficeTreatment"
-        ).disabled = false;
-      }
+      // if (localStorage.getItem("roleName") == "GZXBKJ") {
+      //   this.optionList.column.forEach(el => {
+      //     el.disabled = true;
+      //   });
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryWithdrawalStandard"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "rankWithdrawalStandard"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "performanceAwardName"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "schoolAge").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "capitalIncreaseName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryStandard"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryBaseName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "workloadSalaryCritertion"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "virtualWorkloadSalary"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "doubleCease").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "virtualDoubleCease"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "dailyAssessmentCriteria"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "virtualDailyAssessmentCriteria"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "termPerformanceSalaryName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "leadingCadreSubsidyName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "assessLeadingCadreSubsidyName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "prepareLessonsName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "assessPrepareLessonsName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teachingResearchName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teachingResearch"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "assessTeachingResearchName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teacherSubsidy"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "classes").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "adjustTheBalance"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "payrollCredit"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "paid").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teacherAssessSubsidy"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "wx").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "maternityLeaveSalary"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "inspectorFines"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "telephoneBill"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "learningPower"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "childbirthAllowance"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "androidIt").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "insuranceUnit"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "insurancePersonage"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "reservedFundsUnit"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "reservedFundsPersonage"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "personageTaxes"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryRemark"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "pauseNoPayRemark"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "remarks").disabled = false;
+      //   this.findObject(this.optionList.column, "remarksOne").disabled = false;
+      //   this.findObject(this.optionList.column, "discipline").disabled = false;
+      //   this.findObject(this.optionList.column, "itemType").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "positiveTime"
+      //   ).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;
+      //   this.findObject(this.optionList.column, "code").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "enjoyOfficeTreatment"
+      //   ).disabled = false;
+      // }
       if (localStorage.getItem("roleName") == "GZGZGLY") {
         this.optionList.column.forEach(el => {
           el.disabled = true;

src/views/salaryManagement/highSchool/index.vue

@@ -87,116 +87,7 @@ export default {
         pageSize: 10,
         currentPage: 1
       },
-      option: {
-        searchShow: true,
-        searchMenuSpan: 16,
-        align: "center",
-        searchSpan: 8,
-        border: true,
-        index: true,
-        viewBtn: false,
-        editBtn: false,
-        delBtn: false,
-        menuWidth: 120,
-        tip: false,
-        selection: true,
-        searchIcon: true,
-        searchIndex: 2,
-        addBtnText: "新单",
-        stripe: true,
-        column: [
-          {
-            label: "年",
-            prop: "annual",
-            type: "year",
-            valueFormat: "yyyy",
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "月",
-            prop: "moon",
-            type: "select",
-            filterable: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=month",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "制单人",
-            prop: "createUser",
-            type: "select",
-            filterable: true,
-            dicUrl: "/api/blade-user/client/gainUser",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "制单日期",
-            prop: "createTime",
-            type: "date",
-            overHidden: true,
-            width: 200
-          },
-          {
-            label: "更新人",
-            prop: "updateUser",
-            overHidden: true,
-            width: 100
-          },
-          {
-            label: "更新日期",
-            prop: "updateTime",
-            type: "date",
-            overHidden: true,
-            width: 200
-          },
-          {
-            label: "状态",
-            prop: "status",
-            type: "select",
-            props: {
-              label: "name",
-              value: "code"
-            },
-            dicData: [
-              {
-                name: "录入",
-                code: 0
-              },
-              {
-                name: "申请审批",
-                code: 1
-              },
-              {
-                name: "审批中",
-                code: 2
-              },
-              {
-                name: "审批通过",
-                code: 3
-              }
-            ]
-          },
-          {
-            label: "备注",
-            prop: "remarks",
-            overHidden: true,
-            search: true
-          }
-        ]
-      }
+      option: {}
     };
   },
   async created() {

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

@@ -81,6 +81,13 @@ export const option = {
       width: 100
     },
     {
+      label: "工资金额",
+      prop: "amount",
+      overHidden: true,
+      index: 5,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -92,7 +99,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 5,
+      index: 6,
       search: true
     },
     {
@@ -100,14 +107,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 7,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 7,
+      index: 8,
       width: 100
     },
     {
@@ -115,14 +122,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 8,
+      index: 9,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 9,
+      index: 10,
       props: {
         label: "name",
         value: "code"
@@ -149,7 +156,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 10,
+      index: 11,
       search: true
     }
   ]
@@ -899,12 +906,11 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
-      
       index: 22,
       span: 4
     },
@@ -1128,7 +1134,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1165,7 +1171,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1298,7 +1304,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1431,7 +1437,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1588,7 +1594,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1697,7 +1703,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1890,7 +1896,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2107,7 +2113,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2168,7 +2174,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2193,7 +2199,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -2447,173 +2447,173 @@ export default {
       }
     },
     optionList: function() {
-      if (localStorage.getItem("roleName") == "CZXBKJ") {
-        this.optionList.column.forEach(el => {
-          el.disabled = true;
-        });
-        this.findObject(
-          this.optionList.column,
-          "salaryWithdrawalStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "rankWithdrawalStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "performanceAwardName"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "schoolAge").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "capitalIncreaseName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryBaseName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "workloadSalaryCritertion"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualWorkloadSalary"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "doubleCease").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualDoubleCease"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "dailyAssessmentCriteria"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualDailyAssessmentCriteria"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "termPerformanceSalaryName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "leadingCadreSubsidyName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessLeadingCadreSubsidyName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "prepareLessonsName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessPrepareLessonsName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teachingResearchName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teachingResearch"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessTeachingResearchName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teacherSubsidy"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "classes").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "adjustTheBalance"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "payrollCredit"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "paid").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teacherAssessSubsidy"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "wx").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "maternityLeaveSalary"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "inspectorFines"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "telephoneBill"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "learningPower"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "childbirthAllowance"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "androidIt").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "insuranceUnit"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "insurancePersonage"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "reservedFundsUnit"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "reservedFundsPersonage"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "personageTaxes"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryRemark"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "pauseNoPayRemark"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "remarks").disabled = false;
-        this.findObject(this.optionList.column, "remarksOne").disabled = false;
-        this.findObject(this.optionList.column, "discipline").disabled = false;
-        this.findObject(this.optionList.column, "itemType").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "positiveTime"
-        ).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;
-        this.findObject(this.optionList.column, "code").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "enjoyOfficeTreatment"
-        ).disabled = false;
-      }
+      // if (localStorage.getItem("roleName") == "CZXBKJ") {
+      //   this.optionList.column.forEach(el => {
+      //     el.disabled = true;
+      //   });
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryWithdrawalStandard"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "rankWithdrawalStandard"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "performanceAwardName"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "schoolAge").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "capitalIncreaseName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryStandard"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryBaseName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "workloadSalaryCritertion"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "virtualWorkloadSalary"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "doubleCease").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "virtualDoubleCease"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "dailyAssessmentCriteria"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "virtualDailyAssessmentCriteria"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "termPerformanceSalaryName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "leadingCadreSubsidyName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "assessLeadingCadreSubsidyName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "prepareLessonsName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "assessPrepareLessonsName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teachingResearchName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teachingResearch"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "assessTeachingResearchName"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teacherSubsidy"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "classes").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "adjustTheBalance"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "payrollCredit"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "paid").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "teacherAssessSubsidy"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "wx").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "maternityLeaveSalary"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "inspectorFines"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "telephoneBill"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "learningPower"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "childbirthAllowance"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "androidIt").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "insuranceUnit"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "insurancePersonage"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "reservedFundsUnit"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "reservedFundsPersonage"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "personageTaxes"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "salaryRemark"
+      //   ).disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "pauseNoPayRemark"
+      //   ).disabled = false;
+      //   this.findObject(this.optionList.column, "remarks").disabled = false;
+      //   this.findObject(this.optionList.column, "remarksOne").disabled = false;
+      //   this.findObject(this.optionList.column, "discipline").disabled = false;
+      //   this.findObject(this.optionList.column, "itemType").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "positiveTime"
+      //   ).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;
+      //   this.findObject(this.optionList.column, "code").disabled = false;
+      //   this.findObject(
+      //     this.optionList.column,
+      //     "enjoyOfficeTreatment"
+      //   ).disabled = false;
+      // }
       if (localStorage.getItem("roleName") == "CZGZGLY") {
         this.optionList.column.forEach(el => {
           el.disabled = true;

src/views/salaryManagement/juniorhighSchool/index.vue

@@ -87,116 +87,7 @@ export default {
         pageSize: 10,
         currentPage: 1
       },
-      option: {
-        searchShow: true,
-        searchMenuSpan: 16,
-        align: "center",
-        searchSpan: 8,
-        border: true,
-        index: true,
-        viewBtn: false,
-        editBtn: false,
-        delBtn: false,
-        menuWidth: 120,
-        tip: false,
-        selection: true,
-        searchIcon: true,
-        searchIndex: 2,
-        addBtnText: "新单",
-        stripe: true,
-        column: [
-          {
-            label: "年",
-            prop: "annual",
-            type: "year",
-            valueFormat: "yyyy",
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "月",
-            prop: "moon",
-            type: "select",
-            filterable: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=month",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "制单人",
-            prop: "createUser",
-            type: "select",
-            filterable: true,
-            dicUrl: "/api/blade-user/client/gainUser",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "制单日期",
-            prop: "createTime",
-            type: "date",
-            overHidden: true,
-            width: 200
-          },
-          {
-            label: "更新人",
-            prop: "updateUser",
-            overHidden: true,
-            width: 100
-          },
-          {
-            label: "更新日期",
-            prop: "updateTime",
-            type: "date",
-            overHidden: true,
-            width: 200
-          },
-          {
-            label: "状态",
-            prop: "status",
-            type: "select",
-            props: {
-              label: "name",
-              value: "code"
-            },
-            dicData: [
-              {
-                name: "录入",
-                code: 0
-              },
-              {
-                name: "申请审批",
-                code: 1
-              },
-              {
-                name: "审批中",
-                code: 2
-              },
-              {
-                name: "审批通过",
-                code: 3
-              }
-            ]
-          },
-          {
-            label: "备注",
-            prop: "remarks",
-            overHidden: true,
-            search: true
-          }
-        ]
-      }
+      option: {}
     };
   },
   async created() {
@@ -313,7 +204,7 @@ export default {
         });
       });
     },
-        async saveColumn() {
+    async saveColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(110),
         this.option
@@ -333,7 +224,6 @@ export default {
       if (inSave) {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
-          
         });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;

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

@@ -81,6 +81,13 @@ export const option = {
       width: 100
     },
     {
+      label: "工资金额",
+      prop: "amount",
+      overHidden: true,
+      index: 5,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -92,7 +99,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 5,
+      index: 6,
       search: true
     },
     {
@@ -100,14 +107,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 7,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 7,
+      index: 8,
       width: 100
     },
     {
@@ -115,14 +122,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 8,
+      index: 9,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 9,
+      index: 10,
       props: {
         label: "name",
         value: "code"
@@ -149,7 +156,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 10,
+      index: 11,
       search: true
     }
   ]
@@ -899,12 +906,11 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
-      
       index: 22,
       span: 4
     },
@@ -1128,7 +1134,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1165,7 +1171,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1298,7 +1304,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1431,7 +1437,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1588,7 +1594,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1697,7 +1703,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1890,7 +1896,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2107,7 +2113,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2168,7 +2174,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2193,7 +2199,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/logisticsDepartment/index.vue

@@ -87,116 +87,7 @@ export default {
         pageSize: 10,
         currentPage: 1
       },
-      option: {
-        searchShow: true,
-        searchMenuSpan: 16,
-        align: "center",
-        searchSpan: 8,
-        border: true,
-        index: true,
-        viewBtn: false,
-        editBtn: false,
-        delBtn: false,
-        menuWidth: 120,
-        tip: false,
-        selection: true,
-        searchIcon: true,
-        searchIndex: 2,
-        addBtnText: "新单",
-        stripe: true,
-        column: [
-          {
-            label: "年",
-            prop: "annual",
-            type: "year",
-            valueFormat: "yyyy",
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "月",
-            prop: "moon",
-            type: "select",
-            filterable: true,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=month",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "制单人",
-            prop: "createUser",
-            type: "select",
-            filterable: true,
-            dicUrl: "/api/blade-user/client/gainUser",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            overHidden: true,
-            width: 100,
-            search: true
-          },
-          {
-            label: "制单日期",
-            prop: "createTime",
-            type: "date",
-            overHidden: true,
-            width: 200
-          },
-          {
-            label: "更新人",
-            prop: "updateUser",
-            overHidden: true,
-            width: 100
-          },
-          {
-            label: "更新日期",
-            prop: "updateTime",
-            type: "date",
-            overHidden: true,
-            width: 200
-          },
-          {
-            label: "状态",
-            prop: "status",
-            type: "select",
-            props: {
-              label: "name",
-              value: "code"
-            },
-            dicData: [
-              {
-                name: "录入",
-                code: 0
-              },
-              {
-                name: "申请审批",
-                code: 1
-              },
-              {
-                name: "审批中",
-                code: 2
-              },
-              {
-                name: "审批通过",
-                code: 3
-              }
-            ]
-          },
-          {
-            label: "备注",
-            prop: "remarks",
-            overHidden: true,
-            search: true
-          }
-        ]
-      }
+      option: {}
     };
   },
   async created() {
@@ -313,7 +204,7 @@ export default {
         });
       });
     },
-        async saveColumn() {
+    async saveColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(114),
         this.option
@@ -333,7 +224,6 @@ export default {
       if (inSave) {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
-          
         });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;

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

@@ -81,6 +81,13 @@ export const option = {
       width: 100
     },
     {
+      label: "工资金额",
+      prop: "amount",
+      overHidden: true,
+      index: 5,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -92,7 +99,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 5,
+      index: 6,
       search: true
     },
     {
@@ -100,14 +107,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 7,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 7,
+      index: 8,
       width: 100
     },
     {
@@ -115,14 +122,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 8,
+      index: 9,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 9,
+      index: 10,
       props: {
         label: "name",
         value: "code"
@@ -149,7 +156,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 10,
+      index: 11,
       search: true
     }
   ]
@@ -899,12 +906,11 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
-      
       index: 22,
       span: 4
     },
@@ -1128,7 +1134,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1165,7 +1171,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1298,7 +1304,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1431,7 +1437,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1588,7 +1594,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1697,7 +1703,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1890,7 +1896,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2107,7 +2113,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2168,7 +2174,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2193,7 +2199,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -2460,173 +2460,173 @@ export default {
       }
     },
     optionList: function() {
-      if (localStorage.getItem("roleName") == "XXXBKJ") {
-        this.optionList.column.forEach(el => {
-          el.disabled = true;
-        });
-        this.findObject(
-          this.optionList.column,
-          "salaryWithdrawalStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "rankWithdrawalStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "performanceAwardName"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "schoolAge").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "capitalIncreaseName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryStandard"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryBaseName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "workloadSalaryCritertion"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualWorkloadSalary"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "doubleCease").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualDoubleCease"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "dailyAssessmentCriteria"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "virtualDailyAssessmentCriteria"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "termPerformanceSalaryName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "leadingCadreSubsidyName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessLeadingCadreSubsidyName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "prepareLessonsName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessPrepareLessonsName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teachingResearchName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teachingResearch"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "assessTeachingResearchName"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teacherSubsidy"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "classes").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "adjustTheBalance"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "payrollCredit"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "paid").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "teacherAssessSubsidy"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "wx").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "maternityLeaveSalary"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "inspectorFines"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "telephoneBill"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "learningPower"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "childbirthAllowance"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "androidIt").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "insuranceUnit"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "insurancePersonage"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "reservedFundsUnit"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "reservedFundsPersonage"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "personageTaxes"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "salaryRemark"
-        ).disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "pauseNoPayRemark"
-        ).disabled = false;
-        this.findObject(this.optionList.column, "remarks").disabled = false;
-        this.findObject(this.optionList.column, "remarksOne").disabled = false;
-        this.findObject(this.optionList.column, "discipline").disabled = false;
-        this.findObject(this.optionList.column, "itemType").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "positiveTime"
-        ).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;
-        this.findObject(this.optionList.column, "code").disabled = false;
-        this.findObject(
-          this.optionList.column,
-          "enjoyOfficeTreatment"
-        ).disabled = false;
-      }
+      // if (localStorage.getItem("roleName") == "XXXBKJ") {
+      //   this.optionList.column.forEach(el => {
+      //     el.disabled = true;
+      //   });
+        // this.findObject(
+        //   this.optionList.column,
+        //   "salaryWithdrawalStandard"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "rankWithdrawalStandard"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "performanceAwardName"
+        // ).disabled = false;
+        // this.findObject(this.optionList.column, "schoolAge").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "capitalIncreaseName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "salaryStandard"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "salaryBaseName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "workloadSalaryCritertion"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "virtualWorkloadSalary"
+        // ).disabled = false;
+        // this.findObject(this.optionList.column, "doubleCease").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "virtualDoubleCease"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "dailyAssessmentCriteria"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "virtualDailyAssessmentCriteria"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "termPerformanceSalaryName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "leadingCadreSubsidyName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "assessLeadingCadreSubsidyName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "prepareLessonsName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "assessPrepareLessonsName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "teachingResearchName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "teachingResearch"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "assessTeachingResearchName"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "teacherSubsidy"
+        // ).disabled = false;
+        // this.findObject(this.optionList.column, "classes").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "adjustTheBalance"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "payrollCredit"
+        // ).disabled = false;
+        // this.findObject(this.optionList.column, "paid").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "teacherAssessSubsidy"
+        // ).disabled = false;
+        // this.findObject(this.optionList.column, "wx").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "maternityLeaveSalary"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "inspectorFines"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "telephoneBill"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "learningPower"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "childbirthAllowance"
+        // ).disabled = false;
+        // this.findObject(this.optionList.column, "androidIt").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "insuranceUnit"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "insurancePersonage"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "reservedFundsUnit"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "reservedFundsPersonage"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "personageTaxes"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "salaryRemark"
+        // ).disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "pauseNoPayRemark"
+        // ).disabled = false;
+        // this.findObject(this.optionList.column, "remarks").disabled = false;
+        // this.findObject(this.optionList.column, "remarksOne").disabled = false;
+        // this.findObject(this.optionList.column, "discipline").disabled = false;
+        // this.findObject(this.optionList.column, "itemType").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "positiveTime"
+        // ).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;
+        // this.findObject(this.optionList.column, "code").disabled = false;
+        // this.findObject(
+        //   this.optionList.column,
+        //   "enjoyOfficeTreatment"
+        // ).disabled = false;
+      // }
       if (localStorage.getItem("roleName") == "XXGZGLY") {
         this.optionList.column.forEach(el => {
           el.disabled = true;

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

@@ -81,6 +81,13 @@ export const option = {
       width: 100
     },
     {
+      label: "工资金额",
+      prop: "amount",
+      overHidden: true,
+      index: 5,
+      width: 100
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -92,7 +99,7 @@ export const option = {
       },
       overHidden: true,
       width: 100,
-      index: 5,
+      index: 6,
       search: true
     },
     {
@@ -100,14 +107,14 @@ export const option = {
       prop: "createTime",
       type: "date",
       overHidden: true,
-      index: 6,
+      index: 7,
       width: 200
     },
     {
       label: "更新人",
       prop: "updateUser",
       overHidden: true,
-      index: 7,
+      index: 8,
       width: 100
     },
     {
@@ -115,14 +122,14 @@ export const option = {
       prop: "updateTime",
       type: "date",
       overHidden: true,
-      index: 8,
+      index: 9,
       width: 200
     },
     {
       label: "状态",
       prop: "status",
       type: "select",
-      index: 9,
+      index: 10,
       props: {
         label: "name",
         value: "code"
@@ -149,7 +156,7 @@ export const option = {
       label: "备注",
       prop: "remarks",
       overHidden: true,
-      index: 10,
+      index: 11,
       search: true
     }
   ]
@@ -899,12 +906,11 @@ export const optionList = {
       prop: "basicsSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
       }],
-      
       index: 22,
       span: 4
     },
@@ -1128,7 +1134,7 @@ export const optionList = {
       prop: "workloadSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1165,7 +1171,7 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1298,7 +1304,7 @@ export const optionList = {
       prop: "customizeFour",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1431,7 +1437,7 @@ export const optionList = {
       prop: "awardSalary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1588,7 +1594,7 @@ export const optionList = {
       prop: "dutyAllowances",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1697,7 +1703,7 @@ export const optionList = {
       prop: "classTeacherSubsidy",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -1890,7 +1896,7 @@ export const optionList = {
       prop: "subsidy",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2107,7 +2113,7 @@ export const optionList = {
       prop: "deductions",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2168,7 +2174,7 @@ export const optionList = {
       prop: "salary",
       width: 80,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"
@@ -2193,7 +2199,7 @@ export const optionList = {
       prop: "fSalary",
       width: 100,
       overHidden: true,
-      disabled:true,
+      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"