Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj

src/views/caseManagement/components/addCase.vue

@@ -84,7 +84,7 @@
               </el-select>
             </el-form-item>
           </el-col> -->
-          <el-col :span="12">
+          <el-col :span="12" v-if="buttonFlag">
             <el-form-item label="申请人案件证据资料上传：" prop="applicantEvidence">
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
                 :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove" :on-preview="handlePreview"
@@ -97,7 +97,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="modelFlag">
+          <el-col :span="24" v-if="modelFlag && showEvidence">
             <el-form-item label="证据:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 2">
                 <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
@@ -578,6 +578,7 @@ export default {
       getUserInfoList: {},
       applicationFlag: null,
       showmediate: false,
+      showEvidence: false,//是否显示证据
       formZipData: {},
       nationalityList: [
         {
@@ -671,12 +672,14 @@ export default {
     caseApplicationSelectByIdFn(data) {
       this.applicantEvidence = [];
       this.respondentEvidence = [];
+      this.showEvidence = false;
       caseApplicationSelectById({ id: data }).then((res) => {
         res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
         this.formData = res.data;
         this.formData.caseAttachList.forEach((item) => {
           if (item.annexType == 2) {
             this.applicantEvidence.push(item);
+            this.showEvidence = true
           } else if (item.annexType == 6) {
             // this.respondentEvidence.push(item);
           } else if (item.annexType == 7) {
@@ -740,9 +743,10 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove(file, fileList) {
-      this.caseAttachListArr = this.caseAttachListArr.filter(
-        (item) => item.annexId != file.annexId
-      );
+      let newcaseAttachList = this.formData.caseAttachList.filter(item => 
+        item.annexId !== file.response.annexId
+      )
+      this.formData.caseAttachList = newcaseAttachList
     },
     handleExceedZip(files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件`);

src/views/caseManagement/components/payDialog.vue

@@ -130,7 +130,7 @@ export default {
     handleRemove(file, fileList) {
       (this.submitForm.payOrderList = []),
       fileList.forEach((item) => {
-          this.submitForm.payOrderList.push({ annexId:item.response.data.annexId,annexName:item.response.data.annexName });
+          this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
         });
     },
     handlePreview(file) {

src/views/caseManagement/components/respondentPay.vue

@@ -130,7 +130,7 @@
       handleRemove(file, fileList) {
         (this.submitForm.payOrderList = []),
         fileList.forEach((item) => {
-            this.submitForm.payOrderList.push({ annexId:item.response.data.annexId,annexName:item.response.data.annexName });
+            this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
           });
       },
       handlePreview(file) {