Главная Обзор Помощь
Вход
kd-aiot
/
kd-aiot-frontend-eom
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

fix(accountstatement): 处理订单类别为4时金额显示为'--'的问题

liujt 3 месяцев назад
Родитель
4c5b93fadd
Сommit
aa617e36e5
4 измененных файлов с 19 добавлено и 8 удалено
Единый вид Показать статистику Diff
  1. 8 3
      src/views/saleManage/saleOrder/accountstatement/components/addAccountDialog.vue
  2. 6 1
      src/views/saleManage/saleOrder/accountstatement/components/detailDialog.vue
  3. 1 1
      src/views/saleManage/saleOrder/accountstatement/components/inventoryTable.vue
  4. 4 3
      src/views/saleManage/saleOrder/invoice/components/print-template-jsyp.vue

+ 8 - 3
src/views/saleManage/saleOrder/accountstatement/components/addAccountDialog.vue
Просмотреть файл 

@@ -27,7 +27,7 @@
 
         <template v-slot>
 
         <template v-slot>
 
           <el-row style="font-weight: 700; color: red">
 
           <el-row style="font-weight: 700; color: red">
 
             <span>订单总金额：</span>
 
             <span>订单总金额：</span>
 
-            <span>{{ dataForm.orderTotalAmount || 0 }}</span>
 
+            <span>{{ isNonDirectionalSale ? '--' : dataForm.orderTotalAmount || 0 }}</span>
 
             <el-divider direction="vertical"></el-divider>
 
             <el-divider direction="vertical"></el-divider>
 
             <span>已对账金额：</span>
 
             <span>已对账金额：</span>
 
             <span>{{ dataForm.amountCompletePrice || 0 }}</span>
 
             <span>{{ dataForm.amountCompletePrice || 0 }}</span>
 
@@ -157,7 +157,11 @@
 
         businessId: ''
 
         businessId: ''
 
       };
 
       };
 
     },
 
     },
 
-    computed: {},
 
