herenshan112
/
ShutongInterconnectedChemicalCloudPlatform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'lwx_v17' 

# Conflicts:
#	src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
#	src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
#	src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
qin_15
hreenshan112 9 months ago
parent
d9c94409bf f82ba543ea
commit
8986d779d1
8 changed files with 975 additions and 446 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      src/components/DesignForm/app/index.vue
  2. 4
      src/components/DesignForm/assembly/index.ts
  3. 51
      src/components/DesignForm/formControlPropertiNew.vue
  4. 104
      src/components/DesignForm/tableListPage/index.vue
  5. 50
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
  6. 171
      src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
  7. 200
      src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
  8. 35
      src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

86
src/components/DesignForm/app/index.vue
View File

@ -74,6 +74,7 @@ const props = withDefaults(
viewPage?: viewPageType; viewPage?: viewPageType;
formBasicConfig?: any; formBasicConfig?: any;
fieldsDetailList?:any; fieldsDetailList?:any;
orgAndManTree?:any;
}>(), }>(),
{ {
showPage: true, showPage: true,
@ -119,6 +120,9 @@ const props = withDefaults(
fieldsDetailList: () => { fieldsDetailList: () => {
return {}; return {};
}, },
orgAndManTree: () => {
return {};
},
} }
); );
const emits = defineEmits<{ const emits = defineEmits<{
@ -321,6 +325,7 @@ let checkboxs: any[] = [];
let switchs: any[] = []; let switchs: any[] = [];
let selects: any[] = []; let selects: any[] = [];
let tables: any[] = []; let tables: any[] = [];
let dofs: any[] = [];//deptOrgAndOrgCententAndFounderArr
function getAsfs() { function getAsfs() {
//setTimeout(() => { //setTimeout(() => {
let dataList = ref({}); let dataList = ref({});
@ -337,7 +342,9 @@ function getAsfs() {
switchs.push(dataList.value[i]) switchs.push(dataList.value[i])
} else if(dataList.value[i].type == "select"){ } else if(dataList.value[i].type == "select"){
selects.push(dataList.value[i]) selects.push(dataList.value[i])
} else if ( } else if(dataList.value[i].type == "deptOrg"||dataList.value[i].type == "orgCentent"||dataList.value[i].type == "founder"){//||dataList.value[i].type == "owner"拥有者,"expand-user"选择用户
dofs.push(dataList.value[i])
}else if (
dataList.value[i].type == "card" || dataList.value[i].type == "card" ||
dataList.value[i].type == "flex" || dataList.value[i].type == "flex" ||
dataList.value[i].type == "div" || dataList.value[i].type == "div" ||
@ -358,6 +365,8 @@ function getAsfs() {
switchs.push(element) switchs.push(element)
}else if(element.type == "select"){ }else if(element.type == "select"){
selects.push(element) selects.push(element)
}else if(element.type == "deptOrg"||element.type == "orgCentent"||element.type == "founder"){
dofs.push(element)
} }
}); });
} else if (dataList.value[i].type == "grid") { } else if (dataList.value[i].type == "grid") {
@ -378,6 +387,8 @@ function getAsfs() {
switchs.push(a) switchs.push(a)
}else if(a.type == "select"){ }else if(a.type == "select"){
selects.push(a) selects.push(a)
}else if(a.type == "deptOrg"||a.type == "orgCentent"||a.type == "founder"){
dofs.push(a)
} }
} }
} }
@ -400,6 +411,8 @@ function getAsfs() {
switchs.push(a) switchs.push(a)
}else if(a.type == "select"){ }else if(a.type == "select"){
selects.push(a) selects.push(a)
}else if(a.type == "deptOrg"||a.type == "orgCentent"||a.type == "founder"){
dofs.push(a)
}else if (a.type == "flex" || a.type == "table") { }else if (a.type == "flex" || a.type == "table") {
if (a.type == "table") { if (a.type == "table") {
tables.push(dataList.value[i]); tables.push(dataList.value[i]);
@ -419,6 +432,8 @@ function getAsfs() {
switchs.push(q) switchs.push(q)
}else if(q.type == "select"){ }else if(q.type == "select"){
selects.push(q) selects.push(q)
}else if(q.type == "deptOrg"||q.type == "orgCentent"||q.type == "founder"){
dofs.push(q)
} }
} }
} }
@ -448,6 +463,36 @@ function convertStringToArray(str: string) {
let parts = str.split(','); let parts = str.split(',');
return parts.map(part => parseFloat(part)); return parts.map(part => parseFloat(part));
} }
interface Tree {
id?: string;
label: string;
disabled?: boolean;
children?: Tree[];
parentId?: string;
[key: string]: any;
}
function getLabelById(id: string): string | undefined {
//console.log(id)
const treeNodes = props.orgAndManTree;
const findLabel = (nodes: Tree[]): string | undefined => {
for (const node of nodes) {
// 检查当前节点是否匹配目标id
if (node.id === id) {
return node.label;
}
// 递归遍历子节点
if (node.children?.length) {
const found = findLabel(node.children);
if (found) return found;
}
}
return undefined;
};
return findLabel(treeNodes);
}
//liwenxuan 20250120 二维码 end //liwenxuan 20250120 二维码 end
@ -477,6 +522,12 @@ const setUpClick = (val: string, id: string) => {
text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改 text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改
}); });
//console.log(props.formBasicConfig) //console.log(props.formBasicConfig)
if(props.formBasicConfig.qrCodeFlag==true){
if(props.formBasicConfig.qrCodeInside==true){
if(props.formBasicConfig.qrCodePrintStyle&&props.formBasicConfig.qrCodePrintStyle=="2"&&props.formBasicConfig.qrCodeShowFields.length==0){
alert("未选择表格展示字段")
return
}
//请求数据 //请求数据
let getDetailQrCodesData: any = {} let getDetailQrCodesData: any = {}
let currentFieldsMapArrObj: any = {} let currentFieldsMapArrObj: any = {}
@ -526,6 +577,15 @@ const setUpClick = (val: string, id: string) => {
} }
} }
}); });
//console.log(dofs)
dofs.forEach(function(element) {
if(attr_name==element.name){
//表格属性中存在此单选,将其value根据options替换为可读值
let toConvertValue = currentFieldsMap[attr_name].split("!@#@!")[1]
let orgName = getLabelById(toConvertValue)
currentFieldsMap[attr_name] = currentFieldsMap[attr_name].split("!@#@!")[0]+"!@#@!"+orgName
}
});
switchs.forEach(function(element) { switchs.forEach(function(element) {
if(attr_name==element.name){ if(attr_name==element.name){
//表格属性中存在此单选,将其value根据options替换为可读值 //表格属性中存在此单选,将其value根据options替换为可读值
@ -641,10 +701,16 @@ const setUpClick = (val: string, id: string) => {
loadingInstance1.close() loadingInstance1.close()
} }
})/* .finally(()=>{ }).finally(()=>{
loadingInstance1.close() loadingInstance1.close()
qrCodesPrintDialogFlag.value = true })
}) */ }else{
alert("内部二维码功能未启用")
}
}else{
alert("请先为本表单开启二维码功能")
}
}else{ }else{
alert("未选中任何一条,请先选择") alert("未选中任何一条,请先选择")
@ -889,6 +955,7 @@ const getPageData = () => {
switchs = []; switchs = [];
selects = []; selects = [];
tables = []; tables = [];
dofs = [];
getAsfs() getAsfs()
}); });
} }
@ -1940,9 +2007,9 @@ const transformOption = (val: string | number, type?: string) => {
title="生成的二维码" title="生成的二维码"
:show-close="false" :show-close="false"
style="margin-top: 10px" style="margin-top: 10px"
width="50%" width="40%"
> >
<div v-if="formBasicConfig.qrCodePrintStyle == '2'" style="min-height: 50px; max-height: 750px; overflow-y: auto"> <div v-if="formBasicConfig.qrCodePrintStyle == '2'" style="max-width: 600px;min-height: 50px; max-height: 750px; overflow-y: auto">
<div <div
v-for="(tableData, tableKey) in tablesData" v-for="(tableData, tableKey) in tablesData"
:id="tableKey" :id="tableKey"
@ -1952,8 +2019,8 @@ const transformOption = (val: string | number, type?: string) => {
> >
<table> <table>
<tr> <tr>
<th style="font-weight: bold; font-size:medium;" colspan="2">{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}</th> <th colspan="2">{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}</th>
<th rowspan="6"><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th> <td rowspan="6" style="width: 240px;"><img :src="tableData.bufferedImage" alt="二维码" width="200px" style="margin-top: 5px;" ></td>
</tr> </tr>
<tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex"> <tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex">
<th>{{ item.key }}</th> <th>{{ item.key }}</th>
@ -2065,10 +2132,13 @@ const transformOption = (val: string | number, type?: string) => {
table { table {
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
font-size: 13px;
text-align: center
} }
td, th { td, th {
border: 1px solid black; border: 1px solid black;
padding: 8px; padding: 8px;
vertical-align: middle; /* 设置文字上下居中 */
} }
</style> </style>

4
src/components/DesignForm/assembly/index.ts
View File

@ -217,7 +217,9 @@ export default [
iconFont: 'fa-text-width', iconFont: 'fa-text-width',
control: { control: {
// 组件所有属性 // 组件所有属性
modelValue: '' modelValue: '',
scanInputFlag: false,
scanType:'',
}, },
config: {}, // 其他配置信息 config: {}, // 其他配置信息
styles: { styles: {

51
src/components/DesignForm/formControlPropertiNew.vue
View File

@ -527,6 +527,7 @@ const attrList = computed(() => {
path: "config.append", path: "config.append",
vShow: ["input", "password", "digitpage"], vShow: ["input", "password", "digitpage"],
}, },
// { // {
// label: '状态打开时的值', // label: '状态打开时的值',
// value: control.activeValue, // value: control.activeValue,
@ -733,6 +734,14 @@ const attrList = computed(() => {
vIf: state.isSearch, vIf: state.isSearch,
vShow: ["associatedForms"], vShow: ["associatedForms"],
}, },
{
label: "移动端扫描输入",
value: config.scanInput,
path: "config.scanInput",
type: "input",
vIf: state.isSearch,
vShow: ["input"],
},
{ {
label: "隐藏条件", label: "隐藏条件",
value: config.associatedForms, value: config.associatedForms,
@ -3377,6 +3386,19 @@ const gainFormGroupList = () => {
} }
}); });
}; };
//liwenxuan 2025 移动端单选扫描输入功能 start
const scanTypes = [
{
value: 'QrCode',
label: '二维码',
},
{
value: 'OCR',
label: '光学字符识别',
},
]
//liwenxuan 2025 移动端单选扫描输入功能 end
let asfs: any[] = []; let asfs: any[] = [];
let asfsExpectCurrent: any[] = []; let asfsExpectCurrent: any[] = [];
@ -4233,6 +4255,35 @@ const updataBase = (val: any) => {
> >
</el-row> </el-row>
<el-row v-else-if="item.type === 'input'"><!-- 移动端扫描输入 -->
<el-switch v-model="controlData.control.scanInputFlag" />
<div
v-if="controlData.control.scanInputFlag"
style="
display: flex;
width: auto;
margin-top: 33px;
margin-left: -125px;
padding-bottom: 6px;
"
>
<div style="margin-right: 12px;">扫描方式</div>
<el-select
v-model="controlData.control.scanType"
style="width: 150px; height:20px">
<el-option
v-for="scanType in scanTypes"
:key="scanType.value"
:label="scanType.label"
:value="scanType.value"
/>
</el-select>
</div>
</el-row>
<el-row v-else-if="item.type === 'associatedForms_dataRange'"> <el-row v-else-if="item.type === 'associatedForms_dataRange'">
<el-button <el-button
v-if="controlData.control.dataRangeConditionHtml === ''" v-if="controlData.control.dataRangeConditionHtml === ''"

104
src/components/DesignForm/tableListPage/index.vue
View File

@ -70,6 +70,7 @@ const props = withDefaults(
viewPage?: viewPageType; viewPage?: viewPageType;
formBasicConfig?: any; formBasicConfig?: any;
fieldsDetailList?:any; fieldsDetailList?:any;
orgAndManTree?:any;
}>(), }>(),
{ {
showPage: true, showPage: true,
@ -112,6 +113,9 @@ const props = withDefaults(
fieldsDetailList: () => { fieldsDetailList: () => {
return {}; return {};
}, },
orgAndManTree: () => {
return {};
},
} }
); );
const emits = defineEmits<{ const emits = defineEmits<{
@ -314,6 +318,8 @@ let checkboxs: any[] = [];
let switchs: any[] = []; let switchs: any[] = [];
let selects: any[] = []; let selects: any[] = [];
let tables: any[] = []; let tables: any[] = [];
let dofs: any[] = [];//deptOrgAndOrgCententAndFounderArr
function getAsfs() { function getAsfs() {
//setTimeout(() => { //setTimeout(() => {
let dataList = ref({}); let dataList = ref({});
@ -330,7 +336,9 @@ function getAsfs() {
switchs.push(dataList.value[i]) switchs.push(dataList.value[i])
} else if(dataList.value[i].type == "select"){ } else if(dataList.value[i].type == "select"){
selects.push(dataList.value[i]) selects.push(dataList.value[i])
} else if ( } else if(dataList.value[i].type == "deptOrg"||dataList.value[i].type == "orgCentent"||dataList.value[i].type == "founder"){//||dataList.value[i].type == "owner"拥有者,"expand-user"选择用户
dofs.push(dataList.value[i])
}else if (
dataList.value[i].type == "card" || dataList.value[i].type == "card" ||
dataList.value[i].type == "flex" || dataList.value[i].type == "flex" ||
dataList.value[i].type == "div" || dataList.value[i].type == "div" ||
@ -351,6 +359,8 @@ function getAsfs() {
switchs.push(element) switchs.push(element)
}else if(element.type == "select"){ }else if(element.type == "select"){
selects.push(element) selects.push(element)
}else if(element.type == "deptOrg"||element.type == "orgCentent"||element.type == "founder"){
dofs.push(element)
} }
}); });
} else if (dataList.value[i].type == "grid") { } else if (dataList.value[i].type == "grid") {
@ -371,6 +381,8 @@ function getAsfs() {
switchs.push(a) switchs.push(a)
}else if(a.type == "select"){ }else if(a.type == "select"){
selects.push(a) selects.push(a)
}else if(a.type == "deptOrg"||a.type == "orgCentent"||a.type == "founder"){
dofs.push(a)
} }
} }
} }
@ -393,6 +405,8 @@ function getAsfs() {
switchs.push(a) switchs.push(a)
}else if(a.type == "select"){ }else if(a.type == "select"){
selects.push(a) selects.push(a)
}else if(a.type == "deptOrg"||a.type == "orgCentent"||a.type == "founder"){
dofs.push(a)
}else if (a.type == "flex" || a.type == "table") { }else if (a.type == "flex" || a.type == "table") {
if (a.type == "table") { if (a.type == "table") {
tables.push(dataList.value[i]); tables.push(dataList.value[i]);
@ -412,6 +426,8 @@ function getAsfs() {
switchs.push(q) switchs.push(q)
}else if(q.type == "select"){ }else if(q.type == "select"){
selects.push(q) selects.push(q)
}else if(q.type == "deptOrg"||q.type == "orgCentent"||q.type == "founder"){
dofs.push(q)
} }
} }
} }
@ -425,7 +441,6 @@ function getAsfs() {
//}, 500); //}, 500);
} }
function convertStringToArray(str: string) { function convertStringToArray(str: string) {
if (typeof str!== 'string') { if (typeof str!== 'string') {
throw new Error('Input must be a string.'); throw new Error('Input must be a string.');
@ -442,6 +457,45 @@ function convertStringToArray(str: string) {
return parts.map(part => parseFloat(part)); return parts.map(part => parseFloat(part));
} }
interface Tree {
id?: string;
label: string;
disabled?: boolean;
children?: Tree[];
parentId?: string;
[key: string]: any;
}
function getLabelById(id: string): string | undefined {
//console.log(id)
const treeNodes = props.orgAndManTree;
const findLabel = (nodes: Tree[]): string | undefined => {
for (const node of nodes) {
// 检查当前节点是否匹配目标id
if (node.id === id) {
return node.label;
}
// 递归遍历子节点
if (node.children?.length) {
const found = findLabel(node.children);
if (found) return found;
}
}
return undefined;
};
return findLabel(treeNodes);
}
function isAllCharactersNumbers(str: string) {
// 遍历字符串中的每个字符
for (let i = 0; i < str.length; i++) {
// 检查当前字符是否不是数字字符
if (isNaN(parseInt(str[i], 10))) {
return false;
}
}
return true;
}
//liwenxuan 20250120 二维码 end //liwenxuan 20250120 二维码 end
@ -467,6 +521,14 @@ const setUpClick = (val: string, id: string) => {
text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改 text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改
}); });
//console.log(props.formBasicConfig) //console.log(props.formBasicConfig)
if(props.formBasicConfig.qrCodeFlag==true){
if(props.formBasicConfig.qrCodeInside==true){
if(props.formBasicConfig.qrCodePrintStyle&&props.formBasicConfig.qrCodePrintStyle=="2"&&props.formBasicConfig.qrCodeShowFields.length==0){
alert("未选择表格展示字段")
return
}
//请求数据 //请求数据
let getDetailQrCodesData: any = {} let getDetailQrCodesData: any = {}
let currentFieldsMapArrObj: any = {} let currentFieldsMapArrObj: any = {}
@ -516,6 +578,20 @@ const setUpClick = (val: string, id: string) => {
} }
} }
}); });
//console.log(dofs)
dofs.forEach(function(element) {
if(attr_name==element.name){
//表格属性中存在此单选,将其value根据options替换为可读值
let toConvertValue = currentFieldsMap[attr_name].split("!@#@!")[1]
//console.log(toConvertValue)
if(isAllCharactersNumbers(toConvertValue)){
let orgName = getLabelById(toConvertValue)
currentFieldsMap[attr_name] = currentFieldsMap[attr_name].split("!@#@!")[0]+"!@#@!"+orgName
}
}
});
switchs.forEach(function(element) { switchs.forEach(function(element) {
if(attr_name==element.name){ if(attr_name==element.name){
//表格属性中存在此单选,将其value根据options替换为可读值 //表格属性中存在此单选,将其value根据options替换为可读值
@ -631,10 +707,16 @@ const setUpClick = (val: string, id: string) => {
loadingInstance1.close() loadingInstance1.close()
} }
})/* .finally(()=>{ }).finally(()=>{
loadingInstance1.close() loadingInstance1.close()
qrCodesPrintDialogFlag.value = true })
}) */
}else{
alert("内部二维码功能未启用")
}
}else{
alert("请先为本表单开启二维码功能")
}
}else{ }else{
alert("未选中任何一条,请先选择") alert("未选中任何一条,请先选择")
@ -1952,9 +2034,9 @@ const diGuiJilian = (val: any, options: any[]) => {
title="生成的二维码" title="生成的二维码"
:show-close="false" :show-close="false"
style="margin-top: 10px" style="margin-top: 10px"
width="50%" width="40%"
> >
<div v-if="formBasicConfig.qrCodePrintStyle == '2'" style="min-height: 50px; max-height: 750px; overflow-y: auto"> <div v-if="formBasicConfig.qrCodePrintStyle == '2'" style="max-width: 600px;min-height: 50px; max-height: 750px; overflow-y: auto">
<div <div
v-for="(tableData, tableKey) in tablesData" v-for="(tableData, tableKey) in tablesData"
:id="tableKey" :id="tableKey"
@ -1964,8 +2046,8 @@ const diGuiJilian = (val: any, options: any[]) => {
> >
<table> <table>
<tr> <tr>
<th style="font-weight: bold; font-size:medium;" colspan="2">{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}</th> <th colspan="2">{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}</th>
<th rowspan="6"><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th> <td rowspan="6" style="width: 240px;"><img :src="tableData.bufferedImage" alt="二维码" width="200px" style="margin-top: 5px;" ></td>
</tr> </tr>
<tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex"> <tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex">
<th>{{ item.key }}</th> <th>{{ item.key }}</th>
@ -2087,11 +2169,15 @@ const diGuiJilian = (val: any, options: any[]) => {
table { table {
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
font-size: 13px;
text-align: center;
} }
td, th { td, th {
border: 1px solid black; border: 1px solid black;
padding: 8px; padding: 8px;
vertical-align: middle; /* 设置文字上下居中 */
} }
</style> </style>

50
src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
View File

@ -5,6 +5,7 @@
--> -->
<script lang='ts' setup> <script lang='ts' setup>
import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form' import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
import request from "@/utils/request";
import { gainAppPageInfo,getFieldRecord } from '@/api/DesignForm/requestapi' import { gainAppPageInfo,getFieldRecord } from '@/api/DesignForm/requestapi'
import { Edit,Picture as IconPicture } from '@element-plus/icons-vue' import { Edit,Picture as IconPicture } from '@element-plus/icons-vue'
import { appPageDataInit,appWorkFlow } from "@/api/date/type" import { appPageDataInit,appWorkFlow } from "@/api/date/type"
@ -207,6 +208,7 @@ const handleAppPageClick = () =>{
@ 功能: 获取表单初始化信息 @ 功能: 获取表单初始化信息
*/ */
const gainAppFormPageInit = () =>{ const gainAppFormPageInit = () =>{
if(props.menusInfo.id){ if(props.menusInfo.id){
@ -380,6 +382,36 @@ const gainAppFormPageInit = () =>{
} }
} }
//liwenxuan 二维码表格组织人员名称显示 start
interface Tree {
id?: string;
label: string;
disabled?: boolean;
children?: Tree[];
parentId?: string;
[key: string]: any;
}
const orgAndManTree = ref<Tree[]>();
function getAssociatedFormsOrgAndManTree() {
return request({
url: "/javasys/lowCode/transfer/getOrgAndManTree",
method: "post",
});
}
getAssociatedFormsOrgAndManTree().then(({ data }) => {
let resData = ref(data.children);
orgAndManTree.value = [
{
id: data.id,
//label: data.label,
label: "组织机构",
children: [...resData.value],
},
];
});
//liwenxuan 二维码表格组织人员名称显示 end
function optionsValue3Get3(data: any,fieldName: string){ function optionsValue3Get3(data: any,fieldName: string){
//console.log("openAppFormPage","optionsValue3Get3") //console.log("openAppFormPage","optionsValue3Get3")
@ -415,11 +447,24 @@ function optionsValue3Get3(data: any,fieldName: string){
//} //}
} }
defineExpose({ defineExpose({
gainAppFormPageInit gainAppFormPageInit
}) })
/* onMounted(() => {
getAssociatedFormsOrgAndManTree().then(({ data }) => {
let resData = ref(data.children);
orgAndManTree.value = [
{
id: data.id,
//label: data.label,
label: "组织机构",
children: [...resData.value],
},
];
});
});
*/
/* function optionsValue5Get5(data:any,fieldName:any){ /* function optionsValue5Get5(data:any,fieldName:any){
//console.log("openAppFormPage","optionsValue5Get5") //console.log("openAppFormPage","optionsValue5Get5")
@ -485,6 +530,7 @@ defineExpose({
:viewPage="stateList.view" :viewPage="stateList.view"
:form-basic-config="stateForm.formData.form" :form-basic-config="stateForm.formData.form"
:fields-detail-list="stateForm.formData.list" :fields-detail-list="stateForm.formData.list"
:org-and-man-tree = "orgAndManTree"
@optionsValue5Get5="optionsValue5Get5" @optionsValue5Get5="optionsValue5Get5"
/> />
<ak-form <ak-form

171
src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
View File

@ -596,8 +596,97 @@ const initLoadData = () => {
} }
}; };
<<<<<<< HEAD
function optionsValue3Get3(data: any, fieldName: string) { function optionsValue3Get3(data: any, fieldName: string) {
/* console.log(data) /* console.log(data)
=======
Promise.all(getFieldRecordPromise).then(()=>{
console.log(gainAppPageInfoData)
let objMastesformStr = JSON.stringify(objMastesform);
gainAppPageInfoData.data.appForm.mastesform = objMastesform
gainAppPageInfoData.data.appForm.mastesformjson = objMastesformStr
appInitData.value = gainAppPageInfoData.data
// console.log("获取初始化表单数据---!",appInitData.value)
mastesformjson.value = gainAppPageInfoData.data.appForm.mastesformjson
isFlow.value = gainAppPageInfoData.data.appForm.flowIsOpen
versionId.value = gainAppPageInfoData.data.appForm.id.toString()
versionTitle.value = gainAppPageInfoData.data.appForm.name
if(gainAppPageInfoData.data.page){
// console.log("data.data.mastesform", data.data)
stateForm.id=gainAppPageInfoData.data.appForm.version.toString()
stateForm.formId =gainAppPageInfoData.data.appForm.cfid.toString()
stateForm.versionId =gainAppPageInfoData.data.appForm.id.toString()
stateForm.formData = objMastesform
stateForm.formData.config.hideField = []//暂时的修复方法:接口返回的config中没有hideField属性,手动添加
stateForm.dict = string2json(gainAppPageInfoData.data.appForm.dict)
stateForm.formData.powerstr = string2json(gainAppPageInfoData.data.appForm.powerstr)
// console.log("data.data.mastesform", stateForm.formData)
judgeSubmitCancel({"name":gainAppPageInfoData.data.appForm.mastesformjson})
.then((datajud:any) =>{
if(datajud.code == 0){
if (datajud.data == 3 || datajud.data == 4){
stateForm.formData.list.push(submitButton)
}
}
})
}
});
});
}
}
//liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 start
let qrCodeImgInside = ""
const qrCodeInsideDialogFlag = ref(false)
function showFillFormQrCode(){
//查看二维码展示弹窗图片,图片带有分组,app,表单名称,和二维码图片
//在此获取必要的参数并请求后台,获取二维码图片,当图片返回成功时,显示弹窗
//必要的参数为cfid
if(stateForm.formData.form.qrCodeFlag==true&&stateForm.formData.form.qrCodeInside==true){
getQrCodeImgInside().then(({ data }) => {
qrCodeImgInside = data
if(qrCodeInsideDialogFlag.value==false){
//console.log(qrCodeImgInside)
qrCodeInsideDialogFlag.value = true
}
})
}else{
alert("请先开启表单二维码功能")
}
}
function getQrCodeImgInside() {
return request({
url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
method: "post",
data: {
cfid: stateForm.formId,
},
});
}
//liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 end
function optionsValue3Get3(data: any,fieldName: string){
/* console.log(data)
>>>>>>> lwx_v17
console.log(fileName) console.log(fileName)
console.log("appTableFlow","optionsValue3Get3") */ console.log("appTableFlow","optionsValue3Get3") */
for (let i = 0; i < stateForm.formData.list.length; i++) { for (let i = 0; i < stateForm.formData.list.length; i++) {
@ -611,6 +700,7 @@ function optionsValue3Get3(data: any, fieldName: string) {
} }
</script> </script>
<template> <template>
<<<<<<< HEAD
<el-drawer <el-drawer
v-model="drawerOpenOrClose" v-model="drawerOpenOrClose"
v-loading="loadingData" v-loading="loadingData"
@ -677,6 +767,22 @@ function optionsValue3Get3(data: any, fieldName: string) {
/> />
</div> </div>
<!-- <AppFormPage <!-- <AppFormPage
=======
<el-drawer v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
<!-- liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 start -->
<!-- 自定义抽屉头部 -->
<template #header>
<div v-if="stateForm.formData.form.qrCodeFlag==true&&stateForm.formData.form.qrCodeInside==true" class="drawer-header" >
{{versiontitle}}
<div class="flex-grow"></div>
<el-button size="small" style="margin-right: 15px" @click="showFillFormQrCode" >扫码填单</el-button>
</div>
</template>
<!-- liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 end -->
<!-- <AppFormPage
>>>>>>> lwx_v17
ref="formEl" ref="formEl"
:number="props.pickAppMenu.id" :number="props.pickAppMenu.id"
@ -707,6 +813,7 @@ function optionsValue3Get3(data: any, fieldName: string) {
:after-submit="afterSubmit" :after-submit="afterSubmit"
add-url="addData" add-url="addData"
@optionsValue3Get3="optionsValue3Get3" @optionsValue3Get3="optionsValue3Get3"
<<<<<<< HEAD
/> --> /> -->
</el-drawer> </el-drawer>
</template> </template>
@ -732,5 +839,69 @@ function optionsValue3Get3(data: any, fieldName: string) {
cursor: pointer; cursor: pointer;
} }
} }
=======
/>
</el-drawer>
<el-dialog
v-model="qrCodeInsideDialogFlag"
class="glxxsztc"
top="150px"
:close-on-click-modal="false"
title="内部二维码"
:show-close="false"
style="margin-top: 70px"
width="25%"
>
<img :src="qrCodeImgInside" style="width: 80%;height: 50%;" />
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="qrCodeInsideDialogFlag = false">
确定
</el-button>
</div>
</template>
</el-dialog>
</template>
<style lang='scss' scoped>
.common-layout{
height: calc(100vh - 55px);
padding: 0 15px;
.el-main{
height: calc(100vh - 55px);
padding:0;
}
.flowBox{
height: calc(100vh - 55px);
border-left: 1px solid #ccc;
padding: 0 15px;
}
.el-header{
padding:0 10px;
line-height:30px;
text-align:right;
font-size:20px;
i{
cursor:pointer;
}
}
.drawer-header {
display: flex;
align-items: center;
//padding: 12px;
}
.flex-grow {
/* 占据剩余的可用空间，将后面的元素推到右边 */
flex-grow: 1;
}
.drawer-close {
cursor: pointer;
//margin-left: 8px;
}
>>>>>>> lwx_v17
} }
</style> </style>

200
src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
View File

@ -415,65 +415,104 @@ const closeAppSubmit = () => {
@ 时间: 2024-04-09 16:50:37 @ 时间: 2024-04-09 16:50:37
@ 功能: 保存草稿 @ 功能: 保存草稿
*/ */
const saveDraftPage = (type: string, val?: any) => { const saveDraftPage = (type: string,val?:any) => {
if (type === "success") { if (type === 'success') {
emits("searchquery"); emits("searchquery")
if (isFlowTable.value) { if(isFlowTable.value){
if (val.code == 0) { if(val.code == 0){
let sendInfo = { let sendInfo ={
id: val.data.uuid, id:val.data.uuid,
flowList: flowMap.value, flowList:flowMap.value,
state: 1, state:1
}; }
startRunFlow(sendInfo).then((data: any) => { startRunFlow(sendInfo)
.then((data:any)=>{
// console.log("流程提交成功--------1---------->",data) // console.log("流程提交成功--------1---------->",data)
}); })
} }
} }
} }
closeAppSubmit(); closeAppSubmit()
}; }
//liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 start
let qrCodeImgInside = ""
const qrCodeInsideDialogFlag = ref(false)
function showFillFormQrCode(){
//查看二维码展示弹窗图片,图片带有分组,app,表单名称,和二维码图片
//在此获取必要的参数并请求后台,获取二维码图片,当图片返回成功时,显示弹窗
//必要的参数为cfid
if(state.formData.form.qrCodeFlag==true&&state.formData.form.qrCodeInside==true){
getQrCodeImgInside().then(({ data }) => {
qrCodeImgInside = data
if(qrCodeInsideDialogFlag.value==false){
//console.log(qrCodeImgInside)
qrCodeInsideDialogFlag.value = true
}
})
}else{
alert("请先开启表单二维码功能")
}
}
function optionsValue3Get3(data: any, fieldName: string) { function getQrCodeImgInside() {
return request({
url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
method: "post",
data: {
cfid: state.id,
},
});
}
//liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 end
function optionsValue3Get3(data: any,fieldName: string){
//console.log("tableFlow","optionsValue3Get3") //console.log("tableFlow","optionsValue3Get3")
if (fieldName.startsWith("childTable---")) {
let tableAndFieldNameArr = fieldName.split("---"); if(fieldName.startsWith("childTable---")){
for (let i = 0; i < state.formData.list.length; i++) { let tableAndFieldNameArr = fieldName.split("---")
if (state.formData.list[i].name == tableAndFieldNameArr[1]) { for(let i = 0; i < state.formData.list.length; i++){
for (let u = 0; u < state.formData.list[i].list.length; u++) { if(state.formData.list[i].name==tableAndFieldNameArr[1]){
if (state.formData.list[i].list[u].name == tableAndFieldNameArr[2]) { for(let u = 0; u < state.formData.list[i].list.length; u++){
state.formData.list[i].list[u].options = []; if(state.formData.list[i].list[u].name==tableAndFieldNameArr[2]){
for (let j = 0; j < data.length; j++) { state.formData.list[i].list[u].options = []
state.formData.list[i].list[u].options.push(data[j]); for(let j = 0;j<data.length;j++){
state.formData.list[i].list[u].options.push(data[j])
} }
} }
} }
} }
} }
} else { }else{
for (let i = 0; i < state.formData.list.length; i++) { for(let i = 0; i < state.formData.list.length; i++){
if (state.formData.list[i].name == fieldName) { if(state.formData.list[i].name==fieldName){
state.formData.list[i].options = []; state.formData.list[i].options = []
for (let j = 0; j < data.length; j++) { for(let j = 0;j<data.length;j++){
state.formData.list[i].options.push(data[j]); state.formData.list[i].options.push(data[j])
} }
} }
} }
} }
} }
/*
*/
</script> </script>
<template> <template>
<el-drawer <el-drawer v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
v-model="drawerOpenOrClose" <!-- liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 start -->
v-loading="loadingData" <!-- 自定义抽屉头部 -->
:title="versiontitle" <template #header>
:close-on-click-modal="false" <div v-if="state.formData.form.qrCodeFlag==true&&state.formData.form.qrCodeInside==true" class="drawer-header" >
:close-on-press-escape="false" {{versiontitle}}
:destroy-on-close="true" <div class="flex-grow"></div>
:size="drawbox" <el-button size="small" style="margin-right: 15px" @click="showFillFormQrCode" >扫码填单</el-button>
class="drawerClass" </div>
> </template>
<!-- liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 end -->
<div v-if="isFlowTable" class="common-layout"> <div v-if="isFlowTable" class="common-layout">
<el-container> <el-container>
<el-main v-loading="formLoading" element-loading-text="Loading..."> <el-main v-loading="formLoading" element-loading-text="Loading...">
@ -493,28 +532,18 @@ function optionsValue3Get3(data: any, fieldName: string) {
:save-draft-page="saveDraftPage" :save-draft-page="saveDraftPage"
/> />
</el-main> </el-main>
<el-aside <el-aside v-loading="flowLoading" element-loading-text="Loading..." width="350px" class="flowBox">
v-loading="flowLoading"
element-loading-text="Loading..."
width="350px"
class="flowBox"
>
<el-text size="large">审批流程</el-text> <el-text size="large">审批流程</el-text>
<FlowStep <FlowStep v-model:flow-map="flowMap" :next-step="nextStep" :current-progress="currentProgress" :node-key="nodeKey" />
v-model:flow-map="flowMap"
:next-step="nextStep"
:current-progress="currentProgress"
:node-key="nodeKey"
/>
</el-aside> </el-aside>
</el-container> </el-container>
</div> </div>
<!--无流程表单--> <!--无流程表单-->
<div v-else class="common-layout"> <div v-else class="common-layout">
<ak-form <ak-form
ref="formEl" ref="formEl"
v-loading="formLoading" v-loading="formLoading" element-loading-text="Loading..."
element-loading-text="Loading..."
:form-data="state.formData" :form-data="state.formData"
:type="formType" :type="formType"
:numrun="formType" :numrun="formType"
@ -529,29 +558,68 @@ function optionsValue3Get3(data: any, fieldName: string) {
@optionsValue3Get3="optionsValue3Get3" @optionsValue3Get3="optionsValue3Get3"
/> />
</div> </div>
</el-drawer> </el-drawer>
<el-dialog
v-model="qrCodeInsideDialogFlag"
class="glxxsztc"
top="150px"
:close-on-click-modal="false"
title="内部二维码"
:show-close="false"
style="margin-top: 70px"
width="25%"
>
<img :src="qrCodeImgInside" style="width: 80%;height: 50%;" />
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="qrCodeInsideDialogFlag = false">
确定
</el-button>
</div>
</template>
</el-dialog>
</template> </template>
<style lang="scss" scoped> <style lang='scss' scoped>
.common-layout { .common-layout{
height: calc(100vh - 55px); height: calc(100vh - 55px);
padding: 0 15px; padding: 0 15px;
.el-main { .el-main{
height: calc(100vh - 55px); height: calc(100vh - 55px);
padding: 0; padding:0;
} }
.flowBox { .flowBox{
height: calc(100vh - 55px); height: calc(100vh - 55px);
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
padding: 0 15px; padding: 0 15px;
} }
.el-header { .el-header{
padding: 0 10px; padding:0 10px;
line-height: 30px; line-height:30px;
text-align: right; text-align:right;
font-size: 20px; font-size:20px;
i { i{
cursor: pointer; cursor:pointer;
}
} }
.drawer-header {
display: flex;
align-items: center;
//padding: 12px;
} }
.flex-grow {
/* 占据剩余的可用空间，将后面的元素推到右边 */
flex-grow: 1;
}
.drawer-close {
cursor: pointer;
//margin-left: 8px;
}
} }
</style> </style>

35
src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
View File

@ -15,6 +15,7 @@ import {
gainAppPageInfo, gainAppPageInfo,
getFieldRecord, getFieldRecord,
} from "@/api/DesignForm/requestapi"; } from "@/api/DesignForm/requestapi";
import request from "@/utils/request";
import { Edit, Picture as IconPicture } from "@element-plus/icons-vue"; import { Edit, Picture as IconPicture } from "@element-plus/icons-vue";
import { appPageDataInit, appWorkFlow } from "@/api/date/type"; import { appPageDataInit, appWorkFlow } from "@/api/date/type";
import { import {
@ -324,6 +325,37 @@ watch(
} }
); );
//liwenxuan 二维码表格组织人员名称显示 start
interface Tree {
id?: string;
label: string;
disabled?: boolean;
children?: Tree[];
parentId?: string;
[key: string]: any;
}
const orgAndManTree = ref<Tree[]>();
function getAssociatedFormsOrgAndManTree() {
return request({
url: "/javasys/lowCode/transfer/getOrgAndManTree",
method: "post",
});
}
getAssociatedFormsOrgAndManTree().then(({ data }) => {
let resData = ref(data.children);
orgAndManTree.value = [
{
id: data.id,
//label: data.label,
label: "组织机构",
children: [...resData.value],
},
];
});
//liwenxuan 二维码表格组织人员名称显示 end
function optionsValue3Get3(data: any, fieldName: string) { function optionsValue3Get3(data: any, fieldName: string) {
console.log("runAppForm", "optionsValue3Get3"); console.log("runAppForm", "optionsValue3Get3");
for (let i = 0; i < stateForm.formData.list.length; i++) { for (let i = 0; i < stateForm.formData.list.length; i++) {
@ -335,6 +367,8 @@ function optionsValue3Get3(data: any, fieldName: string) {
} }
} }
} }
</script> </script>
<template> <template>
<el-row> <el-row>
@ -357,6 +391,7 @@ function optionsValue3Get3(data: any, fieldName: string) {
:viewPage="stateList.view" :viewPage="stateList.view"
:form-basic-config="stateForm.formData.form" :form-basic-config="stateForm.formData.form"
:fields-detail-list="stateForm.formData.list" :fields-detail-list="stateForm.formData.list"
:org-and-man-tree = "orgAndManTree"
/> />
<!-- <AppFormPage <!-- <AppFormPage
v-else v-else

Write Preview
Loading…
Cancel
Save