报工删除 和各页分页优化

src/view/performance/caiqiebaogong.vue

@@ -759,8 +759,11 @@ const del_delclick = async () => {
 	console.log(Selection.value)
 	console.log(add_formData['组别'])
 	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
-	res1.code === 0 && ElMessage.success('删除成功')
-	add_onSubmit()
+	if(res1.code === 0){
+		ElMessage.success('删除成功')
+		Selection.value = ''
+		add_onSubmit()
+	}
 }
 
 const _orderid = ref('')//订单子编号

src/view/performance/chafengbaogong.vue

@@ -1040,8 +1040,11 @@ const del_delclick = async () => {
 	console.log(Selection.value)
 	console.log(add_formData['组别'])
 	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
-	res1.code === 0 && ElMessage.success('删除成功')
-	add_onSubmit()
+	if(res1.code === 0){
+		ElMessage.success('删除成功')
+		Selection.value = ''
+		add_onSubmit()
+	}
 }
 
 

src/view/yunyin/shengchanguanli/baogongshuju.vue

@@ -67,18 +67,28 @@
                   size="small" highlight-current-row="true" :show-overflow-tooltip="true"
                   @row-click="add_tableRowClick" @row-dblclick="add_updateCompanyFunc"
                   @selection-change="Excel_Selection">
-                  <el-table-column  align="left" label="订单编号" prop="订单编号" width="100"/>
-        <el-table-column  align="left" label="子订单编号" prop="子订单编号" width="140"/>
-                  <el-table-column  align="left" label="客户编号" prop="客户编号" width="80"/>
-                  <el-table-column  align="left" label="款式" prop="款式" width="80"/>
-        <el-table-column  align="left" label="尺码" prop="尺码" width="60"/>
-        <el-table-column  align="left" label="数量" prop="数量" width="60"/>
-        <el-table-column  align="left" label="班组" prop="sczl_bh" width="80"/>
-                  <el-table-column  align="left" label="生产款号" prop="款号" width="200"/>
-                  <el-table-column  align="left" label="制单数" prop="制单数" width="80"/>
-        <el-table-column  align="left" label="删除用户" prop="delsys_id" width="150"/>
-                  <el-table-column  align="left" label="删除时间" prop="mod_rq" width="155"/>
+                <el-table-column  align="left" label="订单编号" prop="订单编号" width="100"/>
+                <el-table-column  align="left" label="子订单编号" prop="子订单编号" width="140"/>
+                <el-table-column  align="left" label="生产款号" prop="款号" width="180"/>
+                <el-table-column  align="left" label="款式" prop="款式" width="160"/>
+                <el-table-column  align="left" label="尺码" prop="尺码" width="80"/>
+                <el-table-column  align="left" label="数量" prop="数量" width="60"/>
+                <el-table-column  align="left" label="班组" prop="sczl_bh" width="80"/>
+                <el-table-column  align="left" label="制单数" prop="制单数" width="80"/>
+                <el-table-column  align="left" label="删除用户" prop="delsys_id" width="150"/>
+                <el-table-column  align="left" label="删除时间" prop="mod_rq" width="155"/>
         </el-table>
+        <div class="gva-pagination">
+              <el-pagination
+                  @size-change="del_handleSizeChange"
+                  @current-change="del_handleCurrentChange"
+                  :current-page="del_page"
+                  :page-sizes="[10, 30, 50, 100]"
+                  :page-size="del_pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="del_total">
+              </el-pagination>
+            </div>
       </el-dialog>  
       <layout>
         <!--左侧树侧形结构-->
@@ -92,10 +102,10 @@
 
         <!-- 右侧区域 -->
         <layout-content >
-        <el-main>
-          <div class="gva-table-box">
+        <!-- <el-main> -->
+          <!-- <div class="gva-table-box"> -->
             <!-- 表格数据 -->
-           <el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
+           <el-table ref="multipleTable" style="width: 100%;height: 67vh" tooltip-effect="dark"
                       :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="tableData"  border row-key="ID" 
@@ -107,27 +117,35 @@
       <el-table-column  align="left" label="订单编号" prop="订单编号" width="97"/>
       <el-table-column  align="left" label="子订单编号" prop="子订单编号" width="130"/>
       <el-table-column  align="left" label="客户编号" prop="客户编号" width="80"/>
-      <el-table-column  align="left" label="款式" prop="款式" width="90"/>
       <el-table-column  align="left" label="生产款号" prop="生产款号" width="110"/>
+      <el-table-column  align="left" label="款式" prop="款式" width="90"/>
       <el-table-column  align="left" label="颜色备注" prop="颜色备注" width="110"/>
       
       <!-- 尺码列表 -->
       <template v-for="item in sizeDatas">
         <el-table-column align="center"  :label=item :prop=item  width="70"/> 
       </template>
-      <!-- <el-table-column  align="left" label="制单数" prop="制单数" width="80"/> -->
+      <el-table-column  align="left" label="报工数量" prop="数量" width="90"/>
+      <el-table-column  align="left" label="组别" prop="sczl_bh" width="80"/>
       <el-table-column  align="left" label="工序名称" prop="工序名称" width="80"/>
       <el-table-column  align="left" label="上报时间" prop="上报时间" width="150"/>
       <el-table-column  align="left" label="船样" prop="船样" width="50"/>
 
             </el-table>
             <div class="gva-pagination">
-              <el-pagination layout="total" :current-page="page" :page-size="pageSize"
-               :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+              <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>
+          <!-- </div> -->
 
-        </el-main>
+        <!-- </el-main> -->
       </layout-content>
       <el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog"
             title="新增订单资料" width="70%" top="3%" destroy-on-close>
