Jelajahi Sumber

feat(库存管理): 添加增重重量列并支持在销售订单详情中显示

yusheng 6 bulan lalu
induk
melakukan
cdb5de7a59

+ 19 - 2
src/BIZComponents/inventoryTableDetails.vue

@@ -88,7 +88,7 @@
   // import fileMain from '@/components/addDoc/index.vue';
   import { contactQueryByCategoryIdsAPI } from '@/api/bpm/components/supplierManage/contact';
   const dayjs = require('dayjs');
-  import { lbjtList, levelList,pricingWayList } from '@/enum/dict.js';
+  import { lbjtList, levelList, pricingWayList } from '@/enum/dict.js';
   import timeDialog from '@/components/timeDialog/index.vue';
 
   export default {
@@ -158,6 +158,11 @@
       quoteType: {
         type: Number,
         default: 1
+      },
+      //是否显示增重重量
+      isIncreaseTotalWeight: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -434,7 +439,19 @@
             },
             align: 'center'
           },
-
+          {
+            width: 180,
+            prop: 'increaseTotalWeight',
+            label: '增重重量',
+            slot: 'increaseTotalWeight',
+            isNone: this.quoteType === 2 || !this.isIncreaseTotalWeight,
+            align: 'center',
+            formatter: (row, column) => {
+              if (row.increaseTotalWeight) {
+                return row.increaseTotalWeight + ' ' + (row.weightUnit || '');
+              }
+            }
+          },
           {
             width: 160,
             prop: 'goodsPriceType',

+ 12 - 1
src/views/bpm/handleTask/components/purchaseOrder/detailDialog.vue

@@ -220,7 +220,7 @@
   // import fileMain from '@/components/addDoc/index.vue';
   import { orderSourceType, outsourceSceneList } from '@/enum/dict';
   import { lbjtList } from '@/enum/dict.js';
-  import { levelList,pricingWayList } from '@/enum/dict.js';
+  import { levelList, pricingWayList } from '@/enum/dict.js';
   export default {
     mixins: [dictMixins],
     // components: { fileMain },
@@ -451,6 +451,17 @@
             },
             align: 'center'
           },
+          {
+            width: 180,
+            prop: 'increaseTotalWeight',
+            label: '增重重量',
+            align: 'center',
+            formatter: (row, column) => {
+              if (row.increaseTotalWeight) {
+                return row.increaseTotalWeight + ' ' + (row.weightUnit || '');
+              }
+            }
+          },
           // {
           //   width: 120,
           //   prop: 'weightUnit',

+ 1 - 0
src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

@@ -210,6 +210,7 @@
         :isDiscountTotalPrice="true"
         :isArrivalWay="true"
         :isProductionRequirements="true"
+        :isIncreaseTotalWeight="true"
       ></inventoryTabledetail>
       <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>