问题修改

src/components/table/dk-table/dk-table.vue

@@ -1161,7 +1161,6 @@ export default {
             if (it.componentInstance.sum) {
               for (let column of columns) {
                 if (it.componentInstance.field === column.property) {
-                  // console.log('t1',it.componentInstance.columnType)
                   // if (it.componentInstance.columnType === '' && it.componentInstance.getColumnType) {
                   //   it.componentInstance.getColumnType(data)
                   // }

src/locale/lang/zh-CN.js

@@ -119,6 +119,7 @@ export const button = {
   chooseSalesForPurchase:'选择销售订单',
   purchaseBasedOnSales:'选择销售订单',
   choosePurchase:'选择采购入库单',
+  costCheck:'成本核对',
 }
 
 /**
@@ -744,6 +745,7 @@ export const columns = {
   ingBoxPiece:'包装数量',
   intoingBoxPiece:'入库在包装数量',
   intoBoxPiece:'已入库包装数量',
+  sumAmtHandle:'核销金额',
 }
 
 /**

src/view/fin/cost-check/index.vue

@@ -31,6 +31,7 @@
         :page-flag="false"
         :page-total-flag="false"
         :show-setting-flag="false"
+        show-footer
         :freeze="false">
         <DkTableColumn field="intoNo"></DkTableColumn>
         <vxe-column show-overflow="ellipsis" field="costPrice" width="100" height="100" min-width="80"
@@ -59,9 +60,9 @@
         <DkTableColumn field="skuName" width="auto"></DkTableColumn>
         <DkTableColumn field="supName" width="auto"></DkTableColumn>
         <DkTableColumn field="intoTypeName" width="auto"></DkTableColumn>
-        <DkTableColumn field="intoQty" width="auto"></DkTableColumn>
-        <DkTableColumn field="priceInto" width="auto"></DkTableColumn>
-        <DkTableColumn field="intoAmt" width="auto"></DkTableColumn>
+        <DkTableColumn field="intoQty" width="auto" data-type="number" :sum="true" :digits="0"></DkTableColumn>
+        <DkTableColumn field="priceInto" width="auto" data-type="number" sum :digits="0"></DkTableColumn>
+        <DkTableColumn field="intoAmt" width="auto" data-type="number" sum :digits="2"></DkTableColumn>
         <DkTableColumn field="flgCostCheckName" width="auto"></DkTableColumn>
 
       </DkTable>

src/view/fin/daily-check-report/index.vue

@@ -36,6 +36,7 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table"
+                   show-footer
                    :height="this.tableHeight * split - 36">
             <!-- 客户名称-->
             <DkTableColumn field="cusName"></DkTableColumn>
@@ -48,11 +49,11 @@
             <!-- 业务员-->
             <DkTableColumn field="staffName" width="auto"></DkTableColumn>
             <!-- 订货总额-->
-            <DkTableColumn field="totalOrderAmount" :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="totalOrderAmount" dataType="number" sum :digits="0"></DkTableColumn>
             <!-- 应收总额-->
-            <DkTableColumn field="amtShould" :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="amtShould" dataType="number" sum :digits="0"></DkTableColumn>
             <!-- 收款总额-->
-            <DkTableColumn field="amtRec" :title="$t('amtRecTotal')" :sum="true" :digits="0"></DkTableColumn>
+            <DkTableColumn field="amtRec" :title="$t('amtRecTotal')" dataType="number" sum :digits="0"></DkTableColumn>
             <!-- 账务日期-->
             <DkTableColumn field="accDate" width="auto" :dataType="$config.columnType.date"></DkTableColumn>
           </DkTable>

src/view/fin/other-receivable/index.vue

@@ -59,8 +59,8 @@
           </DkTable>
         </div>
         <div slot="bottom">
+          <DkTabs v-model="detailModel" :options="detailOptions" @on-click="detailTabsClick"></DkTabs>
           <div v-show="visItemFlag">
-            <DkTabs v-model="detailModel" :options="detailOptions" @on-click="detailTabsClick"></DkTabs>
             <!--其他收入单明细-->
             <DkTable :id="'table-'+$options.name" ref="detail-select" :data="tableDataDetail_otherReceivableItem"
                      showFooter
@@ -141,6 +141,16 @@ export default {
           valueKind: 'M-CHOICE'
         },
         {
+          itemCode: '制单时间-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE',
+          // required: true,
+        },
+        {
           itemCode: '业务员-文本',
           itemName: 'staffId',
           valueFormat: {
@@ -151,16 +161,7 @@ export default {
           },
           valueKind: 'M-CHOICE'
         },
-        {
-          itemCode: '制单时间-时间',
-          itemName: 'makeTime',
-          valueFormat: {
-            code: 'makeTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE',
-          // required: true,
-        },
+
         self.$config.flgValidSearch
       ],
     }

src/view/fin/payment/form.vue

@@ -184,7 +184,7 @@ export default {
         paymentResidue: 0,
         remarks: null,
         annexPaths: null,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         payableList: [],
@@ -261,7 +261,7 @@ export default {
      * @date   : 2024-02-20 15:53
      */
     initData() {
-      this.formData.staffId = this.$store.state.user.id
+      this.formData.staffId = this.$store.state.user.staffId
       this.formData.staffName = this.$store.state.user.staffName
       this.formData.orgId = this.$store.state.user.orgId
       this.formData.orgName = this.$store.state.user.orgName

src/view/fin/payment/index.vue

@@ -160,6 +160,16 @@ export default {
           valueKind: 'M-CHOICE'
         },
         {
+          itemCode: '制单时间-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE',
+          // required: true,
+        },
+        {
           itemCode: '付款类型-下拉',
           itemName: 'paymentType',
           valueFormat: {
@@ -184,16 +194,6 @@ export default {
         //   },
         //   valueKind: 'M-CHOICE'
         // },
-        {
-          itemCode: '制单时间-时间',
-          itemName: 'makeTime',
-          valueFormat: {
-            code: 'makeTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE',
-          // required: true,
-        },
         self.$config.flgValidSearch
       ],
     }

src/view/fin/receipt/form.vue

@@ -186,11 +186,11 @@ export default {
         receiptResidue: 0,
         remarks: null,
         annexPaths: null,
-        staffId: this.$store.state.user.id,
+        staffId: this.$store.state.user.staffId,
         staffName: this.$store.state.user.staffName,
         orgId: this.$store.state.user.orgId,
         orgName: this.$store.state.user.orgName,
-        makeStaff: self.$store.state.user.id,
+        makeStaff: self.$store.state.user.staffId,
         cpId: self.$store.state.user.cpId,
         itemList: [],
         receivableList: [],

src/view/fin/receipt/index.vue

@@ -151,6 +151,16 @@ export default {
           valueKind: 'STR'
         },
         {
+          itemCode: '制单时间-时间',
+          itemName: 'makeTime',
+          valueFormat: {
+            code: 'makeTime',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE',
+          // required: true,
+        },
+        {
           itemCode: '业务部门-文本',
           itemName: 'orgId',
           valueFormat: {
@@ -197,16 +207,6 @@ export default {
         //   },
         //   valueKind: 'M-CHOICE'
         // },
-        {
-          itemCode: '制单时间-时间',
-          itemName: 'makeTime',
-          valueFormat: {
-            code: 'makeTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE',
-          // required: true,
-        },
         self.$config.flgValidSearch
       ],
     }

src/view/fin/supplier-account-report/index.vue

@@ -31,11 +31,12 @@
                  ref="table-select"
                  :showCheckboxHeader="false"
                  :choose-flag="false"
+                 show-footer
                  v-show="!this.detailFlag">
           <DkTableColumn field="supName" type="link"
                          @on-link="tabsClick"></DkTableColumn>
-          <DkTableColumn field="sumAmtPay" data-type="number"/>
-          <DkTableColumn field="sumAmtHandle" data-type="number"/>
+          <DkTableColumn field="sumAmtPay" sum data-type="number" :digits="2" />
+          <DkTableColumn field="sumAmtHandle" sum data-type="number" :digits="2" />
           <DkTableColumn field="remarks" width="auto"></DkTableColumn>
         </DkTable>
 
@@ -47,12 +48,13 @@
                  primaryKey="itemId"
                  :multiple="false"
                  :choose-flag="false"
+                 show-footer
                  v-show="this.detailFlag">
           <DkTableColumn field="accItemTypeName"/>
           <DkTableColumn field="orgName"/>
           <DkTableColumn field="staffName"/>
-          <DkTableColumn field="amtPay" data-type="number"/>
-          <DkTableColumn field="amtHandle" data-type="number"/>
+          <DkTableColumn field="amtPay" data-type="number" sum :digits="2" />
+          <DkTableColumn field="amtHandle" data-type="number" sum :digits="2" />
           <!--备注-->
           <DkTableColumn field="remarks"></DkTableColumn>
         </DkTable>

src/view/report/detail-report/setting.js

@@ -164,14 +164,14 @@ const data = {
       {field: 'cusFromName'},
       {field: 'makeStaffName'},
       {field: 'makeTime',dataType:"dateTime"},
-      {field: 'sumQuantity',dataType:'number',align:'right'},
+      {field: 'sumQuantity',dataType:'number',align:'right',sum:true},
       {field: 'sumStandard',dataType:'number',align:'right'},
-      {field: 'sumAmount',dataType:'number',align:'right'},
+      {field: 'sumAmount',dataType:'number',align:'right',sum:true},
       {field: 'saleDiscount',dataType:'number',align:'right'},
       {field: 'paymentNo'},
-      {field: 'amtReceivable',dataType:'number',align:'right'},
-      {field: 'amtHandle',dataType:'number',align:'right'},
-      {field: 'amtResidue',dataType:'number',align:'right'},
+      {field: 'amtReceivable',dataType:'number',align:'right',sum:true},
+      {field: 'amtHandle',dataType:'number',align:'right',sum:true},
+      {field: 'amtResidue',dataType:'number',align:'right',sum:true},
       {field: 'remarks', width: 'auto'}
     ],
     detailColumns:[
@@ -184,11 +184,11 @@ const data = {
       {field: 'outNo'},
       {field: 'outStatusName'},
       {field: 'whName'},
-      {field: 'itemQty',dataType:'number',align:'right'},
+      {field: 'itemQty',dataType:'number',align:'right',sum:true},
       {field: 'priceStd',dataType:'number',align:'right'},
-      {field: 'amtStd',dataType:'number',align:'right'},
+      {field: 'amtStd',dataType:'number',align:'right',sum:true},
       {field: 'priceSale',dataType:'number',align:'right'},
-      {field: 'itemAmt',dataType:'number',align:'right'},
+      {field: 'itemAmt',dataType:'number',align:'right',sum:true},
       {field: 'priceDiscount',dataType:'number',align:'right'},
       {field: 'outingQty',dataType:'number',align:'right'},
       {field: 'outingAmt',dataType:'number',align:'right'},
@@ -883,7 +883,7 @@ const data = {
       {field: 'staffName'},
       {field: 'makeStaffName'},
       {field: 'macName'},
-      {field: 'amtRec',dataType:'number',sum:'true',align:'right'},
+      {field: 'amtRec',dataType:'number',sum:true,align:'right'},
       {field: 'remarks', width: 'auto'}
     ],
   },