cqf
2022-05-09 861ffa46e91d5294ebb6660561fc0acddcd17a69
众泰接口对接
已修改5个文件
395 ■■■■ 文件已修改
src/api/sgyhpczl/hiddenDangerRectification.js 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/sgyhpczl/recheckCancellationNumber.js 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hiddenDangerRectification/index.vue 136 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hiddenDangerReview/recheckCancellationNumber.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hiddenDangerReview/recheckHiddenDangerList.vue 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/sgyhpczl/hiddenDangerRectification.js
@@ -75,3 +75,29 @@
        data
    });
}
export function uploadFile(data) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        url: "/taboi/file/upload_do",
        contentType: "multipart/form-data",
        method: 'POST',
        data,
    });
}
//保存延期申请
export function saveDelayApply(data) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        url: "/taboi/danger/delay_do",
        contentType: "application/json",
        method: 'POST',
        data,
    });
}
src/api/sgyhpczl/recheckCancellationNumber.js
@@ -83,3 +83,46 @@
        data
    });
}
//保存延期申请
export function sendDangerNext(data) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        url: "/taboi/danger/next_step_do",
        contentType: "application/json",
        method: 'POST',
        data,
    });
}
//隐患详情
export function getDangerDetails(id) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        url: "/taboi/danger/danger_info?id="+id,
        contentType: "application/json",
        method: 'GET',
    });
}
//查询审批记录
export function getWfRecordList(id) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        url: "taboi/user/wf_record_list?id="+id,
        contentType: "application/json",
        method: 'GET',
    });
}
// /taboi/file/dowloand_do?type=0&fileName=自查隐患管理表_453929676.xls
src/views/hiddenDangerRectification/index.vue
@@ -117,34 +117,39 @@
                  </el-form-item>-->
            <el-form-item label="检查时间">
                <el-col :span="11">
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart"
                                    style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
                </el-col>
                <el-col style="text-align:center" :span="2">-</el-col>
                <el-col :span="11">
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd"
                                    style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
                </el-col>
            </el-form-item>
            <el-form-item label="限改时间">
                <el-col :span="11">
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart"
                                    value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
                </el-col>
                <el-col style="text-align:center" :span="2">-</el-col>
                <el-col :span="11">
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
                    <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd"
                                    value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
                </el-col>
            </el-form-item>
            <el-form-item style="text-align:center;padding:0 50px">
                <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
                <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">导出excel</el-button>
            </el-form-item>
        </el-form>
        <el-row class="title-center">
            <el-col  :span="24" style="text-align:right;">
                <el-button class="btns" type="primary" size="small" @click="dialogVisible=true">申请延期</el-button>
                <el-button class="btns" type="primary" size="small" @click="applyDelay()">申请延期</el-button>
            </el-col>
        </el-row>
        <el-table :data="tableData" style="width: 100%">
        <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
            <el-table-column type="selection" width="55" align="center"></el-table-column>
            <el-table-column prop="number" label="编号" align="center"  width="120"></el-table-column>
            <el-table-column prop="check_branch" label="检查部门" align="center"  width="120"></el-table-column>
@@ -194,14 +199,15 @@
            :close-on-click-modal="false"
            width="30%"
            :before-close="handleClose">
            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
                <el-row>
                    <el-col :span="16" :offset="3">
                        <el-form-item label="申请限改时间" prop="name">
                        <el-form-item label="申请限改时间" prop="application_time">
                            <el-date-picker
                                v-model="value1"
                                v-model="ruleForm.application_time"
                                :picker-options="pickerOptions"
                                type="date"
                                :disabled="true"
                                :disabled="false"
                                placeholder="选择日期"
                                style="width: 100%">
                            </el-date-picker>
@@ -214,12 +220,13 @@
                            <el-upload
                                class="upload-demo"
                                ref="upload"
                                action="https://jsonplaceholder.typicode.com/posts/"
                                :http-request="uploadSectionFile"
                                :on-preview="handlePreview"
                                :on-remove="handleRemove"
                                :file-list="fileList"
                                :before-upload="beforeUpload"
                                :auto-upload="true">
                                :auto-upload="true"
                            >
                                <el-button slot="trigger" size="small" type="primary" class="btns">选择文件</el-button>
                                <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
                            </el-upload>
