Merge branch 'VERSIONS-AnQuanJianCha' into leb-web-dev

src/views/safetyCheck/components/checkItem.vue

@@ -25,10 +25,10 @@
                 :show-all-levels="false"
                 :options="cascaderData"
                 :props="{ value: 'id', label: 'labelName',emitPath:false }"
-                ></el-cascader>
+              ></el-cascader>
             </el-form-item>
-            <el-form-item label="" prop="checkFlag">
-              <el-select v-model="queryParams.checkFlag" placeholder="检查结果" style="width: 200px">
+            <el-form-item label="" prop="checkFlagInt" v-if="checkFlagIntType">
+              <el-select v-model="queryParams.checkFlagInt" placeholder="检查结果" style="width: 200px">
                 <el-option
                   v-for="dict in optionList"
                   :key="dict.value"
@@ -65,7 +65,7 @@
         <div class="page-content-box" style="padding-top:0;">
           <el-table class="table-box" border :data="dataList">
             <el-table-column label="序号" type="index" width="60"/>
-            <el-table-column label="检查项目" prop="name"  show-overflow-tooltip>
+            <el-table-column label="检查项目" prop="name" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{scope.row.hazardCheckCode}} {{scope.row.hazardCheckName}}</span>
               </template>
@@ -78,26 +78,26 @@
             </el-table-column>
             <el-table-column label="检查结果" prop="checkFlag" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">{{scope.row.checkDraftVo.checkFlag?'符合':'不符合'}}</span>
-                <span v-else>{{scope.row.checkStatus!=1?'-':(scope.row.checkFlag?'符合':'不符合')}}</span>
+                <span>{{scope.row.checkStatus!=1?'-':(scope.row.checkFlag?'符合':'不符合')}}</span>
               </template>
             </el-table-column>
             <el-table-column label="检查人" prop="checkUserName" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">{{scope.row.checkDraftVo.checkUserName}}</span>
+                <span
+                  v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">{{scope.row.checkDraftVo.checkUserName}}</span>
                 <span v-else>{{scope.row.checkUserName}}</span>
               </template>
             </el-table-column>
             <el-table-column label="检查时间" prop="createTime" width="180" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">{{ parseTime(scope.row.checkDraftVo.checkTime,"{y}-{m}-{d} {h}:{i}") }}</span>
