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

shj

2022-05-16 4cc5b73a86a6c6195717c0ee18e2e82c3edb3042

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

# Conflicts:
#	src/permission.js

 src/api/sgyhpczl/recheckCancellationNumber.js

@@ -111,6 +111,22 @@
    });
}



//自查隐患详情
export function self_info(id) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        url: "/taboi/danger/self_info?id="+id,
        contentType: "application/json",
        method: 'GET',
    });
}


//查询审批记录
export function getWfRecordList(id) {
    return request({
@@ -124,5 +140,7 @@
    });
}



// /taboi/file/dowloand_do?type=0&fileName=自查隐患管理表_453929676.xls


 src/assets/btn.gif

 src/permission.js

@@ -16,8 +16,7 @@
  if (!permissionRoles) return true
  return roles.some(role => permissionRoles.indexOf(role) >= 0)
}

const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/Issuedbysuperiors','/oneFromanotherN'] // no redirect whitelist
const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN']// no redirect whitelist

router.beforeEach((to, from, next) => {
  NProgress.start() // start progress bar

 src/router/index.js

@@ -343,6 +343,20 @@
                hidden: true
            },
              {
                  path: '/inspectionNotExist',
                  // name: '内部举一反三-待自查-不存在',
                  component: () => import('@/views/oneFromanother/inspectionNotExist'),
                  // meta: { title: '内部举一反三-待自查-不存在', icon: '' }
                  hidden: true
              },
              {
                  path: '/send',
                  // name: '内部举一反三-发送弹窗',
                  component: () => import('@/views/oneFromanother/send'),
                  // meta: { title: '内部举一反三-发送弹窗', icon: '' }
                  hidden: true
              },
              {
                  id: 8,
                  parentId: 0,
                  path: '/hiddenDangerTroubleshootingList',

 src/views/delayHiddenDangerRectification/index.vue

@@ -431,7 +431,7 @@
        sendBath() {
            var selectData = this.$refs.dataTable.selection;
            if (selectData.length < 1) {
                this.$message({type: 'warn', message: "请选择需要发送的数据！", duration: 3000})
                this.$message({type: 'warning', message: "请选择需要发送的数据！", duration: 3000})
                return;
            }
            var selectIds = "";

 src/views/hiddenDangerManagement/fillRectificationAdd.vue

@@ -37,50 +37,6 @@
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <!--<el-row>
                        <el-col :span="9">
                            <el-form-item label="检查类别" prop="checktype">
                                <el-select v-model="ruleForm.checktype" placeholder="请选择"  style="width: 100%">
                                    <el-option
                                        v-for="item in JCLBList"
                                        :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-form-item label="检查单位" prop="check_main_branch">
                                <el-select v-model="ruleForm.check_main_branch" placeholder="请选择"  @change="changeJCDW"  style="width: 100%">
                                    <el-option
                                        v-for="item in JCDWList"
                                        :key="item.label"
                                        :label="item.label"
                                        :value="item.label"
                                    >
                                    </el-option>
                                </el-select>
                            </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">
@@ -88,21 +44,8 @@
                                <el-input v-model="ruleForm.check_man"></el-input>
                            </el-form-item>
                        </el-col>
                        <!--<el-col :span="9" :offset="4">
                            <el-form-item label="陪检人员" prop="acc_man">
                                <el-input v-model="ruleForm.acc_man"></el-input>
                            </el-form-item>
                        </el-col>-->
                    </el-row>


                    <!--  <el-row>
                          <el-col :span="22">
                              <el-form-item label="行走路线">
                                  <el-input v-model="ruleForm.route" rows="3" type="textarea" class="multiline"></el-input>
                              </el-form-item>
                          </el-col>
                      </el-row>-->

                    <el-row style="margin-bottom: 20px">
                        <el-col :span="9">
@@ -341,9 +284,9 @@
    initWxy
} from "@/api/sgyhpczl/initSelect";
import {initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
import {getDangerDetails} from "@/api/sgyhpczl/recheckCancellationNumber";
import {getDangerDetails,self_info} from "@/api/sgyhpczl/recheckCancellationNumber";

import {saveSelfDanger} from '@/api/sgyhpczl/hiddenDangerManagement'
import {saveSelfDanger,self_edit_do} from '@/api/sgyhpczl/hiddenDangerManagement'
import {deepClone} from '@/utils'

export default {
@@ -380,22 +323,22 @@
            YWKSList: [],
            update: false,
            reboundList: [],
            ruleForm: {},
            ruleForm: {
                check_date:"",
                check_class:"",
                check_man:""
            },
            rules: {
                check_date: [{required: true, message: '不能为空', trigger: 'blur'},],
                check_class: [{required: true, message: '不能为空', trigger: 'blur'},],
                check_main_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
                check_branch: [{required: true, message: '不能为空', trigger: 'blur'},],
                check_man: [{required: true, message: '不能为空', trigger: 'blur'},],
                checktype: [{required: true, message: '不能为空', trigger: 'blur'},],
            },
            tableData: [],
        };
    },
    mounted() {
        if (this.$route.query != null) {
            console.log(11111)
            getDangerDetails(this.$route.query.id).then(res => {
            self_info(this.$route.query.id).then(res => {
                console.log(res)
                if (res.data.ok) {
                    this.tableData.push(res.data.data);
@@ -614,6 +557,29 @@
                });
            } else {
                console.log(this.tableData)
                this.$refs[formName].validate((valid) => {
                    if (valid) {
                        var requestData = this.tableData[0];
                        requestData.check_class= this.ruleForm.check_class
                        requestData.check_man= this.ruleForm.check_man
                        requestData.check_date= this.ruleForm.check_date
                        console.log(requestData)
                        self_edit_do(requestData).then(res => {
                            if (res.data.ok == 1) {
                                this.$message({type: 'success', message: "编辑成功", duration: 3000})
                                this.$router.push({
                                    path: "/hiddenDangerManagement"
                                })
                            } else {
                                this.$message({type: 'error', message: res.data.msg, duration: 3000})
                            }
                        })

                    } else {
                        console.log("error submit!!");
                        return false;
                    }
                });
            }
        },
        close() {

 src/views/hiddenDangerManagement/index.vue

@@ -478,7 +478,7 @@
        fillRectification() {
            var checkData = this.$refs.dataTable.selection;
            if (checkData.length < 1) {
                this.$message({type: 'warn', message: "请选择勾选需要填写的数据！", duration: 3000})
                this.$message({type: 'warning', message: "请选择勾选需要填写的数据！", duration: 3000})
                return;
            }
            this.$router.push({
@@ -489,7 +489,7 @@
        fillInspector() {
            var checkData = this.$refs.dataTable.selection;
            if (checkData.length < 1) {
                this.$message({type: 'warn', message: "请选择勾选需要填写的数据！", duration: 3000})
                this.$message({type: 'warning', message: "请选择勾选需要填写的数据！", duration: 3000})
                return;
            }
            this.$router.push({
@@ -571,7 +571,7 @@
        revoke() {
            var checkData = this.$refs.dataTable.selection;
            if (checkData.length < 1) {
                this.$message({type: 'warn', message: "请勾选需要撤销的数据！", duration: 3000})
                this.$message({type: 'warning', message: "请勾选需要撤销的数据！", duration: 3000})
                return;
            }
            var revokeIds = "";
@@ -599,7 +599,7 @@
        deleteBath() {
            var checkData = this.$refs.dataTable.selection;
            if (checkData.length < 1) {
                this.$message({type: 'warn', message: "请勾选需要删除的数据！", duration: 3000})
                this.$message({type: 'warning', message: "请勾选需要删除的数据！", duration: 3000})
                return;
            }
            var deleteIds = "";

 src/views/hiddenDangerTroubleshootingList/index.vue

@@ -1,4 +1,4 @@
<template>
<template xmlns="http://www.w3.org/1999/html">
    <div class="whole">
        <div class="left-tree">
            <el-tree
@@ -24,48 +24,34 @@
                  }"
                    style="color: #409eff;"
                />
                <i v-else class="
el-icon-folder-add" style="color: #EC933A;" />
                <i v-else class="el-icon-folder-add" style="color: #EC933A;" />
                <span>{{ node.label }}</span>
              </template>
            </span>
            </el-tree>
        </div>
        <div class="right-table">
            <el-form :model="config" ref="configTableForm">
                <el-table
                    :data="config.list"
                    style="width: 100%"
                    max-height="450">
<!--                    <el-table-column  label="查询名">-->
<!--                        <template slot-scope="scope">-->
<!--                            <el-form-item>-->
<!--                                <el-input-->
<!--                                    v-model.trim="scope.row.value"-->
<!--                                    size="mini"-->
<!--                                    placeholder="请填写值"></el-input>-->
<!--                            </el-form-item>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
<!--                    <el-table-column  label="查询名">-->
<!--                        <template slot-scope="scope">-->
<!--                            <el-form-item>-->
<!--                                <el-input-->
<!--                                    v-model.trim="scope.row.value"-->
<!--                                    size="mini"-->
<!--                                    placeholder="请填写值"></el-input>-->
<!--                            </el-form-item>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
                    <tr>sssss</tr>
                    <td>ss</td>
                </el-table>
            </el-form>
            <div class="btns">
<!--                <el-button-->
<!--                    type="primary"-->
<!--                    @click="submitConfig('configTableForm')">保存并确定</el-button>-->
            </div>
            <table border="1" style="background: #FFFFFF;width: 100%;">
                <tr>
                    <td class="table_td" style="text-align: right;">模板名称：</td>
                    <td>
                        <input class="input" style="line-height: 24px;height: 24px;">
                    </td>
                </tr>
                <tr>
                    <td class="table_td" style="text-align: right;">模板导入:</td>
                    <td style="line-height: 24px;height: 24px;">
                        <input class="input" type="file" style="color: red;">
                        <button class="btn" style="margin-left: 120px;">导入</button>
                        <button class="btn">下载模板</button>
                    </td>
                </tr>
                <tr class="table_tr">
                    <td colspan="4" align="center">
                        <button class="btn">预览</button>
                    </td>
                </tr>
            </table>
        </div>
    </div>
</template>
@@ -93,12 +79,6 @@
            defaultProps: {
                children: 'children',
                label: 'label'
            },
            // 配置列表
            config: {
                list: [
                    {name: ''}
                ]
            },
        };
    },
@@ -138,6 +118,9 @@
        getAllColumns() {
            var data = this.$route.query
        },
        handleChange(file, fileList) {
            this.fileList = fileList.slice(-3);
        }
    }
}
</script>
@@ -162,25 +145,42 @@
    background-size: 100%;
    margin-right: 5px;
}
/*/deep/ .el-tree-node__expand-icon{*/
/*    background: url(../../../../assets/shu_ic_wzk.png) no-repeat;*/
/*    width: 5px;*/
/*    height: 5px;*/
/*    background-size: 100%;*/
/*    margin-right: 5px;*/
/*}*/
/*/deep/ .expanded{*/
/*    background: url(../../../../assets/shu_ic_zk.png) no-repeat;*/
/*    width: 5px;*/
/*    height: 5px;*/
/*    background-size: 100%;*/
/*    margin-right: 5px;*/
/*    transform: rotate(0deg) !important;*/
/*}*/
/deep/ .el-icon-caret-right:before{
    content: '';
}
.right-table{
    width: 80%;
    width: 85%;
}
table,table tr th, table tr td {
    border:1px solid #ccc;
}
.table_td{
    background: #e4edf4;
}
.table_tr{
    background: #e4edf4;
    line-height: 40px;
    height: 40px;
}
table{
    width: 100%;
    border-collapse: collapse;
    font-size: 14px;
}
.input{
    background: #f9f9f9;
    border-width: 1px;
    margin: 5px 0;
}
.btn{
    background: url(../../assets/btn.gif) no-repeat;
    width: 76px;
    height: 26px;
    line-height: 26px;
    font-size: 14px;
    border: none;
    color: #fff;
    cursor: pointer;
    overflow: visible;
}
</style>

 src/views/oneFromanother/inspectionNotExist.vue

对比新文件
@@ -0,0 +1,68 @@
<template>
    <div>
        <table border="1" style="background: #FFFFFF;width: 50%;">
            <tr>
                <td class="table_td" style="text-align: right;">自查人:</td>
                <td><input class="input" style="line-height: 24px;height: 24px;"></td>
            </tr>
            <tr>
                <td class="table_td" style="text-align: right;">自查时间:</td>
                <td><input class="input" id="meeting" type="date" style="line-height: 24px;height: 24px;"/></td>
            </tr>
            <tr>
                <td class="table_td" style="text-align: right;">备注:</td>
                <td>
                    <textarea class="input" rows="7" cols="80">我是⼀个⽂本框，可以输⼊任意长度的⽂本
                    </textarea>
                </td>
            </tr>
            <tr class="table_tr">
                <td colspan="4" align="center">
                    <button class="btn">保存</button>
                    <button class="btn">关闭</button>
                </td>
            </tr>
        </table>
    </div>
</template>

<script>
export default {
    name: "inspectionNotExist"
}
</script>

<style scoped>
table,table tr th, table tr td {
    border:1px solid #ccc;
}
.table_td{
    background: #e4edf4;
}
.table_tr{
    background: #e4edf4;
    line-height: 40px;
    height: 40px;
}
table{
    width: 400px;
    border-collapse: collapse;
    font-size: 14px;
}
.input{
    background: #f9f9f9;
    border-width: 1px;
    margin: 5px 0;
}
.btn{
    background: url(../../assets/btn.gif) no-repeat;
    width: 76px;
    height: 26px;
    line-height: 26px;
    font-size: 14px;
    border: none;
    color: #fff;
    cursor: pointer;
    overflow: visible;
}
</style>

 src/views/oneFromanother/send.vue

对比新文件
@@ -0,0 +1,108 @@
<template>
    <div>
        <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
        <el-dialog
            title="责任单位"
            :visible.sync="dialogVisible"
            width="37%"
            :before-close="handleClose">
            <el-checkbox-group v-model="checkList">
                <el-checkbox label="安全环保部"></el-checkbox>
                <el-checkbox label="生产技术部 "></el-checkbox>
                <el-checkbox label="机电部"></el-checkbox>
                <el-checkbox label="企管部"></el-checkbox>
                <el-checkbox label="消防保卫部"></el-checkbox>

                <el-checkbox label="质检中心"></el-checkbox>
                <el-checkbox label="市场开发部"></el-checkbox>
                <el-checkbox label="综合办公室"></el-checkbox>
                <el-checkbox label="工程部 "></el-checkbox>
                <el-checkbox label="财务部"></el-checkbox>

                <el-checkbox label="党群工作部"></el-checkbox>
                <el-checkbox label="纪检监察部"></el-checkbox>
                <el-checkbox label="化产一车间"></el-checkbox>
                <el-checkbox label="炼焦一车间"></el-checkbox>
                <el-checkbox label="原料一车间"></el-checkbox>

                <el-checkbox label="选煤厂"></el-checkbox>
                <el-checkbox label="电仪车间"></el-checkbox>
                <el-checkbox label="众和机电"></el-checkbox>
                <el-checkbox label="原料二车间"></el-checkbox>
                <el-checkbox label="化产二车间"></el-checkbox>

                <el-checkbox label="炼焦二车间"></el-checkbox>
                <el-checkbox label="甲醇厂"></el-checkbox>
                <el-checkbox label="干熄焦"></el-checkbox>
            </el-checkbox-group>
            <span slot="footer" class="dialog-footer">
            <el-button class="btn" type="primary" @click="dialogVisible = false">确 定</el-button>
          </span>
        </el-dialog>
    </div>
</template>

<script>
export default {
    name: "send",
    data() {
        return {
            dialogVisible: false,
            checkList: []
        };
    },
    methods: {
        handleClose(done) {
            this.$confirm('确认关闭？')
                .then(_ => {
                    done();
                })
                .catch(_ => {});
        }
    }
}
</script>

<style scoped>
/deep/ .el-dialog__header{
    text-align: center;
    padding: 50px 50px 20px 50px;
}
/deep/ .el-dialog__header .el-dialog__title {
    font-size: 12px;
    font-weight: bold;
}
/deep/ .el-dialog__body{
    text-align: center;
    padding: 30px 50px 30px 50px;
}
/deep/ .el-checkbox-group{
    display: flex;
    flex-direction: row;
    flex-wrap: wrap;
    align-items: center;
}
/deep/ .el-checkbox{
    width: 120px;
    text-align: left;
    line-height: 25px;
}
/deep/ .el-dialog__footer{
    text-align: center;
}
.btn{
    background: url(../../assets/btn.gif) no-repeat;
    width: 76px;
    height: 26px;
    line-height: 26px;
    font-size: 14px;
    border: none;
    color: #fff;
    cursor: pointer;
    overflow: visible;
    padding: 0;
}
/deep/ .el-checkbox__inner{
    border: 1px solid #000000;
}
</style>