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

src/page/index/top/top-notice.vue

@@ -30,6 +30,7 @@
 
 <script>
   import { getMsgLogs , getMsgDetail,getMessage } from "@/api/logs";
+  import { getToken } from "@/util/auth";
 export default {
   name: "top-notice",
   data () {
@@ -110,10 +111,13 @@ export default {
       console.log("socket已经关闭")
     },
     assistMessage(){
-      //辅助消息接口
-      getMessage().then(res=>{
-        this.getMessage(JSON.stringify(res))
-      })
+      // 判断是否有token
+      if (getToken() !== undefined) {
+        //辅助消息接口
+        getMessage().then(res=>{
+          this.getMessage(JSON.stringify(res))
+        })
+      }
     },
     goUrl(row){
       if(row.url){

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/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -46,6 +46,11 @@
     {
       "name": "containerVolume",
       "type": "sum"
+    },
+    {
+      "name": "actualQuantity",
+      "type": "sum",
+      "decimals": 0
     }
   ],
   "column":[

src/views/businessManagement/receipt/configuration/customerContact.json

@@ -32,6 +32,16 @@
       "type": "sum"
     },
     {
+      "name": "actualQuantity",
+      "type": "sum",
+      "decimals": 0
+    },
+    {
+      "name": "purchaseQuantity",
+      "type": "sum",
+      "decimals": 0
+    },
+    {
       "name": "actualWeight",
       "type": "sum"
     },

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -3378,11 +3378,11 @@ export default {
             }
             // 订货数量合计
             if (item.property == "orderQuantity") {
-              sums[index] = orderQuantitySum ? orderQuantitySum.toFixed(2) : "0.00";
+              sums[index] = orderQuantitySum ? orderQuantitySum.toFixed(0) : "0";
             }
             // 发货数量合计
             if (item.property == "actualQuantity") {
-              sums[index] = actualQuantitySum ? actualQuantitySum.toFixed(2) : "0.00";
+              sums[index] = actualQuantitySum ? actualQuantitySum.toFixed(0) : "0";
             }
             // 金额合计
             if (item.property == "amount") {

src/views/dealer/purchase/detail.vue

@@ -142,6 +142,7 @@
                 type="primary"
                 size="small"
                 icon="el-icon-upload"
+                :disabled="disabled || confirmDisabled"
               >导 入</el-button>
             </el-upload>
           </template>
@@ -1332,6 +1333,7 @@ export default {
       res.data.forEach(item => {
       })
       this.dataList = this.dataList.concat(res.data)
+      this.$message.success('导入成功')
     },
     uploadError(err, file, fileList) {
       this.openFullScreen(true)

src/views/dealer/purchaseContract/detail.vue

@@ -167,6 +167,7 @@
                 type="primary"
                 size="small"
                 icon="el-icon-upload"
+                :disabled="disabled || confirmDisabled || checkDisabled"
               >导 入</el-button>
             </el-upload>
           </template>
@@ -1404,6 +1405,7 @@ export default {
       res.data.forEach(item => {
       })
       this.dataList = this.dataList.concat(res.data)
+      this.$message.success('导入成功')
     },
     uploadError(err, file, fileList) {
       this.openFullScreen(true)

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -2445,6 +2445,379 @@ export default {
       } else {
         this.findObject(this.excelOption.column, "excelFile").disabled = true;
       }
+    },
+    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") == "GZGZGLY") {
+        this.optionList.column.forEach(el => {
+          el.disabled = true;
+        });
+        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;
+        this.findObject(
+          this.optionList.column,
+          "performanceAward"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "schoolAgeSalary"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "capitalIncrease"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "educationSalary"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "rankSalaryName"
+        ).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;
+        this.findObject(this.optionList.column, "monthPrice").disabled = false;
+        this.findObject(this.optionList.column, "custom").disabled = false;
+        this.findObject(this.optionList.column, "customOne").disabled = false;
+        this.findObject(this.optionList.column, "doubleHour").disabled = false;
+        this.findObject(this.optionList.column, "doublePrice").disabled = false;
+        this.findObject(this.optionList.column, "customThree").disabled = false;
+        this.findObject(this.optionList.column, "customFour").disabled = false;
+        this.findObject(this.optionList.column, "customFive").disabled = false;
+        this.findObject(this.optionList.column, "customSix").disabled = false;
+        this.findObject(this.optionList.column, "customSeven").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dailyAssessmentCriteria"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "pauseNoPayTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "performanceGrade"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "customNine").disabled = false;
+        this.findObject(this.optionList.column, "customize").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeOne"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeThree"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "customAward").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardOne"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardThree"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardFour"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardFive"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardSix"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardSeven"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardEight"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardNine"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "leadingCadreSubsidy"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeFive"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "prepareLessons"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeSix"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "teachingResearch"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeSeven"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "classTeacherFee"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeEight"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeNine"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "ribbon").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "yearUpPerformance"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "yearDownPerformance"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "cadreAllowanceReservation"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "vacationOvertimePay"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "newPostTrain"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "winningPrize"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "classMinister"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "monthViceClassFee"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "safetyFees").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "reserveReplacement"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "attendance").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dormitoryManagementFee"
+        ).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;
+        this.findObject(this.optionList.column, "ribbonFour").disabled = false;
+        this.findObject(this.optionList.column, "ribbonFive").disabled = false;
+        this.findObject(this.optionList.column, "ribbonSix").disabled = false;
+        this.findObject(this.optionList.column, "ribbonSeven").disabled = false;
+        this.findObject(this.optionList.column, "ribbonEight").disabled = false;
+        this.findObject(this.optionList.column, "ribbonNine").disabled = false;
+        this.findObject(this.optionList.column, "pauseNoPay").disabled = false;
+      }
     }
   },
   computed: {

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

@@ -2445,6 +2445,379 @@ export default {
       } else {
         this.findObject(this.excelOption.column, "excelFile").disabled = true;
       }
+    },
+    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") == "CZGZGLY") {
+        this.optionList.column.forEach(el => {
+          el.disabled = true;
+        });
+        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;
+        this.findObject(
+          this.optionList.column,
+          "performanceAward"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "schoolAgeSalary"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "capitalIncrease"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "educationSalary"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "rankSalaryName"
+        ).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;
+        this.findObject(this.optionList.column, "monthPrice").disabled = false;
+        this.findObject(this.optionList.column, "custom").disabled = false;
+        this.findObject(this.optionList.column, "customOne").disabled = false;
+        this.findObject(this.optionList.column, "doubleHour").disabled = false;
+        this.findObject(this.optionList.column, "doublePrice").disabled = false;
+        this.findObject(this.optionList.column, "customThree").disabled = false;
+        this.findObject(this.optionList.column, "customFour").disabled = false;
+        this.findObject(this.optionList.column, "customFive").disabled = false;
+        this.findObject(this.optionList.column, "customSix").disabled = false;
+        this.findObject(this.optionList.column, "customSeven").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dailyAssessmentCriteria"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "pauseNoPayTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "performanceGrade"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "customNine").disabled = false;
+        this.findObject(this.optionList.column, "customize").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeOne"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeThree"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "customAward").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardOne"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardThree"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardFour"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardFive"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardSix"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardSeven"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardEight"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardNine"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "leadingCadreSubsidy"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeFive"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "prepareLessons"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeSix"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "teachingResearch"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeSeven"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "classTeacherFee"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeEight"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeNine"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "ribbon").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "yearUpPerformance"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "yearDownPerformance"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "cadreAllowanceReservation"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "vacationOvertimePay"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "newPostTrain"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "winningPrize"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "classMinister"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "monthViceClassFee"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "safetyFees").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "reserveReplacement"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "attendance").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dormitoryManagementFee"
+        ).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;
+        this.findObject(this.optionList.column, "ribbonFour").disabled = false;
+        this.findObject(this.optionList.column, "ribbonFive").disabled = false;
+        this.findObject(this.optionList.column, "ribbonSix").disabled = false;
+        this.findObject(this.optionList.column, "ribbonSeven").disabled = false;
+        this.findObject(this.optionList.column, "ribbonEight").disabled = false;
+        this.findObject(this.optionList.column, "ribbonNine").disabled = false;
+        this.findObject(this.optionList.column, "pauseNoPay").disabled = false;
+      }
     }
   },
   computed: {

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

@@ -1379,7 +1379,6 @@ export default {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
-    console.log(this.detailData);
     if (this.detailData.status == 1) {
       this.$set(this.option, "disabled", true);
     }
@@ -1391,6 +1390,17 @@ export default {
     this.annexOption.height = 450;
   },
   methods: {
+    // getOption() {
+    //   let roleName = localStorage.getItem("roleName")
+    //     ? localStorage.getItem("roleName").split(",")
+    //     : [];
+    //   if (roleName.find(el => el == "admin") == "XBKJ") {
+    //     this.optionList.column.forEach(el => {
+    //       el.disabled = true;
+    //     });
+    //     // this.findObject(this.option.column, "salaryWithdrawalStandard").disabled = false;
+    //   }
+    // },
     getTime() {
       setInterval(() => {
         this.time = dateFormat(new Date());
@@ -2448,6 +2458,379 @@ export default {
       } else {
         this.findObject(this.excelOption.column, "excelFile").disabled = true;
       }
+    },
+    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") == "XXGZGLY") {
+        this.optionList.column.forEach(el => {
+          el.disabled = true;
+        });
+        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;
+        this.findObject(
+          this.optionList.column,
+          "performanceAward"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "schoolAgeSalary"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "capitalIncrease"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "educationSalary"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "rankSalaryName"
+        ).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;
+        this.findObject(this.optionList.column, "monthPrice").disabled = false;
+        this.findObject(this.optionList.column, "custom").disabled = false;
+        this.findObject(this.optionList.column, "customOne").disabled = false;
+        this.findObject(this.optionList.column, "doubleHour").disabled = false;
+        this.findObject(this.optionList.column, "doublePrice").disabled = false;
+        this.findObject(this.optionList.column, "customThree").disabled = false;
+        this.findObject(this.optionList.column, "customFour").disabled = false;
+        this.findObject(this.optionList.column, "customFive").disabled = false;
+        this.findObject(this.optionList.column, "customSix").disabled = false;
+        this.findObject(this.optionList.column, "customSeven").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dailyAssessmentCriteria"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "pauseNoPayTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "performanceGrade"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "customNine").disabled = false;
+        this.findObject(this.optionList.column, "customize").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeOne"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeThree"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "customAward").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardOne"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardTwo"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardThree"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardFour"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardFive"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardSix"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardSeven"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardEight"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customAwardNine"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "leadingCadreSubsidy"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeFive"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "prepareLessons"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeSix"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "teachingResearch"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeSeven"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "classTeacherFee"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeEight"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "customizeNine"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "ribbon").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "yearUpPerformance"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "yearDownPerformance"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "cadreAllowanceReservation"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "vacationOvertimePay"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "newPostTrain"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "winningPrize"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "classMinister"
+        ).disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "monthViceClassFee"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "safetyFees").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "reserveReplacement"
+        ).disabled = false;
+        this.findObject(this.optionList.column, "attendance").disabled = false;
+        this.findObject(
+          this.optionList.column,
+          "dormitoryManagementFee"
+        ).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;
+        this.findObject(this.optionList.column, "ribbonFour").disabled = false;
+        this.findObject(this.optionList.column, "ribbonFive").disabled = false;
+        this.findObject(this.optionList.column, "ribbonSix").disabled = false;
+        this.findObject(this.optionList.column, "ribbonSeven").disabled = false;
+        this.findObject(this.optionList.column, "ribbonEight").disabled = false;
+        this.findObject(this.optionList.column, "ribbonNine").disabled = false;
+        this.findObject(this.optionList.column, "pauseNoPay").disabled = false;
+      }
     }
   },
   computed: {

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"

src/views/workManagement/handoverSheet/detail.vue

@@ -111,6 +111,25 @@
               ></el-option>
             </el-select>
           </template>
+          <template slot="handingUserName">
+            <el-select
+              v-model="form.handingUserName"
+              filterable
+              clearable
+              allow-create
+              default-first-option
+              size="small"
+              placeholder="请选择"
+              :disabled="disabled || checkDisabled || form.chargeStatus == 0 || confirmDisabled"
+            >
+              <el-option
+                v-for="(item,index) in userList"
+                :key="index"
+                :label="item.realName"
+                :value="item.realName"
+              ></el-option>
+            </el-select>
+          </template>
           <template slot="external">
             <el-switch
               v-model="form.external"
@@ -328,7 +347,7 @@ export default {
   data() {
     const validateHandingUser = (rule, value, callback) => {
       if (this.form.chargeStatus == 1 && !this.form.handingUser) {
-        callback(new Error('接手人不能为空'))
+        callback(new Error('接收人不能为空'))
       } else {
         callback()
       }
@@ -392,7 +411,7 @@ export default {
             span: 8,
           },
           {
-            label: "接手人",
+            label: "接收人",
             prop: "handingUser",
             span: 8,
             rules: [
@@ -738,9 +757,9 @@ export default {
     chargeStatusChange(data) {
       if (data === 0) this.form.handingUser = null;
     },
-    // 接手人选择触发
+    // 接收人选择触发
     handingUserChange(data) {
-      this.$set(this.form, 'handingUserName', this.userList.find(item => data == item.id).realName);
+      this.$set(this.form, 'handingUserName', this.userList.find(item => data == item.id)? this.userList.find(item => data == item.id).realName: null);
     },
     // 提交确认
     submitConfirm() {

src/views/workManagement/handoverSheet/index.vue

@@ -144,7 +144,7 @@ export default {
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false)
       })
-      let queryParams = Object.assign({}, params, {
+      let queryParams = Object.assign({}, this.search, params, {
         size: page.pageSize,
         current: page.currentPage,
       })