|
|
@@ -141,7 +141,7 @@
|
|
|
</view>
|
|
|
<view class="content-right" v-else-if="infoStatus === 2">
|
|
|
<view class="d-flex a-center j-sb u-m-t-42 u-m-b-10 w-100">
|
|
|
- <view class="d-flex a-center f-24" style="width: 60%; height: 28rpx">
|
|
|
+ <view class="d-flex a-center f-24" style="width: 50%; height: 28rpx">
|
|
|
<image
|
|
|
class="flex-shrink"
|
|
|
src="../../static/return.png"
|
|
|
@@ -155,7 +155,16 @@
|
|
|
>{{ recordName }}</view
|
|
|
>
|
|
|
</view>
|
|
|
- <view class="d-flex f-w-900 f-20 j-end" style="width: 40%">
|
|
|
+ <view class="d-flex f-w-900 f-20 j-end" style="width: 50%">
|
|
|
+ <view
|
|
|
+ class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
|
|
|
+ @click="lookCheckResult"
|
|
|
+ :style="{
|
|
|
+ fontSize: responseClickStatusFc && '15px',
|
|
|
+ }"
|
|
|
+ >
|
|
|
+ 查看
|
|
|
+ </view>
|
|
|
<view
|
|
|
v-if="fcType !== 3"
|
|
|
class="d-flex a-center content-right-chunk b-r-5"
|
|
|
@@ -195,7 +204,7 @@
|
|
|
</view>
|
|
|
<view class="u-m-t-20 d-flex flex-wrap">
|
|
|
<view
|
|
|
- class="a-center f-30 b-r-10 color-white f-w lc-chunk"
|
|
|
+ class="a-center f-25 b-r-10 color-white f-w lc-chunk"
|
|
|
v-for="(item, indez) in procedureRes"
|
|
|
:key="indez"
|
|
|
:style="{ background: item.type === 1 ? '#29BE23' : '#046cb4' }"
|
|
|
@@ -337,7 +346,14 @@
|
|
|
>{{ recordName }}</view
|
|
|
>
|
|
|
</view>
|
|
|
- <view class="d-flex f-w-900 f-16 j-end" style="width: 45%">
|
|
|
+ <view class="d-flex f-w-900 f-20 j-end" style="width: 45%">
|
|
|
+ <view
|
|
|
+ v-if="!ifResultPage"
|
|
|
+ class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
|
|
|
+ @click="showResInfo"
|
|
|
+ >
|
|
|
+ 查看检查信息
|
|
|
+ </view>
|
|
|
<view
|
|
|
class="content-right-chunk b-r-5 f-w-900 d-flex a-center"
|
|
|
:style="{
|
|
|
@@ -381,11 +397,13 @@
|
|
|
style="color: #fff; width: 62%; font-weight: bold"
|
|
|
>
|
|
|
<view class="u-m-b-6">
|
|
|
- 流程: {{ item.flow }} 项目: {{ item.longdyProject }}
|
|
|
- </view>
|
|
|
+ 流程: {{ item.flow }} 项目: {{ item.longdyProject }} <text class="u-m-l-6" v-if="item.inspectClass">班次 : {{ item.inspectClass === 1 ? '白班' : '夜班' }}</text>
|
|
|
+ </view>
|
|
|
<view>
|
|
|
- <text> 标准: {{ item.standard }}</text></view
|
|
|
- >
|
|
|
+ <text> 标准: {{ item.standard }}</text>
|
|
|
+ <text class="u-m-l-6" v-if="item.inspectContent"> 检查结果: {{ item.inspectContent }}</text>
|
|
|
+ <text class="u-m-l-6" v-if="item.remark"> 备注: {{ item.remark }}</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="d-flex a-center j-end b-r-5 f-20" style="width: 38%">
|
|
|
<view
|
|
|
@@ -424,6 +442,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view
|
|
|
+ v-if="!ifResultPage"
|
|
|
style="background: #046cb4; color: #fff"
|
|
|
class="d-flex u-m-b-5 b-r-5 u-p-15"
|
|
|
>
|
|
|
@@ -528,7 +547,7 @@
|
|
|
</view>
|
|
|
<view slot="default" class="u-p-b-10 f-20">
|
|
|
<u-row class="u-m-b-15">
|
|
|
- <u-col :offset="1" :span="3">
|
|
|
+ <u-col :offset="1" :span="4">
|
|
|
<text>设备编号: {{ headerData.deviceNo }}</text>
|
|
|
</u-col>
|
|
|
<u-col :span="3">
|
|
|
@@ -539,7 +558,7 @@
|
|
|
</u-col>
|
|
|
</u-row>
|
|
|
<u-row class="u-m-b-15">
|
|
|
- <u-col :offset="1" :span="3">
|
|
|
+ <u-col :offset="1" :span="4">
|
|
|
责任人: <text>{{ headerData.oneName }}</text
|
|
|
><text v-if="headerData.twoName">,{{ headerData.twoName }}</text>
|
|
|
</u-col>
|
|
|
@@ -548,7 +567,7 @@
|
|
|
>
|
|
|
</u-row>
|
|
|
<u-row class="u-m-b-15">
|
|
|
- <u-col :offset="1" :span="3">
|
|
|
+ <u-col :offset="1" :span="4">
|
|
|
<text>编号: {{ headerData.nos }}</text>
|
|
|
</u-col>
|
|
|
<u-col :span="7">
|
|
|
@@ -574,6 +593,60 @@
|
|
|
>
|
|
|
</view>
|
|
|
</u-modal>
|
|
|
+ <u-modal
|
|
|
+ v-model="otherShow"
|
|
|
+ :show-title="false"
|
|
|
+ :show-confirm-button="false"
|
|
|
+ :show-cancel-button="false"
|
|
|
+ :zoom="false"
|
|
|
+ width="80%"
|
|
|
+ >
|
|
|
+ <view class="d-flex a-center j-end" @click="otherShow = false">
|
|
|
+ <view class="u-m-r-8">
|
|
|
+ <u-icon name="close-circle-fill" color="#A9A3D2" size="30"></u-icon>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view slot="default" class="u-m-b-10">
|
|
|
+ <view style="height:360rpx;overflow-y:auto;">
|
|
|
+ <u-card
|
|
|
+ :show-head="false"
|
|
|
+ :border="false"
|
|
|
+ box-shadow="0rpx 5rpx 5rpx rgba(0, 0, 0, 0.16)"
|
|
|
+ v-for="(item,index) in otherShowData"
|
|
|
+ :key="index"
|
|
|
+ >
|
|
|
+ <view slot="body" class="f-25">
|
|
|
+ <u-row class="u-m-t-10 u-m-b-10">
|
|
|
+ <u-col :span="4">
|
|
|
+ <text>流程: {{ item.flow }}</text>
|
|
|
+ </u-col>
|
|
|
+ <u-col :span="4">
|
|
|
+ <text>项目: {{ item.longdyProject }}</text>
|
|
|
+ </u-col>
|
|
|
+ <!-- <u-col :span="3">
|
|
|
+ <text>频次: {{ item.flow }}</text>
|
|
|
+ </u-col> -->
|
|
|
+ </u-row>
|
|
|
+ <u-row class="u-m-t-10 u-m-b-10">
|
|
|
+ <u-col :span="4">
|
|
|
+ <text>标准: {{ item.standard }}</text>
|
|
|
+ </u-col>
|
|
|
+ <u-col :span="4">
|
|
|
+ <text v-if="item.inspectContent === '√'">结果: 正常</text>
|
|
|
+ <text v-else-if="item.inspectContent === 'x'">结果: 异常</text>
|
|
|
+ <text v-else-if="item.inspectContent === '/'">结果: 停用</text>
|
|
|
+ <text v-else>结果: 未检查</text>
|
|
|
+ </u-col>
|
|
|
+ <u-col :span="3">
|
|
|
+ <text>备注: {{ item.remark || '无' }}</text>
|
|
|
+ </u-col>
|
|
|
+ </u-row>
|
|
|
+ </view>
|
|
|
+ </u-card>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </u-modal>
|
|
|
<u-toast ref="uToast" />
|
|
|
</view>
|
|
|
</template>
|
|
|
@@ -616,8 +689,9 @@ import {
|
|
|
patrolUpdate,
|
|
|
patrolScan,
|
|
|
dutyPatrolScan,
|
|
|
+ otherClazz
|
|
|
} from "@/common/api.js";
|
|
|
-import colorGradient from "../../uview-ui/libs/function/colorGradient";
|
|
|
+import colorGradient from '../../uview-ui/libs/function/colorGradient';
|
|
|
export default {
|
|
|
components: {
|
|
|
djButton,
|
|
|
@@ -628,6 +702,7 @@ export default {
|
|
|
role: 1,
|
|
|
questionShow: false,
|
|
|
headerStatus: false,
|
|
|
+ otherShow: false,
|
|
|
changeStatus: 0,
|
|
|
sjOrFx: 0,
|
|
|
num: 26,
|
|
|
@@ -724,12 +799,20 @@ export default {
|
|
|
halfYearId: "",
|
|
|
// 半年提交数据
|
|
|
halfYearData: [],
|
|
|
+ // 班提交数据
|
|
|
+ shiftData: [],
|
|
|
// 记录表名称
|
|
|
recordName: "",
|
|
|
// 响应id(传后端)
|
|
|
everyId: [],
|
|
|
// 是否点击了编辑
|
|
|
- showButton: false
|
|
|
+ showButton: false,
|
|
|
+ // 其他责任人检查数据
|
|
|
+ otherShowData: [],
|
|
|
+ // 是否为结果信息也
|
|
|
+ ifResultPage: false,
|
|
|
+ // 当期那名
|
|
|
+ nowName: ''
|
|
|
};
|
|
|
},
|
|
|
onLoad() {
|
|
|
@@ -872,10 +955,11 @@ export default {
|
|
|
this.sjRecordId = id;
|
|
|
// title名
|
|
|
this.recordName = name;
|
|
|
+ // 记录名字
|
|
|
+ this.nowName = name;
|
|
|
// 类型
|
|
|
this.fcType = type;
|
|
|
// 创建时间 (巡检人)
|
|
|
- console.log(creatTime);
|
|
|
this.creatime = creatTime;
|
|
|
// 角色 1检查人 0巡检人
|
|
|
this.infoStatus = this.role ? 2 : 4;
|
|
|
@@ -939,6 +1023,9 @@ export default {
|
|
|
}
|
|
|
this.halfYearData = data.patrolHalfYearCheckresults;
|
|
|
}
|
|
|
+ if (data.patrolClazzCheckresults) {
|
|
|
+ this.shiftData = data.patrolClazzCheckresults
|
|
|
+ }
|
|
|
} else {
|
|
|
this.hintCase(res.message || "获取失败");
|
|
|
}
|
|
|
@@ -981,98 +1068,6 @@ export default {
|
|
|
if (res.status === "20000") {
|
|
|
this.infoStatus = 3;
|
|
|
this.datafc = res.data;
|
|
|
-
|
|
|
- // this.fcHeadData
|
|
|
- // this.fcHeadData = [];
|
|
|
- // if (data.dayId) {
|
|
|
- // this.fcHeadData.push({ id: data.dayId, name: "日" });
|
|
|
- // if (!this.datafc.length) {
|
|
|
- // this.datafc.push(data.day);
|
|
|
- // }
|
|
|
- // this.dayData = data.day;
|
|
|
- // this.everyId.push(data.dayId);
|
|
|
- // if (!this.sjRecordPlId) {
|
|
|
- // this.sjRecordPlId = data.dayId;
|
|
|
- // this.sjRecordPlName = "日";
|
|
|
- // }
|
|
|
- // this.submitClickStatusFc = this.dayData.sub !== 2 ? true : false;
|
|
|
- // }
|
|
|
- // if (data.weekId) {
|
|
|
- // this.fcHeadData.push({ id: data.weekId, name: "周" });
|
|
|
- // if (!this.datafc.length) {
|
|
|
- // this.datafc.push(data.week);
|
|
|
- // }
|
|
|
- // this.weekData = data.week;
|
|
|
- // this.everyId.push(data.weekId);
|
|
|
- // if (!this.sjRecordPlId) {
|
|
|
- // this.sjRecordPlId = data.weekId;
|
|
|
- // this.sjRecordPlName = "周";
|
|
|
- // }
|
|
|
- // this.submitClickStatusFc = this.weekData.sub !== 2 ? true : false;
|
|
|
- // }
|
|
|
- // if (data.monthId) {
|
|
|
- // this.fcHeadData.push({ id: data.monthId, name: "月" });
|
|
|
- // if (!this.datafc.length) {
|
|
|
- // this.datafc.push(data.month);
|
|
|
- // }
|
|
|
- // this.monthData = data.month;
|
|
|
- // this.everyId.push(data.monthId);
|
|
|
- // if (!this.sjRecordPlId) {
|
|
|
- // this.sjRecordPlId = data.monthId;
|
|
|
- // this.sjRecordPlName = "月";
|
|
|
- // }
|
|
|
- // this.submitClickStatusFc = this.monthData.sub !== 2 ? true : false;
|
|
|
- // }
|
|
|
- // if (data.quarterId) {
|
|
|
- // this.fcHeadData.push({ id: data.quarterId, name: "季度" });
|
|
|
- // if (!this.datafc.length) {
|
|
|
- // this.datafc.push(data.quarter);
|
|
|
- // }
|
|
|
- // this.quarterData = data.quarter;
|
|
|
- // this.everyId.push(data.quarterId);
|
|
|
- // if (!this.sjRecordPlId) {
|
|
|
- // this.sjRecordPlId = data.quarterId;
|
|
|
- // this.sjRecordPlName = "季度";
|
|
|
- // }
|
|
|
- // this.submitClickStatusFc =
|
|
|
- // this.quarterData.sub !== 2 ? true : false;
|
|
|
- // }
|
|
|
- // if (data.halfYearId) {
|
|
|
- // this.fcHeadData.push({ id: data.halfYearId, name: "半年" });
|
|
|
- // if (!this.datafc.length) {
|
|
|
- // this.datafc.push(data.halfYear);
|
|
|
- // }
|
|
|
- // this.halfYearData = data.halfYear;
|
|
|
- // this.everyId.push(data.halfYearId);
|
|
|
- // if (!this.sjRecordPlId) {
|
|
|
- // this.sjRecordPlId = data.halfYearId;
|
|
|
- // this.sjRecordPlName = "半年";
|
|
|
- // }
|
|
|
- // this.submitClickStatusFc =
|
|
|
- // this.halfYearData.sub !== 2 ? true : false;
|
|
|
- // }
|
|
|
- // // 判断是否响应
|
|
|
- // if (!index) {
|
|
|
- // this.responseClickStatusFc = res.data.type === 1 ? false : true;
|
|
|
- // }
|
|
|
- // this.fcData = res.data;
|
|
|
- // if (!res.data.day) {
|
|
|
- // this.datafc = [];
|
|
|
- // this.showButton = false;
|
|
|
- // } else {
|
|
|
- // this.datafc = res.data.day.infoCheckRes;
|
|
|
- // }
|
|
|
- // this.dayId = res.data.dayId;
|
|
|
- // this.dayData = res.data.day ? res.data.day.infoCheckRes : [];
|
|
|
- // this.weekId = res.data.weekId;
|
|
|
- // this.weekData = res.data.week ? res.data.week.infoCheckRes : [];
|
|
|
- // this.monthId = res.data.monthId;
|
|
|
- // this.monthData = res.data.month ? res.data.month.infoCheckRes : [];
|
|
|
- // if (this.fcData.day && this.fcData.day.sub !== 2) {
|
|
|
- // this.submitClickStatusFc = true;
|
|
|
- // } else {
|
|
|
- // this.submitClickStatusFc = false;
|
|
|
- // }
|
|
|
} else {
|
|
|
this.hintCase("获取失败");
|
|
|
}
|
|
|
@@ -1080,9 +1075,15 @@ export default {
|
|
|
},
|
|
|
// 首件详情页返回
|
|
|
returnSjList() {
|
|
|
- this.infoStatus = 1;
|
|
|
- this.showButton = false;
|
|
|
- this.init();
|
|
|
+ if(this.ifResultPage){
|
|
|
+ this.ifResultPage = false
|
|
|
+ this.recordName = this.nowName;
|
|
|
+ this.patrolWaitInfo();
|
|
|
+ } else {
|
|
|
+ this.infoStatus = 1;
|
|
|
+ this.showButton = false;
|
|
|
+ this.init();
|
|
|
+ }
|
|
|
},
|
|
|
// 响应(防错)
|
|
|
responseClickFc() {
|
|
|
@@ -1132,11 +1133,11 @@ export default {
|
|
|
if (index === 0) {
|
|
|
data = {
|
|
|
everyId: this.everyId,
|
|
|
- subInsertReqs: this.datafc.filter(item => item.state === 1 ),
|
|
|
+ subInsertReqs: this.datafc.filter((item) => item.state === 1),
|
|
|
type: 1,
|
|
|
versionId: this.sjRecordId,
|
|
|
};
|
|
|
- console.log(data)
|
|
|
+ console.log(data);
|
|
|
} else {
|
|
|
let flag = false;
|
|
|
for (let i of this.procedureRes) {
|
|
|
@@ -1197,10 +1198,10 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
} else if (this.fcType === 2) {
|
|
|
- if(!this.showButton){
|
|
|
- this.showButton = true
|
|
|
- return
|
|
|
- }
|
|
|
+ if (!this.showButton) {
|
|
|
+ this.showButton = true;
|
|
|
+ return;
|
|
|
+ }
|
|
|
patrolUpdate(data).then((res) => {
|
|
|
if (res.status === "20000") {
|
|
|
this.successCase("操作成功");
|
|
|
@@ -1281,7 +1282,7 @@ export default {
|
|
|
},
|
|
|
changeButton(index) {
|
|
|
// if (this.submitClickStatus) return;
|
|
|
- if (this.ifUpdate()){
|
|
|
+ if (this.ifUpdate()) {
|
|
|
this.useSpanner = index;
|
|
|
this.spannerRemark = "";
|
|
|
}
|
|
|
@@ -1355,9 +1356,9 @@ export default {
|
|
|
},
|
|
|
// 是否点击编辑
|
|
|
ifUpdate() {
|
|
|
- if(this.fcType === 1){
|
|
|
- return true
|
|
|
- }else if (this.fcType === 2){
|
|
|
+ if (this.fcType === 1) {
|
|
|
+ return true;
|
|
|
+ } else if (this.fcType === 2) {
|
|
|
let responseStatus = true;
|
|
|
if (!this.showButton) {
|
|
|
this.hintCase("请先执行编辑");
|
|
|
@@ -1366,7 +1367,7 @@ export default {
|
|
|
}
|
|
|
return responseStatus;
|
|
|
} else {
|
|
|
- return false
|
|
|
+ return false;
|
|
|
}
|
|
|
},
|
|
|
// 查看附件
|
|
|
@@ -1380,6 +1381,24 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ lookCheckResult() {
|
|
|
+ otherClazz({versionid:this.sjRecordId}).then(res=> {
|
|
|
+ if(res.status === '20000') {
|
|
|
+ this.otherShowData = res.data
|
|
|
+ this.otherShow = true
|
|
|
+ } else {
|
|
|
+ this.hintCase('无相关信息')
|
|
|
+ }
|
|
|
+ console.log(res)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 查看检查信息
|
|
|
+ showResInfo() {
|
|
|
+ this.recordName = '查看检查结果'
|
|
|
+ this.headerData = []
|
|
|
+ this.datafc = this.shiftData
|
|
|
+ this.ifResultPage = true
|
|
|
+ },
|
|
|
// 提示框
|
|
|
hintCase(msg) {
|
|
|
this.$refs.uToast.show({
|
|
|
@@ -1553,4 +1572,7 @@ page {
|
|
|
.sjHead > view + view {
|
|
|
margin-left: 5rpx;
|
|
|
}
|
|
|
+.main-style {
|
|
|
+ box-shadow: 0rpx 6rpx 13rpx rgba(0, 0, 0, 0.16);
|
|
|
+}
|
|
|
</style>
|
