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

src/views/arbitratorsManagement/arbitratorsList.vue

@@ -0,0 +1,230 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="88px"
+    >
+      <el-form-item label="仲裁员姓名" prop="arbitratorName">
+        <el-input
+          v-model="queryParams.arbitratorName"
+          placeholder="请输入仲裁员姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="addArbitrator"
+          v-hasPermi="['monitor:job:add']"
+          >新增仲裁员</el-button
+        >
+      </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="arbitratorName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="职业"
+        align="center"
+        prop="career"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="专业分类"
+        align="center"
+        prop="professiClassifi"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="学历"
+        align="center"
+        prop="education"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="所在地区"
+        align="center"
+        prop="area"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="联系电话"
+        align="center"
+        prop="telephone"
+        :show-overflow-tooltip="true"
+      />
+      <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-zoom-in"
+            @click="detailRow(scope.row)"
+            v-hasPermi="['monitor:online:forceLogout']"
+            >详情</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="editRow(scope.row)"
+            v-hasPermi="['monitor:online:forceLogout']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="deleteRow(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="getArbitratorList"
+    />
+    <arbitrator-dialog
+      :showarbitrator="showarbitrator"
+      :dialogTitle="dialogTitle"
+      @closeArbitratorDialog="closeArbitratorDialog"
+      :formData="formData"
+      :flag="flag"
+    ></arbitrator-dialog>
+  </div>
+</template>
+
+<script>
+import arbitratorDialog from "./components/arbitratorDialog.vue";
+export default {
+  components: { arbitratorDialog },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 查询参数
+      queryParams: {
+        arbitratorName: null,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      formData: {}, // 弹框数据
+      dataList: [],
+      showarbitrator: false, //显示弹框
+      dialogTitle: "", //弹框标题
+      flag: null,
+    };
+  },
+  created() {
+    this.getArbitratorList(this.queryParams);
+  },
+  methods: {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getArbitratorList(this.queryParams);
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.getArbitratorList(this.queryParams);
+    },
+    // 获取仲裁员列表数据
+    getArbitratorList() {
+      this.dataList.push({
+        id: "1",
+        arbitratorName: "刘某",
+        career: "律师",
+        professiClassifi: "经济管理",
+        education: "本科",
+        area: "西安",
+        telephone: "18547451263",
+      });
+      this.total = this.dataList.length;
+      this.loading = false;
+    },
+    // 新增仲裁员
+    addArbitrator() {
+      this.showarbitrator = true;
+      this.dialogTitle = "新增";
+      this.flag = 0;
+      this.formData = {};
+    },
+    // 详情
+    detailRow(row) {
+      this.showarbitrator = true;
+      this.dialogTitle = "详情";
+      this.flag = 1;
+      this.formData = row;
+    },
+    // 修改
+    editRow(row) {
+      this.showarbitrator = true;
+      this.dialogTitle = "修改";
+      this.flag = 2;
+      this.formData = row;
+    },
+    // 关闭弹框
+    closeArbitratorDialog() {
+      this.showarbitrator = false;
+    },
+    // 删除
+    deleteRow() {
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {
+          // return removeCaseApply({ id: row.id });
+        })
+        .then((res) => {
+          this.getArbitratorList(this.queryParams);
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/arbitratorsManagement/components/arbitratorDialog.vue

@@ -0,0 +1,114 @@
+<template>
+  <div>
+    <!-- 仲裁员弹框 -->
+    <el-dialog
+      :title="dialogTitle"
+      :visible="showarbitrator"
+      @close="cancel"
+      :destroy-on-close="true"
+      center
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        label-width="100px"
+        :disabled="flag == 1"
+      >
+        <el-form-item label="仲裁员姓名：" prop="arbitratorName">
+          <el-input
+            v-model="form.arbitratorName"
+            placeholder="请输入仲裁员姓名"
+          />
+        </el-form-item>
+        <el-form-item label="职业：" prop="career">
+          <el-input v-model="form.career" placeholder="请输入职业" />
+        </el-form-item>
+        <el-form-item label="专业分类：" prop="professiClassifi">
+          <el-input v-model="form.professiClassifi" placeholder="请输入专业" />
+        </el-form-item>
+        <el-form-item label="学历：" prop="education">
+          <el-input v-model="form.education" placeholder="请输入学历" />
+        </el-form-item>
+        <el-form-item label="所在地区：" prop="area">
+          <el-input v-model="form.area" placeholder="请输入所在地区" />
+        </el-form-item>
+        <el-form-item label="电话：" prop="telephone">
+          <el-input v-model="form.telephone" placeholder="请输入电话" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <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>
+</template>
+
+<script>
+export default {
+  props: ["showarbitrator", "dialogTitle", "formData", "flag"],
+  data() {
+    return {
+      form: {},
+    };
+  },
+  watch: {
+    formData: {
+      handler(val) {
+        if (val) {
+          this.form = val;
+        }
+      },
+    },
+  },
+  methods: {
+    cancel() {
+      this.$emit("closeArbitratorDialog");
+    },
+    // /提交
+    submitForm() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 600px;
+  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/awardManagement/components/MailawardDialog.vue

@@ -111,8 +111,14 @@ export default {
       formData: {},
     };
   },
-  mounted () {
-    this.formData = {};
+  watch: {
+    openMailawardDialog: {
+      handler(val) {
+        if (val) {
+          this.formData = {};
+        }
+      },
+    },
   },
   methods: {
     submitForm() {

src/views/awardManagement/components/expressDeliveryDialog.vue

@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-dialog
+      title="快递信息"
+      :visible="showDelivery"
+      @close="cancel"
+      center
+      :distroy-on-close="true"
+    >
+      <div class="deliverName">中通快递 85644454542121</div>
+      <el-divider></el-divider>
+      <el-timeline :reverse="reverse">
+        <el-timeline-item
+          v-for="(activity, index) in activities"
+          :key="index"
+          :timestamp="activity.timestamp"
+        >
+          {{ activity.content }}
+        </el-timeline-item>
+      </el-timeline>
+      <div slot="footer" class="dialog-footer">
+         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ["showDelivery"],
+  data() {
+    return {
+      // key: value
+      reverse: true,
+      activities: [  
+        {
+          content: "已下单 08-18 10:11",
+          timestamp: "已下单",
+        },
+        {
+          content: "已接单 08-19 10:11",
+          timestamp: "已接单",
+        },
+        {
+          content: "已发货 08-19 10:11",
+          timestamp: "已发货",
+        },
+        {
+          content: "已揽件 08-20 00:11",
+          timestamp: "已揽件",
+        },
+        {
+          content: "运输中 08-20 02:11",
+          timestamp: "运输中",
+        },
+        {
+          content: "派送中 08-22 10:11",
+          timestamp: "【西安市】快递已到达西安市临潼区",
+        },
+        {
+          content: "待取件 08-23 15:11",
+          timestamp: "【西安市】快递已到达菜鸟驿站",
+        },
+      ],
+    };
+  },
+  methods: {
+    cancel() {
+      this.$emit("closeDeliveryModel");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 600px;
+  background: #ffffff;
+  border-radius: 20px;
+}
+.deliverName {
+  margin-left: 6%;
+  font-size: 16px;
+  font-weight: 500;
+}
+.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/awardManagement/components/paymentdetailsDialog.vue

@@ -66,6 +66,7 @@
         label-width="300px"
         label-position="left"
         :rules="rules"
+        :disabled="flag == 3"
       >
         <el-form-item
           label="经庭审质证，对各方提供的证据认定如下"

src/views/awardManagement/listofAwards.vue

@@ -33,7 +33,12 @@
             <el-table-column label="案件标的" align="center" prop="caseSubjectAmount" />
             <el-table-column label="开庭日期" align="center" prop="hearDate" :show-overflow-tooltip="true" />
             <!-- 缴费人 -->
-            <el-table-column label="案件状态" align="center" prop="caseStatusName" />
+            <!-- <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" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <!-- <el-button size="mini" type="text" icon="el-icon-reading" v-if="scope.row.caseStatus == 10" @click="showModel(scope.row, 0)"
@@ -44,12 +49,14 @@
                         v-hasPermi="['monitor:online:forceLogout']">确认裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 13" @click="showModel(scope.row, 3)"
                         v-hasPermi="['monitor:online:forceLogout']">签名</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showModel(scope.row, 4)"
+                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showaffixModel(scope.row, 4)"
                         v-hasPermi="['monitor:online:forceLogout']">用印申请</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-truck" @click="showDeliveryModel(scope.row, 4)"
+                        v-hasPermi="['monitor:online:forceLogout']">快递信息</el-button>
                         <!-- v-if="scope.row.caseStatus == 15"   送达裁决书 -->
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15"  @click="showMailaward(scope.row)"
                         v-hasPermi="['monitor:online:forceLogout']">送达裁决书</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 16" @click="showModel(scope.row, 6)"
+                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 16" @click="showCasefilingModel(scope.row, 6)"
                         v-hasPermi="['monitor:online:forceLogout']">案件归档</el-button>
                     <!-- <el-button size="mini" type="text" icon="el-icon-reading" 
                         @click="showModel(scope.row, 0)" v-hasPermi="['monitor:online:forceLogout']">生成裁决书</el-button>
@@ -80,6 +87,11 @@
         @updataList="updataList"
         :mailawardata="mailawardata"
         ></mailawardDialog>
+        <!-- 快递信息页面 -->
+        <expressDeliveryDialog
+        :showDelivery="showDelivery"
+        @closeDeliveryModel="closeDeliveryModel"
+        ></expressDeliveryDialog>
     </div>
 </template>
   
@@ -90,11 +102,12 @@ import {
 } from "@/api/awardManagement/awardManagement";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
 import mailawardDialog from './components/MailawardDialog.vue';
+import expressDeliveryDialog from './components/expressDeliveryDialog.vue';
 
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: { paymentdetailsDialog, mailawardDialog },
+    components: { paymentdetailsDialog, mailawardDialog, expressDeliveryDialog },
     data() {
         return {
             queryParams: {
@@ -124,6 +137,7 @@ export default {
             flag: null,
             openMailawardDialog: false,  //送达裁决书页面
             mailawardata: {},   //裁决书送达界面数据
+            showDelivery: false, //快递信息弹框
         };
     },
     created() {
@@ -180,6 +194,37 @@ export default {
         cancelpaymentdetails() {
             this.openDialog = false;
         },
+        // 用印申请
+        showaffixModel(row) {
+            this.$modal.confirm('是否进行用印申请？')
+                .then(function () {
+                //   return changeJobStatus(row.jobId, row.status);
+            })
+            .then(() => {
+            //   this.$modal.msgSuccess(text + "成功");
+            })
+            .catch(function () {
+            //   row.status = row.status === "0" ? "1" : "0";
+            });
+        },
+        // 快递信息弹框
+        showDeliveryModel(row) {
+            console.log(row,'快递');
+            this.showDelivery = true
+        },
+        closeDeliveryModel() {
+            this.showDelivery = false
+        },
+        // 案件归档
+        showCasefilingModel() {
+            this.$modal.confirm('是否确认立即进行案件扫描？').then(
+                function () {}
+            ).then(() => {
+
+            }).catch(function () {
+
+            })
+        },
         // 送达裁决书弹框
         showMailaward(row) {
             this.mailawardata = row;

src/views/caseManagement/caseList.vue

@@ -546,8 +546,8 @@ export default {
     // 是否进行缴费
     payStatus(val) {
       this.getDetail({ id: val.id });
-      // this.payTitle = "缴费";
-          this.openPay = true;
+      this.payTitle = "缴费";
+      this.openPay = true;
     },
     getDetail(parms) {
       caseApplicationDetail(parms).then((res) => {

src/views/caseManagement/components/caseentryDialog.vue

@@ -17,7 +17,10 @@
         label-width="150px"
         :disabled="flag == '0'"
       >
-        <p>案件信息：</p>
+        <div style="display:inline-flex">
+          <div class="infoIcon"></div>
+          <div class="caseInfo">案件信息：</div>
+        </div>
         <el-divider></el-divider>
         <el-row>
           <el-col :span="12">
@@ -117,6 +120,7 @@
               <el-upload
                 class="upload-demo"
                 ref="fileupload"
+                accept=".png,.jpg,.doc,.docx,.txt,.pdf"
                 :action="UploadUrl()"
                 :on-success="handlSuccess"
                 :on-remove="handleRemove"
@@ -131,7 +135,7 @@
               >
                 <el-button size="small" type="primary">点击上传</el-button>
                 <div slot="tip" class="el-upload__tip">
-                  文件支持上传jpg/png、.doc/docx、pdf文件
+                  文件支持上传.jpg，png，.doc，docx，.txt，.pdf文件
                 </div>
               </el-upload>
             </el-form-item>
@@ -147,7 +151,7 @@
             >
               <div v-for="(item, index) in applicateArr" :key="index">
                 <a href="#" @click="toFile(item, index)" style="color: blue">
-                  {{ item }}
+                  {{ item.annexName }}
                 </a>
               </div>
             </el-form-item>
@@ -162,8 +166,8 @@
               "
             >
               <div v-for="(item, index) in quiltArr" :key="index">
-                <a href="#" @click="toFile(item, index)" style="color: blue">
-                  {{ item }}
+                <a href="#" @click="toFile1(item, index)" style="color: blue">
+                  {{ item.annexName }}
                 </a>
               </div>
 
@@ -196,7 +200,11 @@
       >
         <div v-for="(item, index) in form2.paymentArr" :key="index">
           <div style="display: flex; justify-content: space-between">
-            <p>申请人主体信息：</p>
+            <div style="display:inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">申请人主体信息：</div>
+            </div>
+            <!-- <p>申请人主体信息：</p> -->
             <el-button
               type="danger"
               icon="el-icon-delete"
@@ -308,7 +316,11 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <p>代理人信息：</p>
+          <div style="display:inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">代理人信息：</div>
+          </div>
+          <!-- <p>代理人信息：</p> -->
           <el-row>
             <el-col :span="12">
               <el-form-item
@@ -412,7 +424,11 @@
           :key="index + form2.paymentArr.length"
         >
           <div style="display: flex; justify-content: space-between">
-            <p>被申请人主体信息：</p>
+            <div style="display:inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">被申请人主体信息：</div>
+            </div>
+            <!-- <p>被申请人主体信息：</p> -->
             <el-button
               type="danger"
               icon="el-icon-delete"
@@ -524,7 +540,11 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <p>代理人信息：</p>
+          <div style="display:inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">代理人信息：</div>
+          </div>
+          <!-- <p>代理人信息：</p> -->
           <el-row>
             <el-col :span="12">
               <el-form-item
@@ -791,23 +811,31 @@ export default {
           this.applicateArr = [];
           this.quiltArr = [];
           this.formData = this.form;
+          this.fileList = [];
           if (this.flag == "1" || this.flag == "0") {
-              this.form2.paymentArr = this.initpaymentArr;
-              this.form3.paymentArr1 = this.initpaymentArr1;
-              console.log(this.caseAttachList, "caseAttachList");
-              this.caseAttachList.forEach((item) => {
-                if (item.annexType == 2) {
-                  this.applicateArr.push(item.annexName);
-                }
-                if (item.annexType == 6) {
-                  this.quiltArr.push(item.annexName);
-                }
-              });
-              this.fileList = this.caseAttachList;
-              this.fileList.forEach((item) => {
-                item["name"] = item.annexName;
-                item["certificatePath"] = item.annexPath;
-              });
+            this.form2.paymentArr = this.initpaymentArr;
+            this.form3.paymentArr1 = this.initpaymentArr1;
+            console.log(this.caseAttachList, "caseAttachList");
+            this.caseAttachList.forEach((item) => {
+              console.log(item, "iytem");
+              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,
+                });
+              }
+            });
+            this.fileList = this.caseAttachList;
+            this.fileList.forEach((item) => {
+              item["name"] = item.annexName;
+              item["certificatePath"] = item.annexPath;
+            });
           }
           if (this.flag == "2") {
             this.form2.paymentArr = [
@@ -849,13 +877,16 @@ export default {
       return window.location.origin + "/API/evidence/upload";
     },
     handlePreview(file) {
-      if (file.certificatePath) {
+      if (this.flag == "2") {
+        window.open(
+          window.location.origin + "/API" + file.response.data.annexName,
+          "_blank"
+        );
+      } else if (this.flag == "1") {
         window.open(
           window.location.origin + "/API" + file.certificatePath,
           "_blank"
         );
-      } else {
-        this.$message.warning("暂不支持预览");
       }
     },
 
@@ -1001,10 +1032,17 @@ export default {
         }
       });
     },
-    // 详情显示，展示案件文件
+    // 详情显示，展示申请人案件文件
     toFile(item, index) {
       window.open(
-        window.location.origin + "/API" + this.caseAttachList[index].annexPath,
+        window.location.origin + "/API" + this.applicateArr[index].annexPath,
+        "_black"
+      );
+    },
+    // 被申请人文件
+    toFile1(item, index) {
+      window.open(
+        window.location.origin + "/API" + this.quiltArr[index].annexPath,
         "_black"
       );
     },
@@ -1022,6 +1060,16 @@ export default {
   background: #ffffff;
   border-radius: 20px;
 }
+.caseInfo {
+  font-size: 17px;
+  font-weight: 600;
+}
+.infoIcon {
+  width: 4px;
+  // height: 17px;
+  background-color: #0072ff;
+  margin-right: 5px;
+}
 .el-date-editor {
   width: 100%;
 }

src/views/caseManagement/components/courtReviewDialog.vue

@@ -122,4 +122,7 @@ export default {
     // line-height: 48px;
   }
 }
+::v-deep .el-form-item__error {
+  left: 90px;
+}
 </style>

src/views/caseManagement/components/formateCourtDialog.vue

@@ -8,7 +8,7 @@
       :destroy-on-close="true"
       center
     >
-      <el-form label-width="150px">
+      <el-form label-width="150px" v-if="!noArbitrator">
         <el-form-item label="是否同意组庭：">
           <el-radio-group v-model="isAgreePendTral">
             <el-radio :label="1">是</el-radio>
@@ -16,12 +16,18 @@
           </el-radio-group>
         </el-form-item>
       </el-form>
+      <el-tag type="warning" v-if="noArbitrator">当前案件未指定仲裁员，请先指定仲裁员！</el-tag>
+      <p></p>
       <!-- <el-form ref="form"> -->
+      <div v-if="isAgreePendTral == 0 || noArbitrator" style="display:inline-flex;  margin-bottom: 8px;">
+          <div class="infoIcon"></div>
+          <div>仲裁员信息列表</div>
+      </div>
       <el-table
         :data="dataList"
         style="width: 100%"
         @selection-change="handleSelectionChange"
-        v-if="isAgreePendTral == 0"
+        v-if="isAgreePendTral == 0 || noArbitrator"
       >
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column
@@ -89,11 +95,24 @@ export default {
       arbitrators: [],
       isAgreePendTral: 1,
       paramsdata: {},
+      noArbitrator: false,
     };
   },
   created() {
     this.getarbitrAtor();
   },
+  watch: {
+    formateCourtData: {
+      handler(val) {
+        if (val.arbitratorName == null) {
+          console.log('无仲裁员',val);
+          this.noArbitrator = true
+        } else {
+          this.noArbitrator = false
+        }
+      },
+    },
+  },
   methods: {
     // 获取仲裁员信息
     getarbitrAtor() {
@@ -177,4 +196,10 @@ export default {
     color: #959595;
   }
 }
+.infoIcon {
+  width: 4px;
+  // height: 17px;
+  background-color: #0072ff;
+  margin-right: 5px;
+}
 </style>

src/views/caseManagement/components/payDialog.vue

@@ -18,9 +18,11 @@
         <el-descriptions-item label="被申请人">{{
           form.respondentName
         }}</el-descriptions-item>
-        <el-descriptions-item label="案件状态">{{
-          form.caseStatusName
-        }}</el-descriptions-item>
+        <el-descriptions-item label="案件状态">
+          <el-tag size="mini" type='danger' effect="dark">
+            {{ form.caseStatusName }}
+          </el-tag>
+        </el-descriptions-item>
         <el-descriptions-item label="申请人仲裁诉求">{{
           form.arbitratClaims
         }}</el-descriptions-item>
@@ -71,9 +73,10 @@ export default {
     selectCaseApplicationConfirmFn(parms) {
       selectCaseApplicationConfirm(parms).then(res => {
         console.log(res, this.form, "KKKKKKKKKKKKKKKKKKKK");
-        if(res.data.paymentStatus == 1){
+        if(res && res.data && res.data.paymentStatus == 1){
           clearInterval(this.timer);
-          this.openPay = false;
+          // this.openPay = false;
+          this.payCancel()
           this.$message({
           message: "缴费成功",
           type: "success",

src/views/paymentManagement/components/paymentdetailsDialog.vue

@@ -3,40 +3,35 @@
     <el-dialog
       :title="title"
       :visible="openDialog"
-      width="800px"
       @close="cancel"
       :destroy-on-close="true"
       center
     >
-      <el-form ref="form" :model="form" label-width="150px" :disabled="true">
+      <el-form ref="form" :model="form" label-width="90px" :disabled="true">
         <el-form-item label="案件编号：" prop="caseNum">
           <el-input v-model="form.caseNum" placeholder="" />
         </el-form-item>
         <el-form-item label="案件标的：" prop="caseSubjectAmount">
-          <el-input-number
-            v-model="form.caseSubjectAmount"
-            controls-position="right"
-            :min="0"
-          />
+          <el-input v-model="form.caseSubjectAmount" />
         </el-form-item>
         <el-form-item label="缴费人：" prop="caseNum">
           <el-input v-model="form.caseNum" placeholder="" />
         </el-form-item>
         <el-form-item label="缴费金额：" prop="feePayable">
-          <el-input-number
-            v-model="form.feePayable"
-            controls-position="right"
-            :min="0"
-          />
+          <el-input v-model="form.feePayable" />
         </el-form-item>
         <!-- <el-form-item label="缴费截图：" prop="respondent">
           <el-input v-model="form.Respondent" placeholder="" />
         </el-form-item> -->
         <el-form-item label="案件状态：" prop="caseStatusName">
-          <el-input v-model="form.caseStatusName" placeholder="" />
+          <!-- <el-input v-model="form.caseStatusName" placeholder="" /> -->
+          <el-tag>{{ form.caseStatusName }}</el-tag>
         </el-form-item>
         <el-form-item label="支付状态：" prop="paymentStatusName">
-          <el-input v-model="form.paymentStatusName" placeholder="" />
+          <!-- <el-input v-model="form.paymentStatusName" placeholder="" /> -->
+          <el-tag effect="dark" type="success">
+            {{ form.paymentStatusName }}
+          </el-tag>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -64,13 +59,10 @@ export default {
     };
   },
   watch: {
-    openDialog: {
+    detailform: {
       handler(val) {
         if (val) {
-          setTimeout(() => {
-            this.form = this.detailform;
-            console.log(this.form, "this.form");
-          }, 1000);
+          this.form = val;
         }
       },
     },
@@ -98,7 +90,7 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-dialog {
-  width: 800px;
+  width: 50%;
   background: #ffffff;
   border-radius: 20px;
 }

src/views/paymentManagement/paymentList.vue

@@ -222,6 +222,7 @@ export default {
       this.openDialog = true;
       this.title = "缴费确认";
       this.flag = 0;
+      this.detailform = {}
     },
     // 查看缴费单
     viewpaymentformRow(row) {
@@ -230,6 +231,7 @@ export default {
       this.openDialog = true;
       this.title = "缴费单详情";
       this.flag = 1;
+      this.detailform = {}
     },
     // 关闭弹窗
     cancelpaymentdetails() {