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

src/views/caseManagement/components/choosetrialmethodDaiog.vue

@@ -42,9 +42,7 @@
           </div>
         </div>
         <div v-show="choosetrialmethodata.arbitraMethodIssame==2">
-          <el-descriptions>
+          <div>{{choosetrialmethodata.arbitratMethodIllustrate}}</div>
-            <el-descriptions-item label="当前案件开庭方式">{{choosetrialmethodata.arbitratMethodIllustrate}}</el-descriptions-item>
-          </el-descriptions>
           <el-form :model="form" :rules="rules" ref="form">
             <el-form-item label="选择开庭方式"  prop="arbitratMethod">
                 <el-radio-group v-model="form.arbitratMethod">

src/views/caseManagement/components/formateCourtDialog.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- 组庭界面 -->
     <el-dialog
-      title="组庭建议"
+      title="组庭审核"
       :visible="showformateCourt"
       v-if="showformateCourt"
       @close="cancel"
@@ -15,16 +15,16 @@
         label-width="110px"
         label-position="left"
       >
-        <el-form-item label="是否同意组庭：">
+        <!-- <el-form-item label="是否同意组庭：">
           <el-radio-group v-model="isAgreePendTral" @change="radioValue">
             <el-radio :label="1">是</el-radio>
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
-        <el-tag type="warning" v-if="noArbitrator"
+        <!-- <el-tag type="warning" v-if="noArbitrator"
           >当前案件未指定仲裁员，请先指定仲裁员！</el-tag
-        >
+        > -->
-        <p></p>
+        <!-- <p></p> -->
         <!-- <el-form ref="form"> -->
         <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
         <div style="display: inline-flex; margin-bottom: 8px">

src/views/caseManagement/components/judgmentInformation.vue

@@ -77,6 +77,31 @@
           <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin"
             placeholder="请输入" />
         </el-form-item> -->
+         <el-col :span="24">
+          <el-form-item label="上传裁决书:" label-width="100px" v-if="flag==1|| flag==4">
+            <el-upload
+              class="upload-demo"
+              accept=".doc,.docx"
+              ref="upload"
+              :action="UploadUrls()"
+              :headers="headers"
+              :data="filedatas"
+              :before-remove="beforeRemoves"
+              :limit="2"
+              :on-change="beforeUpload"
+              :on-success="handlSuccessAw"
+              :file-list="fileListAw"
+              :before-upload="beforeAvatarUploads"
+            >
+              <el-button slot="trigger" size="small" type="primary"
+                >选取文件</el-button
+              >
+              <div slot="tip" class="el-upload__tip">
+                只能上传.doc，docx文件
+              </div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
         <el-form-item label="驳回原因：" label-width="100px"  v-if="flag==1 && awardDetailform.arbitrateReject">
           <div style="width:800px;">{{awardDetailform.arbitrateReject}}</div>
         </el-form-item>
@@ -99,7 +124,7 @@
           ]">
           <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model.trim="arbitrateRecord.arbitrateReject"></el-input>
         </el-form-item>
-        <el-form-item label-width="100px" label="bmz驳回原因" v-if="agreeOrNotCheck==2 && flag ==2" prop="deptorReject"
+        <el-form-item label-width="100px" label="驳回原因" v-if="agreeOrNotCheck==2 && flag ==2" prop="deptorReject"
           :rules="[
             { required: true, message: '请输入驳回原因', trigger: 'blur' }
           ]">
@@ -134,6 +159,7 @@ import {
   regenerationDocument,
   arbitratorCheckArbitrateRecord
 } from "@/api/awardManagement/awardManagement";
+import { getToken } from "@/utils/auth";
 export default {
   props: ["openDialogInfor", "title", "flag", "awardDetailform","queryParams"],
   data() {
@@ -142,6 +168,14 @@ export default {
       arbitrateRecordt: {},
       agreeOrNotCheck:1,
       form: {},
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+       filedatas: {
+        annexType: 3,
+        id:null
+      },
+      fileListAw:[],
       arbitrateRecord: {
         // checkOpinion:"同意"
         checkOpinion: ""
@@ -340,6 +374,23 @@ export default {
         this.awardFileArr[0] = res.data.annexName;
         this.awardPathArr[0] = res.data.annexPath;
       })
+    },
+        // 上传裁决书
+    UploadUrls() {
+      return window.location.origin + "/API/evidence/uploadRecord";
+    },
+    beforeRemoves(file,fileList){
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    beforeUpload(flie, fileList) {
+      // this.fileList = fileList;
+    },
+     // 上传文件成功
+    handlSuccessAw(res, file) {
+      // this.fileListAw.push(file);         
+    },
+    beforeAvatarUploads(){
+      this.filedatas.id = this.awardDetailform.id;
     },
     submitForm(parms) {
       let that = this;

src/views/caseManagement/components/viewprocessDialog.vue

@@ -7,6 +7,7 @@
                     <el-step :title="item.caseNodeName || item.content" v-for="(item,index) in pageData.allCasenode" :key="index">
                         <template slot="description">
                            <p>{{item.createNickName || ''}}{{item.caseNodeTime || ''}}</p>
+                           <p>{{item.currentRoleName}}</p>
                            <p>{{item.nextRoleName || ''}}</p>
                         </template>
                     </el-step>

vue.config.js

@@ -12,8 +12,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 // const API = 'http://121.40.189.20:9001'  //生产
- const API = 'http://121.40.189.20:8001'  //测试
+//  const API = 'http://121.40.189.20:8001'  //测试
-// const API = 'http://172.16.1.26:8001'  //Bs
+const API = 'http://172.16.1.26:8001'  //Bs
 // const API = 'http://192.168.3.77:9001' //Q
 // const API = 'http://172.16.1.26:8001' //W