Merge remote-tracking branch 'origin/master'

supervise-crm-ui/src/views/enterprise/index.vue

@@ -27,11 +27,11 @@
           <el-table v-loading="listLoading" :data="list" border style="width: 100%;">
             <!-- <el-table-column type="selection" align="center" width="50"/> -->
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column label="操作" wid align="center" width="220">
+            <el-table-column label="操作" wid align="center" width="180">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
                 <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
-                <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
+                <!-- <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button> -->
               </template>
             </el-table-column>
             <el-table-column label="企业名称" prop="enterpriseName" align="center" />

supervise-crm-ui/src/views/project/index.vue

@@ -47,11 +47,11 @@
           <el-table v-loading="listLoading" :data="list" border style="width: 100%;">
             <!-- <el-table-column type="selection" align="center" width="50"/> -->
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column label="操作" wid align="center" width="220">
+            <el-table-column label="操作" wid align="center" width="180">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
                 <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
-                <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
+                <!-- <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button> -->
               </template>
             </el-table-column>
             <el-table-column label="项目名称"  prop="entryName"  width="250" align="center" />