会议-上报/撤销

cqf

2022-05-26 8233d745e8ed66f553122d7f43739cc0db764564

会议-上报/撤销

 src/api/sgyhpczl/troubleshooting.js

@@ -58,26 +58,28 @@
    });
}
//上报
export function put(id) {
export function upload_do(data) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        contentType: "application/json",
        url: "/taboi/conference/upload_do",
        contentType: "multipart/form-data",
        method: 'POST',
        data
    });
}
//撤销
export function revoke(id) {
export function revoke(data) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        contentType: "multipart/form-data",
        url: "/taboi/analogy/revoke_do?id="+id,
        method: 'GET',
        url: "/taboi/conference/revoke_do",
        method: 'POST',
        data
    });
}

 src/views/careabout/index.vue

@@ -172,7 +172,17 @@
            <el-table-column label="隐患项目" align="center">
                <el-table-column prop="check_date" label="检查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
                <el-table-column prop="address" label="地点" align="center"> </el-table-column>
                <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
                <el-table-column prop="ht_content" label="内容" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
                            <p>{{ scope.row.ht_content }}</p>
                            <div slot="reference" class="name-wrapper">{{
                                    scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                                }}
                            </div>
                        </el-popover>
                    </template>
                </el-table-column>
                <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
                <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
            </el-table-column>

 src/views/oneFromanother/exist.vue

@@ -64,6 +64,23 @@
              </el-form-item>
            </el-col>
          </el-row>
            <el-row>
                <el-col :span="9">
                    <el-form-item label="检查部门" prop="check_branch">
                        <el-select v-model="ruleForm.check_branch" placeholder="请选择" style="width: 100%">
                            <el-option
                                v-for="item in JCBMList"
                                :key="item.value"
                                :label="item.value"
                                :value="item.value">
                            </el-option>
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="9" :offset="4">

                </el-col>
            </el-row>
          <el-row>
            <el-col :span="9">
              <el-form-item label="检查人员" prop="check_man">
@@ -76,8 +93,6 @@
              </el-form-item>
            </el-col>
          </el-row>


            <el-row>
                <el-col :span="22">
                    <el-form-item label="行走路线">
@@ -96,7 +111,17 @@
                    <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
                    <el-table-column prop="ht_branch"  align="center" label="隐患部门"></el-table-column>
                    <el-table-column prop="address"  align="center" label="地点"></el-table-column>
                    <el-table-column prop="ht_content" show-overflow-tooltip align="center" label="隐患内容"></el-table-column>
                    <el-table-column prop="ht_content" align="center" label="隐患内容">
                        <template slot-scope="scope">
                            <el-popover trigger="hover" placement="top">
                                <p>{{ scope.row.ht_content }}</p>
                                <div slot="reference" class="name-wrapper">{{
                                        scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                                    }}
                                </div>
                            </el-popover>
                        </template>
                    </el-table-column>
                    <el-table-column prop="measure"  align="center" label="整改措施"></el-table-column>
                    <el-table-column prop="ht_typesub"  align="center" label="隐患类别"></el-table-column>
                    <el-table-column prop="dangerousSource"  align="center" label="关联危险源"></el-table-column>

 src/views/oneFromanother/index.vue

@@ -101,7 +101,17 @@
            <el-table-column prop="ht_typesub" label="隐患类别" align="center"></el-table-column>
            <el-table-column prop="ht_level" label="隐患级别" align="center"></el-table-column>
            <el-table-column prop="address" label="隐患地点" align="center"></el-table-column>
            <el-table-column prop="ht_content" show-overflow-tooltip label="内容" width="200" align="center"></el-table-column>
            <el-table-column prop="ht_content" label="内容" width="200" align="center">
                <template slot-scope="scope">
                    <el-popover trigger="hover" placement="top">
                        <p>{{ scope.row.ht_content }}</p>
                        <div slot="reference" class="name-wrapper">{{
                                scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                            }}
                        </div>
                    </el-popover>
                </template>
            </el-table-column>
            <el-table-column prop="push_branch" label="下发单位" align="center"></el-table-column>
            <el-table-column prop="date" label="流程操作" align="center">
                <template slot-scope="scope">

 src/views/oneFromanotherN/existN.vue

@@ -66,6 +66,23 @@
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="检查部门" prop="check_branch">
                                <el-select v-model="ruleForm.check_branch" placeholder="请选择" style="width: 100%">
                                    <el-option
                                        v-for="item in JCBMList"
                                        :key="item.value"
                                        :label="item.value"
                                        :value="item.value">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="9" :offset="4">

                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="9">
                            <el-form-item label="检查人员" prop="check_man">
                                <el-input v-model="ruleForm.check_man"></el-input>
                            </el-form-item>
