lilei il y a 3 ans
Parent
commit
d9ceaee557

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -22,7 +22,7 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="经销商名称">
+                <a-form-item label="客户名称">
                   <a-input id="financialCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入经销商名称"/>
                 </a-form-item>
               </a-col>

+ 13 - 18
src/views/salesManagement/salesCollection/list.vue

@@ -6,10 +6,15 @@
         <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-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="客户名称">
+                <a-input id="salesCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入客户名称"/>
+              </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="请输入销售单号"/>
@@ -22,19 +27,8 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="经销商名称">
-                  <a-input id="salesCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入经销商名称"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="商户级别">
-                  <v-select
-                    v-model="queryParam.dealerLevel"
-                    ref="dealerLevel"
-                    id="salesCollectionList-dealerLevel"
-                    code="DEALER_LEVEL"
-                    placeholder="请选择商户级别"
-                    allowClear></v-select>
+                <a-form-item label="收货客户名称">
+                  <a-input id="salesCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入收货客户名称"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -126,7 +120,7 @@
         </a-form>
       </div>
       <!-- 操作按钮 -->
-      <div class="table-operator">
+      <div class="table-operator" v-if="$hasPermissions('B_financialCollection_receipt')">
         <a-button type="primary" @click="handlePlColle()" class="button-error">批量收款</a-button>
         <span style="margin-left: 8px">
           <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
@@ -163,8 +157,8 @@
             type="link"
             v-if="record.settleState=='WAIT' && record.voidFlag!=1 && $hasPermissions('B_financialCollection_receipt')"
             class="button-warning"
-            @click="handleColle(row)"
-            id="salesCollectionList-audit-btn">收款</a-button>
+            @click="handleAudit(record)"
+            id="financialCollectionList-audit-btn">收款</a-button>
           <span v-else>--</span>
         </template>
       </s-table>
@@ -207,6 +201,7 @@ import Area from '@/views/common/area.js'
 import commonModal from '@/views/common/commonModal.vue'
 import detailModal from './detailModal.vue'
 import { settleReceiptList, settleReceipt } from '@/api/settleReceipt'
+
 export default {
   name: 'SalesCollectionList',
   mixins: [commonMixin],
@@ -270,7 +265,7 @@ export default {
   computed: {
     // 是否显示table选择框
     showSelect () {
-      return this.$hasPermissions('B_productInfo_batchAudit')
+      return this.$hasPermissions('B_financialCollection_receipt')
     },
     columns () {
       const arr = [