Merge branch 'master' of http://192.168.101.10:13000/boman/boman-framwork

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

@@ -0,0 +1,261 @@
+<template>
+  <div class="eniting">
+    <!-- 头部 -->
+    <div class="eniting_header">
+      <p class="p">表编辑</p>
+      <div class="ppl">
+        <p v-for="(item,index) in 6" :key="index" @click="enditTab(index)">
+          <img src="../../../assets/images/icon_tbtab_normal.png" alt="" class="index_headerImg" v-if="num !== index">
+          <img src="../../../assets/images/icon_tbtab_selected.png" alt="" class="index_headerImg" v-if="num == index">
+          <span :class="[index == num ? 'span' : '']">列表名称</span>
+        </p>
+      </div>
+      <el-divider></el-divider>
+      <div class="table_headerBtun">
+           <el-button type="primary" plain v-for="(item,index) in 7" :key="index">新增</el-button>
+      </div>
+    </div>
+    <!-- 内容 -->
+    <div class="eniting_nav">
+     <el-collapse v-model="activeNames" @change="handleChange">
+       <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index" class="eitde">
+         <el-form :model="queryParams" ref="queryForm" :inline="true"  >
+           <el-row :gutter="0">
+             <el-col :span="6" v-for="(item,index) in 12" :key="index">
+               <el-form-item :label="labletit" prop="dictName">
+                <el-input
+               v-model="queryParams.dictName"
+               placeholder="请输入字典名称"
+               clearable
+               size="small"
+               @keyup.enter.native="handleQuery"
+               />
+              </el-form-item>
+           </el-col>
+           </el-row>
+         </el-form>
+       </el-collapse-item>
+       <!-- 扩展功能 -->
+       <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index" class="eitde">
+         <el-form :model="queryParams" ref="queryForm" :inline="true"  >
+           <el-row :gutter="0">
+             <el-col :span="12" v-for="(item,index) in 2" :key="index">
+               <el-form-item :label="labletit" prop="dictName" class="textarea_et">
+                <el-input
+               v-model="queryParams.dictName"
+               placeholder="请输入字典名称"
+               clearable
+               type="textarea"
+               style="width: 100%; height: 100%;"
+               @keyup.enter.native="handleQuery"
+               />
+              </el-form-item>
+           </el-col>
+           <el-col :span="24" v-for="(item,index) in 1" :key="index">
+               <el-form-item :label="labletit" prop="dictName" class="textarea_ety">
+                <el-input
+               v-model="queryParams.dictName"
+               placeholder="请输入字典名称"
+               clearable
+               type="textarea"
+               style="width: 100%; height: 100%;"
+               @keyup.enter.native="handleQuery"
+               />
+              </el-form-item>
+           </el-col>
+           </el-row>
+         </el-form>
+       </el-collapse-item>
+       <!-- 服务程序 -->
+       <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index" class="eitde">
+         <el-form :model="queryParams" ref="queryForm" :inline="true"  >
+           <el-row :gutter="0">
+            <el-col :span="12" v-for="(item,index) in 8" :key="index">
+                <el-form-item label="取消提交程序：" prop="dictName" class="textarea_etyju">
+                 <el-input
+                v-model="queryParams.dictName"
+                placeholder="请输入字典名称"
+                clearable
+                style="width: 100%;"
+                @keyup.enter.native="handleQuery"
+                />
+               </el-form-item>
+            </el-col>
+           </el-row>
+         </el-form>
+       </el-collapse-item>
+     </el-collapse>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+      name: "index",
+      data() {
+        return {
+           activeNames: ['1'],
+           title:'单表1',
+           // 查询参数
+           queryParams: {
+             pageNum: 1,
+             pageSize: 10,
+             dictName: undefined,
+             dictType: undefined,
+             status: undefined
+           },
+           labletit:'查询参数1233',
+           num:0
+        };
+      },
+      methods: {
+        handleChange(val) {
+                console.log(val);
+              },
+        enditTab(index){
+         this.num = index
+        }
+      },
+    };
+
+</script>
+
+<style  lang="scss">
+  .eniting_header{
+    .el-divider--horizontal{
+      margin-top: 0;
+    }
+  }
+  .eniting_nav{
+    .el-collapse-item__content{
+      padding-bottom: 0;
+    }
+    .el-collapse-item__wrap{
+      border-bottom: 0;
+    }
+    .el-collapse-item__header{
+      border-bottom: 0;
+      font-size: 15px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #3C8DBC;
+      line-height: 36px;
+    }
+    .el-form-item__content{
+      width: 55%;
+    }
+    .textarea_et{
+    width: 95%;
+    .el-form-item__content{
+      width: 80%;
+      height: 83px;
+      .el-textarea__inner{
+        height: 100%;
+      }
+      }
+    }
+    .textarea_etyju{
+      width: 90%;
+      .el-form-item__content{
+        width: 75%;
+        // height: 83px;
+        .el-textarea__inner{
+          // height: 100%;
+        }
+        }
+    }
+    .textarea_ety{
+      width: 100%;
+      .el-form-item__content{
+        width: 88%;
+        height: 150px;
+        margin-bottom: 0;
+        .el-textarea__inner{
+          height: 100%;
+        }
+        }
+    }
+    .el-collapse{
+      border-top: 0;
+    }
+    .eitde{
+      background-color: #fff;
+      border-radius: 6px;
+      padding: 23px;
+      margin-bottom: 20px;
+    }
+  }
+
+</style>
+
+<style scoped lang="scss">
+  .eniting{
+    p{
+      margin: 0;
+    }
+    background-color: #eef0ff;
+    height: 100%;
+    padding: 20px;
+    .eniting_header{
+       background-color: #fff;
+       border-radius: 6px;
+       padding: 23px;
+       margin-bottom: 20px;
+     .p{
+        font-size: 15px;
+        font-weight: bold;
+        color: #3C8DBC;
+        line-height: 36px;
+        margin-bottom: 0;
+       }
+     .p::before{
+       content: "";
+       display: block;
+       width: 18px;
+       height: 8px;
+       background: #3C8DBC;
+       border-radius: 3px;
+
+     }
+     .ppl{
+       display: flex;
+       height: 54px;
+       p{
+         position: relative;
+         width: 113px;
+         height: 38px;
+         img{
+           position: absolute;
+           top:0;
+           left: 0;
+           width: 100%;
+           height: 100%;
+           // z-index: -1;
+         }
+         span{
+           width: 100%;
+           position: absolute;
+           top: 0;
+           left: 0;
+           // transform: translate(-50%);
+           text-align: center;
+           line-height: 38px;
+           font-size: 15px;
+           font-family: PingFang SC;
+           font-weight: bold;
+           color: #aaa;
+         }
+         .span{
+           color: #3C8DBC;
+         }
+       }
+     }
+    }
+    // 内容
+    .eniting_nav{
+      // background-color: #fff;
+      // border-radius: 6px;
+      // padding: 23px;
+    }
+  }
+</style>

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

