王克恕 před 3 roky
rodič
revize
b211b9b967

+ 0 - 1
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogOrder.vue

@@ -275,7 +275,6 @@ export default {
 	      	if(this.type == 'view'){
 	      		this.queryParams.model.id = this.orderData.id
 	      	}else{
-	      		this.queryParams.model.taskBatchNo = this.orderData.taskBatchNo;
 	      		// 最新需求
 	      		this.queryParams.model.planIds = this.orderData.planIds;
 	      	}

+ 2 - 2
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogTask.vue

@@ -336,7 +336,6 @@ export default {
 	      	if(this.type == 'view'){
 	      		this.queryParams.model.planId = this.orderData.id
 	      	}else{
-	      		this.queryParams.taskBatchNo = this.tenant.taskBatchNo;
 	      		// 最新需求
 	      		this.queryParams.planIds = this.orderData.planIds;
 	      	}
@@ -367,7 +366,8 @@ export default {
 	      	if(this.type == 'view'){
 	      		this.queryParams.model.orderId = this.orderData.id
 	      	}else{
-	      		this.queryParams.taskBatchNo = this.tenant.taskBatchNo
+	      		// 最新需求
+	      		this.queryParams.planIds = this.orderData.planIds;
 	      	}
 	    	taskMgrApi.scheduleTaskDaypageList(this.queryParams).then(res => {
 	    		res = res.data

+ 4 - 3
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/index.vue

@@ -917,10 +917,11 @@
 	    			// 先关闭,前一个弹出页面
 	    			this.dialogVisible = false
 	    			// 给页面赋值,带到下一个子组件
-	          this.tenant = res.data
+	          // this.tenant = res.data
 	          // 赋值给,下一个组件使用
-	          res.data.planIds = planIds;
-	          this.$refs.prodProg.setTenant(res.data)
+	          // res.data.planIds = planIds;
+	          this.$refs.prodProg.setTenant({ planIds: planIds });
+	          // this.$refs.prodProg.setTenant(res.data)
 			    	// 给子页面,赋值,订单数据
 			    	this.$refs.prodProg.orderList = this.selection
 			      this.$refs.prodProg.type = "productProg"