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

src/views/caseManagement/components/courtReviewDialog.vue

@@ -1,36 +1,28 @@
 <template>
   <div>
     <!-- 组庭确认页面 -->
-    <el-dialog title="组庭确认" :visible="showcourtReview" @close="cancel" :destroy-on-close="true" center>
+    <el-dialog
+      title="组庭确认"
+      :visible="showcourtReview"
+      @close="cancel"
+      :destroy-on-close="true"
+      center
+    >
       <el-form ref="courtReviewform" :model="courtReviewform">
-        <!-- <el-form-item label="开庭日期：" prop="hearDate" :rules="[
-          {
-            required: true,
-            message: '请选择开庭日期',
-            trigger: 'blur',
-          },
-        ]">
-          <div class="reviewbox">
-            <el-date-picker v-model="courtReviewform.hearDate" :picker-options="pickerOptions" type="datetime"
-              placeholder="选择日期">
-            </el-date-picker>
-          </div>
-        </el-form-item> -->
         <el-form-item label="是否同意组庭：">
           <el-radio-group v-model="isAgreePendTral">
             <el-radio :label="1">是</el-radio>
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-      </el-form>
+        <!-- </el-form> -->
-      <el-tag type="warning" v-if="noArbitrator">当前案件未指定仲裁员，请先指定仲裁员！</el-tag>
+        <el-tag type="warning" v-if="noArbitrator"
-      <p></p>
+          >当前案件未指定仲裁员，请先指定仲裁员！</el-tag
-      <!-- <el-form ref="form"> -->
+        >
-      <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
+        <div style="display: inline-flex; margin: 1% 9%">
-      <div style="display: inline-flex; margin-bottom: 8px">
+          <div v-if="isAgreePendTral == 0">请选择仲裁员</div>
-        <div class="infoIcon"></div>
+          <div v-if="isAgreePendTral == 1 && form.arbitratorName">
-        <div>
+            当前案件仲裁员
-          <span v-if="isAgreePendTral == 1">当前案件</span>仲裁员<span v-if="isAgreePendTral !== 1">信息列表</span>
           </div>
         </div>
         <div v-if="isAgreePendTral == 1" class="nowarbitrator">
@@ -38,20 +30,42 @@
             {{ form.arbitratorName }}
           </el-tag>
         </div>
-      <div v-if="noArbitrator || isAgreePendTral == 0">
+        <!-- <div v-if="noArbitrator || isAgreePendTral == 0"> -->
-        <el-table ref="selectTable" :data="dataList" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-form-item
-          <el-table-column type="selection" width="55" v-if="noArbitrator || isAgreePendTral == 0">
+          label="仲裁员："
-          </el-table-column>
+          prop="Arbitor"
-          <el-table-column label="仲裁员姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
+          v-if="noArbitrator || isAgreePendTral == 0"
-          <el-table-column label="介绍" align="center" prop="remark" :show-overflow-tooltip="true" />
+          :rules="[
-        </el-table>
+            {
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams1.pageNum"
+              required: true,
-          :limit.sync="queryParams1.pageSize" @pagination="getarbitrAtor" v-if="isAgreePendTral == 0" />
+              message: '仲裁员不能为空',
-      </div>
+              trigger: 'blur',
+            },
+          ]"
+        >
+          <el-select
+            placeholder="请选择仲裁员"
+            @change="changeArbitor"
+            v-model="courtReviewform.Arbitor"
+            clearable
+          >
+            <el-option
+              v-for="item in dataList"
+              :key="item.value"
+              :label="item.nickName"
+              :value="item.userId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- </div> -->
+      </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" class="endbutton"><span>确 定</span>
+        <el-button type="primary" @click="submitForm" class="endbutton"
+          ><span>确 定</span>
         </el-button>
