From c717fdbe7a6b3abb91739018e2bcc567b31c7547 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 2 Aug 2024 20:06:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6key?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/cpts/process-form-complete.vue      | 24 +++++++-------
 .../event/cpts/process-form-contact.vue       | 16 ++++-----
 .../event/cpts/process-form-process.vue       | 33 +++++--------------
 3 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue
index 6e0e4a776..548ff1a89 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue
@@ -375,11 +375,11 @@ export default {
       if (res.code === 0 && res.msg === "success") {
         console.log("res.data.url", res.data.url);
         this.audioList.push({
-          format: file.name.split(".").pop(),
-          name: file.name,
+          attachmentFormat: file.name.split(".").pop(),
+          attachmentName: file.name,
           size: file.size,
-          type: file.raw.type,
-          url: res.data.url,
+          attachmentType: file.raw.type,
+          attachmentUrl: res.data.url,
         });
         console.log(this.formData.files);
       } else {
@@ -407,11 +407,11 @@ export default {
       if (res.code === 0 && res.msg === "success") {
         console.log("res.data.url", res.data.url);
         this.imgList.push({
-          format: file.name.split(".").pop(),
-          name: file.name,
+          attachmentFormat: file.name.split(".").pop(),
+          attachmentName: file.name,
           size: file.size,
-          type: file.raw.type,
-          url: res.data.url,
+          attachmentType: file.raw.type,
+          attachmentUrl: res.data.url,
         });
         console.log(this.formData.files);
       } else {
@@ -432,11 +432,11 @@ export default {
       if (res.code === 0 && res.msg === "success") {
         console.log("res.data.url", res.data.url);
         this.examineImgList.push({
-          format: file.name.split(".").pop(),
-          name: file.name,
+          attachmentFormat: file.name.split(".").pop(),
+          attachmentName: file.name,
           size: file.size,
-          type: file.raw.type,
-          url: res.data.url,
+          attachmentType: file.raw.type,
+          attachmentUrl: res.data.url,
         });
         console.log(this.formData.files);
       } else {
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-contact.vue b/src/views/modules/shequzhili/event/cpts/process-form-contact.vue
index f927eba52..dc9510a87 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-contact.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-contact.vue
@@ -179,11 +179,11 @@ export default {
             if (res.code === 0 && res.msg === "success") {
                 console.log("res.data.url", res.data.url);
                 this.audioList.push({
-                    format: file.name.split(".").pop(),
-                    name: file.name,
+                    attachmentFormat: file.name.split(".").pop(),
+                   attachmentName: file.name,
                     size: file.size,
-                    type: file.raw.type,
-                    url: res.data.url,
+                    attachmentType: file.raw.type,
+                    attachmentUrl: res.data.url,
                 });
             } else {
                 this.$message.error(res.msg);
@@ -209,11 +209,11 @@ export default {
             if (res.code === 0 && res.msg === "success") {
                 console.log("res.data.url", res.data.url);
                 this.imgList.push({
-                    format: file.name.split(".").pop(),
-                    name: file.name,
+                    attachmentFormat: file.name.split(".").pop(),
+                   attachmentName: file.name,
                     size: file.size,
-                    type: file.raw.type,
-                    url: res.data.url,
+                    attachmentType: file.raw.type,
+                    attachmentUrl: res.data.url,
                 });
             } else {
                 this.$message.error(res.msg);
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-process.vue b/src/views/modules/shequzhili/event/cpts/process-form-process.vue
index 58ffb2df0..eca8e9af8 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-process.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-process.vue
@@ -195,11 +195,11 @@ export default {
             if (res.code === 0 && res.msg === "success") {
                 console.log("res.data.url", res.data.url);
                 this.imgList.push({
-                    format: file.name.split(".").pop(),
-                    name: file.name,
+                    attachmentFormat: file.name.split(".").pop(),
+                    attachmentName: file.name,
                     size: file.size,
-                    type: file.raw.type,
-                    url: res.data.url,
+                    attachmentType: file.raw.type,
+                    attachmentUrl: res.data.url,
                 });
                 console.log(this.imgList);
             } else {
@@ -226,11 +226,11 @@ export default {
             if (res.code === 0 && res.msg === "success") {
                 console.log("res.data.url", res.data.url);
                 this.audioList.push({
-                    format: file.name.split(".").pop(),
-                    name: file.name,
+                    attachmentFormat: file.name.split(".").pop(),
+                    attachmentName: file.name,
                     size: file.size,
-                    type: file.raw.type,
-                    url: res.data.url,
+                    attachmentType: file.raw.type,
+                    attachmentUrl: res.data.url,
                 });
                 console.log(this.audioList);
             } else {
@@ -253,22 +253,7 @@ export default {
             }
             return isLt1M;
         },
-        handleImgSuccess(res, file, fileList) {
-            console.log("res.data.url", file);
-            if (res.code === 0 && res.msg === "success") {
-                console.log("res.data.url", res.data.url);
-                this.imgList.push({
-                    format: file.name.split(".").pop(),
-                    name: file.name,
-                    size: file.size,
-                    type: file.raw.type,
-                    url: res.data.url,
-                });
-                console.log(this.formData.files);
-            } else {
-                this.$message.error(res.msg);
-            }
-        },
+      
 
         handleImgRemove(file) {
             let index = this.formData.files.findIndex(

From 1a30f2f434ec82e5de6cc64197278d67acc970e1 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 2 Aug 2024 21:58:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9,=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BA=8B=E4=BB=B6=E5=8A=A0=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/shequzhili/event-info.scss   | 17 +++++-
 .../shequzhili/event/cpts/event-info.vue      | 27 ++++++---
 .../event/cpts/process-form-complete.vue      | 57 ++++++++++++-------
 3 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss
index c3aea2dcc..188069ef2 100644
--- a/src/assets/scss/modules/shequzhili/event-info.scss
+++ b/src/assets/scss/modules/shequzhili/event-info.scss
@@ -604,5 +604,20 @@
   width: 250px;
   
 }
-.event{
+.uploadList{
+  width: 99%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+  >div{
+  display: flex;
+  color: #606266;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  &:hover{
+    background-color: #f5f7fa;
+  }
+  }
 }
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index e1841a534..afbd87d68 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -2,9 +2,9 @@
     <div class="">
         <div v-if="pageTypeCopy == 'dispose' || pageTypeCopy == 'info' || pageTypeCopy == 'assign'|| pageTypeCopy == 'check'" class="g-page">
             <!-- 面包屑放到这里-->
-            <div class="tabs">
+            <div class="tabs" @click="handleClose">
                 <i class="el-icon-arrow-left"></i>
-                <el-button class="diy-button--white" style="height: 20px" @click="handleClose">
+                <el-button class="diy-button--white" style="height: 20px">
                     查看详情</el-button>
             </div>
             <div :class="['g-total', { 'g-left': projectProcess.length > 0, 'g-left-top40': pageType == 'info' }]"
@@ -75,6 +75,10 @@
                                             <div class="detail-field">办结时限：</div>
                                             <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
                                         </div>
+                                        <div class="detail" v-if="item.examineContent">
+                                            <div class="detail-field">备注说明：</div>
+                                            <div class="detail-value">{{ item.examineContent }}</div>
+                                        </div>
                                         <template v-if="item.internalFile && item.internalFile.length > 0"
                                             v-for="i in item.internalFile">
                                             <template v-if="i.type === 'image'">
@@ -123,32 +127,37 @@
                                             <div class="detail-field">办结时限：</div>
                                             <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
                                         </div>
+                                        <div class="detail" v-if="item.examineContent">
+                                            <div class="detail-field">备注说明：</div>
+                                            <div class="detail-value">{{ item.examineContent }}</div>
+                                        </div>
+                                        
                                         <template v-if="item.internalFile && item.internalFile.length > 0"
                                             v-for="i in item.internalFile">
-                                            <template v-if="i.type === 'image'">
+                                            <template v-if="i.attachmentType === 'image'">
                                                 <div
                                                     :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                     <span class="u-info-title-2">图片：</span>
-                                                    <img :src="i.url" :key="i.url"
+                                                    <img :src="i.attachmentUrl" :key="i.attachmentUrl"
                                                         style="width: 150px; height: 150px; padding-right: 10px"
-                                                        @click="watchImg(i.url)" />
+                                                        @click="watchImg(i.attachmentUrl)" />
                                                 </div>
                                             </template>
-                                            <template v-if="i.type === 'voice'">
+                                            <template v-if="i.attachmentType === 'voice'">
                                                 <div
                                                     :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                     <span class="u-info-title-2">录音：</span>
                                                     <audio controls>
-                                                        <source :src="i.url" type="" :key="i.url" />
+                                                        <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
                                                     </audio>
                                                 </div>
                                             </template>
-                                            <template v-if="i.type === 'doc'">
+                                            <template v-if="i.attachmentType === 'doc'">
                                                 <div
                                                     :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                     <span class="u-info-title-2">录音：</span>
                                                     <audio controls>
-                                                        <source :src="i.url" type="" :key="i.url" />
+                                                        <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
                                                     </audio>
                                                 </div>
                                             </template>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue
index 548ff1a89..47fbf5ed3 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue
@@ -9,22 +9,37 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="上传录音" label-width="118px" :class="{ 'form-item': source === 'visiual' }">
-        <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUlr" accept=".mp3"
-          :data="{ customerId: customerId }" :show-file-list="true" :on-success="handleAudioSuccess"
-          :on-remove="handleAudioRemove" :before-upload="beforeAudioUpload" :file-list="audioList">
-          <el-button type="primary" :disabled="pageType === 'check'">上传音频<i
-              class="el-icon-upload el-icon--right"></i></el-button>
-        </el-upload>
+      <el-form-item label="上传录音" label-width="118px" :class="{ 'form-item': source === 'visiual' }" prop="luyin">
+                <el-upload v-if="audioList.length < 3" :headers="$getElUploadHeaders()" 
+                    :action="uploadUlr" :data="{ customerId: customerId }" :show-file-list="false"
+                    :on-success="handleAudioSuccess" :before-upload="beforeAudioUpload"
+                    accept=".mp3" >
+                    <el-button type="primary" :disabled="pageType === 'check'">上传录音<i
+                      class="el-icon-upload el-icon--right"></i></el-button>
+                </el-upload>
+                <section  class="uploadList">
+                    <div v-for="file in audioList" :key="file.attachmentUrl" :file="file"
+                        :style="{cursor:pageType === 'check'? 'no-drop':'pointer'}" >
+                        <span>{{ file.attachmentName }}</span>
+                        <span type="text" @click="handleAudioRemove(file)"  class="el-icon-close"> </span>
+                    </div>
+                </section>
       </el-form-item>
-      <el-form-item label="上传图片" label-width="118px" :class="{ 'form-item': source === 'visiual' }" prop="files">
-        <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUlr"
-        accept=".jpg,.png,.jpeg"
-          :data="{ customerId: customerId }" :show-file-list="true" :on-success="handleImgSuccess"
-          :on-remove="handleImgRemove" :before-upload="beforeImgUpload" :file-list="imgList">
-          <el-button type="primary" :disabled="pageType === 'check'">上传图片<i
-              class="el-icon-upload el-icon--right"></i></el-button>
-        </el-upload>
+      <el-form-item label="上传图片" label-width="118px" :class="{ 'form-item': source === 'visiual' }" prop="luyin">
+                <el-upload v-if="audioList.length < 3" :headers="$getElUploadHeaders()" 
+                    :action="uploadUlr" :data="{ customerId: customerId }" :show-file-list="false"
+                    :on-success="handleImgSuccess" :before-upload="beforeImgUpload"
+                    accept=".jpg,.png,.jpeg">
+                    <el-button type="primary" :disabled="pageType === 'check'">上传图片<i
+                      class="el-icon-upload el-icon--right"></i></el-button>
+                </el-upload>
+                <section  class="uploadList">
+                    <div v-for="file in imgList" :key="file.attachmentUrl" :file="file"
+                    :style="{cursor:pageType === 'check'? 'no-drop':'pointer'}">
+                        <span>{{ file.attachmentName }}</span>
+                        <span type="text" @click="handleImgRemove(file)" class="el-icon-close"> </span>
+                    </div>
+                </section>
       </el-form-item>
       <el-divider></el-divider>
       <div class="flex">
@@ -340,8 +355,8 @@ export default {
      if(this.pageType === 'check'){
       this.formData = newVal;
       if(this.formData.internalFile){
-        this.imgList = this.formData.internalFile.filter(item=>item.type==='image')
-        this.audioList = this.formData.internalFile.filter(item=>item.type==='voice')
+        this.imgList = this.formData.internalFile.filter(item=>item.attachmentType==='image')
+        this.audioList = this.formData.internalFile.filter(item=>item.attachmentType==='voice')
       }
      }
     },
@@ -388,8 +403,9 @@ export default {
     },
 
     handleAudioRemove(file) {
+      if(this.pageType === 'check')return
       let index = this.audioList.findIndex(
-        (item) => item.url == file.response.data.url
+        (item) => item.attachmentUrl == file.attachmentUrl
       );
       this.audioList.splice(index, 1);
       console.log(this.audioList);
@@ -445,8 +461,9 @@ export default {
     },
 
     handleImgRemove(file) {
-      let index = this.imgList.findIndex(
-        (item) => item.url == file.response.data.url
+      if(this.pageType === 'check')return
+      let index = this.audioList.findIndex(
+        (item) => item.attachmentUrl == file.attachmentUrl
       );
       this.imgList.splice(index, 1);
       console.log(this.imgList);