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

src/api/meeting/index.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+// 获取房间号
+export function createRoomId(data) {
+    return request({
+        url: '/caseApplication/createRoomId',
+        method: 'get',
+        params: data
+    })
+}
+// 预约会议
+export function reservedConference(data) {
+    return request({
+        url: '/caseApplication/reservedConference',
+        method: 'post',
+        data: data
+    })
+}
+// 根据案件id查询预约会议
+export function reserveConferenceList(data) {
+    return request({
+        url: '/caseApplication/reserveConferenceList',
+        method: 'get',
+        params: data
+    })
+}
+

src/views/caseManagement/caseList.vue

@@ -92,7 +92,7 @@
           <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="viewProcess(scope.row)">查看流程</el-button>
           <!-- 案件日志 -->
           <el-button size="mini" type="text" icon="el-icon-notebook-2" @click="caselogRow(scope.row)">案件日志</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)" v-if="(scope.row.caseStatus < 10 && scope.row.caseStatus != 2 && scope.row.updateSubmitStatus !== 1) &&
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)" v-if="(scope.row.caseStatus < 10 && scope.row.updateSubmitStatus !== 1) &&
             checkPermi(['caseManagement:list:update']) && btnStatus
             ">修改</el-button>
           <!-- 撤销修改 -->

src/views/caseManagement/components/timeDialog.vue

@@ -27,9 +27,10 @@
 <script>
 import { updateHeardate } from '@/api/caseManagement/caseManagement'
 import { getToken } from "@/utils/auth";
