diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 8211580..9d9d8f1 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -836,7 +836,11 @@ function showOrHide(data: any) { props.formData.list[i].type == "radio" || props.formData.list[i].type == "select" ) { - radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz); + if(!props.formData.list[i].control.multiple){ + radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz); + }else{ + checkboxShowConfigArr.push(props.formData.list[i].control.glxxsz); + } } else if (props.formData.list[i].type == "checkbox") { checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox); } else if (props.formData.list[i].type == "switch") { @@ -853,7 +857,12 @@ function showOrHide(data: any) { for (let w = 0; w < a.length; w++) { if (a[w].type == "radio" || a[w].type == "select") { //console.log(a[w]) - radioSelectShowConfigArr.push(a[w].control.glxxsz); + if(!a[w].control.multiple){ + radioSelectShowConfigArr.push(a[w].control.glxxsz); + }else{ + checkboxShowConfigArr.push(a[w].control.glxxsz); + } + //radioSelectShowConfigArr.push(a[w].control.glxxsz); } else if (a[w].type == "checkbox") { checkboxShowConfigArr.push(a[w].control.glxxszForCheckBox); } else if (a[w].type == "switch") { @@ -869,7 +878,12 @@ function showOrHide(data: any) { for (let x = 0; x < columns[z].list.length; x++) { let a = JSON.parse(JSON.stringify(columns[z].list[x])); if (a.type == "radio" || a.type == "select") { - radioSelectShowConfigArr.push(a.control.glxxsz); + if(!a.control.multiple){ + radioSelectShowConfigArr.push(a.control.glxxsz); + }else{ + checkboxShowConfigArr.push(a.control.glxxsz); + } + //radioSelectShowConfigArr.push(a.control.glxxsz); } else if (a.type == "checkbox") { checkboxShowConfigArr.push(a.control.glxxszForCheckBox); } else if (a.type == "switch") { @@ -888,7 +902,12 @@ function showOrHide(data: any) { for (let x = 0; x < columns[z].list.length; x++) { let a = JSON.parse(JSON.stringify(columns[z].list[x])); if (a.type == "radio" || a.type == "select") { - radioSelectShowConfigArr.push(a.control.glxxsz); + if(!a.control.multiple){ + radioSelectShowConfigArr.push(a.control.glxxsz); + }else{ + checkboxShowConfigArr.push(a.control.glxxsz); + } + //radioSelectShowConfigArr.push(a.control.glxxsz); } else if (a.type == "checkbox") { checkboxShowConfigArr.push(a.control.glxxszForCheckBox); } else if (a.type == "switch") { @@ -897,9 +916,13 @@ function showOrHide(data: any) { if (a.list.length > 0) { for (let m = 0; m < a.list.length; m++) { let q = JSON.parse(JSON.stringify(a.list[m])); - //console.log(q) if (q.type == "radio" || q.type == "select") { - radioSelectShowConfigArr.push(q.control.glxxsz); + if(!q.control.multiple){ + radioSelectShowConfigArr.push(q.control.glxxsz); + }else{ + checkboxShowConfigArr.push(q.control.glxxsz); + } + //radioSelectShowConfigArr.push(q.control.glxxsz); } else if (q.type == "checkbox") { checkboxShowConfigArr.push(q.control.glxxszForCheckBox); } else if (q.type == "switch") { diff --git a/src/views/knowledge/dataupload/zypfj.vue b/src/views/knowledge/dataupload/zypfj.vue new file mode 100644 index 0000000..a5da9d8 --- /dev/null +++ b/src/views/knowledge/dataupload/zypfj.vue @@ -0,0 +1,145 @@ + + + 作业票及附件上传 + + + + ID: + + + 获取作业票编号 + + + + + + + 作业票编号: + {{ ticketNumber }} + + + + + + + + + {{ fileName || '点击选择PDF文件' }} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/widget/lowcodetransfer/lowcodeTransfer.vue b/src/widget/lowcodetransfer/lowcodeTransfer.vue index b5a6997..cdd3188 100644 --- a/src/widget/lowcodetransfer/lowcodeTransfer.vue +++ b/src/widget/lowcodetransfer/lowcodeTransfer.vue @@ -315,13 +315,17 @@ let resData1 = ref([ // 勾选或者取消勾选 const handleCheckList = (val) => { + //console.log(val) const valId = val.id; - + //console.log(valId) const _node = treeRef?.value?.getNode(valId) + //console.log(_node) + if (!_node) return const _checkList = checkList.value - if (_node.checked) { // 勾选时 + if (_node.checked||_node.childNodes.length > 0) { + //console.log(1) if (_node.checked && _node.childNodes.length === 0) { _checkList.push(_node) } @@ -408,6 +412,8 @@ const expandAll = () => { // 执行tree数据过滤 watch(keyword, (newVal) => { + console.log(keyword) + console.log(newVal) treeRef.value.filter(newVal) })