Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml

@@ -18,7 +18,9 @@
 </style>
 @Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css")
 <div class="lr-layout-panel-btn">
-    <a id="print" class="btn btn-primary">打印表单</a>
+    @*<a id="print" class="btn btn-primary">打印表单</a>*@
+    @*流程任务-打印表单*@
+    <a id="print2" class="btn btn-primary">打印表单</a>
 </div>
 <div class="lr-layout-panel">
     <div class="tab-pane" id="forminfo">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js

@@ -8,6 +8,7 @@
 var processId = request('processId');      // 流程实例主键
 var nodeId = request('nodeId');            // 流程节点
 var schemeObj2;
+var nodeInfoList = [];  //审核节点部分，流程任务-打印表单需要使用
 
 var bootstrap = function ($, learun) {
     "use strict";
@@ -240,6 +241,36 @@ var bootstrap = function ($, learun) {
                 $.print('.lr-layout-panel');
             });
             $('#print').show();
+            // 流程任务-打印表单
+            $('#print2').on('click', function () {
+                var $iframes = $('#form_list_iframes');
+                var iframeId = $iframes.find('.form-list-iframe.active').attr('id');
+                //表单部分
+                let res = [];
+                if (iframeId) {
+                    var $iframe = learun.iframe(iframeId, frames);
+                    res = $iframe.$('body').lrGetFormShow();
+                } else {
+                    res = $iframes.lrGetFormShow();
+                }
+                //审核部分
+                let anodeinfoList = [];
+                for (var i = 0; i < nodeInfoList.length; i++) {
+                    var nodeItem = nodeInfoList[i];
+                    if (nodeItem.title != "开始") {
+                        var anodeinfo = {
+                            type: 'anodeinfo',
+                            title: nodeItem.title,
+                            content: nodeItem.content,
+                            date: nodeItem.time,
+                            user: nodeItem.people,
+                        };
+                        anodeinfoList.push(anodeinfo);
+                    }
+                }
+                $.jqprintForm(res.concat(anodeinfoList));
+            });
+            $('#print2').show();
         },
         // iframe 加载
         iframeLoad: function (iframeId, url, callback, formData) {
@@ -256,7 +287,11 @@ var bootstrap = function ($, learun) {
                 }
 
                 if (!!iframeObj.$) {
-                    callback(iframeObj, formData);
+                    //callback(iframeObj, formData);
+                    //优化系统表单中的数据无法回显问题；
+                    setTimeout(function () {
+                        callback(iframeObj, formData);
+                    }, 10);
                 }
             };
 
@@ -405,6 +440,7 @@ var bootstrap = function ($, learun) {
 
                                 nodelist.push(point);
                             }
+                            nodeInfoList = nodelist;
                             $('#wf_timeline').lrtimelineEsc(nodelist);
                         }
                     });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml

@@ -74,8 +74,8 @@
                 </div>
             </div>
             <div class="col-xs-12 lr-form-item flow-item" style="padding:0;" id="flow-des">
-                <div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">审批意见<font face="宋体">*</font></div>
-                <textarea id="des" class="form-control" style="height: 120px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+                <div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">审批意见</div>
+                <textarea id="des" class="form-control" style="height: 120px;"></textarea>
             </div>
             <div class="col-xs-12 flow-btn">
                 <a id="release" class="btn btn-success">创建流程</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js

