Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/awardManagement/listofAwards.vue

@@ -11,13 +11,13 @@
                         :value="dict.dictValue"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="是否完成" prop="selectCaseStatus">
+            <!-- <el-form-item label="是否完成" prop="selectCaseStatus">
                 <el-select v-model="queryParams.selectCaseStatus" placeholder="请选择状态" clearable
                     @keyup.enter.native="handleQuery">
                     <el-option v-for="dict in selectCaseStatusList" :key="dict.value" :label="dict.label"
                         :value="dict.value"></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="开庭日期" prop="hearDate">
                 <el-date-picker v-model="queryParams.hearDate" type="daterange" range-separator="至" start-placeholder="开始日期"
                     end-placeholder="结束日期">

src/views/caseManagement/caseList.vue

@@ -21,12 +21,12 @@
             :value="dict.dictValue"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="是否完成" prop="selectCaseStatus">
+      <!-- <el-form-item label="是否完成" prop="selectCaseStatus">
         <el-select v-model="queryParams.selectCaseStatus" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
           <el-option v-for="dict in selectCaseStatusList" :key="dict.value" :label="dict.label"
             :value="dict.value"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="开庭日期" prop="hearDate">
         <el-date-picker
           v-model="queryParams.hearDate"
@@ -148,7 +148,7 @@
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="(scope.row.caseStatus < 10 && scope.row.caseStatus != 2 && scope.row.caseStatus != 0) &&
             checkPermi(['caseManagement:list:evidenceUpdate']) && btnStatus"
             @click="evidenceUpload(scope.row)">证据修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 31 && btnStatus"
+          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 31 && btnStatus &&  checkPermi(['caseManagement:list:timer'])"
             @click="timeUpdata(scope.row)">开庭时间</el-button>
           <el-button size="mini" type="text" icon="el-icon-lock"
             v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 0 && btnStatus"

src/views/caseManagement/components/caseCompressionPackage.vue

@@ -1,14 +1,7 @@
 <template>
   <div>
     <!-- 立案申请弹框 -->
-    <el-dialog
+    <el-dialog title="案件压缩" :visible="openCompressedPackages" width="600px" append-to-body @close="cancel" center>
-      title="案件压缩"
-      :visible="openCompressedPackages"
-      width="600px"
-      append-to-body
-      @close="cancel"
-      center
-    >
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row>
           <!-- <el-col :span="16">
@@ -38,19 +31,9 @@
         </el-row>
         <el-row>
           <el-form-item :span="24" label="案件压缩包上传：" prop="upload">
-            <el-upload
+            <el-upload class="upload-demo" ref="uploadZipBatch" :limit="1" accept=".zip" :headers="upload.headers"
-              class="upload-demo"
+              :action="upload.url" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
-              ref="uploadZipBatch"
+              :on-success="handleFileSuccess" :auto-upload="false" :data="paramsData" drag>
-              :limit="1"
-              accept=".zip"
-              :headers="upload.headers"
-              :action="upload.url"
-              :disabled="upload.isUploading"
-              :on-progress="handleFileUploadProgress"
-              :on-success="handleFileSuccess"
-              :auto-upload="false"
-              drag
-            >
               <i class="el-icon-upload"></i>
               <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
               <!-- <el-button size="small" type="primary">点击上传</el-button> -->
@@ -59,6 +42,11 @@
               </div>
             </el-upload>
           </el-form-item>
+          <el-form-item :span="24" label="裁决书模板" prop="templateId">
+            <el-select v-model="form.templateId" placeholder="请选择">
+              <el-option v-for="dict in templateList" :key="dict.id" :label="dict.temName" :value="dict.id"></el-option>
+            </el-select>
+          </el-form-item>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -70,7 +58,9 @@
 </template>
 
 <script>
