Ver código fonte

Merge branch 'develop_yh27' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh28

# Conflicts:
#	src/views/expenseManagement/expenseReimbursement/detail.vue
#	src/views/reportData/actualSalesReport/list.vue
#	src/views/reportData/promotionSalesRealTimeReport/index.vue
#	src/views/reportData/promotionSalesRealTimeReport/list.vue
#	src/views/reportData/regionTypeSalesReport/list.vue
#	src/views/reportData/salesDetails/list.vue
#	src/views/reportData/salesOrderTotal/list.vue
#	src/views/reportData/salesSlipReport/list.vue
lilei 1 ano atrás
pai
commit
4946da2e40

BIN
public/templ/费用明细模板.xlsx


+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.62",
+    "version": "2.2.26",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/config/router.config.js

@@ -1719,7 +1719,7 @@ export const asyncRouterMap = [
             name: 'salesDetails',
             component: BlankLayout,
             meta: {
-              title: '销售明细(开单统计)',
+              title: '销售明细(下推统计)',
               icon: 'profile',
               permission: 'M_salesDetailsList'
             },

+ 1 - 1
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -83,7 +83,7 @@
           </a-col>
           <a-col :md="24" :sm="24">
             <a-form-model-item style="margin-bottom:10px;" label="备注" prop="remark" :wrapperCol="{ span: 20 }" :labelCol="{ span: 4 }">
-              <a-textarea id="allocateBill-basicInfo-remark" :maxLength="120" v-model="form.remark" placeholder="请输入备注(最多120个字符)" allowClear />
+              <a-textarea id="allocateBill-basicInfo-remark" :maxLength="100" v-model="form.remark" placeholder="请输入备注(最多100个字符)" allowClear />
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

+ 3 - 3
src/views/allocationManagement/transferOut/printModal.vue

@@ -36,21 +36,21 @@
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbPrint'">
+        <a-form-model-item label="产品价格" style="margin-bottom: 0;" prop="priceType" v-if="nowType=='dbPrint'">
           <a-radio-group v-model="form.priceType">
             <a-radio value="ALLOCATE_BILL_PRICE" v-if="$hasPermissions('B_transferOut_print_salesPrice')">销售价</a-radio>
             <a-radio value="ALLOCATE_BILL_COST" v-if="$hasPermissions('B_transferOut_print_costPrice')">成本价</a-radio>
             <a-radio value="ALLOCATE_BILL">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbExport'">
+        <a-form-model-item label="产品价格" style="margin-bottom: 0;" prop="priceType" v-if="nowType=='dbExport'">
           <a-radio-group v-model="form.priceType">
             <a-radio value="ALLOCATE_BILL_PRICE" v-if="$hasPermissions('B_transferOut_detail_export_salesPrice')">销售价</a-radio>
             <a-radio value="ALLOCATE_BILL_COST" v-if="$hasPermissions('B_transferOut_detail_export_costPrice')">成本价</a-radio>
             <a-radio value="ALLOCATE_BILL">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="备注" prop="priceType" v-if="nowType=='dbPrint'">
+        <a-form-model-item label="备注" v-if="nowType=='dbPrint'">
           <a-checkbox @change="onChangeRemark" :checked="remarkFlag">
             打印
           </a-checkbox>

+ 40 - 32
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -72,7 +72,7 @@
           :columns="columns"
           :data="loadData"
           :showPagination="false"
-          :defaultLoadData="true"
+          :defaultLoadData="false"
           bordered>
           <!-- 记账名称 -->
           <template slot="jzname" slot-scope="text,record">
@@ -101,7 +101,13 @@
       </a-card>
     </a-spin>
     <!-- 打印预览 -->
-    <commonModal modalTit="费用报销单打印预览" width="700pt" okText="立即打印" :openModal="showTipModal" @cancel="showTipModal=false" @ok="$refs.printModal.prints()">
+    <commonModal
+      modalTit="费用报销单打印预览"
+      width="700pt"
+      okText="立即打印"
+      :openModal="showTipModal"
+      @cancel="showTipModal=false"
+      @ok="$refs.printModal.prints()">
       <previewModal v-if="printType=='preview'" ref="printModal" @printOk="printOk"></previewModal>
     </commonModal>
     <!-- 快捷打印 -->
@@ -123,7 +129,7 @@ export default {
   mixins: [commonMixin],
   components: { STable, previewModal, commonModal },
   data () {
-    let _this=this
+    const _this = this
     return {
       spinning: false,
       disabled: false,
@@ -132,6 +138,19 @@ export default {
       showDetail: false,
       printType:'',
       count: 0,
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '14%' },
+        { title: '所属区域', dataIndex: 'subareaNames', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '记账费用', dataIndex: 'expense', align: 'right', width: '10%', customRender: function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' } },
+        { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '15%' },
+        { title: '产品信息', scopedSlots: { customRender: 'cpxx' }, align: 'center', width: '15%' },
+        { title: '备注', dataIndex: 'remarks', align: 'center', width: '10%', customRender: function (text) { return text || '--' } }
+      ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.spinning = true
@@ -150,19 +169,6 @@ export default {
           return data
         })
       },
-      columns: [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '14%' },
-        { title: '所属区域', dataIndex: 'subareaNames', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属分区', dataIndex: 'subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账费用', dataIndex: 'expense', align: 'right', width: '10%', customRender: function (text) { return (text||text==0)?_this.toThousands(text):'--' } },
-        { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '15%' },
-        { title: '产品信息', scopedSlots: { customRender: 'cpxx' }, align: 'center', width: '15%' },
-        { title: '备注', dataIndex: 'remarks', align: 'center', width: '10%', customRender: function (text) { return text || '--' } }
-      ],
       chooseLoadData: [],
       detailData: null, //  详情数据
       total: 0
@@ -182,37 +188,37 @@ export default {
       // 审核明细,待提交状态不获取
       const spListData = this.detailData.state != 'WAIT_SUBMIT' ? await getProcessInstance({ businessType: 'EXPENSES', businessSn: this.$route.params.sn }).then(res => res.data) : null
       // 打印预览弹框
-      if(type == 'preview'){
+      if (type == 'preview') {
         this.showTipModal = true
-      } 
-      this.$nextTick(()=>{
+      }
+      this.$nextTick(() => {
         this.$refs.printModal.setData([{
           expenseInfo: this.detailData,
           fyListData,
-          spListData:spListData||[]
+          spListData: spListData || []
         }])
         // 立即打印
-        if(type == 'print'){
-          setTimeout(()=>{
+        if (type == 'print') {
+          setTimeout(() => {
             this.$refs.printModal.prints()
-          },500)
+          }, 500)
         }
         this.spinning = false
       })
     },
-    printOk(data){
-      if(data&&data.status == 200){
+    printOk (data) {
+      if (data && data.status == 200) {
         expenseAccountUpdateBatch([{
-            id: this.detailData.id,
-            printStatus:"PRINT"
-          }]).then(res => {
-          if(res.status == 200){
-             this.getDetail()
+          id: this.detailData.id,
+          printStatus: 'PRINT'
+        }]).then(res => {
+          if (res.status == 200) {
+            this.getDetail()
           }
           this.spinning = false
           this.showTipModal = false
         })
-      }else{
+      } else {
         this.spinning = false
       }
     },
@@ -225,7 +231,9 @@ export default {
           this.spinning = false
           this.detailData = res.data
           this.detailData.content = res.data.content.replace(/\n+/, '\n').split('\n')
-          this.$refs.table.refresh()
+          this.$nextTick(() => {
+            this.$refs.table.refresh()
+          })
         } else {
           this.detailData = null
         }

+ 1 - 1
src/views/reportData/actualSalesReport/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售日期" prop="time">
+              <a-form-model-item label="下推日期" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>

+ 2 - 2
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -211,7 +211,7 @@ export default {
         dealerDistrictSn: undefined // 区域编码
       },
       rules: {
-        salesDate: [{ required: true, message: '请选择销售审核日期', trigger: 'change' }]
+        salesDate: [{ required: true, message: '请选择销售审核时间', trigger: 'change' }]
       },
       dateFormat: 'YYYY-MM-DD',
       tabVal: 1,
@@ -232,7 +232,7 @@ export default {
         { title: '地区', dataIndex: 'provinceName', width: '160px', align: 'center', scopedSlots: { customRender: 'addressInfo' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '140px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售审核日期', dataIndex: 'auditDate', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售审核时间', dataIndex: 'auditDate', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量(非促)', dataIndex: 'notGiftQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量(促)', dataIndex: 'giftQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '实售金额', dataIndex: 'totalRealAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 30 - 30
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -3,34 +3,34 @@
     <div class="productInfoList-wrap">
       <a-card size="small" :bordered="false" class="searchBoxNormal">
         <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
-          <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
-            <a-row :gutter="15">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="销售审核日期" prop="salesDate">
-                  <rangeDate ref="rangeDate" :value="newQueryParam.salesDate" @change="salesDateChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <!-- :disabledDate="disabledDate" -->
-                <a-form-model-item label="促销开始时间">
-                  <a-range-picker
-                    style="width:100%"
-                    v-model="time"
-                    :format="dateFormat"
-                    :placeholder="['开始时间', '结束时间']"
-                    @change="dateChange"></a-range-picker>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="促销名称">
-                  <a-input
-                    id="promotionSalesRealTimeReport-title"
-                    v-model.trim="newQueryParam.promoRuleReport.title"
-                    allowClear
-                    placeholder="请输入促销名称" />
-                </a-form-model-item>
-              </a-col>
-              <template v-if="advanced">
+        <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="下推时间" prop="salesDate">
+                <rangeDate ref="rangeDate" :value="newQueryParam.salesDate" @change="salesDateChange" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <!-- :disabledDate="disabledDate" -->
+              <a-form-model-item label="促销开始时间">
+                <a-range-picker
+                  style="width:100%"
+                  v-model="time"
+                  :format="dateFormat"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="dateChange"></a-range-picker>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="促销名称">
+                <a-input
+                  id="promotionSalesRealTimeReport-title"
+                  v-model.trim="newQueryParam.promoRuleReport.title"
+                  allowClear
+                  placeholder="请输入促销名称" />
+              </a-form-model-item>
+            </a-col>
+            <template v-if="advanced">
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="促销类型">
                     <v-select
@@ -240,7 +240,7 @@ export default {
       rules: {
         salesDate: [{
           required: true,
-          message: '请选择销售审核日期',
+          message: '请选择下推时间',
           trigger: 'change'
         }]
       },
@@ -345,7 +345,7 @@ export default {
         }
       },
       {
-        title: '销售审核日期',
+        title: '销售审核时间',
         dataIndex: 'auditDate',
         width: '120px',
         align: 'center',

+ 33 - 33
src/views/reportData/regionTypeSalesReport/list.vue

@@ -8,38 +8,38 @@
       <a-card size="small">
         <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
           <a-form-model
-            id="returnGoodsPresentationList-form"
-            ref="ruleForm"
-            class="form-model-con"
-            layout="inline"
-            :rules="rules"
-            :model="queryParam"
-            @keyup.enter.native="handleSearch">
-            <a-row :gutter="15">
-              <a-col :md="5" :sm="24">
-                <a-form-model-item label="审核时间" prop="time">
-                  <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-model-item label="销售状态" prop="salesStatusType">
-                  <v-select
-                    v-model="queryParam.salesStatusType"
-                    code="SALES_STATUS"
-                    placeholder="请选择销售状态"
-                    allowClear></v-select>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="5" :sm="24" v-if="activeKey==0">
-                <a-form-model-item label="所在区域">
-                  <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="5" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
+          id="returnGoodsPresentationList-form"
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :rules="rules"
+          :model="queryParam"
+          @keyup.enter.native="handleSearch">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="销售审核时间" prop="time">
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="销售状态" prop="salesStatusType">
+                <v-select
+                  v-model="queryParam.salesStatusType"
+                  code="SALES_STATUS"
+                  placeholder="请选择销售状态"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-if="activeKey==0">
+              <a-form-model-item label="所在区域">
+                <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="区域负责人">
+                <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+              </a-form-model-item>
+            </a-col>
               <!--  <template v-if="advanced && activeKey==0">
               <a-col :md="6" :sm="24">
                 <a-form-model-item prop="dealerProvinceSn" style="margin: 0;" label="地区">
@@ -47,7 +47,7 @@
                 </a-form-model-item>
               </a-col>
             </template> -->
-              <a-col :md="5" :sm="24" style="margin-bottom: 10px;">
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnGoodsPresentationList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnGoodsPresentationList-reset">重置</a-button>
                 <a-button

+ 1 - 1
src/views/reportData/salesAmountReport/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售日期" prop="time">
+              <a-form-model-item label="下推日期" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>

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

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售日期" prop="time">
+              <a-form-model-item label="下推日期" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -22,6 +22,11 @@
                 <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="备货单号">
+                <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="salesDetailsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
@@ -142,12 +147,12 @@
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
-              <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">下推数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
+            <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>
           </template>
@@ -249,20 +254,21 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域负责人', dataIndex: 'subareaArea.bizUserName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '销售单号', dataIndex: 'salesBillNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货单号', dataIndex: 'dispatchBillNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库仓库', dataIndex: 'warehouseName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '开单日期', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售日期', dataIndex: 'salesTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售审核时间', dataIndex: 'salesTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售数量', dataIndex: 'qty', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '下推数量', dataIndex: 'qty', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -273,18 +279,18 @@ export default {
         // { title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
       ]
       if (this.$hasPermissions('M_salesDetailsList_costPrice')) { //  成本价权限
-        arr.splice(16, 0, { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(20, 0, { title: '成本金额', dataIndex: 'totalRealCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesDetailsList_salesPrice')) { //  售价权限
-        arr.push({ title: '实售', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.push({ title: '开单', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '实售金额', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '开单金额', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesDetailsList_cityPrice')) { //  市级价权限
-        arr.push({ title: '市级', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '市级金额', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesDetailsList_salesPrice')) { //  售价权限
-        arr.push({ title: '直接差', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.push({ title: '间接差', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '直接差金额', dataIndex: 'directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '间接差金额', dataIndex: 'indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '优惠金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         // arr.push({ title: '折后单价', dataIndex: 'discountedPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         // arr.push({ title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })

+ 30 - 213
src/views/reportData/salesOrderTotal/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售日期" prop="time">
+              <a-form-model-item label="下推时间" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -133,34 +133,14 @@
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col
-                :md="4"
-                :sm="24">数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-              <a-col
-                :md="4"
-                :sm="24"
-                v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
-              <a-col
-                :md="4"
-                :sm="24"
-                v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
-              <a-col
-                :md="4"
-                :sm="24"
-                v-if="$hasPermissions('M_salesOrderTotalList_costPrice')">成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
-              <a-col
-                :md="4"
-                :sm="24"
-                v-if="$hasPermissions('M_salesOrderTotalList_costPrice')&&$hasPermissions('M_salesOrderTotalList_salesPrice')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
-              <a-col
-                :md="4"
-                :sm="24"
-                v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
-              <a-col
-                :md="4"
-                :sm="24"
-                v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
-              <!-- <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24">下推数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">实售金额:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')">成本金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')&&$hasPermissions('M_salesOrderTotalList_salesPrice')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
+            <!-- <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折后金额:{{ (totalData && (totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0)) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</a-col> -->
             </a-row>
           </template>
@@ -269,91 +249,16 @@ export default {
   computed: {
     columns () {
       const _this = this
-      const arr = [{
-        title: '销售单号',
-        dataIndex: 'salesBillNo',
-        width: 160,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        }
-      },
-      {
-        title: '开单日期',
-        dataIndex: 'createDate',
-        width: 130,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        }
-      },
-      {
-        title: '销售日期',
-        dataIndex: 'auditDate',
-        width: 130,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        }
-      },
-      {
-        title: '客户名称',
-        dataIndex: 'dealerName',
-        width: 120,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        },
-        ellipsis: true
-      },
-      {
-        title: '客户级别',
-        dataIndex: 'dealerLevelDictValue',
-        width: 120,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        },
-        ellipsis: true
-      },
-      {
-        title: '直接绑定客户名称',
-        dataIndex: 'directDealerName',
-        width: 120,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        },
-        ellipsis: true
-      },
-      {
-        title: '间接绑定客户名称',
-        dataIndex: 'indirectDealerName',
-        width: 120,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        },
-        ellipsis: true
-      },
-      {
-        title: '总数量',
-        dataIndex: 'totalQty',
-        width: 70,
-        align: 'center',
-        customRender: function (text) {
-          return ((text || text == 0) ? text : '--')
-        }
-      },
-      {
-        title: '数量(促)',
-        dataIndex: 'giftQty',
-        width: 70,
-        align: 'center',
-        customRender: function (text) {
-          return ((text || text == 0) ? text : '--')
-        }
-      }
+      const arr = [
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售审核时间', dataIndex: 'auditDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总下推数量', dataIndex: 'totalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '下推数量(促)', dataIndex: 'giftQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -369,44 +274,12 @@ export default {
 
       ]
       if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
-        arr.push({
-          title: '实售价',
-          dataIndex: 'totalRealSaleAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
-        arr.push({
-          title: '开单价',
-          dataIndex: 'totalAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
+        arr.push({ title: '实售金额', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '开单金额', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       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) : '--')
-          }
-        })
+        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: '毛利',
@@ -420,75 +293,19 @@ export default {
         }
       }
       if (this.$hasPermissions('M_salesOrderTotalList_provincePrice')) {
-        arr.push({
-          title: '省级价',
-          dataIndex: 'totalProvinceAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
+        arr.push({ title: '省级金额', dataIndex: 'totalProvinceAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesOrderTotalList_cityPrice')) {
-        arr.push({
-          title: '市级价',
-          dataIndex: 'totalCityAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
+        arr.push({ title: '市级金额', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesOrderTotalList_specialPrice')) {
-        arr.push({
-          title: '特约加盟店价',
-          dataIndex: 'totalSpecialAmount',
-          width: 90,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
+        arr.push({ title: '特约金额', dataIndex: 'totalSpecialAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
-        arr.push({
-          title: '直接差价',
-          dataIndex: 'directRebateAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
-        arr.push({
-          title: '间接差价',
-          dataIndex: 'indirectRebateAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
-        arr.push({
-          title: '返利',
-          dataIndex: 'rebateAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
-        arr.push({
-          title: '优惠金额',
-          dataIndex: 'discountAmount',
-          width: 70,
-          align: 'right',
-          customRender: function (text) {
-            return ((text || text == 0) ? _this.toThousands(text) : '--')
-          }
-        })
+        arr.push({ title: '直接差价金额', dataIndex: 'directRebateAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '间接差价金额', dataIndex: 'indirectRebateAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: '优惠金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         // arr.push({ title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         // arr.push({ title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }

+ 1 - 1
src/views/reportData/salesSlipReport/list.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售日期" prop="time">
+              <a-form-model-item label="下推日期" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>

+ 2 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -6,7 +6,7 @@
         <a-form layout="inline">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
+              <a-form-item label="下推时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
@@ -275,7 +275,7 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下推时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 1 - 0
src/views/salesReturnManagement/custConfirm/list.vue

@@ -201,6 +201,7 @@
       ref="chooseProduct"
       :openModal="openProductModal"
       :buyerSn="$route.params.buyerSn"
+      :warehouseSn="ordeDetail?ordeDetail.warehouseSn:''"
       @close="openProductModal=false"
       @addProduct="addProduct"></chooseProductsModal>
     <!-- 批量设置退货原因 -->

+ 5 - 1
src/views/salesReturnManagement/receiveCheck/chooseProductsModal.vue

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: ''
     },
+    warehouseSn: {
+      type: String,
+      default: ''
+    },
     isShowPrice: { //  弹框显示状态
       type: Boolean,
       default: true
@@ -117,7 +121,7 @@ export default {
           this.returnReasonlist = [...this.$store.state.app.goodReturnReason, ...this.$store.state.app.defectiveReturnReason]
         }
         this.$nextTick(() => {
-          this.$refs.partQuery.pageInit(this.buyerSn, 0, this.goodFlag)
+          this.$refs.partQuery.pageInit(this.buyerSn, this.warehouseSn, this.goodFlag)
         })
       }
     }

+ 1 - 0
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -124,6 +124,7 @@
       :goodFlag="goodFlag"
       :isShowPrice="false"
       :openModal="openModal"
+      :warehouseSn="ordeDetail?ordeDetail.warehouseSn:''"
       :buyerSn="$route.params.buyerSn"
       @close="openModal=false"
       @addProduct="addProduct"></chooseProductsModal>

+ 2 - 2
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -177,10 +177,10 @@ export default {
       this.queryParam.code = ''
       this.$refs.table.refresh(true)
     },
-    pageInit (buyerSn, warehouseName, goodFlag) {
+    pageInit (buyerSn, warehouseSn, goodFlag) {
       this.buyerSn = buyerSn
       this.goodFlag = goodFlag
-      this.queryParam.warehouseName = warehouseName
+      this.queryParam.warehouseSn = warehouseSn
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -416,7 +416,7 @@ export default {
         }
         this.$refs.table.refresh(!flag)
         if (!flag) {
-          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseName, this.goodFlag)
+          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseSn, this.goodFlag)
         }
       })
     },