From a81cdbb10246d726c17281b0339945baa8bed627 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 07 十二月 2023 09:35:13 +0800
Subject: [PATCH] 1.个人计件工资产量  100%

---
 pages/grzx/gzcl.vue |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/pages/grzx/gzcl.vue b/pages/grzx/gzcl.vue
index df15aed..9274713 100644
--- a/pages/grzx/gzcl.vue
+++ b/pages/grzx/gzcl.vue
@@ -4,7 +4,7 @@
 		<view class="mainContent" :style="{maxHeight:'1600rpx',overflow: 'scroll'}">
 			<view>
 				<u-gap height="10" bgColor="#eff0f1"></u-gap>
-				<view class="head" :style="{height:detailOrderArray.find(i=>i.unprice===0)?'140rpx':'80rpx'}">
+				<view class="head" :style="{height:'80rpx'}">
 					<view class="head_block">
 						<view class="head_left marginLeft20">
 							<!-- <view class="head_bar"></view> -->
@@ -52,7 +52,7 @@
 				</view>
 				<u-gap height="10" bgColor="#eff0f1"></u-gap>
 				<view class="head">
-					<view class="head_block flex_column" :style="{minHeight:!custom?'230rpx':'130rpx'}">
+					<view class="head_block flex_column" :style="{minHeight:!custom?'210rpx':'130rpx'}">
 						<view v-if="!custom" class="flex_column"
 							style="display: flex;justify-content: space-around;width: 100%;">
 							<view class="" style="display: flex;justify-content: center;width: 100%;">
@@ -84,7 +84,7 @@
 						</view>
 					</view>
 				</view>
-				<u-gap height="20" bgColor="#eff0f1"></u-gap>
+				<u-gap height="10" bgColor="#eff0f1"></u-gap>
 				<view :style="{maxHeight:!custom?'830rpx':'960rpx',overflow: 'scroll'}">
 					<view v-for="(item,index) in detailOrderArray" :key="key">
 						<view class="head">
@@ -109,7 +109,7 @@
 									</view>
 									<view class="lineH50">
 										<view class="titleFont">
-											鎶ュ伐锛�
+											鍚堟牸锛�
 										</view>
 										<view class="contentFont">
 											{{item.report_qty}}
@@ -117,28 +117,20 @@
 									</view>
 									<view class="lineH50">
 										<view class="titleFont">
-											宸ュ簾鏂欏簾锛�
+											宸ュ簾锛�
 										</view>
 										<view class="contentFont">
-											<!-- 	{{item.bad_qty}} -->
+											{{item.laborbad_qty}}
 										</view>
 									</view>
-									<!-- 	<view class="lineH50">
+									<view class="lineH50">
 										<view class="titleFont">
-											鐝粍锛�
+											鍗曚环锛�
 										</view>
 										<view class="contentFont">
-											{{item.group_name}}
+											{{item.unprice}}
 										</view>
 									</view>
-									<view class="lineH50" v-if="$company==='A'">
-										<view class="titleFont">
-											鍒嗛厤姣斾緥锛�
-										</view>
-										<view class="contentFont">
-											{{item.ratio}} %
-										</view>
-									</view> -->
 								</view>
 								<view class="flex_column" style="width: 35%;">
 									<view class="lineH50">
@@ -167,24 +159,24 @@
 									</view>
 									<view class="lineH50" :style="{color:item.unprice===0?'red':''}">
 										<view class="titleFont">
-											鍗曚环锛�
+											鏂欏簾锛�
 										</view>
 										<view class="contentFont">
-											{{item.unprice}}
+											{{item.materielbad_qty}}
 										</view>
 									</view>
-									<view class="lineH50">
+									<!-- 		<view class="lineH50">
 										<view class="titleFont">
 											浜烘暟锛�
 										</view>
 										<view class="contentFont">
 											{{item.colum}}
 										</view>
-									</view>
+									</view> -->
 								</view>
 							</view>
 						</view>
-						<u-gap height="20" v-if="index!==detailOrderArray.length" bgColor="#eff0f1"></u-gap>
+						<u-gap height="10" v-if="index!==detailOrderArray.length" bgColor="#eff0f1"></u-gap>
 					</view>
 				</view>
 			</view>
@@ -273,10 +265,9 @@
 			async getData() {
 				const data = {
 					compute: this.compute ? 'last' : 'contin',
-
 					Ratetime: this.calendarRange
 				}
-				const res = await PieceRateWage(this.global.formatData(data))
+				const res = await PieceRateWage(data)
 				if (res.code === '200') {
 					this.form = res.data.dt0[0]
 					this.detailOrderArray = res.data.dt1

--
Gitblit v1.9.3