@@ -0,0 +1,210 @@
+<template >
+  <div class="tabForm">
+   <div class="tabForm_header">
+     <p class="index_headetab">
+       <span :class="[num == index ? ' spanto' : '']" v-for="(item,index) in editableTabs" :key="index" @click="tabSbu(index)">{{item.title}}</span>
+     </p>
+     <div class="table_headerBtun">
+          <el-button type="primary" plain v-for="(item,index) in 7" :key="index">新增</el-button>
+     </div>
+   </div>
+   <!-- 内容 -->
+   <div class="table_nav">
+    <el-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index">
+        <el-form :model="queryParams" ref="queryForm" :inline="true"  >
+          <el-row :gutter="0">
+            <el-col :span="6" v-for="(item,index) in 8" :key="index">
+              <el-form-item :label="labletit" prop="dictName">
+               <el-input
+              v-model="queryParams.dictName"
+              placeholder="请输入字典名称"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              />
+             </el-form-item>
+          </el-col>
+          </el-row>
+        </el-form>
+      </el-collapse-item>
+
+      <!-- 列表 -->
+     <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index">
+       <el-table stripe v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+         <el-table-column label="序号" align="center" prop="noticeId" width="80" />
+         <el-table-column :label="surlable" align="center" prop="name" />
+         <el-table-column :label="surlable" align="center" sortable prop="name" />
+         <el-table-column label="岗位编码" align="center" prop="postCode" />
+         <el-table-column label="岗位名称" align="center" prop="postName" />
+         <el-table-column label="岗位排序" align="center" prop="postSort" />
+         <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+         <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+           <template slot-scope="scope">
+             <span>{{ parseTime(scope.row.createTime) }}</span>
+           </template>
+         </el-table-column>
+         <el-table-column label="可用" align="center" class-name="small-padding fixed-width">
+
+         </el-table-column>
+       </el-table>
+     </el-collapse-item>
+
+    </el-collapse>
+   </div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "index",
+    data() {
+      return {
+          editableTabs: [{
+                   title: 'Tab 1',
+                   name: '1',
+                   content: 'Tab 1 content'
+                 }, {
+                   title: 'Tab 2',
+                   name: '2',
+                   content: 'Tab 2 content'
+                 }],
+        num:0,
+        activeNames: ['1'],
+        title:'单表1',
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          dictName: undefined,
+          dictType: undefined,
+          status: undefined
+        },
+        labletit:'查询参数1233',
+        surlable:'实际数据库表',
+        postList:[
+          {
+                    date: '2016-05-02',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1518 弄'
+                  }, {
+                    date: '2016-05-04',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1517 弄'
+                  }, {
+                    date: '2016-05-01',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1519 弄'
+                  }, {
+                    date: '2016-05-03',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1516 弄'
+                  }
+        ]
+      };
+    },
+    methods: {
+
+        // tab点击
+      tabSbu(index){
+       this.num = index
+      }
+    },
+  };
+</script>
+
+<style lang="scss">
+  .tabForm{
+    .el-collapse-item__content{
+      padding: 0;
+    }
+   .table_nav{
+     .el-collapse-item__wrap{
+       border-bottom: 0;
+     }
+     .el-collapse-item__header{
+       border-bottom: 0;
+       font-size: 15px;
+       font-family: PingFang SC;
+       font-weight: bold;
+       color: #3C8DBC;
+       line-height: 36px;
+     }
+     .el-form-item__content{
+       width: 55%;
+     }
+     .el-collapse{
+       border-top: 0;
+     }
+     .eitde{
+       background-color: #fff;
+       border-radius: 6px;
+       padding: 23px;
+       margin-bottom: 20px;
+     }
+   }
+  }
+</style>
+
+<style scoped lang="scss">
+  .tabForm{
+    background-color: #eef0ff;
+    height: 100%;
+    padding: 20px;
+    p{
+      margin: 0;
+    }
+    // 头部
+    .tabForm_header{
+       background-color: #fff;
+       border-radius: 6px;
+       padding: 23px;
+       margin-bottom: 20px;
+
+    }
+    // 内容
+    .table_nav{
+      // background-color: #fff;
+      // border-radius: 6px;
+      // padding: 23px;
+    }
+  }
+  // tab
+  .index_headetab{
+    display: flex;
+    border-bottom: 1px solid #E5E5E5;
+    height: 53px;
+    // padding-top: 20px;
+    padding-bottom: 10px;
+    margin-bottom: 20px !important;
+   span{
+     width: 70px;
+     text-align: center;
+     line-height: 53px;
+     height: 53px;
+     font-size: 15px;
+     font-family: PingFang SC;
+     font-weight: bold;
+     color: #666;
+     position: relative;
+     // flex: 1;
+     // border-bottom: ;
+   }
+   .span{
+     content: '';
+     display: block;
+     width: 18px;
+     height: 8px;
+     border-radius: 3px;
+     background-color: #3C8DBC;
+     color: #3C8DBC !important;
+     // position: absolute;
+     // border-bottom: ;
+   }
+  .spanto{
+    color:#3C8DBC ;
+    border-bottom: 3px solid #3C8DBC;
+  }
+  }
+</style>

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

