解决代码冲突

src/views/awardManagement/listofAwards.vue

@@ -75,19 +75,19 @@
                         @click="showModel(scope.row, 0)">查看裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         v-if="scope.row.caseStatus == 11 && checkPermi(['awardManagement:list:secretarycheck'])"
-                        @click="showModel(scope.row, 1)">秘书确认</el-button>
+                        @click="showModel(scope.row, 1)">确认裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         v-if="scope.row.caseStatus == 18 && checkPermi(['awardManagement:list:check']) && btnStatus"
-                        @click="showModel(scope.row, 4)">仲裁员确认</el-button>
+                        @click="showModel(scope.row, 4)">核查裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         v-if="scope.row.caseStatus == 12 && checkPermi(['awardManagement:list:confirmaward']) && btnStatus"
-                        @click="showModel(scope.row, 2)">部门长确认</el-button>
+                        @click="showModel(scope.row, 2)">审核裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         v-if="scope.row.caseStatus == 13 && checkPermi(['awardManagement:list:sign']) && btnStatus"
                         @click="showModel(scope.row, 3)">签名</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         v-if="scope.row.caseStatus == 14 && checkPermi(['awardManagement:list:signprint']) && btnStatus"
-                        @click="showaffixModel(scope.row, 4)">用印申请</el-button>
+                        @click="showaffixModel(scope.row, 4)">用印</el-button>
                     <!-- v-if="scope.row.caseStatus > 15" -->
                     <el-button size="mini" type="text" icon="el-icon-truck"
                         v-if="scope.row.caseStatus > 15 && checkPermi(['delivery:list:detail'])"

src/views/caseManagement/caseList.vue

@@ -51,7 +51,7 @@
           v-hasPermi="['caseManagement:list:add']">案件录入</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="compressedPackages"
         v-hasPermi="['caseManagement:list:zip']"
-          >案件压缩包导入</el-button>
+          >导入压缩包</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchApplication"
           v-hasPermi="['caseManagement:list:import']">案件批量导入</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(2)"
@@ -117,13 +117,13 @@
           <el-button size="mini" type="text" icon="el-icon-edit" @click="undoRow(scope.row,1)" v-if="(scope.row.updateSubmitStatus == 1 || scope.row.updateSubmitStatus == 3) && scope.row.caseStatus > 0 && checkPermi(['caseManagement:list:undo'])">撤销修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="scope.row.caseStatus == 0 &&
             checkPermi(['caseManagement:list:submit']) && btnStatus
-            ">提交</el-button>
+            ">提交案件</el-button>
           <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteRow(scope.row)" v-if="scope.row.caseStatus == 0 &&
             checkPermi(['caseManagement:list:delete']) && btnStatus
             ">删除</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-view" @click="filingreviewRow(scope.row)" v-if="scope.row.caseStatus == 1 &&
             checkPermi(['caseManagement:list:check']) && btnStatus
-            ">立案审查</el-button>
+            ">审查案件</el-button>
           <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)"
             v-if="scope.row.caseStatus == 2" v-hasPermi="['caseManagement:list:pay']">缴费</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)" v-if="scope.row.caseStatus == 2 &&
@@ -146,7 +146,7 @@
           <el-button size="mini" type="text" icon="el-icon-s-check" @click="reviewRevocation(scope.row)" v-if="scope.row.updateSubmitStatus == 2 && checkPermi(['caseManagement:list:reviewRevocation'])">审核撤销</el-button>
           <el-button size="mini" type="text" icon="el-icon-s-check" @click="courtconfirmationRow(scope.row)" v-if="scope.row.caseStatus == 6 &&
             checkPermi(['caseManagement:list:confirmgroup']) && btnStatus
-            ">组庭确认</el-button>
+            ">确认组庭</el-button>
           <el-button size="mini" type="text" icon="el-icon-check" @click="courtreviewRow(scope.row)" v-if="scope.row.caseStatus == 5 &&
             checkPermi(['caseManagement:list:checkgroup']) && btnStatus
             ">组庭审核</el-button>
