Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

src/api/login.js

@@ -107,9 +107,10 @@ export function selectIdentityAuthenticaEIDtoken() {
   })
 } 
 // H5轮询获取E证通Token状态
-export function selectPCEIDtokenStatus() {
+export function selectPCEIDtokenStatus(data) {
   return request({
     url: '/identityAuthentication/selectPCEIDtokenStatus',
     method: 'get',
+    params:data
   })
 }

src/store/modules/user.js

@@ -73,13 +73,14 @@ const user = {
     },
 
     // 退出系统
-    LogOut({ commit, state }) {
+    LogOut({ commit, state, dispatch }) {
       return new Promise((resolve, reject) => {
         logout(state.token).then(() => {
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])
           removeToken()
+          dispatch('tagsView/delAllViews', null, { root: true })
           resolve()
         }).catch(error => {
           reject(error)

src/views/caseManagement/components/addCase.vue

@@ -80,7 +80,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="modelFlag && showmediate">
-            <el-form-item label="调解书:">
+            <el-form-item label="签名前调解书:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 7">
                 <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId, 2)">
                   {{ item.annexName }}
@@ -88,6 +88,15 @@
               </div>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="modelFlag&&labelShowMediate">
+            <el-form-item label="调解后调解书:">
+              <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 13">
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
+                  {{ item.annexName }}
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="调解结果:" v-if="modelFlag && formData.mediaResult">
               <el-link v-if="formData.mediaResult == 1">达成调解</el-link>
@@ -861,6 +870,7 @@ export default {
       getUserInfoList: {},
       applicationFlag: null,
       showmediate: false,
+      labelShowMediate:false,
       showEvidence: false,//是否显示证据
       mediationApplication: false,
       formZipData: {},
@@ -1012,6 +1022,7 @@ export default {
         }
         this.activeName = "first";
         this.showmediate = false;
+        this.labelShowMediate = false;
         this.showEvidence = false;
         this.mediationApplication = false;
         this.getTemplateFn();
@@ -1087,6 +1098,8 @@ export default {
             this.showmediate = true
           } else if (item.annexType == 3) {
             this.mediationApplication = true
+          } else if(item.annexType == 13){
+            this.labelShowMediate = true
           }
         });
 

src/views/caseManagement/components/caseFilingDetailsPage.vue

@@ -29,7 +29,17 @@
          </div> -->
         <div v-show="activeName == 'third'">
           <div v-for="item in detailsAwardNum.caseAttachList" v-if="item.annexType == 7" style="margin-top:10px;">
-            <el-link target="_blank" type="primary" :href="fileURL + item.annexPath">{{ item.annexName }}</el-link>
+            <!-- <el-link target="_blank" type="primary" :href="fileURL + item.annexPath">{{ item.annexName }}</el-link> -->
+                    <span>签署前调解书:</span>
+                    <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId, 2)">
+                      {{ item.annexName }}
+                    </div>
+          </div>
+           <div v-for="item in detailsAwardNum.caseAttachList" v-if="item.annexType == 13" style="margin-top:10px;">
+                    <span>签署后调解书:</span>
+                    <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
+                      {{ item.annexName }}
+                    </div>
           </div>
           <el-empty v-if="isNoData(detailsAwardNum.caseAttachList, 7) == 0" description="暂无数据"></el-empty>
         </div>
@@ -89,13 +99,22 @@
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="调解书:">
+                <el-form-item label="签署前调解书:">
                   <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 7">
                     <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId, 2)">
                       {{ item.annexName }}
                     </div>
                   </div>
                 </el-form-item>
+              </el-col>
+               <el-col :span="24">
+                <el-form-item label="签署后调解书:">
+                  <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 13">
+                    <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
+                      {{ item.annexName }}
+                    </div>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="调解结果:">
@@ -683,8 +702,13 @@ export default {
       });
     },
     /** 查看证据 */
