1

Author: 283591387@qq.com

Vol.Vue/src/views/document/log.vue

@@ -50,6 +50,15 @@ export default {
       active: 0,
       log: [
         { date: '2022.08', type: 'month' },
+        { date: "2022-08-29 04:32:06",desc:"增加审批流程回退功能,更新文件:ServiceBase.cs、WorkFlowManager.cs、Sys_WorkFlowController.cs、前端viewgrid文件夹(回退使用方法见后台开发文档上审批方法)"},
+{ date: "2022-08-29 02:11:03",desc:"优化vue3版本table编辑时数据源类型判断"},
+{ date: "2022-08-29 01:45:31",desc:"优化vue3版本审批时隐藏弹出框其他按钮"},
+{ date: "2022-08-29 01:35:33",desc:"优化vue3版本表单编辑为函数时提交自动计算结果"},
+{ date: "2022-08-29 01:29:53",desc:"修复vue3版本升级后白色与黑色主题颜色显示异常的问题"},
+{ date: "2022-08-29 01:09:52",desc:"优化登陆页字体大小"},
+{ date: "2022-08-29 01:07:11",desc:"修复vue3版本升级后更多按钮图标不显示的问题"},
+{ date: "2022-08-24 21:33:53",desc:"Merge branch 'master' of https://github.com/cq-panda/Vue.NetCore"},
+{ date: "2022-08-24 21:32:19",desc:"优化移动端权限加载顺序"},
         {
           date: '2022-08-22 21:33:00',
           desc: '优化vue3版本表单类型为number时的默认值'

Vol.Vue/src/views/document/netCoreDev.vue

@@ -1313,6 +1313,7 @@ VolElementMenuChild.vue(新增) 、VolElementMenu.vue(新增) 、Index.vue 、co
           content: [
             `<p>
 			<div style="padding:20px;font-size:18px;">此处是SellOrderService为例，如果框架生成的默认功能满足不了需求，请查看下面代码根据需要实现对应功能</div>
+	<p>
 	<div style="color:#D4D4D4;background-color:#1E1E1E;font-family:Consolas, &quot;font-size:14px;">
 		<div>
 			<span style="color:#9cdcfe;">public</span> <span style="color:#9cdcfe;">partial</span> <span style="color:#569cd6;">class</span> <span style="color:#4ec9b0;">SellOrderService</span>
@@ -1379,7 +1380,7 @@ VolElementMenuChild.vue(新增) 、VolElementMenu.vue(新增) 、Index.vue 、co
 			&nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//如果只需要对某个功能生效，如编辑，则在重写编辑方法中设置 IsMultiTenancy = true;</span>
 		</div>
 		<div>
-			&nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#9cdcfe;">IsMultiTenancy</span> = <span style="color:#569cd6;">true</span>;
+			&nbsp; &nbsp; &nbsp; &nbsp;<span style="color:#6a9955;">// IsMultiTenancy = true;</span>
 		</div>
 		<div>
 			&nbsp; &nbsp; }
@@ -2176,6 +2177,25 @@ VolElementMenuChild.vue(新增) 、VolElementMenu.vue(新增) 、Index.vue 、co
 		<div>
 			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }
 		</div>
+		<div>
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+		</div>
+<br />
+		<div>
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//审批流程回退功能，回到第一个审批人重新审批(重新生成审批流程)</span>
+		</div>
+		<div>
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//if (status==AuditStatus.审核未通过||status==AuditStatus.驳回)</span>
+		</div>
+		<div>
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//{</span>
+		</div>
+		<div>
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">// &nbsp; &nbsp;base.RewriteFlow(order);</span>
+		</div>
+		<div>
+			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//}</span>
+		</div>
 <br />
 		<div>
 			&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#c586c0;">return</span> <span style="color:#9cdcfe;">webResponse</span>.<span style="color:#dcdcaa;">OK</span>();
@@ -2390,6 +2410,10 @@ VolElementMenuChild.vue(新增) 、VolElementMenu.vue(新增) 、Index.vue 、co
 			}
 		</div>
 	</div>
+</p>
+<p>
+	<br />
+</p>
 </p>`,
           ],
           tips: `后面扩展实现覆盖了常用业务，请根据需要实现对应方法`,

Vol.Vue3版本/src/components/basic/ViewGrid/methods.js

@@ -1626,9 +1626,12 @@ let methods = {
       this.auditParam.reason = '';
       this.auditParam.status = -1;
       this.auditParam.value = -1;
-      result.his.forEach((item) => {
-        item.auditStatus = this.getAuditStatus(item.auditStatus);
-      });
+      if (result.his) {
+        result.his.forEach((item) => {
+          item.auditStatus = this.getAuditStatus(item.auditStatus);
+        });
+      }
+
       this.auditParam.auditHis = result.his;
       this.workFlowSteps.push(...result.list);
       this.isBoxAudit = true;

开发版dev/Vue.NetCore/Vol.Vue3版本/src/components/basic/ViewGrid/methods.js

@@ -1626,9 +1626,12 @@ let methods = {
       this.auditParam.reason = '';
       this.auditParam.status = -1;
       this.auditParam.value = -1;
-      result.his.forEach((item) => {
-        item.auditStatus = this.getAuditStatus(item.auditStatus);
-      });
+      if (result.his) {
+        result.his.forEach((item) => {
+          item.auditStatus = this.getAuditStatus(item.auditStatus);
+        });
+      }
+
       this.auditParam.auditHis = result.his;
       this.workFlowSteps.push(...result.list);
       this.isBoxAudit = true;