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

src/views/caseManagement/caseList.vue

       // 查询参数
       queryParams: {
         caseNum: undefined,
+        caseStatusList: [0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 16],
         hearDate: "",
         caseStatus: null,
         pageNum: 1,
     };
   },
   created() {
-    this.getcaseApply();
+    this.getcaseApply(this.queryParams);
   },
   methods: {
     cancel() {
       this.openbatch = false;
     },
     /** 查询列表 */
-    getcaseApply() {
+    getcaseApply(val) {
       this.loading = true;
-      caseApply(this.queryParams).then((response) => {
+      caseApply(val).then((response) => {
         this.dataList = response.rows;
         // this.dataList.forEach((item) => {
         //   item.caseStatus = item.caseStatus == 0 ? "立案申请" : "待缴费";
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.caseStatusList = []
       this.queryParams.pageNum = 1;
-      this.getcaseApply();
+      this.getcaseApply(this.queryParams);
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.queryParams.caseStatusList = [0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 16],
+      this.getcaseApply(this.queryParams);
     },
     // 案件录入
     filingApplication() {

src/views/caseManagement/components/adjudicaterecordDialog.vue

         <el-col :span="24">
           <el-form-item
             label="经庭审质证，对各方提供的证据认定如下："
-            prop="arbitrationResult"
+            prop="evidenDetermi"
             :rules="[
               {
                 required: true,
               type="textarea"
               :autosize="{ minRows: 4}"
               placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              v-model="form2.evidenDetermi"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="仲裁庭经审理查明(写明仲裁庭认定的事实)："
-            prop="arbitrationResult"
+            prop="factDetermi"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               :autosize="{ minRows: 4}"
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.factDetermi"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="综上所述："
-            prop="arbitrationResult"
+            prop="caseSketch"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               autosize
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.caseSketch"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="本庭认为："
-            prop="arbitrationResult"
+            prop="arbitrateThink"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               autosize
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.arbitrateThink"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="裁决如下："
-            prop="arbitrationResult"
+            prop="rulingFollows"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               autosize
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.rulingFollows"
             >
             </el-input>
           </el-form-item>

src/views/caseManagement/components/choosetrialmethodDaiog.vue

       </div>
 
       <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>
 .radiobox {
   margin-left: 5%;
 }
+::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/caseManagement/components/courtReviewDialog.vue

 <template>
   <div>
-    <!-- 组庭审核页面 -->
+    <!-- 组庭确认页面 -->
     <el-dialog
       title="组庭确认"
       :visible="showcourtReview"
-      width="500px"
       @close="cancel"
       :destroy-on-close="true"
+      center
     >
       <el-form ref="courtReviewform" :model="courtReviewform">
         <el-form-item
         </el-form-item>
       </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>
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 422px;
+  height: 245px;
+  background: #ffffff;
+  border-radius: 20px;
+}
 .el-form-item {
   margin-left: 10%;
 }
+.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;
+    // line-height: 48px;
+  }
+}
 </style>

src/views/caseManagement/components/trialincourtDialog.vue

         <el-col :span="24">
           <el-form-item
             label="经庭审质证，对各方提供的证据认定如下："
-            prop="arbitrationResult"
+            prop="evidenDetermi"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               :autosize="{ minRows: 4 }"
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.evidenDetermi"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="仲裁庭经审理查明(写明仲裁庭认定的事实)："
-            prop="arbitrationResult"
+            prop="factDetermi"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               :autosize="{ minRows: 4 }"
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.factDetermi"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="综上所述："
-            prop="arbitrationResult"
+            prop="caseSketch"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               autosize
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.caseSketch"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="本庭认为："
-            prop="arbitrationResult"
+            prop="arbitrateThink"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               autosize
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.arbitrateThink"
             >
             </el-input>
           </el-form-item>
         <el-col :span="24">
           <el-form-item
             label="裁决如下："
-            prop="arbitrationResult"
+            prop="rulingFollows"
             :rules="[
               {
                 required: true,
-                message: '请输入仲裁结果',
+                message: '请输入',
                 trigger: 'blur',
               },
             ]"
             <el-input
               type="textarea"
               autosize
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
+              placeholder="请输入"
+              v-model="form2.rulingFollows"
             >
             </el-input>
           </el-form-item>

vue.config.js

 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-const API = 'http://121.40.189.20:9001'  //测试
-// const API = 'http://192.168.3.77:8080' //Q
+// const API = 'http://121.40.189.20:9001'  //测试
+const API = 'http://192.168.3.77:8080' //Q
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions