From 698ca761c9cc4eec92e24553bde44410774f8cc6 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 26 Aug 2024 17:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manufacturerconfirmAdd.vue                | 45 +++++++++++++++----
 .../manufacturerconfirmInfo.vue               |  4 +-
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
index 2381d842eb..1ab798464e 100644
--- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
+++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
@@ -41,14 +41,14 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="span-sty">附件</div>
-            <el-form-item class="trightb_item">
-              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-                v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
-              </el-image>
+            <div class="span-sty"><span class="must">*</span> 附件</div>
+            <el-form-item prop="imgList">
+              <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
+                :upload-data="{ type: '0001' }" @change="backData" />
             </el-form-item>
           </el-col>
 
+
         </el-row>
 
         <el-row>
@@ -65,8 +65,8 @@
           style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
           <div>已返厂旧件列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
+          style="width: 100%;" :row-style="{height: '40px'}">
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
           <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
@@ -97,15 +97,18 @@
 
 <script>
   import req from '@/api/storage/manufacturerconfirm.js'
-
+  import uploadImg from '@/components/uploadFile/uploadImg'
   export default {
-    components: {},
+    components: {
+      uploadImg
+    },
     data() {
       return {
         listLoading: false,
         submitdisabled: false,
         title: "新增",
         formobj: {},
+        imgList: [],
         rules: {
           filePaths: [{
             required: true,
@@ -133,6 +136,11 @@
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data
+              for (var i = 0; i < resp.data.filePaths.length; i++) {
+                this.imgList.push({
+                  url: resp.data.filePaths[i].url
+                })
+              }
             }
           })
           .catch(e => {
@@ -155,6 +163,17 @@
           .catch(e => {
             this.formobj = {}
           })
+      },
+      backData(value) {
+        console.log('backData》》》》', value)
+        console.log('imgList', this.imgList)
+        this.imgList = value
+
+        for (var i = 0; i < this.imgList.length; i++) {
+          this.formobj.filePaths.push(this.imgList[i].url)
+        }
+
+
       },
       commodityComputeYHAndXSJE(row) {
 
@@ -190,6 +209,14 @@
   }
 </script>
 <style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
   .span-sty {
     width: 130px !important;
   }
diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
index 9880a8af5b..25e49a6d6d 100644
--- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
+++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
@@ -81,8 +81,8 @@
           style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
           <div>已返厂旧件列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
+          style="width: 100%;" :row-style="{height: '40px'}">
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
           <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />