whj 1 year ago
parent
commit
7fee2f4bf8

+ 19 - 31
src/views/report/instorecount/InStoreCount.vue

@@ -189,15 +189,6 @@ export default {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        {
-          title: '备件类别',
-          dataIndex: 'typeId',
-          checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return record.typeName
-          }
-        },
         {
           title: '备件规格',
           checked: true,
@@ -205,19 +196,16 @@ export default {
           dataIndex: 'ggxh'
         },
         {
-          title: '原厂编号',
+          title: '编号',
           dataIndex: 'initNo',
           checked: true,
           width: '150px'
         },
         {
           title: '备件',
-          dataIndex: 'spareId',
+          dataIndex: 'name',
           checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return record.spareName
-          }
+          width: '150px'
         },
         {
           title: '备件类型',
@@ -231,15 +219,15 @@ export default {
           width: '150px',
           dataIndex: 'totalNum'
         },
-        {
-          title: '入库总价',
-          dataIndex: 'totalPrice',
-          checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
-          }
-        },
+        // {
+        //   title: '入库总价',
+        //   dataIndex: 'totalPrice',
+        //   checked: true,
+        //   width: '150px',
+        //   customRender: (text, record, index) => {
+        //     return this.BaseTool.Amount.formatter(text)
+        //   }
+        // },
         {
           title: '品牌',
           checked: true,
@@ -259,14 +247,14 @@ export default {
           checked: true,
           width: '150px',
           title: '数量',
-          dataIndex: 'inNum'
-        },
-        {
-          checked: true,
-          width: '150px',
-          title: '总价',
-          dataIndex: 'totalPrice'
+          dataIndex: 'totalNum'
         },
+        // {
+        //   checked: true,
+        //   width: '150px',
+        //   title: '总价',
+        //   dataIndex: 'totalPrice'
+        // },
         {
           title: '计量单位',
           checked: true,

+ 3 - 12
src/views/report/outstorecount/OutStoreCount.vue

@@ -205,12 +205,9 @@ export default {
         },
         {
           title: '备件名称',
-          dataIndex: 'spareId',
+          dataIndex: 'name',
           checked: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return record.spareName
-          }
+          width: '150px'
         },
         {
           title: '备件类型',
@@ -243,13 +240,7 @@ export default {
           checked: true,
           width: '150px',
           title: '数量',
-          dataIndex: 'inNum'
-        },
-        {
-          checked: true,
-          width: '150px',
-          title: '总价',
-          dataIndex: 'totalPrice'
+          dataIndex: 'totalNum'
         },
         {
           title: '计量单位',