财务、库存总账模块添加合计

src/views/basicdata/warehouse/index.vue

@@ -199,7 +199,7 @@
             </el-form-item>
           </el-col>
             <el-form-item label="库容（吨）" prop="fTotalgross" label-width="80">
-              <el-input v-model="form.fTotalgross" placeholder="请输入库容（吨位）" style="width:200px"/>
+              <el-input v-model="form.fTotalgross" placeholder="请输入库容（吨位）" style="width:305px"/>
             </el-form-item>
         </el-row>
 

src/views/finance/charge/index.vue

@@ -106,7 +106,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange" show-summary :summary-method="listTotal">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
@@ -694,6 +694,29 @@ export default {
     this.adoPt()
   },
   methods: {
+    //收费页面合计
+    listTotal(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === 6  || index === 7 || index === 8) {
+          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)
+          }
+        }
+      })
+      return sums
+    },
     approvalRevocation(){
       let  data = {
         id:this.queryParams.fId,

src/views/finance/contrast/index.vue

@@ -124,6 +124,8 @@
       v-loading="loading"
       :data="contrastList"
       @selection-change="handleSelectionChange"
+      show-summary
+      :summary-method="listTotal"
     >
       <el-table-column width="50" align="center" type="selection"/>
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
@@ -337,6 +339,10 @@
             <span v-else>{{scope.row.fBilltype}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="计价单位" align="center" prop="fFeeunitid" />
+        <el-table-column label="数量" align="center" prop="fQty" />
+        <el-table-column label="单价" align="center" prop="fUnitprice" />
+
         <el-table-column label="来源编号" align="center" prop="srcBillNo" />
         <el-table-column label="提单号" align="center" prop="fMblno" />
         <el-table-column label="货物品名" align="center" prop="fProductName" />
@@ -666,6 +672,7 @@ export default {
 
   data() {
     return {
+      jFeetunitOptions:[],
       // 总条数
       total: 0,
       totAL:0,
@@ -821,11 +828,37 @@ export default {
   created() {
     this.getList()
     this.register()
+    this.getDicts("data_unitfees").then((response) => {
+      this.jFeetunitOptions = response.data;
+    });
   },
   activated(){
     this.Jump()
   },
   methods: {
+    //对账页面合计
+    listTotal(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index ===7  || index ===8 ) {
+          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)
+          }
+        }
+      })
+      return sums
+    },
     //财务主取消
     signOut(){
       this.innerVisible = false
@@ -1147,7 +1180,6 @@ export default {
             this.pass.fName = this.nothing[0] + "..."
           }
           this.DzfeeList = this.DzfeeList.concat(this.selection)
-          console.log(this.selection)
           this.queryParams.tMblno = this.pass.fMblno //提单号
           this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
           this.queryParams.fCtrlcorpid = this.pass.fName
@@ -1451,7 +1483,6 @@ export default {
       getFee(fId).then(response => {
         this.Operator = response.data.tFee.createBy
         this.DzfeeList = response.data.feeDoList
-        console.log(this.DzfeeList)
         this.fWbuOptions = response.data.feesList
         this.queryParams = response.data.tFee
         this.fMblnoOptions = response.data.corps

src/views/finance/payment/index.vue

@@ -106,7 +106,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange" show-summary :summary-method="listTotal">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
@@ -693,6 +693,29 @@ export default {
     this.adoPt()
   },
   methods: {
+    //付费页面合计
+    listTotal(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === 6  || index === 7 || index === 8) {
+          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)
+          }
+        }
+      })
+      return sums
+    },
     approvalRevocation(){
       let  data = {
         id:this.queryParams.fId,

src/views/reportManagement/Statistics/index.vue

@@ -158,7 +158,7 @@
 
     <el-table v-loading="loading" :data="whgenlegList">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column type="index" label="行号" align="center" width="120"/>
+      <el-table-column type="index" label="行号" align="center" />
       <el-table-column label="客户" align="center" prop="fName" show-overflow-tooltip width="120"/>
       <el-table-column label="入库日期" align="center" prop="fBsdate" width="120">
         <template slot-scope="scope">
@@ -177,9 +177,9 @@
         :formatter="fTrademodeidFormat"
         width="120"
       />
-      <el-table-column label="件数" align="center" prop="fQty" width="120"/>
-      <el-table-column label="毛重" align="center" prop="fGrossweight" width="120"/>
-      <el-table-column label="净重" align="center" prop="fNetweight" width="120"/>
+      <el-table-column label="件数" align="center" prop="fQty" />
+      <el-table-column label="毛重" align="center" prop="fGrossweight" />
+      <el-table-column label="净重" align="center" prop="fNetweight" />
 
 <!--      <el-table-column v-if="queryParams.fBilltype === 'SJRK'" label="入库件数" align="center" prop="fQty" width="120"/>-->
 <!--      <el-table-column v-if="queryParams.fBilltype === 'SJCK'" label="出库件数" align="center" prop="fQty" width="120"/>-->
@@ -364,7 +364,8 @@ export default {
         fMarks: null,
         fBusinessType:null,
         fBusinessTypes:null,
-        fBilltype:null
+        fBilltype:null,
+        fwarehouseid:null
       },
       // 表单参数
       form: {},
@@ -465,6 +466,7 @@ export default {
         fOriginalbillno: null,
         fWarehouseLocationid: null,
         fGoodsid: null,
+        fwarehouseid:null,
         fTrademodeid: null,
         fPreqty: null,
         fPregrossweight: null,
@@ -499,7 +501,33 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        fOriginalbillno: null,
+        fPreqty: null,
+        fPregrossweight: null,
+        fPrenetweight: null,
+        fQtyd: null,
+        fVolumnd: null,
+        fGrossweightd: null,
+        fNetweightd: null,
+        fVolumnc: null,
+        fQtyc: null,
+        fQtyblc: null,
+        fGrossweightc: null,
+        fNetweightc: null,
+        fGrossweightblc: null,
+        fNetweightblc: null,
+        fCntrno: null,
+        fStatus: null,
+        fMarks: null,
+        fBusinessType:null,
+        fBusinessTypes:null,
+        fBilltype:null,
+        fwarehouseid:null
+      }
+      // this.resetForm("queryForm");
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/reportManagement/generalLedgerCr/index.vue

@@ -132,7 +132,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="payableList">
+    <el-table v-loading="loading" :data="payableList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
       <el-table-column label="货权方" align="center" prop="fName" show-overflow-tooltip/>
@@ -147,7 +147,7 @@
       </el-table-column>
       <el-table-column label="应付金额" align="center" prop="fAmount" />
       <el-table-column label="实付金额" align="center" prop="fStlamount" />
-      <el-table-column label="未付金额" align="center" prop="" />
+      <el-table-column label="未付金额" align="center" prop="nnfinished" />
 
     </el-table>
 
@@ -298,6 +298,29 @@ export default {
     });
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index ===7  || index ===8 || index ===9 ) {
+          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)
+          }
+        }
+      })
+      return sums
+    },
     // 贸易方式(数据字典),对���t_trademodels 字典翻译
     fTrademodeidFormat(row, column) {
       return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);

