优化

cqf

2022-05-26 fc1e027ed026285ccd08881a094a943f155d4285

优化

 src/api/sgyhpczl/delayHiddenDangerRectification.js

@@ -55,7 +55,7 @@
        arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
    }
    /*是否关联*/
    if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
    if(data.form.DTRisk_bankId!=null){
        arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
    }
    /*录入人*/

 src/api/sgyhpczl/hiddenDangerManagement.js

@@ -46,7 +46,7 @@
        arr.push({field: "alter_status", value: data.form.alter_status, type: 'OPT'})
    }
    /*是否关联*/
    if (data.form.DTRisk_bankId != null && data.form.DTRisk_bankId != '') {
    if(data.form.DTRisk_bankId!=null){
        arr.push({field: "DTRisk_bankId", value: data.form.DTRisk_bankId, type: 'OPT'})
    }
    /*检查时间*/

 src/api/sgyhpczl/hiddenDangerRegistration.js

@@ -56,7 +56,7 @@
        arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
    }
    /*是否关联*/
    if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
    if(data.form.DTRisk_bankId!=null){
        arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
    }
    /*录入人*/

 src/api/sgyhpczl/majorHidden.js

@@ -57,7 +57,7 @@
        arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
    }
    /*是否关联*/
    if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
    if(data.form.DTRisk_bankId!=null){
        arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
    }
    /*录入人*/

 src/api/sgyhpczl/recheckCancellationNumber.js

@@ -54,7 +54,7 @@
        arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
    }
    /*是否关联*/
    if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
    if(data.form.DTRisk_bankId!=null){
        arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
    }
    /*录入人*/

 src/views/hiddenDangerManagement/fillRectificationAdd.vue