-import { importTemplate } from "@/api/caseAccess/caseEntry";
+import {
+  getTemplate,
+} from "@/api/officialSeal/officialSeal.js";
 import { getToken } from "@/utils/auth";
 export default {
   props: ["openCompressedPackages", "getcaseApply", "queryParams"],
@@ -79,11 +69,18 @@ export default {
       //   key: value,
       form: {},
       fileList: [],
+      templateList: [],
       rules: {
-        upload: [
+        // upload: [
-          { required: true, message: "案件压缩包不能为空", trigger: "blur" },
+        //   { required: true, message: "案件压缩包不能为空", trigger: "blur" },
+        // ],
+        templateId: [
+          { required: true, message: "裁决书模板不能为空", trigger: "blur" },
         ],
       },
+      paramsData:{
+        // templateId:this.form.templateId
+      },
       // 案件压缩导入
       upload: {
         // 是否显示弹出层（用户导入）
@@ -101,9 +98,32 @@ export default {
       },
     };
   },
+  watch: {
+    openCompressedPackages(val) {
+      if (val) {
+        this.form = {}
+        this.getTemplateFn({
+          pageNum: 1,
+          pageSize: 10000000,
+        })
+      }
+    },
+  },
   methods: {
     submitForm() {
+      this.paramsData.templateId = this.form.templateId;
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
           this.$refs.uploadZipBatch.submit();
+        }
+      })
+    },
+    // 获取裁决书模板
+    getTemplateFn(data) {
+      getTemplate(data).then(res => {
+        console.log(res.rows, "KKKKKKKKKKKKKKKKKKKKKKK");
+        this.templateList = res.rows;
+      })
     },
     // 取消
     cancel() {
@@ -171,16 +191,19 @@ export default {
     }
   }
 }
+
 ::v-deep .el-dialog {
   width: 800px;
   background: #ffffff;
   border-radius: 20px;
 }
+
 .endbutton {
   width: 154px;
   height: 37px;
   background: #0072ff;
   border-radius: 19px;
+
   span {
     width: 96px;
     height: 15px;
@@ -190,12 +213,14 @@ export default {
     color: #ffffff;
   }
 }
+
 .endbutton1 {
   width: 154px;
   height: 37px;
   background: #ffffff;
   border: 1px solid #d0d0d0;
   border-radius: 19px;
+
   span {
     width: 31px;
     height: 13px;

src/views/caseManagement/components/timeDialog.vue

@@ -36,8 +36,9 @@ export default {
             loanStartDate: "",
             pickerOptions: {
                 disabledDate(time) {
-                    return time.getTime() < Date.now() - 8.64e7;
+                    return time.getTime() <= Date.now() -1 * 24 * 3600 * 1000; // 禁用超过当前时间的日期
-                }
+                },
+                selectableRange: `${new Date()}- 23:59:59`,//这
             },
             roomId: null
         };
@@ -48,7 +49,7 @@ export default {
                 // this.getEvidenceList({ caseAppliId: this.timeData.id, annexTypeList: "2" })
                 this.loanStartDate = this.timeData.hearDate
             }
-        }
+        },
     },
     created() {
 
@@ -97,7 +98,7 @@ export default {
                 id: this.timeData.id,
                 hearDate: this.loanStartDate
             })
-            await sendRoomNoMessageFn({
+            await this.sendRoomNoMessageFn({
                 id: this.timeData.id,
                 roomNo: this.roomId,
                 scheduleStartTime: 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>
@@ -291,7 +301,7 @@ import {
   creatTrialRecordnew,
   document,
 } from "@/api/caseManagement/caseManagement.js";
-
+import { reserveConferenceList } from '@/api/meeting/index.js'
 export default {
   props: ["showtrialincourt", "adjudicatename", "form", "queryParams"],
   data() {
@@ -307,12 +317,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 = [];
@@ -353,6 +366,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(

src/views/paymentManagement/paymentList.vue

@@ -10,12 +10,12 @@
             :value="dict.dictValue"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="是否完成" prop="selectCaseStatus">
+      <!-- <el-form-item label="是否完成" prop="selectCaseStatus">
         <el-select v-model="queryParams.selectCaseStatus" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
           <el-option v-for="dict in selectCaseStatusList" :key="dict.value" :label="dict.label"
             :value="dict.value"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="立案日期" prop="registerDate">
         <el-date-picker
           v-model="queryParams.registerDate"