浏览代码

kefu 查询

chenrui 1 年之前
父节点
当前提交
60ba0efde6

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

+ 14 - 6
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">
+            <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="$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)
     },
     // 新增

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

+ 112 - 104
src/views/salesReturnManagement/pickUp/list.vue

@@ -1,123 +1,128 @@
 <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>
+              <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?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">
+                  {{ 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>
@@ -128,6 +133,7 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import logisticsPoint from '../billOfLading/logisticsPoint'
 import rangeDate from '@/views/common/rangeDate.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { warehouseQueryPage, pickUpFinish } from '@/api/pickUp'
 export default {
   name: 'PickUpList',
@@ -139,7 +145,8 @@ export default {
     employee,
     rangeDate,
     logisticsPoint,
-    chooseWarehouse
+    chooseWarehouse,
+    customerService
   },
   data () {
     return {
@@ -159,7 +166,8 @@ export default {
         senderSn: undefined, //  发货人
         state: 'AUDIT_PASS', // 业务状态
         stateList: ['FINISH', 'AUDIT_PASS'],
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -253,6 +261,7 @@ export default {
       this.queryParam.salesReturnBillNo = ''
       this.queryParam.state = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.queryParam.stateList = ['FINISH', 'AUDIT_PASS']
       this.$refs.table.refresh(true)
     },
@@ -301,4 +310,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>
- 

+ 12 - 4
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -73,6 +73,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>
@@ -133,13 +138,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,
@@ -165,7 +171,8 @@ export default {
         provinceName: undefined,
         provinceSn: undefined,
         salesReturnType: undefined, // 退货类别
-        checkflag: undefined// 超时环节提醒
+        checkflag: undefined, // 超时环节提醒
+        bizUserSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
@@ -296,8 +303,9 @@ export default {
       this.queryParam.salesReturnType = undefined
       this.queryParam.goodFlag = undefined
       this.queryParam.checkflag = undefined
-      if(this.advanced){
-         this.$refs.dealerSubareaScopeList.resetForm()
+      this.queryParam.bizUserSn = undefined
+      if (this.advanced) {
+        this.$refs.dealerSubareaScopeList.resetForm()
       }
       this.$refs.table.refresh(true)
     },