wl
2022-10-28 21eb4c23692aec5f451e7276647d165bd0a24580
处理处置结果问题
9个文件已修改
249 ■■■■■ 已修改文件
src/components/myUpload/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/scene/index.vue 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue 118 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/baseSetting/user/components/updateUser/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/myUpload/index.vue
@@ -33,9 +33,9 @@
            // 限制
            limit: 4,
            // 按钮高度
            btnHeight: '120px',
            btnHeight: '100px',
            // 按钮宽度
            btnWidth: '120px',
            btnWidth: '100px',
            // 文件列表类型
            listType: 'picture-card'
        };
@@ -112,12 +112,12 @@
    }
    :deep(.el-upload--picture-card) {
        width: 120px;
        height: 120px;
        width: 100px;
        height: 100px;
    }
    :deep(.el-upload-list__item){
        width: 120px;
        height: 120px;
        width: 100px;
        height: 100px;
    }
    .upload-btn {
        // background-color: rgba(249, 249, 249, 1);
src/components/scene/index.vue
@@ -3,9 +3,9 @@
        <div class="nav">
            <div class="nav-item" v-for="o in list" :key="o.index" @click="changeActive(o.index)">
                <div class="outer">
                    <div :class="['inner',active === o.index ? 'inner-active' : '']"></div>
                    <div :class="['inner', active === o.index ? 'inner-active' : '']"></div>
                </div>
                <div class="innet-title">{{o.label}}</div>
                <div class="innet-title">{{ o.label }}</div>
            </div>
        </div>
        <div class="scene-item" v-if="active === 1">
@@ -23,8 +23,11 @@
                    <el-input disabled v-model="arrivalSituation.replyExplain"></el-input>
                </el-form-item>
                <el-form-item label="现场情况照片:">
                    <img class="img" :src="arrivalSituation.situationPic" alt="" v-if="arrivalSituation.situationPic">
                    <!-- <el-input disabled v-model=""></el-input> -->
                    <div class="flex">
                        <template v-for="item in arrivalSituation.situationPic">
                            <img class="img" :src="item" alt="" v-if="investigation.pic">
                        </template>
                    </div>
                </el-form-item>
            </el-form>
        </div>
@@ -47,19 +50,23 @@
                <el-form-item label="案由:">
                    <el-input disabled v-model="investigation.caseAction"></el-input>
                </el-form-item>
                <el-form-item label="当事人信息:">
                    <el-input disabled v-model="investigation.type"></el-input>
                </el-form-item>
                <el-form-item label="处置结果:">
                    <el-input disabled v-model="investigation.description"></el-input>
                </el-form-item>
                <el-form-item label="照片附件:">
                    <img class="img" :src="investigation.pic" alt="" v-if="investigation.pic">
                    <div class="flex">
                        <template v-for="item in investigation.pic">
                            <img class="img" :src="item" alt="" v-if="investigation.pic">
                        </template>
                    </div>
                    <!-- <el-input disabled v-model="investigation.pic"></el-input> -->
                </el-form-item>
                <el-form-item label="类型:">
                    <el-input disabled v-model="mybaseCase.categoryText"></el-input>
                </el-form-item>
                <div class="inves-item">
                    当事人信息
                </div>
                    <el-form-item label="类型:">
                        <el-input type="textarea" :rows="5" disabled v-model="type"></el-input>
                    </el-form-item>
                <div class="inves-item">
                    <el-form-item label="当事人姓名:">
                        <el-input disabled v-model="partyInfo.name"></el-input>
@@ -102,12 +109,11 @@
                    <el-input disabled v-model="partyInfo.registerAddress"></el-input>
                </el-form-item>
            </el-form>
            <el-button>返回</el-button>
        </div>
        <div class="scene-item" v-if="active === 3">
            <el-form ref="writ" label-position="right" label-width="120px" :model="writ">
                <el-form-item label="类型:">
                    <el-input disabled v-model="writ.name"></el-input>
                    <el-input type="textarea" :rows="5" disabled v-model="type"></el-input>
                </el-form-item>
            </el-form>
        </div>
@@ -136,27 +142,30 @@
            arrivalSituation: {},
            investigation: {},
            writ: {},
            partyInfo: {}
            partyInfo: {},
            type: null
        }
    },
    props: ['currentSitVo', 'baseCase'],
    created() {
        const { currentSitVo: { arrivalSituation: mylist, investigation: invesList }, baseCase } = this;
        if (invesList) {
            const { partyInfo } = invesList;
            if (invesList) {
                this.investigation = invesList;
            }
            if (partyInfo) {
                this.partyInfo = partyInfo;
                this.investigation.pic = invesList.pic.split(",");
                this.partyInfo = invesList.partyInfo;
            }
        }
        if (mylist) {
            this.arrivalSituation = mylist;
            this.arrivalSituation.situationPic = mylist.situationPic.split(",")
        }
        this.mybaseCase = baseCase;
        console.log(baseCase);
        console.log(this.currentSitVo);
        if (baseCase.violations == null) {
            this.type = baseCase.illegalBuilding.categoryText
        } else {
            this.type = baseCase.violations.typeText;
        }
    },
    methods: {
        changeActive(idx) {
@@ -214,10 +223,17 @@
            border: 1px solid #17324c;
        }
    }
    .img{
    .img {
        width: 60px;
        height:60px;
        height: 60px;
        margin-left: 5px;
    }
    .flex {
        display: flex;
    }
    .inves-item {
        display: flex;
    }
src/views/operate/disposal/casepool/dispatch/index.vue
@@ -87,8 +87,8 @@
                <!-- 上传页面 -->
                <el-dialog :visible.sync="dialogUpload" width="80%" title="上传处置结果" v-if="dialogUpload"
                    :before-close="handleClose">
                    <uploadVio v-if="mystatus === 1" :caseId="caseId" @closeDialog="closeDialog"></uploadVio>
                    <uploadIll v-else :caseId="caseId" @closeDialog="closeDialog"></uploadIll>
                    <uploadVio v-if="mystatus === 1" :caseId="caseId" :mycode="caseCode"  @closeDialog="closeDialog"></uploadVio>
                    <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog"></uploadIll>
                </el-dialog>
                <!-- tools -->
                <div class="tools">
@@ -179,6 +179,7 @@
            statusArr: [],
            mystatus: 1,
            caseId: '',
            caseCode:null,
        }
    },
    created() {
@@ -349,6 +350,7 @@
        opernDialog(data) {
            this.dialogUpload = true;
            this.caseId = data.id;
            this.caseCode = data.code
            // console.log(data); 
        },
        // 关闭上传界面
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -145,12 +145,10 @@
            if (this.arrive.situationPic.length < 4) {
                this.arrive.situationPic.push(baseUrl + url)
            }
            console.log(url);
        },
        //删除图片
        delPicUrl({url}){
            const baseUrl = 'http://140.143.152.226:8410/';
            console.log(url);
            this.arrive.situationPic.splice(this.arrive.situationPic.indexOf(baseUrl + url),1);
            console.log(this.arrive.situationPic);
        }
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
@@ -18,8 +18,8 @@
                    </el-form-item>
                </div>
                <!-- 违法类型 -->
                <el-form-item label="违法类型:" prop="illegalType" placeholder="请输入违法类型">
                    <el-input v-model="book.illegalType" placeholder="请输入违法类型"></el-input>
                <el-form-item label="违法类型:" prop="illegalType" >
                    <el-input v-model="basecase" ></el-input>
                </el-form-item>
                <!-- 文书发放时间 -->
                <el-form-item label="文书发放时间:" prop="sendTime">
