Skip to content

Commit d15e630

Browse files
author
283591387@qq.com
committed
1
1 parent bbb3e5f commit d15e630

File tree

4 files changed

+46
-7
lines changed

4 files changed

+46
-7
lines changed

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

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

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,7 @@ VolElementMenuChild.vue(新增) 、VolElementMenu.vue(新增) 、Index.vue 、co
13131313
content: [
13141314
`<p>
13151315
<div style="padding:20px;font-size:18px;">此处是SellOrderService为例,如果框架生成的默认功能满足不了需求,请查看下面代码根据需要实现对应功能</div>
1316+
<p>
13161317
<div style="color:#D4D4D4;background-color:#1E1E1E;font-family:Consolas, &quot;font-size:14px;">
13171318
<div>
13181319
<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
13791380
&nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//如果只需要对某个功能生效,如编辑,则在重写编辑方法中设置 IsMultiTenancy = true;</span>
13801381
</div>
13811382
<div>
1382-
&nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#9cdcfe;">IsMultiTenancy</span> = <span style="color:#569cd6;">true</span>;
1383+
&nbsp; &nbsp; &nbsp; &nbsp;<span style="color:#6a9955;">// IsMultiTenancy = true;</span>
13831384
</div>
13841385
<div>
13851386
&nbsp; &nbsp; }
@@ -2176,6 +2177,25 @@ VolElementMenuChild.vue(新增) 、VolElementMenu.vue(新增) 、Index.vue 、co
21762177
<div>
21772178
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }
21782179
</div>
2180+
<div>
2181+
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
2182+
</div>
2183+
<br />
2184+
<div>
2185+
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//审批流程回退功能,回到第一个审批人重新审批(重新生成审批流程)</span>
2186+
</div>
2187+
<div>
2188+
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//if (status==AuditStatus.审核未通过||status==AuditStatus.驳回)</span>
2189+
</div>
2190+
<div>
2191+
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//{</span>
2192+
</div>
2193+
<div>
2194+
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">// &nbsp; &nbsp;base.RewriteFlow(order);</span>
2195+
</div>
2196+
<div>
2197+
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color:#6a9955;">//}</span>
2198+
</div>
21792199
<br />
21802200
<div>
21812201
&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
23902410
}
23912411
</div>
23922412
</div>
2413+
</p>
2414+
<p>
2415+
<br />
2416+
</p>
23932417
</p>`,
23942418
],
23952419
tips: `后面扩展实现覆盖了常用业务,请根据需要实现对应方法`,

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,9 +1626,12 @@ let methods = {
16261626
this.auditParam.reason = '';
16271627
this.auditParam.status = -1;
16281628
this.auditParam.value = -1;
1629-
result.his.forEach((item) => {
1630-
item.auditStatus = this.getAuditStatus(item.auditStatus);
1631-
});
1629+
if (result.his) {
1630+
result.his.forEach((item) => {
1631+
item.auditStatus = this.getAuditStatus(item.auditStatus);
1632+
});
1633+
}
1634+
16321635
this.auditParam.auditHis = result.his;
16331636
this.workFlowSteps.push(...result.list);
16341637
this.isBoxAudit = true;

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,9 +1626,12 @@ let methods = {
16261626
this.auditParam.reason = '';
16271627
this.auditParam.status = -1;
16281628
this.auditParam.value = -1;
1629-
result.his.forEach((item) => {
1630-
item.auditStatus = this.getAuditStatus(item.auditStatus);
1631-
});
1629+
if (result.his) {
1630+
result.his.forEach((item) => {
1631+
item.auditStatus = this.getAuditStatus(item.auditStatus);
1632+
});
1633+
}
1634+
16321635
this.auditParam.auditHis = result.his;
16331636
this.workFlowSteps.push(...result.list);
16341637
this.isBoxAudit = true;

0 commit comments

Comments
 (0)