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

This commit is contained in:
super_liu
2021-12-29 14:20:37 +08:00
13 changed files with 1409 additions and 120 deletions
+24 -2
View File
@@ -174,10 +174,11 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item class="add-form-item" label="会议时间:">
<el-form-item class="picker_style" label="会议时间:">
<el-date-picker
v-model="editMeetForm.date"
type="datetime"
:picker-options="datePicker"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
align="right">
@@ -339,7 +340,13 @@ export default {
// 议题选中时储存数组
deleteTable: [],
loading: false,
dialogTitle: ''
dialogTitle: '',
// 当前日期之前不可选择
datePicker: {
disabledDate(date) {
return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
}
}
},
mounted() {
@@ -819,6 +826,20 @@ export default {
@import '~@/assets/styles/style';
.standCalendar {
.content_form {
/deep/.el-input--suffix .el-input__inner {
border: 0;
color: #828387;
}
label-input-form {
.picker_style {
margin-bottom: 0;
min-height: 50px;
line-height: 50px;
border-bottom: 1px dashed #e5e5e5;
}
}
}
.date-picker {
.item {
/deep/ .el-input {
@@ -874,6 +895,7 @@ export default {
margin-top: 50px;
}
.card_info {
height: 190px;
margin-top: 10px;
@@ -82,6 +82,7 @@
<el-date-picker
v-model="ch_pageData.meetingStartTime"
type="datetime"
:picker-options="datePicker"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
align="right">
@@ -453,7 +454,13 @@ export default {
isSubmit: false,
saveLoading: false,
commentInfo: '',
bpnId: ''
bpnId: '',
// 设置当前日期之前不可选择
datePicker: {
disabledDate(date) {
return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
}
}
},
mounted() {
@@ -54,13 +54,26 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.cancelReason"
placeholder="请输入取消原因"
clearable
></el-input>
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -116,6 +129,52 @@
></el-input>
</div>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item> <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.cancelReason"
placeholder="请输入取消原因"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -268,12 +327,13 @@ export default {
return{
formRules: {
cancelReason: [
{required: true, message: '请输入延期原因', trigger:'blur'},
{required: true, message: '请输入取消原因', trigger:'blur'},
]
},
ListModel: false,
standinfoList: [],
BZList: [],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
@@ -311,6 +371,12 @@ export default {
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods: {
validateForm () {
@@ -372,6 +438,16 @@ export default {
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
if(this.selectList[0].area){
this.qbfsForm.area = this.selectList[0].area.split(',')
}
this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate
this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
this.ListModel = false
}
},
@@ -54,6 +54,27 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="qbfsForm.yqDraftTime"
@@ -62,14 +83,6 @@
placeholder="请选择延期后初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.delayReason"
placeholder="请输入延期原因"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -124,6 +137,45 @@
></el-input>
</div>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="qbfsForm.yqReleaseTime"
@@ -132,6 +184,14 @@
placeholder="请选择延期后标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.delayReason"
placeholder="请输入延期原因"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -282,6 +342,7 @@ export default {
props: ['message'],
data(){
return{
BZList: [],
formRules: {
yqDraftTime: [
{ required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' },
@@ -332,6 +393,12 @@ export default {
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods: {
validateForm () {
@@ -378,6 +445,7 @@ export default {
},
//带入标准
OkDrawer(){
console.log(this.selectList);
if(this.selectList.length > 1){
this.$message.warning('您只能带入一条标准')
}else if(this.selectList.length < 1){
@@ -393,6 +461,16 @@ export default {
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
if(this.selectList[0].area){
this.qbfsForm.area = this.selectList[0].area.split(',')
}
this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate
this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
this.ListModel = false
}
},
@@ -1,5 +1,5 @@
<template>
<div>
<div id="establish">
<process-title>
<template slot="title">立项信息</template>
</process-title>
@@ -17,58 +17,22 @@
placeholder="请输入企标名称"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option>
<el-form-item prop="planStatus" label="计划类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划类型">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="修订中" value="修订中"></el-option>
<el-option label="已取消" value="已取消"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="standScope" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.standScope" placeholder="请选择标准范围">
<el-option label="N1" value="N1"></el-option>
<el-option label="N2" value="N2"></el-option>
<el-option label="N3" value="N3"></el-option>
<el-option label="M1" value="M1"></el-option>
<el-option label="M2" value="M2"></el-option>
<el-option label="M3" value="M3"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="useStand" label="是否采用标准" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select @change="useStandChange" v-model="qbfsForm.useStand" placeholder="请选择是否采用标准">
<el-option label="是" value="yes"></el-option>
<el-option label="否" value="no"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="!useShow" prop="indexBasis" label="简述指标依据" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.indexBasis"
placeholder="请输入指标依据"
:maxlength="500"/>
</el-form-item>
<!-- <el-form-item prop="useStand" label="采用何种标准" style="width: 100%; margin-right:10px"-->
<!-- class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="qbfsForm.useStand" placeholder="请选择采用何种标准">-->
<!-- <el-option-->
<!-- v-for="item in useOptions"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
@@ -110,6 +74,82 @@
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input>
</el-form-item>
<el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择企业标准"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.tsJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.tsJsonName"
placeholder="请选择体系结构"
readonly
@click.native="choiceTXJG(qbfsForm.tsJson)">
</el-input>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.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>
</el-form-item>
<el-form-item prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
<el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" prop="technologic" label="简述指标依据" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.technologic"
placeholder="请输入指标依据"
:maxlength="500"/>
</el-form-item>
<template v-if="qbfsForm.isRelate === '是'">
<custom-input-for-all-standards
class="classDisplay"
:config="{attrName: '采用标准'}"
:labelWidth="'180px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards>
</template>
<el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.useLevel" placeholder="请选择采标程度">
<el-option label="等同" value="等同"></el-option>
<el-option label="修改" value="修改"></el-option>
<el-option label="非等效" value="非等效"></el-option>
</el-select>
</el-form-item>
<template>
<custom-input-for-all-standards2
class="classDisplay"
:config="{attrName: '配套标准'}"
:labelWidth="'180px'"
v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2>
</template>
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -117,13 +157,130 @@
placeholder="请输入新增原因"
:maxlength="500"/>
</el-form-item>
<!-- <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
<!-- <el-input-->
<!-- v-model="qbfsForm.remarks"-->
<!-- placeholder="请输入备注"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
</el-form>
<!-- 选择企业标准弹窗-->
<el-drawer
title="选择企业标准"
:visible.sync="QYBZmodal"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<!-- 顶部工具栏 -->
<div class="search-area">
<el-form :model="QYBZform" inline class="label-input-form">
<el-formItem label="标准号" prop="numberName" class="search-item">
<el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
</el-formItem>
<el-formItem label="标准名称" prop="standName" class="search-item">
<el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
</el-formItem>
<el-formItem class="search-item btn-box">
<el-button
type="primary"
size="mini"
class="common-button-primary"
@click="QYBZget">查询
</el-button>
<el-button
class="common-button-default"
size="mini"
@click="clearQYBZ">清空
</el-button>
</el-formItem>
</el-form>
</div>
<div class="table-wrap" style="height: 100%;">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table
ref="selection"
:data="QYBZList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
border
@selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
label="企标编号"
prop="standCode"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standName"
label="中文名称"
>
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
width="120"
>
<template slot-scope="scope">
<span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
</template>
</el-table-column>
<el-table-column
prop="putTime"
label="实施日期"
sortable
width="120"
>
<template slot-scope="scope">
<span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
</template>
</el-table-column>
<el-table-column
prop="standStatusShow"
label="文本状态"
width="110"
>
<template slot-scope="scope">
<span>{{scope.row.standStatusShow}}</span>
</template>
</el-table-column>
</el-table>
</div>
<pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<loading :loading="QYBZShow">数据加载中</loading>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
</div>
</div>
</el-drawer>
<!-- 选择体系结构弹窗-->
<el-drawer
title="选择体系结构"
:visible.sync="TXJGmodal"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<el-tree
v-if="TXJGmodal"
ref="TXJGTree"
:data="standSystemOptions"
show-checkbox
node-key="id"
default-expand-all
check-strictly
:default-checked-keys="TXJGList"
:props="defaultProps">
</el-tree>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
</div>
</div>
</el-drawer>
<!-- 多选择责任人-->
<Role-tree
:is-title="drawerTitle2"
@@ -150,18 +307,40 @@
<script>
import ProcessTitle from "process/components/ProcessTitle";
import MechanismTree from "@/components/mechanismTree";
import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
export default {
name: "establish",
components: {
ProcessTitle,
MechanismTree
MechanismTree,
CustomInputForAllStandards,
CustomInputForAllStandards2
},
props: ['message'],
data(){
return {
useShow: false,
QYBZmodal: false,
TXJGmodal: false,
modalshowflagZRBM: false,
QYBZShow: false,
defaultProps: {
children: 'children',
label: 'menuName'
},
TXJGList: [],
QYBZList: [],
QYBZformSelect: [],
standSystemOptions: [],
QYBZform: {
page: 1,
pageSzie: this.$store.getters.userInfo.configContent,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
standName: '',
total: 0,
},
nodeListZRBM: [],
drawerTitle2: '',
drawerTitle: '',
@@ -170,6 +349,7 @@ export default {
modalshowflag: false,
nodeList2: [],
nodeList: [],
BZList: [],
qcdwOptions: [],
qbfsForm: {
type: "5",
@@ -178,9 +358,9 @@ export default {
esName: "", // 企标名称
planStatus: "", // 计划状态
reviseStatus: "", // 制修订状态
standScope: "", //标准范围
useStand: "", //采用何种标准
indexBasis: '', //指标依据
area: "", //标准范围
isRelate: "", //采用何种标准
technologic: '', //指标依据
resPerson: "", // 评审责任人
resPersonName: "",
wgLeader: "", // 工作组组长
@@ -241,21 +421,15 @@ export default {
reviseStatus: [
{ required: true, message: "请选择制修订状态", trigger: "blur" }
],
standScope: [
{ required: true, message: "请选择标准范围", trigger: "blur" }
],
useStand: [
{ required: true, message: "请选择采用何种标准", trigger: "blur" }
],
indexBasis: [
{ required: true, message: "请输入指标依据", trigger: "blur" }
],
resPersonName: [
{ required: true, message: "请输入评审责任人", trigger: "blur" }
],
wgLeaderName: [
{ required: true, message: "请输入工作组组长", trigger: "blur" }
],
unitName: [
{ required: true, message: "请选择起草责任单位", trigger: "blur" }
],
draftTime: [
{ required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
],
@@ -289,13 +463,91 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
console.log(res);
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.qcdwOptions = res.data.QCDW // 起草单位
})
},
methods: {
useStandChange(){
this.useShow = !this.useShow
TXJGcloseDrawer () {
this.TXJGmodal = false
},
TXJGenterDrawer () {
let list = this.$refs.TXJGTree.getCheckedNodes()
let id = ''
let name = ''
list.map(item => {
if (id.length > 0) {
id += ','
id += item.id
name += ','
name += item.menuName
} else {
id = item.id
name = item.menuName
}
})
this.qbfsForm.tsJson = id
this.qbfsForm.tsJsonName = name
this.TXJGmodal = false
},
//选择体系结构
choiceTXJG (id) {
if (id) {
this.TXJGList = id.split(',')
} else {
this.TXJGList = []
}
this.TXJGmodal = true
},
//选择企业标准
choiceQYBZ(){
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
},
QYBZcloseDrawer () {
this.clearQYBZ()
},
QYBZenterDrawer () {
if (this.QYBZformSelect.length > 1) {
this.$message.warning('请选择一条标准')
} else if (this.QYBZformSelect.length < 1){
this.$message.warning('请选择要带入的标准')
} else {
this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
this.clearQYBZ()
this.QYBZmodal = false
}
},
handleSelectionQYBZ (val) {
this.QYBZformSelect = val
},
QYBZpageChange (page) {
this.QYBZform.page = page
this.QYBZget()
},
QYBZpageSizeChange (pageSize) {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
}, res => {
this.QYBZList = res.data.list
this.QYBZform.total = res.data.count
}, e => {
})
},
clearQYBZ () {
this.QYBZform = {
page: 1,
standCode: '',
standName: '',
}
this.QYBZget()
},
choiceZRBM(type, title, id) {
this.nodeListZRBM = []
@@ -390,6 +642,88 @@ export default {
};
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
#establish {
height: 100%;
background: #fff;
.classDisplay {
/deep/.el-form-item__content {
width: calc(~'100% - 180px');
.el-input__inner {
width: calc(~'100% - 80px');
}
}
}
.standardForComments {
height: calc(~'100% - 56px');
background: #fff;
flex-direction: column;
.action-bar {
margin-bottom: 5px;
padding: 0;
}
.content {
flex: auto;
overflow: hidden;
display: flex;
flex-direction: column;
.table-wrap {
flex: auto;
overflow: hidden;
position: relative;
}
}
& > .pagination {
position: static;
/deep/ .pagination-slot {
padding: 0;
}
}
}
/deep/.table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;
}
}
.add-form-item {
/deep/.el-form-item__content {
width: calc(~'100% - 180px');
height: 50px;
}
}
display: flex;
flex-direction: column;
.content-center {
padding: 10px;
}
.container {
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
.table-wrap {
flex: 1;
overflow: hidden;
position: relative;
.inner-wrap {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
}
.footer {
/deep/ .pagination {
position: static;
}
}
}
}
</style>
@@ -86,16 +86,45 @@
<el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input>
<!-- <el-select v-model="qbfsForm.unit" filterable multiple clearable>-->
<!-- <el-option-->
<!-- v-for="item in qcdwOptions"-->
<!-- placeholder="请选择起草责任单位"-->
<!-- :key="item.value"-->
<!-- :value="item.label"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择企业标准"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<template>
<custom-input-for-all-standards2
class="classDisplay"
:config="{attrName: '配套标准'}"
:labelWidth="'180px'"
v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2>
</template>
<el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.useLevel" placeholder="请选择采标程度">
<el-option label="等同" value="等同"></el-option>
<el-option label="修改" value="修改"></el-option>
<el-option label="非等效" value="非等效"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" prop="technologic" label="简述指标依据" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.technologic"
placeholder="请输入指标依据"
:maxlength="500"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -124,6 +153,34 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.tsJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.tsJsonName"
placeholder="请选择体系结构"
readonly
@click.native="choiceTXJG(qbfsForm.tsJson)">
</el-input>
</el-form-item>
<el-form-item prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
<el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option>
</el-select>
</el-form-item>
<template v-if="qbfsForm.isRelate === '是'">
<custom-input-for-all-standards
class="classDisplay"
:config="{attrName: '采用标准'}"
:labelWidth="'180px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards>
</template>
<el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -268,6 +325,129 @@
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div>
</el-drawer>
<!-- 选择企业标准弹窗-->
<el-drawer
title="选择企业标准"
:visible.sync="QYBZmodal"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<!-- 顶部工具栏 -->
<div class="search-area">
<el-form :model="QYBZform" inline class="label-input-form">
<el-formItem label="标准号" prop="numberName" class="search-item">
<el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
</el-formItem>
<el-formItem label="标准名称" prop="standName" class="search-item">
<el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
</el-formItem>
<el-formItem class="search-item btn-box">
<el-button
type="primary"
size="mini"
class="common-button-primary"
@click="QYBZget">查询
</el-button>
<el-button
class="common-button-default"
size="mini"
@click="clearQYBZ">清空
</el-button>
</el-formItem>
</el-form>
</div>
<div class="table-wrap" style="height: 100%;">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table
ref="selection"
:data="QYBZList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
border
@selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
label="企标编号"
prop="standCode"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standName"
label="中文名称"
>
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
width="120"
>
<template slot-scope="scope">
<span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
</template>
</el-table-column>
<el-table-column
prop="putTime"
label="实施日期"
sortable
width="120"
>
<template slot-scope="scope">
<span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
</template>
</el-table-column>
<el-table-column
prop="standStatusShow"
label="文本状态"
width="110"
>
<template slot-scope="scope">
<span>{{scope.row.standStatusShow}}</span>
</template>
</el-table-column>
</el-table>
</div>
<pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
<loading :loading="QYBZShow">数据加载中</loading>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
</div>
</div>
</el-drawer>
<!-- 选择体系结构弹窗-->
<el-drawer
title="选择体系结构"
:visible.sync="TXJGmodal"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<el-tree
v-if="TXJGmodal"
ref="TXJGTree"
:data="standSystemOptions"
show-checkbox
node-key="id"
default-expand-all
check-strictly
:default-checked-keys="TXJGList"
:props="defaultProps">
</el-tree>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
</div>
</div>
</el-drawer>
<!-- 多选择责任人-->
<Role-tree
:is-title="drawerTitle2"
@@ -294,16 +474,40 @@
<script>
import ProcessTitle from "process/components/ProcessTitle";
import MechanismTree from '@/components/mechanismTree'
import CustomInputForAllStandards from "@/components/CustomFormComponents/InputForAllStandards";
import CustomInputForAllStandards2 from "@/components/CustomFormComponents/InputForAllStandards2";
export default {
name: "merge",
components: {
ProcessTitle,
MechanismTree
MechanismTree,
CustomInputForAllStandards,
CustomInputForAllStandards2
},
props: ['message'],
data(){
return {
QYBZmodal: false,
TXJGmodal: false,
QYBZShow: false,
defaultProps: {
children: 'children',
label: 'menuName'
},
TXJGList: [],
QYBZList: [],
QYBZformSelect: [],
standSystemOptions: [],
QYBZform: {
page: 1,
pageSzie: this.$store.getters.userInfo.configContent,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
standName: '',
total: 0,
},
modalshowflagZRBM: false,
nodeListZRBM: [],
drawerTitle2: '',
@@ -411,7 +615,8 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
console.log(res);
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.qcdwOptions = res.data.QCDW // 起草单位
})
this.getStandDataBtn()
@@ -427,6 +632,86 @@ export default {
}
},
methods: {
TXJGcloseDrawer () {
this.TXJGmodal = false
},
TXJGenterDrawer () {
let list = this.$refs.TXJGTree.getCheckedNodes()
let id = ''
let name = ''
list.map(item => {
if (id.length > 0) {
id += ','
id += item.id
name += ','
name += item.menuName
} else {
id = item.id
name = item.menuName
}
})
this.qbfsForm.tsJson = id
this.qbfsForm.tsJsonName = name
this.TXJGmodal = false
},
//选择体系结构
choiceTXJG (id) {
if (id) {
this.TXJGList = id.split(',')
} else {
this.TXJGList = []
}
this.TXJGmodal = true
},
//选择企业标准
choiceQYBZ(){
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
},
QYBZcloseDrawer () {
this.clearQYBZ()
},
QYBZenterDrawer () {
if (this.QYBZformSelect.length > 1) {
this.$message.warning('请选择一条标准')
} else if (this.QYBZformSelect.length < 1){
this.$message.warning('请选择要带入的标准')
} else {
this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
this.clearQYBZ()
this.QYBZmodal = false
}
},
handleSelectionQYBZ (val) {
this.QYBZformSelect = val
},
QYBZpageChange (page) {
this.QYBZform.page = page
this.QYBZget()
},
QYBZpageSizeChange (pageSize) {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
}, res => {
this.QYBZList = res.data.list
this.QYBZform.total = res.data.count
}, e => {
})
},
clearQYBZ () {
this.QYBZform = {
page: 1,
standCode: '',
standName: '',
}
this.QYBZget()
},
choiceZRBM(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
@@ -601,7 +886,87 @@ export default {
</script>
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
.merge {
height: 100%;
background: #fff;
.classDisplay {
/deep/.el-form-item__content {
width: calc(~'100% - 180px');
.el-input__inner {
width: calc(~'100% - 80px');
}
}
}
.standardForComments {
height: calc(~'100% - 56px');
background: #fff;
flex-direction: column;
.action-bar {
margin-bottom: 5px;
padding: 0;
}
.content {
flex: auto;
overflow: hidden;
display: flex;
flex-direction: column;
.table-wrap {
flex: auto;
overflow: hidden;
position: relative;
}
}
& > .pagination {
position: static;
/deep/ .pagination-slot {
padding: 0;
}
}
}
/deep/.table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;
}
}
.add-form-item {
/deep/.el-form-item__content {
width: calc(~'100% - 180px');
height: 50px;
}
}
display: flex;
flex-direction: column;
.content-center {
padding: 10px;
}
.container {
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
.table-wrap {
flex: 1;
overflow: hidden;
position: relative;
.inner-wrap {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
}
.footer {
/deep/ .pagination {
position: static;
}
}
}
}
</style>
@@ -54,6 +54,27 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
<el-input
v-model="qbfsForm.renameEs"
@@ -115,6 +136,45 @@
></el-input>
</div>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -284,6 +344,7 @@ export default {
},
ListModel: false,
standinfoList: [],
BZList: [],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
@@ -320,6 +381,11 @@ export default {
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods: {
validateForm () {
@@ -381,6 +447,16 @@ export default {
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
if(this.selectList[0].area){
this.qbfsForm.area = this.selectList[0].area.split(',')
}
this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate
this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
this.ListModel = false
}
},
@@ -82,6 +82,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -169,7 +229,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
@@ -234,6 +294,19 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- <ProcessFooter-->
<!-- show-back-->
<!-- show-transfer-->
<!-- show-submit-->
<!-- :transfer-loading="isTransfer"-->
<!-- :submitLoading="isSubmit"-->
<!-- :saveLoading="saveLoading"-->
<!-- :approval="true"-->
<!-- @back="beforeBack"-->
<!-- @transfer="handleTransfer"-->
<!-- @submit="handleSubmit"-->
<!-- >-->
<!-- </ProcessFooter>-->
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
@@ -261,6 +334,7 @@ export default {
},
data(){
return {
BZList: [],
active: '1',
type: '',
commentText: '',
@@ -280,6 +354,12 @@ export default {
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -439,25 +439,6 @@ export default {
this.saveLoading = false
})
},
// repeatName(){
// let qbzxdFrom = this.$refs["childForm"].qbfsForm;
// this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
// _this: this
// }, res => {
// if(qbzxdFrom.type === '1'){
// let dataList = res.data
// dataList.forEach(item => {
// if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
// this.comFlag = 1
// }
// })
// }else if(qbzxdFrom.type === '5'){
// if(!res.data.length){
// this.comFlag = 1
// }
// }
// })
// },
//流程提交
handleSubmit() {
if(!this.$refs["childForm"].qbfsForm.type){
@@ -474,6 +455,7 @@ export default {
if (valid) {
this.isSubmit = true;
let json = Object.assign(qbzxdFrom, this.roleForm);
console.log(json);
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
@@ -82,6 +82,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -274,6 +334,7 @@ export default {
},
data(){
return {
BZList: [],
active: '1',
type: '',
commentText: '',
@@ -293,6 +354,12 @@ export default {
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -329,6 +396,7 @@ export default {
console.log(item);
this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item))
console.log(item.area.join(','));
this.type = item.type
})
},
@@ -82,6 +82,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入简述指标依据"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -272,6 +332,7 @@ export default {
},
data(){
return {
BZList: [],
active: '1',
type: '',
commentText: '',
@@ -291,6 +352,12 @@ export default {
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -82,6 +82,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -274,6 +334,7 @@ export default {
},
data(){
return {
BZList: [],
active: '1',
type: '',
commentText: '',
@@ -293,6 +354,12 @@ export default {
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -82,6 +82,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.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>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -274,6 +334,7 @@ export default {
},
data(){
return {
BZList: [],
active: '1',
type: '',
commentText: '',
@@ -293,6 +354,12 @@ export default {
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {