zck 9 mēneši atpakaļ
vecāks
revīzija
2b15576600

+ 1 - 1
src/view/inventory/fabricsummary.vue

@@ -19,7 +19,7 @@
       <layout>
         <layout-content>
           <div class="gva-table-box">
-           <el-table ref="multipleTable" style="width: 100%;height: 64vh" tooltip-effect="dark"
+           <el-table ref="multipleTable" style="width: 100%;height: 66vh" tooltip-effect="dark"
                       :row-style="{ height: '40px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="restableData"  border row-key="ID" size="small"  

+ 2 - 2
src/view/inventory/pickinglist.vue

@@ -24,7 +24,7 @@
         <layout-content >
 			<el-main>
 			  <div class="gva-table-box">
-			   <el-table ref="multipleTable" style="width: 100%;height: 36vh" tooltip-effect="dark"
+			   <el-table ref="multipleTable" style="width: 100%;height: 28vh" tooltip-effect="dark"
 						  :row-style="{ height: '20px' }"
 						  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 						  :header-cell-style="{ padding: '0px' }"
@@ -67,7 +67,7 @@
 						@row-click="listtableclick"
 						@row-dblclick="ysupdateCompanyFunc"
 						@selection-change="selectionChange($event, '出库单详情')"
-						style="width: 100%;height: 40vh" border show-summary
+						style="width: 100%;height: 36vh" border show-summary
 						:summary-method="getSummaries" tooltip-effect="dark" :data="listtableData" row-key="ID" >
 					<!-- <el-table-column type="selection" width="30" /> -->
 					<el-table-column  align="left" label="订单编号" prop="订单编号" width="160" />

+ 16 - 13
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -65,16 +65,17 @@
 				<el-table-column align="left" sortable label="制单日期"    	prop="Sys_rq" 	width="160" />
               </el-table>
               <!-- 分页 -->
-				<div class="gva-pagination" style='height: 30px;margin-right: 10px;'>
-                <el-pagination
-                    @size-change="handleSizeChange"
-                    @current-change="handleCurrentChange"
-                    :current-page="page"
-                    :page-sizes="[10, 30, 50, 100]"
-                    layout="total"
-                    :total="total">
-                </el-pagination>
-              </div>
+			  <div class="gva-pagination">
+              <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="page"
+                  :page-sizes="[10, 30, 50, 100]"
+                  :page-size="pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total">
+              </el-pagination>
+            </div>
             </div>
 
             <!-- 颜色资料列表、工艺资料列表、BOM资料列表  -->
@@ -1299,7 +1300,7 @@ const _WorkList_page = async () => {
 	console.log("pageSize",pageSize.value)
   try {
 	//通过客户编号获取
-    const WorkListdata = await WorkOrderList({search:_Gd_khdh.value,page:1,limit:100});
+    const WorkListdata = await WorkOrderList({search:_Gd_khdh.value,page:page.value,limit:pageSize.value});
     tableData.value = WorkListdata.data.data
     total.value = WorkListdata.data.total
   } catch (error) {
@@ -1569,14 +1570,16 @@ const mlcloseDialog = () => {
 // 分页
 const page = ref(1)
 const total = ref(0)
-const pageSize = ref(10)
+const pageSize = ref(50)
 const handleCurrentChange = (val) => {
   page.value = val;
+  _WorkList_page();
 };
 
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
   pageSize.value = val;
+  _WorkList_page();
 };
 
 // =========== 新增订单资料 ===========
@@ -2716,7 +2719,7 @@ const onSubmit = async () => {
     ElMessage({type: 'warning',message: '请输入搜索的订单编号'})
     return false;
   }else{
-  const WorkListdata = await WorkOrderList({search:searchInfo.value,page:"1",limit:"1"});
+  const WorkListdata = await WorkOrderList({search:searchInfo.value,page:page.value,limit:pageSize.value});
    tableData.value= WorkListdata.data.data
    ystableData.splice(0, ystableData.length);//颜色资料清空
    gytableData.splice(0, gytableData.length);//工艺资料情空