@@ -167,12 +167,12 @@
             @click="evidenceUpload(scope.row)">证据修改</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="(scope.row.caseStatus < 10 && scope.row.caseStatus != 2 && scope.row.caseStatus != 0) &&
             checkPermi(['caseManagement:list:evidenceUpdate']) && btnStatus"
-            @click="evidenceUpload(scope.row)">证据修改</el-button>
+            @click="evidenceUpload(scope.row)">修改证据</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 31 && btnStatus &&  checkPermi(['caseManagement:list:timer'])"
-            @click="timeUpdata(scope.row)">开庭时间</el-button>
+            @click="timeUpdata(scope.row)">设定开庭时间</el-button>
           <el-button size="mini" type="text" icon="el-icon-lock"
             v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 0 && btnStatus"
-            @click="lockClick(scope.row)">锁定</el-button>
+            @click="lockClick(scope.row)">锁定案件</el-button>
           <el-button size="mini" type="text" icon="el-icon-unlock"
             v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1 && btnStatus"
             @click="ulockClick(scope.row)">解锁</el-button>

src/views/caseManagement/components/caseentryDialog.vue

@@ -320,7 +320,6 @@
             <el-col :span="12">
               <el-form-item label="姓名：" :prop="'paymentArr.' + index + '.nameAgent'" :rules="[
                 {
-                  required: true,
                   message: '姓名不能为空',
                   trigger: 'blur',
                 },
@@ -332,7 +331,6 @@
             <el-col :span="12">
               <el-form-item label="身份证号：" :prop="'paymentArr.' + index + '.identityNumAgent'" :rules="[
                 {
-                  required: true,
                   message: '身份证号不能为空',
                   trigger: 'blur',
                 },
@@ -349,7 +347,6 @@
             <el-col :span="12">
               <el-form-item label="联系电话：" :prop="'paymentArr.' + index + '.contactTelphoneAgent'" :rules="[
                 {
-                  required: true,
                   message: '联系电话不能为空',
                   trigger: 'blur',
                 },
@@ -365,7 +362,6 @@
             <el-col :span="12">
               <el-form-item label="联系地址：" :prop="'paymentArr.' + index + '.contactAddressAgent'" :rules="[
                 {
-                  required: true,
                   message: '联系地址不能为空',
                   trigger: 'blur',
                 },
@@ -547,7 +543,6 @@
             <el-col :span="12">
               <el-form-item label="姓名：" :prop="'paymentArr1.' + index + '.nameAgent'" :rules="[
                 {
-                  required: true,
                   message: '姓名不能为空',
                   trigger: 'blur',
                 },
@@ -560,7 +555,6 @@
               <!--  -->
               <el-form-item label="身份证号：" :prop="'paymentArr1.' + index + '.identityNumAgent'" :rules="[
                 {
-                  required: true,
                   message: '身份证号不能为空',
                   trigger: 'blur',
                 },
@@ -577,7 +571,6 @@
             <el-col :span="12">
               <el-form-item label="联系电话：" :prop="'paymentArr1.' + index + '.contactTelphoneAgent'" :rules="[
                 {
-                  required: true,
                   message: '联系电话不能为空',
                   trigger: 'blur',
                 },
@@ -593,7 +586,6 @@
             <el-col :span="12">
               <el-form-item label="联系地址：" :prop="'paymentArr1.' + index + '.contactAddressAgent'" :rules="[
                 {
-                  required: true,
                   message: '联系地址不能为空',
                   trigger: 'blur',
                 },

src/views/payAll/payConfirmation.vue

@@ -31,7 +31,7 @@
                         v-hasPermi="['monitor:online:forceLogout']" style="margin-right: 10px;">查看缴费清单</el-button>
                     <el-popconfirm title="是否确认缴费" @confirm="payStatus(scope.row)">
                         <el-button slot="reference" size="mini" type="text" icon="el-icon-bank-card"
-                            v-hasPermi="['monitor:online:forceLogout']">缴费确认</el-button>
+                            v-hasPermi="['monitor:online:forceLogout']">确认缴费</el-button>
                     </el-popconfirm>
                 </template>
             </el-table-column>

vue.config.js

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