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

src/api/caseManagement/caseManagement.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 确定仲裁方式
+export function arbitrateMethod(data,id) {
+  return request({
+    url: '/arbitrate/method',
+    method: 'put',
+    params: data,
+    data:id
+  })
+}

src/views/caseManagement/caseList.vue

@@ -277,6 +277,8 @@
     <!-- 选择开庭方式 -->
     <choosetrialmethodDaiog
       :showchoosetrialmethod="showchoosetrialmethod"
+      :choosetrialmethodata="choosetrialmethodata"
+      @getcaseApply="getcaseApply"
       @cancelshowchoosetrialMethod="cancelshowchoosetrialMethod"
     ></choosetrialmethodDaiog>
     <!-- 书面审理 -->
@@ -350,6 +352,7 @@ export default {
       showformateCourt: false, //组庭界面显示
       showcourtReview: false, //组庭审核页面
       showchoosetrialmethod: false, //选择仲裁方式页面
+      choosetrialmethodata:{},
       showadjudicaterecord: false, //书面审理弹框
       showtrialincourt: false, //开庭审理
     };
@@ -507,6 +510,7 @@ export default {
     // 选择开庭方式
     choosetrialmethodRow(row) {
       console.log(row, "选择开庭方式");
+      this.choosetrialmethodata = row;
       this.showchoosetrialmethod = true;
     },
     // 关闭选择开庭方式

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -3,13 +3,139 @@
     <el-dialog
       title="书面审理"
       :visible="showadjudicaterecord"
-      width="500px"
+      width="1000px"
       @close="cancel"
       :destroy-on-close="true"
     >
-      书面审理弹框
+      <el-form
+        ref="form"
+        :model="formData"
+        label-width="150px"
+        :disabled="true"
+      >
+        <p>案件信息：</p>
+        <el-divider></el-divider>
+        <el-col :span="12">
+          <el-form-item label="案件编号：" prop="caseNum">
+            <el-input v-model="formData.caseNum" placeholder="请输入案件编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="申请人：" prop="caseNum">
+            <el-input v-model="formData.caseNum" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="被申请人：" prop="caseNum">
+            <el-input v-model="formData.caseNum" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="借款开始日期：" prop="loanStartDate">
+            <el-date-picker
+              v-model="formData.loanStartDate"
+              type="datetime"
+              placeholder="借款开始日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="借款结束日期：" prop="loanEndDate">
+            <el-date-picker
+              v-model="formData.loanEndDate"
+              type="datetime"
+              placeholder="借款结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="案件标的：" prop="caseSubjectAmount">
+            <el-input
+              v-model="formData.caseSubjectAmount"
+              placeholder="请输入案件标的"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="逾期天数：" prop="caseSubjectAmount">
+            <el-input
+              v-model="formData.caseSubjectAmount"
+              placeholder="请输入逾期天数"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="仲裁费用：" prop="caseSubjectAmount">
+            <el-input
+              v-model="formData.caseSubjectAmount"
+              placeholder="请输入仲裁费用"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="申请人主张欠本金：" prop="claimPrinciOwed">
+            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="案件顾问：" prop="claimPrinciOwed">
+            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="案件状态：" prop="claimPrinciOwed">
+            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="仲裁员：" prop="claimPrinciOwed">
+            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="案件资料：" prop="claimPrinciOwed">
+            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开庭日期：" prop="loanEndDate">
+            <el-date-picker
+              v-model="formData.loanEndDate"
+              type="datetime"
+              placeholder="开庭日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <el-form ref="textform" :model="form2" label-width="150px">
+        <el-col :span="24">
+          <el-form-item label="案情描述：">
+            <el-input
+              type="textarea"
+              autosize
+              placeholder="请进行案情描述"
+              v-model="textarea1"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="仲裁结果：">
+            <el-input
+              type="textarea"
+              autosize
+              placeholder="请输入仲裁结果"
+              v-model="textarea2"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">提 交</el-button>
+        <el-button type="primary" @click="submitForm">提交仲裁结果</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -22,6 +148,10 @@ export default {
   data() {
     return {
       // key: value
+      formData: {},
+      form2:{},
+      textarea1:'',
+      textarea2:'',
     };
   },
   methods: {

src/views/caseManagement/components/choosetrialmethodDaiog.vue

@@ -10,8 +10,8 @@
     >
       <div class="radiobox">
         <el-radio-group v-model="radio">
-          <el-radio :label="1">书面审理</el-radio>
+          <el-radio :label="2">书面审理</el-radio>
-          <el-radio :label="2">开庭审理</el-radio>
+          <el-radio :label="1">开庭审理</el-radio>
         </el-radio-group>
       </div>
 
@@ -24,18 +24,32 @@
 </template>
 
 <script>
+import { arbitrateMethod } from "@/api/caseManagement/caseManagement.js";
 export default {
   name: "showchoosetrialmethodDialog",
-  props: ["showchoosetrialmethod"],
+  props: ["showchoosetrialmethod", "choosetrialmethodata"],
   data() {
     return {
-      // key: value
+      radio: 2,
-      radio: 1,
     };
   },
   methods: {
-    // 提交开庭方式
+    // 提交开庭方式 arbitrateMethod
-    submitForm() {},
+    submitForm() {
+      let paramsdata = {
+        arbitratMethod: this.radio,
+      };
+      let id = {
+        id: this.choosetrialmethodata.id,
+      };
+      arbitrateMethod(paramsdata, id)
+        .then((res) => {
+          this.$modal.msgSuccess("提交成功");
+          this.cancel();
+          this.$emit("getcaseApply");
+        })
+        .catch((err) => {});
+    },
     cancel() {
       this.$emit("cancelshowchoosetrialMethod");
     },
@@ -44,7 +58,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.radiobox{
+.radiobox {
-    margin-left: 5%;
+  margin-left: 5%;
 }
 </style>

vue.config.js

@@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-// const API = 'http://121.40.189.20:9001'  //测试
+const API = 'http://121.40.189.20:9001'  //测试
-const API = 'http://192.168.3.77:8080' //Q
+// const API = 'http://192.168.3.77:8080' //Q
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions