Browse Source

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

lilei 11 months ago
parent
commit
9c485499d3

+ 3 - 21
src/views/promotionRulesManagement/dealerPromotions/lookUpCustomersModal.vue

@@ -29,18 +29,6 @@
                   <a-input id="lookUpCustomers-purchaseBillNo" v-model="queryParam.dealerName" placeholder="请输入经销商名称" allowClear/>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="lookUpCustomers-state"
-                    code="PROMOTION_STATE"
-                    placeholder="请选择客户状态"
-                    allowClear
-                  ></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="lookUpCustomers-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="lookUpCustomers-reset">重置</a-button>
@@ -79,10 +67,6 @@
             <span>{{ record.dealerName ||'--' }}</span>
             <!-- <a-badge count="未" :number-style="{ zoom:'80%' }"></a-badge> -->
           </template>
-          <!-- 客户状态 -->
-        <!--  <template slot="dealerState" slot-scope="text, record">
-            <a-switch checkedChildren="启用" unCheckedChildren="禁用" :checked="record.isEnable" @change="changeStatus"/>
-          </template> -->
         </s-table>
       </a-card>
       <div style="text-align:right;color:#666;" v-if="showType ==='isEdit' || showType === 'isAudit'"><span v-if="showType === 'isAudit'">待审核,</span>增加的客户显示红色,删除的客户显示绿色</div>
@@ -126,7 +110,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 // 组件
-import { STable } from '@/components'
+import { STable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
 import { hdExportExcel } from '@/libs/exportExcel'
@@ -136,7 +120,7 @@ import { dealerExport } from '@/api/promoTerminal'
 import { queryAuditPageList, dealerMidwayUpdate } from '@/api/promotion'
 export default {
   name: 'LookUpCustomersModal',
-  components: { STable, subarea, AreaList, chooseDealer },
+  components: { STable, VSelect, subarea, AreaList, chooseDealer },
   mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
@@ -173,8 +157,7 @@ export default {
         provinceSn: undefined, // 省
         citySn: undefined, // 市
         districtSn: undefined, // 区
-        dealerName: '', // 经销商名称
-        state: undefined// 客户状态
+        dealerName: '' // 经销商名称
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -206,7 +189,6 @@ export default {
         { title: '经销商名称', dataIndex: 'dealerName', scopedSlots: { customRender: 'dealerName' }, width: '20%', align: 'center', ellipsis: true },
         { title: '商户类型', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
-        // { title: '客户状态', scopedSlots: { customRender: 'dealerState' }, width: '10%', align: 'center' }
       ],
       openDealerModal: false, // 修改弹窗
       updateFlag: false// 是否刷新页面