Merge remote-tracking branch 'origin/master'

FormInsertDiy/AffairPage/AuditPage/QnMZstuSigning.js

@@ -19,17 +19,18 @@ const initSignFunc = () => {
     let messageList = [];
 
     /**
-     *
+     * 
      * 第一步 获取选择的每一条审核数据需要盖章的图片
-     * 一旦开始调接口 就需要 setSubmitLoading(true) 转圈圈
+     * 一旦开始调接口 就需要 setSubmitLoading(true) 转圈圈 
      */
+    console.log("selectRows",selectRows);
     const selectList =
       selectRows.map((g) => { 
         let json = {};
         json.isSealOrNot = g['LLzXaxdAYHU'] || "0";
         json.signaturePicture = g['LLMbGiXIkvE'];
         json.setUp = g['LLtAdXHnnVM'] &&  ( g['LLtAdXHnnVM'] != undefined && g['LLtAdXHnnVM'] != null ) ? JSON.parse(g['LLtAdXHnnVM']) : {objs: []};
-        json.enclosure = g['LHfENWqbwZs'];
+        json.enclosure = g['LHfENWqbwZs'] ? g['LHfENWqbwZs'] : {files:[]};
         json.code = g['code'];
         json.taskId = g['taskId'];
         json.appId = g['appId'];
@@ -67,22 +68,26 @@ const initSignFunc = () => {
         } = selectData;  
         const oneStudentTask = async () => {
           let resOneStudentRes;
-          if (enclosure.files == [] || enclosure.files.length == 0) {
-            console.log('->>>>>>>>>',`学生：${userName}`+'没有签章图片');
-            messageList.push({name:'学生没有上传签章图片',type:1,username:`学生：${userName}`});
-            return false;
-          } 
-          if (setUp.objs == [] || setUp.objs.length == 0) {
-            console.log('->>>>>>>>>',`学生：${userName}`+'上级没有签章，批量签章不生效');
-            messageList.push({name:'上一级审核没有签章，批量签章不生效！',type:1,username:`学生：${userName}`});
-            return false;
-          }
-          selectTotal++;
-          let background = enclosure.files[enclosure.files.length - 1].path;
           // 这里还要加判断 如果没得图片能签章. 直接跳过这条数据
           if (Number(isSealOrNot) === 1) { //盖章流程
+            if (enclosure.files == [] || enclosure.files.length == 0) {
+              console.log('->>>>>>>>>',`学生：${userName}`+'没有签章图片');
+              messageList.push({name:'学生没有上传签章图片',type:1,username:`学生：${userName}`});
+              return false;
+            } 
+            selectTotal++;
+            let background = enclosure.files[enclosure.files.length - 1].path;
+            if ( setUp.objs == [] || setUp.objs.length == 0) {
+              console.log('->>>>>>>>>',`学生：${userName}`+'上级没有签章，批量签章不生效');
+              messageList.push({name:'上一级审核没有签章，批量签章不生效！',type:1,username:`学生：${userName}`});
+              return false;
+            }
+
             setUp.objs.forEach((sv, si) => { 
               let XGAxis = result[signTypeId] || null ;//根据下级类型配置了XY偏移量  否则使用最上级XY偏移量
+              console.log("signTypeId",signTypeId)
+              console.log("result",result)
+              console.log("XGAxis",XGAxis)
               if(XGAxis != null){
                 XAxisOffset = XGAxis.XAxisOffset;
                 YAxisOffset = XGAxis.YAxisOffset;
@@ -120,7 +125,7 @@ const initSignFunc = () => {
                 taskForm: JSON.stringify(taskForm),
               };
               //console.log('examineJson', examineJson);
-              //return true;
+              // return true;
               return uaaRequest('/UnifiedAppFormApi/examineProcess', examineJson).then((resProcess) => {
                 if (!resProcess) {
                   console.log('->>>>>>>>>', '审核失败');
@@ -130,7 +135,7 @@ const initSignFunc = () => {
                 return true;
               });
             });
-          } else { //无需盖章流程跳过  
+          } else { //无需盖章流程跳过  直接走审批接口  
             let examineMaps = {
               reason: '',
               ...JSON.parse(examineMap),