提交

ruoyi-ui/src/components/FormItemComponent/index.vue

@@ -21,9 +21,9 @@
       </div>
     </div>
     <p v-if="buttonType">
-      <Button type="primary" @click="search">搜索</Button>
-      <Button type="fcdefault" @click="reset">重置</Button>
-    </p>
+      <el-button type="primary" plain icon="el-icon-search" @click="search">搜索</el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
+      </p>
   </div>
 </template>
 <script>

ruoyi-ui/src/components/HistoricalProcess/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 历史流程 -->
   <div class="HistoricalProcess">
-    <Button type="primary" @click="searchData.page = 1;queryLists()">查询</Button>
+    <el-button type="primary" plain icon="el-icon-search" size="mini" @click="searchData.page = 1;queryLists()">查询</el-button>
     <FormItemComponent
       class="form"
       :formItemLists="formLists"
@@ -330,7 +330,8 @@ export default {
         })
         .then(res => {
           if (res.data.resultCode === 0) {
-            this.$Message.success(res.data.resultMsg);
+            this.msgSuccess(res.data.resultMsg);
+            // this.$Message.success(res.data.resultMsg);
           }
         });
     }

ruoyi-ui/src/components/MutipleSelectPop/index.vue

@@ -50,17 +50,6 @@
         <Tabs size="small" @on-click="tabClick" :animated="false">
           <TabPane v-for="(item,key) in TabPaneData" :key="key" :label="item.tab">
             <div class="dialog_center_page">
-              <div class="dialog_p10">
-                <Page
-                  :total="item.total"
-                  :page-size="item.pageSize"
-                  :current="item.pageNum"
-                  @on-change="pageChange"
-                  :page-size-opts="item.pageOptions"
-                  show-total
-                  size="small"
-                />
-              </div>
               <div>
                 <Table
                   border
@@ -79,6 +68,17 @@
                   :data="item.list"
                 ></Table>
               </div>
+              <div class="dialog_p10">
+                <Page
+                  :total="item.total"
+                  :page-size="item.pageSize"
+                  :current="item.pageNum"
+                  @on-change="pageChange"
+                  :page-size-opts="item.pageOptions"
+                  show-total
+                  size="small"
+                />
+              </div>
             </div>
           </TabPane>
         </Tabs>
@@ -413,9 +413,11 @@ export default {
             //没有找到相同的就加入
             this.resultRightData.list.push(selectObj);
           } else {
-            this.$Message.warning(
-              selectObj.ENAME + "已经选择过了,请不要重复选择！"
-            );
+            this.$message({
+                      message: selectObj.ENAME + "已经选择过了,请不要重复选择！",
+                      type: 'warning'
+                    });
+
           }
         } else {
           this.$set(this.resultRightData, "list", [selectObj]);
@@ -519,16 +521,22 @@ export default {
                 //没有找到相同的就加入
                 this.resultRightData.list.push(selectObj);
               } else {
-                this.$Message.warning(
-                  item.ENAME + "已经选择过了,请不要重复选择！"
-                );
+                  this.$message({
+                          message:  item.ENAME + "已经选择过了,请不要重复选择！",
+                          type: 'warning'
+                        });
+
               }
             } else {
               this.$set(this.resultRightData, "list", [selectObj]);
             }
           });
         } else {
-          this.$Message.warning("请选择部门");
+          his.$message({
+                  message:"请选择部门！",
+                  type: 'warning'
+                });
+          // this.$Message.warning("请选择部门");
         }
         this.getTreeData();
       }
