Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

src/api/caseManagement/caseManagement.js

     data: data,
   });
 }
+//查询预约信息
+export function selectReservation(data) {
+    return request({
+      url: "/caseApplication/selectReservation",
+      method: "get",
+      params: data,
+    });
+  }
+  //核实调解员
+export function verifyMediator(data) {
+  return request({
+    url: "/caseApplication/verifyMediator",
+    method: "post",
+    data: data,
+  });
+}

src/utils/permission.js

   if (caseStatus.length == 0) {
     return false
   }
-  if (caseStatus.includes(value)) {
+  // if (caseStatus.includes(value)) {
+  //   // caseStatus.forEach(item => {
+  //   //   if (item == value) {
+  //   //     return true
+  //   //   }
+  //   // });
+  //   for(let i = 0;i < caseStatus.length;i++){
+  //     if(caseStatus[i] == value){
+  //       return true
+  //     }
+  //   }
+  // } else {
+  //   return false
+  // }
+  let flag = null;
+  for (let i = 0; i < caseStatus.length; i++) {
+    if (caseStatus[i] == value) {
+      flag = caseStatus[i]
+    }
+  }
+  if (flag == value) {
     return true
   } else {
     return false

src/views/caseManagement/caseList.vue

             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)">提交</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button>
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
                         icon="el-icon-edit">修改</el-button>
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
                         @click="evidenceUpload(scope.row)">证据修改</el-button>
                     <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button>
                     <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-tickets" @click="secretaryConfirm(scope.row)">秘书审核</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-tickets" @click="department(scope.row)">部门长审核</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <!-- 案件受理 -->
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance" :caseAcceptanceData="caseAcceptanceData" :getList="getList"></caseAcceptance>
         <!-- 调解员弹窗 -->
-        <selectMediator  @cancelMediator="cancelMediator" :mediatorVisable="mediatorVisable" :mediatorData="mediatorData" :getList="getList" :queryParams="queryParams"></selectMediator>
+        <selectMediator  @cancelMediator="cancelMediator" :mediatorVisable="mediatorVisable" :mediatorData="mediatorData" @getList="getList" :queryParams="queryParams"></selectMediator>
+        <!-- 秘书确认 -->
+        <confirmMediator @cancelConfirm="cancelConfirm" :confirmVisable="confirmVisable" :confirmData="confirmData" @getList="getList" :queryParams="queryParams"></confirmMediator>
+        <!-- 部门长确认 -->
+        <departmentMediator @cancelDepartment="cancelDepartment" :departmentVisable="departmentVisable" :departmentData="departmentData" @getList="getList" :queryParams="queryParams"></departmentMediator>
     </div>
 </template>
 
 import paymentdetailsDialog from './components/paymentdetailsDialog.vue'
 import caseAcceptance from './components/caseAcceptance.vue'
 import selectMediator from './components/selectMediator.vue'
+import confirmMediator from './components/confirmMediator.vue'
+import departmentMediator from './components/departmentMediator.vue'
 export default {
     name: "caseList",
     dicts: ["case_flow_node"],
         paymentdetailsDialog,
         caseAcceptance,
         selectMediator,//调解员弹窗
+        confirmMediator,
+        departmentMediator
     },
     data() {
         return {
             caseAcceptanceData:{},//案件受理数据
             mediatorVisable:false,//选择调解员弹窗
             timeVisable:false,//预约时间弹窗
+            confirmVisable:false,//确认时间/调解员
             mediatorData:{},
             flag: null,
             caseData: {},
             caseTime: '',
             deptList: [],
             payTitle: '',
-            tabFlag: false
+            tabFlag: false,
+            confirmData:{},
+            departmentVisable:false,
+            departmentData:{}
         };
     },
     created() {
                 this.payForm.caseId = res.data.id;
             });
         },
