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

src/api/caseManagement/caseManagement.js

@@ -25,6 +25,14 @@ export function creatTrialRecord(data) {
     data: data,
   });
 }
+// 确认生成笔录
+export function creatTrialRecordnew(data) {
+  return request({
+    url: "/caseApplication/creatTrialRecordnew",
+    method: "post",
+    data: data,
+  });
+}
 // 组庭确认
 export function pendTralSure(data) {
   return request({

src/views/awardManagement/listofAwards.vue

@@ -380,7 +380,6 @@ export default {
             caseApplicationDetail(parms).then((res) => {
                 this.detailform = res.data;
                 this.detailsAwardNum = res.data;
-                console.log(this.detailsAwardNum)
             });
         },
         // 裁决书详情

src/views/caseFiling/archiveList.vue

@@ -34,9 +34,9 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-row style="margin-bottom:5px;">
-         <el-button type="primary" size="mini" class="el-icon-download" @click="downloadZips">案件归档</el-button>
-    </el-row>
+    <!-- <el-row style="margin-bottom:5px;">
+         <el-button type="primary" size="mini" icon="el-icon-download" @click="downloadZips">案件归档</el-button>
+    </el-row> -->
     <el-table v-loading="loading" :data="dataList" style="width: 100%">
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
@@ -59,6 +59,7 @@
             v-if="scope.row.filearbitraUrl && scope.row.filearbitraUrl !== ''"
             @click="showModel(scope.row)">查看裁决书</el-button>
           <el-button size="mini" type="text" icon="el-icon-reading" @click="showDetail(scope.row)">归档详情</el-button>
+          <el-button type="text" size="mini" icon="el-icon-download" @click="downloadZips(scope.row)">下载案件压缩包</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -131,7 +132,7 @@ export default {
       this.handleQuery();
     },
     // 下在案件归档压缩包
-    downloadZips(){
+    downloadZips(row){
       //  console.log(this.download) 
     },
     // 查询列表数据

src/views/caseManagement/caseList.vue

@@ -866,6 +866,6 @@ export default {
 <style>
 /* // #formContainer {} */
 .el-table .pendingTrial {
-    background:oldlace;
+    background:rgb(97, 224, 23);
   }
 </style>

src/views/caseManagement/components/evidenceList.vue

@@ -11,8 +11,13 @@
       <div class="loading" v-if ="flagLoading">
         <i class="el-icon-loading"></i>
       </div>
+      <div>申请人证据清单:</div>
       <div v-for="item in this.caseAttachListR" style="margin-top:10px;">
-          <el-link target="_blank" type="primary" v-if="item.annexType == 2 || item.annexType == 6" :href="fileURL+item.annexPath">{{item.annexName}}</el-link>
+          <el-link target="_blank" type="primary" v-if="item.annexType == 2" :href="fileURL+item.annexPath">{{item.annexName}}</el-link>
+      </div>
+      <div style="margin-top:30px;;">被申请人证据清单:</div>
+       <div v-for="item in this.caseAttachListR" style="margin-top:10px;">
+          <el-link target="_blank" type="primary" v-if="item.annexType == 6" :href="fileURL+item.annexPath">{{item.annexName}}</el-link>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel" class="endbutton1"

src/views/caseManagement/components/trialincourtDialog.vue

@@ -180,16 +180,16 @@
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.applicantOpinion" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <el-form-item label="查明本案事实" prop="caseFacts">
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.caseFacts" placeholder="请输入" />
           </el-form-item>
-        </el-col>
-        <el-col :span="24">
+        </el-col> -->
+        <!-- <el-col :span="24">
           <el-form-item label="本案争议焦点" prop="caseFocus">
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.caseFocus" placeholder="请输入" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <!-- <el-col :span="12">
           <el-form-item label="被申请人质证意见：" prop="responCrossOpin" :rules="[
             {
@@ -298,6 +298,7 @@ import { getUserProfile } from "@/api/system/user";
 import {
   writtenHear,
   creatTrialRecord,
+  creatTrialRecordnew,
   document,
 } from "@/api/caseManagement/caseManagement.js";
 import { reserveConferenceList } from '@/api/meeting/index.js'
@@ -417,7 +418,7 @@ export default {
     submitForm() {
       this.$refs["form2"].validate((valid) => {
         if (valid) {
-          creatTrialRecord({
+          creatTrialRecordnew({
             caseAppliId: this.formData.id,
             // evidenDetermi: this.form2.evidenDetermi,
             // factDetermi: this.form2.factDetermi,
@@ -432,19 +433,20 @@ export default {
             isAbsence: this.form2.isAbsence,
             appliIsAbsen: this.form2.appliIsAbsen,
             respondentOpinion: this.form2.respondentOpinion,
-            applicantOpinion: this.form2.applicaCrossOpin,
-            caseFacts: this.form2.caseFacts,
-            caseFocus: this.form2.caseFocus
+            applicantOpinion: this.form2.applicantOpinion,
+            // caseFacts: this.form2.caseFacts,
+            // caseFocus: this.form2.caseFocus
           })
             .then((res) => {
-              res.data.caseAttachList.forEach((item) => {
-                if (item.annexType == 7) {
-                  this.recordArr.push({
-                    annexName: item.annexName,
-                    annexPath: item.annexPath,
-                  });
-                }
-              });
+              // console.log(res);
+              // res.data.caseAttachList.forEach((item) => {
+              //   if (item.annexType == 7) {
+              //     this.recordArr.push({
+              //       annexName: item.annexName,
+              //       annexPath: item.annexPath,
+              //     });
+              //   }
+              // });
               this.$modal.msgSuccess("提交成功");
               this.showsubmit = false;
               this.closeArbitrationresults();