入库明细报表

src/locale/lang/zh-CN.js

@@ -591,6 +591,7 @@ export const columns = {
   outAmtSum:'已出库总金额',
   returnOutQtySum:'已出库退货总量',
   returnOutAmtSum:'已出库退货总金额',
+  intoTypeName:'入库类型',
 }
 
 /**

src/view/ivt/ivt-transfer/form.vue

@@ -161,12 +161,12 @@ export default {
           field: 'transferQty',
           type: 'number',
           digits: 0,
-          formula: {
+          /*formula: {
             intoingAmt: ['transferQty*priceInto', 'transferQty', 'priceInto'],
-          },
+          },*/
         },
-        //入库单价
-        {
+        //入库单价 注释掉不用输入金额 后台默认0
+       /* {
           field: 'priceInto',
           title: self.$t('transferPrice'),
           type: 'number',
@@ -174,9 +174,9 @@ export default {
           formula: {
             intoingAmt: ['transferQty*priceInto', 'transferQty', 'priceInto'],
           },
-        },
+        },*/
         //入库金额
-        {
+       /* {
           field: 'intoingAmt',
           title: self.$t('transferAmt'),
           type: 'number',
@@ -185,7 +185,7 @@ export default {
           formula: {
             priceInto: ['intoingAmt/transferQty', 'transferQty', 'intoingAmt'],
           },
-        },
+        },*/
         //备注
         {
           field: 'remarks', type: 'text', equal: true,
@@ -237,12 +237,12 @@ export default {
           field: 'transferQty',
           type: 'number',
           digits: 0,
-          formula: {
+         /* formula: {
             intoingAmt: ['transferQty*priceInto', 'transferQty', 'priceInto'],
-          },
+          },*/
         },
-        //入库单价
-        {
+        //入库单价 注释掉不用输入金额 后台默认0
+        /*{
           field: 'priceInto',
           title: self.$t('transferPrice'),
           type: 'number',
@@ -250,9 +250,9 @@ export default {
           formula: {
             intoingAmt: ['transferQty*priceInto', 'transferQty', 'priceInto'],
           },
-        },
+        },*/
         //入库金额
-        {
+       /* {
           field: 'intoingAmt',
           title: self.$t('transferAmt'),
           type: 'number',
@@ -261,7 +261,7 @@ export default {
           formula: {
             priceInto: ['intoingAmt/transferQty', 'transferQty', 'intoingAmt'],
           },
-        },
+        },*/
         //备注
         {
           field: 'remarks', type: 'text', equal: true,

src/view/ivt/ivt-transfer/index.vue

@@ -297,6 +297,30 @@ export default {
     },
 
     /**
+     * @desc   : 作废
+     * @author : 宋扬
+     * @date   : 2024/4/15 13:08
+     */
+    invalid(rows) {
+      if (rows && rows.length > 0) {
+        this.$IBMessage({content: this.$t('Q_002', {'param': this.$v('invalid')}), title: this.$t('systemQuestion')},
+          {
+            ok: () => {
+              this.loading = true
+              this.excuteNoParam(this.$service.transferService, this.$service.transferService.invalid, [rows[0].transferId], false).then(res => {
+                if (res.code === this.$config.SUCCESS_CODE) {
+                  this.$Message.success(this.$t('I_001', {'param': this.$t('invalid')}))
+                } else {
+                  this.$Message.warning(res.message)
+                }
+                this.loading = false
+              })
+            },
+          })
+      }
+    },
+
+    /**
      * @desc   : 打开附件
      * @author : 宋扬
      * @date   : 2024/4/3 16:25

src/view/report/detail-report/index.vue

@@ -119,6 +119,7 @@ export default {
     getSelectDataSource() {
       let filters = this.searchContent.filter(it => it.valueKind == 'M-CHOICE' || it.valueKind == 'S-CHOICE');
       if (filters && filters.length > 0) {
+        let params = {}
         filters.forEach(it => {
           params = {}
           if (it.valueFormat && it.valueFormat.service && it.valueFormat.method) {

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

@@ -566,7 +566,7 @@ const data = {
     // 接口文件
     serviceStr: 'detailReportService',
     // 查询方法
-    methodsName: 'inbound_detail_report',
+    methodsName: 'getInboundDetailReport',
     // 查询条件
     searchContent: [
       // 出库单号
@@ -594,7 +594,7 @@ const data = {
         magnifierType: Config.MagnifierType.customer,
       },
 
-      // 出库日期
+      // 入库日期
       {
         itemCode: 'intoDate',
         valueFormat: {
@@ -698,24 +698,24 @@ const data = {
     ],
     // 列表列
     columns: [
-      {field: 'outNo'},
+      {field: 'intoNo'},
       {field: 'fromNo'},
-      {field: 'outTypeName'},
-      {field: 'outStatusName'},
+      {field: 'intoTypeName'},
+      {field: 'intoStatusName'},
       {field: 'supplierName'},
       {field: 'cusName'},
       {field: 'cusPhone'},
       {field: 'cusFrom'},
-      {field: 'outDate',type: 'date'},
+      {field: 'intoDate',type: 'date'},
       {field: 'orgName'},
       {field: 'staffName'},
       {field: 'makeStaffName'},
-      {field: 'outingQtySum',type:'number'},
-      {field: 'outingAmtSum',type:'number'},
-      {field: 'outQtySum',type:'number'},
-      {field: 'outAmtSum',type:'number'},
-      {field: 'returnOutQtySum',type:'number'},
-      {field: 'returnOutAmtSum',type:'number'},
+      {field: 'intoingQtySum',type:'number'},
+      {field: 'intoingAmtSum',type:'number'},
+      {field: 'intoQtySum',type:'number'},
+      {field: 'intoAmtSum',type:'number'},
+      {field: 'returnInQtySum',type:'number'},
+      {field: 'returnInAmtSum',type:'number'},
       {field: 'remarks', width: 'auto'}
     ],
     detailColumns:[
@@ -726,10 +726,10 @@ const data = {
       {field: 'catName'},
       {field: 'seriesName'},
       {field: 'whName'},
-      {field: 'outingQty',type:'number'},
-      {field: 'outingAmt',type:'number'},
-      {field: 'outQty',type:'number'},
-      {field: 'outAmt',type:'number'},
+      {field: 'intoingQty',type:'number'},
+      {field: 'intoingAmt',type:'number'},
+      {field: 'intoQty',type:'number'},
+      {field: 'intoAmt',type:'number'},
       {field: 'returnQty',type:'number'},
       {field: 'returnAmt',type:'number'},
     ]