Merge remote-tracking branch 'origin/master'

src/views/agent/ocpcList.vue

@@ -12,7 +12,9 @@
                     <div class="flex">
                         <GuipInput :label="`ID：`" v-model="searchSaleid" @blur="changeSearchSaleid()" placeholder="" ref="GuipInput" class="searchId" />
 
-                        <GuipSelect label="站点" v-model="searchUid" :options="siteList"  valueKey="uid" labelKey="name" @change="changeSearchSite()"  defaultValue="" placeholder="不限" clearable class="searchSite" />
+                        <GuipSelect label="站点" v-model="searchUid" @change="changeSearchSite()"
+                        :options="siteList" valueKey="uid" labelKey="name" :extraItem="{ label: '全部', value: '0' }"
+                        placeholder="" clearable class="searchSite"  />
                     </div>
 
                     <GuipTable :tableData="orderList" ref="multipleTable" autoColumn="true" :loading="tableLoading">
@@ -60,7 +62,7 @@ export default {
 
             siteList: [],
 
-            searchUid: 0,
+            searchUid: '0',
             searchSaleid: 0,
         }
     },

src/views/agent/siteList.vue

@@ -12,7 +12,7 @@
                         :customStyle="{ fontSize: '14px', background: '#fff', borderRadius: '2px', borderColor: '#DFE2E6' }" />
 
                         <el-form>
-                            <GuipSelect v-model="currentGroup" :options="siteGroups" defaultValue="选项1"  labelKey="name" valueKey="id" style="margin-bottom: 0px;" clearable />
+                            <GuipSelect v-model="currentGroup" :options="siteGroups"  labelKey="name" valueKey="id" :extraItem="{ label: '全部分组', value: '0' }" style="margin-bottom: 0px;" clearable />
                         </el-form>
                     </div> 
                     <GuipButton size="table" @click="addNewSite">新增站点</GuipButton> 
@@ -149,7 +149,7 @@ export default {
             selected_group: '',
             isUpIco: false, 
             currentIcon: require('@/assets/site/drop_icon.svg'),
-            currentGroup: '',
+            currentGroup: '0',
             fitlerIcon: require('@/assets/site/filter.svg'),
             // 手机服务
             phoneServices: [