@@ -398,7 +416,7 @@ console.log("日期",_Machine_riqi.value)
 sizeDatas.length = 0;
 tableData.length = 0;
 try {
-  const WorkListdata = await MachineDetail({machine:_Machine.value,date:_Machine_riqi.value,order:searchInfo.value});
+  const WorkListdata = await MachineDetail({machine:_Machine.value,date:_Machine_riqi.value,order:searchInfo.value,page:page.value,limit:pageSize.value});
   //将 1 转换为 "是"，0 转换为 "否"
   WorkListdata.data.table.forEach(item => {
     item.船样 = item.船样 === 1 ? '是' : '否';
@@ -446,7 +464,7 @@ const getSummaries = (param) => {
   });  
 
   // 将汇总的总数量放在“上报时间”列下方
-  const reportTimeIndex = columns.findIndex(col => col.label === '上报时间');
+  const reportTimeIndex = columns.findIndex(col => col.label === '报工数量');
   sums[reportTimeIndex] = grandTotal;
 
   return sums;  
@@ -652,7 +670,7 @@ bgSelection.value = ids.join(',')
 const deletedialog = ref(false)
 const deletetableData = reactive([]);
 const delete_onclick = async () => {
-const ProcessDetailtable = await ProcessDetailDel()
+const ProcessDetailtable = await ProcessDetailDel({page:del_page.value,limit:del_pageSize.value})
 console.log('删除记录',ProcessDetailtable.data.total)
 
 deletetableData.splice(0,deletetableData.length,...ProcessDetailtable.data.table);
@@ -677,13 +695,15 @@ dialogFormVisible.value = false;
 };
 // =========== 分页 ===========
 
-const del_total = ref(0)
 
 
 // 分页相关的响应式变量
 const page = ref(1)
 const total = ref(0)
-const pageSize = ref(10)
+const pageSize = ref(50)
+const del_total = ref(0)
+const del_page = ref(1)
+const del_pageSize = ref(50)
 // 分页
 const handleCurrentChange = (val) => {
 page.value = val;
@@ -692,10 +712,20 @@ _getStaffList();
 
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
-page.value = 10;//默认显示
 pageSize.value = val;
 _getStaffList();
 };
+// 删除分页
+const del_handleCurrentChange = (val) => {
+del_page.value = val;
+delete_onclick();
+};
+
+// 删除页面容量 点击多少条/页
+const del_handleSizeChange = (val) => {
+pageSize.value = val;
+delete_onclick();
+};
 
 </script>
 <style scoped>

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -70,11 +70,16 @@
   
 			  <!-- 分页 -->
 			  <div class="gva-pagination">
-				<el-pagination layout="total" :current-page="page" :page-size="pageSize"
-				 :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
-  <!--              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]"-->
-  <!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
-			  </div>
+              <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>
   
 		  <!-- </el-main> -->
@@ -124,10 +129,28 @@ const minutes = String(today.getMinutes()).padStart(2, '0');
 const seconds = String(today.getSeconds()).padStart(2, '0');
 const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 const currentDates = `${year}-${month}-${day}`;
+
+  // 分页相关的响应式变量
+  const page = ref(1)
+  const total = ref(0)
+  const pageSize = ref(50)
+  // 分页
+  const handleCurrentChange = (val) => {
+	page.value = val;
+	_getStaffList();
+  };
+  
+  // 修改页面容量 点击多少条/页
+  const handleSizeChange = (val) => {
+	pageSize.value = val;
+	_getStaffList();
+  };
+
+
 //进入页面显示所有数据
 const getUnapprovalList = async () => {
   try {
-    const UnapprovalListtable  = await UnapprovalList({search:''});
+    const UnapprovalListtable  = await UnapprovalList({search:'',page:page.value,limit:pageSize.value});
 	console.log(1484,UnapprovalListtable)
 	const workOrderDetaildata1 = UnapprovalListtable.data.table
 	tableData1.splice(0,tableData1.length,...workOrderDetaildata1);
@@ -273,7 +296,7 @@ const onSubmit = async ()  => {
 		// ElMessage({type: 'warning',message: '请输入搜索的订单编号' })
 		// return false;
 	// }else{
-		const UnapprovalListtable = await UnapprovalList({search:searchInfo.value});
+		const UnapprovalListtable = await UnapprovalList({search:searchInfo.value,page:page.value,limit:pageSize.value});
 		tableData1.splice(0,tableData1.length,...UnapprovalListtable.data.table);
 		total.value = UnapprovalListtable.data.total
 	// }
@@ -306,7 +329,7 @@ const hptg_onClick = async () => {
 	if (Approvals.code === 0) {
 		searchInfo.value = ''
 		ElMessage({type: 'success',message: '核批成功'})
-		const UnapprovalListtable = await UnapprovalList({search:searchInfo.value});
+		const UnapprovalListtable = await UnapprovalList({search:searchInfo.value,page:page.value,limit:pageSize.value});
 		tableData1.splice(0,tableData1.length,...UnapprovalListtable.data.table);
 		total.value = UnapprovalListtable.data.total
 	} else {
@@ -319,22 +342,7 @@ const hptg_onClick = async () => {
 
 
  
-  // 分页相关的响应式变量
-  const page = ref(1)
-  const total = ref(0)
-  const pageSize = ref(10)
-  // 分页
-  const handleCurrentChange = (val) => {
-	page.value = val;
-	_getStaffList();
-  };
-  
-  // 修改页面容量 点击多少条/页
-  const handleSizeChange = (val) => {
-	page.value = 10;//默认显示
-	pageSize.value = val;
-	_getStaffList();
-  };
+
   // 弹窗控制标记
   const dialogFormVisible = ref(false)
   //修改