@@ -86,11 +86,11 @@ var bootstrap = function ($, learun) {
                     nwflow.initAgainCreate();
                     break;
                 case 'audit':// 审批
-                    $("#des").attr('isvalid', 'yes');
+                    //$("#des").attr('isvalid', 'yes');
                     nwflow.initAudit();
                     break;
                 case 'signAudit':// 加签审批
-                    $("#des").attr('isvalid', 'yes');
+                    //$("#des").attr('isvalid', 'yes');
                     nwflow.initSignAudit();
                     break;
                 case 'refer': // 查阅

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1650,6 +1650,10 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Index.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\StampDetailIndex.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.css" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Index.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\StampDetailIndex.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\Form.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormClaim.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormView.js" />
@@ -8289,6 +8293,9 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Index.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\StampDetailIndex.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -168,6 +168,8 @@
 	<add key="QJUrl" value="www.qj.com"/>
 	<!--系主任角色Id-->
 	<add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
+  <!--学校签章使用权角色Id 流程审批时是否有使用学校签章的权限；-->
+  <add key="StampRightRoleId" value="cf0dc3da-3706-41ec-9032-02d1f4650d3b"/>
 	<!-- 登录次数限制：登录连续错误要禁止登录 -->
 	<add key="ForbidLoginNum" value="5"/>
 	<!-- 禁止登录时间（分钟） -->

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj

@@ -227,6 +227,7 @@
     <Compile Include="Modules\RepairReport\RepairReportTeacherApi.cs" />
     <Compile Include="Modules\RepairReport\RepairReportStudentApi.cs" />
     <Compile Include="Modules\SSOApi.cs" />
+    <Compile Include="Modules\StampPersonalApi.cs" />
     <Compile Include="Modules\StuEnrollOfficialApi.cs" />
     <Compile Include="Modules\AnnexesNoLoginApi.cs" />
     <Compile Include="Modules\AssetManagementSystem\Ass_AssetsInfoItemApi.cs" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs

@@ -191,7 +191,7 @@ namespace Learun.Application.WebApi
             ReqParameter req = this.Bind<ReqParameter>();
             loginMark = req.loginMark;
             token = req.token;
-            if (path == "/learun/adms/user/login"|| path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img"||path== "/learun/adms/user/imgfordc"||path== "/learun/adms/timetable/timeTableData"||path== "/quanjiang/sso/authorize")
+            if (path == "/learun/adms/user/login" || path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img" || path == "/learun/adms/user/imgfordc" || path == "/learun/adms/timetable/timeTableData" || path == "/quanjiang/sso/authorize" || path == "/learun/adms/StampPersonal/img")
             {// 登录接口，默认页面接口不做权限验证处理
                 return null;
             }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config

@@ -11,6 +11,8 @@
     <typeAlias alias="INodeMethod" type=" Learun.Application.WorkFlow.INodeMethod, Learun.Application.WorkFlow" />
     <typeAlias alias="NodeMethod" type=" Learun.Application.WorkFlow.NodeMethod, Learun.Application.WorkFlow" />
     <typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="ArrangeLessonTermAttemperMethod" type="Learun.Application.WorkFlow.ArrangeLessonTermAttemperMethod,Learun.Application.WorkFlow" />
+
 
     <!--任务调度器-->
     <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
@@ -29,6 +31,7 @@
     <container name="WfIOCcontainer">
       <type type="INodeMethod" mapTo="NodeMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="ArrangeLessonTermAttemperMethod" name="ArrangeLessonTermAttemperMethod"></type>
 
     </container>
     <container name="TsIOCcontainer">

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -111,6 +111,8 @@
   <add key="OnlineElectiveLessonApplyMax" value="2" />
   <!--系主任角色Id-->
   <add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
+  <!--学校签章使用权角色Id 流程审批时是否有使用学校签章的权限；-->
+  <add key="StampRightRoleId" value="cf0dc3da-3706-41ec-9032-02d1f4650d3b"/>
   <!--最早上课打卡时间（分钟）-->
   <add key="StuAttendanceEarliestMinute" value="15" />
   

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -13,9 +13,9 @@ export default {
   // "webHost":"http://1.190.222.34:9000/",
   //本地：
   "apiHost": [
-  	  "http://localhost:8088/"
+  	  "http://192.168.10.58:8003/"
   ],
-  "webHost":"http://localhost:8087/",
+  "webHost":"http://192.168.10.58:8004/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
     { username: "system", password: "www.qj.com" }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue

@@ -47,7 +47,7 @@
 				<l-button @click="clearcom" color="red" style="margin-right: 15px;">清空签章</l-button>
 			</view>
 		</template>
-		<l-textarea v-model="remark" :placeholder="`输入${typeText}意见`" title="审核意见：" required />
+		<l-textarea v-model="remark" :placeholder="`输入${typeText}意见`" title="审核意见：" />
 
 		<!-- 弹层 -->
 		<l-modal v-model="modal" @close="reviewer = ''" title="指派审核人">
@@ -314,10 +314,10 @@
 					return
 				}
 
-				if (!this.remark) {
-					this.TOAST(`请签署审批意见`)
-					return false;
-				}
+				// if (!this.remark) {
+				// 	this.TOAST(`请签署审批意见`)
+				// 	return false;
+				// }
 
 				this.submitDisable = true
 				uni.showLoading({

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue

@@ -309,7 +309,9 @@ export default {
         processId: currentTask.F_ProcessId,
         taskId: currentTask.F_Id,
         formreq: postData.formreq,
-        taskName: this.currentTask.F_Title
+        taskName: this.currentTask.F_Title,
+		currentNode:this.currentNode,
+		schemeCode:this.code||''
       }
       // 不是加签
       if (action.code !== '__sign__') {