修改bug

src/api/basicData/facultyManagement.js

@@ -44,4 +44,14 @@ export function delItem(data) {
       ids: data
     }
   })
+}
+//重新计算
+export function calculate(id) {
+  return request({
+    url: '/api/blade-client/schoolteacher/calculate',
+    method: 'post',
+    data:{
+      id:id
+    }
+  })
 }

src/components/part-dialog/main.vue

@@ -86,6 +86,7 @@
 <script>
 import option from "./configuration/mainList.json";
 import { micrometerFormat } from "@/util/validate";
+import { costCal } from "@/util/calculate";
 import priceLibrary from "@/components/price-Library/main";
 import { delItem } from "@/api/exportTrade/part";
 import _ from "lodash";
@@ -217,7 +218,7 @@ export default {
               item.goodName = e.cname;
               item.ename = e.ename;
               item.price = e.purchaseAmount;
-              item.partsCost = e.price;
+              item.partsCost = costCal(e.price,e.taxRate);
               item.goodNumber = this.partreData.goodNumber;
               item.amout = _.multiply(
                 Number(
@@ -242,7 +243,7 @@ export default {
             price: e.purchaseAmount,
             goodNumber: 1,
             amout: e.purchaseAmount,
-            partsCost: e.price,
+            partsCost: costCal(e.price,e.taxRate),
             $cellEdit: true
           });
         });

src/router/views/index.js

