Merge branch 'master' of http://123.56.95.229:10010/r/高精

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
       })
     },

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -235,18 +235,21 @@
                 <!--</template>-->
                 <!--</el-table-column>-->
               </el-table>
-              <div class="block" style="display: inline-block;">
+              <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"
-                  style="display:inline-block;width:50px"
+                    mini
+                    style="display:inline-block;margin-right: 0px"
                     layout="total, sizes, prev, pager, next, jumper"
                     @size-change="handleSizeChange11"
                     @current-change="handleCurrentChange11"/>
                 </div>
-              <div style="display: inline-block; float: left">
+              </div>
+              <div style="display: inline-block;float: left">
                 <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
                   <el-button
                     type="primary"
@@ -417,17 +420,20 @@
                 <!--</el-table-column>-->
               </el-table>
             </el-row>
-            <div class="block" style="display: inline-block;">
+            <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"
-                style="display:inline-block;width:50px"
+                  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">
                 <el-button
@@ -2572,4 +2578,7 @@ export default {
       line-height: 46px;
     }
   }
+  el-pagination__sizes {
+    width: 10px;
+  }
 </style>

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -144,17 +144,31 @@
               <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">
+              <!--<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"
-                  style="display:inline-block;width:800px"
+                    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>
             <el-tab-pane label="仓库" name="仓库">
@@ -197,17 +211,31 @@
               <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">
+              <!--<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"
-                  style="display:inline-block;width:50%"
+                    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>
         </el-col>

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -123,17 +123,31 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <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]"
+            :page-sizes="[10, 20, 30, 40, 100]"
             :page-size="pageSize1"
             :total="total1"
-          style="display:inline-block;width:50%"
+            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>