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

src/api/caseManagement/caseManagement.js

@@ -28,7 +28,7 @@ export function creatTrialRecord(data) {
 // 确认生成笔录
 export function creatTrialRecordnew(data) {
   return request({
-    url: "/caseApplication/creatTrialRecordnew",
+    url: "/caseApplication/confirmMeetingResult",
     method: "post",
     data: data,
   });

src/views/caseManagement/caseList.vue

@@ -181,13 +181,13 @@
           @click="showModel(scope.row, 0)">查看裁决书</el-button>
            <el-button size="mini" type="text" icon="el-icon-edit"
                        v-if="scope.row.caseStatus == 11 && checkPermi(['caseManagement: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(['caseManagement:list:arbitratorcheck']) && 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(['caseManagement: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(['caseManagement:list:sign']) && btnStatus"    
                         @click="showModel(scope.row, 3)">签名</el-button>
@@ -1033,6 +1033,7 @@ export default {
     },
     // 表格显示高亮
     tableRowClassName(row){
+      console.log(row)
       if(row.row.arbitratMethodName=="开庭审理"){
         return 'pendingTrial'
       }

src/views/caseManagement/components/judgmentInformation.vue

@@ -77,14 +77,33 @@
           <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin"
             placeholder="请输入" />
         </el-form-item> -->
-        <el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2 || flag == 4">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
+        <el-form-item label="驳回原因：" label-width="100px"  v-if="flag==1 && awardDetailform.arbitrateReject">
+          <div style="width:800px;">{{awardDetailform.arbitrateReject}}</div>
         </el-form-item>
-        <el-form-item label="驳回原因" label-width="100px"  v-if="flag==1 && arbitrateRecord.arbitrateReject">
-          <div style="width:800px;">{{arbitrateRecord.arbitrateReject}}lllllllllllllll</div>
+        <el-form-item label="驳回原因：" label-width="100px"  v-if="flag==4 && awardDetailform.deptorReject">
+          <div style="width:800px;">{{awardDetailform.deptorReject}}</div>
         </el-form-item>
-        <el-form-item label="驳回原因" prop="arbitrateReject" v-if="flag == 2 || flag == 4">
-          <el-input type="textarea" :rows="2" placeholder="请输入拒绝原因" v-model="arbitrateRecord.arbitrateReject"></el-input>
+        <el-form-item label-width="100px" label="审核意见：" prop="checkOpinion" v-if="flag == 2 || flag == 4">
+          <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="arbitrateRecord.checkOpinion" />
+        </el-form-item>
+        <!-- 判断是否驳回 -->
+        <el-form-item label-width="100px" label="是否驳回：" v-if="flag == 2 || flag == 4">
+          <el-radio-group v-model="agreeOrNotCheck">
+            <el-radio :label="1">同意</el-radio>
+            <el-radio :label="2">驳回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label-width="100px" label="驳回原因" v-if="agreeOrNotCheck==2 && flag == 4" prop="arbitrateReject"
+          :rules="[
+            { required: true, message: '请输入驳回原因', trigger: 'blur' }
+          ]">
+          <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model.trim="arbitrateRecord.arbitrateReject"></el-input>
+        </el-form-item>
+        <el-form-item label-width="100px" label="bmz驳回原因" v-if="agreeOrNotCheck==2 && flag ==2" prop="deptorReject"
+          :rules="[
+            { required: true, message: '请输入驳回原因', trigger: 'blur' }
+          ]">
+          <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model.trim="arbitrateRecord.deptorReject"></el-input>
         </el-form-item>
       </el-form>
       <!-- 画布 -->
@@ -96,11 +115,11 @@
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="danger" @click="submitForm(4)" v-if="flag == 1">重新生成裁决书</el-button> -->
         <el-button type="primary" @click="submitForm(0)" v-if="flag == 1">提 交</el-button>
-        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">同 意</el-button>
-        <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button>
-        <el-button type="primary" @click="submitForm(3)" v-if="flag == 3">提 交</el-button>
-        <el-button type="primary" @click="submitForm(5)" v-if="flag == 4">同 意</el-button>
-        <el-button type="danger" @click="submitForm(6)" v-if="flag == 4">驳 回</el-button>
+        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">5提交</el-button>
+        <!-- <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button> -->
+        <!-- <el-button type="primary" @click="submitForm(3)" v-if="flag == 3">提 交</el-button> -->
+        <!-- <el-button type="primary" @click="submitForm(5)" v-if="flag == 4">同 意</el-button> -->
+        <el-button type="primary" @click="submitForm(6)" v-if="flag == 4">提交</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -121,6 +140,7 @@ export default {
     return {
       // key: value
       arbitrateRecordt: {},
+      agreeOrNotCheck:1,
       form: {},
       arbitrateRecord: {
         // checkOpinion:"同意"
@@ -175,7 +195,7 @@ export default {
             required: true,
             message: "意见不能为空",
             trigger: "blur",
-          },
+          }
         ],
         // arbitrateReject: [
         //   {
@@ -196,6 +216,13 @@ export default {
     };
   },
   watch: {
+    openDialogInfor:{
+        handler(val) {
+        if (val) {
+          this.agreeOrNotCheck = 1;
+        }
+      },
+    },
     awardDetailform: {
       handler(val) {
         if (val) {
@@ -270,7 +297,8 @@ export default {
         this.cancel();
         // this.$emit("updataList");
         this.$emit("getcaseApply", this.queryParams);
-        this.$message("成功");
+        // this.$message("成功");
+        this.$modal.msgSuccess("提交成功");
       });
     },
     //审核裁决书
@@ -279,16 +307,19 @@ export default {
         this.cancel();
         // this.$emit("updataList");
         this.$emit("getcaseApply", this.queryParams);
-        this.$message("成功");
+        // this.$message("成功");
+        this.$modal.msgSuccess("提交成功");
       });
     },
     // 仲裁员审核裁决书
     arbitratorCheckArbitrateRecordFn(parms) {
+      console.log(parms)
       arbitratorCheckArbitrateRecord(parms).then((res) => {
         this.cancel();
         // this.$emit("updataList");
         this.$emit("getcaseApply", this.queryParams);
-        this.$message("成功");
+        // this.$message("成功");
+        this.$modal.msgSuccess("提交成功");
       });
     },
     // 签名
@@ -320,51 +351,64 @@ export default {
               arbitrateRecord: this.arbitrateRecord,
             });
           } else if (parms == 1) {
-            this.checkArbitrateRecordFn({
+            if(this.agreeOrNotCheck==1){
+              //部门长同意
+               this.checkArbitrateRecordFn({
               id: this.form.id,
               agreeOrNotCheck: 1,
               arbitrateRecord: this.arbitrateRecord,
             });
-          } else if (parms == 2) {
-            if (!that.arbitrateRecord.arbitrateReject == "") {
-              this.$message.error('请输入拒绝原因');
-              return
-            } else {
-              this.arbitrateRecord.deptorReject = this.arbitrateRecord.arbitrateReject;
-              delete this.arbitrateRecord.arbitrateReject;
+            }else if(this.agreeOrNotCheck==2){
+              //  部门长驳回
               this.checkArbitrateRecordFn({
                 id: this.form.id,
                 agreeOrNotCheck: 2,
                 arbitrateRecord: this.arbitrateRecord,
               });
-            }
+            } 
+          } else if (parms == 2) {
+            // if (!that.arbitrateRecord.arbitrateReject == "") {
+            //   this.$message.error('请输入拒绝原因');
+            //   return
+            // } else {
+            //   this.arbitrateRecord.deptorReject = this.arbitrateRecord.arbitrateReject;
+            //   delete this.arbitrateRecord.arbitrateReject;
+            //   this.checkArbitrateRecordFn({
+            //     id: this.form.id,
+            //     agreeOrNotCheck: 2,
+            //     arbitrateRecord: this.arbitrateRecord,
+            //   });
+            // }
           } else if (parms == 3) {
             this.adjudicationSignatureFn({
               id: this.form.id,
             });
-          } else if (parms == 4) {
-            let paramsData = {};
-            paramsData.arbitrateRecord = this.arbitrateRecord;
-            paramsData.id = this.form.id
-            this.getRegenerationDocument(paramsData)
-          } else if (parms == 5) {
-            this.arbitratorCheckArbitrateRecordFn({
+          }else if (parms == 6) {
+              if(this.agreeOrNotCheck==1){
+                //仲裁员同意
+                 this.arbitratorCheckArbitrateRecordFn({
               id: this.form.id,
               agreeOrNotCheck: 1,
               arbitrateRecord: this.arbitrateRecord,
             });
-          } else if (parms == 6) {
-            debugger
-            if (!that.arbitrateRecord.arbitrateReject) {
-              this.$message.error('请输入拒绝原因');
-              return
-            } else {
-              this.arbitratorCheckArbitrateRecordFn({
+              }else if(this.agreeOrNotCheck==2){
+                //仲裁员驳回
+                  this.arbitratorCheckArbitrateRecordFn({
                 id: this.form.id,
                 agreeOrNotCheck: 2,
                 arbitrateRecord: this.arbitrateRecord,
               });
-            }
+              }
+            // if (!that.arbitrateRecord.arbitrateReject) {
+            //   this.$message.error('请输入拒绝原因');
+            //   return
+            // } else {
+            //   this.arbitratorCheckArbitrateRecordFn({
+            //     id: this.form.id,
+            //     agreeOrNotCheck: 2,
+            //     arbitrateRecord: this.arbitrateRecord,
+            //   });
+            // }
           }
         }
       });

vue.config.js

@@ -12,8 +12,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:8001'  //测试
-const API = 'http://172.16.1.26:8001'  //Bs
+ 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