@@ -781,6 +781,32 @@ export default [{
     }]
   },
   {
+    path: '/salaryManagement/highSchool/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/salaryManagement/highSchool/index',
+      name: '高中部',
+      meta: {
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/salaryManagement/highSchool/index')
+    }]
+  },
+  {
+    path: '/salaryManagement/logisticsDepartment/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/salaryManagement/logisticsDepartment/index',
+      name: '后勤部',
+      meta: {
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/salaryManagement/logisticsDepartment/index')
+    }]
+  },
+  {
     path: '/system/businessLock/index',
     component: Layout,
     hidden: true,

src/util/calculate.js

@@ -5,7 +5,6 @@ export function costCal(num, num2) {
   const price = Number(num ? num : 0)
   //税率
   const rate = Number(num2 ? num2 : 0)
-  console.log(_.divide(_.add(1, rate), 100))
   const sum = _.divide(price, _.add(1, _.divide(rate, 100)))
   return Number(sum).toFixed(2)
 }

src/views/approveData/configuration/mainList2.json

@@ -0,0 +1,100 @@
+{
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 24,
+  "dialogWidth": "60%",
+  "align": "center",
+  "height": "auto",
+  "searchSpan": 8,
+  "searchMenuPosition": "right",
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 180,
+  "stripe": true,
+  "dialogClickModal": false,
+  "searchLabelWidth": 120,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "addBtn":false,
+  "headerAlign": "center",
+  "column": [
+    {
+      "label": "业务类型",
+      "prop": "processType",
+      "type": "select",
+      "hide": true,
+      "dicData": [
+        {
+          "label": "小学部工资审批",
+          "value": "小学部工资审批"
+        },
+        {
+          "label": "初中部工资审批",
+          "value": "初中部工资审批"
+        },
+        {
+          "label": "高中部工资审批",
+          "value": "高中部工资审批"
+        },
+        {
+          "label": "后勤部工资审批",
+          "value": "后勤部工资审批"
+        }
+      ],
+      "search": true,
+      "overHidden": true,
+      "width": 200,
+      "index": 1
+    },
+    {
+      "label": "业务类型",
+      "prop": "checkType",
+      "search": false,
+      "overHidden": true,
+      "width": 180,
+      "index": 2
+    },
+    {
+      "label": "审核状态",
+      "prop": "auditStatus",
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=auditStatus",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "search": true,
+      "searchValue": "S",
+      "overHidden": true,
+      "width": 200,
+      "index": 3
+    },
+    {
+      "label": "申请人",
+      "prop": "sendName",
+      "overHidden": true,
+      "search": true,
+      "index": 7,
+      "width": 150
+    },
+    {
+      "label": "申请日期",
+      "prop": "sendTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "overHidden": true,
+      "index": 8,
+      "width":200
+    }
+  ]
+}

src/views/approveData/index.vue

@@ -1,20 +1,22 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :data="dataList"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               :search.sync="search"
-               :table-loading="loading"
-               :cell-style="cellStyle"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      :data="dataList"
+      ref="crud"
+      v-model="form"
+      :page.sync="page"
+      :search.sync="search"
+      :table-loading="loading"
+      :cell-style="cellStyle"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template slot="corpsIdSearch">
         <select-component
           v-model="search.corpsId"
@@ -25,13 +27,18 @@
         <span v-if="scope.row.checkType == 'ffsq'">付费申请</span>
         <span v-else-if="scope.row.checkType == 'xsqh'">销售请核</span>
         <span v-else-if="scope.row.checkType == 'cgqh'">采购请核</span>
+        <span v-else-if="scope.row.checkType == 'xsgz'">小学部工资审批</span>
+        <span v-else-if="scope.row.checkType == 'czgz'">初中部工资审批</span>
+        <span v-else-if="scope.row.checkType == 'gzgz'">高中部工资审批</span>
+        <span v-else-if="scope.row.checkType == 'hqgz'">后勤工资审批</span>
       </template>
       <template slot="menuLeft">
-        <el-button size="small"
-                   type="success"
-                   :disabled="selectionList.length == 0 "
-                   @click.stop="batchCheck"
-        >批量审批
+        <el-button
+          size="small"
+          type="success"
+          :disabled="selectionList.length == 0"
+          @click.stop="batchCheck"
+          >批量审批
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -40,20 +47,20 @@
           size="small"
           :disabled="scope.row.operate"
           @click.stop="jumpPage(scope.row)"
-        >查看
+          >查看
         </el-button>
         <el-button
           type="text"
           size="small"
           :disabled="scope.row.auditStatus != 'S'"
           @click.stop="openCheck(scope.row)"
-        >审批
+          >审批
         </el-button>
         <el-button
           type="text"
           size="small"
           @click.stop="openCheckSchedule(scope.row)"
-        >审批流程
+          >审批流程
         </el-button>
       </template>
     </avue-crud>
@@ -99,203 +106,218 @@
 </template>
 
 <script>
-  import option from "./configuration/mainList.json";
-  import { getList,approvePass } from "@/api/approveData/main";
-  import checkSchedule from "@/components/check/checkSchedule";
-  import check from "@/components/check/check";
-let previousRouterName = ""
-  let checkRefresh = ""
-  export default {
-    components:{
-      check,
-      checkSchedule
-    },
-    data() {
-      return {
-        loading : false,
-        form: {},
-        search:{},
-        show:true,
-        checkDialog:false,
-        checkId:"",
-        batchNo:'',
-        checkScheduleDialog:false,
-        detailData:{},
-        option: option,
-        parentId:0,
-        checkData:{},
-        dataList: [],
-        idList:[],
-        selectionList:[],
-        page: {
-          pageSize: 10,
-          pagerCount: 5,
-          total: 0,
-        },
-        query:{},
-        configuration:{
-          multipleChoices:false,
-          multiple:false,
-          disabled:false,
-          searchShow:true,
-          collapseTags:false,
-          clearable:true,
-          placeholder:'请点击右边按钮选择',
-          dicData:[]
-        },
+import option from "./configuration/mainList.json";
+import option2 from "./configuration/mainList2.json";
+import { getList, approvePass } from "@/api/approveData/main";
+import checkSchedule from "@/components/check/checkSchedule";
+import check from "@/components/check/check";
+import { getUserInfo } from "@/api/system/user";
+let previousRouterName = "";
+let checkRefresh = "";
+export default {
+  components: {
+    check,
+    checkSchedule
+  },
+  data() {
+    return {
+      loading: false,
+      form: {},
+      search: {},
+      show: true,
+      checkDialog: false,
+      checkId: "",
+      batchNo: "",
+      checkScheduleDialog: false,
+      detailData: {},
+      option: {},
+      parentId: 0,
+      checkData: {},
+      dataList: [],
+      idList: [],
+      selectionList: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0
+      },
+      query: {},
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        clearable: true,
+        placeholder: "请点击右边按钮选择",
+        dicData: []
       }
-    },
-    created() {
-
-    },
-    mounted() {
-      // option.height = window.innerHeight - 200 ;
-    },
-    activated() {
-      if(this.$route.query.check === 'refresh'){
-        this.onLoad(this.page,this.search)
+    };
+  },
+  created() {
+    getUserInfo().then(res => {
+      if (res.data.data.billType) {
+        this.option = option2;
+      } else {
+        this.option = option;
       }
-    },
-    methods: {
-      batchCheck(){
-        for(let i=0;i<this.selectionList.length;i++){
-          if(this.selectionList[i].auditStatus != "S"){
-            return this.$message.error("审核状态必须都为待审核状态!")
-          }else{
-            this.idList.push(this.selectionList[i].id)
-          }
+    });
+  },
+  mounted() {
+    // option.height = window.innerHeight - 200 ;
+  },
+  activated() {
+    if (this.$route.query.check === "refresh") {
+      this.onLoad(this.page, this.search);
+    }
+  },
+  methods: {
+    batchCheck() {
+      for (let i = 0; i < this.selectionList.length; i++) {
+        if (this.selectionList[i].auditStatus != "S") {
+          return this.$message.error("审核状态必须都为待审核状态!");
+        } else {
+          this.idList.push(this.selectionList[i].id);
         }
-        //打开cheack
-        this.checkDialog = true;
-      },
-      operationType(){
-        this.checkDialog = false;
-        this.refreshChange()
-        this.idList = []
-      },
-      //跳转页面
-      jumpPage(row){
-        if(row.url){
-          if(eval('(' + row.pageStatus + ')')){
-            this.$alert(""+row.pageLabel+"页面已存在,请关闭"+row.pageLabel+"页面再进行操作", "温馨提示", {
+      }
+      //打开cheack
+      this.checkDialog = true;
+    },
+    operationType() {
+      this.checkDialog = false;
+      this.refreshChange();
+      this.idList = [];
+    },
+    //跳转页面
+    jumpPage(row) {
+      if (row.url) {
+        if (eval("(" + row.pageStatus + ")")) {
+          this.$alert(
+            "" +
+              row.pageLabel +
+              "页面已存在,请关闭" +
+              row.pageLabel +
+              "页面再进行操作",
+            "温馨提示",
+            {
               confirmButtonText: "确定",
-              type: 'warning',
-              callback: action => {
-              }
-            });
-          }else{
-            this.$router.$avueRouter.closeTag(row.url);
-            this.$router.push({
-              path: row.url,
-              query: {check : row},
-            });
-          }
+              type: "warning",
+              callback: action => {}
+            }
+          );
+        } else {
+          this.$router.$avueRouter.closeTag(row.url);
+          this.$router.push({
+            path: row.url,
+            query: { check: row }
+          });
         }
-      },
-      //审批通过
-      pass(row,operate){
-        row.operate =  operate
-        this.loading = true;
-        approvePass(row).then(res=>{
-          this.$message.success("操作成功!")
-          this.refreshChange()
-        }).finally(()=>{
-          this.loading = false
+      }
+    },
+    //审批通过
+    pass(row, operate) {
+      row.operate = operate;
+      this.loading = true;
+      approvePass(row)
+        .then(res => {
+          this.$message.success("操作成功!");
+          this.refreshChange();
         })
-      },
-      openCheck(row){
-        this.batch = false //单条操作
-        this.checkDialog = true
-        this.checkData = row
-      },
-      choceCheckFun(){
-        this.checkDialog = false;
-        this.refreshChange()
-      },
-      openCheckSchedule(row){
-        this.checkId = row.srcBillId
-        this.batchNo = row.batchNo
-        this.checkScheduleDialog = true
-      },
-      //关闭审批流程页面
-      choceScheduleFun(){
-        this.checkScheduleDialog = false
-      },
-      //新单打开
-      addReceipt(row){
-
-      },
-      //编辑打开
-      editOpen(row, status){
-        this.detailData = {
-          id: row.id,
-          status: status
-        };
-        this.show = false;
-      },
-      rowDel(row, index, done) {
-        if(row.id){
-          this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(() => {
-            remove(row.id).then(res =>{
-              if(res.data.success){
-                this.$message.success("操作成功!");
-                this.onLoad(this.page);
-              }
-            })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    openCheck(row) {
+      this.batch = false; //单条操作
+      this.checkDialog = true;
+      this.checkData = row;
+    },
+    choceCheckFun() {
+      this.checkDialog = false;
+      this.refreshChange();
+    },
+    openCheckSchedule(row) {
+      this.checkId = row.srcBillId;
+      this.batchNo = row.batchNo;
+      this.checkScheduleDialog = true;
+    },
+    //关闭审批流程页面
+    choceScheduleFun() {
+      this.checkScheduleDialog = false;
+    },
+    //新单打开
+    addReceipt(row) {},
+    //编辑打开
+    editOpen(row, status) {
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
+      this.show = false;
+    },
+    rowDel(row, index, done) {
+      if (row.id) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          remove(row.id).then(res => {
+            if (res.data.success) {
+              this.$message.success("操作成功!");
+              this.onLoad(this.page);
+            }
           });
-        }
-      },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done()
-      },
-      searchReset() {
-        console.log('1')
-      },
-      selectionChange(list) {
-        this.selectionList = list
-      },
-      currentChange(val) {
-        this.page.currentPage = val
-      },
-      sizeChange() {
-        console.log('1')
-      },
-      refreshChange(params) {
-        this.onLoad(this.page,params);
-      },
-      paramsAdjustment(params) {
-        params = Object.assign({}, this.search);
-        if(!params.auditStatus && params.auditStatus !== ""){
-          params.auditStatus = "S";
-        }
-        return params
-      },
-      onLoad(page, params) {
-        this.loading = true
-        params = this.paramsAdjustment(params)
+        });
+      }
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    searchReset() {
+      console.log("1");
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange() {
+      console.log("1");
+    },
+    refreshChange(params) {
+      this.onLoad(this.page, params);
+    },
+    paramsAdjustment(params) {
+      params = Object.assign({}, this.search);
+      if (!params.auditStatus && params.auditStatus !== "") {
+        params.auditStatus = "S";
+      }
+      return params;
+    },
+    onLoad(page, params) {
+      this.loading = true;
+      params = this.paramsAdjustment(params);
 
-        getList(page.currentPage, page.pageSize,params).then(res=>{
-          this.dataList = res.data.data.records
-          this.page.total = res.data.data.total
-        }).finally(()=>{
-          this.loading = false;
+      getList(page.currentPage, page.pageSize, params)
+        .then(res => {
+          this.dataList = res.data.data.records;
+          this.page.total = res.data.data.total;
         })
-      },
-      cellStyle() {
-        return "padding:0;height:40px;";
-      },
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
     }
   }
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/basicData/facultyManagement/detailsPage.vue

@@ -13,6 +13,14 @@
         </div>
         <div class="add-customer-btn">
           <el-button
+            type="info"
+            :disabled="!form.id"
+            size="small"
+            @click="recalculate"
+          >
+            重新计算
+          </el-button>
+          <el-button
             type="success"
             :disabled="!form.id"
             size="small"
@@ -35,6 +43,7 @@
           class="trading-form"
           v-model="form"
           :option="option"
+          v-loading="loading"
         >
         </avue-form>
       </basic-container>
@@ -80,7 +89,12 @@
 </template>
 
 <script>
-import { detail, submit, delItem } from "@/api/basicData/facultyManagement";
+import {
+  detail,
+  submit,
+  delItem,
+  calculate
+} from "@/api/basicData/facultyManagement";
 import { addAllsalary, addAllsalary2 } from "@/util/calculate";
 export default {
   name: "index",
@@ -660,6 +674,14 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    recalculate() {
+      this.loading = true;
+      calculate(this.form.id).then(res => {
+        if (res.data.code == 200) {
+          this.getDetail(this.form.id);
+        }
+      });
+    },
     copyDoc() {
       this.$emit("copyOrder", this.form.id);
     },

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -2004,9 +2004,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+          this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/exportTrade/invoice/detailsPage.vue

@@ -995,9 +995,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+          this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -1205,9 +1205,12 @@ export default {
       this.saveLoading = true;
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+          this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -966,9 +966,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+            this.onLock(data).then(res => {
+      if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/exportTrade/receipt/detailsPage.vue

@@ -1001,9 +1001,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+             this.onLock(data).then(res => {
+           if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/exportTrade/salesContract/detailsPage.vue

@@ -2212,9 +2212,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+       this.onLock(data).then(res => {
+      if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -685,9 +685,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+          this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              disabled
+                 :disabled="form.status > 0"
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -1725,9 +1725,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+          this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },
@@ -1746,8 +1749,8 @@ export default {
       }).then(() => {
         const data = {
           id: this.form.id,
-          checkType: "xsgz",
-          url: "/salaryManagement/primarySchool/index",
+          checkType: "gzgz",
+          url: "/salaryManagement/highSchool/index",
           pageStatus: "this.$store.getters.domSaleStatus",
           pageLabel: "高中部",
           checkFlag: 2

src/views/salaryManagement/highSchool/index.vue

@@ -195,6 +195,14 @@ export default {
   created() {
     this.option.height = window.innerHeight - 210;
   },
+  activated() {
+    if (this.$route.query.check) {
+      this.isShow = true;
+      setTimeout(() => {
+        this.editOpen({ id: this.$route.query.check.billId }, 1);
+      }, 100);
+    }
+  },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
@@ -290,6 +298,12 @@ export default {
       });
     },
     goBack() {
+      if (this.$route.query.check) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/salaryManagement/highSchool/index"
+        });
+      }
       this.detailData = this.$options.data().detailData;
       this.onLoad(this.page, this.search);
       this.isShow = true;

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-             disabled
+              :disabled="form.status > 0"
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -1725,9 +1725,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+              this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },
@@ -1746,8 +1749,8 @@ export default {
       }).then(() => {
         const data = {
           id: this.form.id,
-          checkType: "xsgz",
-          url: "/salaryManagement/primarySchool/index",
+          checkType: "czgz",
+          url: "/salaryManagement/juniorhighSchool/index",
           pageStatus: "this.$store.getters.domSaleStatus",
           pageLabel: "初中部",
           checkFlag: 2

src/views/salaryManagement/juniorhighSchool/index.vue

@@ -39,7 +39,12 @@
           <!-- <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
             编辑
           </el-button> -->
-          <el-button type="text" size="small" @click.stop="rowDel(row, index)"  :disabled="row.status > 0">
+          <el-button
+            type="text"
+            size="small"
+            @click.stop="rowDel(row, index)"
+            :disabled="row.status > 0"
+          >
             删除
           </el-button>
         </template>
@@ -190,6 +195,14 @@ export default {
   created() {
     this.option.height = window.innerHeight - 210;
   },
+  activated() {
+    if (this.$route.query.check) {
+      this.isShow = true;
+      setTimeout(() => {
+        this.editOpen({ id: this.$route.query.check.billId }, 1);
+      }, 100);
+    }
+  },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
@@ -285,6 +298,12 @@ export default {
       });
     },
     goBack() {
+      if (this.$route.query.check) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/salaryManagement/juniorhighSchool/index"
+        });
+      }
       this.detailData = this.$options.data().detailData;
       this.onLoad(this.page, this.search);
       this.isShow = true;

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              disabled
+                :disabled="form.status > 0"
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -1725,9 +1725,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+          this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },
@@ -1746,8 +1749,8 @@ export default {
       }).then(() => {
         const data = {
           id: this.form.id,
-          checkType: "xsgz",
-          url: "/salaryManagement/primarySchool/index",
+          checkType: "hqgz",
+          url: "/salaryManagement/logisticsDepartment/index",
           pageStatus: "this.$store.getters.domSaleStatus",
           pageLabel: "后勤部",
           checkFlag: 2

src/views/salaryManagement/logisticsDepartment/index.vue

@@ -39,7 +39,12 @@
           <!-- <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
             编辑
           </el-button> -->
-          <el-button type="text" size="small" @click.stop="rowDel(row, index)"  :disabled="row.status > 0">
+          <el-button
+            type="text"
+            size="small"
+            @click.stop="rowDel(row, index)"
+            :disabled="row.status > 0"
+          >
             删除
           </el-button>
         </template>
@@ -190,6 +195,14 @@ export default {
   created() {
     this.option.height = window.innerHeight - 210;
   },
+  activated() {
+    if (this.$route.query.check) {
+      this.isShow = true;
+      setTimeout(() => {
+        this.editOpen({ id: this.$route.query.check.billId }, 1);
+      }, 100);
+    }
+  },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
@@ -285,6 +298,12 @@ export default {
       });
     },
     goBack() {
+      if (this.$route.query.check) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/salaryManagement/logisticsDepartment/index"
+        });
+      }
       this.detailData = this.$options.data().detailData;
       this.onLoad(this.page, this.search);
       this.isShow = true;

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1725,9 +1725,12 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data);
-          this.detailData.status = 2;
-          this.option = this.$options.data().option;
+          this.onLock(data).then(res => {
+            if (res.data.code == 200) {
+              this.detailData.status = 2;
+              this.option = this.$options.data().option;
+            }
+          });
         }
       });
     },

src/views/salaryManagement/primarySchool/index.vue

@@ -195,6 +195,14 @@ export default {
   created() {
     this.option.height = window.innerHeight - 210;
   },
+  activated() {
+    if (this.$route.query.check) {
+      this.isShow = true;
+      setTimeout(() => {
+        this.editOpen({ id: this.$route.query.check.billId }, 1);
+      }, 100);
+    }
+  },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
@@ -290,6 +298,12 @@ export default {
       });
     },
     goBack() {
+      if (this.$route.query.check) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/salaryManagement/primarySchool/index"
+        });
+      }
       this.detailData = this.$options.data().detailData;
       this.onLoad(this.page, this.search);
       this.isShow = true;

src/views/statisticAnalysis/salesProfit/index.vue

@@ -348,6 +348,10 @@ export default {
     },
     //点击搜索按钮触发
     searchChange(params, done) {
+      if (!params.billType) {
+        done();
+        return this.$message.error("请选择类别");
+      }
       if (params.businesDate) {
         params.contractStartDate = params.businesDate[0];
         params.contractEndDate = params.businesDate[1];