@@ -546,7 +554,11 @@ export default {
       if (!this.isMutiple) {
         //单选逻辑
         if (Object.keys(this.selectDatas).length === 0) {
-          this.$Message.warning("请选择人员");
+          this.$message({
+                    message: '请选择人员',
+                    type: 'warning'
+                  });
+          // this.$Message.warning("请选择人员");
           return;
         }
         this.resultRightData.total
@@ -577,9 +589,13 @@ export default {
                 //没有找到相同的就加入
                 this.resultRightData.list.push(selectObj);
               } else {
-                this.$Message.warning(
-                  item.ENAME + "已经选择过了,请不要重复选择！"
-                );
+                this.$message({
+                          message: item.ENAME + "已经选择过了,请不要重复选择！",
+                          type: 'warning'
+                        });
+                // this.$Message.warning(
+                //   item.ENAME + "已经选择过了,请不要重复选择！"
+                // );
               }
             } else {
               this.$set(this.resultRightData, "list", [selectObj]);
@@ -593,7 +609,11 @@ export default {
                 this.resultRightData.list.length
               );
         } else {
-          this.$Message.warning("请选择人员");
+          this.$message({
+                    message: '请选择人员',
+                    type: 'warning'
+                  });
+          // this.$Message.warning("请选择人员");
         }
       }
       //刷新表格数据
@@ -764,7 +784,11 @@ export default {
           this.translator(parent, children, key);
           return parent;
         } else {
-          this.$Message.warning("数据有问题，请检查...");
+          this.$message({
+                    message: '数据有问题，请检查...',
+                    type: 'warning'
+                  });
+          // this.$Message.warning("数据有问题，请检查...");
           return;
         }
       } else {

ruoyi-ui/src/components/StandardTable/index.vue

@@ -1,20 +1,7 @@
 <template>
   <div class="StandardTable">
-    <Page
-      v-if="showPage"
-     class="page"
-     :total="total"
-     show-total
-     show-sizer
-     show-elevator
-     transfer
-     :page-size="pageSize"
-     :current="currentPage"
-     :page-size-opts="pageSizeOpts"
-     v-on="standardTableEvent"
-    />
 
-    <div 
+    <div
       class="table"
       v-if="showTable"
     >
@@ -33,6 +20,22 @@
 
 
     </div>
+    <div class="stabd">
+      <Page
+       v-if="showPage"
+       class="page"
+       :total="total"
+       show-total
+       show-sizer
+       show-elevator
+       transfer
+       :page-size="pageSize"
+       :current="currentPage"
+       :page-size-opts="pageSizeOpts"
+       v-on="standardTableEvent"
+      />
+    </div>
+
   </div>
 </template>
 <script>
@@ -109,7 +112,7 @@ export default {
   .page{
     margin-bottom: 8px;
   }
-  
+
   .table{
     flex: 1;
     overflow: hidden;
@@ -124,5 +127,9 @@ export default {
     }
   }
 }
+.stabd{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 20px;
+}
 </style>
-

ruoyi-ui/src/components/mutipleSelectPop/index.vue

@@ -50,17 +50,6 @@
         <Tabs size="small" @on-click="tabClick" :animated="false">
           <TabPane v-for="(item,key) in TabPaneData" :key="key" :label="item.tab">
             <div class="dialog_center_page">
-              <div class="dialog_p10">
-                <Page
-                  :total="item.total"
-                  :page-size="item.pageSize"
-                  :current="item.pageNum"
-                  @on-change="pageChange"
-                  :page-size-opts="item.pageOptions"
-                  show-total
-                  size="small"
-                />
-              </div>
               <div>
                 <Table
                   border
@@ -79,6 +68,17 @@
                   :data="item.list"
                 ></Table>
               </div>
+              <div class="dialog_p10">
+                <Page
+                  :total="item.total"
+                  :page-size="item.pageSize"
+                  :current="item.pageNum"
+                  @on-change="pageChange"
+                  :page-size-opts="item.pageOptions"
+                  show-total
+                  size="small"
+                />
+              </div>
             </div>
           </TabPane>
         </Tabs>
@@ -413,9 +413,11 @@ export default {
             //没有找到相同的就加入
             this.resultRightData.list.push(selectObj);
           } else {
-            this.$Message.warning(
-              selectObj.ENAME + "已经选择过了,请不要重复选择！"
-            );
+            this.$message({
+                      message: selectObj.ENAME + "已经选择过了,请不要重复选择！",
+                      type: 'warning'
+                    });
+
           }
         } else {
           this.$set(this.resultRightData, "list", [selectObj]);
@@ -519,16 +521,22 @@ export default {
                 //没有找到相同的就加入
                 this.resultRightData.list.push(selectObj);
               } else {
-                this.$Message.warning(
-                  item.ENAME + "已经选择过了,请不要重复选择！"
-                );
+                  this.$message({
+                          message:  item.ENAME + "已经选择过了,请不要重复选择！",
+                          type: 'warning'
+                        });
+
               }
             } else {
               this.$set(this.resultRightData, "list", [selectObj]);
             }
           });
         } else {
-          this.$Message.warning("请选择部门");
+          his.$message({
+                  message:"请选择部门！",
+                  type: 'warning'
+                });
+          // this.$Message.warning("请选择部门");
         }
         this.getTreeData();
       }
