From 01483ff91788b58162bc32fd2072f32490b78fdd Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 20 May 2024 14:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/uploadFile/uploadImg.vue   | 23 +++++++++----------
 .../purchase/procurement/procurementAdd.vue   | 10 ++++----
 .../workFlow/caigouFlow/procurementEdit.vue   |  8 ++++---
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/yxt-as-ui/src/components/uploadFile/uploadImg.vue b/yxt-as-ui/src/components/uploadFile/uploadImg.vue
index 384d5207da..2721bedb56 100644
--- a/yxt-as-ui/src/components/uploadFile/uploadImg.vue
+++ b/yxt-as-ui/src/components/uploadFile/uploadImg.vue
@@ -100,23 +100,22 @@ export default {
     }
   },
   methods: {
-    showImg(imgList) {
-      this.stateName = 'xunidingjinAdd'
-      this.files = imgList
-      console.log('回显图片', this.files)
-    },
-    view() {
-      // window.open(this.filedUrl)
-    },
     // 页面第一次加载
     Init() {
       if (this.name !== undefined) {
         this.files = []
         for (var i = 0; i < this.name.length; i++) {
-          this.files.push({
-            name: this.name[i],
-            url: this.name[i]
-          })
+          if (this.name[i].url !== null && this.name[i].url !== undefined) {
+            this.files.push({
+              name: this.name[i].name,
+              url: this.name[i].url
+            })
+          } else {
+            this.files.push({
+              name: this.name[i],
+              url: this.name[i]
+            })
+          }
         }
       }
     },
diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
index 086d7f9599..c7077e6841 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
@@ -163,7 +163,7 @@
               <el-col :span="24">
                 <div class="span-sty">附件</div>
                 <el-form-item>
-                  <upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="formobj.purchasePay.filePaths" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+                  <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.purchasePay.filePaths" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -222,9 +222,9 @@
 
 <script>
 import req from '@/api/purchase/procurement'
+import uploadImg from '@/components/uploadFile/uploadImg'
 import { typeValues, getOrgSidByPath, choiceSupplierInfo } from '@/api/Common/dictcommons'
 import chooseproducts from './relation/chooseproducts'
-import uploadImg from '@/components/uploadFile/uploadImg'
 
 export default {
   name: 'ProcurementAdd',
@@ -657,7 +657,9 @@ export default {
 /deep/ .el-form-item__error {
   margin-left: 120px !important;
 }
-/deep/ .el-radio-group {
-  font-size: 1px;
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
 }
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
index af79d136b8..7a9174ab1f 100644
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
@@ -221,9 +221,9 @@
 
 <script>
 import req from '@/api/purchase/procurement'
-import { typeValues, getOrgSidByPath, choiceSupplierInfo } from '@/api/Common/dictcommons'
-import chooseproducts from './relation/chooseproducts'
 import uploadImg from '@/components/uploadFile/uploadImg'
+import { typeValues, choiceSupplierInfo } from '@/api/Common/dictcommons'
+import chooseproducts from './relation/chooseproducts'
 
 export default {
   name: 'ProcurementEdit',
@@ -596,6 +596,8 @@ export default {
   margin-left: 120px !important;
 }
 /deep/ .el-radio-group {
-  font-size: 1px;
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
 }
 </style>