+import { createRoomId, reservedConference } from '@/api/meeting/index'
 import moment from "moment";
 export default {
-    props: ["timeVisable", "timeData","queryParams"],
+    props: ["timeVisable", "timeData", "queryParams"],
     data() {
         return {
             loanStartDate: "",
@@ -37,7 +38,8 @@ export default {
                 disabledDate(time) {
                     return time.getTime() < Date.now() - 8.64e7;
                 }
-            }
+            },
+            roomId: null
         };
     },
     watch: {
@@ -55,19 +57,37 @@ export default {
         cancel() {
             this.$emit("cancelTime");
         },
-        // 提交时间
+        // 获取房间号
-        updateHeardateFn(data) {
+        async createRoomIdFn(data) {
-            updateHeardate(data).then(res => {
+            await createRoomId(data).then(res => {
-                this.$modal.msgSuccess("修改成功");
+                this.roomId = res.data;
-                this.cancel();
-                this.$emit("getcaseApply",this.queryParams);
             })
         },
-        submitTime() {
+        // 预约会议
+        async reservedConferenceFn(data) {
+            await reservedConference(data).then(res => {
+                console.log(res, "PPPPPPPPPPPPPPPPPPPPPPPPP");
+            })
+        },
+        // 提交时间
+        async updateHeardateFn(data) {
+            await updateHeardate(data).then(res => {
+                this.$modal.msgSuccess("修改成功");
+                this.cancel();
+                this.$emit("getcaseApply", this.queryParams);
+            })
+        },
+        async submitTime() {
             this.loanStartDate = moment(
                 this.loanStartDate
             ).format("YYYY-MM-DD HH:mm:ss");
-            this.updateHeardateFn({
+            await this.createRoomIdFn({ caseId: this.timeData.id });
+            await this.reservedConferenceFn({
+                caseId: this.timeData.id,
+                roomId: this.roomId,
+                scheduleStartTime: this.loanStartDate,
+            })
+            await this.updateHeardateFn({
                 id: this.timeData.id,
                 hearDate: this.loanStartDate
             })

src/views/caseManagement/components/trialincourtDialog.vue

@@ -110,6 +110,16 @@
             </div>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="预约会议房间号：">
+            <div>{{ roomId }}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="开庭时间：">
+            <div>{{ startTime }}</div>
+          </el-form-item>
+        </el-col>
         <!-- </el-form> -->
       </el-form>
       <el-button @click="openmeeting" type="primary">发起会议</el-button>
@@ -262,7 +272,7 @@ import {
   creatTrialRecord,
   document,
 } from "@/api/caseManagement/caseManagement.js";
-
+import { reserveConferenceList } from '@/api/meeting/index.js'
 export default {
   props: ["showtrialincourt", "adjudicatename", "form", "queryParams"],
   data() {
@@ -278,12 +288,15 @@ export default {
       showsubmit: true, //生成庭审笔录，方可提交
       annexName: "", //笔录文件名
       annexPath: "", //笔录文件地址
+      roomId:null,
+      startTime:""
     };
   },
   watch: {
     showtrialincourt: {
       handler(val) {
         if (val) {
+          this.reserveConferenceListFn({caseId:this.form.id});
           this.getUser();
           this.formData = this.form;
           this.applicateArr = [];
@@ -324,6 +337,13 @@ export default {
     
   },
   methods: {
+    // 根据案件id查询会议号
+    reserveConferenceListFn(data){
+      reserveConferenceList(data).then(res=>{
+        this.roomId = res.data[0].roomId;
+        this.startTime = res.data[0].scheduleStartTime;
+      })
+    },
     // 详情显示，展示申请人案件文件
     toFile(item, index) {
       window.open(
@@ -355,7 +375,7 @@ export default {
     openmeeting() {
       window.open(
         // `http://localhost:8081/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}`
-        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}`
+        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.roomId}`
       );
     },
     // 提交仲裁结果

src/views/officialSeal/components/editTemplate.vue

@@ -6,6 +6,12 @@
                 <el-form-item label="模板名称" prop="temName">
                     <el-input v-model="ruleForm.temName"></el-input>
                 </el-form-item>
+                <el-form-item label="模板类型" prop="temType">
+                    <el-select v-model="ruleForm.temType" placeholder="请选择">
+                        <el-option v-for="dict in dict.type.template_type" :key="dict.value" :label="dict.label"
+                            :value="dict.value"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="当前模板">
                     <span style="color: #0e5ce3;cursor:pointer" @click="openUrl(editData.temOrigPath)">{{ editData.fileName
                     }}</span>
@@ -27,6 +33,7 @@
 import { getToken } from "@/utils/auth";
 export default {
     props: ["editVisable", "editData", "queryParams"],
+    dicts: ["template_type"],
     data() {
         return {
             fileList: [],
@@ -42,6 +49,9 @@ export default {
                 temName: [
                     { required: true, message: '请输入模板名称', trigger: 'blur' },
                 ],
+                temType: [
+                    { required: true, message: '请输入模板名称', trigger: 'blur' },
+                ],
             }
         };
     },
@@ -49,6 +59,7 @@ export default {
         editData(val) {
             if (val) {
                 this.ruleForm = val;
+                this.ruleForm.temType = this.ruleForm.temType + '';
             }
         }
     },
@@ -65,8 +76,7 @@ export default {
             this.$emit("cancelEdit");
         },
         handleChange(file, fileList) {
-            debugger
+            this.isImg = file.type === '.doc' || '.docx';
-            this.isImg = (file.type === '.doc' || file.type === '.docx') ? true:false;
         },
         UploadUrl() {
             return window.location.origin + "/API/deptIdentify/updateTemplate";
@@ -88,7 +98,7 @@ export default {
             console.log(file, fileList);
         },
         beforeUpload(file) {
-            this.isImg = file.type === '.doc' || '.docx'
+            // this.isImg = file.type === '.doc' || '.docx'
         },
         handleSuccess() {
             this.$message.success('上传成功');

src/views/officialSeal/components/sealManage.vue

@@ -14,7 +14,7 @@
                 <el-table-column label="印章图片" align="center" prop="annexPath">
                     <template slot-scope="scope">
                         <el-image style="width: 40px; height: 40px;" :src="imgUrl + scope.row.annexPath"
-                            :preview-src-list="srcList">
+                            :preview-src-list="[imgUrl + scope.row.annexPath]">
                         </el-image>
                         <!-- <span>{{ imgUrl + scope.row.annexPath }}</span> -->
                     </template>
@@ -51,7 +51,7 @@ export default {
     data() {
         return {
             loading: false,
-            srcList: ["https://img2.baidu.com/it/u=1814561676,2470063876&fm=253&fmt=auto&app=138&f=JPEG?w=750&h=500"],
+            srcList: [],
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
@@ -76,7 +76,7 @@ export default {
     },
     methods: {
         UploadUrl() {
-            this.imgUrl = window.location.origin;
+            this.imgUrl = window.location.origin + '/API';
         },
         // 查询列表数据
         sealListFn(data) {