Sfoglia il codice sorgente

feat: 采购收货单增加收货金额

liujt 2 settimane fa
parent
commit
e28e16a013

+ 1 - 1
src/views/purchasingManage/purchaseOrder/index.vue

@@ -22,7 +22,7 @@
         <div v-if="activeComp == 'saleorder'">
           <div class="ele-border-lighter form-content" v-loading="loading">
             <search-table @search="reload"></search-table>
-            <div v-table-scroll-sync class="table-container">
+            <div class="table-container">
               <!-- 数据表格 -->
               <ele-pro-table
                 ref="table"

+ 17 - 1
src/views/purchasingManage/purchaseOrder/invoice/index.vue

@@ -17,6 +17,8 @@
           :page-size="20"
           @columns-change="handleColumnChange"
           :cache-key="cacheKeyUrl"
+          show-summary
+          :summary-method="getSummaries"
         >
           <!-- 表头工具栏 -->
           <template v-slot:toolbar>
@@ -207,7 +209,7 @@
   import printTemplateWl from './components/print-template-wl.vue';
   import printTemplateTr from './components/print-template-tr.vue';
   import printTemplateHt from './components/print-template-ht.vue';
-
+  import { getSummaries } from '@/utils/util.js';
   import popModal from '@/components/pop-modal';
   import { reviewStatus } from '@/enum/dict';
   import orderDetailDialog from '@/views/purchasingManage/purchaseOrder/components/detailDialog.vue';
@@ -329,6 +331,13 @@
             showOverflowTooltip: true,
             minWidth: 140
           },
+          {
+            prop: 'receiveTotalPrice',
+            label: '收货金额',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 140
+          },
           {
             prop: 'supplierName',
             label: '供应商名称',
@@ -411,6 +420,13 @@
     },
 
     methods: {
+      getSummaries(param) {
+        return getSummaries(
+          param,
+          ['orderTotalCount', 'receiveTotalCount', 'receiveTotalPrice'],
+          ' '
+        );
+      },
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
         this.params = {

+ 2 - 2
vue.config.js

@@ -36,9 +36,9 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.1.251:18086', //开发
+        // target: 'http://192.168.1.251:18086', //开发
         // target: 'http://192.168.1.251:18186', //测试
-        // target: 'http://192.168.1.3:18086',//罗
+        target: 'http://192.168.1.15:18086',//罗
         // target: 'http://192.168.1.144:18086',//付
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域