shj
2022-05-16 dc3640ed779c020e1fe931a504e76b74fc02394c
举一反三
已重命名1个文件
已修改5个文件
202 ■■■■■ 文件已修改
src/permission.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Issuedbysuperiors/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/oneFromanother/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/oneFromanotherN/existN.vue 153 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/oneFromanotherN/index.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/permission.js
@@ -16,7 +16,7 @@
  if (!permissionRoles) return true
  return roles.some(role => permissionRoles.indexOf(role) >= 0)
}
const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN']// no redirect whitelist
const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN','/existN','/exist']// no redirect whitelist
router.beforeEach((to, from, next) => {
  NProgress.start() // start progress bar
src/router/index.js
@@ -387,6 +387,11 @@
                component: () => import('@/views/oneFromanotherN'),
                meta: { title: '内部举一反三', icon: '' }
            },
            {
                path: '/existN',
                component: () => import('@/views/oneFromanotherN/existN'),
                hidden: true
            },
          ]
      }
]
src/views/Issuedbysuperiors/index.vue
@@ -192,7 +192,7 @@
            <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
            <el-table-column prop="warningLevel" label="初始警情" align="center"> </el-table-column>
            <el-table-column prop="curWarningLevel" label="当前警情" align="center"> </el-table-column>
            <el-table-column prop="date" label="流程操作" align="center"  fixed="right">
            <el-table-column prop="date" label="流程操作" v-if="radio1=='待发送'" align="center"  fixed="right">
                <template slot-scope="scope">
                    <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
                </template>
src/views/oneFromanother/index.vue
@@ -76,8 +76,11 @@
            <el-radio-button label="已自查">已自查</el-radio-button>
          </el-radio-group>
            </el-col>
            <el-col :span="14" style="text-align:right;">
            <el-col :span="14" v-if="radio1=='待自查'" style="text-align:right;">
                <el-button class="btns" type="primary" size="small" @click="sendBath()">管理专业</el-button>
            </el-col>
              <el-col :span="14" v-if="radio1=='已自查'" style="text-align:right;">
                <el-button class="btns" type="primary" size="small" @click="sendBath()">撤销</el-button>
            </el-col>
        </el-row>
         <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
@@ -99,8 +102,8 @@
            <el-table-column prop="date" label="流程操作" align="center">
                <template slot-scope="scope">
                    <el-button @click="handleClick(scope.row)" type="text"  size="small">不存在</el-button>
                    <el-button @click="handleClick(scope.row)" type="text" v-if="false" size="small">追查结果</el-button>
                    <el-button @click="handleClick(scope.row,'存在')" type="text" size="small">存在</el-button>
                    <el-button @click="handleClick(scope.row)" type="text" v-if="radio1=='已自查'" size="small">追查结果</el-button>
                    <el-button @click="handleClick(scope.row,'存在')" type="text"  v-if="radio1=='待自查'" size="small">存在</el-button>
                </template>
            </el-table-column>
        </el-table>
src/views/oneFromanotherN/existN.vue
文件名从 src/views/oneFromanotherN/exist.vue 修改
@@ -24,21 +24,7 @@
                </el-date-picker>
              </el-form-item>
            </el-col>
            <el-col :span="9" :offset="4">
              <el-form-item label="班次" prop="check_class">
                  <el-select v-model="ruleForm.check_class" placeholder="请选择"  style="width: 100%">
                      <el-option
                          v-for="item in BCList"
                          :key="item.value"
                          :label="item.value"
                          :value="item.value">
                      </el-option>
                  </el-select>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="9">
             <el-col :span="9">
              <el-form-item label="检查类别" prop="checktype">
                  <el-select v-model="ruleForm.checktype" placeholder="请选择"  style="width: 100%">
                      <el-option
@@ -50,7 +36,9 @@
                  </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="9" :offset="4">
          </el-row>
          <el-row>
            <el-col :span="9" >
              <el-form-item label="检查单位" prop="check_main_branch">
                  <el-select v-model="ruleForm.check_main_branch" placeholder="请选择"  @change="changeJCDW"  style="width: 100%">
                      <el-option
@@ -64,7 +52,7 @@
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
          <!-- <el-row>
            <el-col :span="9">
              <el-form-item label="检查人员" prop="check_man">
                <el-input v-model="ruleForm.check_man"></el-input>
