Commit d850b038 by 兰国旗

laolan

parent f80b81a9
...@@ -1043,7 +1043,7 @@ class RegCenterOrderService { ...@@ -1043,7 +1043,7 @@ class RegCenterOrderService {
if (!ab.consultType) { if (!ab.consultType) {
return system.getResultFail(-101, "业务大类不能为空"); return system.getResultFail(-101, "业务大类不能为空");
} }
if(ab.consultType == "QYJYTC1" || ab.consultType == "QYJYTC2"){ if (ab.consultType == "QYJYTC1" || ab.consultType == "QYJYTC2") {
if (!ab.productType) { if (!ab.productType) {
return system.getResultFail(-101, "业务小类不能为空"); return system.getResultFail(-101, "业务小类不能为空");
} }
...@@ -1395,10 +1395,11 @@ class RegCenterOrderService { ...@@ -1395,10 +1395,11 @@ class RegCenterOrderService {
} }
solutionFlowList = deliveryContent.solutionFlowList || []; solutionFlowList = deliveryContent.solutionFlowList || [];
} }
} else {//如果交付信息不存在的话就去进行赋值
deliveryContent = needsolutioninfo.solutionContent;
solutionFlowList = needsolutioninfo.solutionContent.solutionFlowList
} }
// else {//如果交付信息不存在的话就去进行赋值
// deliveryContent = needsolutioninfo.solutionContent;
// solutionFlowList = needsolutioninfo.solutionContent.solutionFlowList
// }
deliveryContent.solutionFlowList = solutionFlowList; deliveryContent.solutionFlowList = solutionFlowList;
let applicationStatusList = deliveryContent.applicationStatusList || []; let applicationStatusList = deliveryContent.applicationStatusList || [];
let statusObj = { let statusObj = {
...@@ -1410,8 +1411,7 @@ class RegCenterOrderService { ...@@ -1410,8 +1411,7 @@ class RegCenterOrderService {
applicationStatusList.push(statusObj); applicationStatusList.push(statusObj);
deliveryContent.applicationStatusList = applicationStatusList; deliveryContent.applicationStatusList = applicationStatusList;
deliveryContent["applicationStatus"] = ab.applicationStatus; deliveryContent["applicationStatus"] = ab.applicationStatus;
} } else {
else {
if (deliveryContent && deliveryContent[ab.productType] && deliveryContent[ab.productType].status && deliveryContent[ab.productType].deliveryFlowList) { if (deliveryContent && deliveryContent[ab.productType] && deliveryContent[ab.productType].status && deliveryContent[ab.productType].deliveryFlowList) {
if (this.regStatus[deliveryContent.ApplicationStatus] && this.regStatus[deliveryContent.ApplicationStatus] == ab.ApplicationStatus && ab.ApplicationStatus == 705) { if (this.regStatus[deliveryContent.ApplicationStatus] && this.regStatus[deliveryContent.ApplicationStatus] == ab.ApplicationStatus && ab.ApplicationStatus == 705) {
return system.getResultFail(-406, "操作失败,该交付已完成,不能更改"); return system.getResultFail(-406, "操作失败,该交付已完成,不能更改");
...@@ -1422,10 +1422,10 @@ class RegCenterOrderService { ...@@ -1422,10 +1422,10 @@ class RegCenterOrderService {
let startTime let startTime
let endTime let endTime
if (ab.startTime) { if (ab.startTime) {
startTime = (new Date(ab.startTime * 1000)).Format("yyyy-MM-dd hh:mm:ss") startTime = (new Date(ab.startTime * 1000)).Format("yyyy-MM-dd hh:mm:ss")
} }
if(ab.startTime){ if (ab.startTime) {
endTime = (new Date(ab.endTime * 1000)).Format("yyyy-MM-dd hh:mm:ss") endTime = (new Date(ab.endTime * 1000)).Format("yyyy-MM-dd hh:mm:ss")
} }
if (ab.consultType == "QYJYTC1") { if (ab.consultType == "QYJYTC1") {
bizTypeName = "企业经营套餐一" bizTypeName = "企业经营套餐一"
...@@ -1503,8 +1503,8 @@ class RegCenterOrderService { ...@@ -1503,8 +1503,8 @@ class RegCenterOrderService {
bizTypeName: bizTypeName, bizTypeName: bizTypeName,
productType: productType, productType: productType,
productTypeName: "地址服务", productTypeName: "地址服务",
startTime: startTime || "", startTime: startTime || "",
endTime: endTime || "" , endTime: endTime || "",
status: ab.ApplicationStatus, status: ab.ApplicationStatus,
statusName: this.regDeliveryStatusName[ab.ApplicationStatus], statusName: this.regDeliveryStatusName[ab.ApplicationStatus],
channelStatus: this.regDeliveryStatus[ab.ApplicationStatus], channelStatus: this.regDeliveryStatus[ab.ApplicationStatus],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment