合计样式修改

src/views/finance/charge/index.vue

@@ -107,7 +107,7 @@
     </el-row>
 
     <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 type="selection" width="60" 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"/>
       <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="120"/>

src/views/finance/contrast/index.vue

@@ -127,7 +127,7 @@
       show-summary
       :summary-method="listTotal"
     >
-      <el-table-column width="50" align="center" type="selection"/>
+      <el-table-column width="60" align="center" type="selection"/>
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
       <el-table-column label="行号" align="center" type="index"/>
       <el-table-column label="系统编号" align="center" prop="fBillno" show-overflow-tooltip width="120"/>

src/views/finance/payment/index.vue

@@ -107,7 +107,7 @@
     </el-row>
 
     <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 type="selection" width="60" 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"/>
       <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="120"/>

src/views/reportManagement/Statistics/index.vue

@@ -131,7 +131,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList">
+    <el-table v-loading="loading" :data="whgenlegList" 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 width="120"/>
@@ -369,6 +369,29 @@ export default {
     })
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===9 || index ===10 || index ===11 ) {
+          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
+    },
     treeseLect(tree){
       this.queryParams.fWarehouseid = tree.id
     },

src/views/reportManagement/whgenleg/index.vue

@@ -120,7 +120,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList">
+    <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" width="120"/>
       <el-table-column label="客户" align="center" prop="fCorpid" show-overflow-tooltip width="120"/>
@@ -346,6 +346,29 @@ export default {
     })
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===13  || index ===10 || index ===11 || index ===12 || index ===14 || index ===15 || index ===16 || index ===17 || index ===18) {
+          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
+    },
     treeseLect(tree){
       this.queryParams.fWarehouseLocationid = tree.id
     },

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -245,7 +245,7 @@
       show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="60" align="center"/>
       <el-table-column type="index" label="行号" align="center"/>
       <el-table-column  label="制单人" align="center" prop="createBy" />
       <el-table-column

src/views/warehouseBusiness/inStock/index.vue

@@ -270,7 +270,7 @@
       @selection-change="handleSelectionChange"
       show-summary :summary-method="getSum"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" align="center" fixed/>
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
@@ -725,7 +725,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="15">
+          <el-col :span="14">
             <el-form-item label="备注" prop="remark">
               <el-input
                 style="width: 100%"
@@ -742,11 +742,12 @@
               </el-button>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item prop="fChargedate">
               <el-date-picker
                 v-model="form.fChargedate"
                 type="date"
+                style="width:80%"
                 :disabled="browseStatus || formBrowseStatus"
                 value-format="timestamp"
                 placeholder="仓储费计算日期"

src/views/warehouseBusiness/outStock/index.vue

@@ -255,7 +255,7 @@
       @selection-change="handleSelectionChange"
       show-summary :summary-method="getSum"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -256,7 +256,7 @@
       show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column