luobisheng
2022-11-29 237197fbfb7e54bdbeb0f16e7907790a8097c9f6
上传处置修改
8个文件已修改
157 ■■■■ 已修改文件
src/views/intelligentPatrol/illegalSearch/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/sms/smsTemplate/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/intelligentPatrol/illegalSearch/index.vue
@@ -237,6 +237,7 @@
    },
    // 表单重置
    handleReset() {
      this.currentPage = 1;
      this.$refs.condition.resetFields();
      this.getTableData();
    },
src/views/operate/disposal/casepool/dispatch/index.vue
@@ -88,7 +88,7 @@
                <el-dialog :visible.sync="dialogUpload" width="80%" title="上传处置结果" v-if="dialogUpload"
                    :before-close="handleClose">
                    <uploadVio v-if="mystatus === 1" :imageResourceId="imageResourceId" :caseId="caseId" :mycode="caseCode" :vioData="vioData"  @closeDialog="closeDialog"></uploadVio>
                    <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :illData="illData"></uploadIll>
                    <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :vioData="vioData" :illData="illData"></uploadIll>
                </el-dialog>
                <!-- tools -->
                <div class="tools">
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -68,13 +68,6 @@
                callback(new Error('现场情况说明不能为空'));
            }
        }
        const checkReplay = (rule, value, callback) => {
            if (value) {
                callback()
            } else {
                callback(new Error('信访回复说明不能为空'));
            }
        }
        const checkSitPic = (rule, value, callback) => {
            if (value.length !== 0) {
                callback()
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
@@ -51,19 +51,6 @@
                <!-- 文书照片上传 -->
                <el-form-item label="文书照片上传:" prop="writPic">
                    <div class="upImg">
                        <!-- <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>
                            </div>
                        </div>
                        <div class="upload" v-if="book.writPic.length<4">
                            <el-upload :file-list="fileList" class="upload-demo"
                                action="/sccg/file/medias" multiple :show-file-list="false"
                                :limit="4" :on-success="handleSuccess1" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div> -->
                        <MyUpload  @setPictureUrl="writPic" @delPictureUrl="delWritPic"></MyUpload>
                        <div class="tip">{{book.writPic.length}} / 4</div>
                    </div>
@@ -71,19 +58,6 @@
                <!-- 整改前照片 -->
                <el-form-item label="整改前照片:" prop="originalPic">
                     <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>
                            </div>
                        </div>
                        <div class="upload" v-if="book.originalPic.length<4">
                            <el-upload :file-list="fileList" class="upload-demo"
                                action="/sccg/file/medias" multiple :show-file-list="false"
                                :limit="4" :on-success="handleSuccess2" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div>  -->
                        <MyUpload  @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic"></MyUpload>
                        <div class="tip">{{book.originalPic.length}} / 4</div>
                    </div>
@@ -91,19 +65,6 @@
                <!-- 整改后照片 -->
                <el-form-item label="整改后照片:" prop="rectifiedPic">
                    <div class="upImg">
                        <!-- <div class="img-list" v-if="book.rectifiedPic.length!==0">
                            <div class="img" v-for="(item,index) in book.rectifiedPic" :key="index">
                                <img :src="item" alt="">
                                <i class="el-icon-close myicon" @click="handleRemove(index,3)"></i>
                            </div>
                        </div> -->
                        <!-- <div class="upload" v-if="book.rectifiedPic.length<4">
                            <el-upload :file-list="fileList" class="upload-demo"
                                action="/sccg/file/medias" multiple :show-file-list="false"
                                :limit="4" :on-success="handleSuccess3" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div> -->
                        <MyUpload  @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic"></MyUpload>
                        <div class="tip">{{book.rectifiedPic.length}} / 4</div>
                    </div>
@@ -111,19 +72,6 @@
                <!-- 其他照片 -->
                <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">
                                <img :src="item" alt="">
                                <i class="el-icon-close myicon" @click="handleRemove(index,4)"></i>
                            </div>
                        </div>
                        <div class="upload" v-if="book.otherPic.length<4">
                            <el-upload :file-list="fileList" class="upload-demo"
                                action="/sccg/file/medias" multiple :show-file-list="false"
                                :limit="4" :on-success="handleSuccess4" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
                        </div> -->
                        <MyUpload  @setPictureUrl="otherPic" @delPictureUrl="delOtherPic"></MyUpload>
                        <div class="tip">{{book.otherPic.length}} / 4</div>
                    </div>
@@ -242,11 +190,6 @@
                        trigger: 'blur', validator: checkId
                    }
                ],
                // illegalType: [
                //     {
                //         trigger: 'blur', validator: checkVio
                //     }
                // ],
                sendTime: [
                    {
                        trigger: 'blur', validator: checkGiveTime
@@ -309,8 +252,7 @@
        const {getBookType} = this
        getBookType();
        const {mycode}=this;
        console.log(121,mycode)
        this.getEventInfo(mycode)
        this.getEventInfo(mycode);
    },
    props: ['caseId', 'closeDialog','mycode'],
    methods: {
@@ -364,22 +306,19 @@
            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 }) {
        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}){
@@ -393,7 +332,6 @@
            if (this.book.otherPic.length < 4) {
                this.book.rectifiedPic.push(baseUrl + url)
            }
            console.log(url);
        },
        //删除图片
        delRectifiedPic({url}){
@@ -406,7 +344,6 @@
            if (this.book.otherPic.length < 4) {
                this.book.originalPic.push(baseUrl + url)
            }
            console.log(url);
        },
        //删除图片
        delOriginalPic({url}){
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
@@ -1,11 +1,11 @@
<template>
    <div class="ill">
        <!-- 到达现场情况 -->
        <MyArrive ref="arrive"></MyArrive>
        <MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
        <!-- 调查取证 -->
        <MyEvidence ref="evidence" :mytype="2" :mycode="mycode"></MyEvidence>
        <MyEvidence ref="evidence" :evidenceData="evidenceData" :mytype="2" :mycode="mycode"></MyEvidence>
        <!-- 文种书类 -->
        <MyBook ref="book" :mycode="mycode"></MyBook>
        <MyBook ref="book" :writ="writ" :mycode="mycode"></MyBook>
        <div class="footer">
            <el-button @click="handleSubmit" type="primary">确定</el-button>
@@ -22,14 +22,18 @@
    components: {
        MyArrive, MyEvidence, MyBook
    },
    data() {
        return {
            // result:'',
        }
    },
    props: ['caseId','closeDialog','mycode'],
  data() {
      return {
        arriveData: null,
        evidenceData: null,
        writ: null
      }
  },
    props: ['caseId','closeDialog','mycode', 'vioData'],
    created() {
        this.getUserId();
      this.arriveData = this.vioData.arrivalSituation;
      this.evidenceData = this.vioData.investigation;
      this.writ = this.vioData.writ;
    },
    methods: {
        handleSubmit() {
@@ -38,13 +42,11 @@
            const { evidenceForm } = evidence.$refs;
            const { bookForm } = book.$refs;
            arriveForm.validate((valid) => {
              // const partyInfoId = this.evidenceData ? partyInfo.id : null;
                if (valid) {
                    console.log(valid);
                    evidenceForm.validate((flag) => {
                        if (flag) {
                            console.log(flag);
                            bookForm.validate((bookFlag) => {
                                console.log(bookFlag);
                                if (bookFlag) {
                                    this.$axios({
                                        method: 'post',
@@ -55,7 +57,7 @@
                                            situationExplain: arrive.arrive.situationExplain,
                                            replyExplain: arrive.arrive.replyExplain,
                                            situationPic: `${arrive.arrive.situationPic}`,
                                            //
                                            undertaker: evidence.evidence.undertaker,
                                            assistant: evidence.evidence.assistant,
                                            investigationTime: parseTime(evidence.evidence.investigationTime),
@@ -63,8 +65,8 @@
                                            caseAction: evidence.evidence.caseAction,
                                            description: evidence.evidence.description,
                                            pic: `${evidence.evidence.pic}`,
                                            //
                                            // illegalType: evidence.user.illegalType,
                                            partyInfoId: this.evidenceData ? evidence.evidence.partyInfo.id : null,
                                            name: evidence.user.name,
                                            phoneCode: evidence.user.phoneCode,
                                            certificateType: evidence.user.certificateType,
@@ -136,16 +138,6 @@
                    })
                    return false;
                }
            })
        },
        // 获取用户id
        getUserId(){
            const myname = sessionStorage.getItem('name');
            this.$axios({
                method:'get',
                url:'sccg/admin/info?name='+myname,
            })
            .then(res=>{
            })
        },
        handleBack(){
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
@@ -42,7 +42,7 @@
                        if (flag) {
                          const arriveData = Object.assign({}, arrive.arrive);
                          const evidenceData = Object.assign({}, evidence.evidence);
                          const { partyInfo } = evidenceData;
                          const partyInfo = evidence.user;
                          const arrivalSituationId = arriveData.id;
                          const investigationId = evidenceData.id;
                          const partyInfoId = this.evidenceData ? partyInfo.id : null;
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue
@@ -25,50 +25,20 @@
    },
    props: ['caseId', 'closeDialog'],
    created() {
        console.log(this.caseId);
    },
    methods: {
        handleSubmit() {
            const { arrive, evidence } = this.$refs;
            const { arriveForm } = arrive.$refs;
            const { evidenceForm } = evidence.$refs;
            // console.log(evidence.$refs);
            arriveForm.validate((valid) => {
                // console.log(valid);
                if (valid) {
                    evidenceForm.validate((flag) => {
                        if (flag) {
                            // arrive.arrive;evidence.user;evidence.evidence;
                            this.$axios({
                                method: 'post',
                                url: `sccg/dispatch_handle/addition_dispose_result/${this.caseId}/${1}`,
                                data:{
                                    // arrivalAddress: arrive.arrive.arrivalAddress,
                                    // arrivalTime: arrive.arrive.arrivalTime,
                                    // situationExplain: arrive.arrive.situationExplain,
                                    // replyExplain: arrive.arrive.replyExplain,
                                    // situationPic: arrive.arrive.situationPic,
                                    // //
                                    // undertaker: evidence.evidence.undertaker,
                                    // assistant: evidence.evidence.assistant,
                                    // investigationTime: evidence.evidence.investigationTime,
                                    // address: evidence.evidence.address,
                                    // caseAction: evidence.evidence.caseAction,
                                    // description: evidence.evidence.description,
                                    // pic: evidence.evidence.pic,
                                    // //
                                    // illegalType: evidence.user.illegalType,
                                    // name: evidence.user.name,
                                    // phoneCode: evidence.user.phoneCode,
                                    // certificateType: evidence.user.certificateType,
                                    // certificateCode: evidence.user.certificateCode,
                                    // educationDegree: evidence.user.educationDegree,
                                    // career: evidence.user.career,
                                    // work: evidence.user.work,
                                    // nation: evidence.user.nation,
                                    // nativePlace: evidence.user.nativePlace,
                                    // liveAddress: evidence.user.liveAddress,
                                    // registerAddress: evidence.user.registerAddress,
                                }
                            })
                                .then(res => {
src/views/operate/sms/smsTemplate/index.vue
@@ -182,6 +182,10 @@
        },
        // 重置
        handleReset(){
          this.currentPage = 1;
          this.context = '';
          this.messageStatus = 0;
          this.getMessageList();
        },
        // 查看
        handleView(data){