src/api/awardManagement/awardManagement.js

@@ -131,3 +131,11 @@ export function emailByCaseId(data) {
         params: data
     })
 }
+// 仲裁员审核裁决书
+export function arbitratorCheckArbitrateRecord(data) {
+    return request({
+        url: '/caseApplication/arbitrator/checkArbitrateRecord',
+        method: 'post',
+        data: data
+    })
+}

src/api/officialSeal/officialSeal.js

@@ -112,4 +112,36 @@ export function bindHandler(data) {
         method: 'get',
         params: data
     })
+}
+// 查询模板
+export function getManagerList(data) {
+    return request({
+        url: '/template/list',
+        method: 'get',
+        params: data
+    })
+}
+// 新增模板
+export function insertManager(data) {
+    return request({
+        url: '/template/insert',
+        method: 'post',
+        data: data
+    })
+}
+// 删除模板
+export function deleteManager(data) {
+    return request({
+        url: '/template/delete',
+        method: 'delete',
+        params: data
+    })
+}
+// 修改模板
+export function updateManager(data) {
+    return request({
+        url: '/template/update',
+        method: 'put',
+        data: data
+    })
 }

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -74,10 +74,11 @@
             v-model="arbitrateRecord.verificaOpinion" />
         </el-form-item> -->
         <el-form-item label="笔录内容：" prop="responCrossOpin">
-            <!-- <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" /> -->
+          <!-- <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" /> -->
-            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin" placeholder="请输入" />
+          <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin"
-          </el-form-item>
+            placeholder="请输入" />
-        <el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2">
+        </el-form-item>
+        <el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2 || flag == 4">
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
         </el-form-item>
       </el-form>
@@ -94,6 +95,8 @@
         <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">同 意</el-button>
         <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button>
         <el-button type="primary" @click="submitForm(3)" v-if="flag == 3">提 交</el-button>
+        <el-button type="primary" @click="submitForm(5)" v-if="flag == 4">同 意</el-button>
+        <el-button type="danger" @click="submitForm(6)" v-if="flag == 4">驳 回</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -105,7 +108,8 @@ import {
   verificationArbitrateRecord,
   checkArbitrateRecord,
   adjudicationSignature,
-  regenerationDocument
+  regenerationDocument,
+  arbitratorCheckArbitrateRecord
 } from "@/api/awardManagement/awardManagement";
 export default {
   props: ["openDialog", "title", "flag", "detailform"],
@@ -116,7 +120,7 @@ export default {
       form: {},
       arbitrateRecord: {
         // checkOpinion:"同意"
-        checkOpinion:""
+        checkOpinion: ""
       },
       // 表单校验
       rules: {
@@ -191,14 +195,14 @@ export default {
             (this.awardFileArr = []), //裁决书
             (this.awardPathArr = []), //裁决书
             // setTimeout(() => {
-              this.form = this.detailform;
+            this.form = this.detailform;
-              // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
+          // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
-                // this.form.arbitrateRecord.checkOpinion = '同意';
+          // this.form.arbitrateRecord.checkOpinion = '同意';
-                this.arbitrateRecord.checkOpinion = '';
+          this.arbitrateRecord.checkOpinion = '';
-              // }
+          // }
-              // this.arbitrateRecord = this.form.arbitrateRecord;
+          // this.arbitrateRecord = this.form.arbitrateRecord;
-              this.evidenceFile(this.form);
+          this.evidenceFile(this.form);
-            // }, 1000);
+          // }, 1000);
         }
       },
     },
@@ -210,7 +214,7 @@ export default {
         this.applicantFileArr = [];
         this.applicantPathArr = [];
         this.respondentFileArr = [];
-        this.respondenPathArr = [];        
+        this.respondenPathArr = [];
         this.awardFileArr = [];
         this.awardPathArr = [];
         this.bookFileArr = [];
@@ -261,6 +265,14 @@ export default {
         this.$message("成功");
       });
     },
