Jelajahi Sumber

界面调整

luojun 1 tahun lalu
induk
melakukan
e05ed5cc4c

+ 17 - 16
src/views/check/index.vue

@@ -328,22 +328,6 @@
             >
               <template slot-scope="r">
                 <el-button
-                  v-if="eqOrg(r.row)"
-                  type="text"
-                  icon="el-icon-edit-outline"
-                  @click="onEdit(r.row.id)"
-                  v-hasPermi="['core:checkplan:edit']"
-                  >编辑</el-button
-                >
-                <el-button
-                  v-if="eqOrg2(r.row)"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="onDel(r.row.id, r.row.planName)"
-                  v-hasPermi="['core:checkplan:remove']"
-                  >删除</el-button
-                >
-                <el-button
                   type="text"
                   icon="el-icon-arrow-down"
                   v-if="checkCanPublish(r.row)"
@@ -367,6 +351,23 @@
                   v-hasPermi="['core:checkplan:distribute']"
                   >撤回</el-button
                 >
+                <el-button
+                  v-if="eqOrg(r.row)"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onEdit(r.row.id)"
+                  v-hasPermi="['core:checkplan:edit']"
+                  >编辑</el-button
+                >
+                <el-button
+                  v-if="eqOrg2(r.row)"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="onDel(r.row.id, r.row.planName)"
+                  v-hasPermi="['core:checkplan:remove']"
+                  >删除</el-button
+                >
+
               </template>
             </el-table-column>
           </el-table>

+ 19 - 18
src/views/resumption/plan/index.vue

@@ -286,24 +286,6 @@
             <el-table-column fixed="right" width="200" label="操作">
               <template slot-scope="r">
                 <el-button
-                  v-if="eqOrg(r.row)"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit-outline"
-                  @click="onEdit(r.row.id)"
-                  v-hasPermi="['system:user:edit']"
-                  >编辑</el-button
-                >
-                <el-button
-                  v-if="eqOrg2(r.row)"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="onDel(r.row.id, r.row.planName)"
-                  v-hasPermi="['system:user:remove']"
-                  >删除</el-button
-                >
-                <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-arrow-down"
@@ -332,6 +314,25 @@
                   v-hasPermi="['system:user:remove']"
                   >撤回</el-button
                 >
+                <el-button
+                  v-if="eqOrg(r.row)"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onEdit(r.row.id)"
+                  v-hasPermi="['system:user:edit']"
+                  >编辑</el-button
+                >
+                <el-button
+                  v-if="eqOrg2(r.row)"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="onDel(r.row.id, r.row.planName)"
+                  v-hasPermi="['system:user:remove']"
+                  >删除</el-button
+                >
+
               </template>
             </el-table-column>
           </el-table>

+ 1 - 1
src/views/safetycheck/ruleManager/dialog.select.point.vue

@@ -1,6 +1,6 @@
 <template>
   <DialogCom
-    title="选择检查要点"
+    title="选择检查内容"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
     width="55%"