Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/fee-settings/Asbitem.vue

@@ -10,8 +10,10 @@
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
           highlight-current-row
+          :row-style="{ height: '40px' }"
         >
-          <el-table-column prop="id" label="id" width="300"> </el-table-column>
+          <el-table-column prop="id" label="编号" width="320">
+          </el-table-column>
           <el-table-column prop="displayName" label="名称" width="">
           </el-table-column>
           <el-table-column prop="creatorName" label="创建者" width="">
@@ -273,9 +275,11 @@
             <el-button type="primary" @click="addoredit">确 定</el-button>
           </span>
         </el-dialog>
+        <div style="margin-top:30px">
         <span style="margin-top: 10px; padding: 5px; margin-left: 25.8%"
           >项目类别</span
         >
+        <!-- <el-cascader :options="projectid" :show-all-levels="false" props="{label:''}"></el-cascader> -->
         <el-select
           v-model="values"
           placeholder="请选择"
@@ -306,6 +310,7 @@
           >
           </el-option>
         </el-select>
+        </div>
         <!--表单穿梭区域 -->
         <div class="mainbox">
           <div class="mainleftbox">
@@ -970,6 +975,10 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table td.el-table__cell,
+.el-table th.el-table__cell.is-leaf {
+  padding: 0;
+}
 .mainleftbox {
   width: 200px;
   height: 240px;