前端孟祥旭

src/lang/zh.js

@@ -521,6 +521,11 @@
     purchaseReceiptFinanceList:'采购入库报表-财务查看',
     purchaseReceiptDeciderList:'采购入库报表-决策人查看',
     purchaseReceiptCashierList:'采购入库报表出纳查看',
+    purchaseClosingReportList:'采购平仓报表统计查看',
+    purchaseClosingFinanceList:'采购平仓报表财务查看',
+    purchaseClosingDeciderList:'采购平仓报表决策人查看',
+    purchaseClosingCashierList:'采购平仓报表出纳查看',
+    
 
     
     //运输管理
@@ -4777,6 +4782,10 @@
     purchaseReceiptFinanceList:'采购入库报表财务查看',
     purchaseReceiptDeciderList:'采购入库报表决策人查看',
     purchaseReceiptCashierList:'采购入库报表出纳查看',
+    purchaseClosingReportList:'采购平仓报表统计查看',
+    purchaseClosingFinanceList:'采购平仓报表财务查看',
+    purchaseClosingDeciderList:'采购平仓报表决策人查看',
+    purchaseClosingCashierList:'采购平仓报表出纳查看',
 
   },
   //运输管理

src/views/statisticalReport/component/routers/route.js

@@ -1,6 +1,6 @@
 import Layout from '@/layout/index';
 
-const purchasingManagementRouter = {
+const statisticalReportRouter = {
   path: '/statisticalReport',
   component: Layout,
   redirect: '/statisticalReport',
@@ -74,15 +74,15 @@ const purchasingManagementRouter = {
       },
     //   hidden: true
     },
-    //采购订单列表
+    //采购平仓报表统计查看
     {
-      path: 'purchaseOrderList',
+      path: 'purchaseClosingReportList',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/purchasingManagement/purchaseOrderList'),
-      name: 'purchaseOrderList',
+        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingReportList'),
+      name: 'purchaseClosingReportList',
       meta: {
-        title: 'purchaseOrderList',
-        shortcutEntrance: 'purchasingManagement',
+        title: 'purchaseClosingReportList',
+        shortcutEntrance: 'statisticalReport',
         module: 'contractManagement.salesContract',
         permissicon: [],
         keepAlive: true
@@ -90,9 +90,56 @@ const purchasingManagementRouter = {
       },
     //   hidden: true
     },
-   
+        //采购平仓报表财务查看
+        {
+            path: 'purchaseClosingFinanceList',
+            component: () =>
+            import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingFinanceList'),
+            name: 'purchaseClosingFinanceList',
+            meta: {
+            title: 'purchaseClosingFinanceList',
+            shortcutEntrance: 'statisticalReport',
+            module: 'contractManagement.salesContract',
+            permissicon: [],
+            keepAlive: true
+            // module: 'procurement.sparepart.applDetail'
+            },
+        //   hidden: true
+  },
+        //采购平仓报表决策人查看
+        {
+            path: 'purchaseClosingDeciderList',
+            component: () =>
+            import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingDeciderList'),
+            name: 'purchaseClosingDeciderList',
+            meta: {
+            title: 'purchaseClosingDeciderList',
+            shortcutEntrance: 'statisticalReport',
+            module: 'contractManagement.salesContract',
+            permissicon: [],
+            keepAlive: true
+            // module: 'procurement.sparepart.applDetail'
+            },
+        //   hidden: true
+        },
+        //采购平仓报表出纳人查看
+        {
+            path: 'purchaseClosingCashierList',
+            component: () =>
+            import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingCashierList'),
+            name: 'purchaseClosingCashierList',
+            meta: {
+            title: 'purchaseClosingCashierList',
+            shortcutEntrance: 'statisticalReport',
+            module: 'contractManagement.salesContract',
+            permissicon: [],
+            keepAlive: true
+            // module: 'procurement.sparepart.applDetail'
+            },
+        //   hidden: true
+        },
   ],
 
 };
 
-export default purchasingManagementRouter;
+export default statisticalReportRouter;

src/views/statisticalReport/purchaseReceiptCashierList.vue

@@ -1,4 +1,4 @@
-//采购入库报表统计查看
+//采购入库报表出纳查看
 <template>
   <div class="container">
     <el-scrollbar style="height:100%">
@@ -117,6 +117,14 @@
                   class="deal"
                 ></el-input>
               </el-form-item>
+              <el-form-item label="实际发票金额（元）" :label-width="formLabelWidth">
+                  <el-input 
+                    v-model="form.region"
+                    autocomplete="off"
+                    placeholder="请输入本次付款金额"
+                    class="deal"
+                  ></el-input>
+                  </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
               <el-button @click="dialogFormVisible2 = false">取 消</el-button>

src/views/statisticalReport/purchaseReceiptDeciderList.vue

@@ -1,4 +1,4 @@
-//采购入库报表统计查看
+//采购平仓报表决策人查看
 <template>
   <div class="container">
     <el-scrollbar style="height:100%">
@@ -25,8 +25,6 @@
           <ws-button type="primary" @click="handleAdd()">待结算</ws-button>
           <ws-button type="primary" @click="handleAdd()">已结算</ws-button>
           <ws-button type="primary" @click="handleAdd()">全部</ws-button>
