Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

shj

2022-05-13 97f21296e89d2e4fe7ae2fd00ab63696365b1da2

 src/views/hiddenDangerRectification/sendHiddenDangerList.vue

@@ -7,14 +7,14 @@
                         style="margin: 0 14% 0 16%;">
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="隐患编号：" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                            <el-form-item label="隐患编号" prop="name">
                                <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-form-item label="检查单位" prop="elementAName">
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.check_main_branch"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -24,8 +24,8 @@
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="检查人：" prop="region">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                            <el-form-item label="检查人" prop="region">
                                <el-input v-model="ruleForm.check_man" :disabled="true"></el-input>
                                <!--                                <el-select-->
                                <!--                                    v-model="ruleForm.elementAName"-->
                                <!--                                    :disabled="true"-->
@@ -35,16 +35,16 @@
                            </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-form-item label="陪检人员" prop="name">
                                <el-input v-model="ruleForm.acc_man" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="检查时间：" prop="name">
                            <el-form-item label="检查时间" prop="name">
                                <el-date-picker
                                    v-model="value1"
                                    v-model="ruleForm.check_date"
                                    type="date"
                                    :disabled="true"
                                    placeholder="选择日期"
@@ -56,9 +56,9 @@
                            <!--                            <el-form-item label="班次：" prop="name">-->
                            <!--                                <el-input v-model="ruleForm.name"></el-input>-->
                            <!--                            </el-form-item>-->
                            <el-form-item label="班次：" prop="elementAName">
                            <el-form-item label="班次" prop="elementAName">
                                <el-select
                                    v-model="ruleForm.elementAName"
                                    v-model="ruleForm.check_class"
                                    :disabled="true"
                                    style="width: 100%"
                                >
@@ -68,29 +68,29 @@
                    </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-form-item label="跟班、带班情况" prop="name">
                                <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-form-item label="跟班、带班人员" prop="name">
                                <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-form-item label="行走路线" prop="name">
                                <el-input type="textarea" v-model="ruleForm.route" class="multiline" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="隐患单位：" prop="name">
                            <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%"
                                >
@@ -98,10 +98,10 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="隐患部门：" prop="name">
                            <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%"
                                >
@@ -111,24 +111,24 @@
                    </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-form-item label="隐患地点" prop="name">
                                <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-form-item label="隐患内容" prop="name">
                                <el-input type="textarea" v-model="ruleForm.ht_content" class="multiline" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="隐患类别：" prop="name">
                            <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%"
                                >
@@ -136,10 +136,10 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="隐患级别：" prop="name">
                            <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%"
                                >
@@ -149,22 +149,22 @@
                    </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-form-item label="整改措施" prop="name">
                                <el-input v-model="ruleForm.measure" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="所需资金：" prop="name">
                            <el-form-item label="所需资金" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="限改时间：" prop="name">
                            <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="选择日期"
@@ -173,17 +173,17 @@
                            </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-form-item label="责任人" prop="name">
                                <el-input v-model="ruleForm.duty_officer" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="完成时间：" prop="name">
                            <el-form-item label="完成时间" prop="ACCOMPLISHTIME">
                                <!--<el-input v-model="ruleForm.name"></el-input>-->
                                <el-date-picker
                                    v-model="value1"
                                    v-model="ruleForm.ACCOMPLISHTIME"
                                    type="date"
                                    :disabled="true"
                                    placeholder="选择日期"
@@ -192,17 +192,17 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="整改完成情况：" prop="name">
                            <el-form-item label="整改完成情况" prop="name">
                                <el-input v-model="ruleForm.name" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="复查时间：" prop="name">
                            <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="选择日期"
@@ -211,36 +211,36 @@
                            </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-form-item label="复查人" prop="name">
                                <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-form-item label="复查结果" prop="name">
                                <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-form-item label="整改次数" prop="name">
                                <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-form-item label="危险源" prop="name">
                                <el-input type="textarea" v-model="ruleForm.dangerousSource" class="multiline" :disabled="true"></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="风险等级：" prop="name">
                            <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%"
                                >
@@ -248,10 +248,10 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">
                            <el-form-item label="业务科室：" prop="name">
                            <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%"
                                >
@@ -261,38 +261,46 @@
                    </el-row>
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="流程信息：" prop="name">
                            <el-form-item label="流程信息" prop="name">
                                <!--                                <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
                                <el-table
                                    :data="tableData"
                                    border
                                    style="width: 100%">
                                    <el-table-column
                                        prop="date"
                                       type="index"
                                        label="步骤"
                                        align="center"
                                        width="60">
                                    </el-table-column>
                                    <el-table-column
                                        prop="name"
                                        label="操作人："
                                        prop="realname"
                                        label="操作人"
                                        align="center"
                                        width="139">
                                        width="138">
                                    </el-table-column>
                                    <el-table-column
                                        prop="province"
                                        label="处理时间："
                                        prop="create_time"
                                        label="处理时间"
                                        align="center"
                                        width="200">
                                    </el-table-column>
                                    <el-table-column
                                        prop="city"
                                        label="审批意见："
                                        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="scope.row.url+'/'+item">
                                                {{ item.split("fileName=")[1] }}
                                            </a>
                                        </template>
                                    </el-table-column>
                                    <el-table-column
                                        prop="address"
                                        label="流程信息："
                                        prop="ispass"
                                        label="流程信息"
                                        align="center"
                                        width="170">
                                    </el-table-column>
