Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

src/components/process/Contract.vue

@@ -121,7 +121,7 @@
           <el-table :data="formData.data.contractProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
-                <div v-if="row.productId">
+                <div v-if="row.fileUrl">
                   <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>
@@ -484,7 +484,6 @@ import { ElMessage } from "element-plus";
 import Editor from "@/components/Editor/index.vue";
 import selectCity from "@/components/selectCity/index.vue";
 import { useRoute } from "vue-router";
-import Pubsub from "pubsub-js";
 
 const route = useRoute();
 // 接收父组件的传值

src/components/process/EHSD/Contract.vue

@@ -247,7 +247,7 @@
           <el-table :data="formData.data.contractProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
-                <div v-if="row.productId">
+                <div v-if="row.fileUrl">
                   <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>

src/components/process/EHSD/PriceSheet.vue

@@ -196,7 +196,7 @@
           <el-table :data="formData.data.quotationProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
-                <div v-if="row.productId">
+                <div v-if="row.fileUrl">
                   <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>

src/components/process/EHSD/Sample.vue

@@ -247,7 +247,7 @@
           <el-table :data="formData.data.sampleProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
-                <div v-if="row.productId">
+                <div v-if="row.fileUrl">
                   <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>

src/components/process/PriceSheet.vue

@@ -120,7 +120,7 @@
           <el-table :data="formData.data.quotationProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
-                <div v-if="row.productId">
+                <div v-if="row.fileUrl">
                   <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>

src/components/process/ServiceContract.vue

@@ -128,7 +128,7 @@
           <el-table :data="formData.data.serviceContractProductList" style="width: 100%; margin-top: 16px">
             <el-table-column label="商品图片" width="80">
               <template #default="{ row }">
-                <div v-if="row.productId">
+                <div v-if="row.fileUrl">
                   <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
                 </div>
                 <div v-else></div>

src/components/product/SelectGoods.vue

@@ -155,6 +155,19 @@ const getList = async (req = {}) => {
     setTimeout(() => {
       loading.value = false;
     }, 200);
+    const productIdList = message.rows.map((x) => x.id);
+    if (productIdList.length > 0) {
+      proxy.post("/fileInfo/getList", { businessIdList: productIdList }).then((fileObj) => {
+        for (let i = 0; i < sourceList.value.data.length; i++) {
+          const e = sourceList.value.data[i];
+          for (const key in fileObj) {
+            if (e.id === key) {
+              e.fileList = fileObj[key];
+            }
+          }
+        }
+      });
+    }
   });
 };
 getList();