+    computed: {
 
+      isNonDirectionalSale() {
 
+        return this.datasource.some(item => item.orderCategory == 4);
 
+      }
 
+    },
 
     methods: {
 
     methods: {
 
       changeDiscountPrice(price, tableIndex) {
 
       changeDiscountPrice(price, tableIndex) {
 
         console.log('price~~~', price, tableIndex)
 
         console.log('price~~~', price, tableIndex)
 
@@ -192,6 +196,7 @@
 
       //获取对账单详情
 
       //获取对账单详情
 
       async getInfo(row) {
 
       async getInfo(row) {
 
         let data = await accountstatementInfoAPI(row.id);
 
         let data = await accountstatementInfoAPI(row.id);
 
+        console.log('data~~~', data)
 
         // this.recorpayList = data.recorpayList || [];
 
         // this.recorpayList = data.recorpayList || [];
 
         // 解决小数精度丢失问题，使用分进行计算
 
         // 解决小数精度丢失问题，使用分进行计算
 
         data.orderTotalAmount = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.orderAmount * 100), 0) / 100;
 
         data.orderTotalAmount = data.orderList.reduce((pre, cur) => pre + Math.round(+cur.orderAmount * 100), 0) / 100;
 
@@ -242,7 +247,7 @@
 
       },
 
       },
 
       //查询获取订单数据
 
       //查询获取订单数据
 
       async handleSearch(params) {
 
       async handleSearch(params) {
 
-        console.log('this.$refs.inventoryTableRef~~~', this.$refs.inventoryTableref);
 
+        // console.log('this.$refs.inventoryTableRef~~~', this.$refs.inventoryTableref);
 
         let searchQuery = {
 
         let searchQuery = {
 
           endDate: params.endDate,
 
           endDate: params.endDate,
 
           sourceId: params.sourceId,
 
           sourceId: params.sourceId,

+ 6 - 1
src/views/saleManage/saleOrder/accountstatement/components/detailDialog.vue
Просмотреть файл 

@@ -36,7 +36,7 @@
 
         <template v-slot>
 
         <template v-slot>
 
           <el-row style="font-weight: 700; color: red">
 
           <el-row style="font-weight: 700; color: red">
 
             <span>订单总金额：</span>
 
             <span>订单总金额：</span>
 
-            <span>{{ dataForm.orderTotalAmount || 0 }}</span>
 
+            <span>{{ isNonDirectionalSale ? '--' : dataForm.orderTotalAmount || 0 }}</span>
 
             <el-divider direction="vertical"></el-divider>
 
             <el-divider direction="vertical"></el-divider>
 
             <span>已对账金额：</span>
 
             <span>已对账金额：</span>
 
             <span>{{ dataForm.amountCompletePrice || 0 }}</span>
 
             <span>{{ dataForm.amountCompletePrice || 0 }}</span>
 
@@ -99,6 +99,11 @@ export default {
 
 
 
     };
 
     };
 
   },
 
   },
 
+  computed: {
 
+    isNonDirectionalSale() {
 
+      return this.datasource.some(item => item.orderCategory == 4);
 
+    }
 
+  },
 
   methods: {
 
   methods: {
 
     async open(dialogType, row, type = '') {
 
     async open(dialogType, row, type = '') {
 
       console.log(row)
 
       console.log(row)

+ 1 - 1
src/views/saleManage/saleOrder/accountstatement/components/inventoryTable.vue
Просмотреть файл 

@@ -81,7 +81,7 @@
 
           <div class="collapse-title">
 
           <div class="collapse-title">
 
             <div class="collapse-title-left"><span class="collapse-title-index">{{ index + 1 }}</span> {{ type === 'purchase' ? '采购订单' : '销售订单' }}：{{ item.orderNo }}</div>
 
             <div class="collapse-title-left"><span class="collapse-title-index">{{ index + 1 }}</span> {{ type === 'purchase' ? '采购订单' : '销售订单' }}：{{ item.orderNo }}</div>
 
             <div class="collapse-title-right">
 
             <div class="collapse-title-right">
 
-              <span>订单金额：{{ item.orderAmount || 0 }}元</span>
 
+              <span>订单金额：{{ item.orderCategory == 4 ? '--' : item.orderAmount || 0 }}元</span>
 
               <span>已对账金额：{{ item.statementedAmount || 0 }}元</span>
 
               <span>已对账金额：{{ item.statementedAmount || 0 }}元</span>
 
               <span>未对账金额：{{ item.unStatementAmount || 0 }}元</span>
 
               <span>未对账金额：{{ item.unStatementAmount || 0 }}元</span>
 
               <span>本次对账金额：{{ item.statementAmount || 0 }}元</span>
 
               <span>本次对账金额：{{ item.statementAmount || 0 }}元</span>

+ 4 - 3
src/views/saleManage/saleOrder/invoice/components/print-template-jsyp.vue
Просмотреть файл 

@@ -265,9 +265,10 @@
 
         const printWindow = window.open('', '_blank');
 
         const printWindow = window.open('', '_blank');
 
         printWindow.document.open();
 
         printWindow.document.open();
 
         printWindow.document.write('<html><head><title>打印预览</title>');
 
         printWindow.document.write('<html><head><title>打印预览</title>');
 
-        printWindow.document.write(
 
-          '<link rel="stylesheet" href="your-stylesheet-url.css" type="text/css" />'
 
-        );
 
+        // printWindow.document.write(
 
+        //   '<link rel="stylesheet" href="your-stylesheet-url.css" type="text/css" />'
 
+        // );
 
+        printWindow.document.write('<style>table { border-collapse: collapse; width: 100%; } td, th { padding: 5px; }</style>');
 
         printWindow.document.write('</head><body>');
 
         printWindow.document.write('</head><body>');
 
         printWindow.document.write(printSection.innerHTML);
 
         printWindow.document.write(printSection.innerHTML);
 
         printWindow.document.write('</body></html>');
 
         printWindow.document.write('</body></html>');