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

src/views/caseManagement/components/addCase.vue

@@ -124,6 +124,17 @@
               </div>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="modelFlag && formData.mediaResult">
+                 <el-form-item label="调解结果:" >
+                    <el-radio-group v-model="formData.mediaResult">
+                      <el-radio :label="1">达成调解</el-radio>
+                      <el-radio :label="2">未达成调解</el-radio>
+                      <el-radio :label="3">未达成调解但不在争议</el-radio>
+                      <el-radio :label="4">未达成调解但同意引入仲裁</el-radio>
+                      <el-radio :label="5">达成和解</el-radio>
+                    </el-radio-group>
+                 </el-form-item>
+          </el-col>
           <el-col :span="24">
             <div style="display: inline-flex">
               <div class="infoIcon"></div>

src/views/caseManagement/components/caseFilingDetailsPage.vue

@@ -78,7 +78,7 @@
                 </el-upload>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="24" v-if="showmediate">
               <el-form-item label="证据:">
                 <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 2">
                   <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
@@ -87,7 +87,7 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="24" v-if="showEvidence">
               <el-form-item label="调解申请书:">
                 <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 3">
                   <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
@@ -97,7 +97,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="调解书:">
+              <el-form-item label="调解书:" v-if="showConciliation">
                 <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 7">
                   <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
                     {{ item.annexName }}
@@ -105,6 +105,17 @@
                 </div>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+                 <el-form-item label="调解结果:" v-if="detailsAwardNum.mediaResult">
+                    <el-radio-group v-model="detailsAwardNum.mediaResult">
+                      <el-radio :label="1">达成调解</el-radio>
+                      <el-radio :label="2">未达成调解</el-radio>
+                      <el-radio :label="3">未达成调解但不在争议</el-radio>
+                      <el-radio :label="4">未达成调解但同意引入仲裁</el-radio>
+                      <el-radio :label="5">达成和解</el-radio>
+                    </el-radio-group>
+                 </el-form-item>
+            </el-col>
             <el-col :span="24">
               <div style="display: inline-flex">
                 <div class="infoIcon"></div>
@@ -251,6 +262,9 @@
 </template>
 <script>
 import { getToken } from "@/utils/auth";
+import {
+  caseApplicationSelectById,
+} from "@/api/caseManagement/caseManagement.js";
 export default {
     props: ["showarchiveDetails","detailsAwardNum","videoList","flagLoadingS","trialTranscripts","caseFilingData"],
   components: {
@@ -268,6 +282,9 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
+      showEvidence:false,
+      showmediate:false,
+      showConciliation:false
     };
   },
 watch: {
@@ -275,14 +292,19 @@ watch: {
       handler(val) {
         if (val) {
           this.activeName = 'five'
+          this.caseApplicationSelectByIdFn(this.caseFilingData.id)
+          this.showEvidence=false,
+          this.showmediate=false,
+          this.showConciliation=false
           // this.detailsAwardNum.affiliate.respondentSex = Number(this.detailsAwardNum.affiliate.respondentSex)
-          console.log(this.detailsAwardNum)
         }
       },
     },
+    
   },
   created(){
     
+
     
   },
   methods: {
@@ -295,6 +317,20 @@ watch: {
             }
         }
         return resNumber
+    },
+    /** 根据案件id获取对应信息 */
+     caseApplicationSelectByIdFn(data) {
+       caseApplicationSelectById({ id: data }).then((res) => {
+         res.data.caseAttachList.forEach(item => {
+           if(item.annexType==2){
+             this.showmediate = true
+           }else if(item.annexType==3){
+             this.showEvidence = true
+           }else if(item.annexType==7){
+             this.showConciliation = true
+           }
+         });
+      });
     },
       /** 查看证据 */
     fileDetil(val) {
@@ -348,7 +384,7 @@ watch: {
   overflow: auto !important;
 }
 ::v-deep .el-dialog {
-  width: 850px;
+  width: 925px;
   background: #ffffff;
   border-radius: 20px;
 }

src/views/caseManagement/components/mediation.vue

@@ -21,9 +21,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="案件标的：" prop="caseSubjectAmount">
+            <!-- <el-form-item label="案件标的：" prop="caseSubjectAmount">
               <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" :disabled="true" />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
           <el-col :span="12">
             <el-form-item label="调解费用：" prop="feePayable">
@@ -44,7 +44,7 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="mediationType">
+        <el-col :span="24">
           <el-form-item label="调解结果:">
             <el-radio-group v-model="mediaResult" :disabled="!selectRoido" @change="resultsMediation">
               <el-radio :label="1">达成调解</el-radio>
@@ -185,6 +185,7 @@ export default {
       } else if (this.mediationData.mediationMethod == "2") {
         this.title = "线下调解";
         this.mediationType = false;
+        this.selectRoido = true
       }
       if (val) {
         this.caseApplicationSelectByIdFn({
@@ -314,6 +315,7 @@ export default {
         this.loadingSubmit = true;
       }
       let mediationVal = {}
+      
       if (this.codes == 200) {
         mediationVal = {
           id: this.mediationData.id,
@@ -343,4 +345,8 @@ export default {
   display: flex;
   flex-wrap: wrap;
 }
+::v-deep .el-input--medium .el-input__inner {
+  height: 40px;
+  line-height: 40px;
+}
 </style>

src/views/login.vue

@@ -68,7 +68,7 @@
     <!--  底部  -->
     <div class="el-login-footer">
       <div>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</div>
-      <div>Version：1.0.1</div>
+      <div>Version：1.1.0</div>
     </div>
   </div>
 </template>