@@ -75,16 +63,16 @@
                <el-input v-model="ruleForm.acc_man"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
          </el-row> -->
            <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> -->
            <!-- <el-row style="margin-bottom: 20px" v-if="addShow">
                <el-col :span="9">
@@ -94,18 +82,18 @@
                <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_branch"  align="center" label="隐患部门"></el-table-column> -->
                    <el-table-column prop="address"  align="center" label="隐患地点"></el-table-column>
                    <el-table-column prop="ht_content"  align="center" label="隐患内容"></el-table-column>
                    <el-table-column prop="measure"  align="center" label="整改措施"></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>
                    <el-table-column prop="DTRisk_level"  align="center" label="风险等级"></el-table-column>
                    <!-- <el-table-column prop="dangerousSource"  align="center" label="关联危险源"></el-table-column>
                    <el-table-column prop="DTRisk_level"  align="center" label="风险等级"></el-table-column> -->
                    <el-table-column prop="ht_level"  align="center" label="隐患级别"></el-table-column>
                    <el-table-column prop="alter_time"  align="center" label="限改时间"></el-table-column>
                    <!-- <el-table-column prop="alter_time"  align="center" label="限改时间"></el-table-column>
                    <el-table-column prop="duty_officer"  align="center" label="责任人"></el-table-column>
                    <el-table-column prop="alter_status"  align="center" label="整改情况"></el-table-column>
                    <el-table-column prop="Review"  align="center" label="业务科室"></el-table-column>
                    <el-table-column prop="Review"  align="center" label="业务科室"></el-table-column> -->
                    <el-table-column prop="time" label="操作" align="center" width="140">
                        <template slot-scope="scope">
                            <div style="display: flex;align-items: center;flex-direction: row;">
@@ -148,38 +136,20 @@
          <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px">
              <el-row>
                  <el-col :span="9">
                      <el-form-item label="隐患部门" prop="ht_branch">
                          <el-select v-model="dangerForm.ht_branch" placeholder="请选择">
                              <el-option
                                  v-for="item in YHBMList"
                                  :key="item.branch_id"
                                  :label="item.branch_name"
                                  :value="item.branch_name">
                              </el-option>
                          </el-select>
                      <el-form-item label="隐患地点" prop="address">
                          <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
                      </el-form-item>
                  </el-col>
                  <el-col :span="9" :offset="4">
                      <el-form-item label="地点" prop="address">
                          <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
                  <el-col :span="9" offset="4">
                      <el-form-item label="隐患内容" prop="ht_content">
                          <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row>
                  <el-col :span="9">
                      <el-form-item label="隐患内容" prop="ht_content">
                          <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
                      </el-form-item>
                  </el-col>
                  <el-col :span="9" :offset="4">
                      <el-form-item label="整改措施" prop="measure">
                          <el-input v-model="dangerForm.measure" rows="3" type="textarea" class="multiline"></el-input>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row>
                  <el-col :span="9">
                 <el-col :span="9">
                      <el-form-item label="隐患类别" prop="ht_typesub">
                          <el-select v-model="dangerForm.ht_typesub" placeholder="请选择">
                              <el-option
@@ -192,26 +162,6 @@
                      </el-form-item>
                  </el-col>
                  <el-col :span="9" :offset="4">
                      <el-form-item label="关联危险源" prop="DTRisk_bankId">
                          <el-select v-model="dangerForm.DTRisk_bankId" placeholder="请选择" @change="changeWxy" filterable>
                              <el-option
                                  v-for="item in dangerList"
                                  :key="item.id"
                                  :label="item.mriskPoint"
                                  :value="item.id">
                              </el-option>
                          </el-select>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row>
                  <el-col :span="9">
                      <el-form-item label="风险等级" prop="DTRisk_level">
                          <el-input v-model="dangerForm.DTRisk_level" :disabled="true"></el-input>
                      </el-form-item>
                  </el-col>
                  <el-col :span="9" :offset="4">
                      <el-form-item label="隐患级别" prop="ht_level">
                          <el-select v-model="dangerForm.ht_level" placeholder="请选择">
                              <el-option
