Pārlūkot izejas kodu

【修改】浏览器放大的页面样式

howie 2 gadi atpakaļ
vecāks
revīzija
34c2709507

+ 1 - 1
src/components/Common/collapse.vue

@@ -125,7 +125,7 @@ export default {
   }
 }
 .search_box {
-  height: 39px;
+  height: 37px;
   overflow: hidden;
   transition: all 0.3s;
 }

+ 4 - 1
src/styles/element-ui.scss

@@ -42,11 +42,14 @@
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  padding: 2px 10px !important;
+  padding: 0 10px !important;
 }
 .el-range-editor--mini.el-input__inner {
   height: 28px !important;
 }
+.el-form-item__content {
+  line-height: 0 !important;
+}
 // dropdown
 .el-dropdown-menu {
   a {

+ 27 - 5
src/views/supply/apply/apply_list.vue

@@ -370,7 +370,11 @@
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
+                  v-if="
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE'
+                  "
                   style="margin-right: 10px"
                   title="确定申请吗?"
                   @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
@@ -378,7 +382,11 @@
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
                   style="margin-right: 10px"
                   title="确定撤回吗?"
                   @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
@@ -386,7 +394,11 @@
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK'
+                  "
                   style="margin-right: 10px"
                   title="确定弃审吗?"
                   @onConfirm="handleAbandon(scope.row.id)"
@@ -396,6 +408,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 1
                   "
@@ -407,6 +420,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 2
                   "
@@ -416,7 +430,11 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
@@ -424,7 +442,11 @@
                 </el-button>
                 <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
                 <el-popconfirm
-                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
+                  v-if="
+                    $checkBtnRole('del', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK'
+                  "
                   style="margin-left: 10px"
                   title="确定删除吗?"
                   @onConfirm="handleDelete(scope.row.id)"