@@ -76,8 +93,6 @@
                            </el-form-item>
                        </el-col>
                    </el-row>


                    <el-row>
                        <el-col :span="22">
                            <el-form-item label="行走路线">
@@ -86,17 +101,27 @@
                        </el-col>
                    </el-row>

                    <!-- <el-row style="margin-bottom: 20px" v-if="addShow">
                    <el-row style="margin-bottom: 20px">
                        <el-col :span="9">
                            <el-button type="primary" class="btns" @click="addDanger">新增隐患</el-button>
                        </el-col>
                    </el-row> -->
                    </el-row>

                    <el-table :data="tableData" style="width: 100%">
                        <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
                        <el-table-column prop="ht_branch"  align="center" label="隐患部门"></el-table-column>
                        <el-table-column prop="address"  align="center" label="地点"></el-table-column>
                        <el-table-column prop="ht_content" show-overflow-tooltip align="center" label="隐患内容"></el-table-column>
                        <el-table-column prop="ht_content" align="center" label="隐患内容">
                            <template slot-scope="scope">
                                <el-popover trigger="hover" placement="top">
                                    <p>{{ scope.row.ht_content }}</p>
                                    <div slot="reference" class="name-wrapper">{{
                                            scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                                        }}
                                    </div>
                                </el-popover>
                            </template>
                        </el-table-column>
                        <el-table-column prop="measure"  align="center" label="整改措施"></el-table-column>
                        <el-table-column prop="ht_typesub"  align="center" label="隐患类别"></el-table-column>
                        <el-table-column prop="dangerousSource"  align="center" label="关联危险源"></el-table-column>
@@ -361,7 +386,7 @@
    initYHLX,
    initYwks
} from "@/api/sgyhpczl/initSelect";
import {getPageList,initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
import {getPageList,initDangerRebound,saveDanger} from '@/api/sgyhpczl/hiddenDangerRegistration'
import {deepClone} from '@/utils'

export default {
@@ -379,6 +404,7 @@
                address: [{ required: true, message: '不能为空', trigger: 'blur' },],
                ht_content: [{ required: true, message: '不能为空', trigger: 'blur' },],
                ht_typesub: [{ required: true, message: '不能为空', trigger: 'blur' },],
                measure: [{ required: true, message: '不能为空', trigger: 'blur' },],
                DTRisk_bankId: [{ required: true, message: '不能为空', trigger: 'blur' },],
                ht_level: [{ required: true, message: '不能为空', trigger: 'blur' },],
                alter_time: [{ required: true, message: '不能为空', trigger: 'blur' },],
@@ -419,6 +445,8 @@
            pageSize: 10,
            recordTotal: 0,
            detailTableData:[],//隐患详情列表
            beforeData:{}, //上个页面信息
            beforeFlag:true,//上个页面信息保存标志
        };
    },

@@ -445,11 +473,13 @@
        initInfo(data){
            this.paramsData = this.$route.query.data;
            this.ruleForm.jyfsId = data.id;
            this.tableData[0] = {
                address: data.address,
                ht_content: data.ht_content,
                ht_level: data.ht_level,
            };
            this.dangerForm.address = data.address;
            this.dangerForm.ht_content = data.ht_content;
            // this.tableData[0] = {
            //     address: data.address,
            //     ht_content: data.ht_content,
            //     ht_level: data.ht_level,
            // };
        },

        // async initInfo(){
