Merge remote-tracking branch 'origin/center-order' into center-order

center-order/app/base/service/impl/qcutils/aliyunqcSve.js

@@ -72,7 +72,7 @@ class AliyunQcService{
       }
       }
       return system.getResultSuccess();
       return system.getResultSuccess();
     })
     })
-    
+
   }
   }
   //根据需求查看方案列表
   //根据需求查看方案列表
   async getProgrammeInfoByChannelNeedNo(pobj) {
   async getProgrammeInfoByChannelNeedNo(pobj) {
@@ -243,7 +243,7 @@ class AliyunQcService{
           needObj = {
           needObj = {
             id: needinfo.id,
             id: needinfo.id,
             followManUserId: user.id,//跟进人id
             followManUserId: user.id,//跟进人id
-            followManName: user.channel_username,//跟进人姓名 
+            followManName: user.channel_username,//跟进人姓名
             followManMobile: user.mobile,//跟进人手机号（合伙人）
             followManMobile: user.mobile,//跟进人手机号（合伙人）
             followManOnlyCode: user.channel_userid
             followManOnlyCode: user.channel_userid
           };
           };
@@ -394,14 +394,15 @@ class AliyunQcService{
     if (!needinfo || !needinfo.id) {
     if (!needinfo || !needinfo.id) {
       return system.getResultFail(-201, "未知需求信息");
       return system.getResultFail(-201, "未知需求信息");
     }
     }
-    if (needinfo.status == "ycd" || needinfo.status == "ygb") {
+    // if (needinfo.status == "ycd" || needinfo.status == "ygb") {
+    if (needinfo.status == "ygb") {
       return system.getResultFail(-202, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
       return system.getResultFail(-202, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
     }
     }
     var material = ab.material;
     var material = ab.material;
     if (!material.Domain) {
     if (!material.Domain) {
       return system.getResultFail(-101, "备案域名不能为空");
       return system.getResultFail(-101, "备案域名不能为空");
     }
     }
-    //CorporateName 法⼈名称 
+    //CorporateName 法⼈名称
     if (!material.hasOwnProperty("IncludeForeignInvestment")) {
     if (!material.hasOwnProperty("IncludeForeignInvestment")) {
       return system.getResultFail(-102, "包含外贸参数不能为空");
       return system.getResultFail(-102, "包含外贸参数不能为空");
     }
     }
@@ -446,7 +447,7 @@ class AliyunQcService{
     if (ab.officialFileURL) {
     if (ab.officialFileURL) {
       ab["OfficialFileURL"] = ab.officialFileURL;
       ab["OfficialFileURL"] = ab.officialFileURL;
     }
     }
-    
+
     var ns = await this.needsolutionDao.model.findOne({
     var ns = await this.needsolutionDao.model.findOne({
       where:{orderNo:ab.orderNo},raw:true
       where:{orderNo:ab.orderNo},raw:true
     });
     });
@@ -503,8 +504,9 @@ class AliyunQcService{
     if (!needinfo || !needinfo.id) {
     if (!needinfo || !needinfo.id) {
       return system.getResultFail(-201, "未知需求信息");
       return system.getResultFail(-201, "未知需求信息");
     }
     }
-    if (needinfo.status == "ycd" || needinfo.status == "ygb") {
-      return system.getResultFail(-202, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
+    // if (needinfo.status == "ycd" || needinfo.status == "ygb") {
+    if (needinfo.status == "ygb") {
+      return system.getResultFail(-202, "serviceProviderSubmitMateria" + needinfo.statusName + ",不能执行此操作");
     }
     }
     var solutionFlowList = solutionContent.solutionFlowList || [];
     var solutionFlowList = solutionContent.solutionFlowList || [];
     if (ab.ApplicationStatus == 507) {//完成账户注册
     if (ab.ApplicationStatus == 507) {//完成账户注册
@@ -736,7 +738,8 @@ class AliyunQcService{
     if (!needinfo) {
     if (!needinfo) {
       return system.getResultFail(-104, "未知方案需求");
       return system.getResultFail(-104, "未知方案需求");
     }
     }
-    if (needinfo.status == "ycd" || needinfo.status == "ygb") {
+    // if (needinfo.status == "ycd" || needinfo.status == "ygb") {
+    if (needinfo.status == "ygb") {
       return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
       return system.getResultFail(-105, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
     }
     }
     //获取方案信息
     //获取方案信息
@@ -875,5 +878,3 @@ class AliyunQcService{
   }
   }
 }
 }
 module.exports = AliyunQcService;
 module.exports = AliyunQcService;
-
-