-                <span v-else>{{ parseTime(scope.row.checkTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+                <span v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">{{ parseTime(scope.row.checkDraftVo.checkTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                <span v-else>{{ parseTime(scope.row.checkTime,'{y}-{m}-{d} {h}:{i}') }}</span>
               </template>
             </el-table-column>
             <el-table-column label="状态" prop="checkStatus" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">检查中</span>
-                <span v-else>{{scope.row.checkStatus == '0'?'未开始':(scope.row.checkStatus == '1'?'已完成':(scope.row.checkStatus == '2'?'检查中':''))}}</span>
+                <span v-else>{{scope.row.checkStatus == '0'?'未开始':(scope.row.checkStatus == '1'?'已完成':'')}}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="150" show-overflow-tooltip>
@@ -118,13 +118,13 @@
                   >开始检查</p>
                   <!-- 校级 -->
                   <p class="table-button-p"
-                     v-if="((scope.row.checkStatus == 1 && !checkSetType)||scope.row.checkStatus == 2) && propsData.pageType == 1"
+                     v-if="(scope.row.checkStatus == 1 && !checkSetType) && propsData.pageType == 1"
                      @click="tableButton(3,scope.row)"
                      v-hasPermiRouter="['security:checkPlan:detail']"
                   >编辑</p>
                   <!-- 院级 -->
                   <p class="table-button-p"
-                     v-if="((scope.row.checkStatus == 1 && !checkSetType)||scope.row.checkStatus == 2) && propsData.pageType == 2"
+                     v-if="(scope.row.checkStatus == 1 && !checkSetType) && propsData.pageType == 2"
                      @click="tableButton(3,scope.row)"
                      v-hasPermiRouter="['security:checkPlan_1:detail']"
                   >编辑</p>
@@ -158,180 +158,198 @@
   import {
     securityCheckOptionList,
     securityCheckSetOptionList,
-    securityCheckPlanSetFindProgress,
+    securityCheckPlanSetFindProgress
   } from '@/api/safetyCheck/index'
-  import initiateInspect from "@/views/safetyCheck/components/initiateInspect/initiateInspect.vue";
+  import initiateInspect from '@/views/safetyCheck/components/initiateInspect/initiateInspect.vue'
+
   export default {
     name: 'checkItem',
     components: {
       initiateInspect
     },
-    props:{
-      propsData:{},
+    props: {
+      propsData: {}
     },
-    data(){
-      return{
+    data() {
+      return {
         //页面状态
-        pageType:1,
+        pageType: 1,
         //状态选项卡
-        checkStatus:null,
+        checkStatus: null,
+        checkFlagIntType: true,
         //下拉列表数据
-        optionList:[
-          {value:1,label:'符合'},
-          {value:0,label:'不符合'},
+        optionList: [
+          { value: 1, label: '符合' },
+          { value: 0, label: '不符合' },
+          { value: 2, label: '草稿' }
         ],
-        cascaderData:[],
+        cascaderData: [],
         //查询条件
-        queryParams:{
-          page:1,
-          pageSize:20,
-          hazardCheckPro:null,
-          checkFlag :null,
-          checkUserName :'',
+        queryParams: {
+          page: 1,
+          pageSize: 20,
+          hazardCheckPro: null,
+          checkFlagInt: null,
+          checkUserName: ''
         },
         //时间数据
-        dateRange:[],
+        dateRange: [],
         //列表数据
-        dataList:[],
+        dataList: [],
         //数据数量
-        total:0,
+        total: 0,
         //批次是否完成
-        checkSetType:false,
+        checkSetType: false,
         //组件传参
-        initiateInspectData:{},
+        initiateInspectData: {}
       }
     },
-    created(){
-      this.securityCheckOptionList();
-      this.securityCheckPlanSetFindProgress();
+    created() {
+      this.securityCheckOptionList()
+      this.securityCheckPlanSetFindProgress()
     },
-    mounted(){
+    mounted() {
 
     },
-    methods:{
+    methods: {
       //选项卡切换
-      tableCheck(type){
-        if (this.checkStatus !== type){
-          this.$set(this,'checkStatus',type);
-          this.resetQuery();
+      tableCheck(type) {
+        if (this.checkStatus !== type) {
+          if (type == null) {
+            //全部
+            this.$set(this, 'optionList',[{ value: 1, label: '符合' },{ value: 0, label: '不符合' },{ value: 2, label: '草稿' }])
+            this.$set(this, 'checkFlagIntType',true)
+          } else if (type == 0) {
+            //待检查
+            this.$set(this, 'checkFlagIntType',false)
+          } else if (type == 2) {
+            //草稿
+            this.$set(this, 'checkFlagIntType',false)
+          } else if (type == 1) {
+            //已检查
+            this.$set(this, 'optionList', [{ value: 1, label: '符合' },{ value: 0, label: '不符合' }])
+            this.$set(this, 'checkFlagIntType',true)
+          }
+          this.$set(this, 'checkStatus', type)
+          this.resetQuery()
         }
       },
       // 返回按钮
-      backPage(){
-        this.$parent.tableButton(6);
+      backPage() {
+        this.$parent.tableButton(6)
       },
       //查询按钮
-      handleQuery(){
-        this.$set(this.queryParams,'page',1);
-        this.securityCheckPlanSetFindProgress();
+      handleQuery() {
+        this.$set(this.queryParams, 'page', 1)
+        this.securityCheckPlanSetFindProgress()
       },
       //重置按钮
-      resetQuery(){
-        this.$set(this,'dateRange',[])
-        this.$set(this,'queryParams',{
-          page:1,
-          pageSize:20,
-          hazardCheckPro:null,
-          checkFlag :null,
-          checkUserName :'',
-        });
-        this.securityCheckPlanSetFindProgress();
+      resetQuery() {
+        this.$set(this, 'dateRange', [])
+        this.$set(this, 'queryParams', {
+          page: 1,
+          pageSize: 20,
+          hazardCheckPro: null,
+          checkFlagInt: null,
+          checkUserName: ''
+        })
+        this.securityCheckPlanSetFindProgress()
       },
       //获取数据列表
-      getList(){
+      getList() {
         let obj = JSON.parse(JSON.stringify(this.queryParams))
-        if(this.dateRange[0]){
-          obj.startTime = this.dateRange[0]+'T00:00:00'
-          obj.endTime = this.dateRange[1]+'T23:59:59'
-        }else{
-          obj.startTime = "";
-          obj.endTime = "";
+        if (this.dateRange[0]) {
+          obj.startTime = this.dateRange[0] + 'T00:00:00'
+          obj.endTime = this.dateRange[1] + 'T23:59:59'
+        } else {
+          obj.startTime = ''
+          obj.endTime = ''
         }
         obj.manageId = this.propsData.manageId
         obj.checkStatus = this.checkStatus
         securityCheckSetOptionList(obj).then(response => {
-          this.$set(this,'dataList',response.data.records);
-          this.$set(this,'total',response.data.total);
-        });
+          this.$set(this, 'dataList', response.data.records)
+          this.$set(this, 'total', response.data.total)
+        })
       },
       //查询检查批次是否完成
-      securityCheckPlanSetFindProgress(){
-        securityCheckPlanSetFindProgress({planSetId:this.propsData.planSetId}).then(response => {
-          this.$set(this,'checkSetType',response.data);
-          this.getList();
-        });
+      securityCheckPlanSetFindProgress() {
+        securityCheckPlanSetFindProgress({ planSetId: this.propsData.planSetId }).then(response => {
+          this.$set(this, 'checkSetType', response.data)
+          this.getList()
+        })
       },
       //检查项列表
-      securityCheckOptionList(){
+      securityCheckOptionList() {
         securityCheckOptionList({}).then(response => {
-          let list = this.getCascaderData(response.data);
-          this.$set(this,'cascaderData',list);
-        });
+          let list = this.getCascaderData(response.data)
+          this.$set(this, 'cascaderData', list)
+        })
       },
-      getCascaderData(list){
-        let self = this;
-        for(let i=0;i<list.length;i++){
-          list[i].labelName = list[i].code? list[i].code +' '+ list[i].name:list[i].name
-          if(list[i].children){
-            if(list[i].children[0]){
-              list[i].children = self.getCascaderData(list[i].children);
-            }else{
-              if(list[i].level != 3){
-                list.splice(i,1);
+      getCascaderData(list) {
+        let self = this
+        for (let i = 0; i < list.length; i++) {
+          list[i].labelName = list[i].code ? list[i].code + ' ' + list[i].name : list[i].name
+          if (list[i].children) {
+            if (list[i].children[0]) {
+              list[i].children = self.getCascaderData(list[i].children)
+            } else {
+              if (list[i].level != 3) {
+                list.splice(i, 1)
                 i--
-              }else{
+              } else {
                 delete list[i].children
               }
             }
-          }else{
-            if(list[i].level != 3){
-              list.splice(i,1);
+          } else {
+            if (list[i].level != 3) {
+              list.splice(i, 1)
               i--
-            }else{
+            } else {
               delete list[i].children
             }
           }
         }
-        for(let i=0;i<list.length;i++){
-          list[i].labelName = list[i].code? list[i].code +' '+ list[i].name:list[i].name
-          if(list[i].children){
-            if(list[i].children[0]){
-              list[i].children = self.getCascaderData(list[i].children);
-            }else{
-              if(list[i].level != 3){
-                list.splice(i,1);
+        for (let i = 0; i < list.length; i++) {
+          list[i].labelName = list[i].code ? list[i].code + ' ' + list[i].name : list[i].name
+          if (list[i].children) {
+            if (list[i].children[0]) {
+              list[i].children = self.getCascaderData(list[i].children)
+            } else {
+              if (list[i].level != 3) {
+                list.splice(i, 1)
                 i--
-              }else{
+              } else {
                 delete list[i].children
               }
             }
-          }else{
-            if(list[i].level != 3){
-              list.splice(i,1);
+          } else {
+            if (list[i].level != 3) {
+              list.splice(i, 1)
               i--
-            }else{
+            } else {
               delete list[i].children
             }
           }
         }
-        for(let i=0;i<list.length;i++){
-          list[i].labelName = list[i].code? list[i].code +' '+ list[i].name:list[i].name
-          if(list[i].children){
-            if(list[i].children[0]){
-              list[i].children = self.getCascaderData(list[i].children);
-            }else{
-              if(list[i].level != 3){
-                list.splice(i,1);
+        for (let i = 0; i < list.length; i++) {
+          list[i].labelName = list[i].code ? list[i].code + ' ' + list[i].name : list[i].name
+          if (list[i].children) {
+            if (list[i].children[0]) {
+              list[i].children = self.getCascaderData(list[i].children)
+            } else {
+              if (list[i].level != 3) {
+                list.splice(i, 1)
                 i--
-              }else{
+              } else {
                 delete list[i].children
               }
             }
-          }else{
-            if(list[i].level != 3){
-              list.splice(i,1);
+          } else {
+            if (list[i].level != 3) {
+              list.splice(i, 1)
               i--
-            }else{
+            } else {
               delete list[i].children
             }
           }
@@ -339,117 +357,117 @@
         return list
       },
       //操作按钮
-      tableButton(type,row){
-        let self = this;
-        if(type == 1){
+      tableButton(type, row) {
+        let self = this
+        if (type == 1) {
           //开始检查
-          this.$set(this,'pageType',2);
+          this.$set(this, 'pageType', 2)
           let obj = JSON.parse(JSON.stringify(row))
-          obj.manageId = this.propsData.manageId;
-          obj.showType = false;
-          obj.orderTitle = '开始检查';
-          obj.orderType = '1';
-          this.$set(this,'initiateInspectData',obj);
-        }else if(type == 2){
+          obj.manageId = this.propsData.manageId
+          obj.showType = false
+          obj.orderTitle = '开始检查'
+          obj.orderType = '1'
+          this.$set(this, 'initiateInspectData', obj)
+        } else if (type == 2) {
           //详情
-          this.$set(this,'pageType',2);
+          this.$set(this, 'pageType', 2)
           let obj = JSON.parse(JSON.stringify(row))
-          obj.manageId = this.propsData.manageId;
-          obj.showType = true;
-          obj.orderTitle = '检查详情';
-          obj.orderType = '2';
-          this.$set(this,'initiateInspectData',obj);
-        }else if(type == 3){
+          obj.manageId = this.propsData.manageId
+          obj.showType = true
+          obj.orderTitle = '检查详情'
+          obj.orderType = '2'
+          this.$set(this, 'initiateInspectData', obj)
+        } else if (type == 3) {
           //编辑
-          this.$set(this,'pageType',2);
+          this.$set(this, 'pageType', 2)
           let obj = JSON.parse(JSON.stringify(row))
-          obj.manageId = this.propsData.manageId;
-          obj.showType = false;
-          obj.orderType = '1';
-          this.$set(this,'initiateInspectData',obj);
-        }else if(type == 6){
+          obj.manageId = this.propsData.manageId
+          obj.showType = false
+          obj.orderType = '1'
+          this.$set(this, 'initiateInspectData', obj)
+        } else if (type == 6) {
           //返回并刷新
-          this.$set(this,'pageType',1);
-          this.securityCheckPlanSetFindProgress();
+          this.$set(this, 'pageType', 1)
+          this.securityCheckPlanSetFindProgress()
         }
-      },
-    },
+      }
+    }
   }
 </script>
 
 <style scoped lang="scss">
-  .checkItem{
-    .content-box{
-      flex:1;
+  .checkItem {
+    .content-box {
+      flex: 1;
       display: flex;
       flex-direction: column;
       overflow: hidden;
-      .table-school-college-toggle-box{
+      .table-school-college-toggle-box {
         overflow: hidden;
         display: inline-block;
-        margin-right:10px;
-        p{
+        margin-right: 10px;
+        p {
           display: inline-block;
           text-align: center;
-          width:80px;
-          line-height:40px;
-          height:40px;
-          color:#333;
+          width: 80px;
+          line-height: 40px;
+          height: 40px;
+          color: #333;
           background-color: #fff;
-          border:1px solid #E0E0E0;
-          font-size:14px;
+          border: 1px solid #E0E0E0;
+          font-size: 14px;
           cursor: pointer;
         }
-        p:nth-child(1){
+        p:nth-child(1) {
           border-top-left-radius: 4px;
           border-bottom-left-radius: 4px;
           /*border-right:none;*/
         }
-        p:nth-child(4){
+        p:nth-child(4) {
           border-top-right-radius: 4px;
           border-bottom-right-radius: 4px;
           /*border-left:none;*/
         }
-        .p-check{
-          border:1px solid #0183FA;
+        .p-check {
+          border: 1px solid #0183FA;
           background-color: #0183FA;
-          color:#fff;
+          color: #fff;
         }
       }
-      .form-button-max-big-box-me{
+      .form-button-max-big-box-me {
         display: inline-block;
         overflow: hidden;
-        margin-right:10px;
-        .form-button-big-box-me{
+        margin-right: 10px;
+        .form-button-big-box-me {
           display: flex;
-          div{
+          div {
             position: relative;
-            height:40px;
-            width:100px;
+            height: 40px;
+            width: 100px;
             line-height: 40px;
             text-align: center;
-            color:#999;
-            font-size:14px;
-            border:1px solid #999;
-            border-radius:4px;
-            font-weight:500;
+            color: #999;
+            font-size: 14px;
+            border: 1px solid #999;
+            border-radius: 4px;
+            font-weight: 500;
             cursor: pointer;
-            .icon-p-me{
-              width:15px;
-              height:15px;
-              line-height:15px;
+            .icon-p-me {
+              width: 15px;
+              height: 15px;
+              line-height: 15px;
               text-align: center;
               position: absolute;
-              right:0;
-              bottom:0;
-              color:#fff;
+              right: 0;
+              bottom: 0;
+              color: #fff;
               background: #0183fa;
-              border-top-left-radius:4px;
+              border-top-left-radius: 4px;
             }
           }
-          .checkDiv-me{
-            color:#0183FA!important;
-            border:1px solid #0183FA!important;
+          .checkDiv-me {
+            color: #0183FA !important;
+            border: 1px solid #0183FA !important;
           }
         }
       }