-    fileDetil(val) {
-      window.open(this.fileURL + val);
+    fileDetil(val,flag) {
+      if(flag==1){
+         window.open(this.fileURL + val);
+      }else if(flag==2){
+         this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
+      }
+     
     },
     /** 文件上传地址 */
     UploadUrl() {

src/views/caseManagement/components/mediation.vue

@@ -266,6 +266,7 @@ export default {
     },
     /** 发起会议 */
     openmeeting() {
+      this.mediationVisable = false
       window.open(
         // `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
         `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
@@ -340,8 +341,6 @@ export default {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
           attachList: this.attachList,
-          sealFlag:this.sealFlag,
-          mediaResult: this.formData.mediaResult,
         }
       } else {
         if(this.formData.mediaResult != 1){

src/views/caseManagement/components/mediationApplications.vue

@@ -79,11 +79,6 @@ export default {
 
         },
         beforeUpload(flie, fileList) {
-            const isLt2M = flie.size / 1024 / 1024 < 50; // 小于50MB
-            if (!isLt2M) {
-                this.$message.error('上传的文件大小不能超过 50MB!');
-            }
-            return isLt2M;
             function getFileExtension(filename) {
                 const parts = filename.split('.');
                 return parts.length > 1 ? parts.pop() : '';
@@ -96,6 +91,11 @@ export default {
             }
             this.filedata.caseId = this.mediationLise.id
             this.fileList = fileList;
+            const isLt2M = flie.size / 1024 / 1024 < 50; // 小于50MB
+            if (!isLt2M) {
+                this.$message.error('上传的文件大小不能超过 50MB!');
+            }
+            return isLt2M;
         },
         handlSuccess(res, file) {
             if (res.code == 200) {

src/views/caseManagement/components/timeConfirm.vue

@@ -87,10 +87,11 @@ export default {
             this.createRoomIdFn({
                 caseId: this.timeConfirmData.id
             })
-            if (this.formLabelAlign.name == '') {
+            if (!this.formLabelAlign.name) {
                 Message.error('请选择时间');
                 return
             }
+            console.log(this.formLabelAlign.name)
             this.formLabelAlign.name = moment(
                 this.formLabelAlign.name
             ).format("YYYY-MM-DD HH:mm:ss");

src/views/login.vue

@@ -81,24 +81,46 @@
             <span v-else>登 录 中...</span>
           </el-button>
           <div style="float: right" v-if="register">
-            <router-link class="link-type" :to="'/register'">立即注册</router-link>
-            <!-- <el-button type="text" @click="registrationLink('/register')"
-              >立即注册</el-button> -->
+            <!-- <router-link class="link-type" :to="'/register'">立即注册</router-link> -->
+            <el-button
+              type="text"
+              v-if="buttonReg"
+              @click="registrationLink('/register')"
+              >立即注册</el-button
+            >
           </div>
-          <div class="registerImg" v-if="closeImgs">
+          <div class="registerImg" v-show="closeImgs">
             <div class="closeImg" @click="closeImg">
               <img
                 style="width: 25px; height: 25px"
                 src="../assets/images/closed.png"
                 alt=""
               />
+              <span style="padding-left: 100px">扫码人脸核验</span>
             </div>
-            <div id="qrcodeImg"></div>
+            <div id="qrcodeImg" style="padding-left: 76px"></div>
           </div>
         </el-form-item>
       </el-form>
     </div>
-
+    <!-- 注册时选择是否 -->
+    <div>
+      <el-dialog
+        title="是否需要人脸核实"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        center
+      >
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="facialVerification('/register')" type="primary"
+            >是</el-button
+          >
+          <el-button @click="noFacialVerification('/register')" type="primary"
+            >否</el-button
+          >
+        </span>
+      </el-dialog>
+    </div>
     <!--  底部  -->
     <div class="el-login-footer">
       <div>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</div>
@@ -123,8 +145,11 @@ export default {
     return {
       codeUrl: "",
       closeImgs: false,
+      centerDialogVisible: false,
+      buttonReg: true,
+      eidTokens: {},
       timer: null,
-      pathVal:"",
+      pathVal: "",
       loginForm: {
         username: "admin",
         password: "admin123",
@@ -214,36 +239,56 @@ export default {
         }
       });
     },
+    // 生成二维码
+    qrcode(url) {
+      // 前端根据 URL 生成微信支付二维码
+      document.getElementById("qrcodeImg").innerHTML = "";
+      return new QRCode("qrcodeImg", {
+        width: 200,
+        height: 200,
+        text: url,
+        colorDark: "#000",
+        colorLight: "#fff",
+      });
+    },
     registrationLink(path) {
+      this.centerDialogVisible = true;
+    },
+    // 是人脸核实
+    facialVerification(path) {
+      this.centerDialogVisible = false;
       this.pathVal = path;
-      clearInterval(this.timer);
+      // clearInterval(this.timer);
       selectIdentityAuthenticaEIDtoken().then((res) => {
-        // this.timer = setInterval(() => {
-        //   this.getSelectPCEIDtokenStatus(res.data.eidToken);
-        // }, 1000);
         this.closeImgs = true;
-        let url = res.data.eidToken;
-        document.getElementById("qrcodeImg").innerHTML = "";
-        return new QRCode("qrcodeImg", {
-          width: 200,
-          height: 200,
-          text: url,
-          colorDark: "#000",
-          colorLight: "#fff",
-        });
+        this.buttonReg = false;
+        let url = res.data.Url;
+        this.eidTokens = {
+          eidToken: res.data.EidToken,
+        };
+        this.timer = setInterval(() => {
+          this.getSelectPCEIDtokenStatus(this.eidTokens);
+        }, 10000);
+        this.qrcode(url);
       });
-      // this.$router.push(path);
+    },
+    // 不用人脸核实
+    noFacialVerification(path) {
+      this.$router.push(path);
     },
     // H5轮询获取E证通Token状态
     getSelectPCEIDtokenStatus(data) {
       selectPCEIDtokenStatus(data).then((res) => {
-        this.$router.push(this.pathVal);
+        if (res.data.Text.ErrCode == 0) {
+          this.$router.push(this.pathVal);
+        }
       });
     },
     // 关闭弹框
     closeImg() {
-      clearInterval(this.timer)
+      clearInterval(this.timer);
       this.closeImgs = false;
+      this.buttonReg = true;
     },
   },
   beforeDestroy() {
@@ -251,7 +296,7 @@ export default {
     if (this.timer) {
       clearInterval(this.timer);
     }
-  }
+  },
 };
 </script>