panzy
2022-05-10 988ddd65903073c840eb58c9e58652a7c7a222c0
对接接口
已修改3个文件
164 ■■■■■ 文件已修改
src/views/hiddenDangerRectification/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hiddenDangerRectification/sendHiddenDangerList.vue 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hiddenDangerReview/recheckHiddenDangerList.vue 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hiddenDangerRectification/index.vue
@@ -472,9 +472,10 @@
        // 发送隐患单跳转
        handleClick() {
        handleClick(row) {
            this.$router.push({
                path: "/sendHiddenDangerList"
                path: "/sendHiddenDangerList",
                query:{"id":row.id}
            })
        },
        handleClose(done) {
src/views/hiddenDangerRectification/sendHiddenDangerList.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="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,19 @@
                    <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 +90,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 +101,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 +112,14 @@
                    <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 +128,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 +139,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 +150,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 +164,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 +174,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 +183,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 +202,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 +212,26 @@
                        </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 +240,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 +251,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%"
                                >
@@ -407,6 +407,8 @@
<script>
    import Titlename from "../../components/Titlename/index.vue";
    import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
    export default {
        components: {Titlename},
@@ -460,7 +462,32 @@
                // safetyInspectionItemResult:'0',
            };
        },
        mounted() {
            this.getDangerDetails();
        },
        methods: {
            getDangerDetails() {
                getDangerDetails(this.$route.query.id).then(res => {
                    var data = res.data;
                    if (data.ok) {
                        this.ruleForm = data.data;
                        this.ruleForm.url = process.env.BASE_API;
                        this.sendDataForm.id = this.ruleForm.id
                    } 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) {
                this.$refs[formName].validate((valid) => {
                    if (valid) {
src/views/hiddenDangerReview/recheckHiddenDangerList.vue
@@ -3,7 +3,7 @@
        <div style="">
            <Titlename title="发送隐患单"></Titlename>
            <div class="whole-form">
                <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
                <el-form :model="ruleForm" ref="ruleForm" label-width="150px" class="demo-ruleForm"
                         style="margin: 0 14% 0 16%;">
                    <el-row>
                        <el-col :span="9">
@@ -297,7 +297,7 @@
                                        <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">
                                               :href="scope.row.url+'/'+item">
                                                {{ item.split("fileName=")[1] }}
                                            </a>
                                        </template>
@@ -320,12 +320,16 @@
                            </el-form-item>
                        </el-col>
                    </el-row>
                </el-form>
                <el-form :model="sendDataForm" :rules="rules" ref="sendDataForm" label-width="150px"
                         class="demo-ruleForm"
                         style="margin: 0 14% 0 16%;">
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="是否发送" prop="name">
                                <el-radio-group v-model="ruleForm.ispass">
                                    <el-radio :label="0">通过</el-radio>
                                    <el-radio :label="1">不通过</el-radio>
                            <el-form-item label="是否发送" prop="ispass">
                                <el-radio-group v-model="sendDataForm.ispass">
                                    <el-radio label="通过">通过</el-radio>
                                    <el-radio label="不通过">不通过</el-radio>
                                </el-radio-group>
                            </el-form-item>
                        </el-col>
@@ -334,9 +338,9 @@
                        v-if="ruleForm.safetyInspectionItemResult == 0">
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查时间" prop="reviewTime">
                                <el-form-item label="复查时间" prop="CALLBACKTIME">
                                    <el-date-picker
                                        v-model="ruleForm.CALLBACKTIME"
                                        v-model="sendDataForm.CALLBACKTIME"
                                        type="date"
                                        placeholder="选择日期"
                                        style="width: 100%">
@@ -346,23 +350,24 @@
                        </el-row>
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查人" prop="rechecker">
                                    <el-input v-model="ruleForm.CALLBACKPERSON" clearable></el-input>
                                <el-form-item label="复查人" prop="CALLBACKPERSON">
                                    <el-input v-model="sendDataForm.CALLBACKPERSON" clearable></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="22">
                                <el-form-item label="复查结果" prop="reviewResults">
                                <el-form-item label="复查结果" prop="CALLBACKRESULT">
                                    <el-input class="textarea2" type="textarea" clearable
                                              v-model="ruleForm.CALLBACKRESULT"></el-input>
                                              v-model="sendDataForm.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.dealContent"></el-input>
                                <el-form-item label="备注" prop="dealContent">
                                    <el-input class="textarea" type="textarea"
                                              v-model="sendDataForm.dealContent"></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
@@ -371,9 +376,9 @@
                        v-else="ruleForm.safetyInspectionItemResult == 1">
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查时间" prop="reviewTime">
                                <el-form-item label="复查时间" prop="CALLBACKTIME">
                                    <el-date-picker
                                        v-model="ruleForm.CALLBACKTIME"
                                        v-model="sendDataForm.CALLBACKTIME"
                                        type="date"
                                        placeholder="选择日期"
                                        style="width: 100%">
@@ -383,23 +388,24 @@
                        </el-row>
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查人" prop="rechecker">
                                    <el-input v-model="ruleForm.CALLBACKPERSON" clearable></el-input>
                                <el-form-item label="复查人" prop="CALLBACKPERSON">
                                    <el-input v-model="sendDataForm.CALLBACKPERSON" clearable></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="22">
                                <el-form-item label="复查结果" prop="reviewResults">
                                <el-form-item label="复查结果" prop="CALLBACKRESULT">
                                    <el-input class="textarea2" type="textarea"
                                              v-model="ruleForm.CALLBACKRESULT"></el-input>
                                              v-model="sendDataForm.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.dealContent"></el-input>
                                <el-form-item label="备注" prop="dealContent">
                                    <el-input class="textarea" type="textarea"
                                              v-model="sendDataForm.dealContent"></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
@@ -407,7 +413,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 class="btn" size="small" type="primary" @click="submitForm('sendDataForm')">
                                    保存
                                </el-button>
                                <el-button size="small" @click="close()">关闭</el-button>
                            </el-form-item>
@@ -438,11 +445,19 @@
                CALLBACKRESULT: "",
                dealContent: "",
            },
            sendDataForm: {
                id: "",
                step: "3",
                ispass: "",
                CALLBACKTIME: "",
                CALLBACKPERSON: "",
                CALLBACKRESULT: "",
                dealContent: "",
            },
            rules: {
                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: [],
            fileList: [],
@@ -450,7 +465,6 @@
        };
    },
    mounted() {
        console.log(process.env.BASE_API)
        this.getDangerDetails();
        this.getWfRecordList();
    },
@@ -460,7 +474,8 @@
                var data = res.data;
                if (data.ok) {
                    this.ruleForm = data.data;
                    console.log(this.ruleForm);
                    this.ruleForm.url = process.env.BASE_API;
                    this.sendDataForm.id = this.ruleForm.id
                } else {
                    this.$message({type: 'error', message: "数据查询失败,请重试!", duration: 3000})
                }
@@ -477,11 +492,18 @@
            })
        },
        submitForm(formName) {
            console.log(this.ruleForm);
            this.$refs[formName].validate((valid) => {
                if (valid) {
                    sendDangerNext(this.ruleForm).then(res => {
                    sendDangerNext(this.sendDataForm).then(res => {
                        var msg = res.data.msg;
                        if (res.data.ok) {
                            this.$router.push({
                                path:"/recheckCancellationNumber",
                            })
                            this.$message({type: 'success', message: msg, duration: 3000})
                        } else {
                            this.$message({type: 'error', message: msg, duration: 3000})
                        }
                    })
                    // alert('submit!');
                } else {