Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/customer/edit.vue

@@ -11,7 +11,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('国家')" prop="country">
-                <el-select v-model="form.country" :placeholder="$t('请选择国家')">
+                <el-select filterable clearable v-model="form.country" :placeholder="$t('请选择国家')">
                   <el-option v-for="dict in countryList"
                              :key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
                 </el-select>
@@ -43,9 +43,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="13" v-show="form.type && form.type.indexOf('3') !== -1">
+            <el-col :span="13" v-show="form.type && form.type.indexOf('2') !== -1">
               <el-form-item :label="$t('所属代理')" prop="agentId">
-                <el-select v-model="form.agentId" :placeholder="$t('请选择所属代理')">
+                <el-select filterable clearable v-model="form.agentId" :placeholder="$t('请选择所属代理')">
                   <el-option v-for="item in serviceUserList"
                              :key="item.id" :label="item.nickname" :value="item.id" />
                 </el-select>

src/views/ecw/customer/query.vue

@@ -5,9 +5,8 @@
         <div style="display: flex;justify-content: space-between;align-items: flex-end;">
           <h2>{{$t('查看')}}</h2>
           <div>
-            <el-button type="primary" size="small">{{$t('添加优惠')}}</el-button>
             <el-button type="primary" size="small" @click="$router.push('/customer/edit/' + id)">{{$t('编辑')}}</el-button>
-            <el-button type="primary" size="small">{{$t('报价')}}</el-button>
+            <el-button @click="$router.push('/offer/create')" type="primary" size="small">{{$t('报价')}}</el-button>
             <el-button type="primary" size="small" @click="$refs['customerFollow'].customerFollow.dialogVisible = true">{{$t('跟进')}}</el-button>
             <el-button type="primary" size="small" @click="$refs['customerComplaint'].handleAdd()">{{$t('客诉')}}</el-button>
             <el-button type="danger" size="small">{{$t('删除')}}</el-button>