|
|
@@ -5,7 +5,8 @@
|
|
|
<view class="lotName" :class="pageType != 0?'lotNameOne':''" v-if="lotName">{{lotName}}</view>
|
|
|
<view class="line"></view>
|
|
|
<view class="tabTitle_tow">
|
|
|
- <view class="tabTitle_tow_li" @tap="tabClickTow(item.value)" :key="index" v-for="(item,index) in tabTextTow">
|
|
|
+ <view class="tabTitle_tow_li" @tap="tabClickTow(item.value)" :key="index"
|
|
|
+ v-for="(item,index) in tabTextTow">
|
|
|
<view :class="{on:curTabTow==item.value}" class="tabTitle_tow_text">{{item.label}}</view>
|
|
|
<view :class="{on:curTabTow==item.value}" class="tabTitle_tow_across"></view>
|
|
|
</view>
|
|
|
@@ -26,13 +27,19 @@
|
|
|
</view>
|
|
|
<scroll-view scroll-y style="overflow-y: scroll;flex:1;" @scrolltolower="scrollGet" class="info-max-box">
|
|
|
<view class="list">
|
|
|
- <view class="total" :class="curTabTow == 0?'total-color-1':(curTabTow == 2?'total-color-3':(curTabTow == 1?'total-color-2':''))" v-if="pageType == 0">
|
|
|
+ <view class="total"
|
|
|
+ :class="curTabTow == 0?'total-color-1':(curTabTow == 2?'total-color-3':(curTabTow == 1?'total-color-2':''))"
|
|
|
+ v-if="pageType == 0">
|
|
|
{{curTabTow == 0?'待检查共'+total+'项':(curTabTow == 2?'检查中草稿箱共'+total+'项':(curTabTow == 1?'已检查共'+total+'项':''))}}
|
|
|
</view>
|
|
|
- <view class="total" :class="curTabTow == 0?'total-color-1':(curTabTow == 1?'total-color-2':(curTabTow == 2?'total-color-3':''))"v-if="pageType == 1">
|
|
|
+ <view class="total"
|
|
|
+ :class="curTabTow == 0?'total-color-1':(curTabTow == 1?'total-color-2':(curTabTow == 2?'total-color-3':''))"
|
|
|
+ v-if="pageType == 1">
|
|
|
{{curTabTow == 0?'待复查共'+total+'项':(curTabTow == 1?'复查完毕共'+total+'项':(curTabTow == 2?'退回整改共'+total+'项':''))}}
|
|
|
</view>
|
|
|
- <view class="total" :class="curTabTow == 2?'total-color-1':(curTabTow == 0?'total-color-2':(curTabTow == 4?'total-color-3':''))"v-if="pageType == 2">
|
|
|
+ <view class="total"
|
|
|
+ :class="curTabTow == 2?'total-color-1':(curTabTow == 0?'total-color-2':(curTabTow == 4?'total-color-3':''))"
|
|
|
+ v-if="pageType == 2">
|
|
|
{{curTabTow == 2?'待整改共'+total+'项':(curTabTow == 1?'已整改共'+total+'项':(curTabTow == 4?'暂无法整改共'+total+'项':''))}}
|
|
|
</view>
|
|
|
<view class="list-li" v-for="(item,index) in dataList" :key="index">
|
|
|
@@ -40,9 +47,9 @@
|
|
|
<view v-if="pageType == 0">
|
|
|
<img v-if="item.checkFlag==null" src="@/pages_safetyCheck/images/icon_zg_zh@1x.png">
|
|
|
<img v-if="item.checkFlag==false" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
|
|
|
- <img v-if="item.checkFlag==true" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
|
|
|
+ <img v-if="item.checkFlag==true" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
|
|
|
</view>
|
|
|
- <view >{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
|
|
|
+ <view>{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
|
|
|
</view>
|
|
|
<view v-if="item.hazardCheckId" class="list-li-b" @click="hiddenDangerClick(item)">
|
|
|
此检查项在当前实验室累计出现<text>{{item.hazardCheckNum}}</text>次隐患
|
|
|
@@ -56,6 +63,7 @@
|
|
|
<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
|
|
|
</scroll-view>
|
|
|
<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
|
|
|
+ <view v-if="pageType==0" @click="submitBtn()" class="sub-btn">检查完成</view>
|
|
|
</view>
|
|
|
|
|
|
</template>
|
|
|
@@ -68,6 +76,7 @@
|
|
|
securityAppCheckSetOptionList,
|
|
|
securityAppCheckDangerReviewList,
|
|
|
securityAppCheckDangerGetCheckDangerSubId,
|
|
|
+ securityAppCheckSetOptionFinishCheck,
|
|
|
} from '@/pages_safetyCheck/api/index.js'
|
|
|
import {
|
|
|
checkItemModule
|
|
|
@@ -97,31 +106,60 @@
|
|
|
pageSize: 10,
|
|
|
},
|
|
|
//符合/不符合
|
|
|
- checkFlag:null,
|
|
|
+ checkFlag: null,
|
|
|
total: 0,
|
|
|
dataList: [],
|
|
|
getDataType: false,
|
|
|
searchIndex: 0,
|
|
|
//检查项组件数据
|
|
|
- checkItemModuleType:false,
|
|
|
- propsData:{},
|
|
|
+ checkItemModuleType: false,
|
|
|
+ propsData: {},
|
|
|
}
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
let optionData = JSON.parse(decodeURIComponent(option.infoData));
|
|
|
uni.setNavigationBarTitle({
|
|
|
- title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData.subRoom) + ')'
|
|
|
+ title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
|
|
|
+ .subRoom) + ')'
|
|
|
})
|
|
|
this.$set(this, 'pageType', optionData.pageType);
|
|
|
this.$set(this, 'lotName',
|
|
|
optionData.pageType == 0 ? optionData.checkPlanSetVoList.checkName : (
|
|
|
- optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList.checkStartTime +
|
|
|
+ optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList
|
|
|
+ .checkStartTime +
|
|
|
'（逾期未完成整改关闭实验室）' : '整改期限' + optionData.checkPlanSetVoList.checkStartTime));
|
|
|
this.$set(this, 'tabTextTow',
|
|
|
- optionData.pageType == 0 ? [{value: '0',label: '待检查'}, {value: '2',label: '检查中'}, {value: '1',label: '已检查'}] : (
|
|
|
- optionData.pageType == 1 ? [{value: '0',label: '待复查'}, {value: '1',label: '复查完毕'}, {value: '2',label: '退回整改'}] : (
|
|
|
- optionData.pageType == 2 ? [{value: '2',label: '待整改'}, {value: '1',label: '已整改'}, {value: '4',label: '暂无法整改'}] : []
|
|
|
- )))
|
|
|
+ optionData.pageType == 0 ? [{
|
|
|
+ value: '0',
|
|
|
+ label: '待检查'
|
|
|
+ }, {
|
|
|
+ value: '2',
|
|
|
+ label: '检查中'
|
|
|
+ }, {
|
|
|
+ value: '1',
|
|
|
+ label: '已检查'
|
|
|
+ }] : (
|
|
|
+ optionData.pageType == 1 ? [{
|
|
|
+ value: '0',
|
|
|
+ label: '待复查'
|
|
|
+ }, {
|
|
|
+ value: '1',
|
|
|
+ label: '复查完毕'
|
|
|
+ }, {
|
|
|
+ value: '2',
|
|
|
+ label: '退回整改'
|
|
|
+ }] : (
|
|
|
+ optionData.pageType == 2 ? [{
|
|
|
+ value: '2',
|
|
|
+ label: '待整改'
|
|
|
+ }, {
|
|
|
+ value: '1',
|
|
|
+ label: '已整改'
|
|
|
+ }, {
|
|
|
+ value: '4',
|
|
|
+ label: '暂无法整改'
|
|
|
+ }] : []
|
|
|
+ )))
|
|
|
this.$set(this, 'curTabTow', optionData.pageType == 0 ? '0' : (optionData.pageType == 1 ? '0' : (optionData
|
|
|
.pageType == 2 ? '2' : '')));
|
|
|
this.$set(this, 'newData', optionData);
|
|
|
@@ -150,11 +188,11 @@
|
|
|
},
|
|
|
//顶部tab点击
|
|
|
tabClickTow(value) {
|
|
|
- this.$set(this,'hazardCheckPro',null);
|
|
|
- this.$set(this,'checkFlag',null);
|
|
|
- this.$set(this.queryParams,'page',1);
|
|
|
- this.$set(this,'curTabTow',value);
|
|
|
- this.$set(this,'dataList',[]);
|
|
|
+ this.$set(this, 'hazardCheckPro', null);
|
|
|
+ this.$set(this, 'checkFlag', null);
|
|
|
+ this.$set(this.queryParams, 'page', 1);
|
|
|
+ this.$set(this, 'curTabTow', value);
|
|
|
+ this.$set(this, 'dataList', []);
|
|
|
this.getList();
|
|
|
},
|
|
|
dialogOpen() {
|
|
|
@@ -164,36 +202,36 @@
|
|
|
this.dialogVisible = false;
|
|
|
},
|
|
|
//符合/不符合
|
|
|
- checkFlagChange(type){
|
|
|
- if(this.checkFlag == type){
|
|
|
- this.$set(this,'checkFlag',null);
|
|
|
- }else{
|
|
|
- this.$set(this,'checkFlag',type);
|
|
|
+ checkFlagChange(type) {
|
|
|
+ if (this.checkFlag == type) {
|
|
|
+ this.$set(this, 'checkFlag', null);
|
|
|
+ } else {
|
|
|
+ this.$set(this, 'checkFlag', type);
|
|
|
}
|
|
|
- this.$set(this.queryParams,'page',1);
|
|
|
+ this.$set(this.queryParams, 'page', 1);
|
|
|
this.getList()
|
|
|
},
|
|
|
- checkItemModuleButton(type,item){
|
|
|
- if(type == 'open'){
|
|
|
+ checkItemModuleButton(type, item) {
|
|
|
+ if (type == 'open') {
|
|
|
let obj = {
|
|
|
- infoType:this.pageType,
|
|
|
- checkType:this.curTabTow,
|
|
|
+ infoType: this.pageType,
|
|
|
+ checkType: this.curTabTow,
|
|
|
}
|
|
|
- if(this.curTabTow == 0){
|
|
|
+ if (this.curTabTow == 0) {
|
|
|
//检查
|
|
|
obj.manageId = this.newData.manageId
|
|
|
- }else if(this.curTabTow != 0){
|
|
|
+ } else if (this.curTabTow != 0) {
|
|
|
//复查/整改
|
|
|
obj.planId = this.newData.planId;
|
|
|
obj.planSetId = this.newData.planSetId;
|
|
|
obj.subId = this.newData.subId;
|
|
|
}
|
|
|
- this.$set(this,'propsData',obj);
|
|
|
- this.$set(this,'checkItemModuleType',true);
|
|
|
- }else if(type == 'out'){
|
|
|
- this.$set(this,'checkItemModuleType',false);
|
|
|
- this.$set(this,'propsData',{});
|
|
|
- }else if(type == 'submit'){
|
|
|
+ this.$set(this, 'propsData', obj);
|
|
|
+ this.$set(this, 'checkItemModuleType', true);
|
|
|
+ } else if (type == 'out') {
|
|
|
+ this.$set(this, 'checkItemModuleType', false);
|
|
|
+ this.$set(this, 'propsData', {});
|
|
|
+ } else if (type == 'submit') {
|
|
|
this.itemsClick(item);
|
|
|
}
|
|
|
},
|
|
|
@@ -201,30 +239,40 @@
|
|
|
itemsClick(row) {
|
|
|
let infoData = row;
|
|
|
infoData.pageType = this.pageType;
|
|
|
- if(this.pageType==0 && this.curTabTow==0){
|
|
|
+ infoData.itemsStatus = this.curTabTow;
|
|
|
+ if (this.pageType == 0 && this.curTabTow == 0) {
|
|
|
//待检查
|
|
|
uni.redirectTo({
|
|
|
- url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(JSON
|
|
|
+ url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(
|
|
|
+ JSON
|
|
|
.stringify(infoData))
|
|
|
});
|
|
|
- }if(this.pageType==0 && this.curTabTow==1){
|
|
|
+ }
|
|
|
+ if (this.pageType == 0 && this.curTabTow == 2) {
|
|
|
//检查中
|
|
|
+ infoData.checkName=this.newData.checkPlanSetVoList.checkName;
|
|
|
+ infoData.subName=this.newData.subName;
|
|
|
+ infoData.roomNum=this.newData.roomNum;
|
|
|
+ infoData.subRoom=this.newData.subRoom;
|
|
|
uni.redirectTo({
|
|
|
- url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' + encodeURIComponent(JSON
|
|
|
- .stringify(infoData))
|
|
|
+ url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
|
|
|
+ encodeURIComponent(JSON
|
|
|
+ .stringify(infoData))
|
|
|
});
|
|
|
- }if(this.pageType==0 && this.curTabTow==2){
|
|
|
+ }
|
|
|
+ if (this.pageType == 0 && this.curTabTow == 1) {
|
|
|
//已检查
|
|
|
uni.redirectTo({
|
|
|
- url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' + encodeURIComponent(JSON
|
|
|
- .stringify(infoData))
|
|
|
+ url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
|
|
|
+ encodeURIComponent(JSON
|
|
|
+ .stringify(infoData))
|
|
|
});
|
|
|
- }else if(this.pageType==1 && this.curTabTow==0){
|
|
|
+ } else if (this.pageType == 1 && this.curTabTow == 0) {
|
|
|
//待复查
|
|
|
- }else if(this.pageType==1 && this.curTabTow==0){
|
|
|
+ } else if (this.pageType == 1 && this.curTabTow == 0) {
|
|
|
//待整改
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
hiddenDangerClick(row) {
|
|
|
let infoData = row;
|
|
|
@@ -291,7 +339,9 @@
|
|
|
obj.planSetId = this.newData.planSetId;
|
|
|
obj.subId = this.newData.subId;
|
|
|
obj.appReviewStatus = this.curTabTow;
|
|
|
- const { data } = await securityAppCheckDangerGetCheckDangerSubId(obj);
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await securityAppCheckDangerGetCheckDangerSubId(obj);
|
|
|
if (data.code == 200) {
|
|
|
if (self.queryParams.page == 1) {
|
|
|
this.dataList = data.data.records;
|
|
|
@@ -309,7 +359,22 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+ //检查完成
|
|
|
+ async submitBtn() {
|
|
|
+ let obj = {
|
|
|
+ manageId: this.newData.manageId,
|
|
|
+ }
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await securityAppCheckSetOptionFinishCheck(obj);
|
|
|
+ if (data.code == 200) {
|
|
|
+ let infoData=this.newData;
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages_safetyCheck/views/inspectManage/inspectList?infoData=' + encodeURIComponent(JSON
|
|
|
+ .stringify(infoData))
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
}
|
|
|
}
|
|
|
@@ -500,15 +565,18 @@
|
|
|
box-sizing: border-box;
|
|
|
margin-bottom: 20rpx;
|
|
|
}
|
|
|
- .total-color-1{
|
|
|
+
|
|
|
+ .total-color-1 {
|
|
|
background: rgba(1, 131, 250, 0.2);
|
|
|
color: #0183FA;
|
|
|
}
|
|
|
- .total-color-2{
|
|
|
- background: rgba(22,181,49,0.2);
|
|
|
+
|
|
|
+ .total-color-2 {
|
|
|
+ background: rgba(22, 181, 49, 0.2);
|
|
|
color: #16B531;
|
|
|
}
|
|
|
- .total-color-3{
|
|
|
+
|
|
|
+ .total-color-3 {
|
|
|
background: #F7E0C4;
|
|
|
color: #FF8C00;
|
|
|
}
|
|
|
@@ -525,14 +593,16 @@
|
|
|
padding: 12rpx 20rpx 14rpx 14rpx;
|
|
|
box-sizing: border-box;
|
|
|
margin: 20rpx 0;
|
|
|
- >view:nth-of-type(1){
|
|
|
- >img{
|
|
|
+
|
|
|
+ >view:nth-of-type(1) {
|
|
|
+ >img {
|
|
|
width: 24rpx;
|
|
|
height: 24rpx;
|
|
|
margin-right: 30rpx;
|
|
|
}
|
|
|
}
|
|
|
- >view:nth-of-type(2){
|
|
|
+
|
|
|
+ >view:nth-of-type(2) {
|
|
|
flex: 1;
|
|
|
font-size: 24rpx;
|
|
|
color: #3D3D3D;
|
|
|
@@ -576,5 +646,20 @@
|
|
|
line-height: 100rpx;
|
|
|
text-align: center;
|
|
|
}
|
|
|
+
|
|
|
+ .sub-btn {
|
|
|
+ width: 686rpx;
|
|
|
+ height: 100rpx;
|
|
|
+ background: #0183FA;
|
|
|
+ border-radius: 50rpx 50rpx 50rpx 50rpx;
|
|
|
+ position: fixed;
|
|
|
+ left: 30rpx;
|
|
|
+ bottom: 30rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ font-size: 30rpx;
|
|
|
+ color: #FFFFFF;
|
|
|
+ line-height: 100rpx;
|
|
|
+ text-align: center;
|
|
|
+ }
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
heyang