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

src/views/caseManagement/components/formateCourtDialog.vue

@@ -16,58 +16,41 @@
             <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 == 0">请选择仲裁员</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="仲裁员："
-          v-if="noArbitrator || isAgreePendTral == 0"
-          :rules="[
-            {
-              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>
+      <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="
+          :disabled="!this.arbitrators.length > 0 && isAgreePendTral == 0"
-            noArbitrator || (isAgreePendTral == 0 && arbitrators.length == 0)
-          "
           class="endbutton"
           ><span>确 定</span></el-button
         >
@@ -94,15 +77,15 @@ export default {
       isAgreePendTral: 1,
       paramsdata: {},
       noArbitrator: false,
-      Arbitor: "",
+      Arbitor: ""
     };
   },
   created() {
     this.getarbitrAtor();
   },
   watch: {
-    showformateCourt(val) {
+    showformateCourt(val){
-      if (val) {
+      if(val){
         this.isAgreePendTral = 1;
       }
     },
@@ -121,6 +104,7 @@ export default {
     getarbitrAtor() {
       arbitrAtor({}).then((res) => {
         this.dataList = res.rows;
+        console.log(this.dataList,'this.dataList');
       });
     },
     changeArbitor(val) {
@@ -132,7 +116,8 @@ export default {
             arbitratorName: item.nickName,
           });
         }
-      });
+      })
+      console.log(this.arbitrators,'arbitrators');
     },
     // 确认
     submitForm() {