guolufei123 пре 3 година
родитељ
комит
e5321a0e41

+ 53 - 0
front-vue/src/App.vue

@@ -13,4 +13,57 @@ export default  {
 .el-table__fixed-right{
   height: 100% !important; 
  }
+ .zap-main{
+   min-height: 100vh;
+   background-color: #f4f5f6;
+ }
+ .zap-padding{
+   padding: 0 30px;
+ }
+ .zap-padding-start{
+   padding-left: 25px;
+ }
+ .zap-padding-end{
+   padding-right: 25px;
+ }
+ .zap-margin-top{
+   margin-top: 20px;
+ }
+ .zap-content{
+   padding: 20px;
+   background-color: #ffffff;
+ }
+ .zap-font-title{
+   display: inline-block;
+   line-height: 36px;
+   font-size: 18px;
+   color: #333333;
+ }
+ .zap-table{
+   padding: 0 14px;
+   box-sizing: border-box;
+ }
+ .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th{
+   height: 40px;
+   font-size: 14px;
+   color: #333333;
+ }
+ .el-table__row{
+   height: 44px;
+   font-size: 14px;
+   color: #333333;
+ }
+ .el-table::before, .el-table--group::after, .el-table--border::after{
+   background-color: transparent;
+ }
+ .el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
+   border: none;
+ }
+ .pagination-container{
+   display: flex;
+   align-items: center;
+   height: 56px;
+   margin: 0;
+   padding: 0 14px;
+ }
 </style>

+ 6 - 6
front-vue/src/assets/styles/huyi.scss

@@ -189,21 +189,21 @@ width: 50%;
 /* button color */
 .el-button--cyan.is-active,
 .el-button--cyan:active {
-  background: #20B2AA;
-  border-color: #20B2AA;
+  background: #4280f2;
+  border-color: #4280f2;
   color: #FFFFFF;
 }
 
 .el-button--cyan:focus,
 .el-button--cyan:hover {
-  background: #48D1CC;
-  border-color: #48D1CC;
+  background: #6899f5;
+  border-color: #6899f5;
   color: #FFFFFF;
 }
 
 .el-button--cyan {
-  background-color: #20B2AA;
-  border-color: #20B2AA;
+  background-color: #4280f2;
+  border-color: #4280f2;
   color: #FFFFFF;
 }
 

+ 76 - 55
front-vue/src/views/service/contract/contract.vue

@@ -1,64 +1,61 @@
 <template>
-  <div class="app-container">
-      <el-card class="fiche">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
-          <span style="margin-bottom: 10px;color:#333333;font:14px Helvetica Neue, Helvetica, PingFang SC, Tahoma, Arial,sans-serif">所选条件:</span>
-         <div  style="float: right;margin-right:1%">
-            <el-button type="cyan"  icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"  style="float: ;">重置</el-button>
-            <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId"></column-setting>
-         </div>
-         <hr  style="margin-top: 16px;">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="资金方" prop="scyName" >
-        <el-input
-          v-model="queryParams.scyName"
-          placeholder="请输入资金方"
-          clearable
-          size="small"
-          maxlength="30"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同模板名称" prop="zfcName">
-          <el-input
-          v-model="queryParams.zfcName"
-          placeholder="请输入模板名称"
-          clearable
-          size="small"
-          maxlength="20"
-        />
-      </el-form-item>
-      <el-form-item label="合同模板状态" prop="zfcStatus">
-          <el-select
-            v-model="queryParams.zfcStatus"
-            placeholder="请选择合同模板状态"
-            clearable
-            size="small">
-            <el-option
-              v-for="dict in statusOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"/>
-          </el-select>
-      </el-form-item>
-   
-    </el-form>
-      </el-card>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+  <div class="app-container zap-main">
+    <el-row class="zap-table-search">
+        <div class="zap-padding-end">
+          <right-toolbar style="margin-top: 4px;" :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
+          <span class="zap-padding-start zap-font-title">所选条件:</span>
+          <div  style="float: right;margin-right:1%">
+              <el-button type="cyan"  icon="el-icon-search" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" @click="resetQuery"  style="float: ;margin-right: 20px;">重置</el-button>
+              <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId"></column-setting>
+          </div>
+        </div>
+        <hr  style="margin-top: 16px;">
+        <el-form class="zap-table-search__form" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+          <el-form-item label="资金方" prop="scyName" >
+            <el-input
+              v-model="queryParams.scyName"
+              placeholder="请输入资金方"
+              clearable
+              size="small"
+              maxlength="30"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="合同模板名称" prop="zfcName">
+              <el-input
+              v-model="queryParams.zfcName"
+              placeholder="请输入模板名称"
+              clearable
+              size="small"
+              maxlength="20"
+            />
+          </el-form-item>
+          <el-form-item label="合同模板状态" prop="zfcStatus">
+              <el-select
+                v-model="queryParams.zfcStatus"
+                placeholder="请选择合同模板状态"
+                clearable
+                size="small">
+                <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"/>
+              </el-select>
+          </el-form-item>
+        </el-form>
+    </el-row>
+    <div class="zap-content zap-margin-top">
         <el-button
           type="primary"
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
           v-hasPermi="['service:contract:add']"
         >新增</el-button>
-      </el-col>
-	
-    </el-row>
+    </div>
 
-    <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange" border>
+    <el-table v-loading="loading" :data="contractList" class="zap-table" @selection-change="handleSelectionChange" stripe>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@@ -66,7 +63,7 @@
       </el-table-column>     
       <el-table-column label="资金方" align="center" prop="scyName" :show-overflow-tooltip="true" v-if="uncheckList.scyName"/> 
       <el-table-column label="合同模板名称" align="center" prop="zfcName" :show-overflow-tooltip="true" v-if="uncheckList.zfcName"/>
-      <el-table-column label="合同模板状态" align="center" prop="zfcStatus" width = '100px' :formatter="statusFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcStatus"/>
+      <el-table-column label="合同模板状态" align="center" prop="zfcStatus" width = '120px' :formatter="statusFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcStatus"/>
       <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcNode"/>
       <!-- <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcSubject"/> -->
       <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true" v-if="uncheckList.nickName"/>
@@ -385,4 +382,28 @@ export default {
     }
   }
 };
-</script>
+</script>
+
+<style lang="scss">
+.zap-table-search{
+  padding-top: 12px;
+  background-color: #ffffff;
+}
+.zap-table-search__form{
+  display: flex;
+  align-items: center;
+  height: 90px;
+  .el-form-item--medium.el-form-item{
+    margin-bottom: 0;
+  }
+  .el-form-item__label {
+    line-height: 40px;
+    font-size: 14px;
+    color: #333333;
+  }
+  .el-input--small .el-input__inner{
+    height: 40px;
+    line-height: 40px;
+  }
+}
+</style>