浏览代码

fix: 商用工程登录调整

Howie 1 年之前
父节点
当前提交
857d39e65c

+ 5 - 1
src/components/Common/image-upload.vue

@@ -33,6 +33,7 @@
           </el-image>
           <div v-show="item.hover" class="mask">
             <i v-if="checkFileType(item.url) == 'image'" class="el-icon-zoom-in" @click="previewImage(item.url)" />
+            <i v-if="checkFileType(item.url) != 'image'" class="el-icon-zoom-in" @click="previewVideo(item.url)" />
             <i class="el-icon-upload2" @click="uploadImage(item.url)" />
             <i class="el-icon-delete" @click="deleteImage(item.url)" />
           </div>
@@ -154,7 +155,10 @@ export default {
       const fileSuffix = name.substring(name.lastIndexOf('.') + 1)
       return `${date}${uuid}.${fileSuffix}`
     },
-
+   //预览视频
+   previewVideo(url){
+      window.open(this.$imageUrl+url)
+    },
     // 检查文件类型
     checkFileType(url) {
       if (!url) return ''

+ 23 - 7
src/views/commercialEngineering/components/examine.vue

@@ -30,7 +30,7 @@
                 <el-button slot="append" @click="handleFocus">引入</el-button>
               </el-input>
             </el-col>
-            <template v-if="isTradeExaminer">
+            <template v-if="(pageType == 'home' && !isCustomer) ||  (['frock', 'cross'].includes(pageType) && isTradeExaminer)">
               <el-col :span="7" class="flex-box">
               <div class="flex-box-title">经销商编号</div>
               <el-input
@@ -41,7 +41,6 @@
                 clearable
               />
               <CopyButton :copyText="formData.successCustomerNumber" />
-
             </el-col>
             <el-col :span="7" class="flex-box">
               <div class="flex-box-title">经销商名称</div>
@@ -95,8 +94,8 @@
         <el-col :xs="24" :sm="24" :lg="24" class="item">
           <div class="label" style="height: auto">审核上传</div>
           <div class="value" style="height: auto">
-            <ImageUpload v-if="module !== 'detail'" class="mg-b" :file-list="formData.files" />
-            <template v-else>
+            <ImageUpload v-if="module !== 'detail'" class="mg-b" :file-list="formData.files"  :multiple="true"/>
+            <!-- <template v-else>
               <div
                 v-for="item in formData.files"
                 :key="item.fileUrl"
@@ -134,7 +133,7 @@
                   <img v-if="checkFileType(item.fileUrl) == 'file'" class="file aaa" src="@/assets/common/zip.jpeg">
                 </div>
               </div>
-            </template>
+            </template> -->
             <div style="margin-left: 20px">注:可上传文件、附件</div>
           </div>
         </el-col>
@@ -206,12 +205,15 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['isTradeExaminer'])
+    ...mapGetters(['isTradeExaminer', 'isCustomer'])
   },
   watch: {
     async 'formData.id'(newValue, oldValue) {
-      console.log(3333)
+      if(this.formData.files.length){
+        this.showImage(this.formData.files)
+      }
        this.getData()
+
     }
   },
   methods: {
@@ -230,6 +232,20 @@ export default {
       this.showDialog = true
     },
     onSbumit() {},
+    showImage(arr = []) {
+      const newArr = []
+      arr &&
+        arr.forEach(k => {
+          if (k.fileUrl && k.fileUrl !== '0') {
+            newArr.push({
+              hover: true,
+              name: '',
+              url: k.fileUrl
+            })
+          }
+        })
+      return newArr
+    },
     // 检查文件类型
     checkFileType(url) {
       if (!url) return ''

+ 1 - 1
src/views/commercialEngineering/crossDistrict/crossDistrictkList.vue

@@ -187,7 +187,7 @@ export default {
                 underline={false}
                 onClick={() => {
                   const page = this.$router.resolve({
-                    path: '/commercialEngineering/frockList',
+                    path: '/commercialEngineering/crossDistrictkList',
                     query: {
                       detailId: row.id,
                       module: 'detail'

+ 1 - 1
src/views/commercialEngineering/homeDecoration/homeDecorationList.vue

@@ -193,7 +193,7 @@ export default {
                 underline={false}
                 onClick={() => {
                   const page = this.$router.resolve({
-                    path: '/commercialEngineering/frockList',
+                    path: '/commercialEngineering/homeDecorationList',
                     query: {
                       detailId: row.id,
                       module: 'detail'