订单完成

https/api.js

@@ -184,5 +184,18 @@ export default {
 	productOrderDetailAddNonautomatic(params) {
 		return request('/mes/productOrderDetail/addNonautomatic', 'post', params)
 	},
-	// /mes/productOrderDetail/addNonautomatic
+	
+	// 新的接口--------------------------------------------------
+	// 查询订单状态字典
+	clientOrderType(params) {
+		return request('/system/dict/data/type/client_order_type', 'get', params)
+	},
+	// 订单列表接口
+	orderList(params) {
+		return request('/business/order/list', 'get', params)
+	},
+	// 订单详情
+	orderDetails(params) {
+		return request('/business/order/details', 'get', params)
+	},
 }

pages/index/index.vue

@@ -35,26 +35,30 @@
 							{
 								meta:{
 									icon:'http://boyo.oss-cn-beijing.aliyuncs.com/3e138740-5871-11ee-90ae-8375f0aa48d2zhijian.png',
-									title:'生成中'
-								}
+									title:'生产中',
+								},
+								path:'/subPackages/orderforGoods/index?status=生产中' 
 							},
 							{
 								meta:{
 									icon:'http://boyo.oss-cn-beijing.aliyuncs.com/2922f690-5871-11ee-90ae-8375f0aa48d2dingdan.png',
 									title:'逾期'
-								}
+								},
+								path:'/subPackages/orderforGoods/index?status=已逾期' 
 							},
 							{
 								meta:{
 									icon:'http://boyo.oss-cn-beijing.aliyuncs.com/2922f690-5871-11ee-90ae-8375f0aa48d2dingdan.png',
 									title:'已发货'
-								}
+								},
+								path:'/subPackages/orderforGoods/index?status=已发货' 
 							},
 							{
 								meta:{
 									icon:'http://boyo.oss-cn-beijing.aliyuncs.com/2922f690-5871-11ee-90ae-8375f0aa48d2dingdan.png',
 									title:'已签收'
-								}
+								},
+								path:'/subPackages/orderforGoods/index?status=已签收' 
 							}
 						]
 					}

subPackages/orderforGoods/details.vue

@@ -9,16 +9,16 @@
 					<text>基础信息</text>
 				</view>
 				
-				<view class="title-center">压住零件生产</view>
+				<view class="title-center">{{requestData.orderName}}</view>
 				
 				<view class="item-text flex-box">
 					<view class="item-text-left">订单编号:</view>
-					<view>sdhfjshfjsdhjhj</view>
+					<view>{{requestData.orderNum}}</view>
 				</view>
 				
 				<view class="item-text flex-box">
 					<view class="item-text-left">订单数量:</view>
-					<view>1200</view>
+					<view>{{requestData.number}}</view>
 				</view>
 				
 				<view class="item-text flex-box">
@@ -28,11 +28,15 @@
 				
 				<view class="item-text flex-box">
 					<view class="item-text-left">订单交付周期:</view>
-					<view>20个</view>
+					<view>{{requestData.deliveryCycle}}天</view>
 				</view>
 				
 				<view class="positioning-type">
-					已发布
+					<text v-if="requestData.orderStatus == 1">生产中</text>
+					<text v-else-if="requestData.transportOrder && requestData.transportOrder.shippingStatus == 1">已发货</text>
+					<text v-else-if="requestData.transportOrder && requestData.transportOrder.shippingStatus == 2">已签收</text>
+					<text v-else-if="requestData.overdue == 1">已逾期</text>
+					<text v-else></text>
 				</view>
 				
 			</view>
@@ -52,20 +56,14 @@
 							<uni-th style="color: #000;" align="left">完成时间</uni-th>
 						</uni-tr>
 						<!-- 表格数据行 -->
-						<uni-tr>
-							<uni-td>工序1</uni-td>
-							<uni-td>完成</uni-td>
-							<uni-td>2020-10-21</uni-td>
-						</uni-tr>
-						<uni-tr>
-							<uni-td>工序1</uni-td>
-							<uni-td>完成</uni-td>
-							<uni-td>2020-10-21</uni-td>
-						</uni-tr>
-						<uni-tr>
-							<uni-td>工序1</uni-td>
-							<uni-td>完成</uni-td>
-							<uni-td>2020-10-21</uni-td>
+						<uni-tr v-for="item of requestData.productOrderList || []" :key="item.id">
+							<uni-td>{{item.processName}}</uni-td>
+							<uni-td>
+								<text v-if="item.status == 0">执行中</text>
+								<text v-if="item.status == 1">待质检</text>
+								<text v-if="item.status == 2">完成</text>
+							</uni-td>
+							<uni-td>{{item.endTime}}</uni-td>
 						</uni-tr>
 					</uni-table>
 				</view>
@@ -78,24 +76,24 @@
 					<text>发货信息</text>
 				</view>
 				
-				<view class="item-text">
+				<view class="item-text" v-if="requestData.transportOrder">
 					<view class="item-text flex-box">
 						<view class="item-text-left">发货数量:</view>