@@ -51,7 +51,7 @@
                <!-- 文书照片上传 -->
                <el-form-item label="文书照片上传:" prop="writPic">
                    <div class="upImg">
                        <div class="img-list" v-if="book.writPic.length!==0">
                        <!-- <div class="img-list" v-if="book.writPic.length!==0">
                            <div class="img" v-for="(item,index) in book.writPic" :key="index">
                                <img :src="item" alt="">
                                <i class="el-icon-close myicon" @click="handleRemove(index,1)"></i>
@@ -63,14 +63,15 @@
                                :limit="4" :on-success="handleSuccess1" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div>
                        </div> -->
                        <MyUpload  @setPictureUrl="writPic" @delPictureUrl="delWritPic"></MyUpload>
                        <div class="tip">{{book.writPic.length}} / 4</div>
                    </div>
                </el-form-item>
                <!-- 整改前照片 -->
                <el-form-item label="整改前照片:" prop="originalPic">
                    <div class="upImg">
                        <div class="img-list" v-if="book.originalPic.length!==0">
                     <div class="upImg">
                        <!-- <div class="img-list" v-if="book.originalPic.length!==0">
                            <div class="img" v-for="(item,index) in book.originalPic" :key="index">
                                <img :src="item" alt="">
                                <i class="el-icon-close myicon" @click="handleRemove(index,2)"></i>
@@ -82,7 +83,8 @@
                                :limit="4" :on-success="handleSuccess2" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div>
                        </div>  -->
                        <MyUpload  @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic"></MyUpload>
                        <div class="tip">{{book.originalPic.length}} / 4</div>
                    </div>
                </el-form-item>
