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

src/views/caseFiling/archiveList.vue

@@ -1,15 +1,195 @@
 <template>
-    <div class="app-container">
-        归档列表
-    </div>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="案件编号" prop="caseNum">
+        <el-input
+          v-model="queryParams.caseNum"
+          placeholder="请输入案件编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="案件状态" prop="caseStatus">
+        <el-select
+          v-model="queryParams.caseStatus"
+          placeholder="请选择案件状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="dict in dict.type.case_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="开庭日期" prop="hearDate">
+        <el-date-picker
+          v-model="queryParams.hearDate"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <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="caseNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="案件标的"
+        align="center"
+        prop="caseSubjectAmount"
+      />
+      <el-table-column
+        label="立案日期"
+        align="center"
+        prop="registerDate"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="案件状态" align="center" prop="caseStatusName" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-reading"
+            @click="showDetail(scope.row)"
+            v-hasPermi="['monitor:online:forceLogout']"
+            >归档详情</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)"
+    />
+    <!-- 弹窗 -->
+    <!-- <paymentdetailsDialog :openDialog="openDialog" :detailform="detailform" :title="title" :flag="flag"
+            @cancelpaymentdetails="cancelpaymentdetails" @updataList="updataList"></paymentdetailsDialog> -->
+  </div>
 </template>
-
+  
 <script>
-    export default {
-        
-    }
-</script>
+import {
+  caseApplicationList,
+  caseApplicationDetail,
+} from "@/api/awardManagement/awardManagement";
+// import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
 