-						<view>600</view>
+						<view>{{requestData.transportOrder.number}}</view>
 					</view>
 					
 					<view class="item-text flex-box">
 						<view class="item-text-left">剩余数量:</view>
-						<view>600</view>
+						<view>{{requestData.transportOrder.number}}</view>
 					</view>
 					<view class="item-text flex-box">
 						<view class="item-text-left">发货订单:</view>
-						<view>SF机构获得积分</view>
+						<view>{{requestData.transportOrder.invoiceNumber}}</view>
 					</view>
 					
 					<view class="item-text flex-box">
 						<view class="item-text-left">发货时间:</view>
-						<view>2023-08-25</view>
+						<view>{{requestData.transportOrder.createTime}}</view>
 					</view>
 				</view>
 				
@@ -110,16 +108,24 @@
 	export default {
 		data() {
 			return {
-				// 青岛的数据
-				requestData:{}
+				// 请求的数据
+				requestData:{},
+				form:{},
 			}
 		},
+		onLoad(e) {
+			this.form.id = e.id
+			this.orderDetailsfun()
+		},
 		onShow() {
-			// this.dataList = []
-			// this.productOrderlistfun()
 		},
 		methods: {
-			
+			// 获取详情数据
+			orderDetailsfun(){
+				this.$api.orderDetails(this.form).then(res=>{
+					this.requestData = res.data
+				})
+			},
 		}
 	}
 </script>

subPackages/orderforGoods/index.vue

@@ -13,24 +13,26 @@
 		<view class="list-box" v-if="dataList.length>0">
 			<view class="list-item" v-for="(item, index) in dataList" :key="index" @click="Jumpfun(item)">
 				<view class="title-center" >
-					压铸零件生产（订单名称）
+					{{item.orderName}}
 				</view>
 				<view class="bottom-text">
 					<view class="item-text flex-box">
 						<view class="item-text-left">订单编号：</view>
-						<view class="item-text-right">GD20230831001-1000</view>
+						<view class="item-text-right">{{item.orderNum}}</view>
 					</view>
 					<view class="item-text flex-box">
 						<view class="item-text-left">订单数量：</view>
-						<view class="item-text-right">1200</view>
+						<view class="item-text-right">{{item.number}}</view>
 					</view>
 					<view class="item-text flex-box">
 						<view class="item-text-left">订单生产时间：</view>
-						<view class="item-text-right">2023.08.09 2023.08.27</view>
+						<view class="item-text-right">{{item.startTime}}</view>
 					</view>
 					
 					<view class="positioning-type">
-						已发货
+						{{item.status}}
+						<!-- <text v-if="item.orderStatus == ite.dictValue" 
+						v-for="ite of clientOrderTypeData" :key="ite.id">{{ite.dictLabel}}</text> -->
 					</view>
 				</view>
 				
@@ -52,25 +54,29 @@
 			return {
 				// 请求传递的参数
 				form:{
-					current:1,
-					size:10,
-					orderStatus:1
+					pageNum:1,
+					pageSize:10,
 				},
 				// 列表数据
-				dataList:[1],
+				dataList:[],
 				total:0,
 				status: 'loadmore',
+				clientOrderTypeData:[],
 			}
 		},
+		onLoad(e) {
+			this.form.status = e.status
+			// this.clientOrderTypefun()
+		},
 		onShow() {
-			// this.dataList = []
-			// this.productOrderlistfun()
+			this.dataList = []
+			this.orderListfun()
 		},
 		onReachBottom() {
 			this.status = 'loading'
 			if (this.dataList.length < this.total) {
-				this.page.current++
-				this.productOrderlistfun()
+				this.form.pageNum++
+				this.orderListfun()
 			} else {
 				this.status = 'nomore'
 			}
@@ -79,29 +85,35 @@
 			// 跳转方法
 			Jumpfun(item){
 				uni.navigateTo({
-					url: '/subPackages/orderforGoods/details?orderId=' + item.id
+					url: '/subPackages/orderforGoods/details?id=' + item.id
 				});
 			},
 			// 搜索事件
 			searchforfun(){
-				this.form.current = 1
+				this.form.pageNum = 1
 				this.dataList = []
 				this.productOrderlistfun()
 			},
 			// 搜索清空
 			clearforfun(){
 				delete this.form.taskName
-				this.form.current = 1
+				this.form.pageNum = 1
 				this.dataList = []
 				this.productOrderlistfun()
 			},
+			// 获取字典数据
+			clientOrderTypefun(){
+				this.$api.clientOrderType().then(res=>{
+					this.clientOrderTypeData = res.data
+				})
+			},
 			// 获取列表接口
-			productOrderlistfun(){
+			orderListfun(){
 				uni.showLoading({
 					title: '加载中',
 					mask: true
 				});
-				this.$api.productOrderlist(this.form).then(res=>{
+				this.$api.orderList(this.form).then(res=>{
 					this.dataList = this.dataList.concat(res.rows)
 					this.total = res.total
 					if (this.dataList.length == res.total) {