@@ -219,65 +169,6 @@
                                  :key="item.value"
                                  :label="item.label"
                                  :value="item.value">
                              </el-option>
                          </el-select>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row>
                  <el-col :span="9">
                      <el-form-item label="限改时间" prop="alter_time">
                          <el-date-picker
                              v-model="dangerForm.alter_time"
                              type="date"
                              value-format="yyyy-MM-dd"
                              placeholder="选择日期"
                              style="width: 100%"
                          >
                          </el-date-picker>
                      </el-form-item>
                  </el-col>
                  <el-col :span="9" :offset="4">
                      <el-form-item label="责任人" prop="duty_officer">
                          <el-input v-model="dangerForm.duty_officer"></el-input>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row>
                  <el-col :span="9">
                      <el-form-item label="整改情况" prop="alter_status">
                          <el-select v-model="dangerForm.alter_status" placeholder="请选择">
                              <el-option
                                  v-for="item in statusList"
                                  :key="item.value"
                                  :label="item.label"
                                  :value="item.value">
                              </el-option>
                          </el-select>
                      </el-form-item>
                  </el-col>
                  <el-col :span="9" :offset="4">
                      <el-form-item label="业务科室" prop="Review">
                          <el-select v-model="dangerForm.Review" style="width: 100%">
                              <el-option
                                  v-for="item in YWKSList"
                                  :key="item.value"
                                  :label="item.label"
                                  :value="item.value">
                              </el-option>
                          </el-select>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row v-if="dangerForm.alter_status=='重复反弹隐患'">
                  <el-col :span="9">
                      <el-form-item label="重复反弹隐患" prop="repeatId">
                          <el-select v-model="dangerForm.repeatId" placeholder="请选择">
                              <el-option
                                  v-for="item in reboundList"
                                  :key="item.id"
                                  :label="item.content"
                                  :value="item.id">
                              </el-option>
                          </el-select>
                      </el-form-item>
src/views/oneFromanotherN/index.vue
@@ -77,13 +77,16 @@
          </el-radio-group>
          <el-button class="btns" type="primary" size="small">进入自查(3)</el-button>
            </el-col>
            <el-col :span="14" style="text-align:right;">
                <el-button class="btns" type="primary" size="small" icon="el-icon-upload2" @click="sendBath()">发送</el-button>
                <el-button class="btns" type="primary" size="small" icon="el-icon-plus">添加</el-button>
            <el-col :span="14" style="text-align:right;" v-if="radio1=='待发送'">
                <el-button class="btns" type="primary" size="small" icon="el-icon-upload2" >发送</el-button>
                <el-button class="btns" type="primary" size="small" icon="el-icon-plus" @click="sendBath()">添加</el-button>
                <el-button size="small" >批量删除</el-button>
            </el-col>
             <el-col :span="14" style="text-align:right;" v-if="radio1=='已发送'">
                <el-button class="btns" type="primary" size="small" >收回</el-button>
            </el-col>
        </el-row>
         <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
         <el-table ref="dataTable" v-if="radio1=='待发送'" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
            <el-table-column type="selection" width="55" align="center"></el-table-column>
          <el-table-column prop="check_date" label="检查时间" width="120" align="center">
                    <template slot-scope="scope">
@@ -105,6 +108,24 @@
                    <el-button @click="handleClick(scope.row)" type="text" size="small">删除</el-button>
                </template>
            </el-table-column>
        </el-table>
            <el-table ref="dataTable" v-if="radio1=='已发送'" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
            <el-table-column type="selection" width="55" align="center"></el-table-column>
          <el-table-column prop="check_date" label="检查时间" width="120" align="center">
                    <template slot-scope="scope">
                        <label>{{ formatDate(scope.row.check_date)}}</label><br/>
                        <label>{{ scope.row.check_class}}</label>
                    </template>
                </el-table-column>
            <el-table-column prop="check_branch" label="检查单位" align="center"></el-table-column>
            <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
                <el-table-column prop="measure" label="被检单位" align="center"></el-table-column>
            <el-table-column prop="date" label="隐患类别" align="center"></el-table-column>
            <el-table-column prop="DTRisk_level" label="隐患级别" align="center"></el-table-column>
            <el-table-column prop="warningLevel" label="隐患地点" align="center"></el-table-column>
            <el-table-column prop="curWarningLevel" label="隐患内容" width="200" align="center"></el-table-column>
            <el-table-column prop="curWarningLevel" label="发送单位" align="center"></el-table-column>
            <el-table-column prop="date" label="未自查单位" align="center"></el-table-column>
        </el-table>
        <div style="text-align: right">
            <el-pagination
@@ -135,7 +156,7 @@
        methods:{
            sendBath(){
                this.$router.push({
                    path:'/manage'
                    path:'/existN'
                })
            },
            handleClick(data,val){