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:
zhutianqi
2021-12-31 09:59:09 +08:00
parent a790511e97 7e27310dd5
commit cb17bfe56e
25 changed files with 963 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+3 -2
View File
@@ -83,7 +83,7 @@
<script>
import {mapGetters, mapState} from 'vuex'
import {webLoginType} from '@/sysConfig'
import {webLoginType,ssoLogoutUrlDev} from '@/sysConfig'
export default {
name: 'App',
@@ -105,7 +105,8 @@ export default {
roundButton: false
}).then(() => {
if (webLoginType != null && webLoginType === 'idm') {
window.location.href = 'http://sso.foton.com.cn/logout?service='
this.$store.dispatch('logout')
window.location.href = ssoLogoutUrlDev
// this.$http.post('logout', {}, res => {
// window.location.href= 'http://testsso1.foton.com.cn/logout?service='
// })
src/components/navMenu/index.vue
+2 -2
View File
@@ -281,13 +281,13 @@
menuId: 'asfdew33',
isChildren: true // 判断没有子菜单
},
{
/*{
title: '资料中心',
path: '/dataCenter',
'icon-class': 'el-icon-s-order',
menuId: '',
isChildren: true // 判断没有子菜单
},
},*/
// {
// title: '技术要求清单',
// path: '/skillReq',
src/pages/loginVerify/index.vue
+5 -2
View File
@@ -8,7 +8,7 @@
import axios from 'axios'
import util from 'util'
import { get_verify_by_instance,loginIdm,getMenu } from 'api/process'
import { ssoLoginUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
import { ssoLoginUrlDev,ssoLogoutUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
export default {
name: 'LoginVerify',
@@ -135,7 +135,10 @@
if (res.ok) {
this.loginNew(res)
} else {
window.location.href = ssoLoginUrlDev
this.$message.warning('系统无权限访问')
this.$store.dispatch('logout')
// window.location.href = 'http://sso.foton.com.cn/logout?service='
window.location.href = ssoLogoutUrlDev
}
})
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+2 -2
View File
@@ -229,9 +229,9 @@
<el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-input
clearable
v-model="form.QCDW"
placeholder="选择起草部门"
readonly="readonly"
@click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
</el-input>
</el-form-item>
@@ -266,7 +266,7 @@
<el-input
v-model="form.QCRBUSS"
placeholder="选择起草人"
clearable
readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
</el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+79 -13
View File
@@ -239,19 +239,76 @@
<template slot="title">意见信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow">
<el-table
ref="selection"
tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
:data="form.infoList"
border
default-expand-all>
<el-table-column
label="序号"
min-width="15%"
align="center">
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column>
<el-table-column
prop="userName"
label="会签人"
align="center"
min-width="15%">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见"
min-width="35%"
align="center">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见文件"
min-width="35%"
align="left">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
</el-table>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
<el-select v-model="form.opinionsAdopted" filterable clearable :disabled="disabledState">
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="summaryFileList.length>0" v-for="(value,index) in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
@@ -320,6 +377,15 @@ export default {
default: false
},
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
}
},
data () {
return {
opinionsAdoptedOptions:[
@@ -366,7 +432,7 @@ export default {
methods: {
downloadFile (data) {
//文件id中出现了','字符,去除掉
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
},
setMap(data){
data.forEach(item => {
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+505
View File
@@ -0,0 +1,505 @@
<template>
<form>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
<el-input
v-model="form.standCode" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standName" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
<!-- <el-option-->
<!-- v-for="item in standStateOptions"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime" :disabled="disabledState"
:editable="false"></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FSRQBUSS"-->
<!-- :editable="false"-->
<!-- :disabled="true"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<!-- <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">-->
<!-- <el-option-->
<!-- v-for="item in countryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.standNumber" :disabled="disabledState"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
<el-option
v-for="item in standSortOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.standYear" :disabled="disabledState"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
:editable="false"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
<!-- :editable="false"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">过程稿件</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
<div v-if="FBGBUSSFileList.length>0" v-for="(value,index) in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<div v-if="LSBBBUSSFileList.length>0" v-for="(value,index) in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
<div v-if="BZSMBUSSFileList.length>0" v-for="(value,index) in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="QTWJBUSSFileList.length>0" v-for="(value,index) in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">适用范围</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-input v-model="form.QCDW" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
<el-input
v-model="form.WJSCRYBUSSName"
:disabled="true"
clearable
></el-input>
</el-form-item>
<el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in categoryOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in applyArcticOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in sycpxOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">关联信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.DTQBBHBUSS" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.XCSJBUSS"
clearable
:disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="opinionsShow">
<template slot="title">意见信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow">
<el-table
ref="selection"
tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
:data="form.infoList"
border
default-expand-all>
<el-table-column
label="序号"
min-width="15%"
align="center">
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column>
<el-table-column
prop="userName"
label="会签人"
align="center"
min-width="15%">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见"
min-width="35%"
align="center">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见文件"
min-width="35%"
align="left">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
</el-table>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="summaryFileList.length>0" v-for="(value,index) in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</form>
</template>
<script>
import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle'
export default {
name: 'formListIn',
components: {
ProcessTitle,
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
}
},
props: {
form: {
type: Object,
required: true
},
FBGBUSSFileList: {
type: Array,
required: true
},
LSBBBUSSFileList: {
type: Array,
required: true
},
BZSMBUSSFileList: {
type: Array,
required: true
},
QTWJBUSSFileList: {
type: Array,
required: true
},
GLWJBUSSFileList: {
type: Array,
required: true
},
summaryFileList: {
type: Array,
required: false
},
disabledState: {
type: Boolean,
default: false
},
verifySarStandard: {
type: Boolean,
default: false
},
opinionsShow: {
type: Boolean,
default: false
},
},
data () {
return {
opinionsAdoptedOptions:[
{value: '1',label: '采纳'},
{value: '2',label: '不采纳'},
],
countryOptions:[],//国家地区
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系
busVppsOptions: [], // 车系体系架构
busVppsChildOptions: [], // 车系体系架构子集合
modelOptions: [], // 模块体系架构
modelChildOptions: [], // 模块体系架构子集合
applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
cbcdOptions: [], // 采标程度
wssmrOptions: [], // 我司署名人
sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师
qcdwOption: [], // 起草单位
txlbOptions: [], // 体系类别
standSortConfigOptions: [], // 标准类别下拉框
adoptExtentOptions: [], // 采标程度下拉框
emergyKindOptions: [], // 能源种类下拉框
categoryConfigOptions: [], // 所属类别下拉框
assemClassOptions: [], // 总成分类下拉框
qcdwOptions:[],//起草单位下拉框
qcrOptions:[],//起草人下拉框
nylxOptions:[],//能源类型下拉框
syrzOptions:[],//适用认证下拉框
data: [], // 标准列表数据
ListForm: {}, // 新增数据
}
},
computed: {
...mapGetters(['userInfo'])
},
methods: {
downloadFile (data) {
//文件id中出现了','字符,去除掉
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
},
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = []
this.busVppsOptions = res.data
})
},
modelFunc(){
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = []
this.modelOptions = res.data
})
},
},
mounted () {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY
this.applyCountryOptions = res.data.COUNTRY
this.regionOptions = res.data.REGION // 区域
this.standStateOptions = res.data.BUSSSTATE
this.energyKindOptions = res.data.ENERGYTYPES
this.standGeneraOptions = res.data.BUSSBIGCLASS
this.standSubclassOptions = res.data.BUSSFINECLASS
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.standSystemOptions = res.data.TXLBBUSS // 标准体系
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.qcdwOptions = res.data.QCDW // 起草单位
this.qcrOptions = res.data.QCRBUSS // 起草人
this.nylxOptions = res.data.NYLXCLASS // 能源类型
this.syrzOptions = res.data.SYRZCLASS // 适用认证
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.setMap(this.standStateOptions)
})
this.busVsFunc()
this.modelFunc()
}
}
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+50 -36
View File
@@ -25,10 +25,11 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable :disabled="planDisabled">
<el-select v-model="form.standSort" filterable clearable :disabled="planDisabled"
placeholder="请先选择计划带入企标类别"
>
<el-option
v-for="item in standSortOptions"
placeholder="请选择企标类别"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -39,7 +40,7 @@
<el-input
:disabled="planDisabled"
v-model="form.standName"
placeholder="请输入中文名称"
placeholder="请先选择计划带入企标名称"
clearable
></el-input>
</el-form-item>
@@ -237,7 +238,7 @@
<el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-input
clearable
readonly="readonly"
v-model="form.QCDW"
placeholder="选择起草部门"
@click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
@@ -274,7 +275,7 @@
<el-input
v-model="form.QCRBUSS"
placeholder="选择起草人"
clearable
readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
</el-input>
</el-form-item>
@@ -478,7 +479,7 @@
<el-form-item prop="qcUserName" style="margin-bottom: 0">
<h4>其他起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.qcUserName" clearable placeholder="其他起草人" @click.native="choiceZRRList('qcUserId', '选择其他起草人', roleForm.qcUserId)"></el-input>
<el-input v-model="roleForm.qcUserName" clearable readonly="readonly" placeholder="其他起草人" @click.native="choiceZRRList('qcUserId', '选择其他起草人', roleForm.qcUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -488,7 +489,7 @@
<el-form-item prop="hzUserName" style="margin-bottom: 0">
<h4>企标编写汇总修订人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.hzUserName" clearable placeholder="企标编写汇总修订人"></el-input>
<el-input disabled v-model="roleForm.hzUserName" readonly="readonly" clearable placeholder="企标编写汇总修订人"></el-input>
</div>
</el-form-item>
</el-card>
@@ -498,7 +499,7 @@
<el-form-item prop="bzhUserName" style="margin-bottom: 0">
<h4>总院各中心兼职标准化员/各事业部标准化员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bzhUserName" placeholder="选择总院各中心兼职标准化员/各事业部标准化员" @click.native="choiceZRR('bzhUserId', '选择总院各中心兼职标准化员/各事业部标准化员', roleForm.bzhUserId)"></el-input>
<el-input v-model="roleForm.bzhUserName" readonly="readonly" placeholder="选择总院各中心兼职标准化员/各事业部标准化员" @click.native="choiceZRR('bzhUserId', '选择总院各中心兼职标准化员/各事业部标准化员', roleForm.bzhUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -508,7 +509,7 @@
<el-form-item prop="hqUserName" style="margin-bottom: 0">
<h4>会签征求意见人员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.hqUserName" placeholder="选择会签征求意见人员" @click.native="choiceZRRList('hqUserId', '选择会签征求意见人员', roleForm.hqUserId)"></el-input>
<el-input v-model="roleForm.hqUserName" placeholder="选择会签征求意见人员" readonly="readonly" @click.native="choiceZRRList('hqUserId', '选择会签征求意见人员', roleForm.hqUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -518,7 +519,7 @@
<el-form-item prop="xdUserName" style="margin-bottom: 0">
<h4>技术委员会评审/评审意见修改人员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.xdUserName" placeholder="技术委员会评审/评审意见修改人员"></el-input>
<el-input disabled v-model="roleForm.xdUserName" readonly="readonly" placeholder="技术委员会评审/评审意见修改人员"></el-input>
</div>
</el-form-item>
</el-card>
@@ -528,7 +529,7 @@
<el-form-item prop="fggcsUserName" style="margin-bottom: 0">
<h4>标准法规部标准化工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.fggcsUserName" placeholder="标准法规部标准化工程师" @click.native="choiceZRR('fggcsUserId', '选择标准法规部标准化工程师', roleForm.fggcsUserId)"></el-input>
<el-input v-model="roleForm.fggcsUserName" readonly="readonly" placeholder="标准法规部标准化工程师" @click.native="choiceZRR('fggcsUserId', '选择标准法规部标准化工程师', roleForm.fggcsUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -538,7 +539,7 @@
<el-form-item prop="jsfzrUserName" style="margin-bottom: 0">
<h4>起草单位高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.jsfzrUserName" placeholder="选择起草单位高级经理" @click.native="choiceZRR('jsfzrUserId', '选择起草单位高级经理', roleForm.jsfzrUserId)"></el-input>
<el-input v-model="roleForm.jsfzrUserName" readonly="readonly" placeholder="选择起草单位高级经理" @click.native="choiceZRR('jsfzrUserId', '选择起草单位高级经理', roleForm.jsfzrUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -548,7 +549,7 @@
<el-form-item prop="bzUserName" style="margin-bottom: 0">
<h4>标准法规部高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bzUserName" placeholder="选择标准法规部高级经理" @click.native="choiceZRR('bzUserId', '选择标准法规部高级经理', roleForm.bzUserId)"></el-input>
<el-input v-model="roleForm.bzUserName" readonly="readonly" placeholder="选择标准法规部高级经理" @click.native="choiceZRR('bzUserId', '选择标准法规部高级经理', roleForm.bzUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -558,7 +559,7 @@
<el-form-item prop="fzrUserName" style="margin-bottom: 0">
<h4>起草单位中心主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.fzrUserName" placeholder="选择起草单位中心主任" @click.native="choiceZRR('fzrUserId', '选择起草单位中心主任', roleForm.fzrUserId)"></el-input>
<el-input v-model="roleForm.fzrUserName" readonly="readonly" placeholder="选择起草单位中心主任" @click.native="choiceZRR('fzrUserId', '选择起草单位中心主任', roleForm.fzrUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -568,7 +569,7 @@
<el-form-item prop="zhrUserName" style="margin-bottom: 0">
<h4>总院院长或总院主管副院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.zhrUserName" placeholder="选择总院院长或总院主管副院长" @click.native="choiceZRR('zhrUserId', '选择总院院长或总院主管副院长', roleForm.zhrUserId)"></el-input>
<el-input v-model="roleForm.zhrUserName" readonly="readonly" placeholder="选择总院院长或总院主管副院长" @click.native="choiceZRR('zhrUserId', '选择总院院长或总院主管副院长', roleForm.zhrUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -578,7 +579,7 @@
<el-form-item prop="pxUserName" style="margin-bottom: 0">
<h4>标准法规部标准化工程师发布人员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.pxUserName" placeholder="选择标准法规部标准化工程师" @click.native="choiceZRR('pxUserId', '选择标准法规部标准化工程师发布人员', roleForm.pxUserId)"></el-input>
<el-input v-model="roleForm.pxUserName" readonly="readonly" placeholder="选择标准法规部标准化工程师" @click.native="choiceZRR('pxUserId', '选择标准法规部标准化工程师发布人员', roleForm.pxUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -886,7 +887,7 @@
align="center"
label="制修订状态">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
<div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
</template>
</el-table-column>
<el-table-column
@@ -1119,7 +1120,7 @@
unit: '',
esName: '',
planStatus: '0,3',
reviseStatus: '',
reviseStatus: '2',
},
tableData: {
// 标准表格数据
@@ -1225,6 +1226,7 @@
planDisabled:true,
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
@@ -1461,6 +1463,11 @@
}
}
},
'roleForm.qcUserName': {
handler (val) {
console.log(val)
}
},
filterText(val) {
this.$refs.tree.filter(val);
},
@@ -1768,6 +1775,7 @@
this.form.standName = this.standardCheckedList[0].esName
this.form.standSort = this.standardCheckedList[0].bussSort
this.form.planId = this.standardCheckedList[0].id
this.form.planStatus = this.standardCheckedList[0].planStatus
this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
this.standardDrawer = false
this.verifySarStandard = true
@@ -1867,8 +1875,8 @@
this.standardSearchForm.page = 1
this.standardSearchForm.unit = ''
this.standardSearchForm.esName = ''
this.standardSearchForm.planStatus = ''
this.standardSearchForm.reviseStatus = '0,3'
this.standardSearchForm.planStatus = '0,3'
this.standardSearchForm.reviseStatus = '2'
setTimeout(() => {
this.handleSearchStandard()
}, 100)
@@ -1965,7 +1973,19 @@
},
choiceZRRList (type, title, id) {
this.nodeList2 = []
this.nodeList2.push(id)
if(type === 'qcUserId'){
if ( this.roleForm.qcUserId.length > 0) {
this.nodeList2 = this.roleForm.qcUserId.split(',')
}
}else if(type === 'hqUserId'){
if ( this.roleForm.hqUserId.length > 0) {
this.nodeList2 = this.roleForm.hqUserId.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -2019,7 +2039,9 @@
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
if(this.form.QCDWID.length > 0){
this.nodeListZRBM = this.form.QCDWID.split(',')
}
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
@@ -2600,7 +2622,6 @@
this.isSubmit = true
this.saveLoading = true
this.form.country=this.countryArr;
this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X'
var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
@@ -2623,28 +2644,21 @@
this.$message.success(res.message)
const planForm = {}
planForm.id = this.form.planId
planForm.planStatus = this.form.reviseStatus !== undefined ? ( this.form.reviseStatus === '1' ? '1' : '2') :''
planForm.planStatus = '2'
this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, {
_this: this
}, res => {
this.submitLoading = false
if (res.ok) {
if (res.data === '操作成功') {
this.addDrawer = false
this.$message.success(tips + '成功')
this.getData()
} else {
this.addDrawer = false
this.$message.warning(res.data)
this.getData()
this.submitLoading = false
this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else {
}
} else {
this.$message.warning(tips + '失败')
this.$message.warning(res.data)
}
})
this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
})
}
src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+3
View File
@@ -798,6 +798,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+3
View File
@@ -798,6 +798,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+35 -11
View File
@@ -18,7 +18,7 @@
label-width="210px"
>
<div style="flex: auto;" v-show="active === '1'">
<formList
<formListIn
:form = "form"
:FBGBUSSFileList = "FBGBUSSFileList"
:LSBBBUSSFileList = "LSBBBUSSFileList"
@@ -29,7 +29,7 @@
:disabledState = "disabledState"
:verifySarStandard = "verifySarStandard"
:opinionsShow = "true"
></formList>
></formListIn>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
@@ -561,7 +561,7 @@
</template>
<script>
import formList from './common/formList.vue'
import formListIn from './common/formListIn.vue'
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
@@ -573,7 +573,7 @@
export default {
name: "bussLibrary12",
components: {
formList,
formListIn,
ProcessHeader,
ProcessFooter,
ProcessTitle,
@@ -782,6 +782,10 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -2180,7 +2184,7 @@
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
// this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面
this.isSubmit = false
this.processCreateBuss(json)
@@ -2208,12 +2212,15 @@
processCreateBuss(_formData).then(res => {
if (res.result === '操作成功' || res.data === '入库成功') {
this.$message.success(res.data)
setTimeout(() => {
this.$router.push({
name: 'ProcessCenter'
})
}, 100)
this.isSubmit = false
const planForm = {}
planForm.id = this.form.planId
planForm.planStatus = '4'
this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, {
_this: this
}, res => {
this.submitLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
})
} else {
this.$message.warning(res.message)
this.isSubmit = false
@@ -2254,6 +2261,7 @@
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
this.getStandInfoByReviseStatus()
})
},
assemble(ids,names){
@@ -2309,6 +2317,22 @@
})
}
},
getStandInfoByReviseStatus() {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:this.form.reviseStatus}, {
_this: this
}, res => {
const obj = res.data
let standSn = (obj === null || obj.newStandSn === null) ? '001' : obj.newStandSn
let date = new Date();
let year = date.getFullYear();
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standYear = year + ' X'
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}, e => {
})
},
processTable () {
this.$nextTick(() => {
Promise.all([this.getTaskId()]).then((value) => {
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+3
View File
@@ -788,6 +788,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+24 -6
View File
@@ -74,7 +74,7 @@
<div @click="filePreview(scope.row,'onLine')" style="display: inline-block;cursor: pointer;color: #409EFF;">
预览
</div>
&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<div @click="filePreview(scope.row,'down')" style="display: inline-block;cursor: pointer;color: #409EFF;">
下载
</div>
@@ -850,6 +850,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1113,7 +1116,9 @@
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
if(this.form.QCDWID.length > 0){
this.nodeListZRBM = this.form.QCDWID.split(',')
}
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
@@ -1651,7 +1656,19 @@
},
choiceZRRList (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
if(type === 'qcUserId'){
if ( this.roleForm.qcUserId.length > 0) {
this.nodeList2 = this.roleForm.qcUserId.split(',')
}
}else if(type === 'hqUserId'){
if ( this.roleForm.hqUserId.length > 0) {
this.nodeList2 = this.roleForm.hqUserId.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -1951,7 +1968,7 @@
const attId = file.footFile
if (type === 'down') {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
@@ -1969,7 +1986,7 @@
}
if (this.preview) {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
@@ -2227,10 +2244,11 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+3
View File
@@ -795,6 +795,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+101 -16
View File
@@ -28,7 +28,7 @@
style="width: 100%">
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column
label="标准代号"
label="标准类别"
>
<el-table-column
prop="oneIndexTitle"
@@ -116,7 +116,7 @@
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="会签意见" name = "1">
<div style="margin: 10px 0;">
<div style="margin: 0;">
<el-form
ref="formTongGuo"
:model="formTongGuo"
@@ -129,6 +129,34 @@
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="会签意见文件" prop="summaryName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.summaryName"
clearable
></el-input>
<div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
<div style="width: 30%;">
<div v-for="(item,index) in summaryList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview2(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview2(item,'down')"></el-button>
</span>
</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-top: 6px; float: left;"
@click="fileUpload('summary')">
<i class="el-icon-upload"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item
prop="commentText"
>
@@ -762,7 +790,10 @@
prcNum: this.$route.query.prcNum,
prcName: this.$route.query.prcName,
detailData: [],
summary:'',
summaryName:'',
fileList: [],
summaryList: [],
FBGBUSSFileList: [],
BZSMBUSSFileList: [],
LSBBBUSSFileList: [],
@@ -900,6 +931,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
evaluationData:[],
modelData:[],
modelDataNameVerify:[],
@@ -1439,8 +1473,9 @@
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryList=this.assemble(mes.summary,mes.summaryName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formTongGuo.commentText = mes.commentText
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
@@ -2027,6 +2062,23 @@
})
})
},
handleFilePreview2(file,type) {
let attId = ""
if(file && file.id){
attId = file.id
}else {
attId = file.response.data.id
}
if (type === 'down') {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
// 文件预览及下载
handleFilePreview(file) {
const attId = file.response.data.id
@@ -2059,25 +2111,36 @@
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
// if (fileList.length > 1) {
// this.fileList = fileList.splice(0, 1)
// fileList = fileList.splice(0, 1)
// }
if (response.ok) {
const fileObj = {}
fileObj.id = file.response.data.id
fileObj.name = file.response.data.name
switch (this.fileType){
case 'FBGBUSS':
this.FBGBUSSFileList = fileList
this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
this.FBGBUSSFileList.push(fileObj)
break;
case 'BZSMBUSS' :
this.BZSMBUSSFileList = fileList
this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
this.BZSMBUSSFileList.push(fileObj)
break;
case 'LSBBBUSS':
this.LSBBBUSSFileList = fileList
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break;
case 'GLWJLAWS':
this.QTWJBUSSFileList = fileList
this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
this.GLWJLAWSFileList.push(fileObj)
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
this.GLWJBUSSFileList.push(fileObj)
break;
case 'summary':
this.summaryList = this.summaryList.filter ( item => item.response === undefined);
this.summaryList.push(fileObj)
break;
default : ;
}
@@ -2114,6 +2177,9 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
case 'summary':
this.fileList=this.summaryList
break;
default : ;
}
this.fileMadel = true;
@@ -2137,6 +2203,9 @@
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
break;
case 'summary':
this.summaryList = fileList
break;
default : ;
}
},
@@ -2239,6 +2308,9 @@
// this.sarStandardsInfoEO.country = item.country.split(",");
// }
this.summary=this.summaryList.map(item => item.id).join(",")
this.summaryName=this.summaryList.map(item => item.name).join(",")
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
@@ -2247,10 +2319,13 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
summary: this.summary,
summaryName: this.summaryName,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -2370,14 +2445,22 @@
if (valid) {
this.isSubmit = true
this.saveLoading = true
this.summary=this.summaryList.map(item => item.id).join(",")
this.summaryName=this.summaryList.map(item => item.name).join(",")
this.form.commentText = this.formTongGuo.commentText
// this.form.approvalOpinion = this.formTongGuo.approvalOpinion
// 会签意见存储
const infoList = []
const maryList=this.assemble(this.summary,this.summaryName);
const info = {}
info.userId = this.userId
info.userName = this.userName
info.commentText = this.formTongGuo.commentText
info.summary = this.summary
info.summaryName = this.summaryName
info.summaryList = maryList
infoList.push(info)
this.form.infoList = infoList
const json = JSON.stringify(this.form);
@@ -2448,12 +2531,13 @@
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
}
return list;
},
getEvaluation() {
@@ -2501,6 +2585,7 @@
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
}
}).catch(e => {
})
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+69 -16
View File
@@ -68,23 +68,49 @@
<el-table-column
prop="commentText"
label="会签意见"
min-width="70%"
min-width="35%"
align="center">
</el-table-column>
<el-table-column
prop="commentText"
label="会签意见文件"
min-width="35%"
align="left">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
</el-table>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
<el-select v-model="form.opinionsAdopted" filterable clearable>
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="汇总评审意见文件" prop="summaryFileName" class="add-form-item form-item-disabled">
<el-input
@@ -678,6 +704,15 @@
TreeSelectNew,
formEditList
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
}
},
data () {
const validateZrUserIdName = (rule, value, callback) => {
if(this.FBGBUSSFileList.length === 0){
@@ -886,6 +921,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1159,7 +1197,9 @@
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
if(this.form.QCDWID.length > 0){
this.nodeListZRBM = this.form.QCDWID.split(',')
}
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
@@ -1698,7 +1738,19 @@
},
choiceZRRList (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
if(type === 'qcUserId'){
if ( this.roleForm.qcUserId.length > 0) {
this.nodeList2 = this.roleForm.qcUserId.split(',')
}
}else if(type === 'hqUserId'){
if ( this.roleForm.hqUserId.length > 0) {
this.nodeList2 = this.roleForm.hqUserId.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -2284,10 +2336,11 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+7 -2
View File
@@ -28,7 +28,7 @@
style="width: 100%">
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column
label="标准代号"
label="标准类别"
>
<el-table-column
prop="oneIndexTitle"
@@ -901,6 +901,7 @@
multipleFlag2:'',
url:'',
urlChild:'',
drawerModal: false,
drawerTitle: '', //drawer标题
showCheckBox: true, // 树形控件是否展示多选框
nodeKey: 'id',
@@ -916,6 +917,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
evaluationData:[],
modelData:[],
modelDataNameVerify:[],
@@ -2297,10 +2301,11 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+6 -2
View File
@@ -28,7 +28,7 @@
style="width: 100%">
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column
label="标准代号"
label="标准类别"
>
<el-table-column
prop="oneIndexTitle"
@@ -917,6 +917,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
evaluationData:[],
modelData:[],
modelDataNameVerify:[],
@@ -2284,10 +2287,11 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+6 -2
View File
@@ -28,7 +28,7 @@
style="width: 100%">
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column
label="标准代号"
label="标准类别"
>
<el-table-column
prop="oneIndexTitle"
@@ -917,6 +917,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
evaluationData:[],
modelData:[],
modelDataNameVerify:[],
@@ -2284,10 +2287,11 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText: this.formTongGuo.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+20 -2
View File
@@ -849,6 +849,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1112,7 +1115,9 @@
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
if(this.form.QCDWID.length > 0){
this.nodeListZRBM = this.form.QCDWID.split(',')
}
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
@@ -1650,7 +1655,19 @@
},
choiceZRRList (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
if(type === 'qcUserId'){
if ( this.roleForm.qcUserId.length > 0) {
this.nodeList2 = this.roleForm.qcUserId.split(',')
}
}else if(type === 'hqUserId'){
if ( this.roleForm.hqUserId.length > 0) {
this.nodeList2 = this.roleForm.hqUserId.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -2226,6 +2243,7 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+20 -2
View File
@@ -886,6 +886,9 @@
countryArr:'',
commentCycleDate:'',
form: {
planId:'',
planStatus:'',
reviseStatus:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
@@ -1159,7 +1162,9 @@
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
if(this.form.QCDWID.length > 0){
this.nodeListZRBM = this.form.QCDWID.split(',')
}
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
@@ -1698,7 +1703,19 @@
},
choiceZRRList (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
if(type === 'qcUserId'){
if ( this.roleForm.qcUserId.length > 0) {
this.nodeList2 = this.roleForm.qcUserId.split(',')
}
}else if(type === 'hqUserId'){
if ( this.roleForm.hqUserId.length > 0) {
this.nodeList2 = this.roleForm.hqUserId.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -2284,6 +2301,7 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+1 -1
View File
@@ -562,7 +562,7 @@
</template>
<script>
import formList from './common/formList.vue'
import formList from './common/formListIn.vue'
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+8
View File
@@ -305,6 +305,7 @@ export default {
name: 'bussLibrary3',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
@@ -325,6 +326,7 @@ export default {
name: 'bussLibraryC3',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
@@ -335,6 +337,7 @@ export default {
name: 'bussLibrary5',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
@@ -345,6 +348,7 @@ export default {
name: 'bussLibrary6',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
@@ -355,6 +359,7 @@ export default {
name: 'bussLibrary7',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
@@ -365,6 +370,7 @@ export default {
name: 'bussLibraryC6',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
@@ -375,6 +381,7 @@ export default {
name: 'bussLibrary8',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
@@ -385,6 +392,7 @@ export default {
name: 'bussLibrary9',
query: {
type: 'buss1',
prcNum:mes.prcNum,
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+3 -3
View File
@@ -8,9 +8,9 @@
<el-tab-pane label="车型类别清单" name="listProject" v-if="project">
<list-project></list-project>
</el-tab-pane>
<el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
<!--<el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
<list-tracking></list-tracking>
</el-tab-pane>
</el-tab-pane>-->
<el-tab-pane label="其他清单" name="listOther" v-if="other">
<list-other></list-other>
</el-tab-pane>
@@ -39,7 +39,7 @@ export default {
library: false,
list: [],
tabValue: "",
menuName: ["国家/地区清单", "车型类别清单", "重点标准跟踪清单", "其他清单", "项目清单"]
menuName: ["国家/地区清单", "车型类别清单"/*, "重点标准跟踪清单"*/, "其他清单", "项目清单"]
};
},
methods: {
src/router/index.js
+2 -2
View File
@@ -2906,7 +2906,7 @@ const routes = [
menuId: 'ABCLRLJUQN44ENBS93CQ'
}
},
{
/*{
path: '/dataCenter',
name: 'dataCenter',
component: () =>
@@ -2916,7 +2916,7 @@ const routes = [
title: '资料中心',
menuId: ''
}
},
},*/
{
path: '/dataCenterDetail',
name: 'dataCenterDetail',
src/sysConfig/index.js
+3
View File
@@ -13,6 +13,8 @@ const devIp = '10.19.11.243'
const devInterfacePORT = '4304'
// 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
const ssoLogout = 'http://sso.foton.com.cn/logout?service='
// 配置 前端服务
const devWebUrl = 'https://srms.foton.com.cn/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
@@ -60,6 +62,7 @@ module.exports = {
baseUrl: 'http://' + serverIP + ':' + interfacePORT,
webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLogoutUrlDev: ssoLogout + devWebUrl,
ssoLoginUrl: ssoLogin,
onlyOfficeUrl: onlyOfficeUrl,
kkFileViewUrl: kkFileViewUrl,