Browse Source

Merge branch 'sit' of daiyanrong/accout-ui into master

戴艳蓉 3 years ago
parent
commit
b9bef4fc20

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-71c996d6.d0085e78.css


BIN
dist/static/css/chunk-41b6f65d.5617fb97.css.gz → dist/static/css/chunk-71c996d6.d0085e78.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.4c24ee12.js


BIN
dist/static/js/app.df4681b1.js.gz → dist/static/js/app.4c24ee12.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-41b6f65d.54901bcc.js


BIN
dist/static/js/chunk-41b6f65d.54901bcc.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-71c996d6.2b145799.js


BIN
dist/static/js/chunk-71c996d6.2b145799.js.gz


+ 4 - 0
src/apis/service/search/standBook/index.js

@@ -20,6 +20,10 @@ export default {
   hlist: (data, params) => testHttp(api + "execnowlist", data, "post", params),
   // 准备执行
   download: (data, params) => testHttp(api + "execnowdown", data, "post", params),
+  //  即时下载列表接口 -新
+  realNewList: (data, params) => http(api + "nowlist", data, "post", params),
+
+
   // // 分页查询确认单列表
   // qrdlist: (data, params) => http(api + "qrdlist", data, "post", params),
   // // 发票新建(金额)

+ 4 - 1
src/config/env.development.js

@@ -5,7 +5,10 @@ module.exports = {
   api: {
     // baseApi: 'http://inv.sit.wanyuhengtong.com/',
     // baseApi: 'http://inv.test241.wanyuhengtong.com/',
-    baseApi: 'http://www.invoice.com/',
+    // baseApi: 'http://www.invoice.com/',
+    // testApi: 'http://inv.test241.wanyuhengtong.com/',
+    baseApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // tableApi: 'http://inv.sit.wanyuhengtong.com/',
     testApi: 'http://inv.test241.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,

+ 7 - 3
src/views/search/standBook/index.vue

@@ -8,10 +8,13 @@
         <el-tab-pane label="实时导出" name="1">
           <real-time-export />
         </el-tab-pane>
-        <el-tab-pane label="预约导出" name="2">
+         <el-tab-pane label="实时导出-新" name="2">
+          <real-time-export-new />
+        </el-tab-pane>
+        <el-tab-pane label="预约导出" name="3">
           <pre-export />
         </el-tab-pane>
-        <el-tab-pane label="往年数据导出" name="3">
+        <el-tab-pane label="往年数据导出" name="4">
           <history-data />
         </el-tab-pane>
       </el-tabs>
@@ -25,7 +28,7 @@ import urlConfig from "@/apis/url-config";
 import realTimeExport from "./real-time-export";
 import preExport from "./pre-export";
 import historyData from "./history-data";
-
+import realTimeExportNew from "./real-time-export-new";
 import { mapGetters } from "vuex";
 export default {
   name: "standBook",
@@ -34,6 +37,7 @@ export default {
     realTimeExport,
     preExport,
     historyData,
+    realTimeExportNew
   },
   computed: {
     //组件SIZE设置

+ 181 - 0
src/views/search/standBook/real-time-export-new.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="pre-export">
+    <el-row style="padding: 0 0 14px 0">
+      <el-col :span="12" style="width: 355px">
+        <el-alert
+          :closable="false"
+          title="申请导出后,文件会在几分钟后生成!"
+          type="warning"
+        >
+        </el-alert>
+      </el-col>
+
+      <el-col
+        :span="3"
+        style="width: 66px; float: right"
+        v-if="powers.some((item) => item == '002')"
+      >
+        <el-button
+          :size="searchSize"
+          type="primary"
+          style="float: right; margin-left: 5px"
+          @click="searchList"
+        >
+          刷新
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      :data="tableData"
+      border
+      v-loading="loading"
+      :size="size"
+      style="width: 100%"
+    >
+      <el-table-column  prop="name" label="业务表名称" min-width="140"/>
+      <el-table-column prop="start" label="数据开始时间" min-width="140"/>
+      <el-table-column prop="end" label="数据结束时间" min-width="140"/>
+      <el-table-column prop="apply_name" label="申请人" min-width="70"/>
+      <el-table-column prop="status" label="状态" min-width="70">
+          <template slot-scope="scope">
+               <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.status == '2' ? 'success' : scope.row.status == '1'?'warning':'info'"
+          v-text="
+            (statusOptions.find((item) => item.id == scope.row.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column prop="expiretime" label="文件过期时间" min-width="140"/>
+      <el-table-column prop="updatetime" label="创建时间" min-width="140"/>
+      <el-table-column fixed="right" label="操作" width="82">
+        <template slot-scope="scope">
+          <el-tooltip
+            effect="dark"
+            content="编辑"
+            placement="top"
+            v-if="powers.some((item) => item == '005')"
+          >
+            <i class="el-icon-edit tb-icon" @click="openModal(scope.row)"></i>
+          </el-tooltip>
+          <el-tooltip
+            effect="dark"
+            content="导出"
+            placement="top"
+            v-if="
+              powers.some((item) => item == '049') && scope.row.status == '2'
+            "
+          >
+            <i
+              class="el-icon-download tb-icon"
+              @click="batchExport(scope.row.down_url)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <add-edit
+      :sitem="sitem"
+      :show-model="showModel"
+      @refresh="searchList"
+      @cancel="showModel = false"
+    />
+  </div>
+</template>
+<script>
+import asyncRequest from "@/apis/service/search/standBook";
+import addEdit from "./addEdit";
+import { mapGetters } from "vuex";
+import urlConfig from "@/apis/url-config";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "Account",
+  components: {
+    addEdit,
+  },
+  mixins: [ resToken],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "standBook"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      fileUrl: urlConfig.baseURL,
+      // 状态
+      statusOptions: [
+        { id: "0", label: "待创建" },
+        { id: "1", label: "待执行" },
+        { id: "2", label: "已完成" },
+      ],
+      loading: true,
+      showModel: false,
+      sitem: null,
+      parmValue: {
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    restSearch() {
+      this.parmValue = {
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      this.searchList();
+    },
+    openModal(sitem) {
+      this.showModel = true;
+      this.sitem = sitem;
+    },
+
+    batchExport(content) {
+      if (!this.loading) {
+        this.loading = true;
+        let aEle = document.createElement("a"); // 创建a标签
+        aEle.href = this.fileUrl + content; // content为后台返回的下载地址
+        aEle.click(); // 设置点击事件
+        this.$message.success(`导出成功!`);
+        setTimeout(() => {
+          this.loading = false;
+        }, 500);
+      }
+    },
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.realNewList(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+      }
+      this.loading = false;
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.account {
+}
+</style>

+ 35 - 35
src/views/search/standBook/real-time-export.vue

@@ -98,35 +98,35 @@ export default {
         //   end: "",
         //   url: "invreport",
         // },
-        {
-          value: "11",
-          label: "应收账款账龄表",
-          start: "",
-          end: "",
-          url: "downqrdpay",
-        },
-        {
-          value: "12",
-          label: "应收账款开票汇总表",
-          start: "",
-          end: "",
-          url: "downqrdinv",
-        },
+        // {
+        //   value: "11",
+        //   label: "应收账款账龄表",
+        //   start: "",
+        //   end: "",
+        //   url: "downqrdpay",
+        // },
+        // {
+        //   value: "12",
+        //   label: "应收账款开票汇总表",
+        //   start: "",
+        //   end: "",
+        //   url: "downqrdinv",
+        // },
 
-        {
-          value: "6",
-          label: "应收台账",
-          start: "",
-          end: "",
-          url: "Admin/downreportcwtz",
-        },
-        {
-          value: "1",
-          label: "确认单台账",
-          start: "",
-          end: "",
-          url: "Admin/downreportqrdtz",
-        },
+        // {
+        //   value: "6",
+        //   label: "应收台账",
+        //   start: "",
+        //   end: "",
+        //   url: "Admin/downreportcwtz",
+        // },
+        // {
+        //   value: "1",
+        //   label: "确认单台账",
+        //   start: "",
+        //   end: "",
+        //   url: "Admin/downreportqrdtz",
+        // },
         {
           value: "2",
           label: "确认单明细",
@@ -134,13 +134,13 @@ export default {
           end: "",
           url: "Admin/downreportqrd",
         },
-        {
-          value: "3",
-          label: "采购单台账",
-          start: "",
-          end: "",
-          url: "Admin/downreportcgdtz",
-        },
+        // {
+        //   value: "3",
+        //   label: "采购单台账",
+        //   start: "",
+        //   end: "",
+        //   url: "Admin/downreportcgdtz",
+        // },
         {
           value: "4",
           label: "采购单明细",

Some files were not shown because too many files changed in this diff