Prechádzať zdrojové kódy

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

# Conflicts:
#	src/views/reportData/salesDetails/list.vue
#	src/views/salesManagement/outboundOrder/list.vue
#	src/views/salesReturnManagement/returnSchedule/list.vue
lilei 1 rok pred
rodič
commit
dd73903cec
49 zmenil súbory, kde vykonal 2242 pridanie a 1787 odobranie
  1. 9 0
      src/api/bizuser.js
  2. 2 1
      src/store/getters.js
  3. 2 1
      src/store/modules/app.js
  4. 9 6
      src/utils/mixin.js
  5. 20 9
      src/views/allocationManagement/matchSendOutOrder/list.vue
  6. 10 2
      src/views/allocationManagement/transferOut/list.vue
  7. 139 131
      src/views/allocationManagement/transferReturn/list.vue
  8. 13 5
      src/views/allocationManagement/transfersPrint/list.vue
  9. 74 0
      src/views/common/customerService.vue
  10. 11 3
      src/views/expenseManagement/expenseReimbursement/list.vue
  11. 13 5
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  12. 11 4
      src/views/financialManagement/collectionDetailStatic/list.vue
  13. 148 140
      src/views/financialManagement/financialCollection/list.vue
  14. 10 2
      src/views/reportData/actualSalesReport/list.vue
  15. 10 2
      src/views/reportData/allocationDetails/list.vue
  16. 11 3
      src/views/reportData/allocationOrderTotal/list.vue
  17. 10 2
      src/views/reportData/billingReturnReport/list.vue
  18. 23 4
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  19. 15 7
      src/views/reportData/priceDifferenceDetailReport/list.vue
  20. 26 7
      src/views/reportData/promotionSalesRealTimeReport/index.vue
  21. 12 3
      src/views/reportData/promotionSalesRealTimeReport/list.vue
  22. 11 3
      src/views/reportData/regionTypeSalesReport/list.vue
  23. 10 2
      src/views/reportData/returnSlipReport/list.vue
  24. 10 2
      src/views/reportData/salesAmountReport/list.vue
  25. 16 14
      src/views/reportData/salesDetails/list.vue
  26. 25 4
      src/views/reportData/salesOrderTotal/list.vue
  27. 17 5
      src/views/reportData/salesReturnDetailReport/list.vue
  28. 10 3
      src/views/reportData/salesReturnReport/list.vue
  29. 10 2
      src/views/reportData/salesReturnsReport/list.vue
  30. 17 4
      src/views/reportData/salesSlipReport/list.vue
  31. 78 70
      src/views/salesManagement/backorder/list.vue
  32. 153 145
      src/views/salesManagement/examineVerify/list.vue
  33. 13 5
      src/views/salesManagement/matchSendOutOrder/list.vue
  34. 11 2
      src/views/salesManagement/outboundOrder/list.vue
  35. 12 4
      src/views/salesManagement/pushOrderManagement/list.vue
  36. 13 5
      src/views/salesManagement/receiptPrint/list.vue
  37. 208 202
      src/views/salesManagement/salesCollection/list.vue
  38. 3 3
      src/views/salesManagement/salesList/list.vue
  39. 10 2
      src/views/salesManagement/salesQueryNew/list.vue
  40. 147 139
      src/views/salesManagement/sendOutOrder/list.vue
  41. 139 131
      src/views/salesManagement/shortageStatisticsC/list.vue
  42. 108 100
      src/views/salesManagement/shortageStatisticsP/list.vue
  43. 36 28
      src/views/salesManagement/stockPrint/list.vue
  44. 2 2
      src/views/salesManagement/waitDispatchNew/queryPart.vue
  45. 142 133
      src/views/salesReturnManagement/billOfLading/list.vue
  46. 102 102
      src/views/salesReturnManagement/pickUp/list.vue
  47. 128 120
      src/views/salesReturnManagement/receiveCheck/list.vue
  48. 10 2
      src/views/salesReturnManagement/returnSchedule/list.vue
  49. 223 216
      src/views/salesReturnManagement/salesReturn/list.vue

+ 9 - 0
src/api/bizuser.js

@@ -214,3 +214,12 @@ export const querySupplierScope = params => {
     method: 'post'
   })
 }
+
+// 已启用状态下的客户列表
+export const queryUnderlingKf = params => {
+  return axios({
+    url: '/bizuser/queryUnderlingKf',
+    data: params,
+    method: 'post'
+  })
+}

+ 2 - 1
src/store/getters.js

@@ -24,7 +24,8 @@ const getters = {
   priceAuthOptions: state => state.app.priceAuthOptions,
   curActionPermission: state => state.app.curActionPermission,
   isWarehouse: state => state.app.isWarehouse,
-  defWarehouse: state => state.app.defWarehouse
+  defWarehouse: state => state.app.defWarehouse,
+  isShowCustomerSearch: state => state.app.isShowCustomerSearch,
 }
 
 export default getters

+ 2 - 1
src/store/modules/app.js

