From c8ad9ec99de4b498c9f2d5a180d7608a889b73f6 Mon Sep 17 00:00:00 2001
From: liulujia <759670076@qq.com>
Date: Wed, 29 Apr 2020 08:40:24 +0800
Subject: [PATCH] =?UTF-8?q?28=E6=97=A5=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GroupMatching/index.vue                   |  7 +-
 .../CreateInquirySheet/index.vue              | 51 ++++++++------
 .../OfflineContract/index.vue                 | 68 +++++++++++++------
 .../InvoiceSettlementApplication1/index.vue   | 34 +++++++---
 4 files changed, 106 insertions(+), 54 deletions(-)

diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index d2d7e3ec..f9db6dbd 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -127,7 +127,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    {{ scope.row.创建日期 }}
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -187,7 +187,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    {{ scope.row.创建日期 }}
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -252,7 +252,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    采购时间
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -598,6 +598,7 @@ export default {
       this.Group ? check2 = 1 : check2 = 0
       searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02).then(response => {
         this.tableData02 = response.data.rows
+        console.log(response, 999)
         this.total02 = response.data.total
       })
     },
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 374b5f59..7a7f8147 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -235,18 +235,21 @@
                 <!--</template>-->
                 <!--</el-table-column>-->
               </el-table>
-              <div class="block" style="display: inline-block;">
-                <el-pagination
-                  :current-page="pageCurrent11"
-                  :page-sizes="[10, 50, 100, 150]"
-                  :page-size="pageSize11"
-                  :total="total11"
-                  style="display:inline-block;width:50px"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="handleSizeChange11"
-                  @current-change="handleCurrentChange11"/>
+              <div class="block" style="display: inline-block;width:1150px;float: right;">
+                <div style="display: inline-block;float: right;">
+                  <el-pagination
+                    :current-page="pageCurrent11"
+                    :page-sizes="[10, 50, 100, 150]"
+                    :page-size="pageSize11"
+                    :total="total11"
+                    mini
+                    style="display:inline-block;margin-right: 0px"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    @size-change="handleSizeChange11"
+                    @current-change="handleCurrentChange11"/>
+                </div>
               </div>
-              <div style="display: inline-block; float: left">
+              <div style="display: inline-block;float: left">
                 <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
                   <el-button
                     type="primary"
@@ -417,16 +420,19 @@
                 <!--</el-table-column>-->
               </el-table>
             </el-row>
-            <div class="block" style="display: inline-block;">
-              <el-pagination
-                :current-page="pageCurrent12"
-                :page-sizes="[10, 50, 100, 150]"
-                :page-size="pageSize12"
-                :total="total12"
-                style="display:inline-block;width:50px"
-                layout="total, sizes, prev, pager, next, jumper"
-                @size-change="handleSizeChange12"
-                @current-change="handleCurrentChange12"/>
+            <div class="block" style="display: inline-block;width:1150px;float: right;">
+              <div style="display: inline-block;float: right;">
+                <el-pagination
+                  :current-page="pageCurrent12"
+                  :page-sizes="[10, 50, 100, 150]"
+                  :page-size="pageSize12"
+                  :total="total12"
+                  mini
+                  style="display:inline-block;margin-right: 0px"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  @size-change="handleSizeChange12"
+                  @current-change="handleCurrentChange12"/>
+              </div>
             </div>
             <div style="display: inline-block; float: left">
               <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
@@ -2572,4 +2578,7 @@ export default {
       line-height: 46px;
     }
   }
+  el-pagination__sizes {
+    width: 10px;
+  }
 </style>
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 51297208..852f28f8 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -144,16 +144,30 @@
               <el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
                 <el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
               </el-tooltip>
