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

src/views/caseManagement/components/evidenceDialog.vue

@@ -18,7 +18,7 @@
             <div style="margin-top: 30px;">
                 <el-upload class="upload-demo" ref="upload" action="" :file-list="fileList" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
                     :auto-upload="false" :http-request="uploadFile" :on-change="beforeAvatarUpload" :before-remove="beforeRemove" multiple>
-                    <el-button type="primary"><span>修改证据</span></el-button>
+                    <el-button type="primary"><span>选择证据</span></el-button>
                 </el-upload>
             </div>
             <div slot="footer" class="dialog-footer">

src/views/caseManagement/components/formateCourtDialog.vue

@@ -9,49 +9,66 @@
       destroy-on-close
       center
     >
-      <el-form label-width="150px">
+      <el-form
+        ref="formateCourtform"
+        :model="formateCourtform"
+        label-width="110px"
+        label-position="left"
+      >
         <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-tag type="warning" v-if="noArbitrator"
+          >当前案件未指定仲裁员，请先指定仲裁员！</el-tag
+        >
+        <p></p>
+        <!-- <el-form ref="form"> -->
+        <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
+        <div style="display: inline-flex; margin-bottom: 8px">
+          <div v-if="isAgreePendTral !== 1">请选择仲裁员</div>
+          <div v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName">
+            当前案件仲裁员
+          </div>
+        </div>
+        <div
+          v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName"
+          class="nowarbitrator"
+        >
+          <el-tag size="medium">
+            {{ formateCourtData.arbitratorName }}
+          </el-tag>
+        </div>
+        <el-form-item
+          label="仲裁员："
+          prop="Arbitor"
+          v-if="noArbitrator || isAgreePendTral == 0"
+          :rules="[
+            {
+              required: true,
+              message: '仲裁员不能为空',
+            },
+          ]"
+        >
+          <el-select
+            placeholder="请选择仲裁员"
+            @change="changeArbitor"
+            v-model="formateCourtform.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>
       </el-form>
-      <el-tag type="warning" v-if="noArbitrator"
-        >当前案件未指定仲裁员，请先指定仲裁员！</el-tag
-      >
-      <p></p>
-      <!-- <el-form ref="form"> -->
-      <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
-      <div style="display: inline-flex; margin-bottom: 8px">
-        <div v-if="isAgreePendTral !== 1">
-          请选择仲裁员
-        </div>
-        <div v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName">
-          当前案件仲裁员
-        </div>
-      </div>
-      <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>
-          <el-form-item label="仲裁员：">
-            <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>
-      <!-- </el-form> -->
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitForm"
-          :disabled="!this.arbitrators.length > 0 && isAgreePendTral == 0"
-          class="endbutton"
+        <el-button type="primary" @click="submitForm" class="endbutton"
           ><span>确 定</span></el-button
         >
         <el-button @click="cancel" class="endbutton1"
@@ -73,19 +90,20 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      formateCourtform: {},
       arbitrators: [],
       isAgreePendTral: 1,
       paramsdata: {},
       noArbitrator: false,
-      Arbitor: ""
+      Arbitor: "",
     };
   },
   created() {
     this.getarbitrAtor();
   },
   watch: {
-    showformateCourt(val){
-      if(val){
+    showformateCourt(val) {
+      if (val) {
         this.isAgreePendTral = 1;
       }
     },
@@ -104,7 +122,7 @@ export default {
     getarbitrAtor() {
       arbitrAtor({}).then((res) => {
         this.dataList = res.rows;
-        console.log(this.dataList,'this.dataList');
+        // console.log(this.dataList, "this.dataList");
       });
     },
     changeArbitor(val) {
@@ -116,8 +134,7 @@ export default {
             arbitratorName: item.nickName,
           });
         }
-      })
-      console.log(this.arbitrators,'arbitrators');
+      });
     },
     // 确认
     submitForm() {
@@ -140,13 +157,15 @@ export default {
           };
         }
       }
-
-      pendTralCheck(this.paramsdata).then((res) => {
-        this.cancel();
-        this.$modal.msgSuccess("组庭成功");
-        this.$emit("getcaseApply", this.queryParams);
+      this.$refs["formateCourtform"].validate((valid) => {
+        if (valid) {
+          pendTralCheck(this.paramsdata).then((res) => {
+            this.cancel();
+            this.$modal.msgSuccess("组庭成功");
+            this.$emit("getcaseApply", this.queryParams);
+          });
+        }
       });
-      // }
     },
     // 取消
     cancel() {