@@ -298,6 +298,7 @@
            dangerList: [],
            dangerForm: {},
            dangerRules: {
                measure:[{required: true, message: '不能为空', trigger: 'blur'},],
                ht_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
                address: [{required: true, message: '不能为空', trigger: 'blur'},],
                ht_content: [{required: true, message: '不能为空', trigger: 'blur'},],

 src/views/hiddenDangerRectification/index.vue

@@ -141,7 +141,8 @@
                <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询
                </el-button>
                <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
                <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出excel</el-button>
                <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出excel
                </el-button>
            </el-form-item>
        </el-form>
        <el-row class="title-center">
@@ -162,11 +163,11 @@
            <el-table-column label="隐患项目" align="center">
                <el-table-column prop="check_date" label="检查时间" width="120" align="center">
                    <template slot-scope="scope">
                        <label>{{ formatDate(scope.row.check_date)}}</label><br/>
                        <label>{{ scope.row.check_class}}</label>
                        <label>{{ formatDate(scope.row.check_date) }}</label><br/>
                        <label>{{ scope.row.check_class }}</label>
                    </template>
                </el-table-column>
                <el-table-column prop="address" label="地点"   align="center"></el-table-column>
                <el-table-column prop="address" label="地点" align="center"></el-table-column>
                <el-table-column prop="ht_content" label="内容" width="150" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
@@ -195,13 +196,16 @@
                </el-table-column>
                <el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
                <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
                <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
                <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate"
                                 align="center"></el-table-column>
            </el-table-column>
            <el-table-column label="整改情况" align="center">
                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120"
                                 align="center"></el-table-column>
                <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
                <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
                <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
                <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120"
                                 align="center"></el-table-column>
            </el-table-column>
            <el-table-column label="隐患处理状态" align="center">
                <template slot-scope="scope">
@@ -249,6 +253,7 @@
                        <el-form-item label="附件上传" prop="desc">
                            <el-upload
                                class="upload-demo"
                                action="https://jsonplaceholder.typicode.com/posts/"
                                ref="upload"
                                :http-request="uploadSectionFile"
                                :on-preview="handlePreview"
@@ -293,7 +298,7 @@
    </div>
</template>
<script>
import {getPageList, uploadFile, saveDelayApply,danger_export_do} from "@/api/sgyhpczl/hiddenDangerRectification";
import {getPageList, uploadFile, saveDelayApply, danger_export_do} from "@/api/sgyhpczl/hiddenDangerRectification";
import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect";

export default {
@@ -312,7 +317,8 @@
            YHBMList: [],
            YHJBList: [],
            tableData: [],
            loading:false,
            fileNameList: [],
            loading: false,
            listQuery: {
                page: 1,
                limit: 10,
@@ -508,7 +514,7 @@
        handleClick(row) {
            this.$router.push({
                path: "/sendHiddenDangerList",
                query:{"id":row.id}
                query: {"id": row.id}
            })
        },
        handleClose(done) {
@@ -520,7 +526,11 @@
                });
        },
        handleRemove(file, fileList) {
            console.log(file, fileList)
            var fileUidList = [];
            fileList.forEach(file => {
                fileUidList.push(file.uid);
            })
            this.fileNameList = this.fileNameList.filter(n => fileUidList.indexOf(n.uid) != -1);
        },
        handlePreview(file) {
            console.log(file)
@@ -552,6 +562,11 @@
        applyDelaySave() {
            this.$refs["ruleForm"].validate((valid) => {
                if (valid) {
                    this.ruleForm.realFileName = "";
                    this.fileNameList.forEach(n => {
                        this.ruleForm.realFileName += n.fileName + ",";
                    })
                    this.ruleForm.realFileName.substring(0, this.ruleForm.realFileName.length - 1);
                    saveDelayApply(this.ruleForm).then(res => {
                        this.dialogVisible = false;
                        this.$message({
@@ -574,21 +589,27 @@
                if (data.ok) {
                    var fileName = data.data.fileName[0];
                    if (!fileName.endsWith("a62b")) {
                        fileName = fileName + param.file.realFileName;
                        fileName = fileName + "a62b";
                    }
                    that.ruleForm.realFileName = that.ruleForm.realFileName + "," + fileName;
                    var fileObj = {
                        "fileName": fileName,
                        "uid": param.file.uid
                    }
                    this.fileNameList.push(fileObj);
                    // that.ruleForm.realFileName = that.ruleForm.realFileName + "," + fileName;
                }
            }).error(res => {
                this.$message({
                    type: 'error',
                    message: '附件上传失败，请重试！'
                });
            })
            //     .error(res => {
            //     this.$message({
            //         type: 'error',
            //         message: '附件上传失败，请重试！'
            //     });
            // })
        },
        //方法区
        formatDate(data) {
            // 获取单元格数据
            if(data == null) {
            if (data == null) {
                return null
            }
            let dt = new Date(data)
@@ -599,13 +620,13 @@
        formatColumnDate(row, column) {
            // 获取单元格数据
            let data = row[column.property]
            if(data == null) {
            if (data == null) {
                return null
            }
            let dt = new Date(data)
            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
        },
        exportData(){
        exportData() {
            this.listLoading = true
            var requestData = JSON.parse(JSON.stringify(this.listQuery));
            requestData.export_type = 2;
@@ -627,10 +648,10 @@
                console.log(err)
            })
        },
        showDetails(row){
        showDetails(row) {
            this.$router.push({
                path: "/dangerDetails",
                query:{"id":row.id}
                query: {"id": row.id}
            })
        }
    }
@@ -661,10 +682,12 @@
    max-height: 80px;
    overflow-y: auto
}
.blue-font-color:hover{

.blue-font-color:hover {
    cursor: pointer;
    color: blue;
}

/deep/ .el-dialog .button .el-form-item__content {
    margin-left: 0;
}

 src/views/hiddenDangerReview/recheckHiddenDangerList.vue

@@ -321,6 +321,13 @@
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="下一步：" prop="name">
                                <span> 流程结束,不通过则返回隐患部门</span>
                            </el-form-item>
                        </el-col>
                    </el-row>
                </el-form>
                <el-form :model="sendDataForm" :rules="rules" ref="sendDataForm" label-width="150px"
                         class="demo-ruleForm"