QuKatie 3 anos atrás
pai
commit
20c993bc2c

+ 1 - 1
src/cache.js

@@ -10,7 +10,7 @@ Vue.mixin({
     })
   },
   beforeRouteLeave: function (to, from, next) {
-    if (store.getters.tagList.length >= 8 && !store.getters.tagList.find(res => to.fullPath == res.value)) {
+    if (store.getters.tagList.length >= 16 && !store.getters.tagList.find(res => to.fullPath == res.value)) {
       this.$confirm('打开页面数超出最大限制,请先关闭其它页面!', '温馨提示', {
         confirmButtonText: '确定',
         showCancelButton: false,

+ 4 - 5
src/views/salaryManagement/highSchool/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-                 :disabled="form.status > 0"
+              :disabled="form.status > 0"
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -101,7 +101,6 @@
               type="primary"
               size="small"
               @click.stop="openExport()"
-              :disabled="detailData.status == 1"
               >导出
             </el-button>
             <el-button
@@ -923,7 +922,7 @@
         width="70%"
         :before-close="handleClose"
         append-to-body
-        class='abnormal'
+        class="abnormal"
       >
         <span>
           <avue-crud :data="auditList" :option="auditOption">
@@ -1770,7 +1769,7 @@ export default {
     },
     handleClose() {
       this.auditList = [];
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     exportAbnormal() {
       window.open(
@@ -2078,6 +2077,6 @@ export default {
   display: none;
 }
 .abnormal ::v-deep .el-dialog__body {
-    padding: 10px 20px;
+  padding: 10px 20px;
 }
 </style>

+ 4 - 5
src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -101,7 +101,6 @@
               type="primary"
               size="small"
               @click.stop="openExport()"
-              :disabled="detailData.status == 1"
               >导出
             </el-button>
             <el-button
@@ -923,7 +922,7 @@
         width="70%"
         :before-close="handleClose"
         append-to-body
-        class='abnormal'
+        class="abnormal"
       >
         <span>
           <avue-crud :data="auditList" :option="auditOption">
@@ -1725,7 +1724,7 @@ export default {
       });
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-              this.onLock(data).then(res => {
+          this.onLock(data).then(res => {
             if (res.data.code == 200) {
               this.detailData.status = 2;
               this.option = this.$options.data().option;
@@ -1770,7 +1769,7 @@ export default {
     },
     handleClose() {
       this.auditList = [];
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     exportAbnormal() {
       window.open(
@@ -2078,6 +2077,6 @@ export default {
   display: none;
 }
 .abnormal ::v-deep .el-dialog__body {
-    padding: 10px 20px;
+  padding: 10px 20px;
 }
 </style>

+ 4 - 5
src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-                :disabled="form.status > 0"
+              :disabled="form.status > 0"
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -101,7 +101,6 @@
               type="primary"
               size="small"
               @click.stop="openExport()"
-              :disabled="detailData.status == 1"
               >导出
             </el-button>
             <el-button
@@ -923,7 +922,7 @@
         width="70%"
         :before-close="handleClose"
         append-to-body
-        class='abnormal'
+        class="abnormal"
       >
         <span>
           <avue-crud :data="auditList" :option="auditOption">
@@ -1770,7 +1769,7 @@ export default {
     },
     handleClose() {
       this.auditList = [];
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     exportAbnormal() {
       window.open(
@@ -2078,6 +2077,6 @@ export default {
   display: none;
 }
 .abnormal ::v-deep .el-dialog__body {
-    padding: 10px 20px;
+  padding: 10px 20px;
 }
 </style>

+ 3 - 4
src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -101,7 +101,6 @@
               type="primary"
               size="small"
               @click.stop="openExport()"
-              :disabled="detailData.status == 1"
               >导出
             </el-button>
             <el-button
@@ -923,7 +922,7 @@
         width="70%"
         :before-close="handleClose"
         append-to-body
-        class='abnormal'
+        class="abnormal"
       >
         <span>
           <avue-crud :data="auditList" :option="auditOption">
@@ -1770,7 +1769,7 @@ export default {
     },
     handleClose() {
       this.auditList = [];
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     exportAbnormal() {
       window.open(
@@ -2078,6 +2077,6 @@ export default {
   display: none;
 }
 .abnormal ::v-deep .el-dialog__body {
-    padding: 10px 20px;
+  padding: 10px 20px;
 }
 </style>

+ 78 - 69
src/views/statisticAnalysis/payment/index.vue

@@ -28,32 +28,32 @@
             icon="el-icon-download"
             @click="outExport"
             :disabled="dataList.length == 0"
-          >导出</el-button
+            >导出</el-button
           >
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
-<!--        <template slot="dcSearch">-->
-<!--          <el-select-->
-<!--            v-model="search.dc"-->
-<!--            filterable-->
-<!--          >-->
-<!--            <el-option-->
-<!--              label="收"-->
-<!--              value="d"-->
-<!--            />-->
-<!--            <el-option-->
-<!--              label="付"-->
-<!--              value="c"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </template>-->
-        <template slot="corpId" slot-scope="{ row, index }">
+        <!--        <template slot="dcSearch">-->
+        <!--          <el-select-->
+        <!--            v-model="search.dc"-->
+        <!--            filterable-->
+        <!--          >-->
+        <!--            <el-option-->
+        <!--              label="收"-->
+        <!--              value="d"-->
+        <!--            />-->
+        <!--            <el-option-->
+        <!--              label="付"-->
+        <!--              value="c"-->
+        <!--            />-->
+        <!--          </el-select>-->
+        <!--        </template>-->
+        <template slot="corpId" slot-scope="{ row }">
           <span>{{ row.corpName }}</span>
         </template>
-        <template slot="dc" slot-scope="{ row, index }">
-          <span>{{ row.dc == 'd'? '收': '付' }}</span>
+        <template slot="dc" slot-scope="{ row }">
+          <span>{{ row.dc == "d" ? "收" : "付" }}</span>
         </template>
       </avue-crud>
     </basic-container>
@@ -65,16 +65,14 @@ import { getToken } from "@/util/auth";
 import { getList, getProfitItem } from "@/api/statisticAnalysis/salesProfit";
 import { micrometerFormat } from "@/util/validate";
 import _ from "lodash";
-import {getAccList, exportAcctList} from "@/api/statisticAnalysis/payment"
-import {getUserInfo} from "@/api/system/user";
-
+import { getAccList, exportAcctList } from "@/api/statisticAnalysis/payment";
 export default {
   name: "index",
   data() {
     return {
       form: {},
       search: {
-        dc: 'd',
+        dc: "d"
       },
       dataList: [],
       loading: false,
@@ -139,16 +137,16 @@ export default {
             showColumn: false,
             search: true,
             width: 100,
-            searchValue: 'c',
-            type: 'select',
+            searchValue: "c",
+            type: "select",
             dicData: [
               {
-                label: '收',
-                value: 'd'
+                label: "收",
+                value: "d"
               },
               {
-                label: '付',
-                value: 'c'
+                label: "付",
+                value: "c"
               }
             ]
           },
@@ -214,7 +212,7 @@ export default {
           }
         ]
       },
-      tradeType: '',
+      tradeType: ""
     };
   },
   filters: {
@@ -222,24 +220,7 @@ export default {
       return num ? Number(num).toFixed(2) : "0.00";
     }
   },
-  created() {
-    getUserInfo().then(res => {
-      const sysType = res.data.data.billType;
-      if (sysType == 6) {
-        this.tradeType = 'JXS'
-      } else if (sysType == 5) {
-        this.tradeType = 'SW'
-      } else if (sysType == 4) {
-        this.tradeType = 'CK'
-      } else if (sysType == 3) {
-        this.tradeType = 'JK'
-      } else if (sysType == 2) {
-        this.tradeType = 'GN'
-      } else if (sysType == 1) {
-        this.tradeType = 'XX'
-      }
-    })
-  },
+  created() {},
   methods: {
     cellStyle() {
       return "padding:0;height:40px;";
@@ -268,8 +249,8 @@ export default {
     },
     searchReset() {
       this.search = {
-        dc: 'c'
-      }
+        dc: "c"
+      };
       this.onLoad(this.page, this.search);
     },
     currentChange(val) {
@@ -279,14 +260,36 @@ export default {
       this.page.currentPage = 1;
       this.page.pageSize = val;
     },
+    getSysType() {
+      const sysType = localStorage.getItem("sysitemType");
+      if (sysType == 6) {
+        this.tradeType = "JXS";
+      } else if (sysType == 5) {
+        this.tradeType = "SW";
+      } else if (sysType == 4) {
+        this.tradeType = "CK";
+      } else if (sysType == 3) {
+        this.tradeType = "JK";
+      } else if (sysType == 2) {
+        this.tradeType = "GN";
+      } else if (sysType == 1) {
+        this.tradeType = "XX";
+      }
+    },
     onLoad(page, params) {
+      this.getSysType();
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false);
       });
-      let queryParams = Object.assign({tradeType: 'JK'}, params, this.search, {
-        size: page.pageSize,
-        current: page.currentPage,
-      })
+      let queryParams = Object.assign(
+        { tradeType: this.tradeType },
+        params,
+        this.search,
+        {
+          size: page.pageSize,
+          current: page.currentPage
+        }
+      );
       if (this.search.businesDate && this.search.businesDate.length > 0) {
         queryParams = {
           ...queryParams,
@@ -296,16 +299,18 @@ export default {
       }
       delete queryParams.businesDate;
       this.loading = true;
-      getAccList(queryParams).then(res => {
-        this.dataList = res.data.data.records ? res.data.data.records : [];
-        this.page.total = res.data.data.total;
-        this.option.height = window.innerHeight - 210;
-        this.$nextTick(() => {
-          this.$refs.crud.doLayout()
+      getAccList(queryParams)
+        .then(res => {
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+          this.option.height = window.innerHeight - 210;
+          this.$nextTick(() => {
+            this.$refs.crud.doLayout();
+          });
         })
-      }).finally(() => {
-        this.loading = false;
-      })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     editOpen(row) {
       if (row.billType == "BJ") {
@@ -325,13 +330,13 @@ export default {
       }
     },
     outExport() {
-      let accDateStart = '';
-      let accDateEnd = '';
+      let accDateStart = "";
+      let accDateEnd = "";
       if (this.search.businesDate && this.search.businesDate.length > 0) {
-        accDateStart = this.search.businesDate[0]
-        accDateEnd = this.search.businesDate[1]
+        accDateStart = this.search.businesDate[0];
+        accDateEnd = this.search.businesDate[1];
       }
-      let a = {...this.search}
+      let a = { ...this.search };
       // let itemList = JSON.stringify(a)
       // let result = itemList.replace(/""/g, "null");
       // a = JSON.parse(result)
@@ -341,7 +346,11 @@ export default {
       window.open(
         `/api/trade-finance/acc/exportAccMessage?${
           this.website.tokenHeader
-        }=${getToken()}&corpId=${a.corpId}&accDateStart=${accDateStart}&accDateEnd=${accDateEnd}&dc=${a.dc}&accSysNo=${a.accSysNo}&tradeType=JK`
+        }=${getToken()}&corpId=${
+          a.corpId
+        }&accDateStart=${accDateStart}&accDateEnd=${accDateEnd}&dc=${
+          a.dc
+        }&accSysNo=${a.accSysNo}&tradeType=${this.tradeType}`
       );
     },
     summaryMethod({ columns, data }) {

+ 10 - 11
src/views/wel/index.vue

@@ -1,34 +1,33 @@
 <template>
   <div v-if="billType">
     <tongjiSchool v-if="billType == 1"></tongjiSchool>
-    <defaultPage v-else :sysType='billType'></defaultPage>
+    <defaultPage v-else :sysType="billType"></defaultPage>
   </div>
 </template>
 
 <script>
 import defaultPage from "@/views/wel/home/defaultPage";
 import tongjiSchool from "@/views/wel/home/tongjiSchool";
-import {getUserInfo} from "@/api/system/user";
+import { getUserInfo } from "@/api/system/user";
+import { setStore } from "@/util/store";
 export default {
   name: "wel",
   data() {
     return {
-      billType:'',
+      billType: ""
     };
   },
   created() {
-    getUserInfo().then(res=>{
-      this.billType = res.data.data.billType
-    })
+    getUserInfo().then(res => {
+      this.billType = res.data.data.billType;
+      localStorage.setItem('sysitemType',this.billType)
+    });
   },
   components: {
     tongjiSchool,
     defaultPage
   },
-  methods: {
-  }
+  methods: {}
 };
 </script>
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>