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

src/views/caseManagement/components/caseentryDialog.vue

@@ -583,6 +583,15 @@
         @click="generateForm1()"
         >新增被申请人主体信息</el-button
       > -->
+      <div>
+         <div style="display: inline-flex">
+            <div class="infoIcon"></div>
+            <div class="caseInfo2">仲裁申请书:</div>
+          </div>
+        <div v-for="item in caseAttachList" :key ="item.annexId" v-if="item.annexType==1" style="margin-top:-25px;margin-left:100px;">
+          <el-link target="_blank" type="primary" :href="fileURL+item.annexPath">{{item.annexName}}</el-link>
+        </div>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-if="flag != 0" class="endbutton"><span>确 定</span></el-button>
         <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
@@ -609,6 +618,7 @@ export default {
   ],
   data() {
     return {
+      fileURL: window.location.origin + "/API",
       formData: this.form,
       filedata: {
         annexType: 2,

src/views/caseManagement/components/evidenceList.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <el-dialog
+      title="证据清单"
+      :visible="evidenceListD"
+      :caseAttachListR = "caseAttachListR"
+      @close="cancel"
+      center
+      :distroy-on-close="true"
+    >
+      <div class="loading" v-if ="flagLoading">
+        <i class="el-icon-loading"></i>
+      </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>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel" class="endbutton1"
+          ><span>取 消</span></el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ["evidenceListD", "flagLoading", "caseAttachListR"],
+  data() {
+    return {
+      fileURL: window.location.origin + "/API",
+      myData:[]
+    };
+  },
+  created(){
+    // 获取组件传值监听
+    // this.$watch('caseAttachListR',(newVal)=>{
+    //   this.myData = newVal;
+    //   console.log(this.myData)
+    // })
+  },
+  methods: {
+  
+    cancel() {
+      this.$emit("cancelevidenceList");
+    } 
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  height: 500px !important;
+  overflow: auto !important;
+}
+::v-deep .el-dialog {
+  width: 800px;
+  background: #ffffff;
+  border-radius: 20px;
+}
+.endbutton1 {
+  width: 154px;
+  height: 37px;
+  background: #ffffff;
+  border: 1px solid #d0d0d0;
+  border-radius: 19px;
+  span {
+    width: 31px;
+    height: 13px;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #959595;
+  }
+}
+.loading {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-icon-loading {
+    font-size: 50px;
+  }
+}
+.noData {
+  width: 100%;
+  height: 400px;
+  font-size: 30px;
+  font-weight: 700;
+  color: #959595;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

src/views/caseManagement/components/viewprocessDialog.vue

@@ -3,7 +3,7 @@
         <el-dialog title="案件流程" :visible="processVisable" @close="cancel" center :distroy-on-close="true">
             <div>
                 <el-steps class="steps" :active="caseStatus">
-                    <el-step :title="item.caseNodeName || item.content" v-for="(item,index) in pageData.allCasenode" :key="index" :description="(item.createNickName || '') + (item.caseNodeTime || '')"></el-step>
+                    <el-step :title="item.caseNodeName || item.content" v-for="(item,index) in pageData.allCasenode" :key="index" :description="(item.createNickName || '') + (item.caseNodeTime || '')+(item.nextRoleName || '')"></el-step>
                    
                 </el-steps>
             </div>
@@ -41,6 +41,7 @@ export default {
             selectCaseProgress(data).then(res=>{
                  this.pageData = res.data.data; 
                 let allCasenode = res.data.data.allCasenode;
+                console.log(allCasenode)
                 allCasenode.forEach((item,index) => {
                     if(item.caseNode==res.data.data.caseStatus){
                         this.caseStatus = index