+        /** 确认时间/调解员 */
+        secretaryConfirm(val){
+            this.confirmVisable = true;
+            this.confirmData = val;
+        },
+        /** 部门长确认时间/调解员 */
+        department(val){
+            this.departmentVisable = true;
+            this.departmentData = val;
+        },
         /** 时间改变处理 */
         caseTimeChange() {
             if (this.caseTime) {
         cancelTime(){
             this.timeVisable = false;
         },
+        cancelConfirm(){
+            this.confirmVisable = false;
+        },
+        cancelDepartment(){
+            this.departmentVisable = false;
+        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;

src/views/caseManagement/components/confirmMediator.vue

+<template>
+    <div>
+        <el-dialog title="秘书确认时间/调解员" :visible="confirmVisable" v-if="confirmVisable" @close="cancel" center
+            :distroy-on-close="true">
+            <div style="margin-bottom: 20px;">
+                <el-radio-group v-model="confirmFlag">
+                    <el-radio :label="1">同意</el-radio>
+                    <el-radio :label="2">拒绝</el-radio>
+                </el-radio-group>
+            </div>
+            <div>
+                <div>
+                    <div style="margin-bottom: 20px;">调解员</div>
+                </div>
+                <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+                    @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" v-if="!confirmShow">
+                    </el-table-column>
+                    <el-table-column prop="mediatorName" label="调解员名称">
+                    </el-table-column>
+                    <el-table-column prop="specialty" label="专业">
+                    </el-table-column>
+                    <el-table-column prop="todoAmount" label="待办数量">
+                    </el-table-column>
+                    <el-table-column prop="completeAmount" label="已办数量">
+                    </el-table-column>
+                </el-table>
+                <div>
+                    <div style="margin-top: 20px;margin-bottom: 20px;">时间</div>
+                    <el-form label-position="right" label-width="80px" :model="formLabelAlign" :disabled="confirmShow">
+                        <el-form-item label="时间">
+                            <el-date-picker v-model="formLabelAlign.time[0]" type="datetime" placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item>
+                        <!-- 后期需要三个时间 -->
+                        <!-- <el-form-item label="时间2">
+                            <el-date-picker v-model="formLabelAlign.time[1]" type="datetime" placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="时间3">
+                            <el-date-picker v-model="formLabelAlign.time[2]" type="datetime" placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item> -->
+                    </el-form>
+                </div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
+                <el-button @click="submitMediator" class="endbutton1"><span>确 认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+  
+<script>
+import { Message } from 'element-ui'
+import { listMediator, updateBooking, selectReservation, verifyMediator } from '@/api/caseManagement/caseManagement.js'
+import moment from "moment";
+export default {
+    props: ["confirmVisable", "confirmData", "queryParams"],
+    data() {
+        return {
+            tableData: [],
+            multipleSelection: [],
+            formLabelAlign: {
+                time: []
+            },
+            formTimeArr: [],
+            mediatorArr: [],
+            confirmFlag: 1,
+            confirmShow: true,
+        };
+    },
+    watch: {
+        confirmVisable(val) {
+            if (val) {
+                this.confirmFlag = 1;
+                this.mediatorArr = [];
+                this.formTimeArr = [];
+                this.selectReservationFn({ id: this.confirmData.id })
+            }
+        },
+        confirmFlag(val) {
+            if (val == 1) {
+                this.confirmShow = true;
+                console.log(this.confirmData.id);
+                this.selectReservationFn({ id: this.confirmData.id })
+            } else {
+                this.confirmShow = false;
+                listMediator().then(res => {
+                    this.tableData = res.data;
+                })
+            }
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelConfirm");
+        },
+        selectReservationFn(data) {
+            selectReservation(data).then(res => {
+                this.tableData = res.data.mediatorList;
+                this.formLabelAlign.time[0] = res.data.herDates[0];
+            })
+        },
+        /**核实调解员 */
+        verifyMediatorFn(data) {
+            verifyMediator(data).then(res => {
+                this.$modal.msgSuccess("成功");
+                this.$emit("cancelConfirm");
+                this.$emit('getList', this.queryParams);
+            })
+        },
+        /**提交选择结果*/
+        async submitMediator() {
+            if (this.confirmFlag == 1) {
+                let userArr = [];
+                this.tableData.forEach(item => {
+                    userArr.push({
+                        userId: item.mediatorId,
+                        userName: item.mediatorName
+                    })
+                })
+                this.verifyMediatorFn({
+                    id: this.confirmData.id,
+                    caseFlowId: this.confirmData.caseFlowId,
+                    userList: userArr,
+                    herDates: this.formLabelAlign.time
+                })
+            } else {
+                if (this.multipleSelection.length > 1) {
+                    Message.error('最多选择一名调解员');
+                    return
+                } else if (this.multipleSelection.length < 1) {
+                    Message.error('至少选择一名调解员');
+                    return
+                }
+                if (this.formLabelAlign.time.length < 1) {
+                    Message.error('至少选择一个时间');
+                    return
+                }
+                this.formLabelAlign.time.forEach(item => {
+                    item = moment(
+                        item
+                    ).format("YYYY-MM-DD HH:mm:ss");
+                    this.formTimeArr.push(item)
+                })
+                this.multipleSelection.forEach(item => {
+                    this.mediatorArr.push({
+                        userId: item.mediatorId,
+                        userName: item.mediatorName
+                    })
+                })
+                this.verifyMediatorFn({
+                    id: this.confirmData.id,
+                    caseFlowId: this.confirmData.caseFlowId,
+                    userList: this.mediatorArr,
+                    herDates: this.formLabelAlign.time
+                })
+            }
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        }
+    },
+};
+</script>
+  
+<style lang="scss" scoped>
+.steps {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+::v-deep .el-step {
+    // width: 150px;
+    flex-basis: 25% !important;
+    margin-right: 20px;
+    margin-bottom: 20px;
+}
+
+::v-deep .el-dialog__body {
+    height: 500px !important;
+    overflow: auto !important;
+}
+
+::v-deep .el-dialog {
+    width: 800px;
+    background: #ffffff;
+    border-radius: 20px;
+}
+
+.timeTitle {
+    width: 1000%;
+    text-align: center;
+}
+</style>

src/views/caseManagement/components/departmentMediator.vue

+<template>
+    <div>
+        <el-dialog title="部门长确认时间/调解员" :visible="departmentVisable" v-if="departmentVisable" @close="cancel" center
+            :distroy-on-close="true">
+            <div style="margin-bottom: 20px;">
+                <el-radio-group v-model="confirmFlag">
+                    <el-radio :label="1">同意</el-radio>
+                    <el-radio :label="2">拒绝</el-radio>
+                </el-radio-group>
+            </div>
+            <div>
+                <div>
+                    <div style="margin-bottom: 20px;">调解员</div>
+                </div>
+                <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+                    @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" v-if="!confirmShow">
+                    </el-table-column>
+                    <el-table-column prop="mediatorName" label="调解员名称">
+                    </el-table-column>
+                    <el-table-column prop="specialty" label="专业">
+                    </el-table-column>
+                    <el-table-column prop="todoAmount" label="待办数量">
+                    </el-table-column>
+                    <el-table-column prop="completeAmount" label="已办数量">
+                    </el-table-column>
+                </el-table>
+                <div>
+                    <div style="margin-top: 20px;margin-bottom: 20px;">时间</div>
+                    <el-form label-position="right" label-width="80px" :model="formLabelAlign" :disabled="confirmShow">
+                        <el-form-item label="时间">
+                            <el-date-picker v-model="formLabelAlign.time[0]" type="datetime" placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item>
+                        <!-- 后期需要三个时间 -->
+                        <!-- <el-form-item label="时间2">
+                            <el-date-picker v-model="formLabelAlign.time[1]" type="datetime" placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="时间3">
+                            <el-date-picker v-model="formLabelAlign.time[2]" type="datetime" placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item> -->
+                    </el-form>
+                </div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
+                <el-button @click="submitMediator" class="endbutton1"><span>确 认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+  
+<script>
+import { Message } from 'element-ui'
+import { listMediator, selectReservation, verifyMediator } from '@/api/caseManagement/caseManagement.js'
+import moment from "moment";
+export default {
+    props: ["departmentVisable", "departmentData", "queryParams"],
+    data() {
+        return {
+            tableData: [],
+            multipleSelection: [],
+            formLabelAlign: {
+                time: []
+            },
+            formTimeArr: [],
+            mediatorArr: [],
+            confirmFlag: 1,
+            confirmShow: true,
+        };
+    },
+    watch: {
+        departmentVisable(val) {
+            if (val) {
+                this.confirmFlag = 1;
+                this.mediatorArr = [];
+                this.formTimeArr = [];
+                this.selectReservationFn({ id: this.departmentData.id })
+            }
+        },
+        confirmFlag(val) {
+            if (val == 1) {
+                this.confirmShow = true;
+                console.log(this.departmentData.id);
+                this.selectReservationFn({ id: this.departmentData.id })
+            } else {
+                this.confirmShow = false;
+                listMediator().then(res => {
+                    this.tableData = res.data;
+                })
+            }
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelDepartment");
+        },
+        selectReservationFn(data) {
+            selectReservation(data).then(res => {
+                this.tableData = res.data.mediatorList;
+                this.formLabelAlign.time[0] = res.data.herDates[0];
+            })
+        },
+        /**核实调解员 */
+        verifyMediatorFn(data) {
+            verifyMediator(data).then(res => {
+                this.$modal.msgSuccess("成功");
+                this.$emit("cancelDepartment");
+                this.$emit('getList', this.queryParams);
+            })
+        },
+        /**提交选择结果*/
+        async submitMediator() {
+            if (this.confirmFlag == 1) {
+                let userArr = [];
+                this.tableData.forEach(item => {
+                    userArr.push({
+                        userId: item.mediatorId,
+                        userName: item.mediatorName
+                    })
+                })
+                this.verifyMediatorFn({
+                    id: this.departmentData.id,
+                    caseFlowId: this.departmentData.caseFlowId,
+                    userList: userArr,
+                    herDates: this.formLabelAlign.time
+                })
+            } else {
+                if (this.multipleSelection.length > 1) {
+                    Message.error('最多选择一名调解员');
+                    return
+                } else if (this.multipleSelection.length < 1) {
+                    Message.error('至少选择一名调解员');
+                    return
+                }
+                if (this.formLabelAlign.time.length < 1) {
+                    Message.error('至少选择一个时间');
+                    return
+                }
+                this.formLabelAlign.time.forEach(item => {
+                    item = moment(
+                        item
+                    ).format("YYYY-MM-DD HH:mm:ss");
+                    this.formTimeArr.push(item)
+                })
+                this.multipleSelection.forEach(item => {
+                    this.mediatorArr.push({
+                        userId: item.mediatorId,
+                        userName: item.mediatorName
+                    })
+                })
+                this.verifyMediatorFn({
+                    id: this.departmentData.id,
+                    caseFlowId: this.departmentData.caseFlowId,
+                    userList: this.mediatorArr,
+                    herDates: this.formLabelAlign.time
+                })
+            }
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        }
+    },
+};
+</script>
+  
+<style lang="scss" scoped>
+.steps {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+::v-deep .el-step {
+    // width: 150px;
+    flex-basis: 25% !important;
+    margin-right: 20px;
+    margin-bottom: 20px;
+}
+
+::v-deep .el-dialog__body {
+    height: 500px !important;
+    overflow: auto !important;
+}
+
+::v-deep .el-dialog {
+    width: 800px;
+    background: #ffffff;
+    border-radius: 20px;
+}
+
+.timeTitle {
+    width: 1000%;
+    text-align: center;
+}
+</style>

src/views/caseManagement/components/selectMediator.vue

                             <el-date-picker v-model="formLabelAlign.time[0]" type="datetime" placeholder="选择日期时间">
                             </el-date-picker>
                         </el-form-item>
-                        <el-form-item label="时间2">
+                        <!-- 后期需要三个时间 -->
+                        <!-- <el-form-item label="时间2">
                             <el-date-picker v-model="formLabelAlign.time[1]" type="datetime" placeholder="选择日期时间">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="时间3">
                             <el-date-picker v-model="formLabelAlign.time[2]" type="datetime" placeholder="选择日期时间">
                             </el-date-picker>
-                        </el-form-item>
+                        </el-form-item> -->
                     </el-form>
                 </div>
             </div>
             if (val) {
                 // this.this.multipleSelection = [];
                 // this.formLabelAlign.time = [];
+                this.mediatorArr = [];
+                this.formTimeArr = [];
                 listMediator().then(res=>{
                     this.tableData = res.data;
                 })
         },
         /**提交选择结果*/
         async submitMediator() {
-            if (this.multipleSelection.length > 3) {
-                Message.error('最多选择三名调解员');
+            if (this.multipleSelection.length > 1) {
+                Message.error('最多选择一名调解员');
                 return
             }else if(this.multipleSelection.length < 1){
                 Message.error('至少选择一名调解员');
                 userList:this.mediatorArr,
                 herDates:this.formTimeArr
             })
-            console.log(this.mediatorArr,this.formTimeArr,"LLLLLLLLLLLLLLLLLLLLLLLL");
         },
         async updateBookingFn(data){
             await updateBooking(data).then(res=>{
                 this.$modal.msgSuccess("成功");
-                this.$emit("getList",this.queryParams);
-                this.cancel();
+                this.$emit("cancelMediator");
+                this.$emit('getList', this.queryParams);
             })
         },
         handleSelectionChange(val) {

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://121.40.189.20:6001'  //测试
+// const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
 // const API = 'http://192.168.3.77:9001' //Q
-// const API = 'http://172.16.1.14:6001' //w
+const API = 'http://172.16.1.14:6001' //w
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions