From f3a7ef10ceb0da02d930aa32b3b3fb0aebe0545d Mon Sep 17 00:00:00 2001
From: gongdi <410827992@qq.com>
Date: Thu, 13 Jan 2022 15:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=8B=E6=B5=A6=E4=B8=AD=E5=AD=A6=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todoHandle/business/BusinessList.vue      |  26 +-
 .../todoHandle/modulComponent/approveCom.vue  |   7 +-
 .../todoHandle/modulComponent/carApprove.vue  | 266 ++++++++++++++++
 .../modulComponent/carReturnApprove.vue       | 285 ++++++++++++++++++
 .../modulComponent/goodsReceiveApprove.vue    | 273 +++++++++++++++++
 .../todoHandle/modulComponent/interConfig.js  |  34 +++
 .../modulComponent/meetingApprove.vue         |   8 +-
 .../pages/adminCenter/workbench.vue           |   4 +-
 .../todoHandle/business/BusinessList.vue      |   1 -
 9 files changed, 894 insertions(+), 10 deletions(-)
 create mode 100644 src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carApprove.vue
 create mode 100644 src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carReturnApprove.vue
 create mode 100644 src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/goodsReceiveApprove.vue

diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue
index 3b926d8..79a1388 100644
--- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue
@@ -32,11 +32,10 @@
 </template>
 
 <script>
-    import {Spin, Empty,Icon} from 'ant-design-vue';
+    import {Spin, Empty,Icon,Modal} from 'ant-design-vue';
     import GlobalParams from '../../../global_params';
     import InterfaceConfig from '../../../../../api/layoutInterfaceConfig';
     import BusinessItem from './BusinessItem';
-    import MeetingApprove from '../modulComponent/meetingApprove.vue';
     let attandanceType = {
         1: '事假',
         2: '病假',
@@ -575,15 +574,36 @@
                 }
             },
             clickContent: function (item) {
+                let apply_id = item.data_infomation.apply_id;
+                if(!apply_id || apply_id === ""){
+                    Modal.warning({
+                        title:"数据有误，请联系管理员处理",
+                        content:"",
+                        centered:true
+                    })
+                    return
+                }
                 let biz_code = item.biz_code;
                 switch (biz_code){
                     case "108001001":
                         this.infoTitle = "会议室审批";
-                        this.moduleComponent = MeetingApprove;
+                        this.moduleComponent = ()=>import('../modulComponent/meetingApprove.vue');
                         this.moduleParam = item.data_infomation;
                         break;
                     case "107001001":
                         this.infoTitle = "用车审批";
+                        this.moduleComponent = ()=>import('../modulComponent/carApprove.vue');
+                        this.moduleParam = item.data_infomation;
+                        break;
+                    case "107002001":
+                        this.infoTitle = "还车审批";
+                        this.moduleComponent = ()=>import('../modulComponent/carReturnApprove.vue');
+                        this.moduleParam = item.data_infomation;
+                        break;
+                    case "106001001":
+                        this.infoTitle = "物品领用审批";
+                        this.moduleComponent = ()=>import('../modulComponent/goodsReceiveApprove.vue');
+                        this.moduleParam = item.data_infomation;
                         break;
                     case 1:
                         break;
diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue
index 1da0b04..9985d54 100644
--- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue
@@ -12,7 +12,7 @@
                 </a-textarea>
             </div>
         </div>
-        <div class="info-row-style" v-if="hasNext === 1">
+        <div class="info-row-style margin-div" v-if="hasNext === 1">
             <div class="info-left">指定审批人：</div>
             <div class="info-right">
                 <a-radio-group name="radioGroup" @change="changeCheckPerson">
@@ -22,7 +22,7 @@
                 </a-radio-group>
             </div>
         </div>
-        <div class="info-row-style" v-if="openCopyFlag === 1">
+        <div class="info-row-style margin-div" v-if="openCopyFlag === 1">
             <div class="info-left">指定抄送人：</div>
             <div class="info-right">
                 <div class="copy-title-style">{{copyTitle}}</div>
@@ -214,6 +214,9 @@
                 }
             }
         }
