Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/supplier/index.vue

@@ -3,74 +3,23 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('公司名称')" prop="companyZh">
-        <el-input v-model="queryParams.companyZh" :placeholder="$t('请输入公司名称')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('英文名称')" prop="companyEn">
-        <el-input v-model="queryParams.companyEn" :placeholder="$t('请输入英文名称')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('供应商代码')" prop="companyCode">
-        <el-input v-model="queryParams.companyCode" :placeholder="$t('请输入供应商代码')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('代理商名称')" prop="agentName">
-        <el-input v-model="queryParams.agentName" :placeholder="$t('请输入代理商名称')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('公司电话')" prop="tell">
-        <el-input v-model="queryParams.tell" :placeholder="$t('请输入公司电话')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('国家')" prop="country">
-        <el-input v-model="queryParams.country" :placeholder="$t('请输入国家')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('省')" prop="province">
-        <el-input v-model="queryParams.province" :placeholder="$t('请输入省')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('市')" prop="city">
-        <el-input v-model="queryParams.city" :placeholder="$t('请输入市')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <!--el-form-item label="详细地址" prop="area">
-        <el-input v-model="queryParams.area" placeholder="请输入详细地址" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="省市区+详细地址" prop="address">
-        <el-input v-model="queryParams.address" placeholder="请输入省市区+详细地址" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item-->
-      <el-form-item :label="$t('备注')" prop="remark">
-        <el-input v-model="queryParams.remark" :placeholder="$t('请输入备注')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item :label="$t('创建时间')">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
+
       <el-form-item :label="$t('供应商类别')" prop="companyType">
-        <!--el-select v-model="queryParams.companyType" placeholder="请选择供应商类别" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select-->
-        <!--el-select v-model="form.code" placeholder="请选择渠道编码" clearable>
-            <el-option v-for="dict in this.getDictDatas('company_type')"
-                      :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select-->
         <dict-selector :type="DICT_TYPE.ECW_COMPANY_TYPE" v-model="queryParams.companyType" clearable />
       </el-form-item>
+
       <el-form-item :label="$t('合作类型')" prop="cooperationType">
         <dict-selector :type="DICT_TYPE.ECW_COOPERATION_TYPE" v-model="queryParams.cooperationType" clearable/>
-        <!--el-select v-model="queryParams.cooperationType" placeholder="请选择合作类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select-->
       </el-form-item>
-      <el-form-item :label="$t('营业执照')" prop="license">
-        <el-input v-model="queryParams.license" :placeholder="$t('请输入营业执照')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('合同')" prop="contract">
-        <el-input v-model="queryParams.contract" :placeholder="$t('请输入合同')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('统一信用代码')" prop="licenseNumber">
-        <el-input v-model="queryParams.licenseNumber" :placeholder="$t('请输入社会信用统一代码')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item :label="$t('是否展示')" prop="status">
-        <!-- <el-select v-model="queryParams.status" placeholder="请选择是否展示 默认为展示" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select> -->
-        <dict-selector :type="DICT_TYPE.ECW_YES_NO" v-model="queryParams.status" />
-      </el-form-item>
-      <el-form-item :label="$t('创建时间')">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+      
+      <el-form-item :label="$t('名称/代码')" prop="keyword">
+        <el-input v-model="queryParams.keyword" :placeholder="$t('名称/代码')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
+      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -83,27 +32,20 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                    v-hasPermi="['ecw:supplier:create']">{{$t('新增')}}</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['ecw:supplier:export']">{{$t('导出')}}</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
+      <el-table-column :label="$t('供应商代码')" align="center" prop="companyCode" />
       <el-table-column :label="$t('公司名称')" align="center" :prop="$l('company')" />
       <!--el-table-column label="英文名称" align="center" prop="companyEn" /-->
-      <el-table-column :label="$t('供应商代码')" align="center" prop="companyCode" />
-      <el-table-column :label="$t('代理商名称')" align="center" prop="agentName" />
       <el-table-column :label="$t('公司电话')" align="center" prop="tell" />
-      <el-table-column :label="$t('国家')" align="center" prop="country" />
-      <el-table-column :label="$t('省')" align="center" prop="province" />
-      <el-table-column :label="$t('市')" align="center" prop="city" />
-      <el-table-column :label="$t('区')" align="center" prop="area" />
-      <el-table-column :label="$t('详细地址')" align="center" prop="address" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" />
       <el-table-column :label="$t('供应商类别')" align="center" prop="companyType" >
         <template slot-scope="{row}">
           <template v-for="type in row.companyType.split(',')">
@@ -116,10 +58,7 @@
           <dict-tag type="cooperation_type" :value="row.cooperationType" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="营业执照" align="center" prop="license" />
-      <el-table-column label="合同" align="center" prop="contract" /> -->
       <el-table-column :label="$t('统一信用代码')" align="center" prop="licenseNumber" />
-      <el-table-column :label="$t('是否展示')" align="center" prop="status" />
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>