-              <div class="block" style="margin: 10px 0 0 0;display: inline-block">
-                <el-pagination
-                  :current-page="pageCurrent11"
-                  :page-sizes="[10, 20, 30, 40, 100]"
-                  :page-size="pageSize11"
-                  :total="total11"
-                  style="display:inline-block;width:800px"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="handleSizeChange11"
-                  @current-change="handleCurrentChange11"/>
+              <!--<div class="block" style="margin: 10px 0 0 0;display: inline-block">-->
+              <!--<el-pagination-->
+              <!--:current-page="pageCurrent11"-->
+              <!--:page-sizes="[10, 20, 30, 40, 100]"-->
+              <!--:page-size="pageSize11"-->
+              <!--:total="total11"-->
+              <!--style="display:inline-block;width:800px"-->
+              <!--layout="total, sizes, prev, pager, next, jumper"-->
+              <!--@size-change="handleSizeChange11"-->
+              <!--@current-change="handleCurrentChange11"/>-->
+              <!--</div>-->
+              <div class="block" style="display: inline-block;width:1150px;float: right;">
+                <div style="display: inline-block;float: right;">
+                  <el-pagination
+                    :current-page="pageCurrent11"
+                    :page-sizes="[10, 20, 30, 40, 100]"
+                    :page-size="pageSize11"
+                    :total="total11"
+                    mini
+                    style="display:inline-block;margin-right: 0px"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    @size-change="handleSizeChange11"
+                    @current-change="handleCurrentChange11"/>
+                </div>
               </div>
               <!--:row-class-name="tableRowClassName2"-->
             </el-tab-pane>
@@ -197,16 +211,30 @@
               <el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
                 <el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 5px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
               </el-tooltip>
-              <div class="block" style="display: inline-block">
-                <el-pagination
-                  :current-page="pageCurrent22"
-                  :page-sizes="[20, 50, 100, 150]"
-                  :page-size="pageSize22"
-                  :total="total22"
-                  style="display:inline-block;width:50%"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="handleSizeChange22"
-                  @current-change="handleCurrentChange22"/>
+              <!--<div class="block" style="display: inline-block">-->
+              <!--<el-pagination-->
+              <!--:current-page="pageCurrent22"-->
+              <!--:page-sizes="[20, 50, 100, 150]"-->
+              <!--:page-size="pageSize22"-->
+              <!--:total="total22"-->
+              <!--style="display:inline-block;width:50%"-->
+              <!--layout="total, sizes, prev, pager, next, jumper"-->
+              <!--@size-change="handleSizeChange22"-->
+              <!--@current-change="handleCurrentChange22"/>-->
+              <!--</div>-->
+              <div class="block" style="display: inline-block;width:1150px;float: right;">
+                <div style="display: inline-block;float: right;">
+                  <el-pagination
+                    :current-page="pageCurrent22"
+                    :page-sizes="[20, 50, 100, 150]"
+                    :page-size="pageSize22"
+                    :total="total22"
+                    mini
+                    style="display:inline-block;margin-right: 0px"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    @size-change="handleSizeChange22"
+                    @current-change="handleCurrentChange22"/>
+                </div>
               </div>
             </el-tab-pane>
           </el-tabs>
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index f8a5012e..2db27b80 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -123,17 +123,31 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
+      <div class="block" style="display: inline-block;width:1150px;float: right;">
+        <div style="display: inline-block;float: right;">
+          <el-pagination
+            :current-page="pageCurrent1"
+            :page-sizes="[10, 20, 30, 40, 100]"
+            :page-size="pageSize1"
+            :total="total1"
+            mini
+            style="display:inline-block;margin-right: 0px"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange1"
+            @current-change="handleCurrentChange1"/>
+        </div>
       </div>
+      <!--<div class="block" style="margin-top: 10px;">-->
+      <!--<el-pagination-->
+      <!--:current-page="pageCurrent1"-->
+      <!--:page-sizes="[10, 20, 30, 40]"-->
+      <!--:page-size="pageSize1"-->
+      <!--:total="total1"-->
+      <!--style="display:inline-block;width:50%"-->
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
+      <!--@size-change="handleSizeChange1"-->
+      <!--@current-change="handleCurrentChange1"/>-->
+      <!--</div>-->
     </el-card>
 
     <el-card>