FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
396572590@qq.com
2022-07-06 16:11:42 +08:00
parent a78bd5ac97 bbb008e692
commit 8aa31c2b19
3 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/phone/bzdy/step9.vue
+27 -2
View File
@@ -3,7 +3,7 @@
<ProcessHeaderPhone toggle>
<template slot="proName">标准调研流程</template>
<template slot="proNode">批准</template>
</ProcessHeaderPhone>
</ProcessHeaderPhone>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
@@ -35,6 +35,26 @@
- -
</div>
</el-form-item>
<el-form-item label="调研模板" prop="hzfileId" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index">
<span>{{ item.name }}</span>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="相关附件" prop="hzfileId" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index">
<span>{{ item.name }}</span>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
</div>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
@@ -136,7 +156,9 @@
date: '', // 完成时间
hzfileId: '',
hzfileName: '',
textsh: ''
textsh: '',
modelList:[], //调研模板
fjList:[] //相关附件
},
formRules: {
textsh: [
@@ -292,10 +314,13 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data)
this.commentText9 = data.commentText9 || ''
this.form.processName = data.form ? data.form.processName : data.processName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.form.modelList = data.modelList
this.form.fjList =data.fjList
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
src/pages/processCenter/pages/phone/bzrk/step2.vue
+17 -15
View File
@@ -53,12 +53,7 @@
<van-field label="标准年份" v-model="form.standYear" readonly />
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
<div class="wrap">{{form.standName}}</div>
</el-tooltip>
<el-input
v-else
@@ -69,12 +64,7 @@
></el-input>
</el-form-item>
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
<div class="wrap">{{form.standEnName}}</div>
</el-form-item>
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag" disabled>
@@ -369,7 +359,10 @@
<template slot="title">关联信息</template>
</ProcessTitle>
<div class="prc-content-border">
<van-field label="代替标准号" v-model="form.dtbjh" readonly placeholder="请输入代替标准号"/>
<!-- <van-field label="代替标准号" v-model="form.dtbjh" readonly placeholder="请输入代替标准号"/> -->
<el-form-item label="代替标准号" class="add-form-item form-item-disabled">
<div class="wrap">{{form.dtbjh}}</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -384,8 +377,14 @@
</div>
</el-form-item>
<!-- <van-field label="部分代替标准号" v-model="form.bfbdtbzh" readonly placeholder="请输入部分代替标准号"/>-->
<van-field v-if="form.standInData === '0'" label="采标编号" v-model="form.cbbh" readonly placeholder="请输入采标编号"/>
<van-field label="引用标准" v-model="form.yybj" readonly placeholder="请输入引用标准"/>
<!-- <van-field v-if="form.standInData === '0'" label="采标编号" v-model="form.cbbh" readonly placeholder="请输入采标编号"/> -->
<el-form-item label="采标编号" class="add-form-item form-item-disabled">
<div class="wrap">{{form.cbbh}}</div>
</el-form-item>
<!-- <van-field label="引用标准" v-model="form.yybj" readonly placeholder="请输入引用标准"/> -->
<el-form-item label="引用标准" class="add-form-item form-item-disabled">
<div class="wrap">{{form.yybj}}</div>
</el-form-item>
</div>
</el-form>
</div>
@@ -1052,4 +1051,7 @@ export default {
line-height: 22px !important;
}
}
.wrap{
white-space:normal;
}
</style>