liujt 2 долоо хоног өмнө
parent
commit
e3145d1675

+ 61 - 53
src/views/saleManage/saleOrder/accountstatement/components/accountDetailTable.vue

@@ -34,14 +34,14 @@
               @click="batchSetDiscount"
               >批量设置折让比例</el-button
             >
-            <div class="summary-info">
+            <!-- <div class="summary-info">
               <span
                 >本次总对账金额:<b>{{ totalStatementAmount }}</b> 元</span
               >
               <span
                 >本次总对账数量:<b>{{ totalStatementCount }}</b></span
               >
-            </div>
+            </div> -->
           </div>
         </template>
         <template v-slot:statementCount="scope">
@@ -125,6 +125,10 @@
           <span>{{ scope.row.statementAmount }}</span>
         </template>
 
+        <template v-slot:headerRequired="{ column }">
+              <span class="is-required">{{ column.label }}</span>
+            </template>
+
         <template v-slot:action="scope">
           <el-link
             v-if="!isView && queryDimension == 2"
@@ -247,27 +251,7 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            minWidth: 100,
-            prop: 'specification',
-            label: '规格',
-            align: 'center',
-            showOverflowTooltip: true
-          },
-          {
-            minWidth: 100,
-            prop: 'modelType',
-            label: '型号',
-            align: 'center',
-            showOverflowTooltip: true
-          },
-          {
-            minWidth: 80,
-            prop: 'color',
-            label: '颜色',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+          
           {
             minWidth: 110,
             prop: 'historicalStatementCount',
@@ -276,6 +260,7 @@
           },
           {
             minWidth: 140,
+            headerSlot: 'headerRequired',
             prop: 'statementCount',
             label: '本次对账数量',
             align: 'center',
@@ -283,6 +268,7 @@
           },
           {
             minWidth: 120,
+            headerSlot: 'headerRequired',
             prop: 'statementAmount',
             label: '本次对账金额',
             align: 'center',
@@ -294,36 +280,7 @@
             label: this.queryDimension == 1 ? '发货数量' : '调拨数量',
             align: 'center',
           },
-          {
-            minWidth: 120,
-            prop: 'outInCount',
-            label: '出库数量',
-            align: 'center',
-          },
-          {
-            minWidth: 120,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            align: 'center',
-          },
-          {
-            minWidth: 120,
-            prop: 'statementAmount',
-            label: '出库重量',
-            align: 'center',
-          },
-          {
-            minWidth: 120,
-            prop: 'weightUnit',
-            label: '重量单位',
-            align: 'center',
-          },
-          {
-            minWidth: 120,
-            prop: 'pricingWay',
-            label: '计价方式',
-            align: 'center',
-          },
+          
           {
             minWidth: 140,
             prop: 'technologyRouteName',
@@ -376,6 +333,57 @@
             label: '折让合计',
             align: 'center',
           },
+          {
+            minWidth: 100,
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 80,
+            prop: 'color',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'outInCount',
+            label: '出库数量',
+            align: 'center',
+          },
+          {
+            minWidth: 120,
+            prop: 'measuringUnit',
+            label: '计量单位',
+            align: 'center',
+          },
+          {
+            minWidth: 120,
+            prop: 'sendTotalWeight',
+            label: '出库重量',
+            align: 'center',
+          },
+          {
+            minWidth: 120,
+            prop: 'weightUnit',
+            label: '重量单位',
+            align: 'center',
+          },
+          {
+            minWidth: 120,
+            prop: 'pricingWay',
+            label: '计价方式',
+            align: 'center',
+          },
         ]
       }
     },

+ 20 - 17
src/views/saleManage/saleOrder/accountstatement/components/receivableInfo.vue

@@ -76,10 +76,10 @@
           </el-select>
         </template>
 
-        <template v-slot:paymentCondition="scope">
+        <template v-slot:collectionConditionName="scope">
           <el-input
             clearable
-            :value="scope.row.paymentConditionName"
+            :value="scope.row.collectionConditionName"
             @click.native="openReceiveTerms(scope.$index)"
             :placeholder="isView ? '' : '请选择'"
             :disabled="isView"
@@ -183,22 +183,25 @@
             showOverflowTooltip: true
           },
           {
+            prop: 'fundType',
             minWidth: 140,
             label: '款项类型',
             align: 'center',
             slot: 'fundType'
           },
           {
+            prop: 'transactionMode',
             minWidth: 140,
             label: '交易方式',
             align: 'center',
             slot: 'transactionMode'
           },
           {
+            prop: 'collectionConditionName',
             minWidth: 160,
             label: '收款条件',
             align: 'center',
-            slot: 'paymentCondition'
+            slot: 'collectionConditionName'
           },
           {
             minWidth: 140,
@@ -212,7 +215,7 @@
             prop: 'statementAdvanceConfirmAmount',
             label: '本次对账预收款确收金额',
             align: 'center',
-            slot: 'statementAdvanceConfirmAmount'
+            // slot: 'statementAdvanceConfirmAmount'
           },
           {
             minWidth: 120,
@@ -223,19 +226,19 @@
           },
           {
             minWidth: 120,
-            prop: 'currentReceivableAmount',
+            prop: 'receivedPrice',
             label: '本次应收金额',
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            minWidth: 100,
-            prop: 'action',
-            label: '操作',
-            align: 'center',
-            slot: 'action',
-            fixed: 'right'
-          }
+          // {
+          //   minWidth: 100,
+          //   prop: 'action',
+          //   label: '操作',
+          //   align: 'center',
+          //   slot: 'action',
+          //   fixed: 'right'
+          // }
         ]
       };
     },
@@ -280,8 +283,8 @@
       changeReceiveTerms(row, index) {
         const targetIndex = index != null ? index : this.currentRowIndex;
         if (targetIndex == null) return;
-        this.updateRowField(targetIndex, 'paymentConditionId', row.id);
-        this.updateRowField(targetIndex, 'paymentConditionName', row.name);
+        this.updateRowField(targetIndex, 'collectionConditionId', row.id);
+        this.updateRowField(targetIndex, 'collectionConditionName', row.name);
       },
       // 行内字段修改:通过 .sync 回写 receivableList
       updateRowField(index, key, val) {
@@ -314,7 +317,7 @@
         }
         const currentReceivable =
           Math.round(((+row.statementAmount || 0) - val) * 100) / 100;
-        this.$set(row, 'currentReceivableAmount', currentReceivable);
+        this.$set(row, 'receivedPrice', currentReceivable);
         this.$emit('update:receivableList', [...this.receivableList]);
       },
       recalcAllRows() {
@@ -328,7 +331,7 @@
           this.$set(row, 'statementAdvanceConfirmAmount', val);
           this.$set(
             row,
-            'currentReceivableAmount',
+            'receivedPrice',
             Math.round(((+row.statementAmount || 0) - val) * 100) / 100
           );
         });