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

src/api/awardManagement/awardManagement.js

@@ -105,4 +105,12 @@ export function selectSealUrl(data) {
         method: 'post',
         data: data
     })
+}
+// 裁决书列表查询裁决书
+export function selectSignSealUrl(data) {
+    return request({
+        url: '/caseApplication/selectSignSealUrl',
+        method: 'post',
+        data: data
+    })
 }

src/api/caseManagement/caseManagement.js

@@ -17,6 +17,14 @@ export function writtenHear(data) {
     data: data,
   });
 }
+// 生成庭审笔录
+export function creatTrialRecord(data) {
+  return request({
+    url: "/caseApplication/creatTrialRecord",
+    method: "post",
+    data: data,
+  });
+}
 // 组庭确认
 export function pendTralSure(data) {
   return request({

src/router/index.js

@@ -65,14 +65,14 @@ export const constantRoutes = [
     path: '',
     component: Layout,
     redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+    // children: [
+    //   {
+    //     path: 'index',
+    //     component: () => import('@/views/index'),
+    //     name: 'Index',
+    //     meta: { title: '首页', icon: 'dashboard', affix: true }
+    //   }
+    // ]
   },
   {
     path: '/user',

src/views/awardManagement/listofAwards.vue

@@ -90,7 +90,8 @@ import {
     adjudicationCaseFile,
     adjudicationStamp,
     selectSignUrl,
-    selectSealUrl
+    selectSealUrl,
+    selectSignSealUrl
 } from "@/api/awardManagement/awardManagement";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
 import mailawardDialog from './components/MailawardDialog.vue';
@@ -168,8 +169,10 @@ export default {
 
             switch (type) {
                 case 0:
-                    let url = row.filearbitraUrl;
-                    window.open(url)
+                    selectSignSealUrl({ id: row.id }).then(res => {
+                        let url = res.data.filearbitraUrl;
+                        window.open(url)
+                    })
                     break;
                 case 1:
                     this.getDetail({ id: row.id });

src/views/caseManagement/caseList.vue

@@ -280,7 +280,7 @@
             "
             >开庭审理</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-document"
@@ -290,15 +290,6 @@
               checkPermi(['caseManagement:list:createaward'])
             "
             >生成裁决书</el-button
-          >
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-receiving"
-            @click="fileRow(scope.row)"
-            v-if="scope.row.caseStatus == 16"
-            v-hasPermi="['monitor:online:forceLogout']"
-            >归档</el-button
           > -->
         </template>
       </el-table-column>
@@ -535,6 +526,9 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.caseStatusList = [];
+      if (!this.queryParams.caseStatus ) {
+        this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10]
+      }
       this.queryParams.pageNum = 1;
       this.getcaseApply(this.queryParams);
     },
@@ -721,22 +715,22 @@ export default {
     canceltrialincourt() {
       this.showtrialincourt = false;
     },
-    //  生成裁决书
-    generateawardRow(row) {
-      console.log(row, "生成裁决书");
-      this.$modal
-        .confirm("确定生成裁决书吗？")
-        .then(function () {
-          return document({ id: row.id });
-        })
-        .then((res) => {
-          if (res.code == 200) {
-            this.getcaseApply(this.queryParams);
-            this.$modal.msgSuccess("裁决书生成成功");
-          }
-        })
-        .catch(() => {});
-    },
+    //  生成裁决书 2023.10.15裁决书生成为自动，已合并如庭审提交
+    // generateawardRow(row) {
+    //   console.log(row, "生成裁决书");
+    //   this.$modal
+    //     .confirm("确定生成裁决书吗？")
+    //     .then(function () {
+    //       return document({ id: row.id });
+    //     })
+    //     .then((res) => {
+    //       if (res.code == 200) {
+    //         this.getcaseApply(this.queryParams);
+    //         this.$modal.msgSuccess("裁决书生成成功");
+    //       }
+    //     })
+    //     .catch(() => {});
+    // },
     // 归档
     fileRow(row) {
       console.log(row, "归档");

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -13,7 +13,7 @@
         label-width="180px"
         :disabled="true"
       >
-        <p>案件信息：</p>
+        <div class="caseInfo">案件信息：</div>
         <el-divider></el-divider>
         <el-row>
           <el-col :span="12">
@@ -299,7 +299,7 @@
         </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">提交庭审笔录</el-button>
+        <el-button type="primary" @click="submitForm">提交仲裁结果</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -326,21 +326,23 @@ export default {
           this.applicateArr = [];
           this.quiltArr = [];
           this.formData = this.form;
-          setTimeout(() => {    
-          this.adjudicatename.caseAttachList.forEach(item => {
-            if (item.annexType == 2) {
-                this.applicateArr.push({
-                  annexName: item.annexName,
-                  annexPath: item.annexPath,
-                });
-              }
-              if (item.annexType == 6) {
-                this.quiltArr.push({
-                  annexName: item.annexName,
-                  annexPath: item.annexPath,
-                });
-              }
-          });
+          setTimeout(() => {
+            if (this.adjudicatename.caseAttachList.length > 0) {
+              this.adjudicatename.caseAttachList.forEach(item => {
+                if (item.annexType == 2) {
+                    this.applicateArr.push({
+                      annexName: item.annexName,
+                      annexPath: item.annexPath,
+                    });
+                  }
+                  if (item.annexType == 6) {
+                    this.quiltArr.push({
+                      annexName: item.annexName,
+                      annexPath: item.annexPath,
+                    });
+                  }
+              });
+            }          
           }, 500);
           this.form2 = {};
         }
@@ -395,4 +397,8 @@ export default {
   background: #ffffff;
   border-radius: 20px;
 }
+.caseInfo {
+  font-size: 17px;
+  font-weight: 600;
+}
 </style>

src/views/caseManagement/components/trialincourtDialog.vue

@@ -12,7 +12,7 @@
         label-width="180px"
         :disabled="true"
       >
-        <p>案件信息：</p>
+        <div class="caseInfo">案件信息：</div>
         <el-divider></el-divider>
         <el-row>
           <el-col :span="12">
@@ -124,52 +124,59 @@
           </el-form-item>
         </el-col> -->
         <el-col :span="24">
-            <el-form-item
-              label="申请人案件证据："
-            >
-              <div v-if="applicateArr.length == 0">申请人暂未提供证据！</div>
-              <div v-else v-for="(item, index) in applicateArr" :key="index">
-                <a href="#" @click="toFile(item, index)" style="color: blue">
-                  {{ item.annexName }}
-                </a>
-              </div>
-            </el-form-item>
+          <el-form-item label="申请人案件证据：">
+            <div v-if="applicateArr.length == 0">申请人暂未提供证据！</div>
+            <div v-else v-for="(item, index) in applicateArr" :key="index">
+              <a href="#" @click="toFile(item, index)" style="color: blue">
+                {{ item.annexName }}
+              </a>
+            </div>
+          </el-form-item>
         </el-col>
         <el-col :span="24">
-            <el-form-item
-              label="被申请人案件证据："
-            >
+          <el-form-item label="被申请人案件证据：">
             <div v-if="quiltArr.length == 0">被申请人暂未提供证据！</div>
             <div v-for="(item, index) in quiltArr" :key="index">
-                <a href="#" @click="toFile1(item, index)" style="color: blue">
-                  {{ item.annexName }}
-                </a>
+              <a href="#" @click="toFile1(item, index)" style="color: blue">
+                {{ item.annexName }}
+              </a>
             </div>
-            </el-form-item>
+          </el-form-item>
         </el-col>
-      <!-- </el-form> -->
+        <el-col :span="24" v-if="recordArr.length > 0">
+          <el-form-item label="庭审笔录：">
+            <div
+              v-for="(item, index) in recordArr"
+              :key="index"
+              style="color: blue"
+            >
+              <a href="#" @click="toFile2(item, index)">{{ item.annexName }}</a>
+            </div>
+          </el-form-item>
+        </el-col>
+        <!-- </el-form> -->
       </el-form>
-      <el-button @click="openmeeting" type="primary"
-        >发起会议
-        <!-- <iframe src="http://47.97.117.253:9005/#/">发起会议</iframe> -->
-      </el-button>
-      <el-button @click="openArbitrationresults" type="primary"
+      <el-button @click="openmeeting" type="primary">发起会议</el-button>
+      <el-button
+        @click="openArbitrationresults"
+        type="primary"
+        v-if="this.recordArr.length <= 0"
         >生成庭审笔录</el-button
-      >    
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button @click="submitForm" class="endbutton"
-          ><span>结束审理</span></el-button
-        > -->
-        <el-button @click="openArbitrationresults" class="endbutton"
-        ><span>提交庭审笔录</span></el-button
       >
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          class="endbutton"
+          :disabled="showsubmit && recordArr.length == 0"
+          @click="submitResults"
+          >提交</el-button
+        >
         <el-button @click="cancel" class="endbutton1"
           ><span>关 闭</span></el-button
         >
       </div>
     </el-dialog>
     <el-dialog
-      title="提交庭审笔录"
+      title="生成庭审笔录"
       :visible="showArbitrationresults"
       @close="closeArbitrationresults"
       center
@@ -283,7 +290,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="submitForm" class="endbutton">
-          <span>提交</span></el-button
+          <span>确定</span></el-button
         >
         <el-button @click="closeArbitrationresults" class="endbutton1"
           ><span>取 消</span></el-button
@@ -295,7 +302,11 @@
 
 <script>
 import { getUserProfile } from "@/api/system/user";
-import { writtenHear } from "@/api/caseManagement/caseManagement.js";
+import {
+  writtenHear,
+  creatTrialRecord,
+  document,
+} from "@/api/caseManagement/caseManagement.js";
 
 export default {
   props: ["showtrialincourt", "adjudicatename", "form", "queryParams"],
@@ -305,33 +316,49 @@ export default {
       user: "",
       showArbitrationresults: false,
       form2: {},
-      applicateArr: [],//申请人案件资料
-      quiltArr: [],//被申请人案件资料
+      applicateArr: [], //申请人案件资料
+      quiltArr: [], //被申请人案件资料
+      recordArr: [], //笔录附件
+      showsubmit: true, //生成庭审笔录，方可提交
+      annexName: "", //笔录文件名
+      annexPath: "", //笔录文件地址
     };
   },
   watch: {
     showtrialincourt: {
       handler(val) {
         if (val) {
-          this.formData = this.form;      
+          this.formData = this.form;
           this.applicateArr = [];
           this.quiltArr = [];
-          setTimeout(() => {    
-          this.adjudicatename.caseAttachList.forEach(item => {
-            if (item.annexType == 2) {
-                this.applicateArr.push({
-                  annexName: item.annexName,
-                  annexPath: item.annexPath,
-                });
-              }
-              if (item.annexType == 6) {
-                this.quiltArr.push({
-                  annexName: item.annexName,
-                  annexPath: item.annexPath,
-                });
-              }
-          });
-          }, 500);
+          this.recordArr = [];
+          setTimeout(() => {
+            if (this.adjudicatename.caseAttachList.length > 0) {
+              this.adjudicatename.caseAttachList.forEach((item) => {
+                // 申请人案件附件
+                if (item.annexType == 2) {
+                  this.applicateArr.push({
+                    annexName: item.annexName,
+                    annexPath: item.annexPath,
+                  });
+                }
+                // 被申请人案件附件
+                if (item.annexType == 6) {
+                  this.quiltArr.push({
+                    annexName: item.annexName,
+                    annexPath: item.annexPath,
+                  });
+                }
+                // 笔录生成附件
+                if (item.annexType == 7) {
+                  this.recordArr.push({
+                    annexName: item.annexName,
+                    annexPath: item.annexPath,
+                  });
+                }
+              });
+            }
+          }, 1000);
         }
       },
     },
@@ -340,7 +367,7 @@ export default {
     this.getUser();
   },
   methods: {
-     // 详情显示，展示申请人案件文件
+    // 详情显示，展示申请人案件文件
     toFile(item, index) {
       window.open(
         window.location.origin + "/API" + this.applicateArr[index].annexPath,
@@ -354,6 +381,13 @@ export default {
         "_black"
       );
     },
+    // 庭审笔录附件
+    toFile2(item, index) {
+      window.open(
+        window.location.origin + "/API" + this.recordArr[index].annexPath,
+        "_black"
+      );
+    },
     getUser() {
       getUserProfile().then((response) => {
         this.user = response.data.userName;
@@ -361,8 +395,9 @@ export default {
     },
     // 打开会议
     openmeeting() {
-      // window.open('https://txroom.xayunmei.com');
-      window.open(`https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}`);
+      window.open(
+        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}`
+      );
     },
     // 提交仲裁结果
     openArbitrationresults() {
@@ -371,10 +406,26 @@ export default {
     closeArbitrationresults() {
       this.showArbitrationresults = false;
     },
+    // 提交庭审笔录弹框结果
     submitForm() {
       this.$refs["form2"].validate((valid) => {
         if (valid) {
-          writtenHear({
+          //   writtenHear({
+          //     caseAppliId: this.formData.id,
+          //     evidenDetermi: this.form2.evidenDetermi,
+          //     factDetermi: this.form2.factDetermi,
+          //     caseSketch: this.form2.caseSketch,
+          //     arbitrateThink: this.form2.arbitrateThink,
+          //     rulingFollows: this.form2.rulingFollows,
+          //   })
+          //     .then((res) => {
+          //       this.$modal.msgSuccess("提交成功");
+          //       this.cancel();
+          //       this.closeArbitrationresults();
+          //       this.$emit("getcaseApply", this.queryParams);
+          //     })
+          //     .catch((err) => {});
+          creatTrialRecord({
             caseAppliId: this.formData.id,
             evidenDetermi: this.form2.evidenDetermi,
             factDetermi: this.form2.factDetermi,
@@ -383,10 +434,17 @@ export default {
             rulingFollows: this.form2.rulingFollows,
           })
             .then((res) => {
+              res.data.caseAttachList.forEach((item) => {
+                if (item.annexType == 7) {
+                  this.recordArr.push({
+                    annexName: item.annexName,
+                    annexPath: item.annexPath,
+                  });
+                }
+              });
               this.$modal.msgSuccess("提交成功");
-              this.cancel();
+              this.showsubmit = false;
               this.closeArbitrationresults();
-              this.$emit("getcaseApply", this.queryParams);
             })
             .catch((err) => {});
         }
@@ -395,6 +453,20 @@ export default {
     cancel() {
       this.$emit("canceltrialincourt");
     },
+    // 提交开庭审理结果
+    submitResults() {
+      console.log(this.formData.id, "this.formData.id");
+      let id = this.formData.id;
+      document({
+        id: id,
+      }).then((res) => {
+        console.log(res, "提交开庭审理结果");
+        if (res.code == 200) {
+          this.$emit("getcaseApply", this.queryParams);
+          this.cancel();
+        }
+      });
+    },
   },
 };
 </script>
@@ -410,6 +482,7 @@ export default {
   height: 37px;
   background: #488de2;
   border-radius: 19px;
+  color: #ffffff;
   span {
     width: 96px;
     height: 15px;
@@ -425,13 +498,17 @@ export default {
   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;
-  }
+  // span {
+  //   width: 31px;
+  //   height: 13px;
+  //   font-size: 16px;
+  //   font-family: Microsoft YaHei;
+  //   font-weight: 400;
+  color: #959595;
+  // }
+}
+.caseInfo {
+  font-size: 17px;
+  font-weight: 600;
 }
 </style>

src/views/index.vue

@@ -5,31 +5,139 @@
       <div class="headerMain">我的待办事项</div>
     </div>
     <div class="homeMain">
-        <div class="cardList">
+        <div class="cardList" v-hasPermi="['home:caseApplyCheck']">
           <!-- <div class="badge">32</div> -->
           <div class="cardMain" style="margin-top: 50px;">
             <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
           </div>
           <div class="cardMain">
-            <div class="imgTitle">待审查案件</div>
+            <div class="imgTitle">待立案审查</div>
           </div>
         </div>
-        <div class="cardList">
+        <div class="cardList" v-hasPermi="['home:caseApplyPay']">
           <!-- <div class="badge">32</div> -->
           <div class="cardMain" style="margin-top: 50px;">
-            <img class="iconImg" src="@/assets/images/daijiaofei.png" alt="">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待缴费</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyPayCheck']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待缴费确认</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyEvidence']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待案件质证</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyGroupCheck']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
           </div>
           <div class="cardMain">
-            <div class="imgTitle">待缴费案件</div>
+            <div class="imgTitle">待组庭审核</div>
           </div>
         </div>
-        <div class="cardList">
+        <div class="cardList" v-hasPermi="['home:caseApplyGroupConfirm']">
           <!-- <div class="badge">32</div> -->
           <div class="cardMain" style="margin-top: 50px;">
-            <img class="iconImg" src="@/assets/images/peisongzhong.png" alt="">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待组庭确定</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyGroupNotice']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待组庭通知</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyArbitrateWay']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待审核仲裁方式</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyGroupOnline']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
           </div>
           <div class="cardMain">
-            <div class="imgTitle">待送达案件</div>
+            <div class="imgTitle">待开庭审理</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyGroupOffline']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待书面审理</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyAwardCheck']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待核验仲裁文书</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyAwardConfirm']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待审核仲裁文书</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyAwardSignature']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待仲裁文书签发用印</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyAwardSend']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待仲裁文书送达</div>
+          </div>
+        </div>
+        <div class="cardList" v-hasPermi="['home:caseApplyStored']">
+          <!-- <div class="badge">32</div> -->
+          <div class="cardMain" style="margin-top: 50px;">
+            <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+          </div>
+          <div class="cardMain">
+            <div class="imgTitle">待案件归档</div>
           </div>
         </div>
     </div>
@@ -81,14 +189,16 @@ export default {
   .homeMain {
     width: 100%;
     display: flex;
-    justify-content: space-between;
-
+    flex-wrap: wrap;
+    // justify-content: space-between;
     .cardList {
       width: 30%;
       height: 300px;
       border-radius: 30px;
       background-color: #ffffff;
       position: relative;
+      margin-right: 30px;
+      margin-bottom: 30px;
       .badge{
         width: 50px;
         height: 30px;