更新

src/views/oilFinalStatement/oilFinalStatementAddList.vue

@@ -19,10 +19,10 @@
       </div>
       <div v-if="goIn">
         <div class="goInTitle">
-          <el-button style="margin-right: 20px; box-shadow: none" @click="fanhui">返回</el-button>
+          <!-- <el-button style="margin-right: 20px; box-shadow: none" @click="fanhui">返回</el-button> -->
           {{ '新增企业结算单' }}
         </div>
-        <div slot="search" style="margin-top: 10px; overflow: auto">
+        <div slot="search" class="goInSearch" style="margin-top: 10px; overflow: auto">
           <!--这里放顶部搜索-->
           <!-- 搜索部分开始 -->
           <el-form label-width="90px" :inline="true" :model="page" :size="$store.getters.size">
@@ -62,8 +62,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6" class="fr" style="text-align: right">
-              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-              <el-button icon="el-icon-refresh" type="info" @click="refrech">重置</el-button>
+              <el-button icon="el-icon-search" @click="search">查询</el-button>
+              <el-button icon="el-icon-refresh" @click="refrech">重置</el-button>
             </el-col>
           </el-form>
           <!-- 搜索部分结束 -->
@@ -660,14 +660,9 @@ export default {
 
 .lc_footer {
   display: flex;
-  /* text-align: center; */
   width: 100%;
-  position: absolute;
-  bottom: 0;
-  left: 0;
   border-top: solid 1px #dfe6ec;
-  /* background-color: #973E06; */
-  padding: 22px;
+  padding: 12px;
   font-size: 16px !important;
   justify-content: flex-end;
 }
@@ -788,15 +783,20 @@ export default {
 .goInTitle {
   font-size: 18px;
   font-weight: 600;
-  padding: 10px 0;
-  border-bottom: 1px solid #e9e9e9;
+  padding: 10px 20px;
   display: flex;
   align-items: center;
 }
+.goInSearch {
+  padding: 10px 20px;
+  margin: 20px;
+  border: 1px solid #dfe6ec;
+}
 
 .search-form {
   display: flex;
   width: 100%;
+  margin: 20px;
 }
 
 .search-form .el-table {

src/views/oilFinalStatement/oilFinalStatementList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="oilSiteUser">
     <div class="table-header table-div el-scrollbar table-div-box">
-      <div slot="search" style="margin-top: 5px">
+      <div slot="search" class="frame">
         <!--这里放顶部搜索-->
         <!-- 搜索部分开始 -->
         <el-form label-width="90px" :inline="true" :model="page" class="search-form" :size="$store.getters.size">
@@ -16,7 +16,7 @@
           </el-form-item>
           <el-form-item>
             <el-select
-              v-model="page.params.settlementObjectName"
+              v-model="page.params.settlementId"
               remote
               filterable
               :remote-method="companyOrginQuery"
@@ -67,19 +67,20 @@
         </el-form>
 
         <!-- 搜索部分结束 -->
+        <el-row slot="button-group" style="margin-top: 5px; display: flex; align-items: center">
+          <el-col :span="16" style="text-align: start">
+            <el-button icon="el-icon-plus" @click="toAdd()">新增</el-button>
+          </el-col>
+          <el-col :span="8">
+            <div style="text-align: right">
+              <el-button icon="el-icon-search" @click="search">查询</el-button>
+              <el-button icon="el-icon-refresh" @click="refrech">重置</el-button>
+            </div>
+          </el-col>
+        </el-row>
       </div>
 
-      <el-row slot="button-group" style="margin-top: 5px; display: flex; align-items: center">
-        <el-col :span="16" style="text-align: start">
-          <el-button type="primary" :size="$store.getters.size" icon="el-icon-plus" @click="toAdd()">新增</el-button>
-        </el-col>
-        <el-col :span="8">
-          <el-button type="primary" :size="$store.getters.size" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button :size="$store.getters.size" icon="el-icon-refresh" type="info" @click="refrech">重置</el-button>
-        </el-col>
-      </el-row>
-
-      <div slot="table">
+      <div slot="table" class="table">
         <!--这里放表格和分页-->
         <!-- 列表开始 -->
         <el-table :max-height="tableHeight" stripe :data="dataPage" fit style="width: 100%" :size="$store.getters.size">
@@ -157,7 +158,7 @@ export default {
       tableColumns: [
         {
           prop: 'settlementNo',
-          minWidth: 300,
+          minWidth: 350,
           label: '结算单号',
           show: true,
           render: (row, column, cell) => {
@@ -182,7 +183,7 @@ export default {
         },
         {
           prop: 'auditState',
-          minWidth: 80,
+          minWidth: 120,
           label: '审核状态',
           show: true,
           render: (row, column, cell) => {
@@ -212,7 +213,7 @@ export default {
         },
         {
           prop: 'settlementAmount',
-          minWidth: 80,
+          minWidth: 120,
           label: '订单金额',
           show: true,
           render: (row, column, cell) => {
@@ -221,7 +222,7 @@ export default {
         },
         {
           prop: 'invoicedAmount',
-          minWidth: 80,
+          minWidth: 120,
           label: '开票金额',
           show: true,
           render: (row, column, cell) => {
@@ -339,7 +340,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .type-yuan {
   border-radius: 50%;
   width: 12px;
@@ -501,7 +502,58 @@ export default {
 .table-div-box .el-form-item--medium .el-form-item__content {
   width: 100%;
 }
+#oilSiteUser .frame {
+  margin: 20px;
+  padding: 20px;
+  border-radius: 6px;
+  border: 1px solid #e3e3e5;
+  background: #fff;
 
+  .el-input,
+  .el-select {
+    width: 183px;
+    height: 40px;
+  }
+  .el-autocomplete + .el-select,
+  .el-input + .el-input,
+  .el-input + .el-select,
+  .el-select + .el-select,
+  .el-select + .el-input {
+    margin-right: 20px;
+    margin-bottom: 15px;
+  }
+  .mr20 {
+    margin-right: 20px;
+  }
+  .buttons {
+    text-align: right;
+  }
+}
+#oilSiteUser .table {
+  overflow: hidden;
+  margin: 0 20px;
+  padding-bottom: 20px;
+  background: #fff;
+  border-radius: 6px;
+  border: 1px solid #e3e3e5;
+  > .operation {
+    box-sizing: content-box;
+    padding: 15px;
+  }
+  .gray {
+    color: #999;
+    span {
+      color: #333;
+    }
+  }
+  .el-table {
+    margin-bottom: 20px;
+    border-radius: 10px 10px 0px 0px;
+  }
+  .el-link {
+    margin-right: 10px;
+  }
+}
 #oilSiteUser .el-badge__content {
   right: 15px;
   top: 5px;