@@ -102,15 +104,15 @@
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div> -->
                        <MyUpload  @setPictureUrl="setPicUrl" @delPictureUrl="delPicUrl"></MyUpload>
                        <MyUpload  @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic"></MyUpload>
                        <div class="tip">{{book.rectifiedPic.length}} / 4</div>
                    </div>
                </el-form-item>
                <!-- 其他照片 -->
                <el-form-item label="其他:" prop="otherPic">
                    <div class="upImg">
                        <div class="img-list" v-if="book.otherPic.length!==0">
                            <div class="img" v-for="(item,index) in book.otherPic" :key="index">
                        <!-- <div class="img-list" v-if="book.otherPic.length!==0"> -->
                            <!-- <div class="img" v-for="(item,index) in book.otherPic" :key="index">
                                <img :src="item" alt="">
                                <i class="el-icon-close myicon" @click="handleRemove(index,4)"></i>
                            </div>
@@ -121,7 +123,8 @@
                                :limit="4" :on-success="handleSuccess4" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div>
                        </div> -->
                        <MyUpload  @setPictureUrl="otherPic" @delPictureUrl="delOtherPic"></MyUpload>
                        <div class="tip">{{book.otherPic.length}} / 4</div>
                    </div>
                </el-form-item>
@@ -239,11 +242,11 @@
                        trigger: 'blur', validator: checkId
                    }
                ],
                illegalType: [
                    {
                        trigger: 'blur', validator: checkVio
                    }
                ],
                // illegalType: [
                //     {
                //         trigger: 'blur', validator: checkVio
                //     }
                // ],
                sendTime: [
                    {
                        trigger: 'blur', validator: checkGiveTime
@@ -298,15 +301,31 @@
                    label: '书籍2',
                    value: 2,
                },
            ]
            ],
            basecase:""
        }
    },
    created() {
        const {getBookType} = this
        getBookType();
        const {mycode}=this;
        console.log(121,mycode)
        this.getEventInfo(mycode)
    },
    props: ['caseId', 'closeDialog'],
    props: ['caseId', 'closeDialog','mycode'],
    methods: {
        // 获取案件信息
        async getEventInfo(mycode) {
            await this.$axios({
                method: 'get',
                url: `sccg/base_case/baseCaseDetail/${mycode}`
            })
                .then(res => {
                    this.basecase = res.data.baseCase.illegalBuilding.categoryText;
                    this.book.illegalType=res.data.baseCase.illegalBuilding.categoryId;
                })
        },
        handleSuccess1(res, file, filelist) {
            const baseUrl = 'http://140.143.152.226:8410/';
            if (this.book.writPic.length < 4) {
@@ -338,34 +357,63 @@
                return { Authorization: tokenHead + token }
            }
        },
        // 删除图片
        handleRemove(index, flag) {
            if (flag === 1) {
                this.book.writPic.splice(index, 1);
            } else if (flag === 2) {
                this.book.originalPic.splice(index, 1);
            } else if (flag === 3) {
                this.book.rectifiedPic.splice(index, 1);
            } else {
                this.book.otherPic.splice(index, 1);
            }
        },
            // 设置上传成功之后的图片地址
            setPicUrl({ url }) {
            writPic({ url }) {
            const baseUrl = 'http://140.143.152.226:8410/';
            if (this.book.originalPic.length < 4) {
                this.book.writPic.push(baseUrl + url)
            }
            console.log(url);
        },
        //删除图片
        delWritPic({url}){
            const baseUrl = 'http://140.143.152.226:8410/';
            console.log(url);
            this.book.writPic.splice(this.book.writPic.indexOf(baseUrl + url),1);
        },
 // 设置上传成功之后的图片地址
 otherPic({ url }) {
            const baseUrl = 'http://140.143.152.226:8410/';
            if (this.book.otherPic.length < 4) {
                this.book.otherPic.push(baseUrl + url)
            }
            console.log(url);
        },
        //删除图片
        delOtherPic({url}){
            const baseUrl = 'http://140.143.152.226:8410/';
            this.book.otherPic.splice(this.book.otherPic.indexOf(baseUrl + url),1);
        },
         // 设置上传成功之后的图片地址
         rectifiedPic({ url }) {
            const baseUrl = 'http://140.143.152.226:8410/';
            if (this.book.otherPic.length < 4) {
                this.book.rectifiedPic.push(baseUrl + url)
            }
            console.log(url);
        },
        //删除图片
        delRectifiedPic({url}){
            const baseUrl = 'http://140.143.152.226:8410/';
            this.book.rectifiedPic.splice(this.book.rectifiedPic.indexOf(baseUrl + url),1);
        },
         // 设置上传成功之后的图片地址
         originalPic({ url }) {
            const baseUrl = 'http://140.143.152.226:8410/';
            if (this.book.otherPic.length < 4) {
                this.book.originalPic.push(baseUrl + url)
            }
            console.log(url);
        },
        //删除图片
        delPicUrl({url}){
        delOriginalPic({url}){
            const baseUrl = 'http://140.143.152.226:8410/';
            console.log(url);
            this.book.originalPic.splice(this.book.originalPic.indexOf(baseUrl + url),1);
            console.log(this.book.originalPic);
        },
        // 获取文书种类
        async getBookType(){
            let arr 
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
@@ -27,7 +27,7 @@
                    <el-input v-model="evidence.caseAction" placeholder="请输入案由"></el-input>
                </el-form-item>
                <!-- 当事人信息 -->
                <el-form-item label="当事人信息:" prop="userInfo">
                <el-form-item label="当事人信息:" prop="userInfo" class="sp-user-info">
                    <el-input suffix-icon="el-icon-s-order" v-model="evidence.userInfo" @focus="openDialog"></el-input>
                </el-form-item>
                <!-- 情况描述 -->
@@ -66,11 +66,7 @@
                <el-form ref="userForm" label-width="120px" :model="user" :rules="userRules" autoComplete="on">
                    <!-- 类型 -->
                    <el-form-item label="类型:" prop="illegalType">
                        <el-select v-model="user.illegalType" placeholder="请选择">
                            <el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
                                :value="item.value">
                            </el-option>
                        </el-select>
                        <el-input v-model="basecase"></el-input>
                    </el-form-item>
                    <!-- 姓名、手机号 -->
                    <div class="user-item">
@@ -459,7 +455,8 @@
                    label: '大学及以上',
                    value: 4
                },
            ]
            ],
            basecase:""
        }
    },
    created() {
@@ -468,8 +465,25 @@
        this.getNationList();
        console.log(this.mytype);
        this.user.illegalType = JSON.parse(JSON.stringify(this.mytype));
        const {mycode}=this;
        this.getEventInfo(mycode)
    },
    methods: {
           // 获取案件信息
           async getEventInfo(mycode) {
            await this.$axios({
                method: 'get',
                url: `sccg/base_case/baseCaseDetail/${mycode}`
            })
                .then(res => {
                    if(this.mytype == 1){
                        this.basecase = res.data.baseCase.violations.typeText;
                    }else{
                        this.basecase = res.data.baseCase.illegalBuilding.categoryText;
                    }
                    console.log(this.basecase)
                })
        },
        handleSuccess2(res, file, filelist) {
            const baseUrl = 'http://140.143.152.226:8410/';
            console.log(res);
@@ -558,7 +572,7 @@
            deep: true,
        }
    },
    props:['mytype']
    props:['mytype','mycode']
}
</script>
<style lang="scss" scoped>
@@ -640,7 +654,11 @@
    padding-bottom: 60px;
}
.sp-user-info{
    ::v-deep .el-input{
        width: 200px;
    }
}
.user-form-content {
    padding-top: 20px;
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
@@ -3,9 +3,9 @@
        <!-- 到达现场情况 -->
        <MyArrive ref="arrive"></MyArrive>
        <!-- 调查取证 -->
        <MyEvidence ref="evidence" :mytype="2"></MyEvidence>
        <MyEvidence ref="evidence" :mytype="2" :mycode="mycode"></MyEvidence>
        <!-- 文种书类 -->
        <MyBook ref="book"></MyBook>
        <MyBook ref="book" :mycode="mycode"></MyBook>
        <!-- <div class="result">
            <el-input v-model="result" placeholder="请输入处理意见"></el-input>
        </div> -->
@@ -30,7 +30,7 @@
            // result:'',
        }
    },
    props: ['caseId','closeDialog'],
    props: ['caseId','closeDialog','mycode'],
    created() {
        console.log(this.caseId);
        this.getUserId();
@@ -68,7 +68,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 +83,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,
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
@@ -3,7 +3,7 @@
        <!-- 到达现场情况 -->
        <MyArrive ref="arrive"></MyArrive>
        <!-- 调查取证 -->
        <MyEvidence ref="evidence" :mytype="1"></MyEvidence>
        <MyEvidence ref="evidence" :mytype="1" :mycode="mycode"></MyEvidence>
        <!-- 底部按钮 -->
        <div class="footer">
            <el-button @click="handleSubmit" type="primary">确定</el-button>
@@ -24,7 +24,7 @@
        }
    },
    props: ['caseId', 'closeDialog'],
    props: ['caseId', 'closeDialog','mycode'],
    created() {
        console.log(this.caseId);
    },
src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
@@ -175,6 +175,7 @@
        },
        // 部门修改
        handleCheck(data, checked) {
            console.log(this.selectOrg.orgsid[0])
            this.user.departName = data.departName;
            // 获取当前选择的id在数组中的索引
            const indexs = this.selectOrg.orgsid.indexOf(data.id);