@@ -302,29 +310,46 @@
                    </el-row>
                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="发送流程：" prop="name">
                            <el-form-item label="发送流程" prop="name">
                                <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 :label="0">通过</el-radio>
                                    <el-radio :label="1">不通过</el-radio>
                            <el-form-item label="申请复查" prop="name">
                                <el-radio-group v-model="ispass">
                                    <el-radio :label="0" checked>申请复查</el-radio>
                                    <el-radio :label="1">不接受,返回{{ruleForm.check_main_branch}}</el-radio>
                                </el-radio-group>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <div
                        v-if="ruleForm.safetyInspectionItemResult == 0">
                        v-if="ispass == 0">
                        <el-row>
                        <el-col :span="9">
                            <el-form-item label="落实责任人" prop="duty_officer">
                                <el-input  v-model="sendDataForm.duty_officer" ></el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>

                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查时间：" prop="reviewTime">
                                <el-form-item label="选择复查单位/人" prop="callback_branch">
                                    <el-input  v-model="ruleForm.callback_branch" :disabled="true"></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>

                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="完成时间" prop="ACCOMPLISHTIME">
                                    <el-date-picker
                                        v-model="ruleForm.reviewTime"
                                        v-model="sendDataForm.ACCOMPLISHTIME"
                                        type="date"
                                        value-format="yyyy-MM-dd"
                                        placeholder="选择日期"
                                        style="width: 100%">
                                    </el-date-picker>
@@ -333,67 +358,26 @@
                        </el-row>
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查人：" prop="rechecker">
                                    <el-input v-model="ruleForm.rechecker" 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-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-form-item label="所需资金" prop="penalty_dy">
                                    <el-input v-model="sendDataForm.penalty_dy" clearable></el-input>
                                </el-form-item>
                            </el-col>
                        </el-row>
                    </div>
                    <div
                        v-else="ruleForm.safetyInspectionItemResult == 1">
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查时间：" prop="reviewTime">
                                    <el-date-picker
                                        v-model="ruleForm.reviewTime"
                                        type="date"
                                        placeholder="选择日期"
                                        style="width: 100%">
                                    </el-date-picker>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="9">
                                <el-form-item label="复查人：" prop="rechecker">
                                    <el-input v-model="ruleForm.rechecker" 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-form-item label="备注" prop="dealContent">
                                    <el-input class="textarea" type="textarea" v-model="sendDataForm.dealContent"></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-form-item>
                            </el-col>
                        </el-row>
                    </div>


                    <el-row>
                        <el-col :span="22">
                            <el-form-item style="text-align: center;">
                                <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
                                <el-button @click="close()">关闭</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>
                    </el-row>
@@ -406,12 +390,24 @@

<script>
    import Titlename from "../../components/Titlename/index.vue";
    import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";

    export default {
        components: {Titlename},
        name: "sendHiddenDangerList",
        data() {
            return {
                sendDataForm: {
                    id: "",
                    step: "2",
                    ispass: "",
                    callback_branch:"",
                    ACCOMPLISHTIME: "",
                    penalty_dy: "",
                    realFileName: "",
                    dealContent: "",
                },
                ispass:0,
                ruleForm: {
                    name: '',
                    region: '',
@@ -431,44 +427,76 @@
                    desc1:''
                },
                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' },
                },
                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() {
            this.getDangerDetails();
            this.getWfRecordList()
        },
        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.ruleForm.callback_branch= data.data.check_main_branch
                        //this.ruleForm.ispass=0
                        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(this.ispass==0){
                    if(this.sendDataForm.duty_officer==null || this.sendDataForm.duty_officer==""){
                        this.$message({type: 'error', message: "请输入落实责任人", duration: 3000})
                        return
                    }
                    if(this.sendDataForm.ACCOMPLISHTIME==null || this.sendDataForm.ACCOMPLISHTIME==""){
                        this.$message({type: 'error', message: "请选择完成时间", duration: 3000})
                        return
                    }
                    this.sendDataForm.ispass="申请复查"
                }
                if(this.ispass==1){
                    this.sendDataForm.ispass="不接受,返回"+this.ruleForm.check_main_branch
                }
                this.sendDataForm.callback_branch=this.ruleForm.check_main_branch
                sendDangerNext(this.sendDataForm).then(res => {
                    var msg = res.data.msg;
                    if (res.data.ok) {
                        this.$router.push({
                            path:"/hiddenDangerRectification",
                        })
                        this.$message({type: 'success', message: msg, duration: 3000})
                    } else {
                        this.$message({type: 'error', message: msg, duration: 3000})
                    }
                })
                /*this.$refs[formName].validate((valid) => {
                    if (valid) {
                        alert('submit!');
                    } else {
                        console.log('error submit!!');
                        return false;
                    }
                });
                });*/
            },
            handleRemove(file, fileList) {
                console.log(file, fileList);
@@ -519,4 +547,13 @@
        max-height: 100px;
        overflow-y: auto
    }
    .btn{
        background-color: #034ea2;
        border: 1px solid #034ea2;
    }
    /*.el-button:hover {*/
    /*    background: #66b1ff;*/
    /*    border-color: #66b1ff;*/
    /*    color: #FFF;*/
    /*}*/
</style>