国内销售、采购增加合计

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -18,6 +18,22 @@
   "searchIcon": true,
   "searchIndex": 2,
   "searchSpan": 8,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "oceanFreight",
+      "type": "sum"
+    },
+    {
+      "name": "orderQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "actualQuantity",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "采购订单号",
@@ -80,7 +96,7 @@
       "overHidden": true
     },
     {
-      "label": "运费",
+      "label": "预估运费",
       "prop": "oceanFreight",
       "search": false,
       "index": 7,

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -22,6 +22,7 @@
   "searchSpan": 8,
   "expand": true,
   "expandWidth": 38,
+  "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [
     {
@@ -35,6 +36,18 @@
     {
       "name": "balanceAmount",
       "type": "sum"
+    },
+    {
+      "name": "grossProfit",
+      "type": "sum"
+    },
+    {
+      "name": "orderQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "actualQuantity",
+      "type": "sum"
     }
   ],
   "column": [

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -122,7 +122,7 @@
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 :disabled="detailData.seeDisabled"/>
                 <el-input
-                  v-else-if="(item.prop === 'advancePayment') || (item.prop === 'settlmentAmount') || (item.prop === 'overPayment')"
+                  v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') || (item.prop === 'settlmentAmount') || (item.prop === 'overPayment')"
                   v-model.trim="form[item.prop]" size="small" autocomplete="off"
                   @change="computedCost"
                   :disabled="detailData.seeDisabled"
@@ -134,6 +134,9 @@
                 <el-input type="age" v-else-if="item.prop === 'grossProfitRate'" v-model.trim="form[item.prop]" size="small" autocomplete="off" placeholder="请输入" :disabled="detailData.seeDisabled" v-input-limit="2">
                   <template   slot="append">%</template>
                 </el-input>
+                <el-input type="age" v-else-if="item.prop === 'specialOfferOf'" v-model.trim="form[item.prop]" size="small" autocomplete="off" placeholder="请输入" :disabled="detailData.seeDisabled" v-input-limit="2">
+                  <template   slot="append">%</template>
+                </el-input>
                 <el-input
                   v-else-if="item.type == 'number'"
                   placeholder="请输入"
@@ -562,6 +565,8 @@
 
     <report-dialog
       :switchDialog="switchDialog"
+      :reportId="form.id"
+      reportName="销售明细(N)"
       @onClose="onClose()"
     ></report-dialog>
   </div>
@@ -992,7 +997,7 @@ export default {
             ]
           }, {
             label: '特价占比',
-            prop: 'a',
+            prop: 'specialOfferOf',
             disabled: false,
             rules: [
               {
@@ -2126,6 +2131,8 @@ export default {
           this.$set(this.form, 'orderAmount', 0)
           // 成本价
           let purchaseAmount = 0
+          // 销售金额
+          this.form.orderAmount = 0;
           // 计算销售金额
           this.contactsData.forEach(item => {
             if (item.purchaseAmount) {
@@ -2133,6 +2140,7 @@ export default {
             }
             this.form.orderAmount = (Number(this.form.orderAmount) + Number(item.amount)).toFixed(2)
           })
+          this.computedCost()
           if (this.form.orderAmount && this.form.settlmentAmount) {
             this.$set(this.form, "balanceAmount", (Number(this.form.orderAmount) - Number(this.form.settlmentAmount)).toFixed(2));
           }
@@ -2208,6 +2216,7 @@ export default {
         overPayment = this.form.overPayment
       }
       this.$set(this.form, "balanceAmount", (Number(orderAmount) - Number(overPayment) - Number(settlmentAmount)).toFixed(2));
+      this.$set(this.form, 'debitAmount', ((Number(orderAmount) - Number(overPayment)).toFixed(2)))
     },
     quantityChange(row) {
       if (!row.orderQuantity) {