tj

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

@@ -173,7 +173,12 @@ class AliyunQcService{
         "publishName":needinfo.publishName,
         "publishName":needinfo.publishName,
         "publishMobile":needinfo.publishMobile
         "publishMobile":needinfo.publishMobile
     };
     };
+    var salesmanInfo = {//业务员信息
+      "salesmanName":user.channel_username,
+      "salesmanMobile":user.mobile
+    };
     ab.solutionContent["customerInfo"]= customerInfo;
     ab.solutionContent["customerInfo"]= customerInfo;
+    ab.solutionContent["salesmanInfo"]= salesmanInfo;
     ab.solutionContent = JSON.stringify(ab.solutionContent);
     ab.solutionContent = JSON.stringify(ab.solutionContent);
     var self = this;
     var self = this;
     return await this.needsolutionDao.db.transaction(async function (t) {
     return await this.needsolutionDao.db.transaction(async function (t) {
@@ -572,6 +577,9 @@ class AliyunQcService{
     //方案流程列表
     //方案流程列表
     var solutionFlowList = solutionContent.solutionFlowList || [];
     var solutionFlowList = solutionContent.solutionFlowList || [];
     if (ab.status == "2") {//⽤户已上传
     if (ab.status == "2") {//⽤户已上传
+      if(solutionContent.status =="USER_CONFIRMED"){//防止用户确认后又否决
+        return system.getResultFail(-112, "操作失败，⽤户已确认递交⽂件");
+      }
       solutionFlowList.push({
       solutionFlowList.push({
         status: "USER_UPLOADED", statusName: this.icpSolutionStatusReference.USER_UPLOADED, updated_at: new Date()
         status: "USER_UPLOADED", statusName: this.icpSolutionStatusReference.USER_UPLOADED, updated_at: new Date()
       });
       });
@@ -580,7 +588,7 @@ class AliyunQcService{
     }
     }
     if (ab.status == "4") {//⽤户已确认
     if (ab.status == "4") {//⽤户已确认
       if(solutionContent.status !="MATERIAL_UNCONFIRM"){
       if(solutionContent.status !="MATERIAL_UNCONFIRM"){
-        return system.getResultFail(-112, "操作失败，服务商递交⽂件后才能执行此操作");
+        return system.getResultFail(-113, "操作失败，服务商递交⽂件后才能执行此操作");
       }
       }
       solutionFlowList.push({
       solutionFlowList.push({
         status: "USER_CONFIRMED", statusName: this.icpSolutionStatusReference.USER_CONFIRMED, updated_at: new Date()
         status: "USER_CONFIRMED", statusName: this.icpSolutionStatusReference.USER_CONFIRMED, updated_at: new Date()