@@ -229,12 +236,12 @@
                <el-row>
                    <el-col :span="16" :offset="3">
                        <el-form-item label="备注" prop="desc">
                            <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
                            <el-input class="textarea" type="textarea" v-model="ruleForm.remark"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
                <div style="text-align: center">
                    <el-button class="btns" size="small" type="primary" @click="dialogVisible = false">保存</el-button>
                    <el-button class="btns" size="small" type="primary" @click="applyDelaySave()">保存</el-button>
                    <el-button size="small" @click="dialogVisible = false">关闭</el-button>
                </div>
            </el-form>
@@ -256,8 +263,9 @@
    </div>
</template>
<script>
    import {getPageList} from "@/api/sgyhpczl/hiddenDangerRectification";
import {getPageList, uploadFile, saveDelayApply} from "@/api/sgyhpczl/hiddenDangerRectification";
    import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
    export default {
        data() {
            return {
@@ -284,21 +292,24 @@
                dialogVisible: false,
                ruleForm: {
                    name: '',
                    region: '',
                    date1: '',
                    date2: '',
                    delivery: false,
                    type: [],
                    resource: '',
                    value1: '',
                    desc: ''
                application_time: "",
                remark: "",
                realFileName: "",
                id: "",
                },
                rules: {},
            rules: {
                application_time: [{required: true, message: '申请限改时间不能为空', trigger: 'blur'}],
            },
                fileList: [],
                currentPage: 1,
                pageSize: 10,
                recordTotal: 0,
            pickerOptions: { //禁用当前日期之前的日期
                disabledDate(time) {
                    //Date.now()是javascript中的内置函数,它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
                    return time.getTime() < Date.now() - 8.64e7;
                },
            },
            };
        },
        mounted(){
@@ -311,6 +322,20 @@
            this.initYHBM()
        },
    watch: {
        dialogVisible(nval, oval) {
            //弹框关闭,重置值
            if (!nval) {
                this.fileList = [];
                this.ruleForm = {
                    application_time: "",
                    remark: "",
                    realFileName: "",
                    id: "",
                }
            }
        }
    },
        methods:{
            initLlr(){
                initLlr().then(res=>{
@@ -457,7 +482,8 @@
                    .then(_ => {
                        done();
                    })
                    .catch(_ => {});
                .catch(_ => {
                });
            },
            handleRemove(file, fileList) {
                console.log(file, fileList)
@@ -475,6 +501,56 @@
                    return false;
                }
            },
        applyDelay() {
            var selectDataList = this.$refs.dangerRectificationTable.selection;
            if (selectDataList.length != 1) {
                this.$message({
                    type: 'warning',
                    message: '请选择一条数据!'
                });
                return false;
            } else {
                this.ruleForm.id = selectDataList[0].id;
                console.log(this.ruleForm)
                this.dialogVisible = true;
            }
        },
        applyDelaySave() {
            this.$refs["ruleForm"].validate((valid) => {
                if (valid) {
                    saveDelayApply(this.ruleForm).then(res => {
                        this.dialogVisible = false;
                        this.$message({
                            type: 'success',
                            message: '保存成功!'
                        });
                        this.getPageList();
                    })
                }
            })
        },
        uploadSectionFile(param) {
            let form = new FormData();
            var that = this;
            form.append('file', param.file);
            //隐患延期申请附件
            form.append('type', "0");
            uploadFile(form).then(res => {
                var data = res.data;
                if (data.ok) {
                    var fileName = data.data.fileName[0];
                    if (!fileName.endsWith("a62b")) {
                        fileName = fileName + param.file.realFileName;
                    }
                    that.ruleForm.realFileName = that.ruleForm.realFileName + "," + fileName;
                }
            }).error(res => {
                this.$message({
                    type: 'error',
                    message: '附件上传失败,请重试!'
                });
            })
        },
        }
    };
</script>
@@ -484,24 +560,30 @@
        justify-content:left;
        flex-wrap: wrap;
    }
    .inquire .el-form-item{
        padding: 0 46px;
    }
    .title-center{
        padding: 20px 0;
    }
    .btns {
        background-color: #034ea2;
        border: 1px solid #034ea2;
    }
    /deep/ .el-dialog .el-textarea__inner{
        height: 80px;
        max-height: 80px;
        overflow-y: auto
    }
    /deep/.el-dialog .button .el-form-item__content{
        margin-left: 0;
    }
    .textarea{
        max-height: 70px;
        overflow-y: auto;
src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -381,9 +381,10 @@
        },
        // 发送隐患单跳转
      handleClick(){
      handleClick(row){
          this.$router.push({
              path:"/recheckHiddenDangerList"
              path:"/recheckHiddenDangerList",
              query:{"id":row.id}
          })
      },
    }
