diff --git a/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue b/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue index 3b9bfa14..e8e67b84 100644 --- a/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue +++ b/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue @@ -66,7 +66,7 @@
- +
【{{item.destSiteName}}】 @@ -124,8 +124,17 @@ export default { // stepsDesc:[], // 表单校验 rules: { - id: [ - { required: true, message: "id不能为空", trigger: "blur" } + planName: [ + { required: true, message: "计划名称不能为空", trigger: "blur" } + ], + transLineType: [ + { required: true, message: "所属线路不能为空", trigger: ["blur",'change'] } + ], + productType: [ + { required: true, message: "所属产品不能为空", trigger: ["blur",'change'] } + ], + status: [ + { required: true, message: "状态不能为空", trigger: ["blur",'change'] } ], } }; diff --git a/src/views/emis/emisTmsTransPlan/planDtlPanel.vue b/src/views/emis/emisTmsTransPlan/planDtlPanel.vue index b44ecd59..6c61c0ff 100644 --- a/src/views/emis/emisTmsTransPlan/planDtlPanel.vue +++ b/src/views/emis/emisTmsTransPlan/planDtlPanel.vue @@ -42,7 +42,25 @@ - + + + @@ -165,7 +183,7 @@ export default { total: 0, // 费用计算表达式表格数据 emisTmsTransPlanDtlList: [], - + currentSelection:[], isAddSite:false, titleSiteSelectTreeForm:'', openSiteSelectTreeForm:false, @@ -178,7 +196,24 @@ export default { form: {}, // 表单校验 rules: { - + stepName: [ + { required: true, message: "节点名称不能为空", trigger: "blur" } + ], + startSite: [ + { required: true, message: "起始网点不能为空", trigger: ["blur",'change'] } + ], + destSite: [ + { required: true, message: "目的网点不能为空", trigger: ["blur",'change'] } + ], + transType: [ + { required: true, message: "运输方式不能为空", trigger: ["blur",'change'] } + ], + estCostDay: [ + { required: true, message: "预估运输时间不能为空", trigger: "blur" } + ], + orderNum: [ + { required: true, message: "顺序号不能为空", trigger: "blur" } + ], } }; }, @@ -266,7 +301,9 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { + this.currentSelection = selection; this.ids = selection.map(item => item.id) + this.orderNums = selection.map(item => item.orderNum) this.single = selection.length!==1 this.multiple = !selection.length this.currentRow = selection[0]; @@ -350,8 +387,6 @@ export default { }, /** 删除按钮操作 */ handleDelete(row,index,list) { - console.log(this.planId); - if(this.planId != null ){ this.handleDeletePlanId(row); }else{ @@ -369,7 +404,27 @@ export default { }).catch(() => {}); }, handleDeleteByNew(row,index,list){ - list.splice(index, 1); + + if(list){ + list.splice(index, 1); + }else{ + let orderNumMap = new Map(); + this.currentSelection.forEach(item=>{ + orderNumMap[item.orderNum]=1; + }); + if(this.emisTmsTransPlanDtlList){ + let newList=[]; + let orderNumArr = this.currentSelection.map(item=>item.orderNum); + for(let i=0;i