Browse Source

修改bug

lichao 3 years ago
parent
commit
39959d96df

+ 22 - 0
src/api/statisticAnalysis/dataDetail.js

@@ -0,0 +1,22 @@
+import request from '@/router/axios';
+
+// 列表查询
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-purchase-sales/orderitems/dateset',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size
+    }
+  })
+}
+// 导出
+export function exportExcel(params) {
+  return request({
+    url: '/api/blade-purchase-sales/orderitems/dateset-export',
+    method: 'get',
+    params
+  })
+}

+ 4 - 0
src/enums/column-name.js

@@ -475,6 +475,10 @@ const columnName = [{
   {
     code: 126,
     name: '统计分析销售对账'
+  },
+  {
+    code: 127,
+    name: '统计分析数据明细'
   }
 ]
 export const getColumnName = (key) => {

+ 30 - 0
src/router/views/index.js

@@ -1334,4 +1334,34 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/dealer/allocation/index')
     }]
   },
+  //数据明细(N)
+  {
+    path: '/statisticAnalysis/dataDetail/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/statisticAnalysis/dataDetail/index',
+      name: '数据明细(N)',
+      meta: {
+        i18n: '/statisticAnalysis/dataDetail/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/dataDetail/index')
+    }]
+  },
+  //销售对账
+  {
+    path: '/statisticAnalysis/salesReconciliation/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/statisticAnalysis/salesReconciliation/index',
+      name: '销售对账',
+      meta: {
+        i18n: '/statisticAnalysis/salesReconciliation/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/salesReconciliation/index')
+    }]
+  },
 ]

+ 345 - 0
src/views/statisticAnalysis/dataDetail/index.vue