@@ -47,7 +47,8 @@ const app = {
     warehouseAuthList: null, // 有权限的仓库列表
     warehouseAllList: null, // 无权限所有仓库列表
     defWarehouse: null, // 默认仓库
-    isWarehouse: false// 仓库管理权限
+    isWarehouse: false,// 仓库管理权限
+    isShowCustomerSearch:false //客服查询权限
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {

+ 9 - 6
src/utils/mixin.js

@@ -78,16 +78,19 @@ const AppDeviceEnquire = {
 
 // 所有页
 const commonMixin = {
-  data(){
+  data () {
     return {
       toThousands,
       boldAmounts
     }
   },
-  computed:{
+  computed: {
     isShowWarehouse () {
       return this.$store.state.app.isWarehouse
     },
+    isShowCustomerSearch () {
+      return this.$store.state.app.isShowCustomerSearch
+    },
     defWarehouse () {
       return this.$store.state.app.defWarehouse
     }
@@ -101,16 +104,16 @@ const commonMixin = {
         if (this.spinning !== undefined) {
           this.spinning = a
         }
-        if (this.exportLoading !== undefined){
+        if (this.exportLoading !== undefined) {
           this.exportLoading = a
         }
-        if(this.isInster !== undefined){
+        if (this.isInster !== undefined) {
           this.isInster = a
         }
-        if(this.addMoreLoading != undefined){
+        if (this.addMoreLoading != undefined) {
           this.addMoreLoading = a
         }
-        if(this.confirmLoading != undefined){
+        if (this.confirmLoading != undefined) {
           this.confirmLoading = a
         }
       }

+ 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

+ 74 - 0
src/views/common/customerService.vue

@@ -0,0 +1,74 @@
+<template>
+  <a-select
+    :size="size"
+    :value="bizUserSnVal"
+    :placeholder="placeholder"
+    style="width: 100%"
+    :filter-option="false"
+    :not-found-content="fetching ? undefined : null"
+    :dropdownMatchSelectWidth="false"
+    @change="handleChange"
+    allowClear
+    :disabled="disabled"
+    notFoundContent="暂无数据"
+  >
+    <a-spin v-if="fetching" slot="notFoundContent" size="small" />
+    <a-select-option v-for="item in customerData" :key="item.id" :value="item.bizUserSn">
+      {{ item.userName }}
+    </a-select-option>
+  </a-select>
+</template>
+<script>
+import { queryUnderlingKf } from '@/api/bizuser'
+export default {
+  props: {
+    value: {
+      type: [String, Array],
+      defatut: ''
+    },
+    size: {
+      type: String,
+      default: 'default'
+    },
+    placeholder: {
+      type: String,
+      default: '请选择客服名称'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      customerData: [],
+      bizUserSnVal: this.value,
+      fetching: false
+    }
+  },
+  mounted () {
+    this.getListData()
+  },
+  watch: {
+    value (newValue, oldValue) {
+      this.bizUserSnVal = newValue
+    }
+  },
+  methods: {
+    getListData () {
+      queryUnderlingKf({}).then(res => {
+        this.customerData = res.data ? res.data : []
+        this.$store.state.app.isShowCustomerSearch = res.data && res.data.length > 0
+      })
+    },
+    handleChange (value) {
+      this.bizUserSnVal = value
+      this.$emit('change', value)
+      this.$emit('input', value)
+    },
+    resetForm () {
+      this.bizUserSnVal = undefined
+    }
+  }
+}
+</script>

+ 11 - 3
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -70,6 +70,11 @@
                   <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 </a-form-item>
               </a-col>
+            <!--  <a-col :md="4" :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">
@@ -195,12 +200,13 @@ import previewModal from './previewModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import expenseType from '@/views/common/expenseType.js'
 import { getBatchLastProcessInstance } from '@/api/financeBook'
+import customerService from '@/views/common/customerService'
 import { expenseAccountList, expenseAccountDelete, expenseAccountAgainEdit, expenseAcctDetailFindList, expenseAccountUpdateBatch } from '@/api/expenseManagement'
 import baseDataModal from './baseDataModal.vue'
 export default {
   name: 'ExpenseReimbursementList',
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal, commonModal },
+  components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal, commonModal, customerService },
   data () {
     const _this = this
     return {
@@ -224,7 +230,8 @@ export default {
         expenseType3: undefined, // 费用类型3
         printStatus: undefined, // 打印状态
         state: undefined, // 状态
-        salesBillNo: ''// 销售单号
+        salesBillNo: '', // 销售单号
+        bizUserSn: undefined
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -426,7 +433,8 @@ export default {
         state: undefined, // 状态
         printStatus: undefined,
         applyPersonSn: undefined,
-        salesBillNo: ''// 销售单号
+        salesBillNo: '', // 销售单号
+        bizUserSn: undefined
       }
       this.expenseTypes = []
       this.searchForm()

+ 13 - 5
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -134,9 +134,14 @@
                   </a-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">
-              <span class="table-page-search-submitButtons">
+              <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a-button
@@ -152,7 +157,7 @@
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
-              </span>
+              </div>
             </a-col>
           </a-row>
         </a-form>
@@ -199,6 +204,7 @@ import employee from '../expenseReimbursement/employee.js'
 import custList from '@/views/common/custList.vue'
 import supplier from '@/views/common/supplier.js'
 import expenseType from '@/views/common/expenseType.js'
+import customerService from '@/views/common/customerService'
 import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
 import otherTransactions from '@/views/common/otherTransactions.js'
 import { hdExportExcel } from '@/libs/exportExcel'
@@ -206,7 +212,7 @@ moment.locale('zh-cn')
 export default {
   name: 'ExpenseReimbursementDetailList',
   mixins: [commonMixin],
-  components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType, otherTransactions },
+  components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType, otherTransactions, customerService },
   data () {
     const _this = this
     return {
@@ -245,7 +251,8 @@ export default {
         provinceName: '',
         cityName: '',
         provinceSn: undefined,
-        citySn: undefined
+        citySn: undefined,
+        bizUserSn: undefined
       },
       addrProvinceList: [], // 省列表
       addrCityList: [], // 城市列表数据
@@ -387,7 +394,8 @@ export default {
         provinceName: '',
         cityName: '',
         provinceSn: undefined,
-        citySn: undefined
+        citySn: undefined,
+        bizUserSn: undefined
       }
       this.expenseTypes = []
       this.$refs.table.refresh(true)

+ 11 - 4
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -119,8 +119,13 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </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="24" :sm="24" style="text-align:center;">
+            <a-col :md="isShowCustomerSearch&&advanced?6:24" :sm="24" :style="{textAlign:(isShowCustomerSearch&&advanced)?'':'center'}">
               <a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
               <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
               <a-button
@@ -224,11 +229,12 @@ import plInvoiceModal from './plInvoiceModal.vue'
 import noteModal from './noteModal.vue'
 import printModal from './printModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { financeBookDetailQueryPage, financeBookDetailExport, financeBookReportDetailCount, financeBookDetailUpdateBatch } from '@/api/financeBook.js'
 export default {
   name: 'CollectionDetailStaticList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -259,7 +265,8 @@ export default {
         invoiceBeginDate: '',
         invoiceEndDate: '',
         payerType: undefined,
-        warehouseSn: undefined // 仓库
+        warehouseSn: undefined, // 仓库
+        bizUserSn: undefined
       },
       invoiceIsShow: false,
       noteIsShow: false,
@@ -514,6 +521,7 @@ export default {
       this.queryParam.invoiceStatus = undefined
       this.queryParam.payerType = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }
@@ -618,4 +626,3 @@ export default {
   }
 }
 </script>
- 

+ 148 - 140
src/views/financialManagement/financialCollection/list.vue

@@ -1,82 +1,87 @@
 <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="creatDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="收款单号">
-              <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="关联单据单号">
-              <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" 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="申请人">
-                <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :value="creatDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收款事由">
-                <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
+              <a-form-item label="收款单号">
+                <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="付款方类型">
-                <v-select
-                  v-model="queryParam.payerType"
-                  ref="payType"
-                  code="PAYER_TYPE"
-                  placeholder="请选择付款方式类型"
-                  allowClear></v-select>
+              <a-form-item label="关联单据单号">
+                <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="付款方">
-                <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <v-select
-                  v-model="queryParam.status"
-                  ref="status"
-                  id="financialCollectionList-status"
-                  code="FINANCE_BOOK_STATE"
-                  placeholder="请选择状态"
-                  allowClear></v-select>
-              </a-form-item>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="申请人">
+                  <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款事由">
+                  <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方类型">
+                  <v-select
+                    v-model="queryParam.payerType"
+                    ref="payType"
+                    code="PAYER_TYPE"
+                    placeholder="请选择付款方式类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方">
+                  <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="审核时间">
+                  <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.status"
+                    ref="status"
+                    id="financialCollectionList-status"
+                    code="FINANCE_BOOK_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" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="financialCollectionList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="financialCollectionList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-reset">重置</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="financialCollectionList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false" class="financialCollectionList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
           <div class="flex-center">
@@ -91,77 +96,77 @@
           </div>
           <div></div>
         </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :pageSize="30"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="bookNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_fc_detail')" class="link-bule" @click="handleDetail(record)">{{ record.bookNo }}</span>
-          <span v-else>{{ record.bookNo }}</span>
-        </template>
-        <!-- 关联备货单 -->
-        <template slot="dispatchNum" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_glDispatch')&&record.dispatchNum" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchNum }}单</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_edit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="handleEdit(record)"
-          >
-            编辑
-          </a-button>
-          <a-button
-            v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_del')"
-            size="small"
-            type="link"
-            class="button-error"
-            @click="handleDel(record)"
-          >
-            删除
-          </a-button>
-          <a-button
-            v-if="record.status!='WAIT_SUBMIT'&&$hasPermissions('B_fc_Audit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="handleSH(record)"
-          >
-            审核进度
-          </a-button>
-          <a-button
-            v-if="record.status=='AUDIT_REJECT'&&$hasPermissions('B_againEdit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="againEdit(record)"
-          >
-            再次编辑
-          </a-button>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 审核进度 -->
-    <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
-    <!-- 基础信息 -->
-    <baseModal v-drag :show="baseModal" @cancel="baseModal=false"></baseModal>
-    <!-- 关联备货单 -->
-    <dispatchModal v-drag ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
-  </a-card>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :pageSize="30"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="bookNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_fc_detail')" class="link-bule" @click="handleDetail(record)">{{ record.bookNo }}</span>
+            <span v-else>{{ record.bookNo }}</span>
+          </template>
+          <!-- 关联备货单 -->
+          <template slot="dispatchNum" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_glDispatch')&&record.dispatchNum" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchNum }}单</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_edit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="handleEdit(record)"
+            >
+              编辑
+            </a-button>
+            <a-button
+              v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_del')"
+              size="small"
+              type="link"
+              class="button-error"
+              @click="handleDel(record)"
+            >
+              删除
+            </a-button>
+            <a-button
+              v-if="record.status!='WAIT_SUBMIT'&&$hasPermissions('B_fc_Audit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="handleSH(record)"
+            >
+              审核进度
+            </a-button>
+            <a-button
+              v-if="record.status=='AUDIT_REJECT'&&$hasPermissions('B_againEdit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="againEdit(record)"
+            >
+              再次编辑
+            </a-button>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 审核进度 -->
+      <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
+      <!-- 基础信息 -->
+      <baseModal v-drag :show="baseModal" @cancel="baseModal=false"></baseModal>
+      <!-- 关联备货单 -->
+      <dispatchModal v-drag ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
+    </a-card>
   </div>
 </template>
 
@@ -173,11 +178,12 @@ import baseModal from './baseModal.vue'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import verifyModal from './verifyModal.vue'
 import dispatchModal from './dispatchModal.vue'
+import customerService from '@/views/common/customerService'
 import { financeBookQueryPage, financeBookDeleteBySn, financeBookDgainEditBySn, financeBookQueryCount } from '@/api/financeBook.js'
 export default {
   name: 'FinancialCollectionList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, baseModal, employee, verifyModal, dispatchModal },
+  components: { STable, VSelect, rangeDate, baseModal, employee, verifyModal, dispatchModal, customerService },
   data () {
     return {
       spinning: false,
@@ -196,7 +202,8 @@ export default {
         applyPersonSn: undefined,
         bookReason: '',
         status: undefined,
-        payerName: ''
+        payerName: '',
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       creatDate: [], //  创建时间
@@ -286,6 +293,7 @@ export default {
       this.queryParam.bookReason = ''
       this.queryParam.status = undefined
       this.queryParam.payerType = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
     },
     // 新增

+ 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

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

@@ -50,6 +50,11 @@
                   <AreaList id="billingReturnReportList-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="billingReturnReportList-refresh">查询</a-button>
@@ -125,12 +130,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 { salesReportReturnList, salesReportReturnCount, billingReturnExport, salesReturnReportTitle } from '@/api/reportData'
 export default {
   name: 'BillingReturnReportList',
   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,
@@ -153,7 +159,8 @@ export default {
           subareaAreaSn: undefined,
           bizUserSn: undefined
         },
-        dealerLevel: undefined
+        dealerLevel: undefined,
+        bizUserSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
@@ -275,6 +282,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.areaList.clearData()

+ 23 - 4
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -27,8 +27,19 @@
                 <dealerSubareaScopeList id="hPriceDifferenceDetailList-custList" ref="custList" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
+            <a-col :md="7" :sm="24" v-if="isShowCustomerSearch">
+              <a-form-model-item label="客户级别">
+                <v-select
+                  v-model="queryParam.dealer.dealerLevel"
+                  ref="dealerLevel"
+                  id="hPriceDifferenceDetailList-dealerLevel"
+                  code="DEALER_LEVEL"
+                  placeholder="请选择客户级别"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="7" :sm="24">
+              <a-col :md="7" :sm="24" v-if="!isShowCustomerSearch">
                 <a-form-model-item label="客户级别">
                   <v-select
                     v-model="queryParam.dealer.dealerLevel"
@@ -76,8 +87,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="7" :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"
@@ -147,12 +163,13 @@ import Area from '@/views/common/area.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import BizUser from '@/views/common/bizUser.js'
+import customerService from '@/views/common/customerService'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { headRebateDetailReportList, headRebateDetailReportCount, headRebateDetailReportExport } from '@/api/reportData'
 export default {
   name: 'HPriceDifferenceDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType, reportModal, BizUser },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType, reportModal, BizUser, customerService },
   data () {
     return {
       spinning: false,
@@ -183,7 +200,8 @@ export default {
           productTypeSn2: '', //  产品二级分类
           productTypeSn3: '' //  产品三级分类
         },
-        bizType: undefined
+        bizType: undefined,
+        bizUserSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
@@ -359,6 +377,7 @@ export default {
       this.queryParam.product.productTypeSn2 = ''
       this.queryParam.product.productTypeSn3 = ''
       this.queryParam.bizType = undefined
+      this.queryParam.bizUserSn = undefined
       this.productType = []
       this.totalData = null
       if (this.advanced) {

+ 15 - 7
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -12,7 +12,7 @@
           :rules="rules"
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="月份" prop="month">
                 <a-month-picker
                   placeholder="请选择月份"
@@ -23,22 +23,27 @@
                   style="width: 100%;"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="省份" prop="provinceSn">
                 <Area id="priceDifferenceDetailList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="记账门店">
                 <custList id="priceDifferenceDetailList-rebateDealer" ref="rebateDealerList" @change="rebateDealerChange"></custList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
                 <dealerSubareaScopeList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <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" @click="handleSearch" :disabled="disabled" id="priceDifferenceDetailList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="priceDifferenceDetailList-reset">重置</a-button>
               <a-button
@@ -106,12 +111,13 @@ import Area from '@/views/common/area.js'
 import subarea from '@/views/common/subarea.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import reportModal from '@/views/common/reportModal.vue'
+import customerService from '@/views/common/customerService.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportRebateReportList, reportRebateCount, reportRebateExport } from '@/api/reportData'
 export default {
   name: 'PriceDifferenceDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, custList, dealerSubareaScopeList, subarea, Area, rangeDate, reportModal },
+  components: { STable, VSelect, custList, dealerSubareaScopeList, subarea, Area, rangeDate, reportModal, customerService },
   data () {
     return {
       spinning: false,
@@ -122,7 +128,8 @@ export default {
         month: moment().format('YYYY-MM'),
         provinceSn: undefined,
         rebateDealerSn: undefined,
-        dealerSn: undefined
+        dealerSn: undefined,
+        bizUserSn: undefined
       },
       rules: {
         'month': [{ required: true, message: '请选择月份', trigger: 'change' }],
@@ -215,6 +222,7 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.rebateDealerSn = undefined
       this.queryParam.dealerSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.rebateDealerList.resetForm()
       this.totalData = null
       if (this.advanced) {

+ 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,

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

@@ -40,6 +40,11 @@
                   <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </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 v-if="advanced && activeKey==0">
               <a-col :md="6" :sm="24">
                 <a-form-model-item prop="dealerProvinceSn" style="margin: 0;" label="地区">
@@ -47,7 +52,7 @@
                 </a-form-model-item>
               </a-col>
             </template> -->
-              <a-col :md="activeKey==0?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:activeKey==0?'center':'left'}">
+              <a-col :md="(activeKey==0&&!isShowCustomerSearch)?24:activeKey==1&&isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:(activeKey==0&&!isShowCustomerSearch)?'center':(activeKey==1&&isShowCustomerSearch)?'center':'left'}">
                 <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
@@ -96,11 +101,12 @@ import subarea from '@/views/common/subarea.js'
 import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
+import customerService from '@/views/common/customerService.vue'
 import { realReportSalesByProvince, realReportSalesByProvinceExport, subareaAreaReportTitle, subareaReportTitle, realReportSalesBySubArea, realReportSalesBySubAreaExport } from '@/api/reportData.js'
 export default {
   name: 'RegionTypeSalesReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, Area, reportModal, BizUser },
+  components: { STable, VSelect, rangeDate, subarea, Area, reportModal, BizUser, customerService },
   data () {
     return {
       spinning: false,
@@ -121,7 +127,8 @@ export default {
           subareaAreaSn: undefined,
           bizUserSn: undefined
         },
-        salesStatusType: 'REAL_SALES'
+        salesStatusType: 'REAL_SALES',
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -197,6 +204,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.queryParam.salesStatusType = 'REAL_SALES'
       if (this.activeKey == 0) {
         this.$refs.subarea.clearData()

+ 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) {

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

@@ -53,12 +53,12 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <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" 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>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品品牌">
                   <ProductBrand id="salesDetailsList-productBrandSn" :brandType="queryParam.productBrandTypeSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -122,14 +122,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="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
-              <!-- <a-button
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="salesDetailsList-stockDate">盘点区间日期</a-button> -->
+            <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailsList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailsList-reset">重置</a-button>
               <a-button
@@ -204,13 +203,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,
@@ -245,7 +245,8 @@ export default {
         dealerCountySn: undefined,
         warehouseSn: undefined,
         giftFLag: undefined,
-        promotionFlag: undefined
+        promotionFlag: undefined,
+        bizUserSn: undefined // 客服
       },
       productType: [],
       rules: {
@@ -413,6 +414,7 @@ export default {
       this.queryParam.warehouseSn = undefined
       this.queryParam.giftFLag = undefined
       this.queryParam.promotionFlag = 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()

+ 17 - 5
src/views/reportData/salesReturnDetailReport/list.vue

@@ -27,9 +27,13 @@
                 <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-
+            <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
+              <a-form-model-item label="产品名称">
+                <a-input id="salesReturnDetailList-productName" v-model.trim="queryParam.productName" 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="salesReturnDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
@@ -106,8 +110,13 @@
                     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-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
               <!-- <a-button
                 type="primary"
                 class="button-info"
@@ -182,6 +191,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 +200,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,
@@ -224,7 +234,8 @@ export default {
         },
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
-        dealerCountySn: undefined
+        dealerCountySn: undefined,
+        bizUserSn: undefined
       },
       productType: [],
       rules: {
@@ -438,6 +449,7 @@ export default {
       this.queryParam.warehouseSn = undefined
       this.queryParam.goodFlag = undefined
       this.queryParam.salesReturnType = undefined
+      this.queryParam.bizUserSn = undefined
       this.productType = []
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 10 - 3
src/views/reportData/salesReturnReport/list.vue

@@ -33,7 +33,6 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
@@ -50,6 +49,11 @@
                   <AreaList id="salesReturnDetailList-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="salesReturnReportList-refresh">查询</a-button>
@@ -125,13 +129,14 @@ import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 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 { salesReportReturnRebateTitle, salesReportReturnRebateList, salesReportReturnRebateCount, salesReturnExport } from '@/api/reportData'
 
 export default {
   name: 'SalesReturnReportList',
   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,
@@ -154,7 +159,8 @@ export default {
           subareaAreaSn: undefined,
           bizUserSn: undefined
         },
-        dealerLevel: undefined
+        dealerLevel: undefined,
+        bizUserSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
@@ -279,6 +285,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) {

+ 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()

+ 78 - 70
src/views/salesManagement/backorder/list.vue

@@ -1,75 +1,80 @@
 <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" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称">
-              <dealerSubareaScopeList ref="custList" id="backorderList-buyerSn" @change="custChange"></dealerSubareaScopeList>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="销售单号">
-              <a-input id="backorderList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :md="6" :sm="24">
+    <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="5" :sm="24">
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="5" :sm="24">
+              <a-form-item label="客户名称">
+                <dealerSubareaScopeList ref="custList" id="backorderList-buyerSn" @change="custChange"></dealerSubareaScopeList>
+              </a-form-item>
+            </a-col>
+            <a-col :md="5" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="backorderList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :md="6" :sm="24">
             <a-form-model-item label="仓库">
               <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
             </a-form-model-item>
           </a-col> -->
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="backorderList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="backorderList-reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  <a-card size="small" :bordered="false" class="backorderList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.no"
-        rowKeyName="no"
-        :columns="columns"
-        :pageSize="30"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <template slot="salesBillNo" slot-scope="text, record">
-          <span style="padding-right: 15px;">{{ text }}</span>
-          <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-success"
-            @click="handleDetail(record)"
-            v-if="$hasPermissions('B_oosDetail')"
-            id="backorderList-detail-btn">详情</a-button>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 详情 -->
-    <backorder-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
-  </a-card>
-</div>
+            <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>
+            <a-col :md="4" :sm="24">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="backorderList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="backorderList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false" class="backorderList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :pageSize="30"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <template slot="salesBillNo" slot-scope="text, record">
+            <span style="padding-right: 15px;">{{ text }}</span>
+            <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-success"
+              @click="handleDetail(record)"
+              v-if="$hasPermissions('B_oosDetail')"
+              id="backorderList-detail-btn">详情</a-button>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 详情 -->
+      <backorder-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -79,11 +84,12 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { STable, VSelect } from '@/components'
 import backorderDetailModal from './detailModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { oosList } from '@/api/oos'
 export default {
   name: 'BackorderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, backorderDetailModal, rangeDate, chooseWarehouse },
+  components: { STable, VSelect, dealerSubareaScopeList, backorderDetailModal, rangeDate, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -93,7 +99,8 @@ export default {
         endDate: '',
         buyerSn: undefined,
         warehouseSn: undefined,
-        salesBillNo: ''
+        salesBillNo: '',
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
@@ -123,7 +130,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', scopedSlots: { customRender: 'salesBillNo' }},
+        { title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', scopedSlots: { customRender: 'salesBillNo' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '缺货款数', dataIndex: 'totalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -154,6 +161,8 @@ export default {
       this.queryParam.salesBillNo = ''
       this.queryParam.buyerSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
+
       this.$refs.custList.resetForm()
       this.$refs.table.refresh(true)
     },
@@ -206,4 +215,3 @@ export default {
   }
 }
 </script>
- 

+ 153 - 145
src/views/salesManagement/examineVerify/list.vue

@@ -1,159 +1,164 @@
 <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="客户名称">
-              <dealerSubareaScopeList ref="dealerSubareaScopeList" id="examineVerifyList-buyerName" @change="custChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="销售单号">
-              <a-input id="examineVerifyList-salesBillNo" v-model.trim="queryParam.salesBillNo" 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="出库单号">
-                <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
+              <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="打印状态">
-                <v-select
-                  v-model="queryParam.printStatus"
-                  ref="printStatus"
-                  id="examineVerifyList-printStatus"
-                  code="PRINT_STATUS"
-                  placeholder="请选择打印状态"
-                  allowClear></v-select>
+              <a-form-item label="客户名称">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="examineVerifyList-buyerName" @change="custChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="examineVerifyList-billStatus"
-                  code="DISPATCH_BILL_STATUS"
-                  placeholder="请选择单据状态"
-                  allowClear></v-select>
+              <a-form-item label="销售单号">
+                <a-input id="examineVerifyList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="备货单号">
-                <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="所在区域">
-                <subarea id="examineVerifyList-subarea" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                <Area id="examineVerifyList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-              </a-form-model-item>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库单号">
+                  <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="打印状态">
+                  <v-select
+                    v-model="queryParam.printStatus"
+                    ref="printStatus"
+                    id="examineVerifyList-printStatus"
+                    code="PRINT_STATUS"
+                    placeholder="请选择打印状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    id="examineVerifyList-billStatus"
+                    code="DISPATCH_BILL_STATUS"
+                    placeholder="请选择单据状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="备货单号">
+                  <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="examineVerifyList-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+                  <Area id="examineVerifyList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+                </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="$refs.table.refresh(true)" :disabled="disabled" id="examineVerifyList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="examineVerifyList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-          </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="examineVerifyList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="examineVerifyList-reset">重置</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="examineVerifyList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- alert -->
-      <div class="tongji-bar">
-        <span v-if="$hasPermissions('M_examineVerifyList_salesPrice')">总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
-        总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
-        总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
-        总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y:tableHeight }"
-        :defaultLoadData="false"
-        bordered>
+    </a-card>
+
+    <a-card size="small" :bordered="false" class="examineVerifyList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- alert -->
+        <div class="tongji-bar">
+          <span v-if="$hasPermissions('M_examineVerifyList_salesPrice')">总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
+          总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+          总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+          总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y:tableHeight }"
+          :defaultLoadData="false"
+          bordered>
 
-        <!-- 销售单号 -->
-        <template slot="salesBillNo" slot-scope="text, record">
-          <span class="link-bule" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
-          <span v-else>{{ record.salesBillNo }}</span>
-        </template>
-        <!-- 备货单号 -->
-        <template slot="dispatchBillNo" slot-scope="text, record">
-          <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
-          <span v-else>{{ record.dispatchBillNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.billStatus=='WAIT_STOCK_UP_AUDIT'&&$hasPermissions('B_dispatchAduit')"
-            @click="handleExamine(record)"
-            id="examineVerifyList-examine-btn">备货审核</a-button>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 审核 -->
-    <auditModal
-      v-drag
-      :openModal="visibleAudit"
-      :spinning="spinningAudit"
-      @close="visibleAudit=false"
-      @ok="auditOrder('OUTING_WAREHOUSE')"
-      @fail="auditOrder('STOCK_UP_REJECT')" />
-    <auditRejectModal
-      v-drag
-      :openModal="visibleAuditReject"
-      :spinning="spinningAuditReject"
-      :itemData="auditInfo"
-      @close="visibleAuditReject=false"
-      @ok="auditReject" />
-    <!-- 查看销售单或备货单详情 -->
-    <commonModal
-      :modalTit="detailType?'备货单详情':'销售单详情'"
-      bodyPadding="10px"
-      width="70%"
-      :showFooter="false"
-      :openModal="showDetailModal"
-      @cancel="cancelDetail">
-      <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-      <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
-    </commonModal>
-  </a-card>
+          <!-- 销售单号 -->
+          <template slot="salesBillNo" slot-scope="text, record">
+            <span class="link-bule" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+            <span v-else>{{ record.salesBillNo }}</span>
+          </template>
+          <!-- 备货单号 -->
+          <template slot="dispatchBillNo" slot-scope="text, record">
+            <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+            <span v-else>{{ record.dispatchBillNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.billStatus=='WAIT_STOCK_UP_AUDIT'&&$hasPermissions('B_dispatchAduit')"
+              @click="handleExamine(record)"
+              id="examineVerifyList-examine-btn">备货审核</a-button>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 审核 -->
+      <auditModal
+        v-drag
+        :openModal="visibleAudit"
+        :spinning="spinningAudit"
+        @close="visibleAudit=false"
+        @ok="auditOrder('OUTING_WAREHOUSE')"
+        @fail="auditOrder('STOCK_UP_REJECT')" />
+      <auditRejectModal
+        v-drag
+        :openModal="visibleAuditReject"
+        :spinning="spinningAuditReject"
+        :itemData="auditInfo"
+        @close="visibleAuditReject=false"
+        @ok="auditReject" />
+      <!-- 查看销售单或备货单详情 -->
+      <commonModal
+        :modalTit="detailType?'备货单详情':'销售单详情'"
+        bodyPadding="10px"
+        width="70%"
+        :showFooter="false"
+        :openModal="showDetailModal"
+        @cancel="cancelDetail">
+        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+      </commonModal>
+    </a-card>
   </div>
 </template>
 
@@ -172,11 +177,12 @@ import { STable, VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import auditRejectModal from './auditRejectModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { dispatchlBhshList, dispatchQueryBhshCount, dispatchStockUpAduit } from '@/api/dispatch'
 export default {
   name: 'ExamineVerifyList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, commonModal, salesDetail, dispatchDetail, auditModal, subarea, auditRejectModal, Area, chooseWarehouse },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, commonModal, salesDetail, dispatchDetail, auditModal, subarea, auditRejectModal, Area, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -203,7 +209,8 @@ export default {
           subareaAreaSn: undefined
         },
         shippingAddrProvinceSn: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       selectedRowKeys: [], // Check here to configure the default column
@@ -298,6 +305,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }
@@ -419,4 +427,4 @@ export default {
       margin-top: 8px;
     }
   }
-</style>
+</style>

+ 13 - 5
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -84,9 +84,14 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </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="24" :sm="24">
-              <div class="table-page-search-submitButtons" style="text-align:center;">
+            <a-col :md="isShowCustomerSearch&&advanced?6:24" :sm="24">
+              <div class="table-page-search-submitButtons" :style="{textAlign:isShowCustomerSearch&&advanced?'':'center'}">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -163,11 +168,12 @@ import { dispatchlList, dispatchCheck } from '@/api/dispatch'
 import commonModal from '@/views/common/commonModal.vue'
 import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 export default {
   name: 'MatchSendOutOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area, commonModal, salesDetail, dispatchDetail, chooseWarehouse },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area, commonModal, salesDetail, dispatchDetail, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -197,7 +203,8 @@ export default {
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         checkStatus: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -327,7 +334,8 @@ export default {
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         checkStatus: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       }
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 11 - 2
src/views/salesManagement/outboundOrder/list.vue

@@ -79,6 +79,11 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </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="searchTable" :disabled="disabled" id="outboundOrderList-refresh">查询</a-button>
@@ -195,12 +200,13 @@ import allocationDetailModal from '@/views/allocationManagement/transferOut/deta
 import sendGoodModal from './sendGoodModal.vue'
 import { STable, VSelect } from '@/components'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 import { getCustomerInfo, validateStockOut } from '@/api/sendBill'
 export default {
   name: 'OutboundOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, pushOrderDetailModal, allocationDetailModal, subarea, Area, sendGoodModal, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, pushOrderDetailModal, allocationDetailModal, subarea, Area, sendGoodModal, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -225,7 +231,8 @@ export default {
         shippingAddrProvinceSn: undefined,
         sendFlag: undefined,
         warehouseSn: undefined,
-        outBizSubNo: ''
+        outBizSubNo: '',
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       loading: false,
@@ -326,6 +333,8 @@ export default {
       this.queryParam.sendFlag = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.outBizSubNo = ''
+      this.queryParam.bizUserSn = undefined
+
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

+ 12 - 4
src/views/salesManagement/pushOrderManagement/list.vue

@@ -90,9 +90,14 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </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="24" :sm="24">
-              <div class="table-page-search-submitButtons" style="text-align:center;">
+            <a-col :md="isShowCustomerSearch?6:24" :sm="24" :style="{textAlign:isShowCustomerSearch?'':'center'}">
+              <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -204,10 +209,11 @@ import commonModal from '@/views/common/commonModal.vue'
 import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
 import explainInfoModal from './explainInfoModal.vue'
 import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch'
+import customerService from '@/views/common/customerService'
 export default {
   name: 'PushOrderManagementList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal, chooseWarehouse },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -238,7 +244,8 @@ export default {
         shippingAddrProvinceSn: undefined,
         printStatus: undefined,
         checkStatus: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -376,6 +383,7 @@ export default {
       this.queryParam.printStatus = undefined
       this.queryParam.checkStatus = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
 
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 13 - 5
src/views/salesManagement/receiptPrint/list.vue

@@ -48,6 +48,11 @@
                   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>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
@@ -149,11 +154,12 @@ import commonModal from '@/views/common/commonModal.vue'
 import recordModal from './recordModal.vue'
 import printModel from './printModel.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { financeBookDetailList, updateFinanceBookDetail, getBatchLastProcessInstance, checkPrintStatus } from '@/api/financeBook'
 export default {
   name: 'ReceiptPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSearchList, rangeDate, commonModal, recordModal, printModel, chooseWarehouse },
+  components: { STable, VSelect, dealerSearchList, rangeDate, commonModal, recordModal, printModel, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -174,7 +180,8 @@ export default {
         dealerProvinceSn: undefined,
         fullPaymentFlag: undefined,
         warehouseSn: undefined,
-        printStatus: 'NO_PRINT'
+        printStatus: 'NO_PRINT',
+        bizUserSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -306,19 +313,19 @@ export default {
           if (b.detailItemUseList) {
             detailItemUseStr = this.getUseDetailInfo(b.detailItemUseList)
           }
-          if(b.detailItemPayList){
+          if (b.detailItemPayList) {
             detailPayUseStr = this.getUseDetailInfo(b.detailItemPayList)
           }
         })
         // 审核信息
         const auditStr = auditInfo ? this.getAuditInfo(auditInfo[item]) : ''
-        retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail:detailPayUseStr, subList: rs })
+        retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: rs })
       })
       console.log(retArr, '------------')
       this.handlePrint(retArr, 1, rows, bookSns)
     },
     // 获取授信西悉尼
-    getUseDetailInfo(list){
+    getUseDetailInfo (list) {
       let ret = ''
       list.map((k, i) => {
         ret = ret + k.itemName + '(' + k.itemAmount + ')' + (i == list.length - 1 ? '。' : ';')
@@ -447,6 +454,7 @@ export default {
         dealerProvinceSn: undefined,
         fullPaymentFlag: undefined,
         warehouseSn: undefined,
+        bizUserSn: undefined,
         printStatus: this.currentTab == 2 ? 'NO_PRINT' : undefined
       }
       this.$refs.table.refresh(true)

+ 208 - 202
src/views/salesManagement/salesCollection/list.vue

@@ -1,213 +1,218 @@
 <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="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称">
-              <dealerSubareaScopeList ref="settleClientName" id="salesCollectionList-settleClientName" @change="custChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="销售单号">
-              <a-input id="salesCollectionList-bizNo" v-model.trim="queryParam.bizNo" 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="备货单号">
-                <a-input id="salesCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收货客户名称">
-                <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
+              <a-form-item label="客户名称">
+                <dealerSubareaScopeList ref="settleClientName" id="salesCollectionList-settleClientName" @change="custChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收款类型">
-                <v-select
-                  v-model="queryParam.keepType"
-                  ref="keepType"
-                  id="salesCollectionList-keepType"
-                  code="KEEP_TYPE"
-                  placeholder="请选择收款类型"
-                  allowClear></v-select>
+              <a-form-item label="销售单号">
+                <a-input id="salesCollectionList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="备货单号">
+                  <a-input id="salesCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货客户名称">
+                  <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款类型">
+                  <v-select
+                    v-model="queryParam.keepType"
+                    ref="keepType"
+                    id="salesCollectionList-keepType"
+                    code="KEEP_TYPE"
+                    placeholder="请选择收款类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款时间">
+                  <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款方式">
+                  <v-select
+                    v-model="queryParam.settleStyle"
+                    ref="settleStyle"
+                    id="salesCollectionList-settleStyle"
+                    code="SETTLE_STYLE"
+                    placeholder="请选择收款方式"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    id="salesCollectionList-billStatus"
+                    code="DISPATCH_BILL_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.settleState"
+                    ref="settleState"
+                    id="salesCollectionList-settleState"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据状态">
+                  <v-select
+                    v-model="queryParam.voidFlag"
+                    ref="voidFlag"
+                    id="salesCollectionList-voidFlag"
+                    code="VOID_FLAG"
+                    placeholder="请选择单据状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="salesCollectionList-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所在区域">
+                  <subarea id="salesCollectionList-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="地区" prop="dealerProvinceSn" style="margin: 0;">
+                  <Area id="salesCollectionList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" 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="6" :sm="24">
-              <a-form-item label="收款时间">
-                <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="收款方式">
-                <v-select
-                  v-model="queryParam.settleStyle"
-                  ref="settleStyle"
-                  id="salesCollectionList-settleStyle"
-                  code="SETTLE_STYLE"
-                  placeholder="请选择收款方式"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="salesCollectionList-billStatus"
-                  code="DISPATCH_BILL_STATUS"
-                  placeholder="请选择业务状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="财务状态">
-                <v-select
-                  v-model="queryParam.settleState"
-                  ref="settleState"
-                  id="salesCollectionList-settleState"
-                  code="FINANCIAL_RECEIVE_STATUS"
-                  placeholder="请选择财务状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
-                <v-select
-                  v-model="queryParam.voidFlag"
-                  ref="voidFlag"
-                  id="salesCollectionList-voidFlag"
-                  code="VOID_FLAG"
-                  placeholder="请选择单据状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="对单状态">
-                <v-select
-                  v-model="queryParam.checkStatus"
-                  ref="checkStatus"
-                  id="salesCollectionList-checkStatus"
-                  code="CHECK_STATUS"
-                  placeholder="请选择对单状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="所在区域">
-                <subarea id="salesCollectionList-subarea" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-item>
+              <a-button type="primary" @click="searchTable" :disabled="disabled" id="salesCollectionList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesCollectionList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="地区" prop="dealerProvinceSn" style="margin: 0;">
-                <Area id="salesCollectionList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="searchTable" :disabled="disabled" id="salesCollectionList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesCollectionList-reset">重置</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="salesCollectionList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div class="table-operator" v-if="$hasPermissions('B_salesCollection_receipt')">
-        <a-button type="primary" @click="handlePlColle()">批量收款</a-button>
-        <span style="margin-left: 8px">
-          <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-        </span>
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+68+'px' }"
-        size="small"
-        :row-selection="showSelect?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.settleState=='FINISH' } })}:null"
-        @rowSelection="rowSelectionFun"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="bizNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record,0)">{{ record.bizNo }}</span>
-          <span v-else>{{ record.bizNo }}</span>
-        </template>
-        <!-- 下推单号 -->
-        <template slot="dispatchBillNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
-          <span v-else>{{ record.dispatchBillNo || '--' }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.settleState=='WAIT' && record.voidFlag!=1 && $hasPermissions('B_salesCollection_receipt')"
-            class="button-warning"
-            @click="handleColle(record)"
-            id="financialCollectionList-audit-btn">收款</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.settleState=='FINISH' && $hasPermissions('B_salesCollection_record')"
-            class="button-success"
-            @click="handleVoucher(record)"
-            id="financialCollectionList-voucher-btn">凭证</a-button>
-          <span v-if="record.settleState=='WAIT' && record.voidFlag==1">--</span>
-        </template>
-      </s-table>
+    </a-card>
 
-      <!-- 销售收款凭证 -->
-      <voucherModal v-drag ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="closeVoucherModal"></voucherModal>
-
-      <!-- 销售收款弹框 -->
-      <commonModal
-        :openModal="showSkModal"
-        modalTit="销售收款"
-        @cancel="closeColleModal"
-        @ok="handleSaveColle"
-      >
-        <div style="text-align: center;line-height: 24px;">
-          <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ $hasPermissions('B_salesCollection_receipt_salesPrice') ? toThousands(totalAmount) : '--' }} 元</div>
-          <div style="padding: 15px 0;font-weight: bold;font-size:14px;">请确认收款类型变更为标记收款吗?</div>
+    <a-card size="small" :bordered="false" class="salesCollectionList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator" v-if="$hasPermissions('B_salesCollection_receipt')">
+          <a-button type="primary" @click="handlePlColle()">批量收款</a-button>
+          <span style="margin-left: 8px">
+            <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+          </span>
         </div>
-      </commonModal>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+68+'px' }"
+          size="small"
+          :row-selection="showSelect?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.settleState=='FINISH' } })}:null"
+          @rowSelection="rowSelectionFun"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="bizNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record,0)">{{ record.bizNo }}</span>
+            <span v-else>{{ record.bizNo }}</span>
+          </template>
+          <!-- 下推单号 -->
+          <template slot="dispatchBillNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+            <span v-else>{{ record.dispatchBillNo || '--' }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.settleState=='WAIT' && record.voidFlag!=1 && $hasPermissions('B_salesCollection_receipt')"
+              class="button-warning"
+              @click="handleColle(record)"
+              id="financialCollectionList-audit-btn">收款</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.settleState=='FINISH' && $hasPermissions('B_salesCollection_record')"
+              class="button-success"
+              @click="handleVoucher(record)"
+              id="financialCollectionList-voucher-btn">凭证</a-button>
+            <span v-if="record.settleState=='WAIT' && record.voidFlag==1">--</span>
+          </template>
+        </s-table>
 
-      <!-- 查看销售单或备货单详情 -->
-      <commonModal
-        :modalTit="detailType?'备货单详情':'销售单详情'"
-        bodyPadding="10px"
-        width="70%"
-        :showFooter="false"
-        :openModal="showDetailModal"
-        @cancel="cancelDetail">
-        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
-      </commonModal>
-    </a-spin>
-  </a-card>
+        <!-- 销售收款凭证 -->
+        <voucherModal v-drag ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="closeVoucherModal"></voucherModal>
+
+        <!-- 销售收款弹框 -->
+        <commonModal
+          :openModal="showSkModal"
+          modalTit="销售收款"
+          @cancel="closeColleModal"
+          @ok="handleSaveColle"
+        >
+          <div style="text-align: center;line-height: 24px;">
+            <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ $hasPermissions('B_salesCollection_receipt_salesPrice') ? toThousands(totalAmount) : '--' }} 元</div>
+            <div style="padding: 15px 0;font-weight: bold;font-size:14px;">请确认收款类型变更为标记收款吗?</div>
+          </div>
+        </commonModal>
+
+        <!-- 查看销售单或备货单详情 -->
+        <commonModal
+          :modalTit="detailType?'备货单详情':'销售单详情'"
+          bodyPadding="10px"
+          width="70%"
+          :showFooter="false"
+          :openModal="showDetailModal"
+          @cancel="cancelDetail">
+          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+        </commonModal>
+      </a-spin>
+    </a-card>
   </div>
 </template>
 
@@ -223,11 +228,11 @@ import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.v
 import voucherModal from './voucherModal.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { settleReceiptList, settleReceiptBatch } from '@/api/settleReceipt'
-
+import customerService from '@/views/common/customerService'
 export default {
   name: 'SalesCollectionList',
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, rangeDate, commonModal, Area, voucherModal, dealerSubareaScopeList, salesDetail, dispatchDetail },
+  components: { STable, VSelect, subarea, rangeDate, commonModal, Area, voucherModal, dealerSubareaScopeList, salesDetail, dispatchDetail, customerService },
   data () {
     return {
       spinning: false,
@@ -250,7 +255,7 @@ export default {
         dealerLevel: undefined,
         settleStyle: undefined,
         keepType: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
@@ -260,7 +265,8 @@ export default {
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined,
-        checkStatus: undefined
+        checkStatus: undefined,
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       auditDate: [], //  审核时间
@@ -356,7 +362,7 @@ export default {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -390,7 +396,8 @@ export default {
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       this.queryParam.checkStatus = undefined
-      if(this.advanced){
+      this.queryParam.bizUserSn = undefined
+      if (this.advanced) {
         this.$refs.subarea.clearData()
       }
       this.$refs.table.refresh(true)
@@ -439,7 +446,7 @@ export default {
         this.$refs.voucherModal.getData(row)
       })
     },
-    closeVoucherModal(){
+    closeVoucherModal () {
       this.showVoucher = false
       this.$store.state.app.curActionPermission = ''
     },
@@ -449,7 +456,7 @@ export default {
       this.$store.state.app.curActionPermission = 'B_salesCollection_receipt'
       this.showSkModal = true
     },
-    closeColleModal(){
+    closeColleModal () {
       this.showSkModal = false
       this.$store.state.app.curActionPermission = ''
     },
@@ -520,4 +527,3 @@ export default {
   }
 }
 </script>
- 

+ 3 - 3
src/views/salesManagement/salesList/list.vue

@@ -180,6 +180,7 @@ import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import commonModal from '@/views/common/commonModal.vue'
+import customerService from '@/views/common/customerService.vue'
 import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
@@ -187,7 +188,7 @@ import { salesOverviewQueryPage } from '@/api/salesNew'
 export default {
   name: 'SalesListManagementList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, dispatchDetail, commonModal, Area, salesDetail, detailModal },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, dispatchDetail, commonModal, Area, salesDetail, detailModal, customerService },
   data () {
     return {
       spinning: false,
@@ -224,7 +225,7 @@ export default {
         billStatus: undefined, //  业务状态
         sendFlag: '', // 发货状态
         provinceSn: undefined, // 省份
-        timeoutflag: undefined// 超时环节提醒
+        timeoutflag: undefined // 超时环节提醒
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -386,7 +387,6 @@ export default {
       this.queryParam.sendFlag = ''
       this.queryParam.provinceSn = undefined
       this.queryParam.timeoutflag = undefined
-
       this.examineTime = []
       this.paymentTime = []
       this.$refs.subarea.clearData()

+ 10 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -104,6 +104,11 @@
                   </a-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="8" :sm="24">
               <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
@@ -318,10 +323,11 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { dispatchBatchPrintStatus, queryBySalesBillSn } from '@/api/dispatch'
 import { salesDetailExport } from '@/api/salesBillReport'
+import customerService from '@/views/common/customerService'
 export default {
   name: 'SalesQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal },
+  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal, customerService },
   data () {
     return {
       spinning: false,
@@ -356,7 +362,8 @@ export default {
         shippingAddrProvinceSn: undefined,
         warehouseSn: undefined,
         promoFlag: undefined,
-        expenseClainFlag: undefined
+        expenseClainFlag: undefined,
+        bizUserSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -723,6 +730,7 @@ export default {
       this.queryParam.warehouseSn = undefined
       this.queryParam.promoFlag = undefined
       this.queryParam.expenseClainFlag = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

+ 147 - 139
src/views/salesManagement/sendOutOrder/list.vue

@@ -1,153 +1,158 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="searchBoxNormal">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <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="sendOut-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" 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">
+          <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联业务单号">
-                <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
+              <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="托运日期">
-                <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
+              <a-form-item label="发货单号">
+                <a-input id="sendOut-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收货状态">
-                <v-select
-                  v-model="queryParam.receiveFlag"
-                  ref="receiveFlag"
-                  id="sendOut-receiveFlag"
-                  code="RECEIVE_FLAG"
-                  placeholder="请选择收货状态"
-                  allowClear></v-select>
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联业务单号">
+                  <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="托运日期">
+                  <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货状态">
+                  <v-select
+                    v-model="queryParam.receiveFlag"
+                    ref="receiveFlag"
+                    id="sendOut-receiveFlag"
+                    code="RECEIVE_FLAG"
+                    placeholder="请选择收货状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="物流情况">
+                  <v-select
+                    v-model="queryParam.transportState"
+                    ref="transportState"
+                    id="sendOut-transportState"
+                    code="TRANSPORT_STATE"
+                    placeholder="请选择物流情况"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="sendOut-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区" >
+                  <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" @load="warehouseLoad" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+                </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">
-              <a-form-item label="物流情况">
-                <v-select
-                  v-model="queryParam.transportState"
-                  ref="transportState"
-                  id="sendOut-transportState"
-                  code="TRANSPORT_STATE"
-                  placeholder="请选择物流情况"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="所在区域">
-                <subarea id="sendOut-subarea" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="地区" >
-                <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
-              </a-form-model-item>
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a-button
+                  style="margin-left: 10px"
+                  type="primary"
+                  class="button-warning"
+                  @click="handleExport"
+                  :disabled="disabled"
+                  :loading="exportLoading"
+                  v-if="$hasPermissions('B_sendOutExport')"
+                  id="sendOut-export">导出</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </span>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" @load="warehouseLoad" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-              <a-button
-                style="margin-left: 10px"
-                type="primary"
-                class="button-warning"
-                @click="handleExport"
-                :disabled="disabled"
-                :loading="exportLoading"
-                v-if="$hasPermissions('B_sendOutExport')"
-                id="sendOut-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  <a-card size="small" :bordered="false" class="sendOut-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div v-if="isShowImport">
-        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_sendOutPlImport')" @click="openGuideModal=true">批量导入</a-button>
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y:tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 发货单号 -->
-        <template slot="sendBillNo" slot-scope="text, record">
-          <span class="link-bule" v-if="$hasPermissions('B_SooDetail')" @click="handleDetail(record,1)">{{ record.sendBillNo }}</span>
-          <span v-else>{{ record.sendBillNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            v-if="record.receiveFlag == 0&&$hasPermissions('B_SooEdit')"
-            @click="handleEdit(record)"
-          >编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            v-if="record.receiveFlag == 0&&$hasPermissions('B_WLGZ')"
-            @click="handleDetail(record,0)"
-          >物流跟踪</a-button>
-          <span v-if="record.receiveFlag == 1">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 发货单详情 -->
-    <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
-    <!-- 编辑发货单 -->
-    <sendGoodModal
-      v-drag
-      ref="sendGoodModal"
-      modalTit="编辑发货单"
-      :openModal="showSendGoodModal"
-      @ok="sendSuccess"
-      @cancel="showSendGoodModal=false"></sendGoodModal>
-    <!-- 导入发货单 -->
-    <importGuideModal v-drag :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false" class="sendOut-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div v-if="isShowImport">
+          <a-button type="primary" class="button-error" v-if="$hasPermissions('B_sendOutPlImport')" @click="openGuideModal=true">批量导入</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y:tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 发货单号 -->
+          <template slot="sendBillNo" slot-scope="text, record">
+            <span class="link-bule" v-if="$hasPermissions('B_SooDetail')" @click="handleDetail(record,1)">{{ record.sendBillNo }}</span>
+            <span v-else>{{ record.sendBillNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              v-if="record.receiveFlag == 0&&$hasPermissions('B_SooEdit')"
+              @click="handleEdit(record)"
+            >编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              v-if="record.receiveFlag == 0&&$hasPermissions('B_WLGZ')"
+              @click="handleDetail(record,0)"
+            >物流跟踪</a-button>
+            <span v-if="record.receiveFlag == 1">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 发货单详情 -->
+      <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
+      <!-- 编辑发货单 -->
+      <sendGoodModal
+        v-drag
+        ref="sendGoodModal"
+        modalTit="编辑发货单"
+        :openModal="showSendGoodModal"
+        @ok="sendSuccess"
+        @cancel="showSendGoodModal=false"></sendGoodModal>
+      <!-- 导入发货单 -->
+      <importGuideModal v-drag :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
+    </a-card>
   </div>
 </template>
 
@@ -162,11 +167,12 @@ import Area from '@/views/common/area.js'
 import subarea from '@/views/common/subarea.js'
 import ImportGuideModal from './importGuideModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { sendBillQueryPageList, sendBillExcel } from '@/api/sendBill'
 export default {
   name: 'SendOutOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, detailModal, sendGoodModal, Area, subarea, ImportGuideModal, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, detailModal, sendGoodModal, Area, subarea, ImportGuideModal, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -193,7 +199,8 @@ export default {
           subareaAreaSn: undefined
         },
         provinceSn: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -264,7 +271,7 @@ export default {
       this.queryParam.sendBeginDate = date[0]
       this.queryParam.sendEndDate = date[1]
     },
-    warehouseLoad(def,data){
+    warehouseLoad (def, data) {
       this.isShowImport = data.length == 1
     },
     // 详情
@@ -315,6 +322,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

+ 139 - 131
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -1,144 +1,149 @@
 <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" :allowClear="false" :value="time" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品名称">
-              <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品编码">
-              <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" 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="客户名称">
-                <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="区域">
-                <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
+              <a-form-item label="产品名称">
+                <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="省份" prop="provinceSn">
-                <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品分类">
-                <ProductType v-model="productType" id="shortageStatisticsCList-productType" @change="changeProductType" placeholder="请选择产品分类"></ProductType>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="shortageStatisticsCList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="品牌分类">
-                <v-select code="BRAND_TYPE" id="shortageStatisticsCList-brandType" v-model="queryParam.brandType" allowClear placeholder="请选择品牌分类"></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="销售单号">
-                <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="客户类型">
-                <v-select code="DEALER_TYPE" id="shortageStatisticsCList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择客户类型"></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品状态">
-                <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
+              <a-form-item label="产品编码">
+                <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-              </a-form-model-item>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户名称">
+                  <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="区域">
+                  <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="省份" prop="provinceSn">
+                  <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品分类">
+                  <ProductType v-model="productType" id="shortageStatisticsCList-productType" @change="changeProductType" placeholder="请选择产品分类"></ProductType>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="品牌">
+                  <ProductBrand id="shortageStatisticsCList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="品牌分类">
+                  <v-select code="BRAND_TYPE" id="shortageStatisticsCList-brandType" v-model="queryParam.brandType" allowClear placeholder="请选择品牌分类"></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="销售单号">
+                  <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户类型">
+                  <v-select code="DEALER_TYPE" id="shortageStatisticsCList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择客户类型"></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品状态">
+                  <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </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: 8px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+              <a-button
+                style="margin-left: 5px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_oosDetailExportByBuyer')"
+                id="shortageStatisticsCList-export">导出</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 8px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
-            <a-button
-              style="margin-left: 5px"
-              type="primary"
-              class="button-warning"
-              @click="handleExport"
-              :disabled="disabled"
-              :loading="exportLoading"
-              v-if="$hasPermissions('B_oosDetailExportByBuyer')"
-              id="shortageStatisticsCList-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="shortageStatisticsCList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- alert -->
-      <div class="tongji-bar">
-        <div>
-          总客户数:<strong>{{ productTotal && (productTotal.totalBuyerQty || productTotal.totalBuyerQty==0) ? productTotal.totalBuyerQty : '--' }}</strong>,
-          总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
-          缺货总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
-          缺货总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
-          <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">缺货总金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong></span>
-        </div>
-        <div>
-          本页客户数:<strong>{{ currentTotal && (currentTotal.totalBuyerQty || currentTotal.totalBuyerQty==0) ? currentTotal.totalBuyerQty : '--' }}</strong>,
-          本页总单数:<strong>{{ currentTotal && (currentTotal.totalRecord || currentTotal.totalRecord==0) ? currentTotal.totalRecord : '--' }}</strong>,
-          本页缺货总款数:<strong>{{ currentTotal && (currentTotal.totalCategory || currentTotal.totalCategory==0) ? currentTotal.totalCategory : '--' }}</strong>,
-          本页缺货总数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
-          <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">本页缺货总金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong></span>
-        </div>
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+65+'px' }"
-        size="small"
-        :rowKey="(record) => record.no"
-        rowKeyName="no"
-        :pageSize="30"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ x: 2020, y: tableHeight }"
-        bordered>
-        <!-- 单号 -->
-        <template slot="salesBillNo" slot-scope="text, record">
-          {{ record.salesBillNo }}
-        </template>
-        <template slot="productCode" slot-scope="text, record">
-          <span style="padding-right: 15px;">{{ text }}</span>
-          <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-          <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
-</div>
+    </a-card>
+    <a-card size="small" :bordered="false" class="shortageStatisticsCList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- alert -->
+        <div class="tongji-bar">
+          <div>
+            总客户数:<strong>{{ productTotal && (productTotal.totalBuyerQty || productTotal.totalBuyerQty==0) ? productTotal.totalBuyerQty : '--' }}</strong>,
+            总单数:<strong>{{ productTotal && (productTotal.totalRecord || productTotal.totalRecord==0) ? productTotal.totalRecord : '--' }}</strong>,
+            缺货总款数:<strong>{{ productTotal && (productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong>,
+            缺货总数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
+            <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">缺货总金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong></span>
+          </div>
+          <div>
+            本页客户数:<strong>{{ currentTotal && (currentTotal.totalBuyerQty || currentTotal.totalBuyerQty==0) ? currentTotal.totalBuyerQty : '--' }}</strong>,
+            本页总单数:<strong>{{ currentTotal && (currentTotal.totalRecord || currentTotal.totalRecord==0) ? currentTotal.totalRecord : '--' }}</strong>,
+            本页缺货总款数:<strong>{{ currentTotal && (currentTotal.totalCategory || currentTotal.totalCategory==0) ? currentTotal.totalCategory : '--' }}</strong>,
+            本页缺货总数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
+            <span v-if="$hasPermissions('M_shortageStatisticsCList_salesPrice')">本页缺货总金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong></span>
+          </div>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+65+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :pageSize="30"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ x: 2020, y: tableHeight }"
+          bordered>
+          <!-- 单号 -->
+          <template slot="salesBillNo" slot-scope="text, record">
+            {{ record.salesBillNo }}
+          </template>
+          <template slot="productCode" slot-scope="text, record">
+            <span style="padding-right: 15px;">{{ text }}</span>
+            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -153,11 +158,12 @@ import Area from '@/views/common/area.js'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { oosBuyerList, oosBuyerDetailCount, oosBuyerDetailPageCount, oosDetailExport } from '@/api/oos'
 export default {
   name: 'ShortageStatisticsCList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType, chooseWarehouse },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -182,7 +188,8 @@ export default {
         brandType: undefined,
         productBrandSn: undefined,
         state: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -310,6 +317,7 @@ export default {
       this.queryParam.productBrandSn = undefined
       this.queryParam.state = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.productType = []
       this.$refs.table.refresh(true)
     },
@@ -412,4 +420,4 @@ export default {
        margin-top: 10px;
      }
   }
-</style>
+</style>

+ 108 - 100
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -1,112 +1,117 @@
 <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" :allowClear="false" :value="time" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品编码">
-              <a-input id="shortageStatisticsPList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品名称">
-              <a-input id="shortageStatisticsPList-productName" v-model.trim="queryParam.productName" 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="原厂编码">
-                <a-input id="shortageStatisticsPList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品状态">
-                <v-select code="OOS_PRODUCT_STATE" id="shortageStatisticsPList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
+              <a-form-item label="产品编码">
+                <a-input id="shortageStatisticsPList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="停产状态">
-                <a-select v-model="queryParam.haltProdFlag" placeholder="请选择停产状态" allowClear>
-                  <a-select-option value="0">
-                    启用
-                  </a-select-option>
-                  <a-select-option value="1">
-                    停产
-                  </a-select-option>
-                </a-select>
+              <a-form-item label="产品名称">
+                <a-input id="shortageStatisticsPList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsPList-reset">重置</a-button>
-            <a-button
-              style="margin-left: 5px"
-              type="primary"
-              class="button-warning"
-              @click="handleExport"
-              :disabled="disabled"
-              :loading="exportLoading"
-              v-if="$hasPermissions('B_oosDetailExportByProduct')"
-              id="shortageStatisticsCList-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="shortageStatisticsPList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- alert -->
-      <div class="tongji-bar">
-        <div>
-          总缺货数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
-          <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
-            总缺货金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>;
-          </span>
-          本页缺货数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
-          <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
-            本页缺货金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong>;
-          </span>
-        </div>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码">
+                  <a-input id="shortageStatisticsPList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品状态">
+                  <v-select code="OOS_PRODUCT_STATE" id="shortageStatisticsPList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="停产状态">
+                  <a-select v-model="queryParam.haltProdFlag" placeholder="请选择停产状态" allowClear>
+                    <a-select-option value="0">
+                      启用
+                    </a-select-option>
+                    <a-select-option value="1">
+                      停产
+                    </a-select-option>
+                  </a-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="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:isShowCustomerSearch?'center':''}">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsPList-reset">重置</a-button>
+              <a-button
+                style="margin-left: 5px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_oosDetailExportByProduct')"
+                id="shortageStatisticsCList-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>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+65+'px' }"
-        size="small"
-        :rowKey="(record) => record.no"
-        rowKeyName="no"
-        :columns="columns"
-        :data="loadData"
-        :pageSize="30"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <template slot="productCode" slot-scope="text, record">
-          <span style="padding-right: 15px;">{{ text }}</span>
-          <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-          <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false" class="shortageStatisticsPList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- alert -->
+        <div class="tongji-bar">
+          <div>
+            总缺货数量:<strong>{{ productTotal && (productTotal.totalQty || productTotal.totalQty==0) ? productTotal.totalQty : '--' }}</strong>,
+            <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
+              总缺货金额:<strong>{{ productTotal && (productTotal.totalAmount || productTotal.totalAmount==0) ? toThousands(productTotal.totalAmount) : '--' }}</strong>;
+            </span>
+            本页缺货数量:<strong>{{ currentTotal && (currentTotal.totalQty || currentTotal.totalQty==0) ? currentTotal.totalQty : '--' }}</strong>,
+            <span v-if="$hasPermissions('M_shortageStatisticsPList_salesPrice')">
+              本页缺货金额:<strong>{{ currentTotal && (currentTotal.totalAmount || currentTotal.totalAmount==0) ? toThousands(currentTotal.totalAmount) : '--' }}</strong>;
+            </span>
+          </div>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+65+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <template slot="productCode" slot-scope="text, record">
+            <span style="padding-right: 15px;">{{ text }}</span>
+            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
   </div>
 </template>
 
@@ -117,11 +122,12 @@ import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { oosProductList, oosProductDetailCount, oosProductDetailPageCount, oosDetailExportByProduct } from '@/api/oos'
 export default {
   name: 'ShortageStatisticsPList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -135,7 +141,8 @@ export default {
         origCode: '',
         warehouseSn: undefined,
         state: undefined,
-        haltProdFlag: undefined// 停产状态
+        haltProdFlag: undefined, // 停产状态
+        bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -269,6 +276,7 @@ export default {
       this.queryParam.warehouseSn = undefined
       this.queryParam.state = undefined
       this.queryParam.haltProdFlag = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
     },
     pageInit () {
@@ -322,4 +330,4 @@ export default {
        margin-top: 10px;
      }
   }
-</style>
+</style>

+ 36 - 28
src/views/salesManagement/stockPrint/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="stockPrint-wrap">
-      <!-- 搜索条件 -->
+    <!-- 搜索条件 -->
     <a-card class="searchBoxNormal" size="small" :bordered="false">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
@@ -79,22 +79,27 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </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="5" :sm="24">
-              <span class="table-page-search-submitButtons">
+            <a-col :md="(currentTab==1&&isShowCustomerSearch)?24:6" :sm="24" :style="{textAlign:(currentTab==1&&isShowCustomerSearch)?'center':''}">
+              <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
-              </span>
+              </div>
             </a-col>
           </a-row>
         </a-form>
       </div>
     </a-card>
-    
+
     <a-card class="stockPrint-body" size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <div class="flex-center" style="justify-content: space-between;">
@@ -109,15 +114,15 @@
           <div>
             <span>显示:</span>
             <a-tree-select
-                size="small"
-                v-model="showCols"
-                style="min-width: 200px"
-                dropdownMatchSelectWidth
-                :maxTagCount="3"
-                :tree-data="colsArr"
-                tree-checkable
-                placeholder="请选择要显示的列"
-              />
+              size="small"
+              v-model="showCols"
+              style="min-width: 200px"
+              dropdownMatchSelectWidth
+              :maxTagCount="3"
+              :tree-data="colsArr"
+              tree-checkable
+              placeholder="请选择要显示的列"
+            />
           </div>
         </div>
         <!-- 列表 -->
@@ -222,6 +227,7 @@ import sendTypeModal from './sendTypeModal.vue'
 import recordModal from './recordModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import explainInfoModal from '@/views/salesManagement/pushOrderManagement/explainInfoModal.vue'
@@ -230,7 +236,7 @@ import { printBase64Fun } from '@/libs/JGPrint.js'
 export default {
   name: 'StockPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area, commonModal, salesDetail, dispatchDetail, explainInfoModal, chooseWarehouse },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area, commonModal, salesDetail, dispatchDetail, explainInfoModal, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -258,7 +264,8 @@ export default {
         },
         shippingAddrProvinceSn: undefined,
         voidFlag: 0,
-        printStatus: 'NO_PRINT'
+        printStatus: 'NO_PRINT',
+        bizUserSn: undefined
       },
       showTipModal: false,
       showRecordModal: false,
@@ -283,8 +290,8 @@ export default {
       tipData: null,
       showPrintModal: false,
       showInfoModal: false,
-      showCols:[],
-      colsArr:[
+      showCols: [],
+      colsArr: [
         {
           title: '销售单号',
           value: 'salesBillNo',
@@ -331,7 +338,7 @@ export default {
         { title: '产品款数', dataIndex: 'totalCategory', width: '30px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '30px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if(this.showCols.includes('salesBillNo')){
+      if (this.showCols.includes('salesBillNo')) {
         arr.splice(2, 0, { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '80px', align: 'center' })
       }
 
@@ -345,25 +352,25 @@ export default {
         arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 6, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '50px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
-      
-      if(this.showCols.includes('warehouseName')){
+
+      if (this.showCols.includes('warehouseName')) {
         arr.push({ title: '仓库', dataIndex: 'warehouseName', width: '50px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
-        }
-      if(this.showCols.includes('billStatusDictValue')){
+      }
+      if (this.showCols.includes('billStatusDictValue')) {
         arr.push({ title: '业务状态', dataIndex: 'billStatusDictValue', width: '40px', align: 'center', customRender: function (text) { return text || '--' } })
       }
-      if(this.showCols.includes('voidFlagDictValue')){
+      if (this.showCols.includes('voidFlagDictValue')) {
         arr.push({ title: '单据状态', dataIndex: 'voidFlagDictValue', width: '40px', align: 'center', customRender: function (text) { return text || '--' } })
       }
       arr.push({ title: '备货打印状态', width: '40px', align: 'center', scopedSlots: { customRender: 'printStatus' } })
-      if(this.showCols.includes('allowPrintTime')){
+      if (this.showCols.includes('allowPrintTime')) {
         arr.push({ title: '允许打印时间', dataIndex: 'allowPrintTime', width: '50px', align: 'center', customRender: function (text) { return text || '--' } })
       }
-      if(this.showCols.includes('stockUpPrintTimes')){
+      if (this.showCols.includes('stockUpPrintTimes')) {
         arr.push({ title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
-      
-      arr.push({ title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center'})
+
+      arr.push({ title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center' })
       return arr
     }
   },
@@ -489,6 +496,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.queryParam.voidFlag = this.currentTab == 1 ? '' : '0'
       this.queryParam.warehouseSn = undefined
       this.queryParam.printStatus = this.currentTab == 1 ? '' : 'NO_PRINT'

+ 2 - 2
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -498,9 +498,9 @@ export default {
             const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
             if(acTotal){
               // 采购额结余
-              acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)
+              acTotal.cgejyAmount = (Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)).toFixed(2)
               // 采购额超出
-              acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
+              acTotal.cgeccAmount = (Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)).toFixed(2)
             }
              
             // 有数据时才调用接口,避免做无用的调用

+ 142 - 133
src/views/salesReturnManagement/billOfLading/list.vue

@@ -1,147 +1,152 @@
 <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="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="提货单号">
-              <a-input id="billOfLading-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="总部销退单号">
-              <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" 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="申请人">
-                <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="物流点">
-                <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
+              <a-form-item label="提货单号">
+                <a-input id="billOfLading-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="发货方">
-                <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="billOfLading-state"
-                  code="PICK_UP_STATE"
-                  placeholder="请选择状态"
-                  allowClear></v-select>
+              <a-form-item label="总部销退单号">
+                <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
+
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="申请人">
+                  <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="物流点">
+                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="发货方">
+                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="审核时间">
+                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="billOfLading-state"
+                    code="PICK_UP_STATE"
+                    placeholder="请选择状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
+                </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">
-              <a-form-model-item label="退货仓库">
-                <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
-              </a-form-model-item>
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </span>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  <a-card size="small" :bordered="false" class="billOfLading-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_newPickUp')" @click="handleAdd">新增</a-button>
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+64.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :pageSize="30"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="pickUpNo" slot-scope="text, record">
-          <div v-if="$hasPermissions('M_detailPickUp')">
-            <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
-          </div>
-          <div v-else>{{ record.pickUpNo }}</div>
-        </template>
-        <!-- 关联单数 -->
-        <template slot="salesReturnNum" slot-scope="text, record">
-          <div v-if="record.salesReturnNum">{{ record.salesReturnNum }} 单</div>
-          <div v-else></div>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <div>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_auditPickUp')"
-              @click="handleEexamine(record)"
-              id="billOfLading-eexamine-btn">审核进度</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              v-if="record.state == 'AUDIT_REJECT'&&$hasPermissions('B_asginEditPickUp')"
-              @click="handleAgainEdit(record)"
-              id="billOfLading-eexamine-btn">再次编辑</a-button>
-            <a-button
-              size="small"
-              v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_editPickUp')"
-              type="link"
-              class="button-info"
-              @click="handleEdit(record)"
-              id="billOfLading-edit-btn">编辑</a-button>
-            <a-button
-              size="small"
-              v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_delPickUp')"
-              type="link"
-              class="button-error"
-              @click="handleDel(record)"
-              id="billOfLading-del-btn">删除</a-button>
-          </div>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 审核进度 -->
-    <verifyModal :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.pickUpSn" @close="visibleAudit=false"></verifyModal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false" class="billOfLading-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_newPickUp')" @click="handleAdd">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+64.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="pickUpNo" slot-scope="text, record">
+            <div v-if="$hasPermissions('M_detailPickUp')">
+              <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
+            </div>
+            <div v-else>{{ record.pickUpNo }}</div>
+          </template>
+          <!-- 关联单数 -->
+          <template slot="salesReturnNum" slot-scope="text, record">
+            <div v-if="record.salesReturnNum">{{ record.salesReturnNum }} 单</div>
+            <div v-else></div>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_auditPickUp')"
+                @click="handleEexamine(record)"
+                id="billOfLading-eexamine-btn">审核进度</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.state == 'AUDIT_REJECT'&&$hasPermissions('B_asginEditPickUp')"
+                @click="handleAgainEdit(record)"
+                id="billOfLading-eexamine-btn">再次编辑</a-button>
+              <a-button
+                size="small"
+                v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_editPickUp')"
+                type="link"
+                class="button-info"
+                @click="handleEdit(record)"
+                id="billOfLading-edit-btn">编辑</a-button>
+              <a-button
+                size="small"
+                v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_delPickUp')"
+                type="link"
+                class="button-error"
+                @click="handleDel(record)"
+                id="billOfLading-del-btn">删除</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 审核进度 -->
+      <verifyModal :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.pickUpSn" @close="visibleAudit=false"></verifyModal>
+    </a-card>
   </div>
 </template>
 
@@ -153,6 +158,7 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import verifyModal from './verifyModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import { pickUpQueryPage, pickUpDelete, pickUpAgainEdit } from '@/api/pickUp'
 export default {
   name: 'BillOfLadingList',
@@ -164,7 +170,8 @@ export default {
     employee,
     rangeDate,
     verifyModal,
-    warehouse
+    warehouse,
+    customerService
   },
   data () {
     return {
@@ -185,8 +192,9 @@ export default {
         salesReturnBillNo: undefined, //  总部销退单号
         logisticsPoint: undefined, // 物流点
         senderSn: undefined, //  发货人
-        state: undefined ,// 业务状态
-        warehouseSn:undefined//退货仓库
+        state: undefined, // 业务状态
+        warehouseSn: undefined, // 退货仓库
+        bizUserSn: undefined // 客服
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -324,6 +332,7 @@ export default {
       this.queryParam.salesReturnBillNo = flag ? this.$route.query.billNo : ''
       this.queryParam.state = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 102 - 102
src/views/salesReturnManagement/pickUp/list.vue

@@ -1,123 +1,123 @@
 <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="rangeExamineDate" @change="dateExamineChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="提货单号">
-              <a-input id="pickUp-pickUpNo" v-model.trim="queryParam.pickUpNo" allowClear placeholder="请输入提货单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="关联销退单号">
-              <a-input id="pickUp-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="申请人">
-              <employee style="width: 100%;" id="pickUp-Employee" v-model="queryParam.applyPersonSn"></employee>
-            </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="物流点">
-                <logisticsPoint style="width: 100%;" id="pickUp-logisticsPoint" v-model="queryParam.logisticsPoint"></logisticsPoint>
+              <a-form-item label="审核时间">
+                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="发货方">
-                <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="pickUp-senderSn" @change="custChange" />
+              <a-form-item label="提货单号">
+                <a-input id="pickUp-pickUpNo" v-model.trim="queryParam.pickUpNo" 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="pickUp-state"
-                  code="PICK_UP_STATE"
-                  :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
-                  placeholder="请选择状态"
-                ></v-select>
+              <a-form-item label="关联销退单号">
+                <a-input id="pickUp-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-model-item label="退货仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-              </a-form-model-item>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="申请人">
+                  <employee style="width: 100%;" id="pickUp-Employee" v-model="queryParam.applyPersonSn"></employee>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="物流点">
+                  <logisticsPoint style="width: 100%;" id="pickUp-logisticsPoint" v-model="queryParam.logisticsPoint"></logisticsPoint>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="发货方">
+                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="pickUp-senderSn" @change="custChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="pickUp-state"
+                    code="PICK_UP_STATE"
+                    :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
+                    placeholder="请选择状态"
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
+            </template>
+            <a-col :md="24" :sm="24" style="textAlign:center;">
+              <div class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </div>
             </a-col>
-          </template>
-          <a-col :md="24" :sm="24" style="text-align: center;">
-            <div class="table-page-search-submitButtons">
-              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false" class="pickUp-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :pageSize="30"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="pickUpNo" slot-scope="text, record">
+            <div v-if="$hasPermissions('M_detailPickUp')">
+              <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
             </div>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  <a-card size="small" :bordered="false" class="pickUp-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :pageSize="30"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="pickUpNo" slot-scope="text, record">
-          <div v-if="$hasPermissions('M_detailPickUp')">
-            <span class="link-bule" @click="handleDetail(record)">{{ record.pickUpNo }}</span>
-          </div>
-          <div v-else>{{ record.pickUpNo }}</div>
-        </template>
-        <!-- 关联单数 -->
-        <template slot="salesReturnNum" slot-scope="text, record">
-          <div v-if="record.salesReturnNum">{{ record.salesReturnNum }} 单</div>
-          <div v-else></div>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-         <div>
-           <!-- <a-button
+            <div v-else>{{ record.pickUpNo }}</div>
+          </template>
+          <!-- 关联单数 -->
+          <template slot="salesReturnNum" slot-scope="text, record">
+            <div v-if="record.salesReturnNum">{{ record.salesReturnNum }} 单</div>
+            <div v-else></div>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <!-- <a-button
              size="small"
              type="link"
              class="button-info"
              v-if="(record.state == 'AUDIT_PASS'||record.state == 'FINISH')&&$hasPermissions('M_detailPickUp')"
              @click="handleDetail(record)"
              id="pickUp-detail-btn">详情</a-button> -->
-           <a-button
-             size="small"
-             type="link"
-             class="button-info"
-             v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('B_pickUp')"
-             @click="handlePickUp(record)"
-             id="pickUp-detail-btn">提货</a-button>
-         </div>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
- </div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('B_pickUp')"
+                @click="handlePickUp(record)"
+                id="pickUp-detail-btn">提货</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -160,6 +160,7 @@ export default {
         state: 'AUDIT_PASS', // 业务状态
         stateList: ['FINISH', 'AUDIT_PASS'],
         warehouseSn: undefined
+
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -301,4 +302,3 @@ export default {
   }
 }
 </script>
- 

+ 128 - 120
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -1,122 +1,127 @@
 <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="rangeExamineDate" @change="dateExamineChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="总部销退单号">
-              <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称">
-              <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="退货类别">
-              <v-select
-                v-model="queryParam.goodFlag"
-                ref="goodFlag"
-                id="receiveCheck-goodFlag"
-                code="GOOD_FLAG"
-                placeholder="请选择退货类别"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="业务状态">
-              <v-select
-                v-model="queryParam.billStatus"
-                ref="billStatus"
-                id="receiveCheck-billStatus"
-                code="SALES_RETURN_BILL_STATUS"
-                :notIn="['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT']"
-                placeholder="请选择业务状态"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-            <a-form-model-item label="退货仓库">
-              <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  <a-card size="small" :bordered="false" class="receiveCheck-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :pageSize="30"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="salesReturnBillNo" slot-scope="text, record">
-          <div v-if="$hasPermissions('B_salesReturnDetail')">
-            <span class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
-          </div>
-          <div v-else>{{ record.salesReturnBillNo }}</div>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <div>
-            <a-button
-              size="small"
-              type="link"
-              class="button-info"
-              v-if="record.billStatus == 'WAIT_RECEIVE'&&$hasPermissions('B_salesReturnReceiving')"
-              @click="handleReceiving(record)"
-              id="receiveCheck-detail-btn">收货</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
-              @click="handleCheck(record)"
-              id="salesReturn-eexamine-btn">品检</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              @click="handleOpenPrintModal(record)"
-              id="salesReturn-print-btn">打印</a-button>
-          </div>
-        </template>
-      </s-table>
-    </a-spin>
-    <commonModal
-      modalTit="品检打印预览"
-      bodyPadding="10px"
-      width="700pt"
-      :showFooter="false"
-      :openModal="showTipModal"
-      @cancel="canselPrintView">
-      <printModal ref="printModel" @cancel="showTipModal=false"></printModal>
-    </commonModal>
-  </a-card>
+    <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="rangeExamineDate" @change="dateExamineChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="总部销退单号">
+                <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户名称">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="退货类别">
+                <v-select
+                  v-model="queryParam.goodFlag"
+                  ref="goodFlag"
+                  id="receiveCheck-goodFlag"
+                  code="GOOD_FLAG"
+                  placeholder="请选择退货类别"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="receiveCheck-billStatus"
+                  code="SALES_RETURN_BILL_STATUS"
+                  :notIn="['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT']"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+              <a-form-model-item label="退货仓库">
+                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+              </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>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false" class="receiveCheck-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="salesReturnBillNo" slot-scope="text, record">
+            <div v-if="$hasPermissions('B_salesReturnDetail')">
+              <span class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+            </div>
+            <div v-else>{{ record.salesReturnBillNo }}</div>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="record.billStatus == 'WAIT_RECEIVE'&&$hasPermissions('B_salesReturnReceiving')"
+                @click="handleReceiving(record)"
+                id="receiveCheck-detail-btn">收货</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
+                @click="handleCheck(record)"
+                id="salesReturn-eexamine-btn">品检</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                @click="handleOpenPrintModal(record)"
+                id="salesReturn-print-btn">打印</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+      <commonModal
+        modalTit="品检打印预览"
+        bodyPadding="10px"
+        width="700pt"
+        :showFooter="false"
+        :openModal="showTipModal"
+        @cancel="canselPrintView">
+        <printModal ref="printModel" @cancel="showTipModal=false"></printModal>
+      </commonModal>
+    </a-card>
   </div>
 </template>
 
@@ -129,6 +134,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { takeQueryPage } from '@/api/salesReturn'
 import printModal from './printModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import commonModal from '@/views/common/commonModal.vue'
 export default {
   name: 'ReceiveCheckList',
@@ -141,7 +147,8 @@ export default {
     rangeDate,
     printModal,
     commonModal,
-    chooseWarehouse
+    chooseWarehouse,
+    customerService
   },
   data () {
     return {
@@ -159,7 +166,8 @@ export default {
         salesReturnBillNo: undefined, //  总部销退单号
         billStatus: undefined, // 业务状态
         warehouseSn: undefined,
-        goodFlag: undefined
+        goodFlag: undefined,
+        bizUserSn: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -240,6 +248,7 @@ export default {
       this.queryParam.billStatus = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.goodFlag = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
     },
     pageInit () {
@@ -297,4 +306,3 @@ export default {
   }
 }
 </script>
- 

+ 10 - 2
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -75,6 +75,11 @@
                   </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">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>
@@ -156,13 +161,14 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import { queryOverviewPage } from '@/api/salesReturn'
 export default {
   name: 'ReturnSchedule',
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, dealerSubareaScopeList, rangeDate, chooseWarehouse, Area },
+  components: { STable, VSelect, subarea, dealerSubareaScopeList, rangeDate, chooseWarehouse, Area, customerService },
   data () {
     return {
       spinning: false,
@@ -188,7 +194,8 @@ export default {
         provinceName: undefined,
         provinceSn: undefined,
         salesReturnType: undefined, // 退货类别
-        checkflag: undefined// 超时环节提醒
+        checkflag: undefined, // 超时环节提醒
+        bizUserSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
@@ -319,6 +326,7 @@ export default {
       this.queryParam.salesReturnType = undefined
       this.queryParam.goodFlag = undefined
       this.queryParam.checkflag = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.dealerSubareaScopeList.resetForm()
       }

+ 223 - 216
src/views/salesReturnManagement/salesReturn/list.vue

@@ -1,239 +1,244 @@
 <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="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="审核时间">
-              <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="退货类别" prop="goodFlag">
-              <v-select
-                v-model="queryParam.goodFlag"
-                ref="goodFlag"
-                id="returnSchedule-goodFlag"
-                code="GOOD_FLAG"
-                placeholder="请选择退货类别"
-                allowClear></v-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="退货类型">
-              <v-select
-                v-model="queryParam.salesReturnType"
-                id="departUser-salesReturnType"
-                code="SALES_RETURN_TYPE"
-                placeholder="请选择退货类型"
-                allowClear></v-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="总部销退单号">
-              <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" 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="客户采退申请单号">
-                <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeCreateDate" :value="createDate" @change="dateCreateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="单据来源">
-                <v-select
-                  v-model="queryParam.salesReturnBillSource"
-                  ref="salesReturnBillSource"
-                  id="salesReturn-salesReturnBillSource"
-                  code="SALES_SOURCE"
-                  placeholder="请选择单据来源"
-                  allowClear></v-select>
+              <a-form-item label="审核时间">
+                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="是否同步给客户">
-                <v-select
-                  v-model="queryParam.syncFlag"
-                  ref="syncFlag"
-                  id="salesReturn-syncFlag"
-                  code="FLAG"
-                  placeholder="请选择是否同步给客户"
-                  allowClear></v-select>
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
+              <a-form-model-item label="退货类别" prop="goodFlag">
                 <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="salesReturn-billStatus"
-                  code="SALES_RETURN_BILL_STATUS"
-                  placeholder="请选择业务状态"
+                  v-model="queryParam.goodFlag"
+                  ref="goodFlag"
+                  id="returnSchedule-goodFlag"
+                  code="GOOD_FLAG"
+                  placeholder="请选择退货类别"
                   allowClear></v-select>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="所在区域">
-                <subarea id="salesReturn-subarea" ref="subarea" @change="subareaChange"></subarea>
+              <a-form-model-item label="退货类型">
+                <v-select
+                  v-model="queryParam.salesReturnType"
+                  id="departUser-salesReturnType"
+                  code="SALES_RETURN_TYPE"
+                  placeholder="请选择退货类型"
+                  allowClear></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-              </a-form-model-item>
+              <a-form-item label="总部销退单号">
+                <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              </a-form-item>
             </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户采退申请单号">
+                  <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据来源">
+                  <v-select
+                    v-model="queryParam.salesReturnBillSource"
+                    ref="salesReturnBillSource"
+                    id="salesReturn-salesReturnBillSource"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="是否同步给客户">
+                  <v-select
+                    v-model="queryParam.syncFlag"
+                    ref="syncFlag"
+                    id="salesReturn-syncFlag"
+                    code="FLAG"
+                    placeholder="请选择是否同步给客户"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    id="salesReturn-billStatus"
+                    code="SALES_RETURN_BILL_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="salesReturn-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+                  <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
+                </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">
-              <a-form-model-item label="退货仓库">
-                <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
-              </a-form-model-item>
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </span>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  
-  <a-card size="small" :bordered="false" class="salesReturn-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
-       <div style="flex-grow: 1;display: flex;align-items: center;">
-         <!-- 操作按钮 -->
-         <div>
-           <a-button type="primary" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
-         </div>
-         <div class="tongji-bar">
-           总单数:{{ countData&&countData.totalRecord||0 }};
-           申请退货数量:{{ countData&&countData.totalInitialQty||0 }};
-           仓库实收数量:{{ countData&&countData.totalReceiveQty||0 }};
-           坏件数量:{{ countData&&countData.totalBadQty||0 }};
-           良品数量:{{ countData&&countData.totalGoodQty||0 }};
-           返库数量:{{ countData&&countData.totalBackStockQty||0 }};
-           <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
-             实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
-           </span>
-         </div>
-       </div>
-       <div></div>
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+85+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="salesReturnBillNo" slot-scope="text, record">
-          <div v-if="$hasPermissions('B_salesReturnDetail')">
-            <a-badge :count="'改'" :offset="[16,-13]" v-if="record.changeFlag==1" class="badge-con-t">
-              <span class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
-            </a-badge>
-            <span v-else class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
-          </div>
-          <div v-else>{{ record.salesReturnBillNo }}</div>
-        </template>
-        <!-- 提货单 -->
-        <template slot="pickUpSalesReturnNum" slot-scope="text, record">
-          <span class="link-bule" @click="handleBillOfLadingDetail(record)">{{ record.pickUpSalesReturnNum }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <div>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              v-if="record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')"
-              @click="handleEexamine(record)"
-              id="salesReturn-eexamine-btn">审核进度</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              v-if="record.salesReturnBillSource != 'SALES'&&record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_salseReturnSubmit')"
-              @click="beforeSubmit(record)"
-              id="salesReturn-eexamine-btn">提交</a-button>
-            <a-button
-              size="small"
-              v-if="record.billStatus == 'WAIT_SUBMIT' && $hasPermissions('B_salesReturnEdit')"
-              type="link"
-              class="button-info"
-              @click="handleEdit(record)"
-              id="salesReturn-edit-btn">{{ record.salesReturnBillSource == 'SALES' ? '编辑' : '改单' }}</a-button>
-            <a-button
-              size="small"
-              v-if="(record.billStatus == 'WAIT_SUBMIT'|| record.billStatus == 'AUDIT_REJECT') && $hasPermissions('B_salesReturnDel')"
-              type="link"
-              class="button-error"
-              @click="handleDel(record)"
-              id="salesReturn-del-btn">{{ record.salesReturnBillSource == 'SALES' ? '删除' : '取消' }}</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-info"
-              v-if="record.billStatus == 'AUDIT_REJECT'&& $hasPermissions('B_salesReturnAgainSubmit')"
-              @click="handleEdit(record)"
-              id="salesReturn-edit-btn">再次提交</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-info"
-              v-if="record.billStatus == 'WAIT_RECEIVE'&& $hasPermissions('B_newPickUp')"
-              @click="handlePickUp(record)"
-              id="salesReturn-edit-btn">申请提货</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-error"
-              v-if="record.billStatus == 'WAIT_RECEIVE'&&record.salesReturnBillSource=='PURCHASE'&&record.cancelFlag==1"
-              @click="handleCansel(record)"
-              id="salesReturn-cansel-btn">取消</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-info"
-              v-if="(record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'WAIT_CUSTOMER_SERVICE_CONFIRM')&& $hasPermissions('B_salesReturnConfirm')"
-              @click="handleConfirm(record)"
-              id="salesReturn-edit-btn">客服确认</a-button>
+    </a-card>
+
+    <a-card size="small" :bordered="false" class="salesReturn-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
+          <div style="flex-grow: 1;display: flex;align-items: center;">
+            <!-- 操作按钮 -->
+            <div>
+              <a-button type="primary" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
+            </div>
+            <div class="tongji-bar">
+              总单数:{{ countData&&countData.totalRecord||0 }};
+              申请退货数量:{{ countData&&countData.totalInitialQty||0 }};
+              仓库实收数量:{{ countData&&countData.totalReceiveQty||0 }};
+              坏件数量:{{ countData&&countData.totalBadQty||0 }};
+              良品数量:{{ countData&&countData.totalGoodQty||0 }};
+              返库数量:{{ countData&&countData.totalBackStockQty||0 }};
+              <span v-if="$hasPermissions('M_salesReturnList_salesPrice')">
+                实际退货金额:{{ countData&&countData.totalAmount?toThousands(countData.totalAmount):0 }};
+              </span>
+            </div>
           </div>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 选择客户弹框 -->
-    <choose-custom-modal :show="openModal" @ok="handleEdit" @cancel="openModal=false"></choose-custom-modal>
-    <!-- 审核进度 -->
-    <verifyModal v-drag :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.salesReturnBillSn" @close="visibleAudit=false"></verifyModal>
-    <!-- 选择审核人员 -->
-    <chooseDepartUserModal v-drag :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
-  </a-card>
+          <div></div>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+85+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="salesReturnBillNo" slot-scope="text, record">
+            <div v-if="$hasPermissions('B_salesReturnDetail')">
+              <a-badge :count="'改'" :offset="[16,-13]" v-if="record.changeFlag==1" class="badge-con-t">
+                <span class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+              </a-badge>
+              <span v-else class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+            </div>
+            <div v-else>{{ record.salesReturnBillNo }}</div>
+          </template>
+          <!-- 提货单 -->
+          <template slot="pickUpSalesReturnNum" slot-scope="text, record">
+            <span class="link-bule" @click="handleBillOfLadingDetail(record)">{{ record.pickUpSalesReturnNum }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')"
+                @click="handleEexamine(record)"
+                id="salesReturn-eexamine-btn">审核进度</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.salesReturnBillSource != 'SALES'&&record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_salseReturnSubmit')"
+                @click="beforeSubmit(record)"
+                id="salesReturn-eexamine-btn">提交</a-button>
+              <a-button
+                size="small"
+                v-if="record.billStatus == 'WAIT_SUBMIT' && $hasPermissions('B_salesReturnEdit')"
+                type="link"
+                class="button-info"
+                @click="handleEdit(record)"
+                id="salesReturn-edit-btn">{{ record.salesReturnBillSource == 'SALES' ? '编辑' : '改单' }}</a-button>
+              <a-button
+                size="small"
+                v-if="(record.billStatus == 'WAIT_SUBMIT'|| record.billStatus == 'AUDIT_REJECT') && $hasPermissions('B_salesReturnDel')"
+                type="link"
+                class="button-error"
+                @click="handleDel(record)"
+                id="salesReturn-del-btn">{{ record.salesReturnBillSource == 'SALES' ? '删除' : '取消' }}</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="record.billStatus == 'AUDIT_REJECT'&& $hasPermissions('B_salesReturnAgainSubmit')"
+                @click="handleEdit(record)"
+                id="salesReturn-edit-btn">再次提交</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="record.billStatus == 'WAIT_RECEIVE'&& $hasPermissions('B_newPickUp')"
+                @click="handlePickUp(record)"
+                id="salesReturn-edit-btn">申请提货</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-error"
+                v-if="record.billStatus == 'WAIT_RECEIVE'&&record.salesReturnBillSource=='PURCHASE'&&record.cancelFlag==1"
+                @click="handleCansel(record)"
+                id="salesReturn-cansel-btn">取消</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="(record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'WAIT_CUSTOMER_SERVICE_CONFIRM')&& $hasPermissions('B_salesReturnConfirm')"
+                @click="handleConfirm(record)"
+                id="salesReturn-edit-btn">客服确认</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 选择客户弹框 -->
+      <choose-custom-modal :show="openModal" @ok="handleEdit" @cancel="openModal=false"></choose-custom-modal>
+      <!-- 审核进度 -->
+      <verifyModal v-drag :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.salesReturnBillSn" @close="visibleAudit=false"></verifyModal>
+      <!-- 选择审核人员 -->
+      <chooseDepartUserModal v-drag :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
+    </a-card>
   </div>
 </template>
 
@@ -248,10 +253,10 @@ import verifyModal from './verifyModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnCancelBill, salesReturnSubmit, submitVerify } from '@/api/salesReturn'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
-import { forEach } from 'core-js/fn/array'
 export default {
   name: 'SalesReturnList',
   mixins: [commonMixin],
@@ -265,7 +270,8 @@ export default {
     chooseDepartUserModal,
     Area,
     subarea,
-    warehouse
+    warehouse,
+    customerService
   },
   data () {
     return {
@@ -299,8 +305,8 @@ export default {
           subareaAreaSn: undefined
         },
         shippingAddrProvinceSn: undefined,
-        salesReturnBillSource: undefined
-
+        salesReturnBillSource: undefined,
+        bizUserSn: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -507,6 +513,7 @@ export default {
       this.queryParam.warehouseSn = undefined
       this.queryParam.goodFlag = undefined
       this.queryParam.salesReturnType = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }