Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

src/views/modules/shequzhili/analysis/index.vue

@@ -169,6 +169,9 @@
       prop="proportion"
       label="同级占比"
       >
+      <template slot-scope="scope">
+              {{ scope.row.proportion }}%
+            </template>
     </el-table-column>
   </el-table>
         <div style="display: flex;justify-content: space-between;flex-direction:row; height:500px">

src/views/modules/shequzhili/event/cpts/process-form-assign.vue

@@ -88,7 +88,7 @@ export default {
             isCascaderDisabled:false,
             customerId: localStorage.getItem("customerId"),
             formData: {
-                videoNeedFlag:"",//是否需要录音。是为1不是为0
+                videoNeedFlag:"1",//是否需要录音。是为1不是为0
                 operationType: "5", //处理方式[0:已回复 5、指派  6、完成并回复]
                 handlingReq:'',//办理要求
                 transferAdvice:'',//转办意见
@@ -215,10 +215,12 @@ export default {
             
             this.formData.handlingReq = this.eventDetailCopy.handlingReq;
             this.formData.transferAdvice = this.eventDetailCopy.transferAdvice;
-            let dateTime = new Date(new Date(this.eventDetailCopy.timeLimit).getTime()- (1000 * 60 * 60 * 24))
+            if (this.eventDetailCopy.timeLimit) {
-            let yesterday = `${dateTime.getFullYear()}-${(dateTime.getMonth() +1)}-${dateTime.getDate()}` 
+                let dateTime = new Date(new Date(this.eventDetailCopy.timeLimit).getTime() - (1000 * 60 * 60 * 24))
-            console.log('yesterday',yesterday)
+                let yesterday = `${dateTime.getFullYear()}-${(dateTime.getMonth() + 1)}-${dateTime.getDate()}`
+                console.log('yesterday', yesterday)
                 this.formData.timeLimit = yesterday + ' ' + '16:00:00'
+            }
             this.formData.contactTime = this.$dayjs(new Date(new Date().getTime() + (1000 * 60 * 60))).format('YYYY-MM-DD HH:mm:ss')
         }
     },

src/views/modules/shequzhili/event/cpts/process-form-complete.vue

@@ -9,7 +9,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="上传录音" label-width="118px" :class="{ 'form-item': source === 'visiual' }" prop="luyin" :required="required">
+      <el-form-item label="上传录音" label-width="118px" :class="{ 'form-item': source === 'visiual' }" prop="files">
                 <el-upload v-if="audioList.length < 3" :headers="$getElUploadHeaders()" 
                     :action="uploadUlr" :data="{ customerId: customerId }" :show-file-list="false"
                     :on-success="handleAudioSuccess" :before-upload="beforeAudioUpload"
@@ -418,7 +418,7 @@ export default {
         satisfaction: [
           { required: true, message: "请选择服务满意度", trigger: "blur" },
         ],
-        luyin: [
+        files: [
           { required: true, message: " 请上传录音文件", trigger: "blur" },
         ],
     
@@ -463,22 +463,23 @@ export default {
   },
   watch: {
     
-  // // 监听 formData.video 的变化，动态更新验证规则
+    "replayDetailObj": function (newVal,oldVal) {
-  // 'eventDetailData.videoNeedFlag'(newVal) {
+      console.log(newVal,'bianle');
-  //     if (newVal === 1) {
+     if(this.pageType === 'check'){
-  //       console.log("sdlflkshgslg");
+      this.formData = newVal;
-        
+      if(this.formData.internalFile){
-  //       // 如果 video 为 1，luyin 变为必填
+        this.imgList = this.formData.internalFile.filter(item=>item.attachmentType==='image')
-  //       this.dataRule.luyin = [{ required: true, message: "请选择服务满意度", trigger: "blur" }];
+        this.audioList = this.formData.internalFile.filter(item=>item.attachmentType==='voice')
-  //     } else {
+        this.docList = this.formData.internalFile.filter(item=>item.attachmentType == 'doc')
-  //       // 如果 video 为 0，luyin 变为非必填
+      }
-  //       this.dataRule.luyin = [{ required: false, message: "请选择服务满意度", trigger: "blur" }];
+     }
-  //     }
+    },
-  //   }
   },
   created() { },
 
   mounted() {
+    console.log(this.formData,"formData,formDataformData");
+    
     console.log(this.eventDetailData,"alallalalalalalal");
     if (this.eventDetailData.videoNeedFlag=="1") {
       this.required=true
@@ -516,6 +517,7 @@ export default {
           attachmentType: file.raw.type,
           attachmentUrl: res.data.url,
         });
+        this.formData.files.push(this.audioList)
         console.log(this.formData.files);
       } else {
         this.$message.error(res.msg);