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

This commit is contained in:
zhutianqi
2022-01-05 15:48:38 +08:00
23 changed files with 3000 additions and 2263 deletions
+157 -126
View File
@@ -65,11 +65,11 @@
}}</span></p> }}</span></p>
<!--发布稿(必读)--> <!--发布稿(必读)-->
<template v-for="(child, childIndex) in item.child1"> <template v-for="(child, childIndex) in item.child1">
<p class="files-title"> <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
<label style=" margin-right: 164px;">{{ child.attrName }}</label> <label style="margin-right: 164px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" <template v-if="child.value && child.value.length > 0"
v-for="(file, fileIndex) in child1Func(child.value)"> v-for="(file, fileIndex) in child1Func(child.value)">
<!-- 单个文件时--> <!-- 单个文件时-->
<span v-if="child.value && child.value.length > 0 && child.value.length === 1"> <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -88,7 +88,7 @@
/> />
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<!-- 多个文件时--> <!-- 多个文件时-->
<span v-else-if="child.value && child.value.length > 0"> <span v-else-if="child.value && child.value.length > 0">
<div style="margin-left: 19%;margin-top: -60px;line-height: 90px"> <div style="margin-left: 19%;margin-top: -60px;line-height: 90px">
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@@ -119,15 +119,14 @@
icon="icon-separate" icon="icon-separate"
>标准分解单 >标准分解单
</el-button> </el-button>
<!-- <el-button v-if="child.value && child.value.length > 1"-->
<!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"--> <!-- <el-button v-if="child.value && child.value.length > 1"-->
<!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">--> <!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
<!-- 更多--> <!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
<!-- </el-button>--> <!-- 更多-->
<!-- </el-button>-->
</template> </template>
<template v-else-if="child.value === null">-</template> <template v-else-if="child.value === null">-</template>
</p>
</template>
<!--修订本--> <!--修订本-->
<template v-for="(child, childIndex) in item.child5"> <template v-for="(child, childIndex) in item.child5">
<p class="files-title"> <p class="files-title">
@@ -257,6 +256,7 @@
<template v-if="child.value === null">-</template> <template v-if="child.value === null">-</template>
</p> </p>
</template> </template>
</div>
<p class="half"> <p class="half">
<label style=" margin-right: 150px;" <label style=" margin-right: 150px;"
title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。" title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
@@ -287,6 +287,13 @@
<!-- <p><label>文本说明:</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>--> <!-- <p><label>文本说明:</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
<!-- <p><label>重要度:</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>--> <!-- <p><label>重要度:</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
<!-- <p><label>纳入标准法规清单的国家/地区:</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>--> <!-- <p><label>纳入标准法规清单的国家/地区:</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
</template>
<div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
<div class="wrap" @click="handleToggleShowAll(item)">
<span>{{ item.showAll ? '收起' : '更多' }}</span>
<img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png">
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
@@ -384,7 +391,9 @@
> >
<!--发布稿、增补件单独设置下载权限--> <!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'"> <template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
file.oldFileName
}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -400,7 +409,9 @@
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
<template v-else> <template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
file.oldFileName
}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -479,7 +490,9 @@
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG' <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA' || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
file.oldFileName
}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -497,7 +510,9 @@
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
<template v-else> <template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
file.oldFileName
}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -527,7 +542,7 @@
v-for="(child, childIndex) in item.one" v-for="(child, childIndex) in item.one"
v-if="child.isShowImp === '0' && item.label == '过程稿件'" v-if="child.isShowImp === '0' && item.label == '过程稿件'"
> >
<!-- 增补件(必读)和勘误件不放在过程稿件里了--> <!-- 增补件(必读)和勘误件不放在过程稿件里了-->
<div <div
v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'" v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
:key="child.id" :key="child.id"
@@ -658,7 +673,9 @@
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>--> <!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿、增补件单独设置下载权限--> <!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'GLWJ'"> <template v-if="child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
file.oldFileName
}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -679,7 +696,9 @@
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
<template v-else> <template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
file.oldFileName
}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -709,12 +728,6 @@
</div> </div>
</template> </template>
<div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
<div class="wrap" @click="handleToggleShowAll(item)">
<span>{{ item.showAll ? '收起' : '更多' }}</span>
<img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png">
</div>
</div>
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
@@ -814,7 +827,8 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="editResolveList" @click="editResolveList"
>编辑</el-button> >编辑
</el-button>
</div> </div>
<div class="content"> <div class="content">
<el-table <el-table
@@ -893,10 +907,10 @@
width="90" width="90"
> >
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="responsibleUnit"--> <!-- prop="responsibleUnit"-->
<!-- label="责任部门">--> <!-- label="责任部门">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="dutyEngineer" prop="dutyEngineer"
label="责任工程师" label="责任工程师"
@@ -956,7 +970,7 @@
<!-- @pageSizeChange="pageSizeChange"></pagination>--> <!-- @pageSizeChange="pageSizeChange"></pagination>-->
</el-drawer> </el-drawer>
<!-- 编辑分解单的条款--> <!-- 编辑分解单的条款-->
<el-drawer <el-drawer
title="编辑" title="编辑"
:visible.sync="editResolveListShowflag" :visible.sync="editResolveListShowflag"
@@ -1032,11 +1046,11 @@
v-model="resolveListForm.xccssrq" v-model="resolveListForm.xccssrq"
placeholder="请选择新车型实施日期"> placeholder="请选择新车型实施日期">
</el-date-picker> </el-date-picker>
<!-- <el-input--> <!-- <el-input-->
<!-- style="width: 45%"--> <!-- style="width: 45%"-->
<!-- v-model.trim="resolveListForm.xccssrq"--> <!-- v-model.trim="resolveListForm.xccssrq"-->
<!-- clearable--> <!-- clearable-->
<!-- />--> <!-- />-->
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="在产车实施日期(文本)" label="在产车实施日期(文本)"
@@ -1050,11 +1064,11 @@
v-model="resolveListForm.zccssrq" v-model="resolveListForm.zccssrq"
placeholder="请选择在产车实施日期"> placeholder="请选择在产车实施日期">
</el-date-picker> </el-date-picker>
<!-- <el-input--> <!-- <el-input-->
<!-- style="width: 45%"--> <!-- style="width: 45%"-->
<!-- v-model.trim="resolveListForm.zccssrq"--> <!-- v-model.trim="resolveListForm.zccssrq"-->
<!-- clearable--> <!-- clearable-->
<!-- />--> <!-- />-->
</el-form-item> </el-form-item>
<!--适用车型--> <!--适用车型-->
<template> <template>
@@ -1077,16 +1091,16 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</template> </template>
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- label="责任工程师"--> <!-- label="责任工程师"-->
<!-- class="add-form-item"--> <!-- class="add-form-item"-->
<!-- >--> <!-- >-->
<!-- <el-input--> <!-- <el-input-->
<!-- style="width: 45%"--> <!-- style="width: 45%"-->
<!-- v-model="resolveListForm.dutyEngineer"--> <!-- v-model="resolveListForm.dutyEngineer"-->
<!-- clearable--> <!-- clearable-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item <el-form-item
label="符合性状态" label="符合性状态"
class="add-form-item" class="add-form-item"
@@ -1095,11 +1109,11 @@
<el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio> <el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio>
<el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio> <el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio>
</template> </template>
<!-- <el-input--> <!-- <el-input-->
<!-- style="width: 45%"--> <!-- style="width: 45%"-->
<!-- v-model="resolveListForm.complianceRequire"--> <!-- v-model="resolveListForm.complianceRequire"-->
<!-- clearable--> <!-- clearable-->
<!-- />--> <!-- />-->
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="合规性分析" label="合规性分析"
@@ -1120,14 +1134,16 @@
:loading="editLoading" :loading="editLoading"
icon="el-icon-check" icon="el-icon-check"
@click="saveEditInfo" @click="saveEditInfo"
>提交</el-button >提交
</el-button
> >
<el-button <el-button
size="mini" size="mini"
icon="el-icon-close" icon="el-icon-close"
class="common-button-default" class="common-button-default"
@click="resetEditResolveListForm" @click="resetEditResolveListForm"
>取消</el-button >取消
</el-button
> >
</div> </div>
</el-drawer> </el-drawer>
@@ -1300,11 +1316,15 @@
<div class="see-drawer-content"> <div class="see-drawer-content">
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label> <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span> <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{
standShowItemEO.itemsNum
}}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label> <label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span> <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{
standShowItemEO.itemsName
}}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label> <label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
@@ -1314,7 +1334,7 @@
}}</span> }}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="解读内容">解读内容</label> <label class="see-drawer-name" style="font-size: 14px" title="核心技术要求">核心技术要求</label>
<span class="see-drawer-val" style="font-size: 12px" <span class="see-drawer-val" style="font-size: 12px"
:title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''"> :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
{{ {{
@@ -1338,7 +1358,9 @@
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label> <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span> <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{
standShowItemEO.applyArctic
}}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label> <label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
@@ -1744,7 +1766,7 @@ import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
import CustomOrg from '@/components/CustomFormComponents/OrgTree' import CustomOrg from '@/components/CustomFormComponents/OrgTree'
import {dateFormat} from '@/common/date' import {dateFormat} from '@/common/date'
import RelatedTermsSelect from './components/RelatedTermsSelect' import RelatedTermsSelect from './components/RelatedTermsSelect'
import { getBusStandFileByAttId } from 'api/process' import {getBusStandFileByAttId} from 'api/process'
import {dicTypeData} from "api/unqualProcess"; import {dicTypeData} from "api/unqualProcess";
@@ -1769,7 +1791,7 @@ export default {
data() { data() {
return { return {
CycxOptions: [], CycxOptions: [],
activeNames: ['基础信息','过程稿件','实施日期'], activeNames: ['基础信息', '过程稿件', '实施日期'],
activeState: true, activeState: true,
itemExistList: [], itemExistList: [],
interpretationContent: '', interpretationContent: '',
@@ -1940,36 +1962,36 @@ export default {
}, },
applyArcticOptions: { applyArcticOptions: {
attrName: '适用车型', attrName: '适用车型',
options:[] options: []
}, // 适用车辆类型下拉框 }, // 适用车辆类型下拉框
modalshowflagZRBM: false, modalshowflagZRBM: false,
nodeListZRBM: [], nodeListZRBM: [],
nodeList2:[], nodeList2: [],
nodeList:[], nodeList: [],
userType:'', userType: '',
drawerTitle:'', drawerTitle: '',
modalShowRoleFlag:false, modalShowRoleFlag: false,
emergyKindOptions: [], // 能源种类下拉框 emergyKindOptions: [], // 能源种类下拉框
requestOptions: [], requestOptions: [],
BZFGGXOUIUJ: [], // 企标覆盖关系 BZFGGXOUIUJ: [], // 企标覆盖关系
itemModalTitle: '', itemModalTitle: '',
modalItemaddShowflag: false, modalItemaddShowflag: false,
editResolveListShowflag: false, editResolveListShowflag: false,
resolveListForm:{ resolveListForm: {
id:'', id: '',
itemsNum:'', itemsNum: '',
itemsName:'', itemsName: '',
termsConditions:'', termsConditions: '',
readContent:'', readContent: '',
comparedWithPrevious:'', comparedWithPrevious: '',
xccssrq:'', xccssrq: '',
zccssrq:'', zccssrq: '',
applyArctic:'', applyArctic: '',
dutyEngineer:'', dutyEngineer: '',
complianceRequire:'', complianceRequire: '',
complianceState:'', complianceState: '',
}, },
editLoading:false, editLoading: false,
itemAddOrUPdateFlag: '', itemAddOrUPdateFlag: '',
itemFormdisableflag: false, // 查看标准条款不可编辑 itemFormdisableflag: false, // 查看标准条款不可编辑
recommendList: [], recommendList: [],
@@ -2094,7 +2116,7 @@ export default {
watch: {}, watch: {},
methods: { methods: {
child1Func(child1) { child1Func(child1) {
console.log('1943',child1) console.log('1943', child1)
const list = [] const list = []
if (child1 && child1.length > 1) { if (child1 && child1.length > 1) {
for (let i = 0; i < child1.length; i++) { for (let i = 0; i < child1.length; i++) {
@@ -2105,7 +2127,7 @@ export default {
return child1 return child1
}, },
child3Func(child3) { child3Func(child3) {
console.log('1943',child3) console.log('1943', child3)
const list = [] const list = []
if (child3 && child3.length > 1) { if (child3 && child3.length > 1) {
list.push(child3[0]) list.push(child3[0])
@@ -2114,7 +2136,7 @@ export default {
return child3 return child3
}, },
child4Func(child4) { child4Func(child4) {
console.log('1943',child4) console.log('1943', child4)
const list = [] const list = []
if (child4 && child4.length > 1) { if (child4 && child4.length > 1) {
list.push(child4[0]) list.push(child4[0])
@@ -2123,7 +2145,7 @@ export default {
return child4 return child4
}, },
child5Func(child5) { child5Func(child5) {
console.log('1943',child5) console.log('1943', child5)
const list = [] const list = []
if (child5 && child5.length > 1) { if (child5 && child5.length > 1) {
list.push(child5[0]) list.push(child5[0])
@@ -2728,26 +2750,26 @@ export default {
nameList += item.name nameList += item.name
// } // }
}) })
if (this.drawerTitle === '责任部门'){ if (this.drawerTitle === '责任部门') {
this.sarStandardsInfoEO.ZRBMId = idList; this.sarStandardsInfoEO.ZRBMId = idList;
this.sarStandardsInfoEO['ZRBM'] = nameList; this.sarStandardsInfoEO['ZRBM'] = nameList;
}else if (this.drawerTitle === '查询责任部门'){ } else if (this.drawerTitle === '查询责任部门') {
this.advanceSearchMapping['ZRBM'] = nameList this.advanceSearchMapping['ZRBM'] = nameList
} }
}, },
choiceZRRS (type, title, id) { choiceZRRS(type, title, id) {
console.log('2077',type, title, id) console.log('2077', type, title, id)
this.nodeList = [] this.nodeList = []
this.nodeList.push(id) this.nodeList.push(id)
this.userType = type this.userType = type
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
}, },
checkedRole2 (data) { checkedRole2(data) {
console.log('1712',this.drawerTitle) console.log('1712', this.drawerTitle)
let idList = '' let idList = ''
let nameList = '' let nameList = ''
data.forEach( item => { data.forEach(item => {
if (nameList.length > 0) { if (nameList.length > 0) {
nameList += ',' nameList += ','
idList += ',' idList += ','
@@ -2755,7 +2777,7 @@ export default {
idList += item.id idList += item.id
nameList += item.name nameList += item.name
}) })
if (this.drawerTitle === '查询责任工程师'){ if (this.drawerTitle === '查询责任工程师') {
this.resolveListForm.dutyEngineer = nameList this.resolveListForm.dutyEngineer = nameList
} }
@@ -2765,38 +2787,38 @@ export default {
this.$refs.multipleTable.clearSelection() this.$refs.multipleTable.clearSelection()
// 当表格数据都没有被勾选的时候 就返回 // 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除 // 主要用于将当前勾选的表格状态清除
if(selection.length === 0) return if (selection.length === 0) return
this.$refs.multipleTable.toggleRowSelection(row, true) this.$refs.multipleTable.toggleRowSelection(row, true)
}, },
selectAllStand(alldata) { selectAllStand(alldata) {
this.selectedItemList = [] this.selectedItemList = []
this.selectedItemList.push(alldata[alldata.length - 1]) this.selectedItemList.push(alldata[alldata.length - 1])
console.log('2333',this.selectedItemList) console.log('2333', this.selectedItemList)
}, },
editResolveList(){ editResolveList() {
console.log('2337',this.selectedItemList) console.log('2337', this.selectedItemList)
if (this.selectedItemList.length>0){ if (this.selectedItemList.length > 0) {
this.editResolveListShowflag = true this.editResolveListShowflag = true
let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0])) let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
console.log('2518',editItem) console.log('2518', editItem)
this.resolveListForm = editItem this.resolveListForm = editItem
this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):'' this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : ''
// this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):'' // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq?this.resolveListForm.xccssrq.split(','):'' this.resolveListForm.xccssrq = this.resolveListForm.xccssrq ? this.resolveListForm.xccssrq.split(',') : ''
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq?this.resolveListForm.zccssrq.split(','):'' this.resolveListForm.zccssrq = this.resolveListForm.zccssrq ? this.resolveListForm.zccssrq.split(',') : ''
}else { } else {
this.$message.warning('请选择一条数据') this.$message.warning('请选择一条数据')
} }
}, },
saveEditInfo(){ saveEditInfo() {
console.log('2530',typeof this.resolveListForm.xccssrq) console.log('2530', typeof this.resolveListForm.xccssrq)
if (typeof this.resolveListForm.xccssrq !== 'string'){ if (typeof this.resolveListForm.xccssrq !== 'string') {
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',') this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
} }
if (typeof this.resolveListForm.zccssrq !== 'string'){ if (typeof this.resolveListForm.zccssrq !== 'string') {
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',') this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',')
} }
if (typeof this.resolveListForm.applyArctic !== 'string'){ if (typeof this.resolveListForm.applyArctic !== 'string') {
this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',') this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',')
} }
this.$http.putData( this.$http.putData(
@@ -2807,7 +2829,7 @@ export default {
}, },
(res) => { (res) => {
console.log(res) console.log(res)
if (res.ok){ if (res.ok) {
this.$message.success('修改成功') this.$message.success('修改成功')
this.resetEditResolveListForm() this.resetEditResolveListForm()
this.showItemsModel() this.showItemsModel()
@@ -2815,7 +2837,7 @@ export default {
} }
) )
}, },
resetEditResolveListForm(){ resetEditResolveListForm() {
this.editResolveListShowflag = false this.editResolveListShowflag = false
}, },
// 分页点击后方法 // 分页点击后方法
@@ -2975,21 +2997,21 @@ export default {
if (fileSuffix === '.PDG' || fileSuffix === '.pdg') { if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
this.getBusStandFileByAttId(attId) this.getBusStandFileByAttId(attId)
.then(res => { .then(res => {
if(res){ if (res) {
const editFileInfo = res const editFileInfo = res
console.log(editFileInfo) console.log(editFileInfo)
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
}else { } else {
const nowTime = new Date().getTime() const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) window.open(onlyOfficeUrl + '/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
} }
} }
}).catch(e => { }).catch(e => {
console.log(e) console.log(e)
this.$message.warning('文件不存在,预览失败') this.$message.warning('文件不存在,预览失败')
}) })
}else { } else {
this.$http.get('lawss/sarStandFile/queryConvertAtt', { this.$http.get('lawss/sarStandFile/queryConvertAtt', {
attId: attId attId: attId
}, { }, {
@@ -3102,6 +3124,7 @@ export default {
}, },
// 分解单----查看标准条款相关 // 分解单----查看标准条款相关
selectSarStandItems(id, flag) { selectSarStandItems(id, flag) {
this.page7 = 1
this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.standId = this.sarStandardsInfoEO.id
this.standItemSearch.fileType = this.fileType this.standItemSearch.fileType = this.fileType
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
@@ -3110,7 +3133,7 @@ export default {
}, {}, res => { }, {}, res => {
this.selectedItemList = [] this.selectedItemList = []
if (res.ok) { if (res.ok) {
console.log('3092',res.data.list) console.log('3092', res.data.list)
res.data.list.forEach(item => { res.data.list.forEach(item => {
let k = (item.applyArctic || "").split(',') let k = (item.applyArctic || "").split(',')
for (let i in this.applyArcticOptions.options) { for (let i in this.applyArcticOptions.options) {
@@ -3682,7 +3705,7 @@ export default {
displayLocation.forEach(location => { displayLocation.forEach(location => {
// 动态属性字段-FBGBJBD 单独添加至基础信息 // 动态属性字段-FBGBJBD 单独添加至基础信息
const list = displayLocation.filter(item => item.label === '过程稿件'); const list = displayLocation.filter(item => item.label === '过程稿件');
console.log('3535',list) console.log('3535', list)
if (location.label === '基础信息' && list && list.length > 0) { if (location.label === '基础信息' && list && list.length > 0) {
//发布稿必读 //发布稿必读
if (!list[0].child) { if (!list[0].child) {
@@ -3805,25 +3828,32 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/.el-icon-circle-close:before{
/deep/ .el-icon-circle-close:before {
margin-left: 250px; margin-left: 250px;
} }
/deep/.el-tag.el-tag--info {
/deep/ .el-tag.el-tag--info {
margin-left: 30px; margin-left: 30px;
} }
/deep/.el-radio {
/deep/ .el-radio {
margin-left: 30px; margin-left: 30px;
} }
/deep/.label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner {
width: 600px; width: 600px;
margin-left: 20px; margin-left: 20px;
} }
/deep/.label-input-form .add-form-item .el-form-item__label{
/deep/ .label-input-form .add-form-item .el-form-item__label {
width: 150px; width: 150px;
} }
/deep/.el-collapse-item__header {
/deep/ .el-collapse-item__header {
border-bottom: none !important; border-bottom: none !important;
} }
/deep/ .decomposition-btn { /deep/ .decomposition-btn {
position: absolute; position: absolute;
top: 6px; top: 6px;
@@ -3835,6 +3865,7 @@ export default {
color: #07C160; color: #07C160;
border: 1px solid #07C160; border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1); background: rgba(1, 193, 96, 0.1);
/deep/ .icon-separate { /deep/ .icon-separate {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
@@ -111,7 +111,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">选择人员</template> <template slot="title">选择人员</template>
</ProcessTitle> </ProcessTitle>
<el-form-item class="add-form-item" label="入会人员:"> <el-form-item class="add-form-item" label="入会人员:" prop="comityOpRoleId">
<el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input> <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
<el-input <el-input
placeholder="请选择入会成员" placeholder="请选择入会成员"
@@ -243,7 +243,9 @@ export default {
data() { data() {
return { return {
active: '1', // 默认显示 active: '1', // 默认显示
rh_rules: {}, rh_rules: {
comityOpRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
},
rh_pageData: { rh_pageData: {
comityFileNum: '', comityFileNum: '',
comityFileName: '', comityFileName: '',
@@ -107,7 +107,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">选择人员</template> <template slot="title">选择人员</template>
</ProcessTitle> </ProcessTitle>
<el-form-item class="add-form-item" label="参会人员:"> <el-form-item class="add-form-item" label="参会人员:" prop="meetingInRoleId">
<el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input> <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
<el-input <el-input
placeholder="请选择参会人员" placeholder="请选择参会人员"
@@ -239,7 +239,9 @@ export default {
acceptShow: false, acceptShow: false,
ch_pageData: {}, ch_pageData: {},
ch_rules: {}, ch_rules: {
meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
},
nodeList: [], nodeList: [],
commentText: '', commentText: '',
@@ -1,5 +1,5 @@
<template> <template>
<form> <form>
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
@@ -82,11 +82,11 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled"> <!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<el-datePicker v-model="form.issueTime" <!-- <el-datePicker v-model="form.issueTime"-->
:editable="false" <!-- :editable="false"-->
placeholder="请选择发布日期"></el-datePicker> <!-- placeholder="请选择发布日期"></el-datePicker>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FZRQBUSS"--> <!-- <el-datePicker v-model="form.FZRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
@@ -229,9 +229,9 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled"> <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-input <el-input
clearable
v-model="form.QCDW" v-model="form.QCDW"
placeholder="选择起草部门" placeholder="选择起草部门"
readonly="readonly"
@click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)"> @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -254,19 +254,25 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
<el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
</el-form-item>
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input> <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', form.VPPSBMBUSS,false)"></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.QCRBUSS" v-model="form.QCRBUSS"
placeholder="选择起草人" placeholder="选择起草人"
clearable readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)"> @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -292,8 +298,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input> <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -373,15 +385,15 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</form> </form>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle' import ProcessTitle from '../../../components/ProcessTitle'
export default { export default {
name: 'formEditList', name: 'formEditList',
components: { components: {
ProcessTitle, ProcessTitle,
@@ -502,6 +514,22 @@ export default {
...mapGetters(['userInfo']) ...mapGetters(['userInfo'])
}, },
methods: { methods: {
choiceZRR1(type, title, id) {
this.$emit('formChoiceZRR1',type,title,id)
},
choiceZRR2(type, title, id,flag) {
this.$emit('formChoiceZRR2',type,title,id,flag)
},
choiceZRR3(type, title, id) {
this.$emit('formChoiceZRR3',type,title,id)
},
choiceZRR4(type, title, id) {
this.$emit('formChoiceZRR4',type,title,id)
},
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
this.$emit('formChoiceQCDW',type,title,id) this.$emit('formChoiceQCDW',type,title,id)
}, },
@@ -667,7 +695,7 @@ export default {
deep: true //对象的深度验证 deep: true //对象的深度验证
}, },
} }
} }
</script> </script>
<style scoped> <style scoped>
@@ -1,5 +1,5 @@
<template> <template>
<form> <form>
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
@@ -32,10 +32,6 @@
<!-- ></el-option>--> <!-- ></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime" :disabled="disabledState"
:editable="false"></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FSRQBUSS"--> <!-- <el-datePicker v-model="form.FSRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
@@ -68,15 +64,19 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime" :disabled="disabledState"
:editable="false"></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.standYear" :disabled="disabledState"--> <!-- <el-input v-model="form.standYear" :disabled="disabledState"-->
<!-- clearable></el-input>--> <!-- clearable></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled"> <!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<el-datePicker v-model="form.issueTime" :disabled="disabledState" <!-- <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
:editable="false" <!-- :editable="false"-->
></el-datePicker> <!-- ></el-datePicker>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"--> <!-- <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
<!-- :editable="false"--> <!-- :editable="false"-->
@@ -159,12 +159,18 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
<el-input v-model="form.DYBXHBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input> <el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
@@ -190,8 +196,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input> <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -219,12 +231,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.BDTWJHLAWS" :disabled="disabledState"--> <!-- v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
<!-- clearable--> <!-- clearable-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled"> <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.XCSJBUSS" v-model="form.XCSJBUSS"
@@ -239,10 +251,64 @@
<template slot="title">意见信息</template> <template slot="title">意见信息</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow"> <div class="prc-content-border" v-show="opinionsShow">
<el-row :gutter="24"> <el-table
<el-col :span="12"> ref="selection"
<el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled"> tooltip-effect="dark"
<el-select v-model="form.opinionsAdopted" filterable clearable :disabled="disabledState"> style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
:data="form.infoList"
border
default-expand-all>
<el-table-column
label="序号"
min-width="15%"
align="center">
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column>
<el-table-column
prop="userName"
label="会签人"
align="center"
min-width="15%">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见"
min-width="35%"
align="center">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见文件"
min-width="35%"
align="left">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
<el-option <el-option
v-for="item in opinionsAdoptedOptions" v-for="item in opinionsAdoptedOptions"
:key="item.value" :key="item.value"
@@ -251,18 +317,32 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </template>
</el-row> </el-table-column>
</el-table>
<!-- <el-row :gutter="24">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="summaryFileList.length>0" v-for="(value,index) in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
<!-- {{value.name}}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</div> </div>
</form> </form>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle' import ProcessTitle from '../../../components/ProcessTitle'
export default { export default {
name: 'formList', name: 'formList',
components: { components: {
ProcessTitle, ProcessTitle,
@@ -292,6 +372,10 @@ export default {
type: Array, type: Array,
required: true required: true
}, },
summaryFileList: {
type: Array,
required: false
},
disabledState: { disabledState: {
type: Boolean, type: Boolean,
default: false default: false
@@ -305,6 +389,15 @@ export default {
default: false default: false
}, },
}, },
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
}
},
data () { data () {
return { return {
opinionsAdoptedOptions:[ opinionsAdoptedOptions:[
@@ -351,7 +444,7 @@ export default {
methods: { methods: {
downloadFile (data) { downloadFile (data) {
//文件id中出现了','字符,去除掉 //文件id中出现了','字符,去除掉
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
}, },
setMap(data){ setMap(data){
data.forEach(item => { data.forEach(item => {
@@ -410,7 +503,7 @@ export default {
this.busVsFunc() this.busVsFunc()
this.modelFunc() this.modelFunc()
} }
} }
</script> </script>
<style scoped> <style scoped>
@@ -0,0 +1,517 @@
<template>
<form>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
<el-input
v-model="form.standCode" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standName" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
<!-- <el-option-->
<!-- v-for="item in standStateOptions"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime" :disabled="disabledState"
:editable="false"></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FSRQBUSS"-->
<!-- :editable="false"-->
<!-- :disabled="true"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<!-- <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">-->
<!-- <el-option-->
<!-- v-for="item in countryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.standNumber" :disabled="disabledState"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
<el-option
v-for="item in standSortOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.standYear" :disabled="disabledState"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
:editable="false"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
<!-- :editable="false"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">过程稿件</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
<div v-if="FBGBUSSFileList.length>0" v-for="(value,index) in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<div v-if="LSBBBUSSFileList.length>0" v-for="(value,index) in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
<div v-if="BZSMBUSSFileList.length>0" v-for="(value,index) in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="QTWJBUSSFileList.length>0" v-for="(value,index) in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">适用范围</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-input v-model="form.QCDW" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
<el-input
v-model="form.WJSCRYBUSSName"
:disabled="true"
clearable
></el-input>
</el-form-item>
<el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in categoryOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
<el-input v-model="form.DYBXHBUSS" :disabled="disabledState"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in applyArcticOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in sycpxOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">关联信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.DTQBBHBUSS" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.XCSJBUSS"
clearable
:disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="opinionsShow">
<template slot="title">意见信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow">
<el-table
ref="selection"
tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
:data="form.infoList"
border
default-expand-all>
<el-table-column
label="序号"
min-width="15%"
align="center">
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column>
<el-table-column
prop="userName"
label="会签人"
align="center"
min-width="15%">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见"
min-width="35%"
align="center">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见文件"
min-width="35%"
align="left">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
</el-table>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="summaryFileList.length>0" v-for="(value,index) in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</form>
</template>
<script>
import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle'
export default {
name: 'formListIn',
components: {
ProcessTitle,
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
}
},
props: {
form: {
type: Object,
required: true
},
FBGBUSSFileList: {
type: Array,
required: true
},
LSBBBUSSFileList: {
type: Array,
required: true
},
BZSMBUSSFileList: {
type: Array,
required: true
},
QTWJBUSSFileList: {
type: Array,
required: true
},
GLWJBUSSFileList: {
type: Array,
required: true
},
summaryFileList: {
type: Array,
required: false
},
disabledState: {
type: Boolean,
default: false
},
verifySarStandard: {
type: Boolean,
default: false
},
opinionsShow: {
type: Boolean,
default: false
},
},
data () {
return {
opinionsAdoptedOptions:[
{value: '1',label: '采纳'},
{value: '2',label: '不采纳'},
],
countryOptions:[],//国家地区
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系
busVppsOptions: [], // 车系体系架构
busVppsChildOptions: [], // 车系体系架构子集合
modelOptions: [], // 模块体系架构
modelChildOptions: [], // 模块体系架构子集合
applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
cbcdOptions: [], // 采标程度
wssmrOptions: [], // 我司署名人
sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师
qcdwOption: [], // 起草单位
txlbOptions: [], // 体系类别
standSortConfigOptions: [], // 标准类别下拉框
adoptExtentOptions: [], // 采标程度下拉框
emergyKindOptions: [], // 能源种类下拉框
categoryConfigOptions: [], // 所属类别下拉框
assemClassOptions: [], // 总成分类下拉框
qcdwOptions:[],//起草单位下拉框
qcrOptions:[],//起草人下拉框
nylxOptions:[],//能源类型下拉框
syrzOptions:[],//适用认证下拉框
data: [], // 标准列表数据
ListForm: {}, // 新增数据
}
},
computed: {
...mapGetters(['userInfo'])
},
methods: {
downloadFile (data) {
//文件id中出现了','字符,去除掉
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
},
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = []
this.busVppsOptions = res.data
})
},
modelFunc(){
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = []
this.modelOptions = res.data
})
},
},
mounted () {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY
this.applyCountryOptions = res.data.COUNTRY
this.regionOptions = res.data.REGION // 区域
this.standStateOptions = res.data.BUSSSTATE
this.energyKindOptions = res.data.ENERGYTYPES
this.standGeneraOptions = res.data.BUSSBIGCLASS
this.standSubclassOptions = res.data.BUSSFINECLASS
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.standSystemOptions = res.data.TXLBBUSS // 标准体系
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.qcdwOptions = res.data.QCDW // 起草单位
this.qcrOptions = res.data.QCRBUSS // 起草人
this.nylxOptions = res.data.NYLXCLASS // 能源类型
this.syrzOptions = res.data.SYRZCLASS // 适用认证
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.setMap(this.standStateOptions)
})
this.busVsFunc()
this.modelFunc()
}
}
</script>
<style scoped>
</style>
@@ -58,13 +58,6 @@
<!-- placeholder="请输入标准年份"--> <!-- placeholder="请输入标准年份"-->
<!-- clearable></el-input>--> <!-- clearable></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FSRQBUSS"--> <!-- <el-datePicker v-model="form.FSRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
@@ -109,11 +102,18 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" <el-datePicker v-model="form.putTime"
:editable="false" :editable="false"
placeholder="请选择发布日期"></el-datePicker> placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item> </el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.issueTime"-->
<!-- :editable="false"-->
<!-- placeholder="请选择发布日期"></el-datePicker>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FZRQBUSS"--> <!-- <el-datePicker v-model="form.FZRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
@@ -262,19 +262,25 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
<el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
</el-form-item>
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input> <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', form.VPPSBMBUSS,false)"></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.QCRBUSS" v-model="form.QCRBUSS"
readonly="readonly"
placeholder="选择起草人" placeholder="选择起草人"
clearable
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)"> @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
</el-input> </el-input>
</el-form-item> </el-form-item>
@@ -300,8 +306,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input> <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -478,7 +490,7 @@
<el-form-item prop="bussUser2Name" style="margin-bottom: 0"> <el-form-item prop="bussUser2Name" style="margin-bottom: 0">
<h4>其他起草人</h4> <h4>其他起草人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser2Name" readonly="readonly" clearable placeholder="其他起草人" @click.native="choiceZRRList('bussUser2', '选择其他起草人', roleForm.bussUser2)"></el-input> <el-input v-model="roleForm.bussUser2Name" readonly="readonly" placeholder="其他起草人" @click.native="choiceZRRList('bussUser2', '选择其他起草人', roleForm.bussUser2)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -971,10 +983,37 @@
:check-strictly=true :check-strictly=true
:modalShowFlag="modalShowFlag2" :modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:type="type"
:url="url" :url="url"
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new> :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
@popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
<tree-select-new
width="500"
:lazy=true
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
:type="'truck'"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
@popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
<tree-select-module
width="500"
:lazy=true
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
@popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
</div> </div>
</template> </template>
@@ -986,6 +1025,8 @@
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
export default { export default {
@@ -995,7 +1036,8 @@
ProcessFooter, ProcessFooter,
ProcessTitle, ProcessTitle,
TreeSelect, TreeSelect,
TreeSelectNew TreeSelectNew,
treeSelectModule
}, },
data () { data () {
const validateZrUserIdName = (rule, value, callback) => { const validateZrUserIdName = (rule, value, callback) => {
@@ -1225,6 +1267,12 @@
TXLBBUSS: '', TXLBBUSS: '',
VPPSBMBUSS: '', VPPSBMBUSS: '',
VPPSCNBUSS: '', VPPSCNBUSS: '',
KCVPPSBMBUSS: '',
KCVPPSCNBUSS: '',
CYCVPPSBMBUSS: '',
CYCVPPSCNBUSS: '',
DYBXHBUSS: '',
DYMCBUSS: '',
// 关联信息 // 关联信息
DTQBBHBUSS: '', DTQBBHBUSS: '',
BDTQBBHBUSS: '', BDTQBBHBUSS: '',
@@ -1433,6 +1481,64 @@
}, },
}, },
methods: { methods: {
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} else {
this.form.CYCVPPSBMBUSS = checkedData.code
this.form.CYCVPPSCNBUSS = checkedData.chineseName
}
}else {
this.form.CYCVPPSBMBUSS = ''
this.form.CYCVPPSCNBUSS = ''
}
this.modalShowFlag2 = false
this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} else {
this.form.KCVPPSBMBUSS = checkedData.code
this.form.KCVPPSCNBUSS = checkedData.chineseName
}
}else {
this.form.KCVPPSBMBUSS = ''
this.form.KCVPPSCNBUSS = ''
}
this.modalShowFlag3 = false
this.$forceUpdate()
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
console.log(checkedData)
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
} else {
this.form.DYBXHBUSS = checkedData.model
this.form.DYMCBUSS = checkedData.name
}
}else {
this.form.DYBXHBUSS = ''
this.form.DYMCBUSS = ''
}
this.modalShowFlag4 = false
this.$forceUpdate()
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
modelProp(row,index){ modelProp(row,index){
console.log(row) console.log(row)
console.log(index) console.log(index)
@@ -1950,13 +2056,13 @@
}, },
choiceZRRList (type, title, id) { choiceZRRList (type, title, id) {
this.nodeList2 = [] this.nodeList2 = []
if(type === 'qcUserId'){ if(type === 'bussUser2'){
if ( this.roleForm.qcUserId.length > 0) { if ( this.roleForm.bussUser2.length > 0) {
this.nodeList2 = this.roleForm.qcUserId.split(',') this.nodeList2 = this.roleForm.bussUser2.split(',')
} }
}else if(type === 'hqUserId'){ }else if(type === 'bussUser5'){
if ( this.roleForm.hqUserId.length > 0) { if ( this.roleForm.bussUser5.length > 0) {
this.nodeList2 = this.roleForm.hqUserId.split(',') this.nodeList2 = this.roleForm.bussUser5.split(',')
} }
}else if(type === 'QCRBUSS'){ }else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) { if ( this.form.QCRBUSSID.length > 0) {
@@ -2027,14 +2133,15 @@
this.modalShowFlag1 = true this.modalShowFlag1 = true
this.key++ this.key++
}, },
choiceZRR2 (type, title, id) { choiceZRR2 (type, title, id,flag) {
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag2 = true this.modalShowFlag2 = true
this.multipleFlag2 = flag
this.url = '' this.url = ''
this.urlChild = '' this.urlChild = ''
this.type = type
this.url="sarVppsTree/list" this.url="sarVppsTree/list"
this.urlChild="sarVppsTree/childByList" this.urlChild="sarVppsTree/childByList"
this.key1++
}, },
choiceZRR3 (type, title, id) { choiceZRR3 (type, title, id) {
this.drawerTitle = title this.drawerTitle = title
@@ -2043,7 +2150,6 @@
this.urlChild = '' this.urlChild = ''
this.url="sarVppsTree/list" this.url="sarVppsTree/list"
this.urlChild="sarVppsTree/childByList" this.urlChild="sarVppsTree/childByList"
this.key2++
}, },
choiceZRR4 (type, title, id) { choiceZRR4 (type, title, id) {
this.drawerTitle = title this.drawerTitle = title
@@ -2052,7 +2158,6 @@
this.urlChild = '' this.urlChild = ''
this.url="sarModelTree/list" this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList" this.urlChild="sarModelTree/childByList"
this.key3++
}, },
getTree () { getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2372,19 +2477,6 @@
this.form.QCDWID = idList this.form.QCDWID = idList
}, },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}else {
this.form.VPPSBMBUSS = checkedData.code
this.form.VPPSCNBUSS = checkedData.chineseName
}
}
this.modalShowFlag2 = false
this.$forceUpdate()
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) { if(checkedData) {
if(checkedData.length > 0){ if(checkedData.length > 0){
@@ -2399,54 +2491,6 @@
popoverHideCancel(){ popoverHideCancel(){
this.modalShowFlag1 = false this.modalShowFlag1 = false
}, },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData && checkedData.length != 0) {
if(checkedData.length > 0 && checkedData.length != 0){
this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
}else {
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
this.modalShowFlag2 = false
}
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData && checkedData.length != 0) {
if(checkedData.length > 0){
this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
}else {
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
this.modalShowFlag3 = false
}
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData && checkedData.length != 0) {
if(checkedData.length > 0){
this.form.dybxh = checkedData.map(item => item.model).join(",")
this.form.dymc = checkedData.map(item => item.name).join(",")
}else {
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
this.modalShowFlag4 = false
}
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
closeDrawer() { closeDrawer() {
this.ListModel = false this.ListModel = false
}, },
@@ -19,7 +19,7 @@
label-width="210px" label-width="210px"
> >
<div style="flex: auto;" v-show="active === '1'"> <div style="flex: auto;" v-show="active === '1'">
<formList <formListIn
:form = "form" :form = "form"
:FBGBUSSFileList = "FBGBUSSFileList" :FBGBUSSFileList = "FBGBUSSFileList"
:LSBBBUSSFileList = "LSBBBUSSFileList" :LSBBBUSSFileList = "LSBBBUSSFileList"
@@ -29,7 +29,7 @@
:disabledState = "disabledState" :disabledState = "disabledState"
:verifySarStandard = "verifySarStandard" :verifySarStandard = "verifySarStandard"
:opinionsShow = "true" :opinionsShow = "true"
></formList> ></formListIn>
<div> <div>
<el-collapse accordion v-model="activeName"> <el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1"> <el-collapse-item title="审批意见" name = "1">
@@ -553,11 +553,11 @@
</template> </template>
<script> <script>
import formList from './common/formList.vue' import formListIn from './common/formListIn.vue'
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
import {getEvaluationIndex} from "api/businessApi"; import {getEvaluationIndex} from "api/businessApi";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -566,7 +566,7 @@
export default { export default {
name: "bussLibraryProduct13", name: "bussLibraryProduct13",
components: { components: {
formList, formListIn,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle, ProcessTitle,
@@ -794,6 +794,8 @@
countryArr:'', countryArr:'',
commentCycleDate:'', commentCycleDate:'',
form: { form: {
reviseStatus:'',
standSn:'',
evaluationData:[], evaluationData:[],
modelData:[], modelData:[],
modelDataNameVerify:[], modelDataNameVerify:[],
@@ -2340,6 +2342,7 @@
// 流程提交之后,应该流转至待办任务页面 // 流程提交之后,应该流转至待办任务页面
this.isSubmit = false this.isSubmit = false
this.saveLoading = false this.saveLoading = false
this.processCreateBuss(json)
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// if(this.formTongGuo.approvalOpinion === '1'){ // if(this.formTongGuo.approvalOpinion === '1'){
// this.$message.warning("驳回成功") // this.$message.warning("驳回成功")
@@ -2357,6 +2360,24 @@
} }
}) })
}, },
/**
* @description: 流程入库
* @date: 2020-11-18 21:47:58
*/
processCreateBuss(json) {
const _formData = new FormData()
_formData.append('infoJson', json)
processCreateBuss(_formData).then(res => {
if (res.result === '操作成功' || res.data === '入库成功') {
this.$message.success(res.data)
this.submitLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
this.isSubmit = false
}
})
},
busVsFunc(){ busVsFunc(){
this.$http.get('sarVppsTree/list', '', { this.$http.get('sarVppsTree/list', '', {
_this: this _this: this
@@ -2392,6 +2413,7 @@
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
this.getStandInfoByReviseStatus()
}) })
}, },
assemble(ids,names){ assemble(ids,names){
@@ -2454,6 +2476,21 @@
}) })
} }
}, },
getStandInfoByReviseStatus() {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:this.form.reviseStatus}, {
_this: this
}, res => {
const obj = res.data
let standSn = (obj === null || obj.newStandSn === null) ? '001' : obj.newStandSn
let date = new Date();
let year = date.getFullYear();
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standYear = this.form.reviseStatus === '2' ? (year + ' X') : year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}, e => {
})
},
processTable () { processTable () {
this.$nextTick(() => { this.$nextTick(() => {
Promise.all([this.getTaskId()]).then((value) => { Promise.all([this.getTaskId()]).then((value) => {
@@ -2225,7 +2225,6 @@
this.form.footFileName=this.footFileList.map(item => item.name).join(",") this.form.footFileName=this.footFileList.map(item => item.name).join(",")
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
// 会签意见存储
const infoList = [] const infoList = []
const info = {} const info = {}
info.footFile = this.form.footFile info.footFile = this.form.footFile
@@ -1650,8 +1650,20 @@
} }
}, },
choiceZRRList (type, title, id) { choiceZRRList (type, title, id) {
this.nodeList = [] this.nodeList2 = []
this.nodeList.push(id) if(type === 'bussUser2'){
if ( this.roleForm.bussUser2.length > 0) {
this.nodeList2 = this.roleForm.bussUser2.split(',')
}
}else if(type === 'bussUser5'){
if ( this.roleForm.bussUser5.length > 0) {
this.nodeList2 = this.roleForm.bussUser5.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type this.userType = type
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
@@ -31,11 +31,47 @@
<div> <div>
<el-collapse accordion v-model="activeName"> <el-collapse accordion v-model="activeName">
<el-collapse-item title="会签意见" name = "1"> <el-collapse-item title="会签意见" name = "1">
<div style="margin: 10px 0;"> <div style="margin: 0;">
<el-form <el-form
ref="formTongGuo" ref="formTongGuo"
:model="formTongGuo" :model="formTongGuo"
:rules="rules"> :rules="rules">
<!-- <el-form-item-->
<!-- prop="approvalOpinion"-->
<!-- >-->
<!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="会签意见文件" prop="summaryName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.summaryName"
clearable
></el-input>
<div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
<div style="width: 30%;">
<div v-for="(item,index) in summaryList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview2(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview2(item,'down')"></el-button>
</span>
</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-top: 6px; float: left;"
@click="fileUpload('summary')">
<i class="el-icon-upload"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item <el-form-item
prop="commentText" prop="commentText"
> >
@@ -659,6 +695,7 @@
prcName: this.$route.query.prcName, prcName: this.$route.query.prcName,
detailData: [], detailData: [],
fileList: [], fileList: [],
summaryList: [],
FBGBUSSFileList: [], FBGBUSSFileList: [],
BZSMBUSSFileList: [], BZSMBUSSFileList: [],
LSBBBUSSFileList: [], LSBBBUSSFileList: [],
@@ -1335,6 +1372,7 @@
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryList=this.assemble(mes.summary,mes.summaryName);
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText = mes.commentText
}) })
@@ -1958,22 +1996,33 @@
// this.fileList = fileList.splice(0, 1) // this.fileList = fileList.splice(0, 1)
// } // }
if (response.ok) { if (response.ok) {
const fileObj = {}
fileObj.id = file.response.data.id
fileObj.name = file.response.data.name
switch (this.fileType){ switch (this.fileType){
case 'FBGBUSS': case 'FBGBUSS':
this.FBGBUSSFileList = fileList this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
this.FBGBUSSFileList.push(fileObj)
break; break;
case 'BZSMBUSS' : case 'BZSMBUSS' :
this.BZSMBUSSFileList = fileList this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
this.BZSMBUSSFileList.push(fileObj)
break; break;
case 'LSBBBUSS': case 'LSBBBUSS':
this.LSBBBUSSFileList = fileList this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break; break;
case 'GLWJLAWS': case 'GLWJLAWS':
this.QTWJBUSSFileList = fileList this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
this.GLWJLAWSFileList.push(fileObj)
break; break;
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
this.GLWJBUSSFileList.push(fileObj)
break;
case 'summary':
this.summaryList = this.summaryList.filter ( item => item.response === undefined);
this.summaryList.push(fileObj)
break; break;
default : ; default : ;
} }
@@ -2010,6 +2059,9 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList this.fileList=this.GLWJBUSSFileList
break; break;
case 'summary':
this.fileList=this.summaryList
break;
default : ; default : ;
} }
this.fileMadel = true; this.fileMadel = true;
@@ -2033,6 +2085,9 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
case 'summary':
this.summaryList = fileList
break;
default : ; default : ;
} }
}, },
@@ -2134,6 +2189,8 @@
// if(item.country !== undefined && item.country !== null){ // if(item.country !== undefined && item.country !== null){
// this.sarStandardsInfoEO.country = item.country.split(","); // this.sarStandardsInfoEO.country = item.country.split(",");
// } // }
this.summary=this.summaryList.map(item => item.id).join(",")
this.summaryName=this.summaryList.map(item => item.name).join(",")
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
@@ -2266,14 +2323,22 @@
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.summary=this.summaryList.map(item => item.id).join(",")
this.summaryName=this.summaryList.map(item => item.name).join(",")
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.approvalOpinion = this.formTongGuo.approvalOpinion
// 会签意见存储 // 会签意见存储
const infoList = [] const infoList = []
const maryList=this.assemble(this.summary,this.summaryName);
const info = {} const info = {}
info.userId = this.userId info.userId = this.userId
info.userName = this.userName info.userName = this.userName
info.commentText = this.formTongGuo.commentText info.commentText = this.formTongGuo.commentText
info.summary = this.summary
info.summaryName = this.summaryName
info.summaryList = maryList
infoList.push(info) infoList.push(info)
this.form.infoList = infoList this.form.infoList = infoList
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
@@ -2397,6 +2462,8 @@
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
} }
}).catch(e => { }).catch(e => {
}) })
@@ -1655,8 +1655,20 @@
} }
}, },
choiceZRRList (type, title, id) { choiceZRRList (type, title, id) {
this.nodeList = [] this.nodeList2 = []
this.nodeList.push(id) if(type === 'bussUser2'){
if ( this.roleForm.bussUser2.length > 0) {
this.nodeList2 = this.roleForm.bussUser2.split(',')
}
}else if(type === 'bussUser5'){
if ( this.roleForm.bussUser5.length > 0) {
this.nodeList2 = this.roleForm.bussUser5.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type this.userType = type
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
@@ -2335,7 +2335,7 @@
let year = date.getFullYear(); let year = date.getFullYear();
this.form.standSn = standSn this.form.standSn = standSn
this.form.standNumber = standSn this.form.standNumber = standSn
this.form.standYear = year + ' X' this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}, e => { }, e => {
}) })
@@ -12,7 +12,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;"> <el-select v-model="qbfsForm.bussSort" filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option <el-option
v-for="(item, index) in standSortOptions" v-for="(item, index) in standSortOptions"
:key="index" :key="index"
@@ -54,7 +54,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;"> <el-select v-model="qbfsForm.bussSort" filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option <el-option
v-for="(item, index) in standSortOptions" v-for="(item, index) in standSortOptions"
:key="index" :key="index"
@@ -15,65 +15,42 @@
</ProcessTitle> </ProcessTitle>
<div class="content_form"> <div class="content_form">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px"> <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="会议名称:"> <el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }} {{ ch_pageData.meetingName || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="主办单位:"> <el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }} {{ ch_pageData.primaryUnit || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }} <span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="会议时间:"> <el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }} {{ ch_pageData.meetingStartTime || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="会议地点:"> <el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }} {{ ch_pageData.meetingPlace || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="费用标准:"> <el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }} {{ ch_pageData.feeStand || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="费用列支:"> <el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }} {{ ch_pageData.feeKind || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile"> <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<span v-if="uploadFileLength < 1">{{ '-' }}</span> <span v-if="uploadFileLength < 1">{{ '-' }}</span>
<span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)"> <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
{{ item.name }} {{ ';' }} {{ item.name }} {{ ';' }}
</span> </span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="类别:"> <el-form-item class="add-form-item" label="类别:">
<span v-if="ch_pageData.sort === '1'">计划内</span> <span v-if="ch_pageData.sort === '1'">计划内</span>
<span v-else>计划外</span> <span v-else>计划外</span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item" label-width="0px"> <el-form-item class="add-form-item" label-width="0px">
<el-table <el-table
class="meeting_table" class="meeting_table"
@@ -91,7 +68,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">选择人员</template> <template slot="title">选择人员</template>
</ProcessTitle> </ProcessTitle>
<el-form-item class="add-form-item" label="入会人员:"> <el-form-item class="add-form-item" label="参会人员:" prop="meetingInRoleId">
<el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input> <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
<el-input <el-input
placeholder="请选择参会人员" placeholder="请选择参会人员"
@@ -170,7 +147,9 @@ export default {
fillLeader: '', fillLeader: '',
fillFile: '', fillFile: '',
}, },
ch_rules: {}, ch_rules: {
meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
},
nodeList: [], nodeList: [],
modalshowflag: false, modalshowflag: false,
commentText: '', commentText: '',
@@ -314,6 +293,9 @@ export default {
.prc-content-border { .prc-content-border {
overflow: auto; overflow: auto;
} }
/deep/.el-form-item__content {
margin-top: 5px;
}
/deep/.prc-content-border .el-form-item__content { /deep/.prc-content-border .el-form-item__content {
width: 270px; width: 270px;
} }
@@ -15,65 +15,42 @@
</ProcessTitle> </ProcessTitle>
<div class="content_form"> <div class="content_form">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px"> <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="会议名称:"> <el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }} {{ ch_pageData.meetingName || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="主办单位:"> <el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }} {{ ch_pageData.primaryUnit || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }} <span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="会议时间:"> <el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }} {{ ch_pageData.meetingStartTime || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="会议地点:"> <el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }} {{ ch_pageData.meetingPlace || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="费用标准:"> <el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }} {{ ch_pageData.feeStand || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="费用列支:"> <el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }} {{ ch_pageData.feeKind || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile"> <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<span v-if="uploadFileLength < 1">{{ '-' }}</span> <span v-if="uploadFileLength < 1">{{ '-' }}</span>
<span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)"> <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
{{ item.name }} {{ ';' }} {{ item.name }} {{ ';' }}
</span> </span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="类别:"> <el-form-item class="add-form-item" label="类别:">
<span v-if="ch_pageData.sort === '1'">计划内</span> <span v-if="ch_pageData.sort === '1'">计划内</span>
<span v-else>计划外</span> <span v-else>计划外</span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item" label="议题:"> <el-form-item class="add-form-item" label="议题:">
<el-table <el-table
class="meeting_table" class="meeting_table"
@@ -285,6 +262,9 @@ export default {
.prc-content-border { .prc-content-border {
overflow: auto; overflow: auto;
} }
/deep/.el-form-item__content {
margin-top: 5px;
}
/deep/.prc-content-border .el-form-item__content { /deep/.prc-content-border .el-form-item__content {
width: 270px; width: 270px;
} }
@@ -17,65 +17,42 @@
</ProcessTitle> </ProcessTitle>
<div class="content_form"> <div class="content_form">
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px"> <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="会议名称:"> <el-form-item class="add-form-item" label="会议名称:">
{{ ch_pageData.meetingName || '-' }} {{ ch_pageData.meetingName || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="主办单位:"> <el-form-item class="add-form-item" label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }} {{ ch_pageData.primaryUnit || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }} <span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="会议时间:"> <el-form-item class="add-form-item" label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }} {{ ch_pageData.meetingStartTime || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="会议地点:"> <el-form-item class="add-form-item" label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }} {{ ch_pageData.meetingPlace || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="费用标准:"> <el-form-item class="add-form-item" label="费用标准:">
{{ ch_pageData.feeStand || '-' }} {{ ch_pageData.feeStand || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="费用列支:"> <el-form-item class="add-form-item" label="费用列支:">
{{ ch_pageData.feeKind || '-' }} {{ ch_pageData.feeKind || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile"> <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
<span v-if="uploadFileLength < 1">{{ '-' }}</span> <span v-if="uploadFileLength < 1">{{ '-' }}</span>
<span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)"> <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
{{ item.name }} {{ ';' }} {{ item.name }} {{ ';' }}
</span> </span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item class="add-form-item" label="类别:"> <el-form-item class="add-form-item" label="类别:">
<span v-if="ch_pageData.sort === '1'">计划内</span> <span v-if="ch_pageData.sort === '1'">计划内</span>
<span v-else>计划外</span> <span v-else>计划外</span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item" label="议题:"> <el-form-item class="add-form-item" label="议题:">
<el-table <el-table
class="meeting_table" class="meeting_table"
@@ -348,6 +325,9 @@ export default {
.prc-content-border { .prc-content-border {
overflow: auto; overflow: auto;
} }
/deep/.el-form-item__content {
margin-top: 5px;
}
/deep/.prc-content-border .el-form-item__content { /deep/.prc-content-border .el-form-item__content {
width: 270px; width: 270px;
} }
@@ -15,64 +15,41 @@
</ProcessTitle> </ProcessTitle>
<div class="content_form"> <div class="content_form">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules"> <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }} <span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState"> <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }} {{ rh_pageData.comityState || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind"> <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }} {{ rh_pageData.comityKind || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="资质:"> <el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }} {{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="成员:"> <el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }} {{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="费用估计:"> <el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }} {{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="职责:"> <el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }} {{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="任期:"> <el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }} {{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources"> <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
<span v-if="infoSourcesLength === 0">{{ '-' }}</span> <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
<span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)"> <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
{{ item.name }} {{ ';' }} {{ item.name }} {{ ';' }}
</span> </span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item" label="工作方向:" prop="workPath"> <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea" readonly style="width: 50%;height: auto"></el-input> <el-input v-model="rh_pageData.workPath" type="textarea" readonly style="width: 50%;height: auto"></el-input>
</el-form-item> </el-form-item>
@@ -95,7 +72,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">选择人员</template> <template slot="title">选择人员</template>
</ProcessTitle> </ProcessTitle>
<el-form-item class="add-form-item" label="入会人员:"> <el-form-item class="add-form-item" label="入会人员:" prop="comityOpRoleId">
<el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input> <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
<el-input <el-input
placeholder="请选择入会成员" placeholder="请选择入会成员"
@@ -182,7 +159,9 @@ export default {
comityOpRole: '', comityOpRole: '',
comityInRoleId: '', comityInRoleId: '',
}, },
roleForm: {}, roleForm: {
comityOpRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
},
commentText: '', commentText: '',
roleShowflag: false, roleShowflag: false,
nodeList: [], nodeList: [],
@@ -324,6 +303,9 @@ export default {
.prc-content-border { .prc-content-border {
overflow: auto; overflow: auto;
} }
/deep/.el-form-item__content {
margin-top: 5px;
}
/deep/.prc-content-border .el-form-item__content { /deep/.prc-content-border .el-form-item__content {
width: 270px; width: 270px;
} }
@@ -15,64 +15,41 @@
</ProcessTitle> </ProcessTitle>
<div class="content_form"> <div class="content_form">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules"> <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }} <span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState"> <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }} {{ rh_pageData.comityState || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind"> <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }} {{ rh_pageData.comityKind || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="资质:"> <el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }} {{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="成员:"> <el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }} {{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="费用估计:"> <el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }} {{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="职责:"> <el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }} {{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="任期:"> <el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }} {{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources"> <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
<span v-if="infoSourcesLength === 0">{{ '-' }}</span> <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
<span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)"> <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
{{ item.name }} {{ ';' }} {{ item.name }} {{ ';' }}
</span> </span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item" label="工作方向:" prop="workPath"> <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input> <el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
</el-form-item> </el-form-item>
@@ -327,6 +304,9 @@ export default {
.prc-content-border { .prc-content-border {
overflow: auto; overflow: auto;
} }
/deep/.el-form-item__content {
margin-top: 5px;
}
/deep/.prc-content-border .el-form-item__content { /deep/.prc-content-border .el-form-item__content {
width: 270px; width: 270px;
} }
@@ -17,64 +17,45 @@
</ProcessTitle> </ProcessTitle>
<div class="content_form"> <div class="content_form">
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules"> <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }} <span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState"> <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
{{ rh_pageData.comityState || '-' }} {{ rh_pageData.comityState || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind"> <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
{{ rh_pageData.comityKind || '-' }} {{ rh_pageData.comityKind || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="资质:"> <el-form-item class="add-form-item" label="资质:">
{{ rh_pageData.comityMake.makeQualification || '-' }} {{ rh_pageData.comityMake.makeQualification || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="成员:"> <el-form-item class="add-form-item" label="成员:">
{{ rh_pageData.comityMake.makeRole || '' }} {{ rh_pageData.comityMake.makeRole || '' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="费用估计:"> <el-form-item class="add-form-item" label="费用估计:">
{{ rh_pageData.comityMake.makeCost || '-' }} {{ rh_pageData.comityMake.makeCost || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="add-form-item" label="职责:"> <el-form-item class="add-form-item" label="职责:">
{{ rh_pageData.comityMake.makeDuties || '-' }} {{ rh_pageData.comityMake.makeDuties || '-' }}
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="add-form-item" label="任期:"> <el-form-item class="add-form-item" label="任期:">
{{ rh_pageData.comityMake.makeTime || '-' }} {{ rh_pageData.comityMake.makeTime || '-' }}
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources"> <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
<span v-if="infoSourcesLength < 1">{{ '-' }}</span> <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
<span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)"> <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
{{ item.name }} {{ ';' }} {{ item.name }} {{ ';' }}
</span> </span>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item" label="工作方向:" prop="workPath"> <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" readonly type="textarea" style="width: 50%;height: auto"></el-input> <el-input v-model="rh_pageData.workPath" readonly type="textarea" style="width: 50%;height: auto"></el-input>
</el-form-item> </el-form-item>
@@ -340,6 +321,9 @@ export default {
.prc-content-border { .prc-content-border {
overflow: auto; overflow: auto;
} }
/deep/.el-form-item__content {
margin-top: 5px;
}
/deep/.prc-content-border .el-form-item__content { /deep/.prc-content-border .el-form-item__content {
width: 270px; width: 270px;
} }
@@ -307,6 +307,11 @@
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span> <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="replaceStandNum"
width="150"
label="代替标准号">
</el-table-column>
<el-table-column fixed="right" <el-table-column fixed="right"
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
label="收藏" align="center" width="50px" label="收藏" align="center" width="50px"
@@ -675,7 +675,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</template> </template>
<template v-else-if="field.attrField === 'DTQBBHBUSS'"> <template v-else-if="field.attrField === 'DTQBBHBUSS' || field.attrField === 'CYBZ' || field.attrField === 'YYBZ'">
<custom-input-for-standards <custom-input-for-standards
:config="field" :config="field"
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''" :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"