Merge remote-tracking branch 'origin/master'

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -155,7 +155,7 @@
             </template>
           </vxe-column>
 
-          <vxe-column title="操作" width="170px" fixed="right" align="center">
+          <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  slot-scope="scope">
               <el-button v-if="isAdmin" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-else-if="hasPermission('cwProjectReport:edit')&&

src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -63,9 +63,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="拥有人" prop="updateUserName">
+      <!--<el-form-item label="拥有人" prop="updateUserName">
         <el-input size="small" v-model="searchForm.updateUserName" placeholder="请输入拥有人" clearable></el-input>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
         <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>