@@ -0,0 +1,154 @@
+<template>
+  <div class="single">
+   <!-- 头部 -->
+   <div class="single_header">
+      <p>表</p>
+      <el-divider></el-divider>
+      <div class="table_headerBtun">
+           <el-button type="primary" plain v-for="(item,index) in 7" :key="index">新增</el-button>
+      </div>
+      <el-form style="margin-top: 30px;" :model="queryParams" ref="queryForm" :inline="true"  label-width="118px">
+        <el-form-item label="岗位编码" prop="postCode" v-for="(item,index) in 4" :key="index">
+          <el-input
+            v-model="queryParams.postCode"
+            placeholder="请输入岗位编码"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+   </div>
+   <!-- 内容 -->
+   <div class="surface_nave">
+     <el-table stripe v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+       <el-table-column label="序号" align="center" prop="noticeId" width="80" />
+       <el-table-column :label="surlable" align="center" prop="name" />
+       <el-table-column :label="surlable" align="center" sortable prop="name" />
+       <el-table-column label="岗位编码" align="center" prop="postCode" />
+       <el-table-column label="岗位名称" align="center" prop="postName" />
+       <el-table-column label="岗位排序" align="center" prop="postSort" />
+       <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+       <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+         <template slot-scope="scope">
+           <span>{{ parseTime(scope.row.createTime) }}</span>
+         </template>
+       </el-table-column>
+       <el-table-column label="可用" align="center" class-name="small-padding fixed-width">
+
+       </el-table-column>
+     </el-table>
+
+     <pagination
+       v-show="total>0"
+       :total="total"
+       :page.sync="queryParams.pageNum"
+       :limit.sync="queryParams.pageSize"
+       @pagination="getList"
+     />
+   </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "index",
+    data() {
+      return {
+         activeNames: ['1'],
+         title:'单表1',
+         total:1,
+         // 查询参数
+         queryParams: {
+           pageNum: 1,
+           pageSize: 10,
+           dictName: undefined,
+           dictType: undefined,
+           status: undefined
+         },
+         labletit:'查询参数1233',
+         surlable:'实际数据库表',
+         postList:[
+           {
+                     date: '2016-05-02',
+                     name: '王小虎',
+                     address: '上海市普陀区金沙江路 1518 弄'
+                   }, {
+                     date: '2016-05-04',
+                     name: '王小虎',
+                     address: '上海市普陀区金沙江路 1517 弄'
+                   }, {
+                     date: '2016-05-01',
+                     name: '王小虎',
+                     address: '上海市普陀区金沙江路 1519 弄'
+                   }, {
+                     date: '2016-05-03',
+                     name: '王小虎',
+                     address: '上海市普陀区金沙江路 1516 弄'
+                   }
+         ]
+      };
+    },
+    methods: {
+      handleChange(val) {
+              console.log(val);
+            }
+    },
+  };
+</script>
+
+<style lang="scss">
+   .single_header{
+     .el-divider--horizontal{
+       margin-top: 16px;
+     }
+   }
+   .single{
+      .el-table td{
+        border-bottom: 0;
+      }
+   }
+
+</style>
+
+<style scoped lang="scss">
+  .single{
+    background-color: #eef0ff;
+    height: 100%;
+    padding: 20px;
+    p{
+      margin: 0;
+    }
+    // 头部
+    .single_header{
+       background-color: #fff;
+       border-radius: 6px;
+       padding: 23px;
+       margin-bottom: 20px;
+     p{
+        font-size: 15px;
+        font-weight: bold;
+        color: #3C8DBC;
+        line-height: 36px;
+       }
+     p::before{
+       content: "";
+       display: block;
+       width: 18px;
+       height: 8px;
+       background: #3C8DBC;
+       border-radius: 3px;
+
+     }
+    }
+    // 内容
+    .surface_nave{
+      background-color: #fff;
+      border-radius: 6px;
+      padding: 23px;
+    }
+  }
+</style>

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