src/views/reportManagement/generalLedgerDr/index.vue

@@ -132,7 +132,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="receivableList">
+    <el-table v-loading="loading" :data="receivableList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
       <el-table-column label="货权方" align="center" prop="fName" show-overflow-tooltip />
@@ -147,7 +147,7 @@
       </el-table-column>
       <el-table-column label="应收金额" align="center" prop="fAmount" />
       <el-table-column label="实收金额" align="center" prop="fStlamount"/>
-      <el-table-column label="未收金额" align="center" prop=""/>
+      <el-table-column label="未收金额" align="center" prop="nnfinished"/>
 
 
     </el-table>
@@ -298,6 +298,29 @@ export default {
     });
   },
   methods: {
+    getSum(param){
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总计'
+          } else if (index ===7  || index ===8 || index ===9 ) {
+            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)
+            }
+          }
+        })
+        return sums
+      },
+
     // 贸易方式(数据字典),对���t_trademodels 字典翻译
     fTrademodeidFormat(row, column) {
       return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);

src/views/reportManagement/whgenleg/index.vue

@@ -467,7 +467,33 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        fOriginalbillno: null,
+        fPreqty: null,
+        fPregrossweight: null,
+        fPrenetweight: null,
+        fQtyd: null,
+        fVolumnd: null,
+        fGrossweightd: null,
+        fNetweightd: null,
+        fVolumnc: null,
+        fQtyc: null,
+        fQtyblc: null,
+        fGrossweightc: null,
+        fNetweightc: null,
+        fGrossweightblc: null,
+        fNetweightblc: null,
+        fCntrno: null,
+        fStatus: null,
+        fMarks: null,
+        fBusinessType:null,
+        fBusinessTypes:null,
+        fBilltype:null,
+        fwarehouseid:null
+      }
+      // this.resetForm("queryForm");
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -260,6 +260,7 @@
         <template slot-scope="scope">
           <span v-if="scope.row.fItemsStatus === 1">计划</span>
           <span v-if="scope.row.fItemsStatus === 2">待调拨</span>
+          <span v-if="scope.row.fItemsStatus === 3">调拨中</span>
           <span v-if="scope.row.fItemsStatus === 6">已调拨</span>
         </template>
       </el-table-column>
@@ -3328,6 +3329,11 @@ export default {
             this.approvalStatus = true
           }
         }
+
+
+
+
+
         if (response.data.corps) {
           this.fMblnoOptions = response.data.corps;
           this.KHblnoOptions = response.data.corps;
@@ -3339,6 +3345,11 @@ export default {
         if (response.data.warehouse) {
           this.warehouseOptions = response.data.warehouse;
         }
+
+
+
+
+
         if (response.data.warehouseBillsItem) {
           this.dataList = response.data.warehouseBillsItem;
           for (let list in this.dataList) {
@@ -3352,6 +3363,10 @@ export default {
             this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
           }
         }
+
+
+
+
         if (response.data.enclosures) {
           this.relevantAttachments = response.data.enclosures;
         }