src/views/hiddenDangerReview/recheckHiddenDangerList.vue
@@ -8,13 +8,13 @@
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="隐患编号" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.number" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="检查单位" prop="elementAName">
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.check_main_branch"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -25,7 +25,7 @@
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="检查人" prop="region">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.check_man" :disabled="true"></el-input>
                                <!--                                <el-select-->
                                <!--                                    v-model="ruleForm.elementAName"-->
                                <!--                                    :disabled="true"-->
@@ -36,7 +36,7 @@
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="陪检人员" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.acc_man" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -44,7 +44,7 @@
                        <el-col :span="9">
                            <el-form-item label="检查时间" prop="name">
                                <el-date-picker
                                    v-model="value1"
                                    v-model="ruleForm.check_date"
                                    type="date"
                                    :disabled="true"
                                    placeholder="选择日期"
@@ -58,7 +58,7 @@
                            <!--                            </el-form-item>-->
                            <el-form-item label="班次" prop="elementAName">
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.check_class"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -69,19 +69,20 @@
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="跟班、带班情况" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.class_situation" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="跟班、带班人员" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.class_man" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="行走路线" prop="name">
                                <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
                                <el-input type="textarea" v-model="ruleForm.route" class="multiline"
                                          :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -90,7 +91,7 @@
                            <el-form-item label="隐患单位" prop="name">
                                <!--<el-input v-model="ruleForm.name"></el-input>-->
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.ht_community"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -101,7 +102,7 @@
                            <el-form-item label="隐患部门" prop="name">
                                <!--                                <el-input v-model="ruleForm.name"></el-input>-->
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.ht_branch"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -112,14 +113,16 @@
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="隐患地点" prop="name">
                                <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
                                <el-input type="textarea" v-model="ruleForm.address" class="multiline"
                                          :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="隐患内容" prop="name">
                                <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
                                <el-input type="textarea" v-model="ruleForm.ht_content" class="multiline"
                                          :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -128,7 +131,7 @@
                            <el-form-item label="隐患类别" prop="name">
                                <!--<el-input v-model="ruleForm.name"></el-input>-->
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.ht_typesub"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -139,7 +142,7 @@
                            <el-form-item label="隐患级别" prop="name">
                                <!--<el-input v-model="ruleForm.name"></el-input>-->
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.ht_level"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -150,7 +153,7 @@
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="整改措施" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.measure" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
@@ -164,7 +167,7 @@
                            <el-form-item label="限改时间" prop="name">
                                <!--<el-input v-model="ruleForm.name"></el-input>-->
                                <el-date-picker
                                    v-model="value1"
                                    v-model="ruleForm.alter_time"
                                    type="date"
                                    :disabled="true"
                                    placeholder="选择日期"
@@ -174,7 +177,7 @@
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="责任人" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.duty_officer" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -183,7 +186,7 @@
                            <el-form-item label="完成时间" prop="name">
                                <!--<el-input v-model="ruleForm.name"></el-input>-->
                                <el-date-picker
                                    v-model="value1"
                                    v-model="ruleForm.ACCOMPLISHTIME"
                                    type="date"
                                    :disabled="true"
                                    placeholder="选择日期"
@@ -202,7 +205,7 @@
                            <el-form-item label="复查时间" prop="name">
                                <!--<el-input v-model="ruleForm.name"></el-input>-->
                                <el-date-picker
                                    v-model="value1"
                                    v-model="ruleForm.CALLBACKTIME"
                                    type="date"
                                    :disabled="true"
                                    placeholder="选择日期"