+        .margin-div{
+            margin-top: 0.5rem;
+        }
         .button-div-style {
             display: flex;
             justify-content: center;
diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carApprove.vue
new file mode 100644
index 0000000..1d2bbc5
--- /dev/null
+++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carApprove.vue
@@ -0,0 +1,266 @@
+<template>
+    <a-spin :spinning="spinning">
+        <vue-scroll :ops="listScroll" class="car-apply-info-box-style" style="height:450px">
+            <div class="info-row-style">
+                <div class="info-left">车辆：</div>
+                <div class="info-right">{{applyInfo.car_name}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">车牌号：</div>
+                <div class="info-right">{{applyInfo.car_no}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">驾车方式：</div>
+                <div class="info-right">{{applyInfo.driving_type === 1?'司机驾驶':'自己驾驶'}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">用车人员：</div>
+                <div class="info-right">
+                    <div class="left-style">{{applyInfo.user_person_name}}</div>
+                    <div class="right-style">
+                        <div class="part-left">用车部门：</div>
+                        <div class="part-right">{{applyInfo.user_dept_name}}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">同行人员：</div>
+                <div class="info-right">{{applyInfo.together_person_names}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">开始时间：</div>
+                <div class="info-right">{{applyInfo.begin_datetime}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">结束时间：</div>
+                <div class="info-right">{{applyInfo.end_datetime}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">出车地点：</div>
+                <div class="info-right">{{applyInfo.departure_place}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">目的地点：</div>
+                <div class="info-right">{{applyInfo.destination_place}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">用车事由：</div>
+                <div class="info-right">{{applyInfo.use_car_reason}}</div>
+            </div>
+            <a-divider>审批内容</a-divider>
+            <ApproveCom
+                    :hasNext="hasNext"
+                    :checkPersonList="checkPersonList"
+                    :openCopyFlag="openCopyFlag"
+                    :copyPersonType="copyPersonType"
+                    :copyPersonList="copyPersonList"
+                    @changeCheckPerson="changeCheckPerson"
+                    @changeCopyPerson="changeCopyPerson"
+                    @submit="submit"
+            />
+        </vue-scroll>
+    </a-spin>
+</template>
+<script>
+    /*
+     * 公车申请审批
+     * */
+    import {Spin, Divider, Modal} from 'ant-design-vue';
+    import interConfig from './interConfig';
+    import ApproveCom from './approveCom.vue';
+    export default{
+        props: {
+            param: {
+                type: Object,
+            }
+        },
+        data(){
+            return {
+                applyInfo: {},
+                spinning: false,
+                listScroll: this.StaticParams.scrollOption,
+                hasNext: 0,//是否存在下一审批节点
+                checkPersonList: [],//审批人信息
+                nextLevelId: "",//下级节点ID
+                openCopyFlag: 0,//是否开启抄送
+                copyPersonType: -1,//抄送类型 （0-自选，1-申请部门领导，2-指定）
+                copyPersonList: [],//抄送人员
+
+                checkPersonId: "",//下一步审核人员ID
+                checkPersonName: "",//下一步审核人员姓名
+                paramCopyList: [],//抄送人
+                options: "",//审批意见
+            }
+        },
+        computed:{
+
+        },
+        mounted(){
+            this.getApplyInfo();
+        },
+        methods: {
+            getApplyInfo: function () {
+                let params = {
+                    apply_id: this.param.apply_id,
+                    run_type: 1,
+                    person_id: this.BaseConfig.userInfo.person_id
+                }
+                this.spinning = true;
+                this.InterfaceConfig.callInterface([{
+                    url: interConfig.getCarApplyInfo.url,
+                    params: params,
+                    method: interConfig.getCarApplyInfo.method,
+                    isTestLogin: interConfig.getCarApplyInfo.isTestLogin
+                }], (result) => {
+                    let res = result[0].data;
+                    if (res.code === 2000) {
+                        this.applyInfo = res.data.apply_info;
+                        let soflow = res.data.soFlowInfo;//下一节点信息
+                        this.hasNext = soflow.has_next;//是否存在下一审批节点
+                        if (this.hasNext === 1) {
+                            this.checkPersonList = soflow.next_level.check_person_list;
+                            this.nextLevelId = soflow.next_level.level_id;
+                        }
+                        if (soflow.current_level) {
+                            this.openCopyFlag = soflow.current_level.open_copy_flag;
+                            if (this.openCopyFlag === 1) {
+                                this.copyPersonType = soflow.current_level.copy_person_type;
+                                this.copyPersonList = soflow.current_level.copy_person_list;
+                            }
+                        }
+                        this.spinning = false;
+                    } else {
+                        this.spinning = false;
+                    }
+                })
+            },
+            changeCheckPerson:function (personId) {
+                let checkPerson = this.checkPersonList.filter((item)=>{
+                    return parseInt(item.person_id) === parseInt(personId);
+                })
+                this.checkPersonId = personId;
+                if(checkPerson.length > 0){
+                    this.checkPersonName = checkPerson[0].person_name;
+                }
+            },
+            changeCopyPerson:function (personArr) {
+                this.paramCopyList = personArr;
+            },
+            submit:function (res) {
+                let type = res.type;
+                this.options = res.options;
+                if(type === 1){
+                    if(this.hasNext === 1 && this.checkPersonId === ""){
+                        Modal.warning({
+                            title:"请选择审批人",
+                            content:"",
+                            centered:true
+                        })
+                        return
+                    }
+                    if(this.openCopyFlag === 1 && this.paramCopyList.length > 20){
+                        Modal.warning({
+                            title:"请选择审批人",
+                            content:"",
+                            centered:true
+                        })
+                        return
+                    }
+                }else if(type === -1){
+                    if(this.options === ""){
+                        Modal.warning({
+                            title:"请填写审批意见",
+                            content:"",
+                            centered:true
+                        })
+                        return
+                    }
+                }
+                let submitParam = {
+                    apply_id:this.param.apply_id,
+                    check_id:this.param.check_id,
+                    status_id:type,
+                    person_id:this.BaseConfig.userInfo.person_id_cookie,
+                    check_opinion:this.options,
+                    has_next:this.hasNext,
+                }
+                if(type === 1 && this.hasNext === 1){
+                    submitParam.next_level_id = this.nextLevelId;
+                    submitParam.next_person_id = this.checkPersonId;
+                    submitParam.next_person_name = this.checkPersonName;
+                }
+                if(this.copyPersonType === 1 && this.copyPersonList.length > 0){
+                    //部门领导
+                    submitParam.copy_list = JSON.stringify(this.copyPersonList);
+                }
+                if(this.copyPersonType !== 1 && this.paramCopyList.length > 0){
+                    //其他方式
+                    submitParam.copy_list = JSON.stringify(this.paramCopyList);
+                }
+                this.spinning = true;
+                this.InterfaceConfig.callInterface([{
+                    url: interConfig.submitCarCheck.url,
+                    params: submitParam,
+                    method: interConfig.submitCarCheck.method,
+                    isTestLogin: interConfig.submitCarCheck.isTestLogin
+                }], (result) => {
+                    let res = result[0].data;
+                    if(res.code === 2000){
+                        Modal.success({
+                            title:"审批成功",
+                            content:"",
+                            centered:true
+                        })
+                        this.$emit("updateModuleData")
+                        this.spinning = false;
+                    }else {
+                        this.spinning = false;
+                    }
+                })
+            }
+        },
+        components: {
+            ASpin: Spin,
+            ADivider:Divider,
+            ApproveCom
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .car-apply-info-box-style {
+        width: 100%;
+        /*height: calc(100% - 50px) !important;*/
+        padding: 10px !important;
+        display: flex;
+        flex-direction: column;
+        .info-row-style {
+            width: 100%;
+            min-height: 2.5rem;
+            display: flex;
+            .info-left {
+                width: 20%;
+                text-align: right;
+            }
+            .info-right {
+                width: 80%;
+                text-align: left;
+                display: flex;
+                .left-style {
+                    width: 50%;
+                    text-align: left;
+                }
+                .right-style {
+                    width: 50%;
+                    text-align: left;
+                    display: flex;
+                }
+            }
+        }
+        scrollbar-width: none; /* Firefox */
+        -ms-overflow-style: none; /* IE 10+ */
+        ::-webkit-scrollbar {
+            display: none; /* Chrome Safari */
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carReturnApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carReturnApprove.vue
new file mode 100644
index 0000000..7a49931
--- /dev/null
+++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/carReturnApprove.vue
@@ -0,0 +1,285 @@
+<template>
+    <a-spin :spinning="spinning">
+        <vue-scroll :ops="listScroll" class="car-apply-info-box-style" style="height:450px">
+            <div class="info-row-style">
+                <div class="info-left">车辆：</div>
+                <div class="info-right">{{applyInfo.car_name}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">车牌号：</div>
+                <div class="info-right">{{applyInfo.car_no}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">驾车方式：</div>
+                <div class="info-right">{{applyInfo.driving_type === 1?'司机驾驶':'自己驾驶'}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">用车人员：</div>
+                <div class="info-right">
+                    <div class="left-style">{{applyInfo.user_person_name}}</div>
+                    <div class="right-style">
+                        <div class="part-left">用车部门：</div>
+                        <div class="part-right">{{applyInfo.user_dept_name}}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">同行人员：</div>
+                <div class="info-right">{{applyInfo.together_person_names}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">开始时间：</div>
+                <div class="info-right">{{applyInfo.begin_datetime}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">结束时间：</div>
+                <div class="info-right">{{applyInfo.end_datetime}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">出车地点：</div>
+                <div class="info-right">{{applyInfo.departure_place}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">目的地点：</div>
+                <div class="info-right">{{applyInfo.destination_place}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">用车事由：</div>
+                <div class="info-right">{{applyInfo.use_car_reason}}</div>
+            </div>
+
+            <div class="info-row-style">
+                <div class="info-left">出车时间：</div>
+                <div class="info-right">
+                    <div class="left-style">{{applyInfo.leave_datetime}}</div>
+                    <div class="right-style">
+                        <div class="part-left">表盘里程：</div>
+                        <div class="part-right">{{applyInfo.leave_mileage + '公里'}}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">照片：</div>
+                <div class="info-right">
+                    <div v-if="leavePic.length == 0">暂无照片</div>
+                    <div v-else>
+                        <Uploader :type="2" :fileData="leavePic" :canUpload="false" :option="{}" :multiple="false"></Uploader>
+                    </div>
+                </div>
+            </div>
+
+            <div class="info-row-style">
+                <div class="info-left">还车时间：</div>
+                <div class="info-right">
+                    <div class="left-style">{{applyInfo.giveback_datetime}}</div>
+                    <div class="right-style">
+                        <div class="part-left">表盘里程：</div>
+                        <div class="part-right">{{applyInfo.giveback_mileage + '公里'}}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">照片：</div>
+                <div class="info-right">
+                    <div v-if="givebackPic.length == 0">暂无照片</div>
+                    <div v-else>
+                        <Uploader :type="2" :fileData="givebackPic" :canUpload="false" :option="{}" :multiple="false"></Uploader>
+                    </div>
+                </div>
+            </div>
+
+            <a-divider>审批内容</a-divider>
+            <ApproveCom
+                    :hasNext="hasNext"
+                    :checkPersonList="checkPersonList"
+                    :openCopyFlag="openCopyFlag"
+                    :copyPersonType="copyPersonType"
+                    :copyPersonList="copyPersonList"
+                    @submit="submit"
+            />
+        </vue-scroll>
+    </a-spin>
+</template>
+<script>
+    /*
+     * 公车申请审批
+     * */
+    import {Spin, Divider, Modal} from 'ant-design-vue';
+    import interConfig from './interConfig';
+    import ApproveCom from './approveCom.vue';
+    import Uploader from '../../../../../../../components/common/uploader/Upload.vue';
+    import StaticParams from '../../../../../../../global-llibs/staticParams';
+    export default{
+        props: {
+            param: {
+                type: Object,
+            }
+        },
+        data(){
+            return {
+                applyInfo: {},
+                spinning: false,
+                listScroll: this.StaticParams.scrollOption,
+                hasNext: 0,//是否存在下一审批节点
+                checkPersonList: [],//审批人信息
+                nextLevelId: "",//下级节点ID
+                openCopyFlag: 0,//是否开启抄送
+                copyPersonType: -1,//抄送类型 （0-自选，1-申请部门领导，2-指定）
+                copyPersonList: [],//抄送人员
+
+                checkPersonId: "",//下一步审核人员ID
+                checkPersonName: "",//下一步审核人员姓名
+                paramCopyList: [],//抄送人
+                options: "",//审批意见
+                leavePic:[],//出车时图片
+                givebackPic:[],//还车时图片
+            }
+        },
+        computed:{
+
+        },
+        mounted(){
+            this.getApplyInfo();
+        },
+        methods: {
+            getApplyInfo: function () {
+                let params = {
+                    apply_id: this.param.apply_id,
+                    run_type: 1,
+                    person_id: this.BaseConfig.userInfo.person_id
+                }
+                this.spinning = true;
+                this.InterfaceConfig.callInterface([{
+                    url: interConfig.getCarApplyInfo.url,
+                    params: params,
+                    method: interConfig.getCarApplyInfo.method,
+                    isTestLogin: interConfig.getCarApplyInfo.isTestLogin
+                }], (result) => {
+                    let res = result[0].data;
+                    if (res.code === 2000) {
+                        this.applyInfo = res.data.apply_info;
+                        if(this.applyInfo.leave_pic && this.applyInfo.leave_pic !== ""){
+                            this.leavePic = JSON.parse(this.applyInfo.leave_pic);
+                            if(this.leavePic.length > 0){
+                                for (let j = 0, fileLen = this.leavePic.length; j < fileLen; j++) {
+                                    let key = "";
+                                    key = StaticParams.getThumbUrl(this.leavePic[j].file_id + "." + this.leavePic[j].resource_format, 100, 100, 100);
+                                    if(this.BaseConfig.pt_type + "" === "1"){
+                                        key = key.substring(0, key.indexOf("?"))
+                                    }else{
+                                        key = key.substring(0, key.lastIndexOf("@"));
+                                        key = key.substring(key.indexOf("html") + 4);//去掉 http://localhost/dsideal_yy/html
+                                    }
+                                    this.leavePic[j]["key"] = key;
+                                }
+                            }
+                        }
+                        if(this.applyInfo.giveback_pic && this.applyInfo.giveback_pic !== ""){
+                            this.givebackPic = JSON.parse(this.applyInfo.giveback_pic);
+                            if(this.givebackPic.length > 0){
+                                for (let j = 0, fileLen = this.givebackPic.length; j < fileLen; j++) {
+                                    let key = "";
+                                    key = StaticParams.getThumbUrl(this.givebackPic[j].file_id + "." + this.givebackPic[j].resource_format, 100, 100, 100);
+                                    if(this.BaseConfig.pt_type + "" === "1"){
+                                        key = key.substring(0, key.indexOf("?"))
+                                    }else{
+                                        key = key.substring(0, key.lastIndexOf("@"));
+                                        key = key.substring(key.indexOf("html") + 4);//去掉 http://localhost/dsideal_yy/html
+                                    }
+                                    this.givebackPic[j]["key"] = key;
+                                }
+                            }
+                        }
+                        this.spinning = false;
+                    } else {
+                        this.spinning = false;
+                    }
+                })
+            },
+            submit:function (res) {
+                let type = res.type;
+                this.options = res.options;
+                if(type === -1){
+                    if(this.options === ""){
+                        Modal.warning({
+                            title:"请填写审批意见",
+                            content:"",
+                            centered:true
+                        })
+                        return
+                    }
+                }
+                let submitParam = {
+                    apply_id:this.param.apply_id,
+                    check_flag:type,
+                    person_id:this.BaseConfig.userInfo.person_id_cookie,
+                    check_info:this.options,
+                }
+                this.spinning = true;
+                this.InterfaceConfig.callInterface([{
+                    url: interConfig.checkGiveBackCar.url,
+                    params: submitParam,
+                    method: interConfig.checkGiveBackCar.method,
+                    isTestLogin: interConfig.checkGiveBackCar.isTestLogin
+                }], (result) => {
+                    let res = result[0].data;
+                    if(res.code === 2000){
+                        Modal.success({
+                            title:"审批成功",
+                            content:"",
+                            centered:true
+                        })
+                        this.$emit("updateModuleData")
+                        this.spinning = false;
+                    }else {
+                        this.spinning = false;
+                    }
+                })
+            }
+        },
+        components: {
+            ASpin: Spin,
+            ADivider:Divider,
+            ApproveCom,
+            Uploader
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .car-apply-info-box-style {
+        width: 100%;
+        /*height: calc(100% - 50px) !important;*/
+        padding: 10px !important;
+        display: flex;
+        flex-direction: column;
+        .info-row-style {
+            width: 100%;
+            min-height: 2.5rem;
+            display: flex;
+            .info-left {
+                width: 20%;
+                text-align: right;
+            }
+            .info-right {
+                width: 80%;
+                text-align: left;
+                display: flex;
+                .left-style {
+                    width: 50%;
+                    text-align: left;
+                }
+                .right-style {
+                    width: 50%;
+                    text-align: left;
+                    display: flex;
+                }
+            }
+        }
+        scrollbar-width: none; /* Firefox */
+        -ms-overflow-style: none; /* IE 10+ */
+        ::-webkit-scrollbar {
+            display: none; /* Chrome Safari */
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/goodsReceiveApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/goodsReceiveApprove.vue
new file mode 100644
index 0000000..72470b1
--- /dev/null
+++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/goodsReceiveApprove.vue
@@ -0,0 +1,273 @@
+<template>
+    <a-spin :spinning="spinning">
+        <vue-scroll :ops="listScroll" class="goods-receive-box-style" style="height:450px">
+            <div class="info-row-style">
+                <div class="info-left">申请时间：</div>
+                <div class="info-right">{{applyInfo.apply_time}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">申请人员：</div>
+                <div class="info-right">{{applyInfo.person_name}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">申请部门：</div>
+                <div class="info-right">{{applyInfo.dept_name}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">使用人员：</div>
+                <div class="info-right">{{applyInfo.use_person_name}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">使用部门：</div>
+                <div class="info-right">{{applyInfo.use_dept_name}}</div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">申请说明：</div>
+                <div class="info-right">{{applyInfo.apply_desc}}</div>
+            </div>
+            <a-divider>物品明细</a-divider>
+            <a-table :columns="tableColumns" :data-source="tableData" :pagination="false"></a-table>
+            <a-divider>审批内容</a-divider>
+            <ApproveCom
+                    :hasNext="hasNext"
+                    :checkPersonList="checkPersonList"
+                    :openCopyFlag="openCopyFlag"
+                    :copyPersonType="copyPersonType"
+                    :copyPersonList="copyPersonList"
+                    @changeCheckPerson="changeCheckPerson"
+                    @changeCopyPerson="changeCopyPerson"
+                    @submit="submit"
+            />
+        </vue-scroll>
+    </a-spin>
+</template>
+<script>
+    /*
+     * 物品领用审批
+     * */
+    import {Spin, Divider, Modal,Table} from 'ant-design-vue';
+    import interConfig from './interConfig';
+    import ApproveCom from './approveCom.vue';
+    export default{
+        props: {
+            param: {
+                type: Object,
+            }
+        },
+        data(){
+            return {
+                applyInfo: {},
+                spinning: false,
+                listScroll: this.StaticParams.scrollOption,
+                tableColumns:[
+                    {
+                        title: "物品名称",
+                        dataIndex: "title",
+                        align: "center",
+                    },
+                    {
+                        title: "申请数量",
+                        dataIndex: "num",
+                        align: "center",
+                    }
+                ],
+                tableData:[],
+                hasNext: 0,//是否存在下一审批节点
+                checkPersonList: [],//审批人信息
+                nextLevelId: "",//下级节点ID
+                openCopyFlag: 0,//是否开启抄送
+                copyPersonType: -1,//抄送类型 （0-自选，1-申请部门领导，2-指定）
+                copyPersonList: [],//抄送人员
+
+                checkPersonId: "",//下一步审核人员ID
+                checkPersonName: "",//下一步审核人员姓名
+                paramCopyList: [],//抄送人
+                options: "",//审批意见
+            }
+        },
+        computed: {},
+        mounted(){
+            this.getApplyInfo();
+        },
+        methods: {
+            getApplyInfo: function () {
+                let params = {
+                    apply_id: this.param.apply_id,
+                    run_type: 1,
+                    person_id: this.BaseConfig.userInfo.person_id,
+                    org_id: this.BaseConfig.person_info_my.bureau_id,
+                }
+                this.spinning = true;
+                this.InterfaceConfig.callInterface([{
+                    url: interConfig.getGoodsReceiveApplyInfo.url,
+                    params: params,
+                    method: interConfig.getGoodsReceiveApplyInfo.method,
+                    isTestLogin: interConfig.getGoodsReceiveApplyInfo.isTestLogin
+                }], (result) => {
+                    let res = result[0].data;
+                    if (res.code === 2000) {
+                        this.applyInfo = res.data.apply_info;
+                        let suppliesList = this.applyInfo.supplies_list;
+                        if(suppliesList && suppliesList.length > 0){
+                            for(let i = 0,len = suppliesList.length;i < len;i ++){
+                                let goods = {
+                                    title:suppliesList[i].name,
+                                    num:suppliesList[i].apply_count
+                                }
+                                this.tableData.push(goods);
+                            }
+                        }
+                        let soflow = res.data.soFlowInfo;//下一节点信息
+                        this.hasNext = soflow.has_next;//是否存在下一审批节点
+                        if (this.hasNext === 1) {
+                            this.checkPersonList = soflow.next_level.check_person_list;
+                            this.nextLevelId = soflow.next_level.level_id;
+                        }
+                        if (soflow.current_level) {
+                            this.openCopyFlag = soflow.current_level.open_copy_flag;
+                            if (this.openCopyFlag === 1) {
+                                this.copyPersonType = soflow.current_level.copy_person_type;
+                                this.copyPersonList = soflow.current_level.copy_person_list;
+                            }
+                        }
+                        this.spinning = false;
+                    } else {
+                        this.spinning = false;
+                    }
+                })
+            },
+            changeCheckPerson: function (personId) {
+                let checkPerson = this.checkPersonList.filter((item) => {
+                    return parseInt(item.person_id) === parseInt(personId);
+                })
+                this.checkPersonId = personId;
+                if (checkPerson.length > 0) {
+                    this.checkPersonName = checkPerson[0].person_name;
+                }
+            },
+            changeCopyPerson: function (personArr) {
+                this.paramCopyList = personArr;
+            },
+            submit: function (res) {
+                let type = res.type;
+                this.options = res.options;
+                if (type === 1) {
+                    if (this.hasNext === 1 && this.checkPersonId === "") {
+                        Modal.warning({
+                            title: "请选择审批人",
+                            content: "",
+                            centered: true
+                        })
+                        return
+                    }
+                    if (this.openCopyFlag === 1 && this.paramCopyList.length > 20) {
+                        Modal.warning({
+                            title: "请选择审批人",
+                            content: "",
+                            centered: true
+                        })
+                        return
+                    }
+                } else if (type === -1) {
+                    if (this.options === "") {
+                        Modal.warning({
+                            title: "请填写审批意见",
+                            content: "",
+                            centered: true
+                        })
+                        return
+                    }
+                }
+                let submitParam = {
+                    org_id: this.BaseConfig.person_info_my.bureau_id,
+                    person_id: this.BaseConfig.userInfo.person_id_cookie,
+                    apply_id: this.param.apply_id,
+                    check_id: this.param.check_id,
+                    status_id: type,
+                    check_opinion: this.options,
+                    has_next: this.hasNext,
+                }
+                if (type === 1 && this.hasNext === 1) {
+                    submitParam.next_level_id = this.nextLevelId;
+                    submitParam.next_person_id = this.checkPersonId;
+                    submitParam.next_person_name = this.checkPersonName;
+                }
+                if (this.copyPersonType === 1 && this.copyPersonList.length > 0) {
+                    //部门领导
+                    submitParam.copy_list = JSON.stringify(this.copyPersonList);
+                }
+                if (this.copyPersonType !== 1 && this.paramCopyList.length > 0) {
+                    //其他方式
+                    submitParam.copy_list = JSON.stringify(this.paramCopyList);
+                }
+                this.spinning = true;
+                this.InterfaceConfig.callInterface([{
+                    url: interConfig.doCheck.url,
+                    params: submitParam,
+                    method: interConfig.doCheck.method,
+                    isTestLogin: interConfig.doCheck.isTestLogin
+                }], (result) => {
+                    let res = result[0].data;
+                    if (res.code === 2000) {
+                        Modal.success({
+                            title: "审批成功",
+                            content: "",
+                            centered: true
+                        })
+                        this.$emit("updateModuleData")
+                        this.spinning = false;
+                    } else {
+                        this.spinning = false;
+                    }
+                })
+            }
+        },
+        components: {
+            ASpin: Spin,
+            ADivider: Divider,
+            ApproveCom,
+            ATable:Table
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .goods-receive-box-style {
+        width: 100%;
+        /*height: calc(100% - 50px) !important;*/
+        padding: 10px !important;
+        display: flex;
+        flex-direction: column;
+        .__panel{
+            width: 100% !important;
+        }
+        .info-row-style {
+            width: 100%;
+            min-height: 2.5rem;
+            display: flex;
+            .info-left {
+                width: 20%;
+                text-align: right;
+            }
+            .info-right {
+                width: 80%;
+                text-align: left;
+                display: flex;
+                .left-style {
+                    width: 50%;
+                    text-align: left;
+                }
+                .right-style {
+                    width: 50%;
+                    text-align: left;
+                    display: flex;
+                }
+            }
+        }
+        scrollbar-width: none; /* Firefox */
+        -ms-overflow-style: none; /* IE 10+ */
+        ::-webkit-scrollbar {
+            display: none; /* Chrome Safari */
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js
index c58fd61..2d60183 100644
--- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js
+++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js
@@ -1,5 +1,6 @@
 const interConfig = {
 
+    //---------------会议室审批-----------------
     //获取会议室申请信息
     'getMeetingApplyInfo':{
         url:'/intellioa/meetingRoom/apply/getApplyInfo',
@@ -20,5 +21,38 @@ const interConfig = {
         method:'post',
         isTestLogin:true,
     },
+
+    //---------------公车审批-----------------
+    //获取会议室申请信息
+    'getCarApplyInfo':{
+        url:'/intellioa/carManage/carApply/getApplyInfo',
+        method:'post',
+        isTestLogin:true,
+    },
+    //提交审批信息
+    'submitCarCheck':{
+        url:'/intellioa/carManage/carApply/checkApplyCar',
+        method:'post',
+        isTestLogin:true,
+    },
+    //提交还车审批信息
+    'checkGiveBackCar':{
+        url:'/intellioa/carManage/carApply/checkGiveBackCar',
+        method:'post',
+        isTestLogin:true,
+    },
+
+    //---------------物品领用审批-----------------
+    'getGoodsReceiveApplyInfo':{
+        url:'/intellioa/supplies/apply/getApplyInfo',
+        method:'post',
+        isTestLogin:true,
+    },
+    'doCheck':{
+        url:'/intellioa/supplies/apply/doCheck',
+        method:'post',
+        isTestLogin:true,
+    },
+
 }
 export default interConfig
diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue
index cbc91d7..1b7aeb1 100644
--- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/meetingApprove.vue
@@ -207,11 +207,15 @@
                     submitParam.next_person_id = this.checkPersonId;
                     submitParam.next_person_name = this.checkPersonName;
                 }
-                if(this.paramCopyList.length > 0){
+                if(this.copyPersonType === 1 && this.copyPersonList.length > 0){
+                    //部门领导
+                    submitParam.copy_person_list = JSON.stringify(this.copyPersonList);
+                }
+                if(this.copyPersonType !== 1 && this.paramCopyList.length > 0){
+                    //其他方式
                     submitParam.copy_person_list = JSON.stringify(this.paramCopyList);
                 }
                 this.spinning = true;
-                console.log(submitParam)
                 this.InterfaceConfig.callInterface([{
                     url: interConfig.submitCheck.url,
                     params: submitParam,
diff --git a/src/views/screenAdaptation/pages/adminCenter/workbench.vue b/src/views/screenAdaptation/pages/adminCenter/workbench.vue
index aa406c2..c2e2f74 100644
--- a/src/views/screenAdaptation/pages/adminCenter/workbench.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/workbench.vue
@@ -187,14 +187,13 @@
                                 GlobalParams.biz_codes_bureau = [];
                                 GlobalParams.biz_codes_dept = [];
                                 GlobalParams.biz_codes_person = [];
-
                                 if (
                                     this.jurisdictionIsExist([
                                         "daliyOffice",
                                         "newOfficeCar",
                                         "carApproval",
                                         "returnApproval",
-                                    ])
+                                    ],false)
                                 ) {
                                     GlobalParams.biz_codes_bureau.push("107002001");
                                 }
@@ -623,6 +622,7 @@
                     jurisdictionAry.length > 0
                 ) {
                     let ary = this.crmData;
+                    console.log(ary)
                     for (let i = 0; i < jurisdictionAry.length; i++) {
                         let menuString = jurisdictionAry[i];
                         if (
diff --git a/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue b/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue
index 905cb9e..5b80bb4 100644
--- a/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue
+++ b/src/views/superFusionPlatform/messageProcessing/todoHandle/business/BusinessList.vue
@@ -84,7 +84,6 @@
             }
         },
         mounted(){
-            console.log(this.listType)
             this.getModuleTodoList();
         },
         methods: {