Przeglądaj źródła

refactor(销售订单调整单): 清理未使用的导入和优化价格格式化

liujt 2 miesięcy temu
rodzic
commit
eb4ed737b3

+ 0 - 19
src/views/saleManage/saleOrder/adjustmentNote‌/components/addAdjustDialog.vue

@@ -202,19 +202,12 @@
 </template>
 
 <script>
-  import { acceptUnpackoptions } from '@/enum/dict';
-  import fileUpload from '@/components/upload/fileUpload';
   import dictMixins from '@/mixins/dictMixins';
-  import deptSelect from '@/components/CommomSelect/dept-select.vue';
-  import personSelect from '@/components/CommomSelect/person-select.vue';
-  import parentList from '@/views/saleManage/contact/components/parentList.vue';
   import inventoryTable from './inventoryTable.vue';
   import { copyObj } from '@/utils/util';
   import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
   import fileMain from '@/components/addDoc/index.vue';
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
-  import orderListDialog from '@/views/saleManage/saleOrder/invoice/components/orderListDialog.vue';
-  import inventoryTable1 from '@/BIZComponents/inventoryTable.vue';
   import inventoryTableDetails from '@/BIZComponents/inventoryTableDetails.vue';
   import {
     getSaleOrderDetail,
@@ -224,15 +217,9 @@
   export default {
     mixins: [dictMixins],
     components: {
-      orderListDialog,
       processSubmitDialog,
       fileMain,
-      fileUpload,
-      deptSelect,
       inventoryTable,
-      inventoryTable1,
-      parentList,
-      personSelect,
       inventoryTableDetails
     },
     //客户管理数据
@@ -587,12 +574,6 @@
                 this.loading = false;
                 this.$message.success('新增成功');
                 if (type === 'sub') {
-                  // let storemanIds = '';
-                  // let ids = commitData.detailList.map(
-                  //   (item) => item.warehouseId
-                  // );
-                  // let warehouseList = await getWarehouseListByIds(ids || []);
-                  // storemanIds = warehouseList.map((item) => item.ownerId);
                   this.adjustSubmit(res);
                   this.$emit('done');
                   return;

+ 6 - 19
src/views/saleManage/saleOrder/adjustmentNote‌/components/inventoryTable.vue

@@ -61,6 +61,7 @@
   import productList from '@/views/saleManage/saleOrder/invoice/components/product-list.vue';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import { reduce } from 'lodash';
+  import { formatPrice } from '@/BIZComponents/setProduct.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -268,7 +269,7 @@
           this.$set(
             this.form.datasource[index],
             'adjustPrice',
-            row.priceDifference ? row.price + Number(row.priceDifference) : row.price
+            row.priceDifference ? formatPrice(+row.price + Number(row.priceDifference)) : row.price
           );
           // 改变相关数据
           this.$set(
@@ -286,24 +287,10 @@
       //改变数量
       changeCount(row, countObj) {
         
-        // let total = row['quantity'] || 0;
         let data = row;
-        // if (row.packageDispositionList) {
-        //   let endIndex = row.packageDispositionList.findIndex(
-        //     (ite) => row[countObj.unitIdKey] == ite.id
-        //   );
-        //   for (; 0 < endIndex; endIndex--) {
-        //     total = Vue.prototype.$math.format(
-        //       row.packageDispositionList[endIndex].packageCell * total,
-        //       14
-        //     );
-        //   }
-        // }
-
-        // data['totalCount'] = total;
+   
         data['adjustDiscountPrice'] = data.adjustPrice;
 
-
         if (row['quantity'] && row.adjustPrice) {
           data['adjustAmount'] = row['quantity'] * row.adjustPrice;
           data['adjustDiscountAmount'] = data.adjustAmount;
@@ -417,14 +404,14 @@
         
         // let num =
         //   Number(this.form.adjustDiscountAmount) * (Number(row.adjustDiscountAmount) /Number(this.allPrice));
-        return isNaN(num) ? '' : num.toFixed(2);
+        return isNaN(num) ? '' : formatPrice(num);
       },
 
       //获取折让合计
       getDiscountTotalPrice(row) {
         let num = 0;
         num = Number(row.adjustDiscountPrice) * Number(row.quantity);
-        return isNaN(num) ? '' : num.toFixed(2);
+        return isNaN(num) ? '' : formatPrice(num);
       },
       getTotalCount(row) {
         let num = 0;
@@ -434,7 +421,7 @@
             num += Number(item.totalCount);
           });
 
-        return num;
+        return formatPrice(num);
       },
       // 返回列表数据
       getTableValue() {