From ba35165bab46691e5863db8010235a5e91621cc3 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 14 Apr 2025 13:06:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=E4=B8=BA=E5=A4=9A=E9=80=89=E6=97=B6,=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

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") {

From a9ccbe20d39ca27d227cb5aa8cfbc715f1eaf4ac Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 14 Apr 2025 14:16:12 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E6=A1=86=E4=B8=AD?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=8A=82=E7=82=B9=E6=A0=91=E4=B8=8B=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=8D=E5=8F=AF=E9=80=89=E8=8A=82=E7=82=B9=E6=97=B6?=
 =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E5=A4=B1=E8=B4=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/lowcodetransfer/lowcodeTransfer.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/widget/lowcodetransfer/lowcodeTransfer.vue b/src/widget/lowcodetransfer/lowcodeTransfer.vue
index b5a6997..813a4d0 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)
         }

From 9824a0d216a2648c3ab0962f555b0267f1344fcd Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 22 Apr 2025 14:01:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A5=A8=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/knowledge/dataupload/zypfj.vue      | 142 ++++++++++++++++++
 .../lowcodetransfer/lowcodeTransfer.vue       |   2 +
 2 files changed, 144 insertions(+)
 create mode 100644 src/views/knowledge/dataupload/zypfj.vue

diff --git a/src/views/knowledge/dataupload/zypfj.vue b/src/views/knowledge/dataupload/zypfj.vue
new file mode 100644
index 0000000..2e5115c
--- /dev/null
+++ b/src/views/knowledge/dataupload/zypfj.vue
@@ -0,0 +1,142 @@
+<template>
+    <div class="container">
+        <h1 style="padding-left: 60px;">作业票附件上传</h1>
+        <!-- 第一行：ID 输入与查询 -->
+        <div class="grid-row" style="--columns: 12; --gap: 20px">
+            <div class="grid-item" style="--span: 6">
+                ID:<el-input v-model="id" placeholder="请输入ID" clearable></el-input>
+            </div>
+            <div class="grid-item" style="--span: 4">
+                <el-button type="primary" @click="getTicketNumber" :loading="loading">获取作业票编号</el-button>
+            </div>
+        </div>
+
+        <!-- 第二行：显示作业票编号 -->
+        <div v-if="ticketNumberFlag" class="grid-row">
+            <div class="grid-item" style="--span: 12">
+                作业票编号：
+                {{ ticketNumber }}
+            </div>
+        </div>
+
+        <!-- 第三行：选择文件 -->
+        <div class="grid-row">
+            <div class="grid-item" style="--span: 12">
+                <el-upload class="upload-demo" :action="downloadUrl" :data="{
+                    id: id,
+                    ticketNumber: ticketNumber
+                }" :disabled="ticketNumber.length == 0" :before-upload="beforeUpload" :on-success="handleSuccess"
+                    :show-file-list="false">
+                    <el-button type="primary" :disabled="ticketNumber.length == 0">
+                        {{ fileName || '点击选择PDF文件' }}
+                    </el-button>
+                    
+                </el-upload>
+            </div>
+        </div>
+
+    </div>
+</template>
+
+
+
+<script setup>
+import { ref, watch } from 'vue';
+import { ElMessage } from 'element-plus'
+import request from '@/utils/request';
+
+// 响应式数据
+const id = ref('')
+const ticketNumberFlag = ref(false)
+const ticketNumber = ref('')
+const uploadDisabled = ref(true)
+const loading = ref(false)
+const fileName = ref('')
+
+// 获取作业票编号（模拟接口）
+const fetchTicket = () => {
+    console.log(id.value)
+    return request({
+        url: '/javasys/dataupload/api/v1/getOTBILLIDById',
+        method: 'post',
+        data: {
+            id: id.value,
+        },
+    });
+}
+const downloadUrl = import.meta.env.VITE_APP_BASE_API + "/javasys/dataupload/api/v1/uploadPDF";
+
+watch(id, (newValue, oldValue) => {
+    console.log('票号变化:', oldValue, '→', newValue);
+    ticketNumber.value = ''
+});
+function getTicketNumber() {
+
+    fetchTicket().then(({ code, data }) => {
+        if (code == 0) {
+            if (data) {
+                ticketNumberFlag.value = true
+                ticketNumber.value = data
+            } else {
+                alert("id有误,请重新输入")
+            }
+        } else {
+            alert("id有误,请重新输入")
+        }
+
+
+    });
+}
+
+
+// 上传前校验
+const beforeUpload = (file) => {
+    if (!ticketNumberFlag.value) {
+        ElMessage.warning('请先获取作业票编号')
+        return false
+    }
+    if (file.type !== 'application/pdf') {
+        ElMessage.error('仅支持上传PDF文件')
+        return false
+    }
+    return true
+}
+
+// 上传成功处理
+const handleSuccess = (response, file) => {
+    fileName.value = file.name
+    ElMessage.success('上传成功')
+    uploadDisabled.value = true  // 上传后禁用按钮
+}
+</script>
+
+<style scoped>
+.container {
+    display: grid;
+    gap: 20px;
+    /* 行间距 */
+    padding: 30px;
+}
+
+.grid-row {
+    display: grid;
+    grid-template-columns: repeat(var(--columns, 12), 1fr);
+    gap: var(--gap, 0);
+}
+
+.grid-item {
+    grid-column: span var(--span, 12);
+    /* 元素对齐方式 */
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    /* 元素内部间距 */
+}
+
+/* 保持原有样式兼容 */
+.row {
+    margin-bottom: 20px;
+}
+
+/* 如果原有样式依赖可以保留 */
+</style>
\ No newline at end of file
diff --git a/src/widget/lowcodetransfer/lowcodeTransfer.vue b/src/widget/lowcodetransfer/lowcodeTransfer.vue
index 813a4d0..cdd3188 100644
--- a/src/widget/lowcodetransfer/lowcodeTransfer.vue
+++ b/src/widget/lowcodetransfer/lowcodeTransfer.vue
@@ -412,6 +412,8 @@ const expandAll = () => {
 
 // 执行tree数据过滤
 watch(keyword, (newVal) => {
+    console.log(keyword)
+    console.log(newVal)
     treeRef.value.filter(newVal)
 })
 

From 1090c9b77ff0250d15e6ca3bce79aae97beddb99 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 23 Apr 2025 10:41:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A5=A8=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=9B=AD=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/knowledge/dataupload/zypfj.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/knowledge/dataupload/zypfj.vue b/src/views/knowledge/dataupload/zypfj.vue
index 2e5115c..a5da9d8 100644
--- a/src/views/knowledge/dataupload/zypfj.vue
+++ b/src/views/knowledge/dataupload/zypfj.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <h1 style="padding-left: 60px;">作业票附件上传</h1>
+        <h1 style="padding-left: 60px;">作业票及附件上传</h1>
         <!-- 第一行：ID 输入与查询 -->
         <div class="grid-row" style="--columns: 12; --gap: 20px">
             <div class="grid-item" style="--span: 6">
@@ -24,7 +24,8 @@
             <div class="grid-item" style="--span: 12">
                 <el-upload class="upload-demo" :action="downloadUrl" :data="{
                     id: id,
-                    ticketNumber: ticketNumber
+                    ticketNumber: ticketNumber,
+                    zypTypeId: zypTypeId
                 }" :disabled="ticketNumber.length == 0" :before-upload="beforeUpload" :on-success="handleSuccess"
                     :show-file-list="false">
                     <el-button type="primary" :disabled="ticketNumber.length == 0">
@@ -52,6 +53,7 @@ const ticketNumber = ref('')
 const uploadDisabled = ref(true)
 const loading = ref(false)
 const fileName = ref('')
+const zypTypeId = ref("")
 
 // 获取作业票编号（模拟接口）
 const fetchTicket = () => {
@@ -76,7 +78,8 @@ function getTicketNumber() {
         if (code == 0) {
             if (data) {
                 ticketNumberFlag.value = true
-                ticketNumber.value = data
+                ticketNumber.value = data.OTBILLID
+                zypTypeId.value = data.zypTypeId
             } else {
                 alert("id有误,请重新输入")
             }
@@ -105,7 +108,7 @@ const beforeUpload = (file) => {
 // 上传成功处理
 const handleSuccess = (response, file) => {
     fileName.value = file.name
-    ElMessage.success('上传成功')
+    ElMessage.success('作业票上传成功')
     uploadDisabled.value = true  // 上传后禁用按钮
 }
 </script>