jiawuxian hace 2 años
padre
commit
3e02d05b52

+ 1 - 1
src/views/resumption/rule/dialog.edit.vue

@@ -69,7 +69,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="isShow = false">取消</el-button>
+        <el-button type="primary" @click="isShow = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
     </DialogCom>

+ 8 - 7
src/views/resumption/rule/index.vue

@@ -48,6 +48,13 @@
             </el-select>
           </el-form-item>
           <el-form-item>
+            
+          </el-form-item>
+        </el-form>
+
+        <!--    按纽    -->
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -56,15 +63,9 @@
               v-hasPermi="['resumption:rule:query']"
               >搜索</el-button
             >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
               >重置</el-button
             >
-          </el-form-item>
-        </el-form>
-
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-plus"

+ 1 - 1
src/views/resumption/ruleManager/dialog.editItem.vue

@@ -70,7 +70,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary"  @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
       </div>
     </DialogCom>

+ 5 - 7
src/views/resumption/ruleManager/index.vue

@@ -14,16 +14,14 @@
           </el-form-item>
           <el-form-item prop="pointName" label="履职内容">
             <el-input v-model="queryParams.pointName" placeholder="请输入履职内容" maxlength="50" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="refresh"
-              v-hasPermi="['resumption:ruleManager']">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
+          </el-form-item>         
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="refresh"
+              v-hasPermi="['resumption:ruleManager']">搜索</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             <el-button type="primary" size="mini" icon="el-icon-plus" @click="onAddItem()" :disabled="rule ? false : true"
               v-hasPermi="['resumption:ruleManager:add']"
               v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0">新增</el-button>
@@ -32,7 +30,7 @@
               @click="onSelect()"
               >选择</el-button
             > -->
-            <el-button type="warning" @click="dakai" size="mini" :disabled="rule ? false : true">{{ expandAll ? "收起所有行" :
+            <el-button type="primary" :icon="expandAll ?'el-icon-arrow-up':'el-icon-arrow-down'" @click="dakai" size="mini" :disabled="rule ? false : true">{{ expandAll ? "收起所有行" :
               "展开所有行" }}</el-button>
           </el-col>
           <!-- <el-col :span="1.5">