Parcourir la source

Merge commit 'f40624492dcf2b7660fa11e4a2bc9ef3496c97f9' into HEAD

gitadmin il y a 2 ans
Parent
commit
2bf3fd1c4f
1 fichiers modifiés avec 22 ajouts et 8 suppressions
  1. 22 8
      src/views/numsGoodsShelves/approveStore/list.vue

+ 22 - 8
src/views/numsGoodsShelves/approveStore/list.vue

@@ -5,12 +5,12 @@
       <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="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="联系人手机">
                 <a-input allowClear placeholder="请输入联系人手机" v-model.tirm="queryParam.contactPhone"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="联系人姓名">
                 <a-input allowClear placeholder="请输入联系人姓名" v-model.tirm="queryParam.contactName"/>
               </a-form-item>
@@ -20,7 +20,7 @@
                 <a-input allowClear placeholder="请输入门店名称" v-model.tirm="queryParam.storeName"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="状态">
                 <v-select
                   v-model="queryParam.auditStatus"
@@ -31,6 +31,11 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="关联汽配商">
+                <storeList ref="storeList" @change="custChange"></storeList>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <div>
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="approveStore-refresh">查询</a-button>
@@ -61,10 +66,11 @@
         </template>
         <!-- 地址 -->
         <template slot="addr" slot-scope="text, record">
-          <div style="word-break:break-all;">
-            <div>{{ record.addrProvinceName +'-'+ record.addrCityName +'-'+ record.addrDistrictName }}</div>
-            <div>{{ record.addrDetail }}</div>
+          <div style="word-break:break-all;" v-if="record.addrProvinceName||record.addrDetail">
+            <div v-if="record.addrProvinceName">{{ record.addrProvinceName +'-'+ record.addrCityName +'-'+ record.addrDistrictName }}</div>
+            <div v-if="record.addrDetail">{{ record.addrDetail }}</div>
           </div>
+          <div v-else>--</div>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -81,9 +87,10 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import storeList from '@/views/common/storeList.vue'
 import { xprhStoreApplyQueryPage, xprhStoreApplyAudit } from '@/api/approveStore'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, storeList },
   data () {
     return {
       spinning: false,
@@ -93,7 +100,8 @@ export default {
         contactName: '',
         contactPhone: '',
         storeName: '',
-        auditStatus: undefined
+        auditStatus: undefined,
+        delearSn: undefined
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -132,6 +140,10 @@ export default {
     }
   },
   methods: {
+    custChange (val) {
+      console.log(val)
+      this.queryParam.delearSn = val.key
+    },
     inited (viewer) {
       if (viewer && viewer.length) {
         this.$info({
@@ -178,6 +190,8 @@ export default {
       this.queryParam.contactPhone = ''
       this.queryParam.storeName = ''
       this.queryParam.auditStatus = undefined
+      this.queryParam.delearSn = undefined
+      this.$refs.storeList.resetForm()
       this.$refs.table.refresh(true)
     },
     setTableH () {