From 861ffa46e91d5294ebb6660561fc0acddcd17a69 Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期一, 09 五月 2022 08:24:24 +0800
Subject: [PATCH] 众泰接口对接

---
 src/views/hiddenDangerReview/recheckHiddenDangerList.vue |  327 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 175 insertions(+), 152 deletions(-)

diff --git a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
index 65c83af..ecff40c 100644
--- a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
+++ b/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>
@@ -406,127 +421,135 @@
 </template>
 
 <script>
-    import Titlename from "../../components/Titlename/index.vue";
+import Titlename from "../../components/Titlename/index.vue";
+import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
 
-    export default {
-        components: {Titlename},
-        name: "recheckHiddenDangerList",
-        data() {
-            return {
-                ruleForm: {
-                    name: '',
-                    region: '',
-                    date1: '',
-                    date2: '',
-                    delivery: false,
-                    type: [],
-                    resource: '',
-                    value1: '',
-                    desc: '',
-                    rechecker:'',
-                    reviewTime:'',
-                    reviewResults:'',
-                    rechecker1:'',
-                    reviewTime1:'',
-                    reviewResults1:'',
-                    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: '已发送众泰煤焦化安全环保部',
-                }],
-                fileList: [],
-                // safetyInspectionItemResult:'0',
-            };
+export default {
+    components: {Titlename},
+    name: "recheckHiddenDangerList",
+    data() {
+        return {
+            ruleForm: {
+                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: [],
+            // 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})
+                }
+            })
         },
-        methods: {
-            submitForm(formName) {
-                this.$refs[formName].validate((valid) => {
-                    if (valid) {
-                        alert('submit!');
-                    } else {
-                        console.log('error submit!!');
-                        return false;
-                    }
-                });
-            },
-            handleRemove(file, fileList) {
-                console.log(file, fileList);
-            },
-            handlePreview(file) {
-                console.log(file);
-            },
-            beforeUpload(file) {
-                var FileExt = file.name.replace(/.+\./, "");
-                if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
-                    this.$message({
-                        type: 'warning',
-                        message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片!'
-                    });
+        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) {
+                    sendDangerNext(this.ruleForm).then(res => {
+
+                    })
+                    // alert('submit!');
+                } else {
+                    console.log('error submit!!');
                     return false;
                 }
-            },
-            close(){
-                this.$router.push({
-                    path:"/recheckCancellationNumber"
-                })
+            });
+        },
+        handleRemove(file, fileList) {
+            console.log(file, fileList);
+        },
+        handlePreview(file) {
+            console.log(file);
+        },
+        beforeUpload(file) {
+            var FileExt = file.name.replace(/.+\./, "");
+            if (['jpg', 'png', 'bmp', 'gif', 'jpeg'].indexOf(FileExt.toLowerCase()) === -1) {
+                this.$message({
+                    type: 'warning',
+                    message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片!'
+                });
+                return false;
             }
+        },
+        close() {
+            this.$router.push({
+                path: "/recheckCancellationNumber"
+            })
         }
     }
+}
 </script>
 
 <style scoped>
-    .app-container {
-        padding: 20px;
-        height: 850px;
-        overflow-y: auto;
-    }
+.app-container {
+    padding: 20px;
+    height: 850px;
+    overflow-y: auto;
+}
 
-    /deep/ .box {
-        padding-top: 0;
-    }
+/deep/ .box {
+    padding-top: 0;
+}
 
-    /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;*/
-    /*    color: #FFF;*/
-    /*}*/
+/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;*/
+/*    color: #FFF;*/
+/*}*/
 </style>

--
Gitblit v1.9.2