Skip to content

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

审批提交1

parent 7ff1a596
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 31 deletions
pages/approval_detail/drawerShow.vue
View file @ 23110077
......@@ -61,7 +61,7 @@
所属产线
</view>
<view class="subContent">
{{ instanceDetail.toolCheckDto.lineName || '-' }}
{{ instanceDetail.materialDto.lineName || '-' }}
</view>
</view>
<view class="subRow">
......@@ -208,7 +208,7 @@
详细信息
</view>
<view class="remark-container">
<view class="rmark-card" v-for="(item, key) in instanceDetailList" :key="index">
<view class="rmark-card" v-for="(item, index) in instanceDetailList" :key="index">
<template v-if="getProcessType() === '工具'">
<view class="subRow">
<view class="subTitle">
......@@ -231,11 +231,10 @@
剩余有效期(当前)
</view>
<view :class="[
item.surplusDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.surplusDay <= 0 ? '到期' : (item.surplusDay + '天') }}
item.surplusDay <= 0 ? 'expire-color' : null
, 'subContent']">
{{ item.surplusDay <= 0 ? '到期' : (item.surplusDay + '天') }} </view>
</view>
</view>
</template>
<template v-if="getProcessType() === '辅材'">
<view class="subRow">
......@@ -259,7 +258,7 @@
有效期截止日期
</view>
<view class="subContent">
{{item.expirationDate ? item.expirationDate.substring(0,10) : '-'}}
{{ item.expirationDate ? item.expirationDate.substring(0, 10) : '-' }}
</view>
</view>
<view class="subRow">
......@@ -275,11 +274,11 @@
剩余有效期(当前)
</view>
<view :class="[
item.surplusDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.theRemainingCurrentValidityPeriod <= 0 ? '到期' : (item.theRemainingCurrentValidityPeriod + '天') }}
item.surplusDay <= 0 ? 'expire-color' : null
, 'subContent']">
{{ item.theRemainingCurrentValidityPeriod <= 0 ? '到期' :
(item.theRemainingCurrentValidityPeriod + '天') }} </view>
</view>
</view>
</template>
<template v-if="getProcessType() === '标定'">
<view class="subRow">
......@@ -295,7 +294,7 @@
标定时间
</view>
<view class="subContent">
{{item.calibrationTime ? item.calibrationTime.substring(0,10) : '-'}}
{{ item.calibrationTime ? item.calibrationTime.substring(0, 10) : '-' }}
</view>
</view>
<view class="subRow">
......@@ -311,11 +310,10 @@
剩余有效期(当前)
</view>
<view :class="[
item.surplusDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.surplusDay <= 0 ? '到期' : (item.surplusDay + '天') }}
item.surplusDay <= 0 ? 'expire-color' : null
, 'subContent']">
{{ item.surplusDay <= 0 ? '到期' : (item.surplusDay + '天') }} </view>
</view>
</view>
</template>
<template v-if="getProcessType() === 'TPM'">
<view class="subRow">
......@@ -331,7 +329,7 @@
定检时间
</view>
<view class="subContent">
{{item.fixcheckDate ? item.fixcheckDate.substring(0,10) : '-'}}
{{ item.fixcheckDate ? item.fixcheckDate.substring(0, 10) : '-' }}
</view>
</view>
<view class="subRow">
......@@ -347,25 +345,79 @@
剩余有效期(当前)
</view>
<view :class="[
item.validityDay <= 0 ? 'expire-color' : null
,'subContent']">
{{ item.validityDay <= 0 ? '到期' : (item.validityDay + '天') }}
item.validityDay <= 0 ? 'expire-color' : null
, 'subContent']">
{{ item.validityDay <= 0 ? '到期' : (item.validityDay + '天') }} </view>
</view>
</view>
</template>
</view>
</view>
<!-- 备注区完成 -->
<!-- 变更内容区 -->
<view class="title">
变更内容
提交信息
</view>
<view class="change-container">
<view class="change-item">
请登录PC端查看变更详情
</view>
</view>
<u-form :model="approve" labelWidth="120">
<template v-for="(item, index) in instanceDetail.approves">
<!-- TPM日期选择 -->
<u-form-item v-if="index !== instanceDetail.approves.length - 1
&& processCode === '00006'
&& item.currentNode === '1'
&& processStatus
&& isUpdate"
key="tpm-date"
borderBottom
@click="showFormResultOne = true; hideKeyboard()"
label="计划TPM日期">
<u--input
v-model="approve.formResultOne"
disabled
disabledColor="#ffffff"
placeholder="请选择计划TPM日期"
border="none"
></u--input>
<u-icon
slot="right"
name="arrow-right"
></u-icon>
</u-form-item>
<!-- 点检日期选择 -->
<u-form-item v-if="index !== instanceDetail.approves.length - 1
&& processCode === '00010'
&& item.currentNode === '1'
&& processStatus
&& isUpdate"
key="check-date"
@click="showFormResultOne = true; hideKeyboard()"
borderBottom
label="计划点检日期">
<u--input
v-model="approve.formResultOne"
disabled
disabledColor="#ffffff"
placeholder="请选择计划点检日期"
border="none"
></u--input>
<u-icon
slot="right"
name="arrow-right"
></u-icon>
</u-form-item>
<!-- 处理结果下拉 -->
<u-form-item v-if="processCode === '00004'
&& index === instanceDetail.approves.length - 1
&& item.currentNode === '1'" key="handle-result" label="处理结果">
<u-select v-model="approve.selectOption" :options="selectOptions" :disabled="!isUpdate || item.approveStatus !== '0'" />
</u-form-item>
</template>
</u-form>
</view>
<u-datetime-picker :show="showFormResultOne" :value="formResultOne" mode="date" closeOnClickOverlay
@confirm="formResultOneConfirm" @cancel="formResultOneClose"
@close="formResultOneClose"></u-datetime-picker>
<!-- 按钮区域 -->
<view v-if="isView === '0' && status === 'true'" class="btns-container">
<view class="btn reject-btn" @click="approveByAdmin('REJECT')">
......@@ -400,6 +452,13 @@ export default {
components: { VerticalSteps },
data() {
return {
selectOptions:[
{ label: '本次强制开机', value: '本次强制开机' },
{ label: '本次禁止开机', value: '本次禁止开机' },
{ label: '改正后开机', value: '改正后开机' }
],
formResultOne: null,
showFormResultOne: false,
isLoading: false,
processId: '',
processCode: '',
......@@ -545,6 +604,16 @@ export default {
},
},
methods: {
formResultOneConfirm(e) {
this.showFormResultOne = false;
this.approve.formResultOne = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
},
formResultOneClose() {
this.showFormResultOne = false
},
hideKeyboard() {
uni.hideKeyboard()
},
getProcessType() {
if (
this.processCode === '00002' ||
......@@ -782,10 +851,11 @@ export default {
.remark-container {
padding: 28rpx 46rpx 0 48rpx;
// 新增卡片间距
& > view {
&>view {
margin-bottom: 20rpx;
&:last-child {
margin-bottom: 0;
}
......@@ -842,11 +912,12 @@ export default {
text-align: right;
font-style: normal;
text-transform: none;
}
.expire-color {
color: red !important;
}
color: red !important;
}
}
}
}
......
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