Explorar o código

销售(开单统计)、销售明细(开单统计)

chenrui hai 1 ano
pai
achega
99ec6f0a2a

+ 16 - 1
src/views/reportData/salesDetails/list.vue

@@ -84,6 +84,18 @@
                   <AreaList id="salesDetailsList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="促销产品">
+                  <a-select v-model="queryParam.giftFLag" placeholder="请选择促销产品">
+                    <a-select-option value="1">
+                      是
+                    </a-select-option>
+                    <a-select-option value="0">
+                      否
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="12" :sm="24" style="margin-bottom: 10px;">
               <a-button
@@ -129,6 +141,7 @@
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_costPrice')">成本:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? toThousands(totalData.totalRealCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
           <!--  <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">折后金额:{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesDetailsList_salesPrice')">折扣金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col> -->
           </a-row>
@@ -190,7 +203,8 @@ export default {
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        giftFLag: undefined
       },
       productType: [],
       rules: {
@@ -342,6 +356,7 @@ export default {
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.giftFLag = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()

+ 1 - 0
src/views/reportData/salesOrderTotal/list.vue

@@ -224,6 +224,7 @@ export default {
       }
       if (this.$hasPermissions('M_salesOrderTotalList_costPrice')) { //  成本价权限
         arr.push({ title: '成本价', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '成本价(促)', dataIndex: 'totalGiftCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
           arr.push({ title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         }