chenrui 1 tahun lalu
induk
melakukan
36416b01b8

+ 20 - 9
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -60,14 +60,21 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a-col :md="isShowCustomerSearch?24:6" :sm="24" :style="{textAlign: isShowCustomerSearch?'center':''}">
+             <div class="table-page-search-submitButtons">
+               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
+               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
+               <a @click="advanced=!advanced" style="margin-left: 5px">
+                 {{ advanced ? '收起' : '展开' }}
+                 <a-icon :type="advanced ? 'up' : 'down'"/>
+               </a>
+             </div>
             </a-col>
           </a-row>
         </a-form>
@@ -128,13 +135,14 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
+import customerService from '@/views/common/customerService.vue'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import { allocateBillList, allocateBillCheck } from '@/api/allocateBill'
 export default {
   name: 'MatchSendOutOrderAllocationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSearchList, commonModal, allocationDetailModal, warehouse },
+  components: { STable, VSelect, rangeDate, dealerSearchList, commonModal, allocationDetailModal, warehouse,customerService },
   data () {
     return {
       spinning: false,
@@ -153,7 +161,8 @@ export default {
         warehouseSn: undefined,
         receiverSn: undefined,
         checkStatus: undefined,
-        printState: undefined
+        printState: undefined,
+        bizUserSn:undefined
       },
       showDetailModal: false,
       disabled: false, //  查询、重置按钮是否可操作
@@ -181,6 +190,7 @@ export default {
       bizSn: '',
       spinningAudit: false,
       openModal: false //  新增编辑  弹框
+      
     }
   },
   computed: {
@@ -234,6 +244,7 @@ export default {
       this.queryParam.receiverName = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.checkStatus = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
       this.$refs.receiverSn.resetForm()
     },

+ 10 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -77,6 +77,11 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
@@ -202,6 +207,7 @@ import basicInfoModal from './basicInfoModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import auditModal from '@/views/common/auditModal.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport, allocateBillAblePrint } from '@/api/allocateBill'
 import AllocateType from '@/views/common/allocateType.js'
@@ -210,7 +216,7 @@ import printModal from './printStatusModal.vue'
 export default {
   name: 'TransferOutList',
   mixins: [commonMixin],
-  components: { STable, VSelect, basicInfoModal, printModal, rangeDate, auditModal, AllocateType, dealerSearchList, warehouse },
+  components: { STable, VSelect, basicInfoModal, printModal, rangeDate, auditModal, AllocateType, dealerSearchList, warehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -233,7 +239,8 @@ export default {
         receiverSn: undefined,
         checkStatus: undefined,
         printState: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -340,6 +347,7 @@ export default {
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.allocateTypeVal = []
       this.$refs.receiverSn.resetForm()
       this.$refs.table.refresh(true)

+ 139 - 131
src/views/allocationManagement/transferReturn/list.vue

@@ -1,57 +1,62 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="searchBoxNormal">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="创建时间">
-              <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="调拨退货单号">
-              <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="调拨退货对象名称">
-              <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="费用/调拨退货类型">
-                <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调入仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  id="transferReturn-warehouseSn"
-                  placeholder="请选择调入仓库"
-                />
+              <a-form-item label="调拨退货单号">
+                <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="transferReturn-state"
-                  code="ALLOCATE_RETURN_STATE"
-                  placeholder="请选择业务状态"
-                  allowClear
-                ></v-select>
+              <a-form-item label="调拨退货对象名称">
+                <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
               </a-form-item>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
-            <!-- <a-button
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="费用/调拨退货类型">
+                  <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调入仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="transferReturn-warehouseSn"
+                    placeholder="请选择调入仓库"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="transferReturn-state"
+                    code="ALLOCATE_RETURN_STATE"
+                    placeholder="请选择业务状态"
+                    allowClear
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
+              <!-- <a-button
               style="margin-left: 5px"
               type="primary"
               class="button-warning"
@@ -60,93 +65,93 @@
               :disabled="disabled"
               :loading="exportLoading"
               id="transferReturn-export">导出</a-button> -->
-            <a @click="advanced=!advanced" style="margin-left: 5px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  
-  <a-card size="small" :bordered="false" class="transferReturn-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ y: tableHeight }"
-        bordered>
-        <!-- 单号 -->
-        <template slot="allocateReturnNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('M_transferReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
-          <span v-else>{{ record.allocateReturnNo }}</span>
-        </template>
-        <!-- 调拨类型 -->
-        <template slot="allocateType" slot-scope="text, record">
-          <div>
-            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
-            <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
-            <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
-          </div>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferReturnAudit')"
-            class="button-warning"
-            @click="handleExamine(record)"
-            id="transferReturn-examine-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            v-if="record.state=='WAIT_CHECK' && $hasPermissions('M_transferReturnCheck')"
-            @click="handleCheck(record)"
-            id="transferReturn-examine-btn">品检</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnEdit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="transferReturn-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnDel')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="transferReturn-del-btn">删除</a-button>
-          <!-- 带财务确认或已完结 -->
-          <span v-if="record.state == 'WAIT_FINANCIAL_AUDIT'||record.state == 'FINISH'">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增 -->
-    <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
-    <!-- 审核 -->
-    <auditModal
-      v-drag
-      :openModal="visibleAudit"
-      :spinning="spinningAudit"
-      @close="visibleAudit=false"
-      @ok="auditOrder('WAIT_CHECK')"
-      @fail="auditOrder('AUDIT_REJECT')" />
-  </a-card>
+    </a-card>
+
+    <a-card size="small" :bordered="false" class="transferReturn-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ y: tableHeight }"
+          bordered>
+          <!-- 单号 -->
+          <template slot="allocateReturnNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('M_transferReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
+            <span v-else>{{ record.allocateReturnNo }}</span>
+          </template>
+          <!-- 调拨类型 -->
+          <template slot="allocateType" slot-scope="text, record">
+            <div>
+              <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+              <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
+              <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
+            </div>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferReturnAudit')"
+              class="button-warning"
+              @click="handleExamine(record)"
+              id="transferReturn-examine-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              v-if="record.state=='WAIT_CHECK' && $hasPermissions('M_transferReturnCheck')"
+              @click="handleCheck(record)"
+              id="transferReturn-examine-btn">品检</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnEdit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="transferReturn-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnDel')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="transferReturn-del-btn">删除</a-button>
+            <!-- 带财务确认或已完结 -->
+            <span v-if="record.state == 'WAIT_FINANCIAL_AUDIT'||record.state == 'FINISH'">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增 -->
+      <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
+      <!-- 审核 -->
+      <auditModal
+        v-drag
+        :openModal="visibleAudit"
+        :spinning="spinningAudit"
+        @close="visibleAudit=false"
+        @ok="auditOrder('WAIT_CHECK')"
+        @fail="auditOrder('AUDIT_REJECT')" />
+    </a-card>
   </div>
 </template>
 
@@ -159,11 +164,12 @@ import auditModal from '@/views/common/auditModal.vue'
 import { allocateReturnQueryPage, allocateReturnAudit, allocateReturnDelete, allocateReturnExport } from '@/api/allocateReturn'
 import AllocateType from '@/views/common/allocateType.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {
   name: 'TransferReturnList',
   mixins: [commonMixin],
-  components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType, warehouse },
+  components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType, warehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -180,7 +186,8 @@ export default {
         allocateReturnTypeSn: undefined, // 调拨退货类型2
         state: undefined, //  业务状态
         warehouseSn: undefined,
-        allocateReturnNo: '' //  调拨单号
+        allocateReturnNo: '', //  调拨单号
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -258,6 +265,7 @@ export default {
       this.queryParam.allocateSortSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.allocateTypeVal = []
       this.$refs.table.refresh(true)
     },

+ 13 - 5
src/views/allocationManagement/transfersPrint/list.vue

@@ -20,7 +20,7 @@
                 <dealerSearchList ref="receiverSn" @change="custChange"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24" v-if="currentTab==2">
+            <a-col :md="6" :sm="24" v-if="currentTab==2&&!isShowCustomerSearch">
               <a-form-item label="业务状态">
                 <v-select
                   v-model="queryParam.state"
@@ -33,7 +33,7 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24" v-if="currentTab==1">
+              <a-col :md="6" :sm="24" v-if="currentTab==1 ||(currentTab==2&&isShowCustomerSearch)">
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.state"
@@ -82,8 +82,13 @@
                   <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="currentTab==2?24:6" :sm="24" :style="{textAlign: currentTab==2?'center':''}">
+            <a-col :md="currentTab==2&&!isShowCustomerSearch ?24:6" :sm="24" :style="{textAlign: (currentTab==2&&!isShowCustomerSearch)?'center':''}">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
@@ -201,6 +206,7 @@ import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import printModal from '@/views/allocationManagement/transferOut/printModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import recordModal from './recordModal.vue'
 import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
@@ -208,7 +214,7 @@ import { printBase64Fun } from '@/libs/JGPrint.js'
 export default {
   name: 'TransfersPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, allocationDetailModal, warehouse },
+  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, allocationDetailModal, warehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -237,7 +243,8 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
-        shippingAddrProvinceSn: undefined
+        shippingAddrProvinceSn: undefined,
+        bizUserSn: undefined
       },
       currentTab: 2,
       disabled: false, //  查询、重置按钮是否可操作
@@ -333,6 +340,7 @@ export default {
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined

+ 10 - 2
src/views/reportData/actualSalesReport/list.vue

@@ -50,6 +50,11 @@
                   <AreaList id="actualSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom:10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="actualSalesReportList-refresh">查询</a-button>
@@ -123,6 +128,7 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import reportModal from '@/views/common/reportModal.vue'
+import customerService from '@/views/common/customerService.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
 import BizUser from '@/views/common/bizUser.js'
@@ -132,7 +138,7 @@ import { actualSalesExport } from '@/api/reportData'
 export default {
   name: 'ActualSalesReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser, customerService },
   data () {
     return {
       spinning: false,
@@ -157,7 +163,8 @@ export default {
           citySn: undefined,
           districtSn: undefined,
           dealerLevel: undefined
-        }
+        },
+        bizUserSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
@@ -282,6 +289,7 @@ export default {
         bizUserSn: undefined
       }
       this.totalData = null
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.areaList.clearData()
         this.$refs.subarea.clearData()

+ 10 - 2
src/views/reportData/allocationDetails/list.vue

@@ -87,6 +87,11 @@
                   <Area id="allocationDetailsList-shippingAddrProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <!-- <a-button
@@ -161,12 +166,13 @@ import ProductType from '@/views/common/productType.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { userQueryList } from '@/api/power-user'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import AllocateType from '@/views/common/allocateType.js'
 import { allocateReportDetailList, allocateReportDetailCount, allocateReportDetailExport } from '@/api/allocateReport'
 export default {
   name: 'AllocationDetailsList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, Area, ProductBrand, reportModal, AllocateType, ProductType, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, subarea, Area, ProductBrand, reportModal, AllocateType, ProductType, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -201,7 +207,8 @@ export default {
           subareaAreaSn: undefined
         },
         dealerProvinceSn: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       productType: [],
       labelCol: { span: 8 },
@@ -386,6 +393,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.productType = []
       this.allocateTypeVal = []
       if (this.advanced) {

+ 11 - 3
src/views/reportData/allocationOrderTotal/list.vue

@@ -43,7 +43,12 @@
                 <AllocateType id="allocationDetailsList-allocateTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
               </a-form-model-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+              <a-form-item label="客服">
+                <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+              </a-form-item>
+            </a-col>
+            <a-col :md="isShowCustomerSearch?6:24" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: !isShowCustomerSearch?'center':''}">
               <!-- <a-button
                 type="primary"
                 class="button-info"
@@ -98,11 +103,12 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { allocateTypeAllList } from '@/api/allocateType'
 import { userQueryList } from '@/api/power-user'
 import AllocateType from '@/views/common/allocateType.js'
+import customerService from '@/views/common/customerService'
 import { allocateReportList, allocateReportCount } from '@/api/allocateReport'
 export default {
   name: 'AllocationOrderTotalList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, AllocateType },
+  components: { STable, VSelect, rangeDate, AllocateType, customerService },
   data () {
     return {
       spinning: false,
@@ -118,7 +124,8 @@ export default {
         creatorId: undefined,
         costTypeSn: undefined, // 费用类型
         allocateCategory: undefined, //  调拨类型1
-        allocateTypeSn: undefined //  调拨类型2
+        allocateTypeSn: undefined, //  调拨类型2
+        bizUserSn: undefined// 客服
       },
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
@@ -230,6 +237,7 @@ export default {
       this.queryParam.costTypeSn = undefined
       this.queryParam.allocateCategory = undefined
       this.queryParam.allocateTypeSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.allocateTypeVal = []
       this.$refs.ruleForm.resetFields()
       this.totalData = null

+ 26 - 7
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -32,8 +32,19 @@
                       <a-input id="promotionSalesRealTimeReport-title" v-model.trim="queryParam.promoRuleReport.title" allowClear placeholder="请输入促销名称"/>
                     </a-form-model-item>
                   </a-col>
+                  <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
+                    <a-form-model-item label="促销类型">
+                      <v-select
+                        v-model="queryParam.promoRuleReport.promotionRuleType"
+                        ref="ruleType"
+                        id="promotionSalesRealTimeReport-ruleType"
+                        code="PROMOTION_RULE_TYPE"
+                        placeholder="请选择促销类型"
+                        allowClear></v-select>
+                    </a-form-model-item>
+                  </a-col>
                   <template v-if="advanced">
-                    <a-col :md="6" :sm="24">
+                    <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
                       <a-form-model-item label="促销类型">
                         <v-select
                           v-model="queryParam.promoRuleReport.promotionRuleType"
@@ -91,9 +102,14 @@
                           allowClear></v-select>
                       </a-form-model-item>
                     </a-col>
+                    <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                      <a-form-item label="客服">
+                        <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                      </a-form-item>
+                    </a-col>
                   </template>
-                  <a-col :md="6" :sm="24">
-                    <span class="table-page-search-submitButtons">
+                  <a-col :md="isShowCustomerSearch?24:6" :sm="24" :style="{textAlign: isShowCustomerSearch?'center':''}">
+                    <div class="table-page-search-submitButtons">
                       <a-button type="primary" :disabled="disabled" @click="testForm('search')" >查询</a-button>
                       <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm">重置</a-button>
                       <a-button
@@ -109,7 +125,7 @@
                         {{ advanced ? '收起' : '展开' }}
                         <a-icon :type="advanced ? 'up' : 'down'"/>
                       </a>
-                    </span>
+                    </div>
                   </a-col>
                 </a-row>
               </a-form-model>
@@ -188,11 +204,12 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import getDate from '@/libs/getDate.js'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
+import customerService from '@/views/common/customerService'
 // import moment from 'moment'
 export default {
   name: 'PriceDifferenceDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, gatherList, reportModal, AreaList, rangeDate, subarea },
+  components: { STable, VSelect, gatherList, reportModal, AreaList, rangeDate, subarea, customerService },
   data () {
     const _this = this
     return {
@@ -223,7 +240,8 @@ export default {
         dealerProvinceSn: undefined, // 省份编码
         dealerCitySn: undefined, // 城市编码
         dealerDistrictSn: undefined, // 区域编码
-        giveMoney: undefined
+        giveMoney: undefined,
+        bizUserSn: undefined// 客服
       },
       rules: {
         salesDate: [{ required: true, message: '请选择销售审核时间', trigger: 'change' }]
@@ -402,7 +420,8 @@ export default {
         dealerProvinceSn: undefined, // 省份编码
         dealerCitySn: undefined, // 城市编码
         dealerDistrictSn: undefined, // 区域编码
-        giveMoney: undefined
+        giveMoney: undefined,
+        bizUserSn: undefined // 客服
       }
       this.time = undefined
       this.$refs.subarea.clearData()

+ 12 - 3
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -90,6 +90,11 @@
                     <AreaList id="promotionSalesRealTimeReport-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                   </a-form-model-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                  <a-form-item label="客服">
+                    <customerService ref="customerName" v-model="newQueryParam.bizUserSn"></customerService>
+                  </a-form-item>
+                </a-col>
               </template>
               <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
@@ -191,6 +196,7 @@ import {
 } from '@/components'
 import reportModal from '@/views/common/reportModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
+import customerService from '@/views/common/customerService.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
 import getDate from '@/libs/getDate.js'
@@ -203,7 +209,8 @@ export default {
     reportModal,
     AreaList,
     rangeDate,
-    subarea
+    subarea,
+    customerService
   },
   data () {
     const _this = this
@@ -236,7 +243,8 @@ export default {
         },
         dealerProvinceSn: undefined, // 省份编码
         dealerCitySn: undefined, // 城市编码
-        dealerDistrictSn: undefined // 区域编码
+        dealerDistrictSn: undefined, // 区域编码
+        bizUserSn: undefined
       },
       rules: {
         salesDate: [{
@@ -549,7 +557,8 @@ export default {
         },
         dealerProvinceSn: undefined, // 省份编码
         dealerCitySn: undefined, // 城市编码
-        dealerDistrictSn: undefined // 区域编码
+        dealerDistrictSn: undefined, // 区域编码
+        bizUserSn: undefined
       }
       this.$set(this.newQueryParam, 'salesDate', [
         getDate.getCurrMonthDays().starttime,

+ 10 - 2
src/views/reportData/returnSlipReport/list.vue

@@ -76,6 +76,11 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSlipReportList-refresh">查询</a-button>
@@ -151,12 +156,13 @@ import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import BizUser from '@/views/common/bizUser.js'
+import customerService from '@/views/common/customerService'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnTitle, salesReportReturnBillList, salesReportReturnBillCount, returnSlipExport } from '@/api/reportData'
 export default {
   name: 'ReturnSlipReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList, BizUser },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList, BizUser, customerService },
   data () {
     return {
       spinning: false,
@@ -182,7 +188,8 @@ export default {
         dealerLevel: undefined,
         salesReturnType: undefined,
         goodFlag: undefined,
-        salesReturnBillNo: ''
+        salesReturnBillNo: '',
+        bizUserSn: undefined// 客服
       },
       rules: {
         'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
@@ -312,6 +319,7 @@ export default {
       this.queryParam.dealerLevel = undefined
       this.queryParam.salesReturnType = undefined
       this.queryParam.goodFlag = undefined
+      this.queryParam.bizUserSn = undefined
       this.queryParam.salesReturnBillNo = ''
       this.$refs.custList.resetForm()
       this.totalData = null

+ 10 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -49,6 +49,11 @@
                   <AreaList id="salesAmountReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesAmountReportList-refresh">查询</a-button>
@@ -125,13 +130,14 @@ import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import BizUser from '@/views/common/bizUser.js'
+import customerService from '@/views/common/customerService'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesKdxxReportTitle, salesBillReportGroupByBuyerList, salesBillReportCountByBuyer } from '@/api/salesBillReport'
 import { salesAmountExport } from '@/api/reportData'
 export default {
   name: 'SalesAmountReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser, customerService },
   data () {
     return {
       spinning: false,
@@ -154,7 +160,8 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined,
           bizUserSn: undefined
-        }
+        },
+        bizUserSn: undefined// 客服
       },
       columns: [],
       countLabel: [],
@@ -274,6 +281,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
+      this.queryParam.bizUserSn = undefined
       this.totalData = null
       this.$refs.subarea.clearData()
       if (this.advanced) {

+ 17 - 4
src/views/reportData/salesDetails/list.vue

@@ -53,8 +53,13 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
+              <a-form-model-item label="品牌分类">
+                <v-select code="BRAND_TYPE" id="salesDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
                 <a-form-model-item label="品牌分类">
                   <v-select code="BRAND_TYPE" id="salesDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
                 </a-form-model-item>
@@ -101,8 +106,13 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
               <!-- <a-button
                 type="primary"
                 class="button-info"
@@ -176,13 +186,14 @@ import AreaList from '@/views/common/areaList.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillDetailExport } from '@/api/reportData'
 export default {
   name: 'SalesDetailsList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse, BizUser },
+  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse, BizUser, customerService },
   data () {
     return {
       spinning: false,
@@ -216,7 +227,8 @@ export default {
         dealerCitySn: undefined,
         dealerCountySn: undefined,
         warehouseSn: undefined,
-        giftFLag: undefined
+        giftFLag: undefined,
+        bizUserSn: undefined // 客服
       },
       productType: [],
       rules: {
@@ -383,6 +395,7 @@ export default {
       this.queryParam.dealerCountySn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.giftFLag = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()

+ 25 - 4
src/views/reportData/salesOrderTotal/list.vue

@@ -35,8 +35,19 @@
                   placeholder="请输入客户名称" />
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
+              <a-form-model-item label="客户级别">
+                <v-select
+                  v-model="queryParam.dealerLevel"
+                  ref="dealerLevel"
+                  id="salesOrderTotalList-dealerLevel"
+                  code="DEALER_LEVEL"
+                  placeholder="请选择客户级别"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
                 <a-form-model-item label="客户级别">
                   <v-select
                     v-model="queryParam.dealerLevel"
@@ -78,8 +89,13 @@
                     placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
               <!-- <a-button
                 type="primary"
                 class="button-info"
@@ -165,6 +181,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import reportModal from '@/views/common/reportModal.vue'
+import customerService from '@/views/common/customerService.vue'
 import Area from '@/views/common/area.js'
 import {
   hdExportExcel
@@ -187,7 +204,8 @@ export default {
     custList,
     subarea,
     reportModal,
-    Area
+    Area,
+    customerService
   },
   data () {
     return {
@@ -210,7 +228,8 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
-        dealerProvinceSn: undefined
+        dealerProvinceSn: undefined,
+        bizUserSn: undefined
       },
       rules: {
         'time': [{
@@ -244,6 +263,7 @@ export default {
       totalData: null,
       operatorList: [], //  操作员下拉数据
       addrProvinceList: [] //  省下拉
+
     }
   },
   computed: {
@@ -392,6 +412,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.totalData = null
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 7 - 1
src/views/reportData/salesReturnDetailReport/list.vue

@@ -106,6 +106,11 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <!-- <a-button
@@ -182,6 +187,7 @@ import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import BizUser from '@/views/common/bizUser.js'
@@ -190,7 +196,7 @@ import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesR
 export default {
   name: 'SalesReturnDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse, BizUser },
+  components: { STable, VSelect, rangeDate, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse, BizUser, customerService },
   data () {
     return {
       spinning: false,

+ 10 - 2
src/views/reportData/salesReturnsReport/list.vue

@@ -75,6 +75,11 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="5" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <!-- <a-button
@@ -146,13 +151,14 @@ import subarea from '@/views/common/subarea.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import AreaList from '@/views/common/areaList.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnList, reportSalesReturnCount, salesReturnsExport } from '@/api/reportData'
 export default {
   name: 'SalesReturnsReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -178,7 +184,8 @@ export default {
         dealerSn: '',
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
-        dealerCountySn: undefined
+        dealerCountySn: undefined,
+        bizUserSn: undefined// 客服
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
@@ -348,6 +355,7 @@ export default {
       this.queryParam.dealerCountySn = undefined
       this.queryParam.goodFlag = undefined
       this.queryParam.salesReturnType = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.custList.resetForm()

+ 17 - 4
src/views/reportData/salesSlipReport/list.vue

@@ -33,8 +33,13 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
+              <a-form-model-item label="销售单号">
+                <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
                 <a-form-model-item label="销售单号">
                   <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 </a-form-model-item>
@@ -54,8 +59,13 @@
                   <AreaList id="salesSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}" >
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesSlipReportList-reset">重置</a-button>
               <a-button
@@ -130,13 +140,14 @@ import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import BizUser from '@/views/common/bizUser.js'
+import customerService from '@/views/common/customerService'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesKdxxdReportTitle, salesBillReportList, salesBillReportCount } from '@/api/salesBillReport'
 import { salesSlipExport } from '@/api/reportData'
 export default {
   name: 'SalesSlipReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser, customerService },
   data () {
     return {
       spinning: false,
@@ -160,7 +171,8 @@ export default {
           subareaAreaSn: undefined,
           bizUserSn: undefined
         },
-        dealerLevel: undefined
+        dealerLevel: undefined,
+        bizUserSn: undefined// 客服
       },
       columns: [],
       countLabel: [],
@@ -281,6 +293,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
+      this.queryParam.bizUserSn = undefined
       this.totalData = null
       if (this.advanced) {
         this.$refs.subarea.clearData()