细节优化

api/product-order.js

@@ -114,7 +114,7 @@ export const getParamsList = () => {
 }
 
 export const getList = (params,pageData) => {
-	let url = `/service/S_SC_RW_01`
+	let url = `/service/S_SC_RW_07`
 	let d = setParamsData(params,pageData)
 	return http.post(url, d)
 }

pages/picking/add-sub.vue

@@ -178,7 +178,7 @@
 		</view>
 
 		<view class="footer-box">
-			<button class="cu-btn block bg-blue" @tap="onSubmit">提交</button>
+			<button class="cu-btn block bg-blue" @tap="onSubmit">保存</button>
 		</view>
 		<u-calendar :show="show2" mode="single" :defaultDate="receiptDate" :minDate="minDate" :monthNum='4'
 			@confirm="onConfirm" @close="onCancel"></u-calendar>

pages/product-order/index.vue

@@ -94,16 +94,27 @@
 							<text class="text-gray part-2">:</text>
 							<text class="text-title">{{orderInfo.registeredQuantity}}</text>
 						</view>
-						<view v-if="Number(orderInfo.unregisterQuantity)" class="flex-row">
+						<view v-if="Number(orderInfo.unregisterQuantity) && Number(orderInfo.unregisterQuantity)>0" class="flex-row">
 							<text class="text-gray part-1">待报工数量</text>
 							<text class="text-gray part-2">:</text>
 							<text class="text-title">{{orderInfo.unregisterQuantity}}</text>
 						</view>
-						<view v-if="Number(orderInfo.unregisterWeight)" class="flex-row">
+						<view v-if="Number(orderInfo.unregisterQuantity) && Number(orderInfo.unregisterQuantity)<0" class="flex-row">
+							<text class="text-red part-1">超报数量</text>
+							<text class="text-red part-2">:</text>
+							<text class="text-title text-red">{{Math.abs(orderInfo.unregisterQuantity)}}</text>
+						</view>
+						
+						<view v-if="Number(orderInfo.unregisterWeight)&&Number(orderInfo.unregisterWeight)>0" class="flex-row">
 							<text class="text-gray part-1">待报工重量</text>
 							<text class="text-gray part-2">:</text>
 							<text class="text-title">{{Number(orderInfo.unregisterWeight)}}</text>
 						</view>
+						<view v-if="Number(orderInfo.unregisterWeight)&&Number(orderInfo.unregisterWeight)<0" class="flex-row">
+							<text class="text-red part-1">超报重量</text>
+							<text class="text-red part-2">:</text>
+							<text class="text-title text-red">{{Math.abs(orderInfo.unregisterWeight)}}</text>
+						</view>
 					</view>
 				</view>
 			</view>

pages/product-order/list.vue

@@ -130,23 +130,52 @@
 							<text class="text-title">{{Number(item.totalWeight)}}</text>
 						</view>
 						
-						<view  class="flex-row">
-							<text class="text-gray part-1">完工重量</text>
+						<view v-if="Number(item.taskQuantity)" class="flex-row">
+							<text class="text-gray part-1">报工数量</text>
 							<text class="text-gray part-2">:</text>
-							<text class="text-title">{{Number(item.finishWeight)}}</text>
+							<text class="text-title">{{Number(item.taskQuantity)}}</text>
 						</view>
 						
-						<view  class="flex-row">
-							<text class="text-gray part-1">待完工重量</text>
+						<view v-if="Number(item.unTaskQuantity) && Number(item.unTaskQuantity)>0" class="flex-row">
+							<text class="text-gray part-1">待报工数量</text>
 							<text class="text-gray part-2">:</text>
-							<text class="text-title">{{Number(item.unfinishWeight)}}</text>
+							<text class="text-title">{{Number(item.unTaskQuantity)}}</text>
 						</view>
+						<view v-if="Number(item.unTaskQuantity) && Number(item.unTaskQuantity)<0" class="flex-row">
+							<text class="text-red part-1">超报数量</text>
+							<text class="text-red part-2">:</text>
+							<text class="text-title text-red">{{Math.abs(item.unTaskQuantity)}}</text>
+						</view>
+						
+						<view v-if="Number(item.finishQuantity)" class="flex-row">
+							<text class="text-gray part-1">完工数量</text>
+							<text class="text-gray part-2">:</text>
+							<text class="text-title">{{Number(item.finishQuantity)}}</text>
+						</view>
+
+						
+						<view v-if="Number(item.unfinishQuantity)" class="flex-row">
+							<text class="text-gray part-1">待完工数量</text>
+							<text class="text-gray part-2">:</text>
+							<text class="text-title">{{Number(item.unfinishQuantity)}}</text>
+						</view>
+						
 						
 						<view  class="flex-row">
-							<text class="text-gray part-1">完成状态</text>
+							<text class="text-gray part-1">报工状态</text>
+							<text class="text-gray part-2">:</text>
+							<text class="text-title">{{completeStatusEnum[item.isComplete]}}</text>
+						</view>
+						<view  class="flex-row">
+							<text class="text-gray part-1">完工状态</text>
 							<text class="text-gray part-2">:</text>
 							<text class="text-title">{{Number(item.unfinishWeight) <= 0? '已完工':'未完工'}}</text>
 						</view>
+						<view v-if="item.completeDate.length>2" class="flex-row">
+							<text class="text-gray part-1">完工日期</text>
+							<text class="text-gray part-2">:</text>
+							<text class="text-title">{{item.completeDate}}</text>
+						</view>
 					</view>
 					
 
@@ -239,23 +268,28 @@
 				target: 60,
 				modelVale: 100,
 				tabList: [
-					{
-						name: '全部',
-						value: ''
-					},
+					// {
+					// 	name: '全部',
+					// 	value: ''
+					// },
 					{
 						name: '未报工',
 						value: '0'
 					},
-					// {
-					// 	name: '部分报工',
-					// 	value: '1'
-					// },
 					{
-						name: '已报工',
+						name: '部分报工',
 						value: '1'
+					},
+					{
+						name: '全部报工',
+						value: '2'
 					}
 				],
+				completeStatusEnum:{
+					0:'未报工',
+					1:'部分报工',
+					2:'全部报工',
+				},
 				value: 0,
 				title: '生产任务',
 				eChartData: [],
@@ -370,7 +404,7 @@
 				})
 				getList({
 					...this.queryData,
-					completeStatus:this.tabList[this.current].value,
+					isComplete:this.tabList[this.current].value,
 					companyCode: this.factoryList[this.index].value
 				},this.pageData).then(res => {
 					uni.hideLoading();