@@ -0,0 +1,345 @@
+<template>
+  <div>
+    <basic-container class="page-crad">
+      <avue-crud
+        ref="crud"
+        :option="option"
+        :data="dataList"
+        :page.sync="page"
+        :search.sync="search"
+        :cell-style="cellStyle"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        :table-loading="loading"
+        @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
+        @search-criteria-switch="searchCriteriaSwitch"
+      >
+        <template slot="menuLeft">
+          <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
+        </template>
+      </avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/util/auth";
+import { getList, exportExcel } from "@/api/statisticAnalysis/dataDetail";
+import { micrometerFormat } from "@/util/validate";
+import _ from "lodash";
+export default {
+  name: "index",
+  data() {
+    return {
+      form: {},
+      search: {},
+      dataList: [],
+      loading: false,
+      detailData: {},
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      option: {},
+      defaultOption: {
+        searchShow: true,
+        align: "center",
+        searchSpan: 8,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        showSummary: true,
+        summaryText: '合计',
+        sumColumnList: [
+          {
+            name: "orderQuantity",
+            type: "sum",
+            decimals: 0
+          },
+          {
+            name: "amount",
+            type: "sum",
+          },
+          {
+            name: "purchaseAmount",
+            type: "sum",
+          },
+        ],
+        searchIcon: true,
+        searchIndex: 2,
+        menu: false,
+        column: [
+          {
+            label: "销售订单号",
+            prop: "orderNo",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "客户名称",
+            prop: "corpName",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "供应商",
+            prop: "gysName",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "所属公司",
+            prop: "belongCompany",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "制单日期",
+            prop: "createTime",
+            search: true,
+            type: 'date',
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            unlinkPanels: true,
+            searchRange: true,
+            overHidden: true,
+          },
+          {
+            label: "商品名称",
+            prop: "goodsName",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "规格",
+            prop: "typeNo",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "花纹",
+            prop: "brandItem",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "数量",
+            prop: "orderQuantity",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "金额",
+            prop: "amount",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "采购价",
+            prop: "purchaseAmount",
+            search: false,
+            overHidden: true,
+          },
+          {
+            label: "包装要求",
+            prop: "packageRemarks",
+            search: true,
+            overHidden: true,
+          },
+        ],
+      },
+    };
+  },
+  filters: {
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
+    }
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(127), this.defaultOption);
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      delete this.search.corpName;
+      delete this.search.storageName
+      this.onLoad(this.page, this.search);
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    onLoad(page, params) {
+      this.loading = true;
+      this.dataList.forEach(item => {
+        this.$refs.crud.toggleRowExpansion(item, false);
+      });
+      let queryParams = Object.assign({}, params);
+      if (queryParams.createTime && queryParams.createTime.length > 0) {
+        queryParams = {
+          ...queryParams,
+          beginCreateTime: queryParams.createTime[0] + ' 00:00:00',
+          endCreateTime: queryParams.createTime[1] + ' 23:59:59',
+        }
+        delete queryParams.createTime;
+      }
+      getList(
+        page.currentPage,
+        page.pageSize,
+        queryParams
+      )
+        .then(res => {
+          if (res.data.data.records) {
+            res.data.data.records.forEach(e => {
+              e.itemLoading = true;
+            });
+          }
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 210;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    editOpen(row) {
+      if (row.billType == "BJ") {
+        this.$router.push({
+          path: "/exportTrade/customerInquiry/index",
+          query: {
+            id: row.id
+          }
+        });
+      } else {
+        this.$router.push({
+          path: "/exportTrade/salesContract/index",
+          query: {
+            id: row.id
+          }
+        });
+      }
+    },
+    outExport() {
+      let params = {...this.search}
+      if (!params.corpName) this.$set(params, 'corpName', '');
+      if (!params.orderNo) this.$set(params, 'orderNo', '');
+      if (!params.gysName) this.$set(params, 'gysName', '');
+      if (!params.belongCompany) this.$set(params, 'belongCompany', '');
+      if (params.createTime && params.createTime.length > 0) {
+        params = {
+          ...params,
+          beginCreateTime: params.createTime[0] + ' 00:00:00',
+          endCreateTime: params.createTime[1] + ' 23:59:59',
+        }
+      } else {
+        params = {
+          ...params,
+          beginCreateTime: '',
+          endCreateTime: '',
+        }
+      }
+      // return console.log(this.search)
+      this.$confirm('是否导出数据明细?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        window.open(
+          `/api/blade-purchase-sales/orderitems/dateset-export?${
+            this.website.tokenHeader
+          }=${getToken()}&corpName=${params.corpName}&beginCreateTime=${params.beginCreateTime}&endCreateTime=${params.endCreateTime}&orderNo=${params.orderNo}&gysName=${params.gysName}&belongCompany=${params.belongCompany}`
+        );
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消' //
+        });
+      })
+    },
+    //列保存触发
+    async saveColumn() {
+      /**
+       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(
+        this.getColumnName(127),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
+
+      }
+    },
+    async resetColumn() {
+      this.option = this.defaultOption;
+      const inSave = await this.delColumnData(this.getColumnName(127), this.defaultOption);
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
+        this.$message.success("重置成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+  }
+};
+</script>
+
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0px;
+}
+.itemTable ::v-deep .el-table {
+  width: 100%;
+}
+</style>

+ 18 - 13
src/views/workManagement/requisition/detail.vue

@@ -146,6 +146,7 @@
                 size="small"
                 style="width:60%"
                 @change="codeChange(row, index)"
+                disabled
               >
                 <el-option
                   v-for="item in goodsoptions"
@@ -172,6 +173,7 @@
                 filterable
                 style="width:60%"
                 @change="cnameChange(row, index)"
+                disabled
               >
                 <el-option
                   v-for="item in goodsoptions"
@@ -238,19 +240,20 @@
             <span>{{ row.storageQuantity | IntegerFormat }}</span>
           </template>
           <template slot="storageId" slot-scope="{ row, index }">
-            <el-select
-              v-model="row.storageId"
-              filterable
-              @change="storageChange(row)"
-              disabled
-            >
-              <el-option
-                v-for="(item, index) in storageOptions"
-                :key="index"
-                :value="item.id"
-                :label="item.cname"
-              ></el-option>
-            </el-select>
+            <span>{{ row.storageId | storageFormat(storageOptions) }}</span>
+<!--            <el-select-->
+<!--              v-model="row.storageId"-->
+<!--              filterable-->
+<!--              @change="storageChange(row)"-->
+<!--              disabled-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(item, index) in storageOptions"-->
+<!--                :key="index"-->
+<!--                :value="item.id"-->
+<!--                :label="item.cname"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
           </template>
           <template slot="remarks" slot-scope="{ row, index }">
             <el-input
@@ -761,6 +764,7 @@ export default {
           row.unit = e.unit;
           row.priceCategory = e.goodsTypeName;
           row.price = e.unitPrice;
+          row.storageId = e.storageId;
         }
       });
     },
@@ -775,6 +779,7 @@ export default {
           row.unit = e.unit;
           row.priceCategory = e.goodsTypeName;
           row.price = e.unitPrice;
+          row.storageId = e.storageId;
         }
       });
     },