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

src/views/caseFiling/components/caselogInfo.vue

@@ -1,21 +1,21 @@
 <template>
   <div>
-      <div class="loading" v-if="flagLoading">
+    <div class="loading" v-if="flagLoading">
-        <i class="el-icon-loading"></i>
+      <i class="el-icon-loading"></i>
-      </div>
+    </div>
-      <div v-else>
+    <div v-else>
-        <div class="noData" v-if="noData">暂无数据！</div>
+      <div class="noData" v-if="noData">暂无数据！</div>
-        <el-timeline v-else>
+      <el-timeline v-else>
-          <el-timeline-item
+        <el-timeline-item
-            v-for="(activity, index) in activities"
+          v-for="(activity, index) in activities"
-            :key="index"
+          :key="index"
-            :timestamp="(index + 1).toString()"
+          :timestamp="(index + 1).toString()"
-            placement="top"
+          placement="top"
-          >
+        >
-            <p>{{ activity.content }}</p>
+          <p>{{ activity.content }}</p>
-          </el-timeline-item>
+        </el-timeline-item>
-        </el-timeline>
+      </el-timeline>
-      </div>
+    </div>
   </div>
 </template>
 
@@ -28,20 +28,16 @@ export default {
       noData: false,
     };
   },
-  watch: {
+  created() {
-    caselogDataArr: {
+    if (this.caselogDataArr && this.caselogDataArr.length > 0) {
-      handler(val) {
+      this.noData = false;
-        if (val && val.length > 0) {
+      this.activities = this.caselogDataArr;
-          this.noData = false;
+      this.activities.forEach((item) => {
-          this.activities = val;
+        item.content = item.content;
-          this.activities.forEach((item) => {
+      });
-            item.content = item.content;
+    } else {
-          });
+      this.noData = true;
-        } else {
+    }
-          this.noData = true;
-        }
-      },
-    },
   },
   methods: {
     cancel() {

src/views/caseManagement/caseList.vue

@@ -11,7 +11,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         /> -->
-        <el-cascader :options="options" @change="changeDept" :props="{ checkStrictly: true }" clearable></el-cascader>
+        <el-cascader v-model="queryParams.nameId" :options="options" @change="changeDept" :props="{ checkStrictly: true }" clearable></el-cascader>
       </el-form-item>
       <el-form-item label="案件状态" prop="caseStatus">
         <el-select v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable @keyup.enter.native="handleQuery">
@@ -97,10 +97,11 @@
             v-if="scope.row.caseStatus == 7" v-hasPermi="['caseManagement:list:checkarbitrationway']">审核仲裁方式</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="adjudicaterecordRow(scope.row)"
             v-if="scope.row.caseStatus == 9 && scope.row.arbitratMethod == 2"
-            v-hasPermi="['caseManagement:list:hear']">书面审理</el-button>
+            >书面审理</el-button>
+            <!-- v-hasPermi="['caseManagement:list:hear']" -->
           <el-button size="mini" type="text" icon="el-icon-service" @click="trialcourtRow(scope.row)"
             v-if="scope.row.caseStatus == 8 && scope.row.arbitratMethod == 1"
-            v-hasPermi="['caseManagement:list:hear']">开庭审理</el-button>
+            >开庭审理</el-button>
           <el-button size="mini" type="text" icon="el-icon-document" @click="generateawardRow(scope.row)"
             v-if="scope.row.caseStatus == 10" v-hasPermi="['caseManagement:list:createaward']">生成裁决书</el-button>
           <!-- <el-button
@@ -207,9 +208,10 @@ export default {
         caseNum: undefined,
         // caseStatusList: [0, 1, 2, 5, 6, 7, 8, 9, 10, 16],
         caseStatusList: [0, 1, 2, 5, 6, 7, 8, 9, 10],
-        hearDate: "",
+        // hearDate: "",
         caseStatus: null,
         applicantName: "",
+        nameId: '',
         pageNum: 1,
         pageSize: 10,
       },
@@ -295,7 +297,9 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       (this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10]),
-        this.getcaseApply(this.queryParams);
+      this.queryParams.applicantName = '',
+      this.queryParams.nameId = '',
+      this.getcaseApply(this.queryParams);
     },
     // 案件录入
     filingApplication() {

src/views/caseManagement/components/formateCourtDialog.vue

@@ -21,20 +21,20 @@
       >
       <p></p>
       <!-- <el-form ref="form"> -->
+        <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
       <div
-        v-if="isAgreePendTral == 0 || noArbitrator"
         style="display: inline-flex; margin-bottom: 8px"
       >
         <div class="infoIcon"></div>
-        <div>仲裁员信息列表</div>
+        <div><span v-if="isAgreePendTral == 1">当前案件</span>仲裁员信息列表</div>
       </div>
       <el-table
         :data="dataList"
         style="width: 100%"
         @selection-change="handleSelectionChange"
-        v-if="isAgreePendTral == 0 || noArbitrator"
       >
-        <el-table-column type="selection" width="55"> </el-table-column>
+        <!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
+        <el-table-column type="selection" width="55" v-if="isAgreePendTral == 0"> </el-table-column>
         <el-table-column
           label="仲裁员姓名"
           align="center"

src/views/index.vue

@@ -2,11 +2,11 @@
   <div class="app-container home">
     <div class="header">
       <div class="iconTitle"></div>
-      <div class="headerMain">我的代办事项</div>
+      <div class="headerMain">我的待办事项</div>
     </div>
     <div class="homeMain">
         <div class="cardList">
-          <div class="badge">32</div>
+          <!-- <div class="badge">32</div> -->
           <div class="cardMain" style="margin-top: 50px;">
             <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
           </div>
@@ -15,7 +15,7 @@
           </div>
         </div>
         <div class="cardList">
-          <div class="badge">32</div>
+          <!-- <div class="badge">32</div> -->
           <div class="cardMain" style="margin-top: 50px;">
             <img class="iconImg" src="@/assets/images/daijiaofei.png" alt="">
           </div>
@@ -24,7 +24,7 @@
           </div>
         </div>
         <div class="cardList">
-          <div class="badge">32</div>
+          <!-- <div class="badge">32</div> -->
           <div class="cardMain" style="margin-top: 50px;">
             <img class="iconImg" src="@/assets/images/peisongzhong.png" alt="">
           </div>

src/views/login.vue

@@ -72,8 +72,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
+        username: "",
-        password: "admin123",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

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.18:9001'  //B
+const API = 'http://192.168.3.18:9001'  //B
 // const API = 'http://192.168.3.77:8080' //Q
 
 // vue.config.js 配置说明