-<style lang="scss" scoped>
+export default {
+  name: "archiveList",
+  dicts: ["case_status"],
+  // components: { paymentdetailsDialog },
+  data() {
+    return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
 
-</style>
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      // 弹出层内容
+      form: {},
+      // 校验表单
+      rules: {},
+      dataList: [],
+      detailform: {}, //详情数据
+      openDialog: false, //详情数据弹框
+      flag: null,
+    };
+  },
+  created() {
+    this.queryParams.caseStatusList = [16];
+    this.getList(this.queryParams);
+  },
+  methods: {
+    updataList() {
+      this.getList(this.queryParams);
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList(this.queryParams);
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 查询列表数据
+    getList(parms) {
+      this.loading = true;
+      caseApplicationList(parms).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // model框显示
+    showDetail(row) {
+      this.getDetail({ id: row.id });
+      this.openDialog = true;
+    },
+    // 关闭弹窗
+    cancelpaymentdetails() {
+      this.openDialog = false;
+    },
+    /** 查询详情 */
+    getDetail(parms) {
+      caseApplicationDetail(parms).then((res) => {
+        this.detailform = res.data;
+      });
+    },
+  },
+};
+</script>
+  
+<style lang="scss" scoped></style>

src/views/caseManagement/caseList.vue

@@ -115,7 +115,11 @@
         prop="hearDate"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="案件状态" align="center" prop="caseStatusName" />
+      <el-table-column label="案件状态" align="center" prop="caseStatusName">
+        <template slot-scope="scope">
+          <el-tag type="success">{{ scope.row.caseStatusName }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -239,7 +243,10 @@
             v-hasPermi="['monitor:online:forceLogout']"
             >开庭审理</el-button
           >
-          <el-popconfirm title="确定生成裁决书吗？" @confirm="generateawardRow(scope.row)">
+          <el-popconfirm
+            title="确定生成裁决书吗？"
+            @confirm="generateawardRow(scope.row)"
+          >
             <el-button
               size="mini"
               slot="reference"
@@ -291,11 +298,11 @@
     ></batchDialog>
     <!-- 立案审查页面 -->
     <filingreviewDialog
-    :showfilingreview="showfilingreview"
-    :filingreviewdata="filingreviewdata"
-    :queryParams="queryParams"
-    @getcaseApply="getcaseApply"
-    @cancelFilingreview="cancelFilingreview"
+      :showfilingreview="showfilingreview"
+      :filingreviewdata="filingreviewdata"
+      :queryParams="queryParams"
+      @getcaseApply="getcaseApply"
+      @cancelFilingreview="cancelFilingreview"
     ></filingreviewDialog>
     <!-- 组庭页面---改为组庭审核 -->
     <formateCourtDialog
@@ -357,7 +364,7 @@ import choosetrialmethodDaiog from "./components/choosetrialmethodDaiog.vue";
 import adjudicaterecordDialog from "./components/adjudicaterecordDialog.vue";
 import trialincourtDialog from "./components/trialincourtDialog.vue";
 import payDialog from "./components/payDialog.vue";
-import filingreviewDialog from './components/filingreviewDialog.vue';
+import filingreviewDialog from "./components/filingreviewDialog.vue";
 
 import { caseApplicationDetail } from "@/api/pay/pay";
 import {
@@ -379,7 +386,7 @@ export default {
     adjudicaterecordDialog,
     trialincourtDialog,
     payDialog,
-    filingreviewDialog
+    filingreviewDialog,
   },
   data() {
     return {

src/views/caseManagement/components/batchDialog.vue

@@ -7,6 +7,7 @@
       width="600px"
       append-to-body
       @close="cancel"
+      center
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row>
@@ -54,8 +55,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm" class="endbutton"><span>确 定</span></el-button>
+        <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
       </div>
     </el-dialog>
   </div>
@@ -156,4 +157,38 @@ 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;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
+.endbutton1 {
+  width: 154px;
+  height: 37px;
+  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;
+  }
+}
 </style>

src/views/caseManagement/components/caseentryDialog.vue

@@ -6,7 +6,8 @@
       @close="cancel"
       width="1000px"
       append-to-body
-      :destroy-on-close= true
+      :destroy-on-close="true"
+      center
     >
       <!-- 案件信息 -->
       <el-form
@@ -180,6 +181,12 @@
                     message: '身份证号不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern:
+                      /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+                    message: '请输入正确的身份证号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input v-model="item.identityNum" placeholder="请输入" />
@@ -195,6 +202,11 @@
                     message: '联系电话不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
+                    message: '请输入正确的手机号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input v-model="item.contactTelphone" placeholder="请输入" />
@@ -273,6 +285,12 @@
                     message: '身份证号不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern:
+                      /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+                    message: '请输入正确的身份证号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input
@@ -291,6 +309,11 @@
                     message: '联系电话不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
+                    message: '请输入正确的手机号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input
@@ -374,6 +397,12 @@
                     message: '身份证号不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern:
+                      /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+                    message: '请输入正确的身份证号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input v-model="itm.identityNum" placeholder="请输入" />
@@ -389,6 +418,11 @@
                     message: '联系电话不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
+                    message: '请输入正确的手机号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input v-model="itm.contactTelphone" placeholder="请输入" />
@@ -458,6 +492,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <!--  -->
               <el-form-item
                 label="身份证号："
                 :prop="'paymentArr1.' + index + '.identityNumAgent'"
@@ -467,6 +502,12 @@
                     message: '身份证号不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern:
+                      /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+                    message: '请输入正确的身份证号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input v-model="itm.identityNumAgent" placeholder="请输入" />
@@ -482,6 +523,11 @@
                     message: '联系电话不能为空',
                     trigger: 'blur',
                   },
+                  {
+                    pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
+                    message: '请输入正确的手机号码',
+                    trigger: 'blur',
+                  },
                 ]"
               >
                 <el-input
@@ -519,10 +565,16 @@
         >新增被申请人主体信息</el-button
       >
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="flag != 0"
-          >确 定</el-button
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="flag != 0"
+          class="endbutton"
+          ><span>确 定</span></el-button
+        >
+        <el-button @click="cancel" class="endbutton1"
+          ><span>取 消</span></el-button
         >
-        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -540,7 +592,7 @@ export default {
     "flag",
     "initpaymentArr",
     "initpaymentArr1",
-    "queryParams"
+    "queryParams",
   ],
   data() {
     return {
@@ -786,4 +838,38 @@ export default {
   height: 700px !important;
   overflow: auto !important;
 }
+::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;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
+.endbutton1 {
+  width: 154px;
+  height: 37px;
+  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;
+  }
+}
 </style>

src/views/caseManagement/components/formateCourtDialog.vue

@@ -4,9 +4,9 @@
     <el-dialog
       title="组庭审核"
       :visible="showformateCourt"
-      width="800px"
       @close="cancel"
       :destroy-on-close="true"
+      center
     >
       <el-form label-width="150px">
         <el-form-item label="是否同意组庭：">
@@ -63,9 +63,12 @@
           type="primary"
           @click="submitForm"
           :disabled="!this.arbitrators.length > 0 && isAgreePendTral == 0"
-          >确 定</el-button
+          class="endbutton"
+          ><span>确 定</span></el-button
+        >
+        <el-button @click="cancel" class="endbutton1"
+          ><span>取 消</span></el-button
         >
-        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -127,7 +130,7 @@ export default {
       pendTralCheck(this.paramsdata).then((res) => {
         this.cancel();
         this.$modal.msgSuccess("组庭成功");
-        this.$emit("getcaseApply",this.queryParams);
+        this.$emit("getcaseApply", this.queryParams);
       });
       // }
     },
@@ -141,4 +144,39 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 422px;
+  height: 245px;
+  background: #ffffff;
+  border-radius: 20px;
+}
+.endbutton {
+  width: 124px;
+  height: 37px;
+  background: #0072ff;
+  border-radius: 19px;
+  span {
+    width: 32px;
+    height: 15px;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
+.endbutton1 {
+  width: 124px;
+  height: 37px;
+  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;
+  }
+}
 </style>

src/views/caseManagement/components/payDialog.vue

@@ -7,6 +7,7 @@
       width="800px"
       append-to-body
       :destroy-on-close="true"
+      center
     >
       <el-descriptions title="订单信息">
         <el-descriptions-item label="案件编号：">{{
@@ -41,7 +42,7 @@
       </div>
       <div class="payTitle">{{ payMain }}</div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="payCancel">取 消</el-button>
+        <el-button @click="payCancel" class="endbutton"><span>取 消</span></el-button>
       </div>
     </el-dialog>
   </div>
@@ -135,4 +136,24 @@ export default {
   width: 100%;
   text-align: center;
 }
+::v-deep .el-dialog {
+  width: 800px;
+  background: #ffffff;
+  border-radius: 20px;
+}
+.endbutton {
+  width: 154px;
+  height: 37px;
+  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;
+  }
+}
 </style>

src/views/caseManagement/components/trialincourtDialog.vue

@@ -128,7 +128,9 @@
         >发起会议
         <!-- <iframe src="http://47.97.117.253:9005/#/">发起会议</iframe> -->
       </el-button>
-      <el-button @click="openArbitrationresults" type="primary">提交仲裁结果</el-button>
+      <el-button @click="openArbitrationresults" type="primary"
+        >提交仲裁结果</el-button
+      >
       <div slot="footer" class="dialog-footer">
         <!-- <el-button @click="submitForm" class="endbutton"
           ><span>结束审理</span></el-button
@@ -139,9 +141,10 @@
       </div>
     </el-dialog>
     <el-dialog
-      title="仲裁结果"
+      title="提交仲裁结果"
       :visible="showArbitrationresults"
       @close="closeArbitrationresults"
+      center
     >
       <el-form ref="form2" :model="form2" label-width="150px">
         <el-col :span="24">
@@ -251,8 +254,12 @@
         </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="submitForm">提交</el-button>
-        <el-button @click="closeArbitrationresults">取 消</el-button>
+        <el-button @click="submitForm" class="endbutton">
+          <span>提交仲裁结果</span></el-button
+        >
+        <el-button @click="closeArbitrationresults" class="endbutton1"
+          ><span>取 消</span></el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -322,22 +329,22 @@ export default {
 .endbutton {
   width: 154px;
   height: 37px;
-  background: #ff5a00;
+  background: #0072ff;
   border-radius: 19px;
   span {
-    width: 65px;
-    height: 16px;
+    width: 96px;
+    height: 15px;
     font-size: 16px;
     font-family: Microsoft YaHei;
     font-weight: 400;
     color: #ffffff;
-    // line-height: 48px;
   }
 }
 .endbutton1 {
   width: 154px;
   height: 37px;
   background: #ffffff;
+  border: 1px solid #d0d0d0;
   border-radius: 19px;
   span {
     width: 31px;
@@ -346,7 +353,6 @@ export default {
     font-family: Microsoft YaHei;
     font-weight: 400;
     color: #959595;
-    // line-height: 48px;
   }
 }
 </style>

src/views/paymentManagement/components/paymentdetailsDialog.vue

@@ -6,6 +6,7 @@
       width="800px"
       @close="cancel"
       :destroy-on-close="true"
+      center
     >
       <el-form ref="form" :model="form" label-width="150px" :disabled="true">
         <el-form-item label="案件编号：" prop="caseNum">
@@ -36,10 +37,10 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="flag == 0"
-          >提 交</el-button
+        <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton"
+          >确认已缴费</el-button
         >
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" class="endbutton1">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -76,4 +77,39 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 800px;
+  background: #ffffff;
+  border-radius: 20px;
+}
+.endbutton {
+  width: 124px;
+  height: 37px;
+  background: #0072ff;
+  border-radius: 19px;
+  span {
+    width: 32px;
+    height: 15px;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #ffffff;
+    // line-height: 48px;
+  }
+}
+.endbutton1 {
+  width: 124px;
+  height: 37px;
+  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;
+  }
+}
 </style>

src/views/paymentManagement/paymentList.vue

@@ -15,7 +15,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="案件状态" prop="caseStatus">
+      <!-- <el-form-item label="案件状态" prop="caseStatus">
         <el-select
           v-model="queryParams.caseStatus"
           placeholder="请选择案件状态"
@@ -29,10 +29,10 @@
             :value="dict.value"
           ></el-option>
         </el-select>
-      </el-form-item>
-      <el-form-item label="开庭日期" prop="hearDate">
+      </el-form-item> -->
+      <el-form-item label="立案日期" prop="registerDate">
         <el-date-picker
-          v-model="queryParams.hearDate"
+          v-model="queryParams.registerDate"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
@@ -79,8 +79,12 @@
         :show-overflow-tooltip="true"
       />
       <!-- 缴费人 -->
-      <el-table-column label="缴费人" align="center" prop="caseArbitrator" />
-      <el-table-column label="缴费状态" align="center" prop="caseStatus" />
+      <!-- <el-table-column label="缴费人" align="center" prop="caseArbitrator" /> -->
+      <el-table-column label="案件状态" align="center" prop="caseStatusName">
+        <template slot-scope="scope">
+          <el-tag type="warning">{{ scope.row.caseStatusName }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -141,6 +145,7 @@ export default {
       queryParams: {
         caseNum: undefined,
         pageNum: 1,
+        caseStatusList: [3],
         registerDate: "",
         pageSize: 10,
       },