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

src/views/awardManagement/listofAwards.vue

                     <!-- <el-button size="mini" type="text" icon="el-icon-reading" v-if="scope.row.caseStatus == 10" @click="showModel(scope.row, 0)"
                         v-hasPermi="['monitor:online:forceLogout']">生成裁决书</el-button> -->
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 11" @click="showModel(scope.row, 1)"
-                        v-hasPermi="['monitor:online:forceLogout']">核查</el-button>
+                        v-hasPermi="['awardManagement:list:check']">核查</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 12" @click="showModel(scope.row, 2)"
-                        v-hasPermi="['monitor:online:forceLogout']">确认裁决书</el-button>
+                        v-hasPermi="['awardManagement:list:confirmaward']">确认裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 13" @click="showModel(scope.row, 3)"
-                        v-hasPermi="['monitor:online:forceLogout']">签名</el-button>
+                        v-hasPermi="['awardManagement:list:sign']">签名</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showaffixModel(scope.row, 4)"
-                        v-hasPermi="['monitor:online:forceLogout']">用印申请</el-button>
+                        v-hasPermi="['awardManagement:list:signprint']">用印申请</el-button>
                         <!-- v-if="scope.row.caseStatus > 15" -->
                     <el-button size="mini" type="text" icon="el-icon-truck" v-if="scope.row.caseStatus > 15" @click="showDeliveryModel(scope.row, 4)"
-                        v-hasPermi="['monitor:online:forceLogout']">快递信息</el-button>
+                        v-hasPermi="['delivery:list:detail']">快递信息</el-button>
                         <!-- v-if="scope.row.caseStatus == 15"   送达裁决书 -->
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15" @click="showMailaward(scope.row)"
-                        v-hasPermi="['monitor:online:forceLogout']">送达裁决书</el-button>
+                        v-hasPermi="['awardManagement:list:sendaward']">送达裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 16" @click="showCasefilingModel(scope.row, 6)"
-                        v-hasPermi="['monitor:online:forceLogout']">案件归档</el-button>
+                        v-hasPermi="['awardManagement:list:file']">案件归档</el-button>
                     <!-- <el-button size="mini" type="text" icon="el-icon-reading" 
                         @click="showModel(scope.row, 0)" v-hasPermi="['monitor:online:forceLogout']">生成裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" 

src/views/caseFiling/archiveList.vue

             type="text"
             icon="el-icon-reading"
             @click="showDetail(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseFiles:list:detail']"
             >归档详情</el-button
           >
         </template>

src/views/caseManagement/caseList.vue

           icon="el-icon-plus"
           size="mini"
           @click="filingApplication"
-          v-hasPermi="['monitor:job:add']"
+          v-hasPermi="['caseManagement:list:add']"
           >案件录入</el-button
         >
         <el-button
           icon="el-icon-plus"
           size="mini"
           @click="batchApplication"
-          v-hasPermi="['monitor:job:add']"
+          v-hasPermi="['caseManagement:list:import']"
           >案件批量导入</el-button
         >
       </el-col>
       <el-table-column
         label="申请人(机构)"
         align="center"
-        prop="caseAffiliates[0].name"
+        prop="applicantName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
             type="text"
             icon="el-icon-zoom-in"
             @click="detailRow(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:detail']"
             >详情</el-button
           >
           <!-- 案件日志 -->
             type="text"
             icon="el-icon-notebook-2"
             @click="caselogRow(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseLog:list:detail']"
             >案件日志</el-button
           >
           <el-button
             icon="el-icon-edit"
             @click="editRow(scope.row)"
             v-if="scope.row.caseStatus == 0"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:update']"
             >修改</el-button
           >
           <el-button
             icon="el-icon-check"
             @click="onsubmitRow(scope.row)"
             v-if="scope.row.caseStatus == 0"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:submit']"
             >提交</el-button
           >
           <el-button
             icon="el-icon-delete"
             @click="deleteRow(scope.row)"
             v-if="scope.row.caseStatus == 0"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:delete']"
             >删除</el-button
           >
           <el-button
             icon="el-icon-view"
             @click="filingreviewRow(scope.row)"
             v-if="scope.row.caseStatus == 1"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:check']"
             >立案审查</el-button
           >
           <el-button
             icon="el-icon-tickets"
             @click="payStatus(scope.row)"
             v-if="scope.row.caseStatus == 2"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:pay']"
             >缴费</el-button
           >
 
             icon="el-icon-s-check"
             @click="courtconfirmationRow(scope.row)"
             v-if="scope.row.caseStatus == 6"
-            v-hasPermi="['caseManagement:caseList:commit']"
+            v-hasPermi="['caseManagement:list:confirmgroup']"
             >组庭确认</el-button
           >
           <el-button
             icon="el-icon-check"
             @click="courtreviewRow(scope.row)"
             v-if="scope.row.caseStatus == 5"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:checkgroup']"
             >组庭审核</el-button
           >
           <el-button
             icon="el-icon-sort"
             @click="choosetrialmethodRow(scope.row)"
             v-if="scope.row.caseStatus == 7"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:checkarbitrationway']"
             >审核仲裁方式</el-button
           >
           <el-button
             icon="el-icon-edit-outline"
             @click="adjudicaterecordRow(scope.row)"
             v-if="scope.row.caseStatus == 9 && scope.row.arbitratMethod == 2"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:hear']"
             >书面审理</el-button
           >
           <el-button
             icon="el-icon-service"
             @click="trialcourtRow(scope.row)"
             v-if="scope.row.caseStatus == 8 && scope.row.arbitratMethod == 1 "
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:hear']"
             >开庭审理</el-button
           >
           <el-button
             icon="el-icon-document"
             @click="generateawardRow(scope.row)"
             v-if="scope.row.caseStatus == 10"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['caseManagement:list:createaward']"
             >生成裁决书</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-receiving"
             v-if="scope.row.caseStatus == 16"
             v-hasPermi="['monitor:online:forceLogout']"
             >归档</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
       // 查询参数
       queryParams: {
         caseNum: undefined,
-        caseStatusList: [0, 1, 2, 5, 6, 7, 8, 9, 10, 16],
+        // caseStatusList: [0, 1, 2, 5, 6, 7, 8, 9, 10, 16],
+        caseStatusList: [0, 1, 2, 5, 6, 7, 8, 9, 10],
         hearDate: "",
         caseStatus: null,
         applicantName: "",
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      (this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10, 16]),
+      (this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10]),
         this.getcaseApply(this.queryParams);
     },
     // 案件录入

src/views/paymentManagement/paymentList.vue

             type="text"
             icon="el-icon-zoom-in"
             @click="paymentconfirmationRow(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['paymentManagement:list:payconfirm']"
             >缴费确认</el-button
           >
           <el-button
             type="text"
             icon="el-icon-edit"
             @click="viewpaymentformRow(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
+            v-hasPermi="['paymentManagement:list:detail']"
             >查看缴费单</el-button
           >
         </template>

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