-        <el-button @click="cancel" class="endbutton1"><span> 取 消</span></el-button>
+        <el-button @click="cancel" class="endbutton1"
+          ><span> 取 消</span></el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -66,9 +80,10 @@ export default {
   props: ["showcourtReview", "form", "queryParams"],
   data() {
     return {
+      dataList: [],
       hearDate: "",
       courtReviewform: {
-        hearDate:null
+        hearDate: null,
       },
       noArbitrator: false,
       isAgreePendTral: 1,
@@ -81,8 +96,9 @@ export default {
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;
-        }
         },
+      },
+      Arbitor: "",
     };
   },
   created() {
@@ -92,7 +108,7 @@ export default {
     showcourtReview(val) {
       if (val) {
         this.isAgreePendTral = 1;
-        this.courtReviewform.hearDate = null
+        this.courtReviewform.hearDate = null;
       }
     },
     form: {
@@ -113,18 +129,15 @@ export default {
         this.total = res.total;
       });
     },
-    // 勾选仲裁员
+    changeArbitor(val) {
-    handleSelectionChange(val) {
-      if (val.length > 1) {
-        this.$refs.selectTable.clearSelection();
-        this.$refs.selectTable.toggleRowSelection(val.pop());
-      }
       this.arbitrators = [];
-      val.forEach((item) => {
+      this.dataList.forEach((item) => {
+        if (item.userId == val) {
           this.arbitrators.push({
             id: item.userId,
             arbitratorName: item.nickName,
           });
+        }
       });
     },
     submitForm() {
@@ -149,13 +162,7 @@ export default {
       }
       this.$refs["courtReviewform"].validate((valid) => {
         if (valid) {
-          this.courtReviewform.hearDate = moment(
+          pendTralSure(this.paramsdata)
-            this.courtReviewform.hearDate
-          ).format("YYYY-MM-DD HH:mm:ss");
-          this.paramsdata.hearDate = this.courtReviewform.hearDate;
-          pendTralSure(
-            this.paramsdata
-          )
             .then((res) => {
               this.$modal.msgSuccess("确认成功");
               this.cancel();
@@ -216,6 +223,9 @@ export default {
     // line-height: 48px;
   }
 }
+.nowarbitrator {
+  margin-left: 10%;
+}
 
 ::v-deep .el-form-item__error {
   left: 90px;

src/views/caseManagement/components/formateCourtDialog.vue

@@ -16,7 +16,6 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-      </el-form>
         <el-tag type="warning" v-if="noArbitrator"
           >当前案件未指定仲裁员，请先指定仲裁员！</el-tag
         >
@@ -24,32 +23,51 @@
         <!-- <el-form ref="form"> -->
         <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
         <div style="display: inline-flex; margin-bottom: 8px">
-        <div v-if="isAgreePendTral == 0">
+          <div v-if="isAgreePendTral == 0">请选择仲裁员</div>
-          请选择仲裁员
-        </div>
           <div v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName">
             当前案件仲裁员
           </div>
         </div>
-      <div v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName" class="nowarbitrator">
+        <div
+          v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName"
+          class="nowarbitrator"
+        >
           <el-tag size="medium">
             {{ formateCourtData.arbitratorName }}
           </el-tag>
         </div>
-      <div v-if="noArbitrator || isAgreePendTral == 0">
+        <el-form-item
-        <el-form>
+          label="仲裁员："
-          <el-form-item label="仲裁员：">
+          v-if="noArbitrator || isAgreePendTral == 0"
-            <el-select placeholder="请选择仲裁员" @change="changeArbitor" v-model="Arbitor">
+          :rules="[
-              <el-option v-for="item in dataList" :key="item.value" :label="item.nickName" :value="item.userId"></el-option>
+            {
+              required: true,
+              message: '仲裁员不能为空',
+              trigger: 'blur',
+            },
+          ]"
+        >
+          <el-select
+            placeholder="请选择仲裁员"
+            @change="changeArbitor"
+            v-model="Arbitor"
+          >
+            <el-option
+              v-for="item in dataList"
+              :key="item.value"
+              :label="item.nickName"
+              :value="item.userId"
+            ></el-option>
           </el-select>
         </el-form-item>
       </el-form>
-      </div>
       <div slot="footer" class="dialog-footer">
         <el-button
           type="primary"
           @click="submitForm"
-          :disabled="noArbitrator && isAgreePendTral == 0"
+          :disabled="
+            noArbitrator || (isAgreePendTral == 0 && arbitrators.length == 0)
+          "
           class="endbutton"
           ><span>确 定</span></el-button
         >
@@ -76,7 +94,7 @@ export default {
       isAgreePendTral: 1,
       paramsdata: {},
       noArbitrator: false,
-      Arbitor: ""
+      Arbitor: "",
     };
   },
   created() {
@@ -114,7 +132,7 @@ export default {
             arbitratorName: item.nickName,
           });
         }
-      })
+      });
     },
     // 确认
     submitForm() {