From 7ab78edd2dce38f2a75b9930c03d669a9ab469b3 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 24 十一月 2023 18:01:33 +0800
Subject: [PATCH] 项目表
---
web/packages/components/zt-uploader/src/zt-uploader.vue | 4 ++--
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 6 +++---
web/src/components/table-uploader/src/table-uploader.vue | 17 +++++++++++++----
web/src/views/modules/project/Environ-AddOrUpdate.vue | 4 ++--
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/web/packages/components/zt-uploader/src/zt-uploader.vue b/web/packages/components/zt-uploader/src/zt-uploader.vue
index 7d3c13b..7f9fa0d 100644
--- a/web/packages/components/zt-uploader/src/zt-uploader.vue
+++ b/web/packages/components/zt-uploader/src/zt-uploader.vue
@@ -335,8 +335,8 @@
cropData: {},
isShowCrop: false,
uploading: false,
- fileList: this.getUploadList(this.value),
- uploadList: this.getUploadList(this.value),
+ fileList: this.getUploadList(this.value) || [],
+ uploadList: this.getUploadList(this.value) || [],
progressFlag: false
}
},
diff --git a/web/src/components/table-uploader/src/table-uploader.vue b/web/src/components/table-uploader/src/table-uploader.vue
index 7856c5e..73483a3 100644
--- a/web/src/components/table-uploader/src/table-uploader.vue
+++ b/web/src/components/table-uploader/src/table-uploader.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div class="config-uploader" v-if="oss">
+ <div class="config-uploader1" v-if="oss">
<div v-for="group in (oss.groups || [])" :key="group.busiFieldGroup">
<zt-form-item v-for="field in group.fields" :prop="field.busiField"
:key="field.busiField" :rules="field.isRequired ? 'required':''" style="width: 100%;margin-bottom: 0">
@@ -50,12 +50,12 @@
console.log(this.oss,"this.oss")
// this.dataForm.files = this.oss
this.$set(this.dataForm, 'files', this.oss)
-
// 鍒嗚В鍒版瘡涓瓧娈电粰dataForm璧嬪��
this.fields.forEach(field => {
// this.dataForm[field.busiField] = field.files
this.$set(this.dataForm, field.busiField, field.files)
})
+ console.log(this.dataForm,'this.dataForm')
}
}
},
@@ -102,8 +102,17 @@
}
</script>
<style>
-.config-uploader label {
- width: 260px !important;
+.config-uploader1 label {
+ width: 30px !important;
+}
+.config-uploader1 a{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 180px;
+}
+.config-uploader1 .zt-upload {
+ line-height: 0;
}
.zt .el-upload-list__item .el-progress{
top:15px !important;
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 6b96d83..59a3e4e 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -1,5 +1,5 @@
<template>
- <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <zt-dialog ref="dialog" column="3" @confirm="formSubmit">
<el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
<div class="">
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
@@ -74,11 +74,11 @@
<el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="80" align="center">
+ <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
<template v-slot="{ row }">
<!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>-->
<table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
- v-model="row.files"/>
+ v-model="row.files"/>
</template>
</el-table-column>
</el-table>
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
index 343c843..9a52aad 100644
--- a/web/src/views/modules/project/Environ-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -291,8 +291,8 @@
})
},
getImageUrl(url){
- this.image.url = url
- console.log(this.image.url,' this.image.url')
+ this.dataForm.url = url
+ console.log(this.dataForm.url,' this.dataForm.url')
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
--
Gitblit v1.9.1