@@ -474,7 +504,9 @@
            this.$refs[formName].validate((valid) => {
                if (valid) {
                    if(this.title=='新增'){
                        this.beforeFlag = false;
                        this.tableData.push(this.dangerForm)
                        console.log(this.tableData)
                    }else {
                        var arr = this.tableData;
                        arr.splice(this.rowIndex, 1, this.dangerForm);
@@ -531,7 +563,9 @@
        },

        addDanger(){
            this.dangerForm={}
            if (!this.beforeFlag){
                this.dangerForm={}
            }
            this.title="新增"
            this.dialogVisible=true
        },
@@ -655,51 +689,47 @@
        },
        submitForm(formName) {
            this.$refs[formName].validate((valid) => {

                if (valid) {
                    this.ruleForm.items=this.tableData
                    if(this.judge(this.tableData[0])){
                        this.$message({type:'error', message:"请完整录入隐患", duration:2000})
                    }
                    // if(this.addShow){
                    console.log(this.ruleForm)
                    saveDanger(this.ruleForm).then(res=>{
                        if (res.data.ok==1){
                            this.$message({type:'success', message:"保存成功", duration:3000})
                            this.$router.push({
                                path:"/oneFromanother"
                                path:"/oneFromanotherN"
                            })
                        }else {
                            this.$message({type:'error', message:res.data.msg, duration:3000})
                        }
                    })
                    // }else {
                    // var param=deepClone(this.ruleForm)
                    // var obj=deepClone(this.tableData[0])
                    // param.ht_branch=obj.ht_branch
                    // param.address=obj.address
                    // param.ht_content=obj.ht_content
                    // param.measure=obj.measure
                    // param.ht_typesub=obj.ht_typesub
                    // param.DTRisk_bankId=obj.DTRisk_bankId
                    // param.DTRisk_level=obj.mriskLevel
                    // param.dangerousSource=obj.mriskPoint
                    // param.ht_level=obj.ht_level
                    // param.alter_time=obj.alter_time
                    // param.duty_officer=obj.duty_officer
                    // param.alter_status=obj.alter_status
                    // param.Review=obj.Review
                    // param.repeatId=obj.repeatId
                    // editDanger(param).then(res=>{
                    //     if (res.data.ok==1){
                    //         this.$message({type:'success', message:"编辑成功", duration:3000})
                    //         this.$router.push({
                    //             path:"/hiddenDangerRegistration"
                    //         })
                    //     }else {
                    //         this.$message({type:'error', message:res.data.msg, duration:3000})
                    //     }
                    // })
                    //     var param=deepClone(this.ruleForm)
                    //     var obj=deepClone(this.tableData[0])
                    //     param.ht_branch=obj.ht_branch
                    //     param.address=obj.address
                    //     param.ht_content=obj.ht_content
                    //     param.measure=obj.measure
                    //     param.ht_typesub=obj.ht_typesub
                    //     param.DTRisk_bankId=obj.DTRisk_bankId
                    //     param.DTRisk_level=obj.mriskLevel
                    //     param.dangerousSource=obj.mriskPoint
                    //     param.ht_level=obj.ht_level
                    //     param.alter_time=obj.alter_time
                    //     param.duty_officer=obj.duty_officer
                    //     param.alter_status=obj.alter_status
                    //     param.Review=obj.Review
                    //     param.repeatId=obj.repeatId
                    //     editDanger(param).then(res=>{
                    //         if (res.data.ok==1){
                    //             this.$message({type:'success', message:"编辑成功", duration:3000})
                    //             this.$router.push({
                    //                 path:"/hiddenDangerRegistration"
                    //             })
                    //         }else {
                    //             this.$message({type:'error', message:res.data.msg, duration:3000})
                    //         }
                    //     })
                    // }



 src/views/oneFromanotherN/index.vue

@@ -115,7 +115,17 @@
            <el-table-column prop="ht_typesub" label="隐患类别" align="center"></el-table-column>
            <el-table-column prop="ht_level" label="隐患级别" align="center"></el-table-column>
            <el-table-column prop="address" label="隐患地点" align="center"></el-table-column>
            <el-table-column prop="ht_content" show-overflow-tooltip label="隐患内容" width="200" align="center"></el-table-column>
            <el-table-column prop="ht_content" label="隐患内容" width="200" align="center">
                <template slot-scope="scope">
                    <el-popover trigger="hover" placement="top">
                        <p>{{ scope.row.ht_content }}</p>
                        <div slot="reference" class="name-wrapper">{{
                                scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                            }}
                        </div>
                    </el-popover>
                </template>
            </el-table-column>
            <!-- <el-table-column prop="curWarningLevel" label="下发单位" align="center"></el-table-column> -->
            <el-table-column prop="date" label="基本操作" align="center">
                <template slot-scope="scope">
@@ -138,7 +148,17 @@
            <el-table-column prop="ht_typesub" label="隐患类别" align="center"></el-table-column>
            <el-table-column prop="ht_level" label="隐患级别" align="center"></el-table-column>
            <el-table-column prop="address" label="隐患地点" align="center"></el-table-column>
            <el-table-column prop="ht_content" show-overflow-tooltip label="隐患内容" width="200" align="center"></el-table-column>
            <el-table-column prop="ht_content" label="隐患内容" width="200" align="center">
                <template slot-scope="scope">
                    <el-popover trigger="hover" placement="top">
                        <p>{{ scope.row.ht_content }}</p>
                        <div slot="reference" class="name-wrapper">{{
                                scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                            }}
                        </div>
                    </el-popover>
                </template>
            </el-table-column>
            <el-table-column prop="workGroupName" label="发送单位" align="center"></el-table-column>
            <el-table-column prop="state" label="未自查单位" align="center"></el-table-column>
        </el-table>

 src/views/troubleshooting/index.vue

@@ -46,7 +46,7 @@
                    </el-option>
                </el-select>
            </el-col>
            <div v-if="upType == 1">
            <div v-if="upType == 2">
                <el-col :span="5" :offset="1">
                    <el-date-picker type="date" placeholder="选择日期" v-model="upTimeStart" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
                </el-col>
@@ -94,7 +94,17 @@
        <el-table-column prop="ADDRESS" label="地点" align="center" width="120"></el-table-column>
        <el-table-column prop="HOST" label="主持人" align="center" width="120"></el-table-column>
        <el-table-column prop="CONFERENCE_PROFESSIONAL" label="会议专业" align="center" width="120"></el-table-column>
        <el-table-column prop="meeting_content" show-overflow-tooltip label="会议摘要" align="center"></el-table-column>
        <el-table-column prop="meeting_content" label="会议摘要" align="center">
            <template slot-scope="scope">
                <el-popover trigger="hover" placement="top">
                    <p>{{ scope.row.meeting_content }}</p>
                    <div slot="reference" class="name-wrapper">{{
                            scope.row.meeting_content != null && scope.row.meeting_content.length > 20 ? scope.row.meeting_content.substring(0, 18) + "...." : scope.row.meeting_content
                        }}
                    </div>
                </el-popover>
            </template>
        </el-table-column>
        <el-table-column prop="realFileName" label="会议纪要" align="center">
            <template slot-scope="scope" >

@@ -211,7 +221,7 @@
  </div>
</template>
<script>
import {getPageList,addOrEdit, del, revoke, put} from "@/api/sgyhpczl/troubleshooting";
import {getPageList,addOrEdit, del, revoke, upload_do} from "@/api/sgyhpczl/troubleshooting";
import {uploadFile} from "@/api/sgyhpczl/hiddenDangerRectification";
import {deepClone} from '@/utils'
import {downloadFile} from "@/api/sgyhpczl/fileUtils";
@@ -241,7 +251,7 @@
            listLoading: false,
            // fileList:[{name:'aa.doc',url:'sssss.doc'}],
            fileList:[],
            upTypeList:[{label:"按勾选上报",value:0},{label:"按时间上报",value:1}],
            upTypeList:[{label:"按勾选上报",value:0},{label:"按时间上报",value:2}],
            upType:0,
            upTimeStart:'',
            upTimeEnd:'',
@@ -275,7 +285,7 @@
      },
      changeUpType(val){
        this.upType = val;
          if (val == 1){
          if (val == 2){
              this.offset = 2;
          }else {
              this.offset = 14;
@@ -311,7 +321,9 @@
    },
    //重置
    reset() {
      this.listQuery.form = {};
      this.listQuery.form = {
          CONFERENCE_PROFESSIONAL: '0'
      };
      this.getPageList();
    },
    handleSizeChange(val) {
@@ -536,41 +548,56 @@
              cancelButtonText: '取消',
              type: 'warning'
          }).then(() => {
              // revoke(ids).then(() => {
              //     this.getPageList()
              //     this.$notify({
              //         title: "成功",
              //         message: "撤销成功",
              //         type: "success",
              //         duration: 2000,
              //     });
              // });
              let data = {
                  id:ids
              }
              revoke(data).then(() => {
                  this.getPageList()
                  this.$notify({
                      title: "成功",
                      message: "撤销成功",
                      type: "success",
                      duration: 2000,
                  });
              });
          }).catch(error => {
          });
      },
      //上报
      putBatch() {
          if (this.selectedList == null || this.selectedList.length == 0) {
              this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
              return
          let data = {}
          if (this.upType == 0){
              if (this.selectedList == null || this.selectedList.length == 0) {
                  this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
                  return
              }
              var ids = this.selectedList.map((obj) => {
                  return obj.id
              }).join(",")
              data = {
                  type: this.upType,
                  id: ids,
              }
          }else {
              data = {
                  type: this.upType,
                  time: this.upTimeStart+'至'+this.upTimeEnd,
              }
          }
          var ids = this.selectedList.map((obj) => {
              return obj.id
          }).join(",")
          this.$confirm('确认上报吗', '提示', {
              confirmButtonText: '确认',
              cancelButtonText: '取消',
              type: 'warning'
          }).then(() => {
              // put(ids).then(() => {
              //     this.getPageList()
              //     this.$notify({
              //         title: "成功",
              //         message: "上报成功",
              //         type: "success",
              //         duration: 2000,
              //     });
              // });
              upload_do(data).then(() => {
                  this.getPageList()
                  this.$notify({
                      title: "成功",
                      message: "上报成功",
                      type: "success",
                      duration: 2000,
                  });
              });
          }).catch(error => {
          });
      },