From 4e517dc54e1e3e5e5b543383c321161de351272e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 11 十一月 2024 16:05:06 +0800
Subject: [PATCH] Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unattended-app into feature/jlhg/first

---
 subPages/splicingOrders/index.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/subPages/splicingOrders/index.vue b/subPages/splicingOrders/index.vue
index 70bf59b..79655e8 100644
--- a/subPages/splicingOrders/index.vue
+++ b/subPages/splicingOrders/index.vue
@@ -103,7 +103,7 @@
 export default {
     data() {
         return {
-            proType:['鏁h','娑叉埃鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
+            proType:['鏁h','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
             datetailData:[],
             taskId:'',
             pageList:[],
@@ -111,6 +111,7 @@
             activeObj:{},
             showLing:false,
             radioValue:'',
+			orderType:'',
             radioChange:"",
             ClickLoading:false,
         }
@@ -120,7 +121,7 @@
             uni.showLoading({
 					title: "鍔犺浇涓�"
 				})
-            this.$reqGet('getUnclaimedList',{taskCoalId:this.taskId}).then((res) => {
+            this.$reqGet('getUnclaimedList',{taskCoalId:this.taskId,orderType:this.orderType}).then((res) => {
                 this.datetailData =  res.data;
                 uni.hideLoading();
             })
@@ -199,6 +200,7 @@
     onLoad(params)
     {
         this.taskId = params.taskCoalId;
+		this.orderType = params.orderType;
     },
     onShow(){
         this.init();

--
Gitblit v1.9.1