+    // 仲裁员审核裁决书
+    arbitratorCheckArbitrateRecordFn(parms) {
+      arbitratorCheckArbitrateRecord(parms).then((res) => {
+        this.cancel();
+        this.$emit("updataList");
+        this.$message("成功");
+      });
+    },
     // 签名
     adjudicationSignatureFn(parms) {
       adjudicationSignature(parms).then((res) => {
@@ -308,6 +320,18 @@ export default {
             paramsData.arbitrateRecord = this.arbitrateRecord;
             paramsData.id = this.form.id
             this.getRegenerationDocument(paramsData)
+          } else if (parms == 5) {
+            this.arbitratorCheckArbitrateRecordFn({
+              id: this.form.id,
+              agreeOrNotCheck: 1,
+              arbitrateRecord: this.arbitrateRecord,
+            });
+          }else if (parms == 6) {
+            this.arbitratorCheckArbitrateRecordFn({
+              id: this.form.id,
+              agreeOrNotCheck: 2,
+              arbitrateRecord: this.arbitrateRecord,
+            });
           }
         }
       });

src/views/awardManagement/listofAwards.vue

@@ -7,8 +7,8 @@
             <el-form-item label="案件状态" prop="caseStatus">
                 <el-select :disabled="caseStatusType" v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable
                     @keyup.enter.native="handleQuery">
-                    <el-option v-for="dict in caseStatus" :key="dict.dictSort" :label="dict.dictLabel"
+                    <el-option v-for="dict in caseStatus" :key="dict.dictValue" :label="dict.dictLabel"
-                        :value="dict.dictSort"></el-option>
+                        :value="dict.dictValue"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="是否完成" prop="selectCaseStatus">
@@ -62,11 +62,14 @@
                         v-if="scope.row.filearbitraUrl && scope.row.filearbitraUrl !== ''"
                         @click="showModel(scope.row, 0)">查看裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
-                        v-if="scope.row.caseStatus == 11 && checkPermi(['awardManagement:list:check']) && btnStatus"
+                        v-if="scope.row.caseStatus == 11 && checkPermi(['awardManagement:list:secretarycheck'])"
-                        @click="showModel(scope.row, 1)">核查</el-button>
+                        @click="showModel(scope.row, 1)">秘书确认</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit"
+                        v-if="scope.row.caseStatus == 18 && checkPermi(['awardManagement:list:check']) && btnStatus"
+                        @click="showModel(scope.row, 4)">仲裁员确认</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         v-if="scope.row.caseStatus == 12 && checkPermi(['awardManagement:list:confirmaward']) && btnStatus"
-                        @click="showModel(scope.row, 2)">确认裁决书</el-button>
+                        @click="showModel(scope.row, 2)">部门长确认</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         v-if="scope.row.caseStatus == 13 && checkPermi(['awardManagement:list:sign']) && btnStatus"
                         @click="showModel(scope.row, 3)">签名</el-button>
@@ -182,9 +185,9 @@ export default {
             this.caseStatus = res.data;
             let params = this.$route.params.status;
             if (params) {
-                this.queryParams.caseStatus = params;
+                this.queryParams.caseStatus = params + '';
             }
-            this.queryParams.caseStatusList = [11, 12, 13, 14, 15, 16]
+            this.queryParams.caseStatusList = [11, 12, 13, 14, 15, 16, 18]
             this.getList(this.queryParams);
         })
         // 裁决书列表不显示 生成裁决书
@@ -208,7 +211,7 @@ export default {
             } else if (type == 3) {
                 this.operateTitle = '批量归档';
                 this.operateStatus = 3;
-            }else if (type == 5) {
+            } else if (type == 5) {
                 this.operateTitle = '批量核查';
                 this.operateStatus = 5;
             }
@@ -273,6 +276,12 @@ export default {
                         window.open(url)
                     })
                     break;
+                case 4:
+                    this.getDetail({ id: row.id });
+                    this.openDialog = true;
+                    this.title = "审核裁决书";
+                    this.flag = 4;
+                    break;
                 default:
                     break;
             }
