Browse Source

Merge branch 'lwx_v24'

han_v1
herenshan112 7 months ago
parent
commit
b1f4faa176
  1. 25
      src/components/DesignForm/public/form/form.vue
  2. 145
      src/views/knowledge/dataupload/zypfj.vue
  3. 10
      src/widget/lowcodetransfer/lowcodeTransfer.vue

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

145
src/views/knowledge/dataupload/zypfj.vue

@ -0,0 +1,145 @@
<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,
zypTypeId: zypTypeId
}" :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 zypTypeId = 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.OTBILLID
zypTypeId.value = data.zypTypeId
} 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>

10
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)
})

Loading…
Cancel
Save