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

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

Browse Source
This commit is contained in:
super_liu
2021-12-29 17:41:24 +08:00
parent 4a48ca8e40 16c9c664b0
commit 7f2111bc46
17 changed files with 333 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForAllStandards.vue
+1
View File
@@ -21,6 +21,7 @@
size="mini" size="mini"
style="position:absolute;top: 10px;right: 0;" style="position:absolute;top: 10px;right: 0;"
@click="selectLaws" @click="selectLaws"
:disabled="disabled"
v-if="(processModel && !disabled) || !processModel" v-if="(processModel && !disabled) || !processModel"
>{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button> >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
</el-form-item> </el-form-item>
src/components/CustomFormComponents/InputForAllStandards2.vue
+1
View File
@@ -21,6 +21,7 @@
size="mini" size="mini"
style="position:absolute;top: 10px;right: 0;" style="position:absolute;top: 10px;right: 0;"
@click="selectLaws" @click="selectLaws"
:disabled="disabled"
v-if="(processModel && !disabled) || !processModel" v-if="(processModel && !disabled) || !processModel"
>{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button> >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+56 -52
View File
@@ -137,8 +137,8 @@
height="100%" height="100%"
: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'}"
row-key="id"
> >
<el-table-column type="selection" width="55" align="center"/>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
@@ -149,8 +149,8 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
fixed
show-overflow-tooltip show-overflow-tooltip
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -165,90 +165,91 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-if="!form.itemsNum1"
prop="technicalRequir" prop="technicalRequir"
width="200" width="200"
v-if="!form.itemsNum1"
label="核心技术要求" label="核心技术要求"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND' && form.itemsNum1"
prop="changePoint" prop="changePoint"
width="150" width="150"
v-show="form.itemsNum1"
label="基于上一版本差异" label="基于上一版本差异"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-show="sarType === 'FOREIGN' && form.itemsNum1"
v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
label="相对于国行标差异点" label="相对于国行标差异点"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceRequir" prop="newData"
width="150" width="180"
label="符合项状态" show-overflow-tooltip
align="center"> label="新车型实施日期"
<template slot-scope="scope"> align="center">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip prop="onlineData"
prop="complianceState" width="180"
width="200" show-overflow-tooltip
label="合规性分析" label="在产车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="applyArctic"
width="150" width="200"
show-overflow-tooltip label="适用车型"
label="新车型实施日期" show-overflow-tooltip
align="center"> align="center">
</el-table-column>
<el-table-column
prop="onlineData"
width="150"
show-overflow-tooltip
label="在产车型实施日期"
align="center">
</el-table-column>
<el-table-column
prop="applyArctic"
width="150"
show-overflow-tooltip
label="适用车型"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.applyArctic.toString() }} {{ scope.row.applyArctic.toString() }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unitDeptName" prop="unitDeptName"
label="责任部门" label="责任部门"
show-overflow-tooltip width="200"
width="170" show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人" label="责任人"
width="170" width="170"
prop="zrUserName" prop="zrUserName"
align="center"> show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
</template>
</el-table-column>
<el-table-column
prop="complianceState"
width="200"
label="合规性分析"
show-overflow-tooltip
align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
v-if="form.itemsNum1"
width="140" width="140"
v-show="form.itemsNum1"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -336,6 +337,7 @@
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -355,6 +357,7 @@ export default {
name: "bzjdStep1-6", name: "bzjdStep1-6",
data() { data() {
return { return {
itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
oldNumber: '', oldNumber: '',
@@ -422,7 +425,7 @@ export default {
}, e => { }, e => {
}) })
}, },
checkBD (id,id2) { checkBD (id,id2,itemsNum) {
let itemsEoPage = { let itemsEoPage = {
oldItemId: id, oldItemId: id,
newItemId: id2, newItemId: id2,
@@ -434,6 +437,7 @@ export default {
if (res.data.leftString === '' && res.data.rightString === '') { if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = res.data.leftString
this.rightData = res.data.rightString this.rightData = res.data.rightString
this.BDmodel = true this.BDmodel = true
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2 -17
View File
@@ -156,13 +156,11 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<cus-tom-data-picker-group <cus-tom-data-picker-group
:key="'ssrq'"
:config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}" :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
v-model="form.ssrq" v-model="form.ssrq"
:disabled="false" :disabled="false"
></cus-tom-data-picker-group> ></cus-tom-data-picker-group>
<cus-tom-data-picker-group <cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}" :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq" v-model="form.zccssrq"
:disabled="false" :disabled="false"
@@ -184,7 +182,6 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<cus-tom-data-picker-group <cus-tom-data-picker-group
:key="'xcxssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}" :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
v-model="form.xcxssrq" v-model="form.xcxssrq"
:disabled="false"> :disabled="false">
@@ -750,7 +747,6 @@
<template> <template>
<custom-select-array <custom-select-array
style="margin-left: -12px" style="margin-left: -12px"
:key="applyArcticOptions.options"
:config="applyArcticOptions" :config="applyArcticOptions"
v-model="form['cllx']" v-model="form['cllx']"
></custom-select-array> ></custom-select-array>
@@ -759,7 +755,6 @@
<template> <template>
<custom-select-array <custom-select-array
style="margin-left: -12px" style="margin-left: -12px"
:key="categoryOptions.options"
:config="categoryOptions" :config="categoryOptions"
v-model="form['nylx']" v-model="form['nylx']"
></custom-select-array> ></custom-select-array>
@@ -868,7 +863,6 @@
<!--适用产品线--> <!--适用产品线-->
<template> <template>
<custom-select-array <custom-select-array
:key="sycpxOptions.options"
style="margin-left: -12px" style="margin-left: -12px"
:config="sycpxOptions" :config="sycpxOptions"
v-model="form['sycpx']" v-model="form['sycpx']"
@@ -888,7 +882,6 @@
<!--适用认证--> <!--适用认证-->
<template> <template>
<custom-select-array <custom-select-array
:key="applyAuthOptions.options"
style="margin-left: -12px" style="margin-left: -12px"
:config="applyAuthOptions" :config="applyAuthOptions"
v-model="form['syrz']" v-model="form['syrz']"
@@ -948,15 +941,6 @@
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)"> <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
</el-input> </el-input>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
<!-- <el-option-->
<!-- v-for="item in wssmrOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度"> <el-select v-model="form.cysd" placeholder="请选择我司参与深度">
@@ -1428,6 +1412,7 @@ export default {
}, },
data () { data () {
return { return {
modalShowRoleFlag: false,
fileList: [], fileList: [],
caFileList: [], caFileList: [],
FBGBJBDFileList: [], FBGBJBDFileList: [],
@@ -1684,6 +1669,7 @@ export default {
drawerModal: false, drawerModal: false,
nodeList: [], nodeList: [],
selectPeople:'', selectPeople:'',
nodeList2: []
} }
}, },
computed: { computed: {
@@ -1803,7 +1789,6 @@ export default {
} }
}, },
choiceZRRS (type, title, id) { choiceZRRS (type, title, id) {
console.log('2077',title)
this.nodeList = [] this.nodeList = []
this.nodeList.push(id) this.nodeList.push(id)
this.userType = type this.userType = type
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+31 -10
View File
@@ -22,6 +22,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled"> <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
@@ -54,11 +64,11 @@
placeholder="请选择初稿完成时间"> placeholder="请选择初稿完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -199,9 +209,8 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订状态" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.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-select>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
@@ -248,7 +257,8 @@
label="计划状态" label="计划状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div> <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -256,7 +266,7 @@
align="center" align="center"
label="制修订状态"> label="制修订状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -326,6 +336,9 @@ export default {
data(){ data(){
return{ return{
formRules: { formRules: {
bussSort: [
{ required: true, message: "请选择企标类别", trigger: "blur" }
],
cancelReason: [ cancelReason: [
{required: true, message: '请输入取消原因', trigger:'blur'}, {required: true, message: '请输入取消原因', trigger:'blur'},
] ]
@@ -334,6 +347,7 @@ export default {
ListModel: false, ListModel: false,
standinfoList: [], standinfoList: [],
BZList: [], BZList: [],
standSortOptions: [],
page: 1, page: 1,
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
@@ -376,6 +390,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods: { methods: {
@@ -432,22 +447,28 @@ export default {
this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
(this.selectList[0] === '3'? '已取消' : '已完成')))
this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
if(this.selectList[0].area){ if(this.selectList[0].area){
this.qbfsForm.area = this.selectList[0].area.split(',') this.qbfsForm.area = this.selectList[0].area.split(',')
} }
if(this.selectList[0].bussSort){
this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',')
}
this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.isRelate = this.selectList[0].isRelate
this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic this.qbfsForm.technologic = this.selectList[0].technologic
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
}
this.ListModel = false this.ListModel = false
} }
}, },
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+33 -13
View File
@@ -22,6 +22,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled"> <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
@@ -32,9 +42,8 @@
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定" value="1"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="修订" value="2"></el-option>
<el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled"> <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -54,11 +63,11 @@
placeholder="请选择初稿完成时间"> placeholder="请选择初稿完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -216,9 +225,8 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订状态" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.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-select>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
@@ -265,7 +273,8 @@
label="计划状态" label="计划状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div> <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -273,7 +282,7 @@
align="center" align="center"
label="制修订状态"> label="制修订状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -343,7 +352,11 @@ export default {
data(){ data(){
return{ return{
BZList: [], BZList: [],
standSortOptions: [],
formRules: { formRules: {
bussSort: [
{ required: true, message: "请选择企标类别", trigger: "blur" }
],
yqDraftTime: [ yqDraftTime: [
{ required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' }, { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' },
], ],
@@ -398,6 +411,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods: { methods: {
@@ -455,22 +469,28 @@ export default {
this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
(this.selectList[0] === '3'? '已取消' : '已完成')))
this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
if(this.selectList[0].area){ if(this.selectList[0].area){
this.qbfsForm.area = this.selectList[0].area.split(',') this.qbfsForm.area = this.selectList[0].area.split(',')
} }
if(this.selectList[0].bussSort){
this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',')
}
this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.isRelate = this.selectList[0].isRelate
this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic this.qbfsForm.technologic = this.selectList[0].technologic
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
}
this.ListModel = false this.ListModel = false
} }
}, },
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+17 -40
View File
@@ -11,6 +11,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="qbfsForm.esName" v-model="qbfsForm.esName"
@@ -74,7 +84,7 @@
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)"> @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="rqbName" label="被修订标准代号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
style="display: none;" style="display: none;"
v-model="qbfsForm.rqbJson"> v-model="qbfsForm.rqbJson">
@@ -82,7 +92,7 @@
<el-input <el-input
clearable clearable
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请选择企业标准" placeholder="请选择被修订标准代号"
readonly readonly
@click.native="choiceQYBZ"> @click.native="choiceQYBZ">
</el-input> </el-input>
@@ -349,6 +359,7 @@ export default {
modalshowflag: false, modalshowflag: false,
nodeList2: [], nodeList2: [],
nodeList: [], nodeList: [],
standSortOptions: [],
BZList: [], BZList: [],
qcdwOptions: [], qcdwOptions: [],
qbfsForm: { qbfsForm: {
@@ -372,46 +383,13 @@ export default {
newReason: "" //新增原因 newReason: "" //新增原因
// remarks: '', // 备注 // remarks: '', // 备注
}, },
useOptions: [
{
value: "ISO",
label: "ISO"
}, {
value: "ESE",
label: "ESE"
}, {
value: "EC/EEC",
label: "EC/EEC"
}, {
value: "IEC",
label: "IEC"
}, {
value: "GB",
label: "GB"
}, {
value: "GB/T",
label: "GB/T"
}, {
value: "QC/T",
label: "QC/T"
}, {
value: "JT/T",
label: "JT/T"
}, {
value: "HJ",
label: "HJ"
}, {
value: "TB",
label: "团标"
},{
value: "QT",
label: "其他"
},
],
qbfsFormRules: { qbfsFormRules: {
unit: [ unit: [
{ required: true, message: "请选择起草单位", trigger: "change" } { required: true, message: "请选择起草单位", trigger: "change" }
], ],
bussSort: [
{ required: true, message: "请选择企标类别", trigger: "blur" }
],
esName: [ esName: [
{ required: true, message: "请输入企标名称", trigger: "blur" } { required: true, message: "请输入企标名称", trigger: "blur" }
], ],
@@ -464,6 +442,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.qcdwOptions = res.data.QCDW // 起草单位 this.qcdwOptions = res.data.QCDW // 起草单位
}) })
@@ -646,8 +625,6 @@ export default {
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
#establish { #establish {
height: 100%;
background: #fff;
.classDisplay { .classDisplay {
/deep/.el-form-item__content { /deep/.el-form-item__content {
width: calc(~'100% - 180px'); width: calc(~'100% - 180px');
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+38 -19
View File
@@ -53,6 +53,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled"> <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="qbfsForm.esName" v-model="qbfsForm.esName"
@@ -62,9 +72,8 @@
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <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-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-select>
</el-form-item> </el-form-item>
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled"> <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -87,7 +96,7 @@
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)"> @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="rqbName" label="被修订标准代号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
style="display: none;" style="display: none;"
v-model="qbfsForm.rqbJson"> v-model="qbfsForm.rqbJson">
@@ -95,7 +104,7 @@
<el-input <el-input
clearable clearable
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请选择企业标准" placeholder="请选择被修订标准代号"
readonly readonly
@click.native="choiceQYBZ"> @click.native="choiceQYBZ">
</el-input> </el-input>
@@ -127,11 +136,13 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <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-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-option label="修订中" value="修订中"></el-option>
<el-option label="已取消" value="已取消"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
@@ -213,9 +224,8 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订状态" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.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-select>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
@@ -262,7 +272,8 @@
label="计划状态" label="计划状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div> <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -270,7 +281,7 @@
align="center" align="center"
label="制修订状态"> label="制修订状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -496,6 +507,8 @@ export default {
label: 'menuName' label: 'menuName'
}, },
TXJGList: [], TXJGList: [],
BZList: [],
standSortOptions: [],
QYBZList: [], QYBZList: [],
QYBZformSelect: [], QYBZformSelect: [],
standSystemOptions: [], standSystemOptions: [],
@@ -528,6 +541,9 @@ export default {
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
selectList: [], selectList: [],
qbfsFormRules: { qbfsFormRules: {
bussSort: [
{ required: true, message: "请选择企标类别", trigger: "blur" }
],
esName1: [ esName1: [
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
], ],
@@ -616,6 +632,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.qcdwOptions = res.data.QCDW // 起草单位 this.qcdwOptions = res.data.QCDW // 起草单位
}) })
@@ -825,8 +842,9 @@ export default {
if(this.showType === 'one'){ if(this.showType === 'one'){
this.qbfsForm.esId1 = this.selectList[0].id || '--' this.qbfsForm.esId1 = this.selectList[0].id || '--'
this.qbfsForm.esName1 = this.selectList[0].esName || '--' this.qbfsForm.esName1 = this.selectList[0].esName || '--'
this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') (this.selectList[0] === '3'? '已取消' : '已完成')))
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
this.standShow = true this.standShow = true
}else{ }else{
if(this.qbfsForm.esName1 === this.selectList[0].esName ){ if(this.qbfsForm.esName1 === this.selectList[0].esName ){
@@ -834,8 +852,9 @@ export default {
}else{ }else{
this.qbfsForm.esId2 = this.selectList[0].id || '--' this.qbfsForm.esId2 = this.selectList[0].id || '--'
this.qbfsForm.esName2 = this.selectList[0].esName || '--' this.qbfsForm.esName2 = this.selectList[0].esName || '--'
this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') (this.selectList[0] === '3'? '已取消' : '已完成')))
this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
this.standShow2 = true this.standShow2 = true
} }
} }
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+33 -13
View File
@@ -22,6 +22,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled"> <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
@@ -32,9 +42,8 @@
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled 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-select>
</el-form-item> </el-form-item>
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled"> <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -54,11 +63,11 @@
placeholder="请选择初稿完成时间"> placeholder="请选择初稿完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -207,9 +216,8 @@
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订状态" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.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-select>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
@@ -256,7 +264,8 @@
label="计划状态" label="计划状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div> <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -264,7 +273,7 @@
align="center" align="center"
label="制修订状态"> label="制修订状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -334,6 +343,9 @@ export default {
data(){ data(){
return{ return{
formRules: { formRules: {
bussSort: [
{ required: true, message: "请选择企标类别", trigger: "blur" }
],
renameEs: [ renameEs: [
{required: true, message: '请输入更名后企标名称', trigger:'blur'}, {required: true, message: '请输入更名后企标名称', trigger:'blur'},
], ],
@@ -345,6 +357,7 @@ export default {
ListModel: false, ListModel: false,
standinfoList: [], standinfoList: [],
BZList: [], BZList: [],
standSortOptions: [],
page: 1, page: 1,
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
@@ -385,6 +398,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods: { methods: {
@@ -441,22 +455,28 @@ export default {
this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
(this.selectList[0] === '3'? '已取消' : '已完成')))
this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
if(this.selectList[0].area){ if(this.selectList[0].area){
this.qbfsForm.area = this.selectList[0].area.split(',') this.qbfsForm.area = this.selectList[0].area.split(',')
} }
if(this.selectList[0].bussSort){
this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',')
}
this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.isRelate = this.selectList[0].isRelate
this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic this.qbfsForm.technologic = this.selectList[0].technologic
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
}
this.ListModel = false this.ListModel = false
} }
}, },
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+14 -3
View File
@@ -15,6 +15,16 @@
</process-title> </process-title>
<el-form :model="qbfsForm" class="label-input-form prc-content-border" <el-form :model="qbfsForm" class="label-input-form prc-content-border"
label-width="150px"> label-width="150px">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -82,11 +92,11 @@
placeholder="请输入起草责任单位" placeholder="请输入起草责任单位"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -348,7 +358,7 @@ export default {
nodeList:[], nodeList:[],
drawerTitle: '', drawerTitle: '',
detailData: [], detailData: [],
standSortOptions: [],
} }
}, },
mounted() { mounted() {
@@ -359,6 +369,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods:{ methods:{
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
-1
View File
@@ -455,7 +455,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
let json = Object.assign(qbzxdFrom, this.roleForm); let json = Object.assign(qbzxdFrom, this.roleForm);
console.log(json);
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+14 -2
View File
@@ -15,6 +15,16 @@
</process-title> </process-title>
<el-form :model="qbfsForm" class="label-input-form prc-content-border" <el-form :model="qbfsForm" class="label-input-form prc-content-border"
label-width="150px"> label-width="150px">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -82,11 +92,11 @@
placeholder="请输入起草责任单位" placeholder="请输入起草责任单位"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -335,6 +345,7 @@ export default {
data(){ data(){
return { return {
BZList: [], BZList: [],
standSortOptions: [],
active: '1', active: '1',
type: '', type: '',
commentText: '', commentText: '',
@@ -359,6 +370,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods:{ methods:{
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+14 -3
View File
@@ -15,6 +15,16 @@
</process-title> </process-title>
<el-form :model="qbfsForm" class="label-input-form prc-content-border" <el-form :model="qbfsForm" class="label-input-form prc-content-border"
label-width="150px"> label-width="150px">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -82,11 +92,11 @@
placeholder="请输入起草责任单位" placeholder="请输入起草责任单位"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -346,7 +356,7 @@ export default {
nodeList:[], nodeList:[],
drawerTitle: '', drawerTitle: '',
detailData: [], detailData: [],
standSortOptions: [],
} }
}, },
mounted() { mounted() {
@@ -357,6 +367,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods:{ methods:{
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+14 -3
View File
@@ -15,6 +15,16 @@
</process-title> </process-title>
<el-form :model="qbfsForm" class="label-input-form prc-content-border" <el-form :model="qbfsForm" class="label-input-form prc-content-border"
label-width="150px"> label-width="150px">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -82,11 +92,11 @@
placeholder="请输入起草责任单位" placeholder="请输入起草责任单位"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -348,7 +358,7 @@ export default {
nodeList:[], nodeList:[],
drawerTitle: '', drawerTitle: '',
detailData: [], detailData: [],
standSortOptions: [],
} }
}, },
mounted() { mounted() {
@@ -359,6 +369,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods:{ methods:{
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+14 -3
View File
@@ -15,6 +15,16 @@
</process-title> </process-title>
<el-form :model="qbfsForm" class="label-input-form prc-content-border" <el-form :model="qbfsForm" class="label-input-form prc-content-border"
label-width="150px"> label-width="150px">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -82,11 +92,11 @@
placeholder="请输入起草责任单位" placeholder="请输入起草责任单位"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" 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 <el-input
disabled disabled
v-model="qbfsForm.rqbName" v-model="qbfsForm.rqbName"
placeholder="请输入企业标准" placeholder="请输入被修订标准代号"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled"> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -348,7 +358,7 @@ export default {
nodeList:[], nodeList:[],
drawerTitle: '', drawerTitle: '',
detailData: [], detailData: [],
standSortOptions: [],
} }
}, },
mounted() { mounted() {
@@ -359,6 +369,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.BZList = res.data.ENERGYTYPES //标准范围 this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
}) })
}, },
methods:{ methods:{
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+24 -13
View File
@@ -206,10 +206,10 @@
<el-col :span="24"> <el-col :span="24">
<el-form :model="addForm" inline class="label-input-form" label-width="180px" :rules="addFormRules" ref="addForm"> <el-form :model="addForm" inline class="label-input-form" label-width="180px" :rules="addFormRules" ref="addForm">
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''"> <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别"> <el-select :disabled="DrawerType === 'see'" v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
<el-option <el-option
v-for="item in standSortOptions" v-for="(item, index) in standSortOptions"
:key="item.value" :key="index"
:value="item.value" :value="item.value"
:label="item.label" :label="item.label"
></el-option> ></el-option>
@@ -323,7 +323,7 @@
</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="area" :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-select v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;"> <el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option <el-option
v-for="item in BZList" v-for="item in BZList"
:key="item.value" :key="item.value"
@@ -335,7 +335,7 @@
</el-form-item> </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' : ''"> <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 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>
<el-radio label="否" value="否"></el-radio> <el-radio label="否" value="否"></el-radio>
</el-radio-group> </el-radio-group>
@@ -345,13 +345,14 @@
<custom-input-for-all-standards <custom-input-for-all-standards
class="classDisplay" class="classDisplay"
:config="{attrName: '采用标准'}" :config="{attrName: '采用标准'}"
:disabled="DrawerType === 'see'"
:labelWidth="'180px'" :labelWidth="'180px'"
v-model="addForm.esStandRelations" v-model="addForm.esStandRelations"
></custom-input-for-all-standards> ></custom-input-for-all-standards>
</template> </template>
<el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''"> <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :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 v-model="addForm.useLevel"> <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.useLevel">
<el-radio label="等同" value="等同"></el-radio> <el-radio label="等同" value="等同"></el-radio>
<el-radio label="修改" value="修改"></el-radio> <el-radio label="修改" value="修改"></el-radio>
<el-radio label="非等效" value="非等效"></el-radio> <el-radio label="非等效" value="非等效"></el-radio>
@@ -361,6 +362,7 @@
<el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''"> <el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :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
:disabled="DrawerType === 'see'"
v-model="addForm.technologic" v-model="addForm.technologic"
placeholder="请简述技术指标依据"> placeholder="请简述技术指标依据">
</el-input> </el-input>
@@ -369,6 +371,7 @@
<template> <template>
<custom-input-for-all-standards2 <custom-input-for-all-standards2
class="classDisplay" class="classDisplay"
:disabled="DrawerType === 'see'"
:config="{attrName: '配套标准'}" :config="{attrName: '配套标准'}"
:labelWidth="'180px'" :labelWidth="'180px'"
v-model="addForm.esMatingRelations" v-model="addForm.esMatingRelations"
@@ -718,12 +721,16 @@
this.TXJGmodal = false this.TXJGmodal = false
}, },
choiceTXJG (id) { choiceTXJG (id) {
if (id) { if ( this.DrawerType === 'see') {
this.TXJGList = id.split(',') return
} else { } else {
this.TXJGList = [] if (id) {
this.TXJGList = id.split(',')
} else {
this.TXJGList = []
}
this.TXJGmodal = true
} }
this.TXJGmodal = true
}, },
QYBZcloseDrawer () { QYBZcloseDrawer () {
this.clearQYBZ() this.clearQYBZ()
@@ -768,9 +775,13 @@
} }
}, },
choiceQYBZ (id) { choiceQYBZ (id) {
this.QYBZformSelect = [] if (this.DrawerType === 'see') {
this.QYBZget() return
this.QYBZmodal = true } else {
this.QYBZformSelect = []
this.QYBZget()
this.QYBZmodal = true
}
}, },
drawerCheckZRBM (data) { drawerCheckZRBM (data) {
let list = '' let list = ''
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+27 -22
View File
@@ -945,22 +945,22 @@
placeholder="请输入标准英文名称" placeholder="请输入标准英文名称"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="standNature" label-width="150px" class="add-form-item"> <!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
<template slot="label">标准性质</template> <!-- <template slot="label">标准性质</template>-->
<el-select v-model="sarStandardsInfoEO.standNature" <!-- <el-select v-model="sarStandardsInfoEO.standNature"-->
placeholder="请选择标准性质" <!-- placeholder="请选择标准性质"-->
clearable> <!-- clearable>-->
<el-option <!-- <el-option-->
v-for="item in standNatureOptions" <!-- v-for="item in standNatureOptions"-->
placeholder="请选择" <!-- placeholder="请选择"-->
:key="item.value" <!-- :key="item.value"-->
:value="item.value" <!-- :value="item.value"-->
:label="item.label" <!-- :label="item.label"-->
> <!-- >-->
{{ item.label }} <!-- {{ item.label }}-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="standState" label-width="150px" class="add-form-item"> prop="standState" label-width="150px" class="add-form-item">
<template slot="label">文本状态</template> <template slot="label">文本状态</template>
@@ -1659,7 +1659,7 @@
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new> :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
<tree-select-new <tree-select-module
width="500" width="500"
:lazy=true :lazy=true
:multiple=true :multiple=true
@@ -1669,7 +1669,9 @@
:url="url" :url="url"
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new> :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
@popoverHideCancel="popoverHideModelCancel()">
</tree-select-module>
<!-- 导入失败 --> <!-- 导入失败 -->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px"> <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
<p slot="title" style="color:#f60"> <p slot="title" style="color:#f60">
@@ -1740,6 +1742,7 @@ import {interfaceUrl} from "@/sysConfig";
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 store from "@/store"; import store from "@/store";
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
@@ -1765,6 +1768,7 @@ export default {
CustomDatePickWithText2, CustomDatePickWithText2,
TreeSelect, TreeSelect,
TreeSelectNew, TreeSelectNew,
treeSelectModule,
ProcessTitle ProcessTitle
}, },
data() { data() {
@@ -2281,11 +2285,11 @@ export default {
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
], ],
standName: [ standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'}, {required: false, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
], ],
standEnName: [ standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'}, {required: false, message: '英文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// {validator: this.verify.valiateEnName, trigger: 'blur'} // {validator: this.verify.valiateEnName, trigger: 'blur'}
], ],
@@ -2587,7 +2591,8 @@ export default {
this.modalShowFlag3 = false this.modalShowFlag3 = false
}, },
popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) { popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) { console.log(checkedData)
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) { if (checkedData.length > 0) {
this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",") this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",") this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2595,8 +2600,8 @@ export default {
this.sarStandardsInfoEO.DYBXH = checkedData.model this.sarStandardsInfoEO.DYBXH = checkedData.model
this.sarStandardsInfoEO.DYMC = checkedData.name this.sarStandardsInfoEO.DYMC = checkedData.name
} }
this.modalShowFlag4 = false
} }
this.modalShowFlag4 = false
this.$forceUpdate() this.$forceUpdate()
}, popoverHideModelCancel() { }, popoverHideModelCancel() {
this.modalShowFlag4 = false this.modalShowFlag4 = false