@@ -212,26 +215,27 @@
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="复查人" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.CALLBACKPERSON" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="复查结果" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.CALLBACKRESULT" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="整改次数" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                                <el-input v-model="ruleForm.amendnum" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="危险源" prop="name">
                                <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
                                <el-input type="textarea" v-model="ruleForm.dangerousSource" class="multiline"
                                          :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -240,7 +244,7 @@
                            <el-form-item label="风险等级" prop="name">
                                <!--                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.DTRisk_level"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -251,7 +255,7 @@
                            <el-form-item label="业务科室" prop="name">
                                <!--                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.Review"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -274,25 +278,32 @@
                                        width="60">
                                    </el-table-column>
                                    <el-table-column
                                        prop="name"
                                        prop="realname"
                                        label="操作人"
                                        align="center"
                                        width="138">
                                    </el-table-column>
                                    <el-table-column
                                        prop="province"
                                        prop="create_time"
                                        label="处理时间"
                                        align="center"
                                        width="200">
                                    </el-table-column>
                                    <el-table-column
                                        prop="city"
                                        prop="content"
                                        label="审批意见"
                                        align="center"
                                        width="260">
                                        <template slot-scope="scope">
                                            <span size="medium">{{ scope.row.content }}</span>
                                            <a v-for="item in scope.row.realFileName"
                                               :href="process.env.BASE_API+'/'+item">
                                                {{ item.split("fileName=")[1] }}
                                            </a>
                                        </template>
                                    </el-table-column>
                                    <el-table-column
                                        prop="address"
                                        prop="ispass"
                                        label="流程信息"
                                        align="center"
                                        width="170">
@@ -304,14 +315,15 @@
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="发送流程" prop="name">
                                <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
                                <el-input type="textarea" v-model="ruleForm.name" class="multiline"
                                          :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="是否发送" prop="name">
                                <el-radio-group v-model="ruleForm.safetyInspectionItemResult">
                                <el-radio-group v-model="ruleForm.ispass">
                                    <el-radio :label="0">通过</el-radio>
                                    <el-radio :label="1">不通过</el-radio>
                                </el-radio-group>
@@ -324,7 +336,7 @@
                            <el-col :span="9">
                                <el-form-item label="复查时间" prop="reviewTime">
                                    <el-date-picker
                                        v-model="ruleForm.reviewTime"
                                        v-model="ruleForm.CALLBACKTIME"
                                        type="date"
                                        placeholder="选择日期"
                                        style="width: 100%">
@@ -335,21 +347,22 @@
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查人" prop="rechecker">
                                    <el-input v-model="ruleForm.rechecker" clearable></el-input>
                                    <el-input v-model="ruleForm.CALLBACKPERSON" clearable></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="22">
                                <el-form-item label="复查结果" prop="reviewResults">
                                    <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input>
                                    <el-input class="textarea2" type="textarea" clearable
                                              v-model="ruleForm.CALLBACKRESULT"></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="22">
                                <el-form-item label="备注" prop="desc">
                                    <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
                                    <el-input class="textarea" type="textarea" v-model="ruleForm.dealContent"></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
@@ -360,7 +373,7 @@
                            <el-col :span="9">
                                <el-form-item label="复查时间" prop="reviewTime">
                                    <el-date-picker
                                        v-model="ruleForm.reviewTime"
                                        v-model="ruleForm.CALLBACKTIME"
                                        type="date"
                                        placeholder="选择日期"
                                        style="width: 100%">
@@ -371,21 +384,22 @@
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查人" prop="rechecker">
                                    <el-input v-model="ruleForm.rechecker" clearable></el-input>
                                    <el-input v-model="ruleForm.CALLBACKPERSON" clearable></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="22">
                                <el-form-item label="复查结果" prop="reviewResults">
                                    <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input>
                                    <el-input class="textarea2" type="textarea"
                                              v-model="ruleForm.CALLBACKRESULT"></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="22">
                                <el-form-item label="备注" prop="desc1">
                                    <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input>
                                    <el-input class="textarea" type="textarea" v-model="ruleForm.dealContent"></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
@@ -393,7 +407,8 @@
                    <el-row>
                        <el-col :span="22">
                            <el-form-item style="text-align: center;">
                                <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
                                <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存
                                </el-button>
                                <el-button size="small" @click="close()">关闭</el-button>
                            </el-form-item>
                        </el-col>
@@ -407,6 +422,7 @@
<script>
    import Titlename from "../../components/Titlename/index.vue";
import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
    export default {
        components: {Titlename},
@@ -414,57 +430,60 @@
        data() {
            return {
                ruleForm: {
                    name: '',
                    region: '',
                    date1: '',
                    date2: '',
                    delivery: false,
                    type: [],
                    resource: '',
                    value1: '',
                    desc: '',
                    rechecker:'',
                    reviewTime:'',
                    reviewResults:'',
                    rechecker1:'',
                    reviewTime1:'',
                    reviewResults1:'',
                    desc1:''
                id: "",
                step: "3",
                ispass: "",
                CALLBACKTIME: "",
                CALLBACKPERSON: "",
                CALLBACKRESULT: "",
                dealContent: "",
                },
                rules: {
                    reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
                    rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
                    reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
                    desc1: { required: true, message: '复查不通过时请在备注说明原因!', trigger: 'blur' },
                CALLBACKTIME: {required: true, message: '请填写复查时间', trigger: 'blur'},
                CALLBACKPERSON: {required: true, message: '请填写复查人', trigger: 'blur'},
                CALLBACKRESULT: {required: true, message: '请填写复查结果', trigger: 'blur'},
                dealContent: {required: true, message: '复查不通过时请在备注说明原因!', trigger: 'blur'},
                },
                tableData: [{
                    date: ' 1',
                    name: '超级管理员',
                    province: '2022-04-07 16:10:27',
                    city: '',
                    address: '已发送众泰煤焦化安全环保部',
                }, {
                    date: ' 1',
                    name: '超级管理员',
                    province: '2022-04-07 16:10:27',
                    city: '',
                    address: '已发送众泰煤焦化安全环保部',
                }, {
                    date: ' 1',
                    name: '超级管理员',
                    province: '2022-04-07 16:10:27',
                    city: '',
                    address: '已发送众泰煤焦化安全环保部',
                }],
            tableData: [],
                fileList: [],
                // safetyInspectionItemResult:'0',
            };
        },
    mounted() {
        console.log(process.env.BASE_API)
        this.getDangerDetails();
        this.getWfRecordList();
    },
        methods: {
        getDangerDetails() {
            getDangerDetails(this.$route.query.id).then(res => {
                var data = res.data;
                if (data.ok) {
                    this.ruleForm = data.data;
                    console.log(this.ruleForm);
                } else {
                    this.$message({type: 'error', message: "数据查询失败,请重试!", duration: 3000})
                }
            })
        },
        getWfRecordList() {
            getWfRecordList(this.$route.query.id).then(res => {
                var data = res.data;
                if (data.ok) {
                    this.tableData = data.data;
                } else {
                    this.$message({type: 'error', message: "数据查询失败,请重试!", duration: 3000})
                }
            })
        },
            submitForm(formName) {
            console.log(this.ruleForm);
                this.$refs[formName].validate((valid) => {
                    if (valid) {
                        alert('submit!');
                    sendDangerNext(this.ruleForm).then(res => {
                    })
                    // alert('submit!');
                    } else {
                        console.log('error submit!!');
                        return false;
@@ -510,20 +529,24 @@
    /deep/ .multiline .el-input__inner {
        height: 62px;
    }
    /deep/ .textarea .el-textarea__inner{
        height: 80px;
        max-height: 80px;
        overflow-y: auto
    }
    /deep/ .textarea2 .el-textarea__inner{
        height: 100px;
        max-height: 100px;
        overflow-y: auto
    }
    .btn {
        background-color: #034ea2;
        border: 1px solid #034ea2;
    }
    /*.el-button:hover {*/
    /*    background: #66b1ff;*/
    /*    border-color: #66b1ff;*/