@@ -546,7 +554,11 @@ export default {
       if (!this.isMutiple) {
         //单选逻辑
         if (Object.keys(this.selectDatas).length === 0) {
-          this.$Message.warning("请选择人员");
+          this.$message({
+                    message: '请选择人员',
+                    type: 'warning'
+                  });
+          // this.$Message.warning("请选择人员");
           return;
         }
         this.resultRightData.total
@@ -577,9 +589,13 @@ export default {
                 //没有找到相同的就加入
                 this.resultRightData.list.push(selectObj);
               } else {
-                this.$Message.warning(
-                  item.ENAME + "已经选择过了,请不要重复选择！"
-                );
+                this.$message({
+                          message: item.ENAME + "已经选择过了,请不要重复选择！",
+                          type: 'warning'
+                        });
+                // this.$Message.warning(
+                //   item.ENAME + "已经选择过了,请不要重复选择！"
+                // );
               }
             } else {
               this.$set(this.resultRightData, "list", [selectObj]);
@@ -593,7 +609,11 @@ export default {
                 this.resultRightData.list.length
               );
         } else {
-          this.$Message.warning("请选择人员");
+          this.$message({
+                    message: '请选择人员',
+                    type: 'warning'
+                  });
+          // this.$Message.warning("请选择人员");
         }
       }
       //刷新表格数据
@@ -764,7 +784,11 @@ export default {
           this.translator(parent, children, key);
           return parent;
         } else {
-          this.$Message.warning("数据有问题，请检查...");
+          this.$message({
+                    message: '数据有问题，请检查...',
+                    type: 'warning'
+                  });
+          // this.$Message.warning("数据有问题，请检查...");
           return;
         }
       } else {

ruoyi-ui/src/components/todoProcess/index.vue

@@ -2,8 +2,8 @@
   <!-- 待办流程 -->
   <div class="TodoProcess">
     <div class="btnArea">
-      <Button type="primary" @click="searchData.page = 1;queryLists()">查询</Button>
-      <Button type="primary" ghost @click="openModal(2)">转派</Button>
+      <el-button type="primary" plain icon="el-icon-search" size="mini"  @click="searchData.page = 1;queryLists()">查询</el-button>
+      <el-button type="primary"  icon="el-icon-refresh-left" size="mini" ghost @click="openModal(2)">转派</el-button>
     </div>
     <FormItemComponent
       class="form"
@@ -59,7 +59,7 @@
 import FormItemComponent from "../FormItemComponent";
 import ItemComponent from "../ItemComponent";
 import StandardTable from "../StandardTable";
-import mutipleSelectPop from "../MutipleSelectPop";
+import mutipleSelectPop from "@/components/MutipleSelectPop";
 import FlowChartShow from "../FlowChartShow";
 import {
     addGendefini,

ruoyi-ui/src/views/system/post/index.vue

@@ -275,7 +275,8 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function() {
+      // console.log(this.form,23456)
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != undefined) {