Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-28 fa5fd9d4f9c1ba33f26a343942a7941003cc601c

 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue

@@ -3,13 +3,10 @@
        <!-- 到达现场情况 -->
        <MyArrive ref="arrive"></MyArrive>
        <!-- 调查取证 -->
        <MyEvidence ref="evidence" :mytype="2"></MyEvidence>
        <MyEvidence ref="evidence" :mytype="2" :mycode="mycode"></MyEvidence>
        <!-- 文种书类 -->
        <MyBook ref="book"></MyBook>
        <!-- <div class="result">
            <el-input v-model="result" placeholder="请输入处理意见"></el-input>
        </div> -->
        <!-- 底部按钮 -->
        <MyBook ref="book" :mycode="mycode"></MyBook>

        <div class="footer">
            <el-button @click="handleSubmit" type="primary">确定</el-button>
            <el-button @click="handleBack">返回</el-button>
@@ -30,9 +27,8 @@
            // result:'',
        }
    },
    props: ['caseId','closeDialog'],
    props: ['caseId','closeDialog','mycode'],
    created() {
        console.log(this.caseId);
        this.getUserId();
    },
    methods: {
@@ -68,7 +64,7 @@
                                            description: evidence.evidence.description,
                                            pic: `${evidence.evidence.pic}`,
                                            // 
                                            illegalType: evidence.user.illegalType,
                                            // illegalType: evidence.user.illegalType,
                                            name: evidence.user.name,
                                            phoneCode: evidence.user.phoneCode,
                                            certificateType: evidence.user.certificateType,
@@ -83,7 +79,7 @@
                                            //
                                            writType: book.book.writType,
                                            writCode: book.book.writCode,
                                            // illegalType: book.book.illegalType,
                                            illegalType: book.book.illegalType,
                                            sendTime: parseTime(book.book.sendTime),
                                            limitTime: parseTime(book.book.limitTime),
                                            sendContent: book.book.sendContent,
@@ -97,7 +93,6 @@
                                        }
                                    })
                                        .then(res => {
                                            console.log(res);
                                            if (res.code === 200) {
                                                this.$message({
                                                    type: 'success',
@@ -151,7 +146,6 @@
                url:'sccg/admin/info?name='+myname,
            })
            .then(res=>{
                console.log(res);
            })
        },
        handleBack(){