@@ -3,10 +3,32 @@
    <div class="table_header">
      <p>单表</p>
      <el-divider></el-divider>
+     <div class="table_headerBtun">
+          <el-button type="primary" plain v-for="(item,index) in 7" :key="index">新增</el-button>
+     </div>
    </div>
    <!-- 内容 -->
    <div class="table_nav">
-     
+    <el-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse-item :title="title" :name="index" v-for="(item,index) in 4" :key="index">
+        <el-form :model="queryParams" ref="queryForm" :inline="true"  >
+          <el-row :gutter="0">
+            <el-col :span="6" v-for="(item,index) in 12" :key="index">
+              <el-form-item :label="labletit" prop="dictName">
+               <el-input
+              v-model="queryParams.dictName"
+              placeholder="请输入字典名称"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              />
+             </el-form-item>
+          </el-col>
+          </el-row>
+        </el-form>
+      </el-collapse-item>
+
+    </el-collapse>
    </div>
 
  </div>
@@ -14,23 +36,96 @@
 </template>
 
 <script>
+  export default {
+    name: "index",
+    data() {
+      return {
+         activeNames: ['1'],
+         title:'单表1',
+         // 查询参数
+         queryParams: {
+           pageNum: 1,
+           pageSize: 10,
+           dictName: undefined,
+           dictType: undefined,
+           status: undefined
+         },
+         labletit:'查询参数1233'
+      };
+    },
+    methods: {
+      handleChange(val) {
+              console.log(val);
+            }
+    },
+  };
 </script>
 
 
 <style  lang="scss">
-
+  .table_header{
+    .el-divider--horizontal{
+      margin-top: 16px;
+    }
+  }
+  .table_nav{
+    .el-collapse-item__wrap{
+      border-bottom: 0;
+    }
+    .el-collapse-item__header{
+      border-bottom: 0;
+      font-size: 15px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #3C8DBC;
+      line-height: 36px;
+    }
+    .el-form-item__content{
+      width: 55%;
+    }
+    .el-collapse{
+      border-top: 0;
+    }
+  }
 </style>
 
 
 
 <style scoped lang="scss">
+  .app-main{
+     // background-color: #eef0ff !important;
+  }
   .table_total{
      background-color: #eef0ff;
+     height: 100%;
      padding: 20px;
      // 头部
      .table_header{
         background-color: #fff;
+        border-radius: 6px;
+        padding: 23px;
+        margin-bottom: 20px;
+      p{
+         font-size: 15px;
+         font-weight: bold;
+         color: #3C8DBC;
+         line-height: 36px;
+        }
+      p::before{
+        content: "";
+        display: block;
+        width: 18px;
+        height: 8px;
+        background: #3C8DBC;
+        border-radius: 3px;
 
+      }
+     }
+     // 内容
+     .table_nav{
+       background-color: #fff;
+       border-radius: 6px;
+       padding: 23px;
      }
   }
   p{