审批:
-
-
-
+
+
+
@@ -260,6 +266,8 @@
:title="boxOptions.title"
:width="boxOptions.width"
:height="boxOptions.height"
+ :modal="boxOptions.modal"
+ :draggable="boxOptions.draggable"
:padding="0"
:on-model-close="onGridModelClose"
>
@@ -491,7 +499,7 @@ var vueParam = {
import('./ViewGridCustomColumn.vue')
),
'vol-header': defineAsyncComponent(() => import('./../VolHeader.vue')),
- 'audit-his': defineAsyncComponent(() => import('./AuditHis.vue'))
+ 'audit-his': defineAsyncComponent(() => import('./AuditHis.vue'))
},
props: {},
setup(props) {
@@ -607,7 +615,7 @@ var vueParam = {
reason: '', //审核原因
height: 500,
showViewButton: true,
- auditHis:[],
+ auditHis: [],
showAction: false, //是否显示审批操作(当前节点为用户审批时显示)
//审核选项(可自行再添加)
data: [
@@ -638,7 +646,9 @@ var vueParam = {
labelWidth: 100,
height: 0,
width: 0,
- summary: false //弹出框明细table是否显示合计
+ summary: false, //弹出框明细table是否显示合计
+ draggable: false, //2022.09.12弹出框拖动功能
+ modal: true //2022.09.12弹出框背景遮罩层
}, //saveClose新建或编辑成功后是否关闭弹出框//弹出框的标签宽度labelWidth
editor: {
uploadImgUrl: '', //上传路径
diff --git a/Vol.Vue3版本/src/components/basic/VolBox.vue b/Vol.Vue3版本/src/components/basic/VolBox.vue
index 964cf748..06ca7ad9 100644
--- a/Vol.Vue3版本/src/components/basic/VolBox.vue
+++ b/Vol.Vue3版本/src/components/basic/VolBox.vue
@@ -6,9 +6,11 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:width="width"
+ :draggable="draggable"
+ :modal="modal"
:before-close="handleClose"
>
- {{ title }}
+ {{ title }}
@@ -17,7 +19,7 @@
class="srcoll-content"
:style="{ padding: padding + 'px' }"
>
-
+
@@ -36,7 +38,7 @@
diff --git a/开发版dev/Vue.NetCore/Vol.Vue3版本/src/components/basic/ViewGrid/ViewGrid.vue b/开发版dev/Vue.NetCore/Vol.Vue3版本/src/components/basic/ViewGrid/ViewGrid.vue
index 0460b93f..9fdfd87b 100644
--- a/开发版dev/Vue.NetCore/Vol.Vue3版本/src/components/basic/ViewGrid/ViewGrid.vue
+++ b/开发版dev/Vue.NetCore/Vol.Vue3版本/src/components/basic/ViewGrid/ViewGrid.vue
@@ -65,7 +65,13 @@
备 注: {{ item.remark || '-' }}