-          <ws-button type="primary" @click="handleAdd()">通过</ws-button>
-          <ws-button type="primary" @click="handleAdd()">驳回</ws-button>
           <template slot="right">
             <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
             <ws-select
@@ -63,36 +61,27 @@
           :data="warehouseList.records"
           style="width: 100%; margin-top: 20px"
           height="780"
-           @selection-change="handleSelectionChange"
-           :summary-method="getSummaries"
-         
+          @selection-change="handleSelectionChange"
         >
-            <el-table-column type="selection" width="55"></el-table-column>
+        
+         <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
-          <el-table-column class="table_td" prop="procurementPlan" label="货名"></el-table-column>
-          <el-table-column class="table_td" prop="customer" label="仓位号"></el-table-column>
-          <el-table-column class="table_td" prop="unitPrice" label="车牌号"></el-table-column>
-          <el-table-column class="table_td" prop="basis" label="入库日期"></el-table-column>
-          <el-table-column class="table_td" prop="freezingDeposit" label="蛋白(%)>="></el-table-column>
-          <el-table-column class="table_td" prop="defaultDeposit" label="水分(%)>="></el-table-column>
-          <el-table-column class="table_td" prop="unloadingCharge" label="单价(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="invoiceFee" label="基差(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="send" label="卸车费(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="stockInQuantity" label="发票费(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="openPosition" label="扣款(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="closedPosition" label="结算单价(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop=" cumulativeTurnover" label="净重(吨)"></el-table-column>
-          <el-table-column class="table_td" label="应付金额(元)" prop="type"></el-table-column>
-          <el-table-column class="table_td" label="已付金额(元)"></el-table-column>
-          <el-table-column class="table_td" label="未付金额(元)" prop="type"></el-table-column>
-          <el-table-column class="table_td" label="付款日期"></el-table-column>
-          <el-table-column class="table_td" label="结转"></el-table-column>
-          <el-table-column class="table_td" label="客户确认"></el-table-column>
+          <el-table-column class="table_td" prop="procurementPlan" label="平仓日期"></el-table-column>
+          <el-table-column class="table_td" prop="customer" label="平仓数量(吨)"></el-table-column>
+          <el-table-column class="table_td" prop="unitPrice" label="成交价格(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="basis" label="平仓价格(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="freezingDeposit" label="基差(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="defaultDeposit" label="应付金额(元)"></el-table-column>
+          <el-table-column class="table_td" prop="unloadingCharge" label="已付金额(元)"></el-table-column>
+          <el-table-column class="table_td" prop="unloadingCharge" label="未付金额(元)"></el-table-column>
+          <el-table-column class="table_td" prop="invoiceFee" label="付款日期"></el-table-column>
+          <el-table-column class="table_td" prop="send" label="应收金额(元)"></el-table-column>
+          <el-table-column class="table_td" prop="stockInQuantity" label="已收金额(元)"></el-table-column>
+          <el-table-column class="table_td" prop="openPosition" label="未收金额(元)"></el-table-column>
+          <el-table-column class="table_td" prop="closedPosition" label="收款日期"></el-table-column>
           <el-table-column class="table_td" label="客户"></el-table-column>
           <el-table-column class="table_td" label="库点"></el-table-column>
-          <el-table-column class="table_td" label="发票类型"></el-table-column>
-          <el-table-column class="table_td" label="已开发票(元)"></el-table-column>
           <el-table-column prop="status" label="状态">
           </el-table-column>
         </el-table>
@@ -228,31 +217,6 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-     getSummaries(param) {
-          const { columns, data } = param;
-          const sums = [];
-          columns.forEach((column, index) => {
-              if (index === 0) {
-            sums[index] = '总价';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                   const value = Number(curr);
-                    if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-              }, 0);
-              sums[index] += ' 元';
-               } else {
-            sums[index] = 'N/A';
-             }
-        });
-         return sums;
-     },
     //成交
     submit() {
       if (!this.warehouseList.transactionPrice) {
@@ -312,6 +276,9 @@ export default {
     //       this.warehouseList = response
     //     })
     // },
+    handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
     handleRemove(file) {
       console.log(file)
     },
@@ -405,9 +372,6 @@ export default {
       }
       return fmt
     },
-    handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
     handleClose() {
       this.accessoryTFs = false
     },
@@ -459,6 +423,20 @@ export default {
         }
       }
     },
+    // fujian(row) {
+    //   if (
+    //     row.receiveAttachmentPath === null ||
+    //     row.receiveAttachmentPath === ''
+    //   ) {
+    //     EventBus.$emit(
+    //       'warning',
+    //       this.$t('system.noticeCircular.NoInformation')
+    //     )
+    //   } else {
+    //     this.accessoryTFs = true
+    //   }
+    //   this.appendixIdss = row.receiveAttachmentPath
+    // },
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',

src/views/statisticalReport/purchaseReceiptFinanceList.vue

@@ -1,4 +1,4 @@
-//采购入库报表统计查看
+//采购入库报表财务查看
 <template>
   <div class="container">
     <el-scrollbar style="height:100%">