优化
This commit is contained in:
何美荣
parent
ab40839c88
commit
fafee4efb2
@ -189,7 +189,7 @@
|
||||
<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
|
||||
</view>
|
||||
|
||||
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息</view>
|
||||
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">验收情况</view>
|
||||
|
||||
|
||||
<view v-if="model.STATUS==30">
|
||||
|
||||
@ -108,6 +108,8 @@
|
||||
|
||||
</u-form-item>
|
||||
<u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea>
|
||||
<view class="upload-title">附件：</view>
|
||||
<full-upload v-model="item.Nav_DetailFiles"></full-upload>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<view class="todo-page">
|
||||
<view class="background"></view>
|
||||
<view class="allview">
|
||||
<view class="card">
|
||||
<view class="card" v-if="stepsPageList === 0">
|
||||
<u--form labelWidth="auto" :model="model" ref="wForm" class="demo-ruleForm">
|
||||
<view style="position: relative;">
|
||||
<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
|
||||
@ -85,9 +85,69 @@
|
||||
|
||||
</u--form>
|
||||
</view>
|
||||
<view style="padding: 10px 16px;" class="bottom-button">
|
||||
<u-button type="primary" @click="submit" color="#3d4b70" :loading="stepLoad">提交</u-button>
|
||||
<view style="padding: 10px 16px;" v-if="stepsPageList === 0" class="bottom-button">
|
||||
<u-button type="primary" @click="stepAdd" color="#3d4b70" :loading="stepLoad">下一步</u-button>
|
||||
</view>
|
||||
<view class="card" v-if="stepsPageList === 1">
|
||||
<u--form labelWidth="auto" :model="model" ref="wForm" class="sub-form">
|
||||
|
||||
|
||||
<view style="position: relative;">
|
||||
|
||||
<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
|
||||
</view>
|
||||
|
||||
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;margin-top: 20px;">作业流程及安全措施</view>
|
||||
<uni-collapse :border="false" accordion>
|
||||
<view v-for="(item, index) in model.Nav_Details.filter(i => !i.IS_DELETED)" :key="index">
|
||||
<uni-collapse-item title-border="none" :border="false">
|
||||
<template v-slot:title>
|
||||
<view class="uni-collapse-item__title-box">
|
||||
<view class="uni-collapse-item__title-text">
|
||||
{{item.CONTENT?index+1+'.'+item.JOB_STEPName+'--'+item.CONTENT:index+1+'.'}}
|
||||
</view>
|
||||
<view @click.stop style="display: flex;flex-direction: row;align-items: center;">
|
||||
<u-switch v-model="item.IS_CONFIRM_NEW" @change="changeConfirm($event,item)" size="18" style="margin-right: 10px;"></u-switch>
|
||||
<u-icon @click="handleDelRowBefore(item)" name="trash" color="#ff4d4f" size="21" style="margin-right: 10px;"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
<view class="content" style="padding: 0px 0px 0px 10px;">
|
||||
<u-form-item label="顺序：" prop="Nav_User.NAME" @ borderBottom>
|
||||
<u--input disabledColor="#fff" v-model="item.NUM" placeholder="请输入顺序" type="number" fontSize="14px" customStyle="margin:0px;display:flex;padding:3px 0px" border="none"
|
||||
inputAlign="right">
|
||||
</u--input>
|
||||
</u-form-item>
|
||||
<u-form-item label="作业阶段：" prop="Nav_User.NAME" @click="handleChange('FOJobStepEnum',item)" borderBottom>
|
||||
<u--input disabledColor="#fff" v-model="item.JOB_STEPName" disabled placeholder="请选择作业阶段" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
|
||||
customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
|
||||
</u--input>
|
||||
</u-form-item>
|
||||
<u-form-item label="作业流程及安全措施：">
|
||||
|
||||
</u-form-item>
|
||||
<u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea>
|
||||
<view class="upload-title">附件：</view>
|
||||
<full-upload v-model="item.Nav_DetailFiles"></full-upload>
|
||||
</view>
|
||||
|
||||
|
||||
</uni-collapse-item>
|
||||
</view>
|
||||
</uni-collapse>
|
||||
<view style="padding: 10px 16px;display: flex;flex-direction: row;">
|
||||
<u-button type="primary" @click="handleNewCheckArea" color="#3d4b70">新增</u-button>
|
||||
<!-- <u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">检查清单</u-button> -->
|
||||
</view>
|
||||
</u--form>
|
||||
|
||||
</view>
|
||||
|
||||
<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button">
|
||||
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
|
||||
<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
|
||||
</view>
|
||||
|
||||
<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
|
||||
@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
|
||||
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="comPickerInfo.showSheet=false" @cancel="comPickerInfo.showSheet=false" keyName="NAME"></u-picker>
|
||||
@ -363,7 +423,11 @@
|
||||
this.model.LEAVE_DATE = uni.$u.timeFormat(this.model.LEAVE_DATE,
|
||||
'yyyy-mm-dd hh:MM:ss')
|
||||
this.model.IS_LEAVEName = res.IS_LEAVE !== '' && res.IS_LEAVE !== undefined ? this.enumsData['FOYesOrNoEnum'].find(item => item.code === res.IS_LEAVE).name : ''
|
||||
|
||||
if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
|
||||
this.model.Nav_Details.map(item => {
|
||||
item.JOB_STEPName = item.JOB_STEP !== '' && item.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item1 => item1.code === item.JOB_STEP).name : ''
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
@ -401,6 +465,9 @@
|
||||
if (this.comPickerInfo.name == 'FOYesOrNoEnum') {
|
||||
this.model.IS_LEAVEName = e.value[0].name
|
||||
this.model.IS_LEAVE = e.value[0].ID
|
||||
} else if (this.comPickerInfo.name == 'FOJobStepEnum') {
|
||||
this.comPickerInfo.itemData.JOB_STEPName = e.value[0].name
|
||||
this.comPickerInfo.itemData.JOB_STEP = e.value[0].ID
|
||||
}
|
||||
|
||||
this.comPickerInfo = {
|
||||
@ -549,6 +616,7 @@
|
||||
if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
|
||||
this.model.Nav_Details.map(item1 => {
|
||||
item1.JOB_STEPName = this.enumsData['FOJobStepEnum'].find(item => item.code === item1.JOB_STEP).name
|
||||
// item1.JOB_STEPName = item1.JOB_STEP !== '' && item1.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item2 => item2.code === item1.JOB_STEP).name : ''
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user