@@ -339,7 +348,7 @@ export default {
         },
         // 根据案件id查询邮件
         emailByCaseIdFn(val) {
-            emailByCaseId({id: val}).then((res) => {
+            emailByCaseId({ id: val }).then((res) => {
                 this.emailobj = res.data
             })
         },

src/views/caseManagement/caseList.vue

@@ -17,8 +17,8 @@
       <el-form-item label="案件状态" prop="caseStatus">
         <el-select :disabled="caseStatusType" v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable
           @keyup.enter.native="handleQuery">
-          <el-option v-for="dict in caseStatus" :key="dict.dictSort" :label="dict.dictLabel"
+          <el-option v-for="dict in caseStatus" :key="dict.dictValue" :label="dict.dictLabel"
-            :value="dict.dictSort"></el-option>
+            :value="dict.dictValue"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="是否完成" prop="selectCaseStatus">
@@ -866,6 +866,6 @@ export default {
 <style>
 /* // #formContainer {} */
 .el-table .pendingTrial {
-    background:rgb(148, 224, 25);
+    background:oldlace;
   }
 </style>

src/views/caseManagement/components/trialincourtDialog.vue

@@ -110,16 +110,6 @@
             </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>
@@ -129,8 +119,21 @@
         <el-button @click="cancel" class="endbutton1"><span>关 闭</span></el-button>
       </div>
     </el-dialog>
-    <!-- <el-dialog title="庭审笔录" :visible="showArbitrationresults" @close="closeArbitrationresults" center>
+    <el-dialog title="庭审笔录" :visible="showArbitrationresults" @close="closeArbitrationresults" center>
       <el-form ref="form2" :model="form2" label-width="150px">
+        <!-- <el-col :span="12">
+          <el-form-item label="申请人是否缺席：" prop="isAbsence" :rules="[
+            {
+              required: true,
+              message: '请输入',
+            },
+          ]">
+            <el-radio-group v-model="form2.isAbsence">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col> -->
         <el-col :span="24">
           <el-form-item label="被申请人是否缺席：" prop="appliIsAbsen" :rules="[
             {
@@ -145,17 +148,138 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="笔录内容：" prop="responCrossOpin">
+          <el-form-item label="申请人是否缺席：" prop="isAbsence" :rules="[
-            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.responCrossOpin" placeholder="请输入" />
+            {
+              required: true,
+              message: '请输入',
+            },
+          ]">
+            <el-radio-group v-model="form2.isAbsence">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="被申请人对上述材料的质证意见" prop="respondentOpinion">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.respondentOpinion" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="申请人对上述材料的质证意见" prop="applicantOpinion">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.applicantOpinion" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="查明本案事实" prop="caseFacts">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.caseFacts" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="本案争议焦点" prop="caseFocus">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.caseFocus" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="12">
+          <el-form-item label="被申请人质证意见：" prop="responCrossOpin" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" v-model="form2.responCrossOpin" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="申请人质证意见：" prop="applicaCrossOpin" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" v-model="form2.applicaCrossOpin" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="被申请人的答辩意见：" prop="responDefenOpini" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" v-model="form2.responDefenOpini" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="经庭审质证，对各方提供的证据认定如下：" prop="evidenDetermi" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入" v-model="form2.evidenDetermi">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="仲裁庭经审理查明(写明仲裁庭认定的事实)：" prop="factDetermi" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入" v-model="form2.factDetermi">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="综上所述：" prop="caseSketch" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" autosize placeholder="请输入" v-model="form2.caseSketch">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="本庭认为：" prop="arbitrateThink" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" autosize placeholder="请输入" v-model="form2.arbitrateThink">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="裁决如下：" prop="rulingFollows" :rules="[
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur',
+            },
+          ]">
+            <el-input type="textarea" autosize placeholder="请输入" v-model="form2.rulingFollows">
+            </el-input>
+          </el-form-item>
+        </el-col> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="submitForm" class="endbutton">
           <span>确定</span></el-button>
         <el-button @click="closeArbitrationresults" class="endbutton1"><span>取 消</span></el-button>
       </div>
-    </el-dialog> -->
+    </el-dialog>
   </div>
 </template>
 
@@ -165,16 +289,16 @@ import {
   writtenHear,
   creatTrialRecord,
   document,
-  attachListByCaseId
 } from "@/api/caseManagement/caseManagement.js";
-import { reserveConferenceList } from '@/api/meeting/index.js'
+
 export default {
   props: ["showtrialincourt", "adjudicatename", "form", "queryParams"],
   data() {
     return {
       formData: {},
       user: "",
-      userId:1,
+      userId: 1,
+      showArbitrationresults: false,
       form2: {},
       applicateArr: [], //申请人案件资料
       quiltArr: [], //被申请人案件资料
@@ -182,15 +306,12 @@ 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 = [];
@@ -228,16 +349,9 @@ export default {
     },
   },
   created() {
-    
+
   },
   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(
@@ -262,7 +376,7 @@ export default {
     getUser() {
       getUserProfile().then((response) => {
         this.user = response.data.userName;
-        this.userId =  response.data.userId;
+        this.userId = response.data.userId;
       });
     },
     // 打开会议
@@ -272,58 +386,53 @@ export default {
         `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.roomId}`
       );
     },
-    // 生成庭申笔录
+    // 提交仲裁结果
     openArbitrationresults() {
-      attachListByCaseId({
+      this.showArbitrationresults = true;
-        caseAppliId:this.formData.id,
+    },
-        annexType:7
+    closeArbitrationresults() {
-      }).then(res=>{
+      this.showArbitrationresults = false;
-          console.log(res,"llllllll");
-          if(res.data.length == 0){
-            this.$modal.msgSuccess("请先进行会议");
-          }else{
-            this.recordArr = res.data;
-            this.$modal.msgSuccess("生成成功");
-          }
-      })
     },
-    // closeArbitrationresults() {
-    //   this.showArbitrationresults = false;
-    // },
     // 提交庭审笔录弹框结果
-    // submitForm() {
+    submitForm() {
-    //   this.$refs["form2"].validate((valid) => {
+      this.$refs["form2"].validate((valid) => {
-    //     if (valid) {
+        if (valid) {
-    //       creatTrialRecord({
+          creatTrialRecord({
-    //         caseAppliId: this.formData.id,
+            caseAppliId: this.formData.id,
-    //         evidenDetermi: this.form2.evidenDetermi,
+            // evidenDetermi: this.form2.evidenDetermi,
-    //         factDetermi: this.form2.factDetermi,
+            // factDetermi: this.form2.factDetermi,
-    //         caseSketch: this.form2.caseSketch,
+            // caseSketch: this.form2.caseSketch,
-    //         arbitrateThink: this.form2.arbitrateThink,
+            // arbitrateThink: this.form2.arbitrateThink,
-    //         rulingFollows: this.form2.rulingFollows,
+            // rulingFollows: this.form2.rulingFollows,
-    //         isAbsence: this.form2.isAbsence,
+            // isAbsence: this.form2.isAbsence,
-    //         appliIsAbsen: this.form2.appliIsAbsen,
+            // appliIsAbsen: this.form2.appliIsAbsen,
-    //         responCrossOpin: this.form2.responCrossOpin,
+            // responCrossOpin: this.form2.responCrossOpin,
-    //         applicaCrossOpin: this.form2.applicaCrossOpin,
+            // applicaCrossOpin: this.form2.applicaCrossOpin,
-    //         responDefenOpini: this.form2.responDefenOpini,
+            // responDefenOpini: this.form2.responDefenOpini,
-    //       })
+            isAbsence: this.form2.isAbsence,
-    //         .then((res) => {
+            appliIsAbsen: this.form2.appliIsAbsen,
-    //           res.data.caseAttachList.forEach((item) => {
+            respondentOpinion: this.form2.respondentOpinion,
-    //             if (item.annexType == 7) {
+            applicantOpinion: this.form2.applicaCrossOpin,
-    //               this.recordArr.push({
+            caseFacts: this.form2.caseFacts,
-    //                 annexName: item.annexName,
+            caseFocus: this.form2.caseFocus
-    //                 annexPath: item.annexPath,
+          })
-    //               });
+            .then((res) => {
-    //             }
+              res.data.caseAttachList.forEach((item) => {
-    //           });
+                if (item.annexType == 7) {
-    //           this.$modal.msgSuccess("提交成功");
+                  this.recordArr.push({
-    //           this.showsubmit = false;
+                    annexName: item.annexName,
-    //           this.closeArbitrationresults();
+                    annexPath: item.annexPath,
-    //         })
+                  });
-    //         .catch((err) => { });
+                }
-    //     }
+              });
-    //   });
+              this.$modal.msgSuccess("提交成功");
-    // },
+              this.showsubmit = false;
+              this.closeArbitrationresults();
+            })
+            .catch((err) => { });
+        }
+      });
+    },
     cancel() {
       this.$emit("canceltrialincourt");
     },

src/views/index.vue

@@ -113,6 +113,15 @@
           <div class="imgTitle">待核验仲裁文书</div>
         </div>
       </div>
+      <div class="cardList" v-hasPermi="['home:arbitratorCheck']" @click="pushPage(18)">
+        <div class="badge">{{ dataCount.caseApplyAwardCheck }}</div>
+        <div class="cardMain">
+          <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']" @click="pushPage(12)">
         <div class="badge">{{ dataCount.caseApplyAwardConfirm }}</div>
         <div class="cardMain">
@@ -131,12 +140,13 @@
           <div class="imgTitle">待仲裁文书签名</div>
         </div>
       </div>
-      <div class="cardList" v-hasPermi="['home:caseApplyAwardSignature']" @click="pushPage(14)">
+      <div class="cardList" v-hasPermi="['home:seal']" @click="pushPage(14)">
         <div class="badge">{{ dataCount.caseApplyAwardSeal }}</div>
         <div class="cardMain">
           <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
         </div>
         <div class="cardMain">
+
           <div class="imgTitle">待仲裁文书用印</div>
         </div>
       </div>
@@ -185,11 +195,11 @@ export default {
     // 点击代办案件按钮
     pushPage(status) {
       if (status == 0 || status == 1 || status == 2 || status == 5 || status == 6 || status == 7 || status == 31 || status == 8 || status == 9) {
-        this.$router.push({ name: 'CaseManagement/caseList', params: { status: status } })
+        this.$router.push({ name: 'CaseManagement/caseList', params: { status: status + '' } })
-      } else if (status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16) {
+      } else if (status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16 || status == 18) {
-        this.$router.push({ name: 'AwardManagement/listofAwards', params: { status: status } })
+        this.$router.push({ name: 'AwardManagement/listofAwards', params: { status: status + '' } })
       } else if (status == 3){
-        this.$router.push({ name: 'PaymentManagement/paymentList', params: { status: status } })
+        this.$router.push({ name: 'PaymentManagement/paymentList', params: { status: status + ''} })
       }
     }
     // goTarget(href) {
@@ -270,7 +280,7 @@ export default {
         }
 
         .imgTitle {
-          font-size: 20px;
+          font-size: 18px;
           font-weight: 600;
         }
       }

src/views/officialSeal/components/addManager.vue

@@ -0,0 +1,94 @@
+<template>
+    <div>
+        <el-dialog title="新增模板" :visible="uploadVisable" v-if="uploadVisable" @close="cancel" width="600px" center>
+            <el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="90px"
+                class="demo-ruleForm">
+                <el-form-item label="模板名称" prop="name">
+                    <el-input v-model="ruleForm.name"></el-input>
+                </el-form-item>
+                <el-form-item label="模板类型" prop="type">
+                    <el-select v-model="ruleForm.type" placeholder="请选择">
+                        <el-option v-for="dict in dict.type.manager_type" :key="dict.value" :label="dict.label"
+                            :value="dict.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="模板内容" prop="content">
+                    <el-input type="textarea" placeholder="请输入内容" v-model="ruleForm.content">
+                    </el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+                <el-button type="primary" @click="submitUpload" class="endbutton"><span>确认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { getToken } from "@/utils/auth";
+import {
+    insertManager,
+} from "@/api/officialSeal/officialSeal.js";
+export default {
+    props: ["uploadVisable", "uploadData", "queryParams"],
+    dicts: ["manager_type"],
+    data() {
+        return {
+            fileList: [],
+            data: [],
+            tempList: [],
+            isImg: false,
+            headers: {
+                Authorization: "Bearer " + getToken(),
+            },
+            filedata: {},
+            flagBtn: false,
+            ruleForm: {},
+            rules: {
+                name: [
+                    { required: true, message: '请输入模板名称', trigger: 'blur' },
+                ],
+                type: [
+                    { required: true, message: '请输入模板名称', trigger: 'blur' },
+                ],
+                content: [
+                    { required: true, message: '请输入模板名称', trigger: 'blur' },
+                ]
+            }
+        };
+    },
+    watch: {
+        uploadVisable(val) {
+            if (val) {
+                this.ruleForm = {};
+            }
+        }
+    },
+    created() {
+
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelUpload");
+        },
+        // 新增模板
+        insertManagerFn(data) {
+            insertManager(data).then(res => {
+                this.$message.success('新增成功');
+                this.$emit("cancelUpload");
+                this.$emit('getList', this.queryParams);
+            })
+        },
+        submitUpload() {
+            this.$refs['ruleForm'].validate((valid) => {
+                if (valid) {
+                    console.log(this.ruleForm, "LLLLLLLLLLLLLLLLLLLLLLL");
+                    this.insertManagerFn(this.ruleForm)
+                }
+            });
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped></style>

src/views/officialSeal/components/editManager.vue

@@ -0,0 +1,90 @@
+<template>
+    <div>
+        <el-dialog title="修改模板" :visible="editVisable" v-if="editVisable" @close="cancel" width="600px" center>
+            <el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="90px"
+                class="demo-ruleForm">
+                <el-form-item label="模板名称" prop="name">
+                    <el-input v-model="ruleForm.name"></el-input>
+                </el-form-item>
+                <el-form-item label="模板类型" prop="type">
+                    <el-select v-model="ruleForm.type" placeholder="请选择">
+                        <el-option v-for="dict in dict.type.manager_type" :key="dict.value" :label="dict.label"
+                            :value="dict.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="模板内容" prop="content">
+                    <el-input type="textarea" placeholder="请输入内容" v-model="ruleForm.content">
+                    </el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+                <el-button type="primary" @click="submitUpload" class="endbutton"><span>确认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { updateManager } from "@/api/officialSeal/officialSeal"
+export default {
+    props: ["editVisable", "editData", "queryParams"],
+    dicts: ["manager_type"],
+    data() {
+        return {
+            data: [],
+            flagBtn: false,
+            ruleForm: {},
+            rules: {
+                name: [
+                    { required: true, message: '请输入模板名称', trigger: 'blur' },
+                ],
+                type: [
+                    { required: true, message: '请输入模板名称', trigger: 'blur' },
+                ],
+                content: [
+                    { required: true, message: '请输入模板名称', trigger: 'blur' },
+                ]
+            }
+        };
+    },
+    watch: {
+        editData(val) {
+            if (val) {
+                this.ruleForm = val;
+                this.fileList = [];
+                this.ruleForm.type = this.ruleForm.type + '';
+            }
+        }
+    },
+    created() {
+
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelEdit");
+        },
+        // 修改模板
+        updateManagerFn(data) {
+            updateManager(data).then(res => {
+                this.$message.success('修改成功');
+                this.$emit("cancelEdit");
+                this.$emit('getList', this.queryParams);
+            })
+        },
+        submitUpload() {
+            this.$refs['ruleForm'].validate((valid) => {
+                if (valid) {
+                    this.updateManagerFn({
+                        name: this.ruleForm.name,
+                        content: this.ruleForm.content,
+                        type: this.ruleForm.type,
+                        id:this.ruleForm.id
+                    })
+                }
+            });
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped></style>

src/views/officialSeal/templateManager.vue

@@ -0,0 +1,140 @@
+<template>
+    <div class="app-container">
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addtemplate">新增模板</el-button>
+                <!-- v-hasPermi="['caseManagement:list:add']" -->
+            </el-col>
+        </el-row>
+        <el-table v-loading="loading" :data="dataList" style="width: 100%">
+            <el-table-column label="序号" type="index" align="center">
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="模板名称" align="center" prop="name" :show-overflow-tooltip="true" />
+            <el-table-column label="模板内容" align="center" prop="content" :show-overflow-tooltip="true" />
+            <el-table-column label="模板类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="deleteTemplate(scope.row)" type="text" icon="el-icon-delete">删除</el-button>
+                    <el-button size="mini" @click="eidtTemplate(scope.row)" type="text" icon="el-icon-edit">修改模板</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList(queryParams)" />
+       
+        <addManager :uploadVisable="uploadVisable" @cancelUpload="cancelUpload" :uploadData="uploadData" @getList="getList" :queryParams="queryParams">
+        </addManager>
+        <editManager :editVisable="editVisable" @cancelEdit="cancelEdit" @getList="getList" :editData="editData" :queryParams="queryParams"></editManager>
+    </div>
+</template>
+  
+<script>
+import {
+    getManagerList,
+    deleteManager
+} from "@/api/officialSeal/officialSeal.js";
+
+import addManager from "./components/addManager";
+import editManager from "./components/editManager";
+export default {
+    name: "paymentList",
+    components: {
+        addManager,
+        editManager
+    },
+    data() {
+        return {
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+            },
+            // 遮罩层
+            loading: false,
+            // 总条数
+            total: 0,
+            // 表格数据
+            form: {},
+            // 校验表单
+            rules: {},
+            dataList: [],
+            operateVisable: false,//新增弹窗
+            uploadVisable: false,//上传弹窗
+            uploadData: {},
+            sealData: {},
+            editVisable:false,
+            editData:{}
+        };
+    },
+    created() {
+        this.getList(this.queryParams)
+    },
+    methods: {
+        // 删除
+        deleteTemplate(row) {
+            this.$modal
+                .confirm("是否删除")
+                .then((res) => {
+                    this.deleteSealFn({ id: row.id })
+                })
+        },
+        // 删除接口
+        deleteSealFn(data) {
+            deleteManager(data).then(res => {
+                this.$modal.msgSuccess("删除成功！");
+                this.getList(this.queryParams);
+            })
+        },
+        // 新增模板
+        addtemplate(row) {
+            this.uploadVisable = true;
+            this.uploadData = row;
+        },
+        cancelUpload() {
+            this.uploadVisable = false;
+        },
+        // 编辑
+        eidtTemplate(row) {
+            this.editVisable = true;
+            this.editData = row;
+        },
+        cancelEdit() {
+            this.editVisable = false;
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList(this.queryParams);
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 查询列表数据
+        getList(parms) {
+            this.loading = true;
+            getManagerList(parms).then((response) => {
+                this.dataList = response.rows;
+                this.dataList.forEach(item => {
+                    if(item.type == 1){
+                        item.typeName = '裁决内容'
+                    }else if(item.type == 2){
+                        item.typeName = '调解协议'
+                    }else if(item.type == 3){
+                        item.typeName = '金融消费纠纷基本情况'
+                    }
+                });
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped></style>

src/views/paymentManagement/paymentList.vue

@@ -6,8 +6,8 @@
       </el-form-item>
       <el-form-item label="案件状态" prop="caseStatus">
         <el-select :disabled="caseStatusType" v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable @keyup.enter.native="handleQuery">
-          <el-option v-for="dict in caseStatus" :key="dict.dictSort" :label="dict.dictLabel"
+          <el-option v-for="dict in caseStatus" :key="dict.dictValue" :label="dict.dictLabel"
-            :value="dict.dictSort"></el-option>
+            :value="dict.dictValue"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="是否完成" prop="selectCaseStatus">

src/views/system/user/index.vue

@@ -122,7 +122,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门">
+                <el-tooltip slot="option-label" slot-scope="{node, shouldShowCount, count,labelClassName, countClassName}"
+                  :content="node.label" :class="labelClassName" placement="top-start">
+                  <span>{{ node.label }}</span>
+                </el-tooltip>
+              </treeselect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,7 +194,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="身份证号码" prop="idCard">
-              <el-input v-model="form.idCard" placeholder="请输入身份证号码"/>
+              <el-input v-model="form.idCard" placeholder="请输入身份证号码" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -327,7 +332,7 @@ export default {
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
         email: [
-        {
+          {
             required: true,
             message: '邮箱不能为空',
             trigger: 'blur',