Merge remote-tracking branch 'origin/master'

one_stop_public/models/affairModels.js

@@ -188,6 +188,20 @@ const myCollect = {
 				callback(response);
 			}
 		},
+
+    //26708 学生事务/请假管理/请假申请，202002050943 辅导员在手机端填写的审批原因 在这个表中没有体现出来
+    *getIdFormDetailNoNeedShowForm({ payload, callback }, { call, put }) {
+      const response = yield call(getHistoryFormDetail, {
+        ...payload,
+      });
+      if (response == null) {
+        yield put({ type: 'nom' });
+        return;
+      }
+      if (callback) {
+        callback(response);
+      }
+    },
 		/**
 		 * 删除草稿
 		 * @param {ids } 表单ids

one_stop_public/models/callbackExamineProcess.js

 export function callbackSubmitData(infoData) {
   // console.log(infoData);
   if (window.callbackSubmitInfoZhiYong && typeof window.callbackSubmitInfoZhiYong === 'function') {
+    // console.log('审核回调开始执行', JSON.stringify(infoData));
     infoData = window.callbackSubmitInfoZhiYong({ // 返回新的值就行了.
       postData: infoData, //
     });