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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-05 21:09:30 +08:00
parent 80d1b06ed0 c9f6a06c6f
commit 294c773e14
33 changed files with 1849 additions and 1276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForAllStandards2.vue
+4 -1
View File
@@ -164,6 +164,9 @@
labelWidth: { labelWidth: {
type: String, type: String,
default: '150px' default: '150px'
},
placeholderText: {
type: String
} }
}, },
data () { data () {
@@ -193,7 +196,7 @@
}, },
computed: { computed: {
placeholder () { placeholder () {
return `请输入${this.config.attrName}` return `${this.placeholderText}`
}, },
showMessage () { showMessage () {
return `${this.config.attrName}不能为空` return `${this.config.attrName}不能为空`
src/pages/details/otherStandardDetails/index.vue
+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="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -266,7 +266,7 @@
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{ <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
sarStandardsInfoEO.issueTime || '-' sarStandardsInfoEO.issueTime || '-'
}}</span></p> }}</span></p>
<p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{ <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{
standMap[sarStandardsInfoEO.standNature] || '-' standMap[sarStandardsInfoEO.standNature] || '-'
}}</span></p> }}</span></p>
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
@@ -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>
@@ -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;
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+142 -41
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,34 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div> <div>
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="fileClass"
style="margin-right: 15px;padding-left: 10px"
v-for="(item, index) in form.fjList"
:key="index">
<span @click="fileLook(item)">{{ item.fileName }}</span>
<el-button
size="small"
@click="filesUpload(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
@click="filesUpload(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -67,12 +86,14 @@
<div class="button-list"> <div class="button-list">
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')" @click="upload(oldData, '汇总单.xls')"
size="mini">导出汇总单</el-button> size="mini">生成汇总单
</el-button>
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')" @click="upload(data, '上报意见.xls')"
size="mini">导出征求意见搞</el-button> size="mini">生成上报意见
</el-button>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@@ -109,6 +130,9 @@
prop="oldText" prop="oldText"
align="center" align="center"
label="修改前"> label="修改前">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newText" prop="newText"
@@ -211,6 +235,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog
title="查看修改前内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@@ -224,6 +257,8 @@ export default {
name: "bzzqyjStep1-9", name: "bzzqyjStep1-9",
data() { data() {
return { return {
itermsConditionsFlag: false,
itermsConditionsTitle: '',
histortData: [], histortData: [],
oldData: [], oldData: [],
data: [], data: [],
@@ -246,9 +281,14 @@ export default {
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
cid: '', // 编号 cid: "", // 编号
endTime: '', // 结束日期 endTime: "", // 结束日期
cname: '', // 名称 cname: "", // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
@@ -264,6 +304,25 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
fileLook(file) { // 预览
const attId = file.attId
this.$preview(attId)
},
filesUpload (file) { // 下载
const attId = file.attId
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
},
updataFj (item) { updataFj (item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
@@ -281,29 +340,39 @@ export default {
this.histortData = res this.histortData = res
}, e => {}) }, e => {})
}, },
upload (row, title) { upload(row, title) {
if (row.length > 0) {
var params = { var params = {
columnName: { columnName: {
chapterNumber : '章条编号', chapterNumber: "章条编号",
chapterName : '章节名称', chapterName: "章节名称",
commentText: '修改意见内容（包括理由或依据）', commentText: "修改意见内容（包括理由或依据）",
department: '提出部门', oldText: "修改前",
responUserName: '提出人', newText: "修改后",
stateText: '处理意见' reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
}, },
dataList: [] dataList: []
};
if (title === '上报意见.xls') {
params.columnName.stateText = "处理意见"
} }
params.dataList = JSON.parse(JSON.stringify(row)) params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => { params.dataList.forEach(item => {
if (item.state === '1') { if (item.state === "1") {
item.stateText = '上报' item.stateText = "上报";
} else if (item.state === '2') { } else if (item.state === "2") {
item.stateText = '处理后上报' item.stateText = "处理后上报";
} else { } else {
item.stateText = '不上报' item.stateText = "不上报";
}
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
} else {
this.$message.warning('无上报数据')
} }
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
}, },
stateText (row) { stateText (row) {
if (row === '1') { if (row === '1') {
@@ -343,23 +412,55 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.fjList = data.fjList || data.form.fjList
this.form.endTime = data.endTime if (data.fjListId === '') {
this.form.cname = data.cname this.form.fjListId = ''
this.form.fjList = data.fjList } else {
this.form.fjListId = data.fjListId this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText9 = data.commentText9 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.summaryList.forEach( item => { data.info.forEach(item => {
if (item.state != '3') { if (item.state != '3') {
arr.push(item) arr.push(item)
} }
}) })
this.json = data this.json = data
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.data = arr this.data = arr
this.oldData = data.oldinfo
}).catch(e => { }).catch(e => {
}) });
}) });
// return new Promise((resolve, reject) => {
// inboundLiaisonDetail({
// taskIds: this.taskIds,
// pId: this.pId
// }).then(res => {
// let data = JSON.parse(res.mesg)
// console.log(data);
// this.form.cid = data.cid
// this.form.endTime = data.endTime
// this.form.cname = data.cname
// this.form.fjList = data.fjList
// this.form.fjListId = data.fjListId
// var arr = []
// data.summaryList.forEach( item => {
// if (item.state != '3') {
// arr.push(item)
// }
// })
// this.json = data
// this.data = arr
// this.oldData = data.oldinfo
// }).catch(e => {
// })
// })
}, },
}, },
mounted () { mounted () {
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+7 -7
View File
@@ -40,13 +40,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"-->
@@ -82,6 +75,13 @@
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"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</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"-->
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+24 -4
View File
@@ -1022,7 +1022,7 @@
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} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} 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"; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -2651,9 +2651,17 @@
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName json.prcCreateUserName = this.form.prcCreateUserName
this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, { this.$http.post('lawss/activiti/startProcessRollBack', {
_this: this id: this.$route.query.bpnId || '',
}, res => { createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: 'buss2',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {}, res => {
if (res.ok) { if (res.ok) {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data, taskIds: res.data,
@@ -2665,12 +2673,24 @@
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
this.isSubmit = false this.isSubmit = false
if (this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} }
}) })
} }
}) })
// this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, {
// _this: this
// }, res => {
// })
}else { }else {
this.$message.warning('请检查人员信息表单是否填写完整') this.$message.warning('请检查人员信息表单是否填写完整')
} }
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+32 -8
View File
@@ -68,14 +68,37 @@
<el-table-column <el-table-column
prop="commentText" prop="commentText"
label="会签意见" label="会签意见"
min-width="70%" min-width="35%"
align="center"> align="center">
</el-table-column> </el-table-column>
</el-table> <el-table-column
<el-row :gutter="24"> prop="commentText"
<el-col :span="12"> label="会签意见文件"
<el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled"> min-width="35%"
<el-select v-model="form.opinionsAdopted" filterable clearable> 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>
<el-option <el-option
v-for="item in opinionsAdoptedOptions" v-for="item in opinionsAdoptedOptions"
:key="item.value" :key="item.value"
@@ -84,8 +107,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </template>
</el-row> </el-table-column>
</el-table>
</div> </div>
</template> </template>
<div> <div>
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+112 -92
View File
@@ -6,7 +6,7 @@
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>--> <!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content"> <div class="content">
@@ -39,24 +39,24 @@
<template slot="title">文件汇总</template> <template slot="title">文件汇总</template>
</ProcessTitle> </ProcessTitle>
<template> <template>
<div class="prc-content-border" style="height: 66vh;position: relative;"> <div class="prc-content-border" style="height: auto;position: relative;">
<el-table <el-table
ref="selection" ref="selection"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;" 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', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
:data="form.fileModelList" :data="form.fileModelList"
border border
default-expand-all> default-expand-all>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="序号"--> <!-- label="序号"-->
<!-- min-width="15%"--> <!-- min-width="15%"-->
<!-- align="center">--> <!-- align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{scope.$index + 1}}--> <!-- {{scope.$index + 1}}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="footFileName" prop="footFileName"
label="编写文件名称" label="编写文件名称"
@@ -91,6 +91,14 @@
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 <el-form-item
prop="commentText" prop="commentText"
> >
@@ -108,85 +116,85 @@
</el-collapse> </el-collapse>
</div> </div>
</div> </div>
<!-- <div class="block" id="active2" v-show="active === '2'">--> <!-- <div class="block" id="active2" v-show="active === '2'">-->
<!-- <ProcessTitle>--> <!-- <ProcessTitle>-->
<!-- <template slot="title">模块信息</template>--> <!-- <template slot="title">模块信息</template>-->
<!-- </ProcessTitle>--> <!-- </ProcessTitle>-->
<!-- <template>--> <!-- <template>-->
<!-- <div class="prc-content-border" style="height: 66vh;position: relative;">--> <!-- <div class="prc-content-border" style="height: 66vh;position: relative;">-->
<!-- <div class="action-bar">--> <!-- <div class="action-bar">-->
<!-- <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">--> <!-- <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
<!-- 批量编辑--> <!-- 批量编辑-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- class="common-button-primary add-button"--> <!-- class="common-button-primary add-button"-->
<!-- @click="createRow"--> <!-- @click="createRow"-->
<!-- >创建模块</el-button>--> <!-- >创建模块</el-button>-->
<!-- </div>--> <!-- </div>-->
<!-- <el-table--> <!-- <el-table-->
<!-- ref="selection"--> <!-- ref="selection"-->
<!-- tooltip-effect="dark"--> <!-- tooltip-effect="dark"-->
<!-- style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"--> <!-- style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
<!-- :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',--> <!-- :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
<!-- fontWeight: 'bold', height: '48px'}"--> <!-- fontWeight: 'bold', height: '48px'}"-->
<!-- @selection-change="handleSelectionChange"--> <!-- @selection-change="handleSelectionChange"-->
<!-- row-key="id"--> <!-- row-key="id"-->
<!-- :data="form.modelData"--> <!-- :data="form.modelData"-->
<!-- border--> <!-- border-->
<!-- default-expand-all--> <!-- default-expand-all-->
<!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">--> <!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
<!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>--> <!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="modelNum"--> <!-- prop="modelNum"-->
<!-- label="序号"--> <!-- label="序号"-->
<!-- min-width="15%"--> <!-- min-width="15%"-->
<!-- align="center"--> <!-- align="center"-->
<!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">--> <!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="名称"--> <!-- label="名称"-->
<!-- align="center"--> <!-- align="center"-->
<!-- min-width="30%">--> <!-- min-width="30%">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"--> <!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >--> <!-- >-->
<!-- <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled" placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>--> <!-- <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled" placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="责任人"--> <!-- label="责任人"-->
<!-- min-width="15%"--> <!-- min-width="15%"-->
<!-- align="center">--> <!-- align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"--> <!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >--> <!-- >-->
<!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>--> <!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" min-width="5%">--> <!-- <el-table-column label="操作" align="center" min-width="5%">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <div @click.stop style="display: inline-block">--> <!-- <div @click.stop style="display: inline-block">-->
<!-- <el-dropdown trigger="click" @command="handleCommand">--> <!-- <el-dropdown trigger="click" @command="handleCommand">-->
<!-- <i class="iconfont">&#xe61e;</i>--> <!-- <i class="iconfont">&#xe61e;</i>-->
<!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- </el-table>--> <!-- </el-table>-->
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<!-- </div>--> <!-- </div>-->
<div class="block" style="padding-top: 20px;" v-show="active === '3'"> <div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list">
<el-table <el-table
@@ -1642,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
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+48 -12
View File
@@ -39,11 +39,11 @@
<template slot="title">意见信息</template> <template slot="title">意见信息</template>
</ProcessTitle> </ProcessTitle>
<template> <template>
<div class="prc-content-border" style="height: 66vh;position: relative;"> <div class="prc-content-border" style="height: auto;position: relative;">
<el-table <el-table
ref="selection" ref="selection"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;" 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', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@@ -68,14 +68,37 @@
<el-table-column <el-table-column
prop="commentText" prop="commentText"
label="会签意见" label="会签意见"
min-width="70%" min-width="35%"
align="center"> align="center">
</el-table-column> </el-table-column>
</el-table> <el-table-column
<el-row :gutter="24"> prop="commentText"
<el-col :span="12"> label="会签意见文件"
<el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled"> min-width="35%"
<el-select v-model="form.opinionsAdopted" filterable clearable> 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>
<el-option <el-option
v-for="item in opinionsAdoptedOptions" v-for="item in opinionsAdoptedOptions"
:key="item.value" :key="item.value"
@@ -84,8 +107,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </template>
</el-row> </el-table-column>
</el-table>
</div> </div>
</template> </template>
<div> <div>
@@ -1655,8 +1679,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
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+65 -24
View File
@@ -330,6 +330,70 @@
@click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
<el-input
v-model="form.CYBZ"
placeholder="请输入采用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('CYBZ'),config.attrName = '采用标准'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
<el-input
v-model="form.YYBZ"
placeholder="请输入引用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('YYBZ'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button>
</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"-->
<!-- placeholder="请输入被代替企标编号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
<!-- >{{'手动查找'}}</el-button>-->
<!-- </el-form-item>-->
<el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.XCSJBUSS"
placeholder=""
clearable
:disabled="true"
></el-input>
</el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select v-model="form.CBCD" filterable clearable
placeholder="请先选择采标程度"
>
<el-option
v-for="item in cbcdOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -359,30 +423,6 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </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"-->
<!-- placeholder="请输入被代替企标编号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
<!-- >{{'手动查找'}}</el-button>-->
<!-- </el-form-item>-->
<el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.XCSJBUSS"
placeholder=""
clearable
:disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</div> </div>
</form> </form>
@@ -680,6 +720,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+32 -9
View File
@@ -174,7 +174,7 @@
</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 v-model="form.QCRBUSS" :disabled="disabledState" clearable></el-input> <el-input v-model="form.QCRBUSS" :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled"> <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-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
@@ -220,14 +220,17 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="采用标准" prop="CYBZ" 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)"> <el-input
<!-- {{ value.name }} --> v-model="form.CYBZ" :disabled="disabledState"
{{value.name}} clearable
</div> ></el-input>
<div v-else> </el-form-item>
- - <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
</div> <el-input
v-model="form.YYBZ" :disabled="disabledState"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -244,6 +247,25 @@
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in cbcdOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</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>
</el-row> </el-row>
</div> </div>
@@ -498,6 +520,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+31 -8
View File
@@ -226,14 +226,17 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="采用标准" prop="CYBZ" 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)"> <el-input
<!-- {{ value.name }} --> v-model="form.CYBZ" :disabled="disabledState"
{{value.name}} clearable
</div> ></el-input>
<div v-else> </el-form-item>
- - <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
</div> <el-input
v-model="form.YYBZ" :disabled="disabledState"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -250,6 +253,25 @@
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in cbcdOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</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>
</el-row> </el-row>
</div> </div>
@@ -504,6 +526,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+134 -23
View File
@@ -281,6 +281,7 @@
<el-input <el-input
v-model="form.QCRBUSS" v-model="form.QCRBUSS"
placeholder="选择起草人" placeholder="选择起草人"
:title="form.QCRBUSS"
readonly="readonly" readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)"> @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
</el-input> </el-input>
@@ -339,28 +340,33 @@
@click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
<el-input <el-input
disabled v-model="form.CYBZ"
style="display: none;" placeholder="请输入采用标准"
v-model="form.GLWJBUSSName"
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;" style="position:absolute;top: 10px;right: 0;"
@click="fileUpload('GLWJBUSS')"> @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
<i class="el-icon-upload"></i> >{{'手动查找'}}</el-button>
</el-button> </el-form-item>
</div> <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
</div> <el-input
v-model="form.YYBZ"
placeholder="请输入引用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('YYBZ'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -386,6 +392,41 @@
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select v-model="form.CBCD" filterable clearable
placeholder="请先选择采标程度"
>
<el-option
v-for="item in cbcdOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.GLWJBUSSName"
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('GLWJBUSS')">
<i class="el-icon-upload"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -1038,7 +1079,7 @@
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} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} 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"; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1055,6 +1096,15 @@
TreeSelectNew, TreeSelectNew,
treeSelectModule treeSelectModule
}, },
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
}
},
data () { data () {
const validateZrUserIdName = (rule, value, callback) => { const validateZrUserIdName = (rule, value, callback) => {
if(this.FBGBUSSFileList.length === 0){ if(this.FBGBUSSFileList.length === 0){
@@ -1321,6 +1371,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -1425,6 +1479,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change' } { required: false, message: '请选择企标发布日期', trigger: 'change' }
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1806,6 +1863,16 @@
XCSJBUSS: '', XCSJBUSS: '',
} // 标准信息 } // 标准信息
}, },
filterDate(data){
if(data === undefined || data === null || data === '' || data === 'null'){
return ""
}else if (data.toString().indexOf(",") !== -1){
data = data.toString().split(",")
}else {
data = data.toString()
}
return data
},
handleProcessStandardNext(status) { handleProcessStandardNext(status) {
switch (status) { switch (status) {
// 新增 // 新增
@@ -1824,6 +1891,18 @@
this.form.planId = this.standardCheckedList[0].id this.form.planId = this.standardCheckedList[0].id
this.form.planStatus = this.standardCheckedList[0].planStatus this.form.planStatus = this.standardCheckedList[0].planStatus
this.form.reviseStatus = this.standardCheckedList[0].reviseStatus this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
// 代替企标编号
this.form.DTQBBHBUSS = this.filterDate(this.standardCheckedList[0].rqbName)
// 标准编号
this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum)
// 适用车型
this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area)
// 采标程度
this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel)
// 采用标准
this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
// 引用标准
this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
this.standardDrawer = false this.standardDrawer = false
this.verifySarStandard = true this.verifySarStandard = true
this.planDisabled = false this.planDisabled = false
@@ -2220,10 +2299,10 @@
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){ if(this.replaceLawType === 'DTQBBHBUSS'){
this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){ }else if(this.replaceLawType === 'CYBZ'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){ }else if(this.replaceLawType === 'YYBZ'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'bfbdtbzh'){ }else if(this.replaceLawType === 'bfbdtbzh'){
this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
}else { }else {
@@ -2440,6 +2519,17 @@
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
}, },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) { if(checkedData) {
@@ -2698,9 +2788,17 @@
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName json.prcCreateUserName = this.form.prcCreateUserName
this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, { this.$http.post('lawss/activiti/startProcessRollBack', {
_this: this id: this.$route.query.bpnId || '',
}, res => { createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: 'buss1',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {}, res => {
if (res.ok) { if (res.ok) {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data, taskIds: res.data,
@@ -2721,6 +2819,14 @@
if (res.data === '操作成功') { if (res.data === '操作成功') {
this.submitLoading = false this.submitLoading = false
this.isSubmit = false this.isSubmit = false
if (this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else {
} }
@@ -2732,6 +2838,10 @@
}) })
} }
}) })
// this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
// _this: this
// }, res => {
// })
}else { }else {
this.$message.warning('请检查人员信息表单是否填写完整') this.$message.warning('请检查人员信息表单是否填写完整')
} }
@@ -2797,6 +2907,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+4
View File
@@ -853,6 +853,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+4
View File
@@ -852,6 +852,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+23 -6
View File
@@ -843,6 +843,10 @@
commentText:'', commentText:'',
prcName:'', prcName:'',
standType: '', standType: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -2324,21 +2328,34 @@
}) })
} }
}, },
regDate(data){
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
data = data + ' X'
}
return data
},
getStandInfoByReviseStatus() { getStandInfoByReviseStatus() {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:this.form.reviseStatus}, { let date = new Date();
let year = date.getFullYear();
if(this.form.reviseStatus === '2'){
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
_this: this _this: this
}, res => { }, res => {
const obj = res.data const obj = res.data
let standSn = (obj === null || obj.newStandSn === null) ? '001' : obj.newStandSn let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn
let date = new Date();
let year = date.getFullYear();
this.form.standSn = standSn this.form.standSn = standSn
this.form.standNumber = standSn this.form.standNumber = standSn
this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准 this.form.standYear = year // 待带入立项标准
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 => {
}) })
}
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$nextTick(() => {
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+4
View File
@@ -843,6 +843,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+17
View File
@@ -909,6 +909,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -1012,6 +1016,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1122,6 +1129,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+4
View File
@@ -848,6 +848,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+4
View File
@@ -985,6 +985,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+17
View File
@@ -983,6 +983,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -1089,6 +1093,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1203,6 +1210,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+4
View File
@@ -971,6 +971,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+4
View File
@@ -973,6 +973,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+4
View File
@@ -973,6 +973,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+13
View File
@@ -1012,6 +1012,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1122,6 +1125,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+13
View File
@@ -1089,6 +1089,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1203,6 +1206,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+4
View File
@@ -834,6 +834,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+19 -11
View File
@@ -632,6 +632,7 @@ export default {
// 新增、编辑 数据搜索字段 // 新增、编辑 数据搜索字段
sarAccessInfoSearch: { sarAccessInfoSearch: {
id: '', id: '',
standType: 'INLAND',
standNumber: '', standNumber: '',
askType: '', // 监管类型 askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源 dataSource: 'INLAND_STAND', // 数据来源
@@ -645,6 +646,7 @@ export default {
id: '', id: '',
standNumber: '', standNumber: '',
standName: '', standName: '',
standType: 'INLAND',
askType: '', // 监管类型 askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源 dataSource: 'INLAND_STAND', // 数据来源
pageNo: 1, pageNo: 1,
@@ -1009,6 +1011,8 @@ export default {
this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.advanceSearchVOStr = ''
// 国内标准法规可查字段 // 国内标准法规可查字段
if (val === 'INLAND_STAND') { if (val === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.selectLawsStands()
this.twoOptions = [ this.twoOptions = [
{ {
label: '适用车辆类型', label: '适用车辆类型',
@@ -1050,6 +1054,8 @@ export default {
] ]
// 海外标准法规可查字段 // 海外标准法规可查字段
} else if (val === 'FOREIGN_STAND') { } else if (val === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.dataSource = 'FOREIGN_STAND'
this.selectLawsStands()
this.twoOptions = [ this.twoOptions = [
{ {
label: '适用车辆类型', label: '适用车辆类型',
@@ -1096,6 +1102,8 @@ export default {
] ]
// 国内外政策可查字段 // 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){ }else if (val === 'FOREIGN_LAWS'){
this.sarAccessInfoSearch.dataSource = 'FOREIGN_LAWS'
this.selectLawsStands()
this.twoOptions=[ this.twoOptions=[
{ {
label: '适用车辆类型', label: '适用车辆类型',
@@ -1142,6 +1150,8 @@ export default {
] ]
// 标准法规清单可查字段 // 标准法规清单可查字段
}else { }else {
this.sarAccessInfoSearch.dataSource = 'BUSINESS'
this.selectLawsStands()
this.twoOptions=[ this.twoOptions=[
{ {
label: '清单名称', label: '清单名称',
@@ -1350,7 +1360,7 @@ export default {
sarAccessInfoSelect(selectData) { sarAccessInfoSelect(selectData) {
this.sarAccessInfoListArry = [] this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) { for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id); this.sarAccessInfoListArry.push(selectData[i]);
} }
}, },
// 点击取消按钮 返回事件 // 点击取消按钮 返回事件
@@ -1473,7 +1483,6 @@ export default {
this.sarAccessInfoSearch.page = 1 this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => { StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
console.log('1476',res.data.list)
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) { if (item.standYear === null) {
@@ -1501,7 +1510,6 @@ export default {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, { this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
_this: this, _this: this,
}, res => { }, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.drawerTotal = res.data.count this.drawerTotal = res.data.count
}, e => { }, e => {
@@ -1543,17 +1551,17 @@ export default {
}, },
selectBtn() { selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND' this.sarAccessInfo.standType = 'INLAND'
this.selectPage() this.selectPage()
} else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfo.standType = 'FOREIGN'
this.pageInfo() this.selectPage()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS' this.sarAccessInfo.standType = 'LAWS'
this.pageInfo() this.selectPage()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS' this.sarAccessInfo.standType = 'BUSINESS'
this.pageInfo() this.selectPage()
} }
}, },
// 数据搜索table判断checked状态 // 数据搜索table判断checked状态
@@ -1652,7 +1660,7 @@ export default {
let accIdAndrestype = [] let accIdAndrestype = []
let accessInfo = 1 let accessInfo = 1
for (accessInfo in exportList) { for (accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo]) accIdAndrestype.push(exportList[accessInfo].id)
} }
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' + '&exportType=apart' + '&ids=' + accIdAndrestype.join(',') + '&exportName=' + this.exportName const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' + '&exportType=apart' + '&ids=' + accIdAndrestype.join(',') + '&exportName=' + this.exportName
window.open(exportURL) window.open(exportURL)
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+17 -12
View File
@@ -61,19 +61,11 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item" prop="responseUnit"> <el-form-item label="责任部门" class="search-item" prop="responseUnit">
<el-select <el-input
v-model="standardForm.zrbm" v-model="standardForm.responseUnit"
placeholder="请选择" placeholder="请输入责任部门"
filterable
size="small"
> >
<el-option </el-input>
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" <el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary"
@@ -483,6 +475,15 @@ export default {
if(item.zrbm === "[]"){ if(item.zrbm === "[]"){
item.zrbm = null item.zrbm = null
} }
if (item.zccssrqgj === "undefined") {
item.zccssrqgj = '-'
}
if (item.xcxssrqgj === "undefined") {
item.xcxssrqgj = '-'
}
if (item.ssrq === "undefined") {
item.ssrq = '-'
}
}); });
this.standinfoList = res.data.records; this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total; this.standardFormTotal = res.data.total;
@@ -541,6 +542,7 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.data !== null) {
res.data.records.forEach(item => { res.data.records.forEach(item => {
if (item.nylx === "[]") { if (item.nylx === "[]") {
item.nylx = null; item.nylx = null;
@@ -556,6 +558,9 @@ export default {
} }
}); });
this.standinfoList = res.data.records; this.standinfoList = res.data.records;
} else {
this.standinfoList = []
}
this.standardFormTotal = res.data.total; this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => { this.standinfoList.forEach(item => {
if (item.standYear === null) { if (item.standYear === null) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+1 -1
View File
@@ -1122,7 +1122,7 @@ export default {
sarAccessInfoSelect (selectData) { sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = [] this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) { for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id); this.sarAccessInfoListArry.push(selectData[i]);
} }
}, },
// 点击取消按钮 返回事件 // 点击取消按钮 返回事件
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+1 -3
View File
@@ -1117,7 +1117,7 @@ export default {
sarAccessInfoSelect(selectData) { sarAccessInfoSelect(selectData) {
this.sarAccessInfoListArry = [] this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) { for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id); this.sarAccessInfoListArry.push(selectData[i]);
} }
}, },
// 点击取消按钮 返回事件 // 点击取消按钮 返回事件
@@ -1306,7 +1306,6 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => { StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
console.log('1476',res.data.list)
//为空转换 //为空转换
for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) { for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
//适用车型为空 //适用车型为空
@@ -1441,7 +1440,6 @@ export default {
}, },
// 导出确定功能 // 导出确定功能
exportTestItem() { exportTestItem() {
let exportNames = this.exportName
let exportList = [] let exportList = []
if (this.sarAccessInfoListArry.length > 0) { if (this.sarAccessInfoListArry.length > 0) {
exportList = this.sarAccessInfoListArry exportList = this.sarAccessInfoListArry
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2 -6
View File
@@ -4278,7 +4278,8 @@ export default {
this.sarStandardsSearch.page = page this.sarStandardsSearch.page = page
} }
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
if (this.sarStandardsSearch) { this.standCommonlySearch.pageNo = 1
if (this.sarStandardsSearch.standNumber !== '' || this.sarStandardsSearch.standName !== '') {
this.getDomesticStandardTable(this.sarStandardsSearch) this.getDomesticStandardTable(this.sarStandardsSearch)
} else { } else {
this.getDomesticStandardTable(this.standCommonlySearch) this.getDomesticStandardTable(this.standCommonlySearch)
@@ -4294,7 +4295,6 @@ export default {
}, },
// 分页查询国内标准 // 分页查询国内标准
getDomesticStandardTable(item) { getDomesticStandardTable(item) {
console.log('4292',item)
if (item !== '' && item !== null && item !== undefined) { if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent item.pageSize = this.$store.getters.userInfo.configContent
} }
@@ -4305,7 +4305,6 @@ export default {
} }
// this.sarStandardsSearch.menuId = this.selectSarMenu.id // this.sarStandardsSearch.menuId = this.selectSarMenu.id
const formData = {...data} const formData = {...data}
console.log(formData)
if (!item) { if (!item) {
formData.menuId = this.sarStandardsSearch.menuId formData.menuId = this.sarStandardsSearch.menuId
} else { } else {
@@ -4335,11 +4334,8 @@ export default {
// // 自定义属性字段高级搜索处理 // // 自定义属性字段高级搜索处理
//advanceSearchVOStr //advanceSearchVOStr
const advanceSearchVOList = []; const advanceSearchVOList = [];
console.log('4333',this.advanceSearchMapping)
for (let key in this.advanceSearchMapping) { for (let key in this.advanceSearchMapping) {
console.log('key',key)
const value = this.advanceSearchMapping[key]; const value = this.advanceSearchMapping[key];
console.log('value',value)
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){ if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
advanceSearchVOList.push({ advanceSearchVOList.push({
connect: "and", connect: "and",
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -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' : ''"
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+64 -44
View File
@@ -222,6 +222,18 @@
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''"> <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态"> <el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-option label="未开始" value="0"></el-option> <el-option label="未开始" value="0"></el-option>
@@ -237,6 +249,51 @@
<el-option label="修订" value="2"></el-option> <el-option label="修订" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="addForm.reviseStatus === '1'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item v-else label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.unit">
</el-input>
<el-input
clearable
v-model="addForm.unitName"
placeholder="请选择起草责任单位"
readonly
@click.native="choiceZRBM(addForm.unit)">
</el-input>
</div>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''"> <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input <el-input
style="display: none;" style="display: none;"
@@ -276,36 +333,6 @@
placeholder="请选择计划标准发布时间"> placeholder="请选择计划标准发布时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.unit">
</el-input>
<el-input
clearable
v-model="addForm.unitName"
placeholder="请选择起草责任单位"
readonly
@click.native="choiceZRBM(addForm.unit)">
</el-input>
</div>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择企业标准"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;"> <div style="display: flex;justify-content: space-between;align-items: center;">
<el-input <el-input
@@ -321,19 +348,7 @@
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''"> <el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;"> <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate"> <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
<el-radio label="是" value="是"></el-radio> <el-radio label="是" value="是"></el-radio>
@@ -371,8 +386,9 @@
<template> <template>
<custom-input-for-all-standards2 <custom-input-for-all-standards2
class="classDisplay" class="classDisplay"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:disabled="DrawerType === 'see'" :disabled="DrawerType === 'see'"
:config="{attrName: '配套标准'}" :config="{attrName: '引用标准'}"
:labelWidth="'180px'" :labelWidth="'180px'"
v-model="addForm.esMatingRelations" v-model="addForm.esMatingRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
@@ -672,6 +688,9 @@
drafter: [ drafter: [
{required: true, message: '请选择起草人', trigger: 'change'}, {required: true, message: '请选择起草人', trigger: 'change'},
], ],
rqbJson: [
{required: true, message: '请选择代替企标编号', trigger: 'change'},
]
}, },
form: { form: {
page: 1, page: 1,
@@ -1073,6 +1092,7 @@
this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.BZList = res.data.ENERGYTYPES this.BZList = res.data.ENERGYTYPES
console.log(res.data);
}, e => { }, e => {
}) })
}, },