HC_YFZX
/
CaiYuanYiTiHua
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

zzq
刘妍 2024-06-18 14:21:12 +08:00
parent ec8f828c08 cf2e56868c
commit 2c8af2da8c
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/FormViewer/index.vue
View File

@ -428,7 +428,8 @@
} }
// 存储创建人、创建时间等内容 // 存储创建人、创建时间等内容
if (createOrModifyList.value.length > 0) { if (createOrModifyList.value.length > 0) {
createOrModifyList.value.forEach((item) => { createOrModifyList.value.forEach((childTab) => {
childTab.forEach(item => {
if (!item.componentProps.disabled) { if (!item.componentProps.disabled) {
if (item.type == 'createuser' || item.type == 'modifyuser') { if (item.type == 'createuser' || item.type == 'modifyuser') {
query[item.field] = userName; query[item.field] = userName;
@ -436,6 +437,7 @@
query[item.field] = nowTime.value; query[item.field] = nowTime.value;
} }
} }
})
}); });
} }
return query; return query;

3
src/components/ProcessDesigner/package/penal/PropertiesPanel.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div :class="prefixCls" :style="{ width: `${props.width}px` }"> <div :class="prefixCls" style="width: 30%">
<a-tabs v-model:activeKey="configActiveName"> <a-tabs v-model:activeKey="configActiveName">
<a-tab-pane :tab="data.wfNodeName" key="1"> <a-tab-pane :tab="data.wfNodeName" key="1">
<!-- 开始节点 --> <!-- 开始节点 -->
@ -582,6 +582,7 @@
::v-deep .ant-tabs-content-holder { ::v-deep .ant-tabs-content-holder {
overflow-y: auto; overflow-y: auto;
padding-right: 10px;
} }
.hidden { .hidden {

7
src/views/demo/onlineform/formCall/CreateOrModifyComponent/index.vue
View File

@ -2,7 +2,7 @@
<a-row v-if="isTime && show" style="width:100%;margin-bottom:10px;"> <a-row v-if="isTime && show" style="width:100%;margin-bottom:10px;">
<a-col flex="100px" style="display: flex;align-items: center;justify-content: right;padding-right: 7px;">{{ props.data.label }}</a-col> <a-col flex="100px" style="display: flex;align-items: center;justify-content: right;padding-right: 7px;">{{ props.data.label }}</a-col>
<a-col flex="auto"> <a-col flex="auto">
<a-input v-model:value="nowTime" readOnly> <a-input v-model:value="nowTime" readOnly :disabled="disabled">
<template #suffix> <template #suffix>
<FieldTimeOutlined /> <FieldTimeOutlined />
</template> </template>
@ -12,7 +12,7 @@
<a-row v-else-if="!isTime && show" style="width:100%;margin-bottom:10px;" > <a-row v-else-if="!isTime && show" style="width:100%;margin-bottom:10px;" >
<a-col flex="100px" style="display: flex;align-items: center;justify-content: right;padding-right: 7px;">{{ props.data.label }}</a-col> <a-col flex="100px" style="display: flex;align-items: center;justify-content: right;padding-right: 7px;">{{ props.data.label }}</a-col>
<a-col flex="auto"> <a-col flex="auto">
<a-input v-model:value="userName" readOnly> <a-input v-model:value="userName" readOnly :disabled="disabled">
<template #suffix> <template #suffix>
<UserOutlined /> <UserOutlined />
</template> </template>
@ -28,7 +28,8 @@ import { ref, defineProps, onMounted } from 'vue'
import { UserOutlined, FieldTimeOutlined } from '@ant-design/icons-vue'; import { UserOutlined, FieldTimeOutlined } from '@ant-design/icons-vue';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
const props = defineProps(['data', 'createOrModifyData', 'isUpdate', 'isDetail']) const props = defineProps(['data', 'createOrModifyData', 'isUpdate', 'isDetail'])
const show = props.data.display const show = props.data.display && (Object.keys(props.data).includes('ifShow')? props.data.ifShow: true)
const disabled = Object.keys(props.data.componentProps).includes('disabled')? props.data.componentProps.disabled: false
const isTime = ['createtime', 'modifytime'].includes(props.data.type) const isTime = ['createtime', 'modifytime'].includes(props.data.type)
const nowTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss')) const nowTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'))
const userName = ref(localStorage.getItem('fireUserLoginName')) const userName = ref(localStorage.getItem('fireUserLoginName'))