Skip to content

D
db_qms_wx
Commit 7ff1a596 authored by 刘怀志's avatar 刘怀志
Browse files
Options

审核对接暂存

parent c5452dce
Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 9 deletions
pages/approval_detail/drawerShow.vue
View file @ 7ff1a596
...@@ -129,6 +129,44 @@ ...@@ -129,6 +129,44 @@
</view> </view>
</view> </view>
</template> </template>
<template v-if="getProcessType() === 'TPM'">
<view class="custom-table">
<view class="subTitleClass">
<view class="subRow">
<view class="subTitle">
设备编号
</view>
<view class="subContent">
{{ instanceDetail.tmpInfoDTO.equipmentCode || '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
设备名称
</view>
<view class="subContent">
{{ instanceDetail.tmpInfoDTO.equipmentName || '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
所属产线
</view>
<view class="subContent">
{{ instanceDetail.tmpInfoDTO.proLineName || '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
工序编号
</view>
<view class="subContent">
{{ instanceDetail.tmpInfoDTO.gxCode || '-' }}
</view>
</view>
</view>
</view>
</template>
</template> </template>
<!-- 审批人 --> <!-- 审批人 -->
<template v-else> <template v-else>
...@@ -139,7 +177,7 @@ ...@@ -139,7 +177,7 @@
部门 部门
</view> </view>
<view class="subContent"> <view class="subContent">
{{ step.content.approveDeptName }} {{ step.content.configApproveDeptName }}
</view> </view>
</view> </view>
<view class="subRow"> <view class="subRow">
...@@ -147,7 +185,7 @@ ...@@ -147,7 +185,7 @@
生产角色 生产角色
</view> </view>
<view class="subContent"> <view class="subContent">
{{ step.content.approveRoleName || '无' }} {{ step.content.configApproveRoleName || '无' }}
</view> </view>
</view> </view>
<view class="subRow"> <view class="subRow">
...@@ -155,7 +193,7 @@ ...@@ -155,7 +193,7 @@
员工姓名 员工姓名
</view> </view>
<view class="subContent"> <view class="subContent">
{{ step.content.approveUser || '无' }} {{ step.content.configApproveUserName || '无' }}
</view> </view>
</view> </view>
</view> </view>
...@@ -167,14 +205,155 @@ ...@@ -167,14 +205,155 @@
<!-- 步骤图完成 --> <!-- 步骤图完成 -->
<!-- 备注区 --> <!-- 备注区 -->
<view class="title"> <view class="title">
备注信息 详细信息
</view> </view>
<view class="remark-container"> <view class="remark-container">
<u-form :model="instanceDetail"> <view class="rmark-card" v-for="(item, key) in instanceDetailList" :key="index">
<u-form-item label="访问区域" prop="remark" labelPosition="top" labelWidth="80"> <template v-if="getProcessType() === '工具'">
<u-textarea disabled v-model="instanceDetail.remarks" placeholder="-"></u-textarea> <view class="subRow">
</u-form-item> <view class="subTitle">
</u-form> 点检时间(最近一次)
</view>
<view class="subContent">
{{ item.checkDate ? item.checkDate.substring(0, 10) : '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(校验时)
</view>
<view class="subContent">
{{ item.checkDay || '0' }}天
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(当前)
</view>
<view :class="[
item.surplusDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.surplusDay <= 0 ? '到期' : (item.surplusDay + '天') }}
</view>
</view>
</template>
<template v-if="getProcessType() === '辅材'">
<view class="subRow">
<view class="subTitle">
上料时间
</view>
<view class="subContent">
{{ item.operatorDate || '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
批次号
</view>
<view class="subContent">
{{ item.batchNumber || '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
有效期截止日期
</view>
<view class="subContent">
{{item.expirationDate ? item.expirationDate.substring(0,10) : '-'}}
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(校验时)
</view>
<view class="subContent">
{{ item.theRemainingValidationValidityPeriod || '0' }}天
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(当前)
</view>
<view :class="[
item.surplusDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.theRemainingCurrentValidityPeriod <= 0 ? '到期' : (item.theRemainingCurrentValidityPeriod + '天') }}
</view>
</view>
</template>
<template v-if="getProcessType() === '标定'">
<view class="subRow">
<view class="subTitle">
部件名称
</view>
<view class="subContent">
{{ item.comName || '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
标定时间
</view>
<view class="subContent">
{{item.calibrationTime ? item.calibrationTime.substring(0,10) : '-'}}
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(校验时)
</view>
<view class="subContent">
{{ item.checkDay || '0' }}天
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(当前)
</view>
<view :class="[
item.surplusDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.surplusDay <= 0 ? '到期' : (item.surplusDay + '天') }}
</view>
</view>
</template>
<template v-if="getProcessType() === 'TPM'">
<view class="subRow">
<view class="subTitle">
定检单据ID
</view>
<view class="subContent">
{{ item.onlyId || '-' }}
</view>
</view>
<view class="subRow">
<view class="subTitle">
定检时间
</view>
<view class="subContent">
{{item.fixcheckDate ? item.fixcheckDate.substring(0,10) : '-'}}
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(校验时)
</view>
<view class="subContent">
{{ item.regularCheckPeriod || '0' }}天
</view>
</view>
<view class="subRow">
<view class="subTitle">
剩余有效期(当前)
</view>
<view :class="[
item.validityDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.validityDay <= 0 ? '到期' : (item.validityDay + '天') }}
</view>
</view>
</template>
</view>
</view> </view>
<!-- 备注区完成 --> <!-- 备注区完成 -->
<!-- 变更内容区 --> <!-- 变更内容区 -->
...@@ -603,6 +782,14 @@ export default { ...@@ -603,6 +782,14 @@ export default {
.remark-container { .remark-container {
padding: 28rpx 46rpx 0 48rpx; padding: 28rpx 46rpx 0 48rpx;
// 新增卡片间距
& > view {
margin-bottom: 20rpx;
&:last-child {
margin-bottom: 0;
}
}
::v-deep .u-form-item__body__left__content__label { ::v-deep .u-form-item__body__left__content__label {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
...@@ -614,6 +801,54 @@ export default { ...@@ -614,6 +801,54 @@ export default {
text-transform: none; text-transform: none;
margin-bottom: 14rpx; margin-bottom: 14rpx;
} }
.rmark-card {
background: #F9F9F9;
border-radius: 20rpx;
padding: 0rpx 40rpx 0 38rpx;
.subRow {
display: flex;
justify-content: space-between;
margin-bottom: 12rpx;
border-bottom: 2rpx solid #E9E9E9;
padding-bottom: 12rpx;
align-items: center;
&:last-child {
border-bottom: none;
padding-bottom: 0;
}
height: 96rpx;
.subTitle {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #666666;
text-align: left;
font-style: normal;
text-transform: none;
min-width: 120rpx;
}
.subContent {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #111111;
text-align: right;
font-style: normal;
text-transform: none;
}
.expire-color {
color: red !important;
}
}
}
} }
.change-container { .change-container {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment