Browse Source

管理费

lxf 1 year ago
parent
commit
b4c1d3eaad

+ 6 - 0
src/views/shengde/group/finance/reconciliation/addOrModified.vue

@@ -50,6 +50,11 @@
               <span>{{ moneyFormat(scope.row.packingMaterialAmount, 2) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="管理费 ¥" align="right" width="120">
+            <template slot-scope="scope">
+              <span>{{ moneyFormat(scope.row.managementFeesPriceAmount, 2) }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" width="80" fixed="right">
             <template slot-scope="scope">
               <el-button type="text" @click="clickRemove(scope.$index)" v-db-click>删除</el-button>
@@ -178,6 +183,7 @@ export default {
         deliverGoodsPriceAmount: row.deliverGoodsPriceAmount,
         expressPriceAmount: row.expressPriceAmount,
         expensePriceAmount: row.expensePriceAmount,
+        managementFeesPriceAmount: row.managementFeesPriceAmount,
         packingMaterialAmount: row.packingMaterialAmount,
       })
       this.msgSuccess('添加成功')

+ 15 - 6
src/views/shengde/group/finance/reconciliation/print.vue

@@ -11,12 +11,12 @@
       <div style="text-align: center; font-size: 18px; padding-bottom: 8px">( 对账时间: {{ rowData.createTime }} )</div> -->
       <table class="tableOne" border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <th colspan="20" style="border-right: 0; border-top: 0">
+          <th colspan="21" style="border-right: 0; border-top: 0">
             <div style="text-align: center; font-size: 30px; padding: 8px">{{ rowData.subsidiaryName }}-胜德体育对账单</div>
           </th>
         </tr>
         <tr>
-          <th colspan="20" style="border-bottom: 1px solid black; border-right: 0">
+          <th colspan="21" style="border-bottom: 1px solid black; border-right: 0">
             <div style="text-align: center; font-size: 18px; padding-bottom: 8px">
               ( 对账时间: {{ rowData.reconciliationStartTime }} - {{ rowData.reconciliationEndTime }} )
             </div>
@@ -38,6 +38,7 @@
           <th style="width: 65px">代发费</th>
           <th style="width: 70px">快递包材费</th>
           <th style="width: 70px">包装人工费</th>
+          <th style="width: 70px">管理费</th>
           <th style="width: 80px">SKU单价</th>
           <th style="width: 80px">小计</th>
           <th style="width: 80px">售后数量</th>
@@ -83,6 +84,11 @@
             <td>
               <span v-if="itemBom.dataResource === 1 && item.expensePrice && Number(item.expensePrice) !== 0">{{ item.expensePrice }}</span>
             </td>
+            <td>
+              <span v-if="itemBom.dataResource === 1 && item.managementFeesPrice && Number(item.managementFeesPrice) !== 0">
+                {{ item.managementFeesPrice }}
+              </span>
+            </td>
             <td v-if="indexBom === 0" :rowspan="item.bomDetails.length">
               <span>{{ item.skuPrice }}</span>
             </td>
@@ -104,23 +110,23 @@
         </tbody>
         <tr>
           <td>总计:</td>
-          <td colspan="18"></td>
+          <td colspan="19"></td>
           <td style="border-right: 0">
             <span>{{ getAggregate() }}</span>
           </td>
         </tr>
         <tr>
           <td>备注:</td>
-          <td colspan="19" style="border-right: 0"></td>
+          <td colspan="20" style="border-right: 0"></td>
         </tr>
         <tr>
           <td>交货地点:</td>
-          <td colspan="19" style="border-right: 0"></td>
+          <td colspan="20" style="border-right: 0"></td>
         </tr>
         <tr>
           <td colspan="3" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请人:</td>
           <td colspan="5" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">胜德体育总经理:</td>
-          <td colspan="12" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
+          <td colspan="13" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
         </tr>
       </table>
     </div>
@@ -200,6 +206,9 @@ export default {
         if (item.expensePrice) {
           money = parseFloat(Number(money) + Number(item.expensePrice)).toFixed(2)
         }
+        if (item.managementFeesPrice) {
+          money = parseFloat(Number(money) + Number(item.managementFeesPrice)).toFixed(2)
+        }
       } else {
         if (itemBom.price) {
           money = parseFloat(Number(money) + Number(itemBom.price)).toFixed(2)

+ 15 - 5
src/views/shengde/group/finance/reconciliation/printBOM.vue

@@ -9,12 +9,12 @@
     <div style="border: 1px solid black; height: calc(100vh - 182px - 56px); overflow: auto" id="tableId">
       <table class="tableOne" border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <th colspan="13" style="border-right: 0; border-top: 0">
+          <th colspan="14" style="border-right: 0; border-top: 0">
             <div style="text-align: center; font-size: 30px; padding: 8px">{{ rowData.subsidiaryName }}-胜德体育对账单</div>
           </th>
         </tr>
         <tr>
-          <th colspan="13" style="border-bottom: 1px solid black; border-right: 0">
+          <th colspan="14" style="border-bottom: 1px solid black; border-right: 0">
             <div style="text-align: center; font-size: 18px; padding-bottom: 8px">
               ( 对账时间: {{ rowData.reconciliationStartTime }} - {{ rowData.reconciliationEndTime }} )
             </div>
@@ -30,6 +30,7 @@
           <th style="width: 100px">代发费汇总</th>
           <th style="width: 100px">快递包材费汇总</th>
           <th style="width: 100px">包装人工费汇总</th>
+          <th style="width: 100px">管理费汇总</th>
           <th style="width: 80px">小计</th>
           <th style="width: 80px">售后数量</th>
           <th style="width: 80px">售后金额</th>
@@ -61,6 +62,9 @@
             <span v-if="item.expensePrice && Number(item.expensePrice) !== 0">{{ Number(item.expensePrice) }}</span>
           </td>
           <td>
+            <span v-if="item.managementFeesPrice && Number(item.managementFeesPrice) !== 0">{{ Number(item.managementFeesPrice) }}</span>
+          </td>
+          <td>
             <span v-if="item.amount">{{ Number(item.amount) }}</span>
           </td>
           <td>
@@ -92,6 +96,9 @@
             <span>{{ getNumber('expensePrice') }}</span>
           </td>
           <td>
+            <span>{{ getNumber('managementFeesPrice') }}</span>
+          </td>
+          <td>
             <span>{{ getNumber('amount') }}</span>
           </td>
           <td>
@@ -106,16 +113,16 @@
         </tr>
         <tr>
           <td>备注:</td>
-          <td colspan="12" style="border-right: 0"></td>
+          <td colspan="13" style="border-right: 0"></td>
         </tr>
         <tr>
           <td>交货地点:</td>
-          <td colspan="12" style="border-right: 0"></td>
+          <td colspan="13" style="border-right: 0"></td>
         </tr>
         <tr>
           <td style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请人:</td>
           <td style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">胜德体育总经理:</td>
-          <td colspan="11" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
+          <td colspan="12" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
         </tr>
       </table>
     </div>
@@ -213,6 +220,9 @@ export default {
       if (item.expensePrice) {
         num -= Number(item.expensePrice)
       }
+      if (item.managementFeesPrice) {
+        num -= Number(item.managementFeesPrice)
+      }
       if (item.bomColorQuantity) {
         num = parseFloat(Number(num) / Number(item.bomColorQuantity)).toFixed(2)
       }

+ 11 - 4
src/views/shengde/group/finance/summary/batchPrint.vue

@@ -26,6 +26,7 @@
           <th style="width: 65px">代发费</th>
           <th style="width: 70px">快递包材费</th>
           <th style="width: 70px">包装人工费</th>
+          <th style="width: 70px">管理费</th>
           <th style="width: 80px">SKU单价</th>
           <th style="width: 80px">小计</th>
           <th style="width: 80px">售后数量</th>
@@ -73,6 +74,9 @@
             <td>
               <span v-if="itemBom.dataResource === 1 && item.expensePrice && Number(item.expensePrice) !== 0">{{ item.expensePrice }}</span>
             </td>
+            <td>
+              <span v-if="itemBom.dataResource === 1 && item.managementFeesPrice && Number(item.managementFeesPrice) !== 0">{{ item.managementFeesPrice }}</span>
+            </td>
             <td v-if="indexBom === 0" :rowspan="item.bomDetails.length">
               <span>{{ item.skuPrice }}</span>
             </td>
@@ -92,23 +96,23 @@
         </tbody>
         <tr>
           <td>总计:</td>
-          <td colspan="20"></td>
+          <td colspan="21"></td>
           <td style="border-right: 0">
             <span>{{ getAggregate() }}</span>
           </td>
         </tr>
         <tr>
           <td>备注:</td>
-          <td colspan="21" style="border-right: 0"></td>
+          <td colspan="22" style="border-right: 0"></td>
         </tr>
         <tr>
           <td>交货地点:</td>
-          <td colspan="21" style="border-right: 0"></td>
+          <td colspan="22" style="border-right: 0"></td>
         </tr>
         <tr>
           <td colspan="3" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请人:</td>
           <td colspan="5" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">胜德体育总经理:</td>
-          <td colspan="12" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
+          <td colspan="13" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
         </tr>
       </table>
     </div>
@@ -193,6 +197,9 @@ export default {
         if (item.expensePrice) {
           money = parseFloat(Number(money) + Number(item.expensePrice)).toFixed(2)
         }
+        if (item.managementFeesPrice) {
+          money = parseFloat(Number(money) + Number(item.managementFeesPrice)).toFixed(2)
+        }
       } else {
         if (itemBom.price) {
           money = parseFloat(Number(money) + Number(itemBom.price)).toFixed(2)

+ 13 - 3
src/views/shengde/group/finance/summary/batchPrintBOM.vue

@@ -20,6 +20,7 @@
           <th style="width: 100px">代发费汇总</th>
           <th style="width: 100px">快递包材费汇总</th>
           <th style="width: 100px">包装人工费汇总</th>
+          <th style="width: 100px">管理费汇总</th>
           <th style="width: 80px">小计</th>
           <th style="width: 80px">售后数量</th>
           <th style="width: 80px">售后金额</th>
@@ -53,6 +54,9 @@
             <span v-if="item.expensePrice && Number(item.expensePrice) !== 0">{{ Number(item.expensePrice) }}</span>
           </td>
           <td>
+            <span v-if="item.managementFeesPrice && Number(item.managementFeesPrice) !== 0">{{ Number(item.managementFeesPrice) }}</span>
+          </td>
+          <td>
             <span v-if="item.amount">{{ Number(item.amount) }}</span>
           </td>
           <td>
@@ -84,6 +88,9 @@
             <span>{{ getNumber('expensePrice') }}</span>
           </td>
           <td>
+            <span>{{ getNumber('managementFeesPrice') }}</span>
+          </td>
+          <td>
             <span>{{ getNumber('amount') }}</span>
           </td>
           <td>
@@ -98,16 +105,16 @@
         </tr>
         <tr>
           <td>备注:</td>
-          <td colspan="14" style="border-right: 0"></td>
+          <td colspan="15" style="border-right: 0"></td>
         </tr>
         <tr>
           <td>交货地点:</td>
-          <td colspan="14" style="border-right: 0"></td>
+          <td colspan="15" style="border-right: 0"></td>
         </tr>
         <tr>
           <td colspan="2" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请人:</td>
           <td colspan="2" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">胜德体育总经理:</td>
-          <td colspan="11" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
+          <td colspan="12" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
         </tr>
       </table>
     </div>
@@ -205,6 +212,9 @@ export default {
       if (item.expensePrice) {
         num -= Number(item.expensePrice)
       }
+      if (item.managementFeesPrice) {
+        num -= Number(item.managementFeesPrice)
+      }
       if (item.bomColorQuantity) {
         num = parseFloat(Number(num) / Number(item.bomColorQuantity)).toFixed(2)
       }

+ 15 - 6
src/views/shengde/group/finance/summary/print.vue

@@ -9,12 +9,12 @@
     <div style="border: 1px solid black; height: calc(100vh - 182px - 56px); overflow: auto" id="tableId">
       <table class="tableOne" border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <th colspan="20" style="border-right: 0; border-top: 0">
+          <th colspan="21" style="border-right: 0; border-top: 0">
             <div style="text-align: center; font-size: 30px; padding: 8px">{{ rowData.subsidiaryName }}-胜德体育对账单</div>
           </th>
         </tr>
         <tr>
-          <th colspan="20" style="border-bottom: 1px solid black; border-right: 0">
+          <th colspan="21" style="border-bottom: 1px solid black; border-right: 0">
             <div style="text-align: center; font-size: 18px; padding-bottom: 8px">
               ( 对账时间: {{ rowData.reconciliationStartTime }} - {{ rowData.reconciliationEndTime }} )
             </div>
@@ -36,6 +36,7 @@
           <th style="width: 65px">代发费</th>
           <th style="width: 70px">快递包材费</th>
           <th style="width: 70px">包装人工费</th>
+          <th style="width: 70px">管理费</th>
           <th style="width: 80px">SKU单价</th>
           <th style="width: 80px">小计</th>
           <th style="width: 80px">售后数量</th>
@@ -81,6 +82,11 @@
             <td>
               <span v-if="itemBom.dataResource === 1 && item.expensePrice && Number(item.expensePrice) !== 0">{{ item.expensePrice }}</span>
             </td>
+            <td>
+              <span v-if="itemBom.dataResource === 1 && item.managementFeesPrice && Number(item.managementFeesPrice) !== 0">
+                {{ item.managementFeesPrice }}
+              </span>
+            </td>
             <td v-if="indexBom === 0" :rowspan="item.bomDetails.length">
               <span>{{ item.skuPrice }}</span>
             </td>
@@ -102,23 +108,23 @@
         </tbody>
         <tr>
           <td>总计:</td>
-          <td colspan="18"></td>
+          <td colspan="19"></td>
           <td style="border-right: 0">
             <span>{{ getAggregate() }}</span>
           </td>
         </tr>
         <tr>
           <td>备注:</td>
-          <td colspan="19" style="border-right: 0"></td>
+          <td colspan="20" style="border-right: 0"></td>
         </tr>
         <tr>
           <td>交货地点:</td>
-          <td colspan="19" style="border-right: 0"></td>
+          <td colspan="20" style="border-right: 0"></td>
         </tr>
         <tr>
           <td colspan="3" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请人:</td>
           <td colspan="5" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">胜德体育总经理:</td>
-          <td colspan="12" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
+          <td colspan="13" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
         </tr>
       </table>
     </div>
@@ -198,6 +204,9 @@ export default {
         if (item.expensePrice) {
           money = parseFloat(Number(money) + Number(item.expensePrice)).toFixed(2)
         }
+        if (item.managementFeesPrice) {
+          money = parseFloat(Number(money) + Number(item.managementFeesPrice)).toFixed(2)
+        }
       } else {
         if (itemBom.price) {
           money = parseFloat(Number(money) + Number(itemBom.price)).toFixed(2)

+ 15 - 5
src/views/shengde/group/finance/summary/printBOM.vue

@@ -9,12 +9,12 @@
     <div style="border: 1px solid black; height: calc(100vh - 182px - 56px); overflow: auto" id="tableId">
       <table class="tableOne" border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <th colspan="13" style="border-right: 0; border-top: 0">
+          <th colspan="14" style="border-right: 0; border-top: 0">
             <div style="text-align: center; font-size: 30px; padding: 8px">{{ rowData.subsidiaryName }}-胜德体育对账单</div>
           </th>
         </tr>
         <tr>
-          <th colspan="13" style="border-bottom: 1px solid black; border-right: 0">
+          <th colspan="14" style="border-bottom: 1px solid black; border-right: 0">
             <div style="text-align: center; font-size: 18px; padding-bottom: 8px">
               ( 对账时间: {{ rowData.reconciliationStartTime }} - {{ rowData.reconciliationEndTime }} )
             </div>
@@ -30,6 +30,7 @@
           <th style="width: 100px">代发费汇总</th>
           <th style="width: 100px">快递包材费汇总</th>
           <th style="width: 100px">包装人工费汇总</th>
+          <th style="width: 100px">管理费汇总</th>
           <th style="width: 80px">小计</th>
           <th style="width: 80px">售后数量</th>
           <th style="width: 80px">售后金额</th>
@@ -61,6 +62,9 @@
             <span v-if="item.expensePrice && Number(item.expensePrice) !== 0">{{ Number(item.expensePrice) }}</span>
           </td>
           <td>
+            <span v-if="item.managementFeesPrice && Number(item.managementFeesPrice) !== 0">{{ Number(item.managementFeesPrice) }}</span>
+          </td>
+          <td>
             <span v-if="item.amount">{{ Number(item.amount) }}</span>
           </td>
           <td>
@@ -92,6 +96,9 @@
             <span>{{ getNumber('expensePrice') }}</span>
           </td>
           <td>
+            <span>{{ getNumber('managementFeesPrice') }}</span>
+          </td>
+          <td>
             <span>{{ getNumber('amount') }}</span>
           </td>
           <td>
@@ -106,16 +113,16 @@
         </tr>
         <tr>
           <td>备注:</td>
-          <td colspan="12" style="border-right: 0"></td>
+          <td colspan="13" style="border-right: 0"></td>
         </tr>
         <tr>
           <td>交货地点:</td>
-          <td colspan="12" style="border-right: 0"></td>
+          <td colspan="13" style="border-right: 0"></td>
         </tr>
         <tr>
           <td style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请人:</td>
           <td style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">胜德体育总经理:</td>
-          <td colspan="11" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
+          <td colspan="12" style="padding: 8px 4px; font-size: 16px; font-weight: 700; text-align: left; border-right: 0">申请日期:</td>
         </tr>
       </table>
     </div>
@@ -208,6 +215,9 @@ export default {
       if (item.expensePrice) {
         num -= Number(item.expensePrice)
       }
+      if (item.managementFeesPrice) {
+        num -= Number(item.managementFeesPrice)
+      }
       if (item.bomColorQuantity) {
         num = parseFloat(Number(num) / Number(item.bomColorQuantity)).toFixed(2)
       }

+ 5 - 0
src/views/shengde/group/order/orderManagement/index.vue

@@ -138,6 +138,11 @@
             <span>{{ moneyFormat(scope.row.packingMaterialAmount, 2) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="管理费 ¥" align="right" width="120">
+          <template slot-scope="scope">
+            <span>{{ moneyFormat(scope.row.managementFeesPriceAmount, 2) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="交期" prop="deliveryTime" align="center" width="140" />
         <el-table-column label="下单时间" prop="createTime" align="center" width="140" />
         <el-table-column label="发货时间" prop="shipmentTime" align="center" width="140" />

+ 5 - 0
src/views/shengde/group/order/orderProductManagement/index.vue

@@ -163,6 +163,11 @@
           <span>{{ moneyFormat(scope.row.packingMaterialAmount, 2) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="管理费 ¥" align="right" width="90">
+        <template slot-scope="scope">
+          <span>{{ moneyFormat(scope.row.managementFeesPriceAmount, 2) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="下单时间" prop="createTime" align="center" width="140" />
     </el-table>
     <!-- 分页器 -->

+ 5 - 0
src/views/shengde/subsidiary/order/management/index.vue

@@ -147,6 +147,11 @@
           <span>{{ moneyFormat(scope.row.packingMaterialAmount, 2) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="管理费 ¥" align="right" width="120">
+        <template slot-scope="scope">
+          <span>{{ moneyFormat(scope.row.managementFeesPriceAmount, 2) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="交期" align="center" width="140" prop="deliveryTime" />
       <el-table-column label="下单时间" align="center" width="140" prop="createTime" />
       <el-table-column label="发货时间" prop="shipmentTime" align="center" width="140" />

+ 5 - 0
src/views/shengde/subsidiary/order/productManagement/index.vue

@@ -164,6 +164,11 @@
           <span>{{ moneyFormat(scope.row.packingMaterialAmount, 2) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="管理费 ¥" align="right" width="90">
+        <template slot-scope="scope">
+          <span>{{ moneyFormat(scope.row.managementFeesPriceAmount, 2) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="下单时间" prop="dataForTime" align="center" width="140" />
       <el-table-column label="操作" align="center" min-width="80" fixed="right">
         <template slot-scope="scope">