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

Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-19 10:57:22 +08:00
parent 959ab65acd f8536448e7
commit 504349cef0
25 changed files with 2332 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/treeSelect/treeSelect.vue
+3 -2
View File
@@ -17,12 +17,11 @@
<template>
<div>
<div class="mask" v-show="isShowSelect" @click="isShowSelect = !isShowSelect"></div>
<el-popover placement="bottom-start" :width="width" trigger="manual"
<el-popover placement="bottom-start" :width="width" trigger="manual" :disabled="disabled"
v-model="isShowSelect" @hide="popoverHide">
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
:show-checkbox="multiple"
:node-key="nodeKey"
:disabled="disabled"
:check-strictly="checkStrictly"
default-expand-all
:expand-on-click-node="false"
@@ -110,6 +109,8 @@
checkedData: []
};
},
created(){
},
mounted () {
if (this.checkedKeys.length > 0) {
if (this.multiple) {
src/pages/details/otherStandardDetails/index.vue
+1 -3
View File
@@ -56,7 +56,7 @@
</p>
<p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p><label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
<p><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
<p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
<!-- <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
<!-- <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
<!-- <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
@@ -2624,8 +2624,6 @@ export default {
// if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
// return
// }
console.log("displayLocation");
console.log(displayLocation);
displayLocation.forEach((location) => {
location.isShowImp = '0'
if (dynamicFormField) {
src/pages/home1/components/todoList/index.vue
-1
View File
@@ -50,7 +50,6 @@ export default {
this.$router.push(this.path)
},
dealWith (row) { // 办理
this.setHandleInfo(JSON.stringify(row))
const prcType = row.prcType
switch(prcType) {
case '1':
src/pages/home1/index.vue
+37 -20
View File
@@ -16,27 +16,29 @@
<search-group></search-group>
<div class="main-tabs">
<div class="main-left-wrap">
<el-button type="text" class="more" @click="MORE">MORE</el-button>
<el-tabs
v-model="activeName"
class="home-tabs"
@tab-click="handleTabClick"
>
<!-- <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
<!-- <conference-materials></conference-materials>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
<!-- <notice-of-meeting></notice-of-meeting>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="标准征求意见" name="solicitOpinions">
<solicitOpinions></solicitOpinions>
</el-tab-pane>
<!-- <el-tab-pane label="标准发布" name="release">-->
<!-- <release></release>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="外部资讯" name="realTimeInfo">-->
<!-- <realTimeInfo></realTimeInfo>-->
<!-- </el-tab-pane>-->
</el-tabs>
v-model="activeName"
class="home-tabs"
@tab-click="handleTabClick"
>
<!-- <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
<!-- <conference-materials></conference-materials>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
<!-- <notice-of-meeting></notice-of-meeting>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="标准征求意见" name="solicitOpinions">
<solicitOpinions></solicitOpinions>
</el-tab-pane>
<!-- <el-tab-pane label="标准发布" name="release">-->
<!-- <release></release>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="外部资讯" name="realTimeInfo">-->
<!-- <realTimeInfo></realTimeInfo>-->
<!-- </el-tab-pane>-->
</el-tabs>
</div>
</div>
</div>
@@ -106,6 +108,9 @@ export default {
}, e => {})
}).catch(() => {
})
},
MORE() {
this.$router.push({name: 'standardForComments'})
}
},
}
@@ -172,8 +177,20 @@ export default {
width: 60vw;
height: 100%;
margin-right: 10px;
.more {
float: right;
color: #FFFFFF;
margin: 0px 15px;
&:hover {
color: red;
cursor: pointer;
}
}
.home-tabs {
margin-left: 2.34vw;
::v-deep.el-tabs__header{
margin: 0 70px 15px 0px
}
::v-deep {
.el-tabs__item {
font-size: 16px;
src/pages/localTool/standAutoSplit/index.vue
+12 -14
View File
@@ -28,8 +28,8 @@
</table-tools-bar>
<div class="content">
<div class="action-bar">
<el-button size="mini" @click="spiltStandFile" v-btn-permission="''"><i class="iconfont"></i>拆分</el-button>
<el-button size="mini" @click="batchDelete" v-btn-permission="''"><i class="iconfont">&#xe61b;</i>删除</el-button>
<el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="''">拆分</el-button>
<el-button size="small" type="danger" @click="batchDelete" v-btn-permission="''">删除</el-button>
</div>
<div class="table-wrap">
<div style="position: absolute;height: 100%;width: 100%;">
@@ -542,16 +542,17 @@
</el-formItem>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
size="mini"
type="primary"
class="common-button-primary"
@click="getSearchSarBussStandPage">
搜索
</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
size="mini"
@click="handleResetCondition()"
></el-button>
>清空</el-button>
</el-form-item>
</el-form>
</div>
@@ -594,11 +595,11 @@
<a @click="showLawsDetails(scope.row)">{{ scope.row.lawsName }}</a>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="stateName"-->
<!-- align="center"-->
<!-- label="文本状态">-->
<!-- </el-table-column>-->
<!-- <el-table-column
prop="fileType"
align="center"
label="文本状态">
</el-table-column>-->
<!-- <el-table-column-->
<!-- prop="putTime"-->
<!-- label="新车型实施日期"-->
@@ -931,7 +932,7 @@ export default {
_this: this
}, res => {
this.addSpiltStandList = res.data.list
this.addFileStandtotal = res.data.count
this.addFileStandtotal = res.data.list.length
this.loadData = false
}, e => {
this.loadData = false
@@ -1359,10 +1360,7 @@ export default {
name: 'ItemSplitInfo',
query: {
infoId: row.id,
// standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit,
// standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit,
result: row.result,
// fileType: row.fileType
}
})
},
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+2 -2
View File
@@ -110,12 +110,12 @@
</div>
<ProcessFooter
show-submit
show-back
approval
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+24 -24
View File
@@ -28,18 +28,18 @@
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="cid" class="add-form-item form-item-disabled">
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称/政策名称" prop="cname" class="add-form-item form-item-disabled">
<el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
@@ -47,14 +47,14 @@
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
@@ -392,18 +392,18 @@
saveLoading: false,
// 基础信息form表单
form: {
number: '',
name: '',
id: '',
number1: '',
name1: '',
id1: ''
itemsNum: '',
itemsName: '',
standId: '',
itemsNum1: '',
itemsName1: '',
oldNumber: ''
},
formRules: {
number: [
itemsNum: [
{ required: true, message: '请输入标准号/政策号', trigger: 'change' },
],
name: [
itemsName: [
{ required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
],
},
@@ -558,13 +558,13 @@
bringData.push(deposit.get(this.selectedList[i]));
}
if (bringData[0].splitStatus === '0') {
this.form.number = bringData[0].standNumSplit
this.form.name = bringData[0].standNameSplit
this.form.itemsNum = bringData[0].standNumSplit
this.form.itemsName = bringData[0].standNameSplit
} else {
this.form.number = bringData[0].showNumber
this.form.name = bringData[0].standName
this.form.itemsNum = bringData[0].showNumber
this.form.itemsName = bringData[0].standName
}
this.form.id = bringData[0].id
this.form.standId = bringData[0].id
this.sarType = bringData[0].sarType
this.standId = bringData[0].standId
this.listModel = false;
@@ -605,13 +605,13 @@
bringData.push(deposit.get(this.selectedList2[i]));
}
if (bringData[0].splitStatus === '0') {
this.form.number1 = bringData[0].standNumSplit
this.form.name1 = bringData[0].standNameSplit
this.form.itemsNum1 = bringData[0].standNumSplit
this.form.itemsName1 = bringData[0].standNameSplit
} else {
this.form.number1 = bringData[0].showNumber
this.form.name1 = bringData[0].standName
this.form.itemsNum1 = bringData[0].showNumber
this.form.itemsName1 = bringData[0].standName
}
this.form.id1 = bringData[0].id
this.form.oldNumber = bringData[0].id
this.listModel2 = false
} else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+2 -2
View File
@@ -2,8 +2,8 @@
<div class="bzjdStep2">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">对接人选择责任人</template>
<template slot="proName">标准解读流程</template>
<template slot="proNode">选择执行人</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+216 -41
View File
@@ -2,8 +2,8 @@
<div class="bzjdStep3">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">对接人选择责任人</template>
<template slot="proName">标准解读流程</template>
<template slot="proNode">填写解读分析</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -86,7 +86,8 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange"
row-key="id">
row-key="id"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
prop="itemsNum"
@@ -101,64 +102,97 @@
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
width="150"
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
prop="technicalRequir"
width="150"
label="核心技术要求"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.technicalRequir" placeholder="请输入核心技术要求" />
</template>
</el-table-column>
<el-table-column
prop="itermsConditions"
v-if="sarType === 'INLAND'"
prop="changePoint"
width="150"
label="基于上一版本差异"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.changePoint" placeholder="请输入基于上一版本差异" />
</template>
</el-table-column>
<el-table-column
prop="itermsConditions"
v-if="sarType === 'FOREIGN'"
prop="changePoint"
width="150"
label="相对于国行标差异点"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.changePoint" placeholder="请输入相对于国行标差异点" />
</template>
</el-table-column>
<el-table-column
prop="itermsConditions"
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.complianceRequir">
<el-option value="1" label="符合" key="1"></el-option>
<el-option value="2" label="不符合" key="2"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
prop="itermsConditions"
prop="complianceState"
width="150"
label="合规性分析"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.complianceState" placeholder="请输入合规性分析" />
</template>
</el-table-column>
<el-table-column
prop="itermsConditions"
width="150"
prop="newData"
width="250"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.newData"
type="date"
placeholder="选择新车型实施日期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column
prop="itermsConditions"
width="150"
prop="onlineData"
width="250"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.onlineData"
type="date"
placeholder="选择新车型实施日期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column
prop="itermsConditions"
prop="applyArctic"
width="150"
label="适用车型"
align="center">
</el-table-column>
<el-table-column
prop="unitDeptName"
label="责任部门"
width="170"
prop="deptName"
align="center">
</el-table-column>
<el-table-column
@@ -192,6 +226,66 @@
@submit="handleSubmit"
>
</ProcessFooter>
<el-drawer
title="批量填写"
:visible.sync="modalshowflag"
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
<el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" >
<el-input
v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求"
></el-input>
</el-formItem>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'">
<el-input
v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点"
></el-input>
</el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'">
<el-input
v-model="plForm.changePoint"
placeholder="请输入上一版本差异点"
></el-input>
</el-form-item>
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
<el-select
v-model="plForm.complianceRequir"
placeholder="请选择符合性要求">
<el-option value="1" label="符合"></el-option>
<el-option value="2" label="不符合"></el-option>
</el-select>
</el-form-item>
<el-form-item label="合规性分析" prop="complianceState" class="add-form-item" >
<el-input
v-model="plForm.complianceState"
placeholder="请输入合规性分析"
></el-input>
</el-form-item>
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
<el-date-picker
v-model="plForm.newData"
type="date"
placeholder="选择新车型实施日期">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
<el-date-picker
v-model="plForm.onlineData"
type="date"
placeholder="选择在产车实施日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div id="roleFormButton2" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
</div>
</template>
@@ -205,6 +299,15 @@
name: "bzjdStep3",
data() {
return {
plForm: {
technicalRequir: '', // 核心技术要求
changePoint: '', // 国内标准的差异点
complianceRequir: '1', // 符合性要求
complianceState: '', // 合规性分析
newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期
},
modalshowflag: false,
sarType: '',
itemList: [],
loading: false,
@@ -221,7 +324,8 @@
number1: '',
name1: ''
},
json: {}
json: {},
idList: []
}
},
components: {
@@ -230,7 +334,43 @@
ProcessTitle
},
methods: {
handleSelectionChange () {},
saveUserInfo () {
for( let a = 0; a < this.itemList.length; a++) {
for ( let b = 0; b < this.idList.length; b++) {
if (this.itemList[a].id === this.idList[b]) {
this.itemList[a].technicalRequir = this.plForm.technicalRequir
this.itemList[a].changePoint = this.plForm.changePoint
this.itemList[a].complianceRequir = this.plForm.complianceRequir
this.itemList[a].complianceState = this.plForm.complianceState
this.itemList[a].newData = this.plForm.newData
this.itemList[a].onlineData = this.plForm.onlineData
}
}
}
this.modalshowflag = false
},
cancleUserInfo () {
this.modalshowflag = false
},
choiceZRR () {
if (this.idList.length > 0) {
this.plForm.technicalRequir = ''
this.plForm.changePoint = ''
this.plForm.complianceRequir = '1'
this.plForm.complianceState = ''
this.plForm.newData = ''
this.plForm.onlineData = ''
this.modalshowflag = true
} else {
this.$message.warning('请选择要编辑的数据')
}
},
handleSelectionChange (val) {
this.idList = []
val.forEach( item => {
this.idList.push(item.id)
})
},
handleTabs(name) {
this.active = name
},
@@ -238,27 +378,53 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
var json = this.json
json.commentText = this.commentText
var arr = this.form.zxUserId.split(',')
var newArr = []
arr.forEach(item => {
var json1 = {}
json1.id = item
newArr.push(json1)
})
json.zxUserId = newArr
json.zxUserIdName = this.form.zxUserIdName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0
for (let a = 0; a < this.itemList.length; a++) {
if (!this.itemList[a].technicalRequir) {
num1++
}
})
if (!this.itemList[a].changePoint) {
num2++
}
if (!this.itemList[a].complianceRequir) {
num3++
}
if (!this.itemList[a].newData) {
num4++
}
if (!this.itemList[a].onlineData) {
num5++
}
}
if (num1 > 0) {
this.$message.warning('请输入核心技术要求')
} else if (num2 > 0) {
if (this.sarType === 'INLAND') {
this.$message.warning('请输入国内标准的差异点')
} else {
this.$message.warning('请输入基于上一版本差异')
}
} else if (num3 > 0) {
this.$message.warning('请输入符合性要求')
} else if (num4 > 0) {
this.$message.warning('请输入新车型实施日期')
} else if (num5 > 0) {
this.$message.warning('请输入在产车实施日期')
} else {
var json = this.json
json.commentText = this.commentText
json.itemList = this.itemList
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
}
} else {
return this.$message.warning('请完善基础信息')
}
@@ -277,10 +443,19 @@
this.form.name1 = data.name1
this.sarType = data.standInData
this.json = data
this.itemList = JSON.parse(data.itemList)
this.itemList.forEach( item => {
item.deptName = this.$store.getters.userInfo.orgName
const itemList = JSON.parse(data.itemList)
itemList.forEach(item => {
item.unitDeptName = this.$store.getters.userInfo.orgName
item.onlineData = ''
item.newData = ''
item.complianceState = ''
item.oldNumber = ''
item.complianceRequir = '1'
item.changePoint = ''
item.technicalRequir = ''
item.itemsTitle = item.itermsConditions
})
this.itemList = itemList
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+355 -4
View File
@@ -1,13 +1,364 @@
<template>
<div class="bzjdStep4">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准解读流程</template>
<template slot="proNode">责任人审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
<ProcessTitle>
<template slot="title">拆分信息</template>
</ProcessTitle>
<el-table border
ref="selection"
:data="itemList"
tooltip-effect="dark"
style="width: 100%;"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
>
<el-table-column
prop="itemsNum"
label="条款号"
width="70"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="technicalRequir"
width="150"
label="核心技术要求"
align="center">
</el-table-column>
<el-table-column
v-if="sarType === 'INLAND'"
prop="changePoint"
width="150"
label="基于上一版本差异"
align="center">
</el-table-column>
<el-table-column
v-if="sarType === 'FOREIGN'"
prop="changePoint"
width="150"
label="相对于国行标差异点"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
prop="complianceState"
width="150"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="250"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
</template>
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
</template>
</el-table-column>
<el-table-column
prop="applyArctic"
width="150"
label="适用车型"
align="center">
</el-table-column>
<el-table-column
prop="unitDeptName"
label="责任部门"
width="170"
align="center">
</el-table-column>
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
align="center">
</el-table-column>
</el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
export default {
name: "step4"
name: "bzjdStep4",
data() {
return {
sarType: '',
itemList: [],
loading: false,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
textarea: '', // 意见
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
number1: '',
name1: ''
},
json: {},
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
var json = this.json
json.resolveFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
},
handleSubmitNo () {
if (this.commentText) {
var json = this.json
json.resolveFlag = 2
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
}).catch(e => {
})
})
},
},
mounted () {
this.getData()
}
}
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzjdStep4 {
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+355 -4
View File
@@ -1,13 +1,364 @@
<template>
<div class="bzjdStep5">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准解读流程</template>
<template slot="proNode">工程师审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
<ProcessTitle>
<template slot="title">拆分信息</template>
</ProcessTitle>
<el-table border
ref="selection"
:data="itemList"
tooltip-effect="dark"
style="width: 100%;"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
>
<el-table-column
prop="itemsNum"
label="条款号"
width="70"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="technicalRequir"
width="150"
label="核心技术要求"
align="center">
</el-table-column>
<el-table-column
v-if="sarType === 'INLAND'"
prop="changePoint"
width="150"
label="基于上一版本差异"
align="center">
</el-table-column>
<el-table-column
v-if="sarType === 'FOREIGN'"
prop="changePoint"
width="150"
label="相对于国行标差异点"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
prop="complianceState"
width="150"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="250"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
</template>
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
</template>
</el-table-column>
<el-table-column
prop="applyArctic"
width="150"
label="适用车型"
align="center">
</el-table-column>
<el-table-column
prop="unitDeptName"
label="责任部门"
width="170"
align="center">
</el-table-column>
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
align="center">
</el-table-column>
</el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
export default {
name: "step5"
name: "bzjdStep5",
data() {
return {
sarType: '',
itemList: [],
loading: false,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
textarea: '', // 意见
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
number1: '',
name1: ''
},
json: {},
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
var json = this.json
json.zrApplyFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
},
handleSubmitNo () {
if (this.commentText) {
var json = this.json
json.zrApplyFlag = 2
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
}).catch(e => {
})
})
},
},
mounted () {
this.getData()
}
}
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzjdStep5 {
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+356 -4
View File
@@ -1,13 +1,365 @@
<template>
<div class="bzjdStep6">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准解读流程</template>
<template slot="proNode">部长审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.number"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.name"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.number1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.number1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.name1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.name1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
<ProcessTitle>
<template slot="title">拆分信息</template>
</ProcessTitle>
<el-table border
ref="selection"
:data="itemList"
tooltip-effect="dark"
style="width: 100%;"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
prop="itemsNum"
label="条款号"
width="70"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="technicalRequir"
width="150"
label="核心技术要求"
align="center">
</el-table-column>
<el-table-column
v-if="sarType === 'INLAND'"
prop="changePoint"
width="150"
label="基于上一版本差异"
align="center">
</el-table-column>
<el-table-column
v-if="sarType === 'FOREIGN'"
prop="changePoint"
width="150"
label="相对于国行标差异点"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
prop="complianceState"
width="150"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="250"
label="新车型实施日期"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
</template>
</el-table-column>
<el-table-column
prop="onlineData"
width="250"
label="在产车型实施日期"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
</template>
</el-table-column>
<el-table-column
prop="applyArctic"
width="150"
label="适用车型"
align="center">
</el-table-column>
<el-table-column
prop="unitDeptName"
label="责任部门"
width="170"
align="center">
</el-table-column>
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
align="center">
</el-table-column>
</el-table>
<loading :loading="loading">数据获取中</loading>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
export default {
name: "step6"
name: "bzjdStep6",
data() {
return {
sarType: '',
itemList: [],
loading: false,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
textarea: '', // 意见
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
number: '',
name: '',
number1: '',
name1: ''
},
json: {},
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
var json = this.json
json.gcApplyFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
},
handleSubmitNo () {
if (this.commentText) {
var json = this.json
json.gcApplyFlag = 2
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
this.form.number1 = data.number1
this.form.name1 = data.name1
this.sarType = data.standInData
this.json = data
this.itemList = data.itemList
}).catch(e => {
})
})
},
},
mounted () {
this.getData()
}
}
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzjdStep6 {
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+60 -34
View File
@@ -123,6 +123,7 @@
</el-form-item>
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<tree-select
:key="key"
width = "340"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -489,7 +490,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -502,23 +503,26 @@
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<tree-select
width = "340"
:key="key1"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHideBusVs"></tree-select>
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<tree-select
width = "340"
:key="key2"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHideCarVs"></tree-select>
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<tree-select
:key="key3"
width = "340"
:data="modelOptions"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHideModel"></tree-select>
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
@@ -548,7 +552,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -739,7 +743,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签责任人" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="选择会签责任人" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="zrUserName" style="margin-bottom: 0">
<h4>会签责任人</h4>
@@ -951,7 +955,7 @@
<div class="content">
<div class="standard-table-search">
<el-form :model="standardSearchForm" inline class="label-input-form search-area">
<el-formItem label="标准来源" prop="standType" class="search-item" >
<el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
<el-select
v-model="standardSearchForm.standType"
placeholder="请选择标准来源">
@@ -959,7 +963,7 @@
<el-option value="FOREIGN" label="国外标准库"></el-option>
</el-select>
</el-formItem>
<el-form-item label="标准类别" prop="standSort" class="search-item" >
<el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
<el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
<el-option
v-for="item in standSortOptions"
@@ -969,20 +973,20 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="search-item" >
<el-form-item label="标准编号" style="margin-right:-20px" prop="standNumber" class="search-item" >
<el-input
v-model="standardSearchForm.standNumber"
placeholder="请输入标准编号"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="search-item" >
<el-form-item label="中文名称" style="margin-right:-20px" prop="standName" class="search-item" >
<el-input v-model="standardSearchForm.standName"
placeholder="请输入标准名称"
clearable
:maxlength="500"></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="search-item">
<el-form-item label="英文名称" style="margin-right:-20px" prop="standEnName" class="search-item">
<el-input
v-model="standardSearchForm.standEnName"
maxlength="1000"
@@ -1177,11 +1181,20 @@
children: 'children',
label: 'name'
},
key:1,
key1:2,
key2:3,
key3:4,
treeData: [], // 人员数据
modalShowFlag: false, // drawer开关
drawerTitle: '', //drawer标题
nodeKey: 'id',
defaultCheckedKeys: [],
nodeKeyCode: 'code',
nodeKeyModel: 'model',
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -1479,6 +1492,13 @@
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
this.defaultCheckedKeys3 = [this.form.dybxh];
this.key++
this.key1++
this.key2++
this.key3++
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
this.form.prcNum = this.prcNum
@@ -1486,6 +1506,9 @@
this.form['id'] = bringData.id
this.standardDrawer = false
this.verifySarStandard = true
this.busVsFunc()
this.modelFunc()
this.$forceUpdate()
} else if (this.standardCheckedList.length > 1) {
this.$message.warning('最多可以带入一条标准信息')
} else {
@@ -1836,6 +1859,9 @@
}else if(this.fileType === 'ca'){
this.form.ca = response.data.id;
this.form.caName = response.data.name;
}else if(this.fileType === 'zbjbd'){
this.form.zbjbd = response.data.id;
this.form.zbjbdName = response.data.name;
}
this.$message({
showClose: true,
@@ -1850,32 +1876,28 @@
this.fileType = type;
},
popoverHide (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
console.log(this.sarStandardsInfoEO.standSystem);
if(checkedData) {
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
}
},
popoverHideBusVs (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
console.log(this.sarStandardsInfoEO.standSystem);
if(checkedData){
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
},
popoverHideCarVs (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
console.log(this.sarStandardsInfoEO.standSystem);
if(checkedData){
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
},
popoverHideModel (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
console.log(this.sarStandardsInfoEO.standSystem);
if(checkedData){
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
},
closeDrawer() {
this.ListModel = false
@@ -1924,6 +1946,7 @@
if (valid) {
this.$refs['userForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
@@ -1944,6 +1967,7 @@
}, res => {
if (res.success) {
this.$message.success(res.message)
this.isSubmit = false
}
})
}
@@ -1961,6 +1985,7 @@
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = []
this.busVppsOptions = res.data
})
},
@@ -1968,6 +1993,7 @@
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = []
this.modelOptions = res.data
})
},
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+113 -31
View File
@@ -42,13 +42,12 @@
</el-select>
</el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-date-picker
<el-input
disabled
v-model="form.standYear"
type="year"
placeholder="请选择标准年份"
value-format="yyyy">
</el-date-picker>
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
@@ -120,11 +119,13 @@
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standSystemName"
clearable
></el-input>
<tree-select
:key="key"
width = "340"
:disabled="false"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
@@ -314,7 +315,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -325,22 +326,31 @@
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled>
<el-option label="乘用车VPPS编码1" value="1"></el-option>
<el-option label="乘用车VPPS编码2" value="2"></el-option>
</el-select>
<tree-select
:key="key1"
:disabled="true"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled>
<el-option label="卡车VPPS编码1" value="1"></el-option>
<el-option label="卡车VPPS编码2" value="2"></el-option>
</el-select>
<tree-select
:key="key2"
:disabled="true"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
<el-option label="模块结构单元变型号1" value="1"></el-option>
<el-option label="模块结构单元变型号2" value="2"></el-option>
</el-select>
<tree-select
:key="key3"
width = "340"
:disabled="true"
:data="modelOptions"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
@@ -372,7 +382,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -774,6 +784,25 @@
prcName:'',
standType: '',
}, // 标准信息
nodeKeyCode: 'code',
nodeKeyModel: 'model',
key:1,
key1:2,
key2:3,
key3:4,
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
defaultCodeProps: {
children: 'children',
label: 'code'
},
defaultModelProps: {
children: 'children',
label: 'model'
},
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
@@ -811,10 +840,45 @@
},
methods: {
popoverHide (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.form.standSystem = checkedData.id
console.log(this.sarStandardsInfoEO.standSystem);
if(checkedData) {
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
}
},
popoverHideBusVs (checkedIds, checkedData) {
if(checkedData){
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
},
popoverHideCarVs (checkedIds, checkedData) {
if(checkedData){
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
},
popoverHideModel (checkedIds, checkedData) {
if(checkedData){
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = res.data
this.key1++
this.key2++
})
},
modelFunc(){
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = res.data
this.key3++
})
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -848,8 +912,13 @@
getFormFieldList (item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys = [this.form.standSystem]
console.log(this.defaultCheckedKeys)
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
@@ -874,6 +943,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
@@ -886,7 +956,12 @@
}, res => {
console.log(res);
if (res.success) {
this.processCreateStand(json)
if(this.approvalOpinion === '1'){
this.$message.warning("驳回成功")
this.isSubmit = false
}else{
this.processCreateStand(json)
}
}
})
},
@@ -907,12 +982,16 @@
name: 'ProcessCenter'
})
}, 100)
this.isSubmit = false
} else {
this.$message.warning(res.message)
this.isSubmit = false
}
})
},
},
created(){
},
mounted () {
this.getData()
this.processTable()
@@ -931,7 +1010,10 @@
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.key++
})
this.busVsFunc()
this.modelFunc()
}
}
</script>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+108 -32
View File
@@ -42,13 +42,12 @@
</el-select>
</el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.standYear"
type="year"
value-format="yyy"
placeholder="请选择标准年份">
</el-date-picker>
<el-input
disabled
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
@@ -119,11 +118,13 @@
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standSystemName"
clearable
></el-input>
<tree-select
:key="key"
width = "340"
:disabled="true"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
@@ -307,7 +308,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -318,22 +319,31 @@
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled>
<el-option label="乘用车VPPS编码1" value="1"></el-option>
<el-option label="乘用车VPPS编码2" value="2"></el-option>
</el-select>
<tree-select
:key="key1"
:disabled="true"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled>
<el-option label="卡车VPPS编码1" value="1"></el-option>
<el-option label="卡车VPPS编码2" value="2"></el-option>
</el-select>
<tree-select
:key="key2"
:disabled="true"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
<el-option label="模块结构单元变型号1" value="1"></el-option>
<el-option label="模块结构单元变型号2" value="2"></el-option>
</el-select>
<tree-select
:key="key3"
width = "340"
:disabled="true"
:data="modelOptions"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
@@ -365,7 +375,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -766,6 +776,25 @@ export default {
prcName:'',
standType: '',
}, // 标准信息
nodeKeyCode: 'code',
nodeKeyModel: 'model',
key:1,
key1:2,
key2:3,
key3:4,
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
defaultCodeProps: {
children: 'children',
label: 'code'
},
defaultModelProps: {
children: 'children',
label: 'model'
},
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
@@ -803,7 +832,45 @@ export default {
},
methods: {
popoverHide (checkedIds, checkedData) {
this.form.standSystem = checkedData.id
if(checkedData) {
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
}
},
popoverHideBusVs (checkedIds, checkedData) {
if(checkedData){
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
},
popoverHideCarVs (checkedIds, checkedData) {
if(checkedData){
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
},
popoverHideModel (checkedIds, checkedData) {
if(checkedData){
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = res.data
this.key1++
this.key2++
})
},
modelFunc(){
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = res.data
this.key3++
})
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -837,8 +904,12 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
@@ -864,10 +935,10 @@ export default {
},
handleSave() {},
handleSubmit() {
this.isSubmit = false
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -880,6 +951,7 @@ export default {
}else {
this.$message.success(res.message)
}
this.isSubmit = false
})
},
@@ -905,7 +977,11 @@ export default {
})
},
},
created(){
this.getData()
},
mounted () {
this.getData()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -914,7 +990,6 @@ export default {
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
console.log(this.standSystemOptions)
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
@@ -923,9 +998,10 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.getData()
this.key++
})
this.$forceUpdate()
this.busVsFunc()
this.modelFunc()
},
}
</script>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+97 -25
View File
@@ -43,12 +43,11 @@
</el-select>
</el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.standYear"
type="year"
value-format="yyy"
placeholder="请选择标准年份">
</el-date-picker>
<el-input
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
@@ -116,7 +115,9 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<tree-select v-if="treeStatus"
:key="key"
width = "340"
:disabled="false"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
@@ -476,7 +477,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -487,22 +488,28 @@
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple>
<el-option label="乘用车VPPS编码1" value="1"></el-option>
<el-option label="乘用车VPPS编码2" value="2"></el-option>
</el-select>
<tree-select
:key="key1"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple>
<el-option label="卡车VPPS编码1" value="1"></el-option>
<el-option label="卡车VPPS编码2" value="2"></el-option>
</el-select>
<tree-select
:key="key2"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple>
<el-option label="模块结构单元变型号1" value="1"></el-option>
<el-option label="模块结构单元变型号2" value="2"></el-option>
</el-select>
<tree-select
:key="key3"
width = "340"
:data="modelOptions"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
@@ -532,7 +539,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -566,18 +573,21 @@
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cycvppscn"
clearable
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.kccvppscn"
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.dymc"
clearable
></el-input>
@@ -996,8 +1006,25 @@ export default {
children: 'children',
label: 'menuName'
},
defaultCodeProps: {
children: 'children',
label: 'code'
},
defaultModelProps: {
children: 'children',
label: 'model'
},
nodeKey: 'id',
defaultCheckedKeys: [],
nodeKeyCode: 'code',
nodeKeyModel: 'model',
key:1,
key1:2,
key2:3,
key3:4,
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
treeStatus:false,
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
@@ -1140,6 +1167,8 @@ export default {
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
@@ -1172,6 +1201,23 @@ export default {
},
},
methods: {
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = res.data
this.key1++
this.key2++
})
},
modelFunc(){
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = res.data
this.key3++
})
},
// 代替政策号 请求数据
getReplaceLawsNumRowFirst () {
if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
@@ -1408,10 +1454,28 @@ export default {
this.fileType = type;
},
popoverHide (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
if(checkedData) {
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
}
},
popoverHideBusVs (checkedIds, checkedData) {
if(checkedData){
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
},
popoverHideCarVs (checkedIds, checkedData) {
if(checkedData){
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
},
popoverHideModel (checkedIds, checkedData) {
if(checkedData){
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -1446,7 +1510,11 @@ export default {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
this.defaultCheckedKeys3 = [this.form.dybxh];
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
@@ -1474,6 +1542,7 @@ export default {
handleSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
@@ -1489,6 +1558,7 @@ export default {
}else {
this.$message.success(res.message)
}
this.isSubmit = false
})
}
})
@@ -1521,7 +1591,6 @@ export default {
},
mounted () {
this.processTable()
this.getData()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -1538,7 +1607,10 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.treeStatus = true
this.key++
})
this.busVsFunc()
this.modelFunc()
},
watch:{
form(val){
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+3 -3
View File
@@ -340,7 +340,7 @@ export default {
// 点击批量删除事件
deleteList() {
if (this.selectList.length < 1) {
if (this.selectedList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
@@ -350,7 +350,7 @@ export default {
type: "warning"
}).then(() => {
let exits = [];
this.selectList.map(item => {
this.selectedList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
@@ -360,7 +360,7 @@ export default {
}
exits.push(item);
});
this.selectList = [];
this.selectedList = [];
}).catch(() => {
});
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+14 -2
View File
@@ -92,8 +92,10 @@
<el-table-column prop="planCloseTime" label="整改完成时间"/>
<el-table-column prop="responsibleUnit" label="责任部门"/>
<el-table-column prop="dutyEngineer" label="负责人"/>
<el-table-column label="佐证材料">
<div class="div-text">{{ 11 || '暂无数据' }}</div>
<el-table-column label="佐证材料" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="text" @click="download" >{{scope.row.fileText}}</el-button>
</template>
</el-table-column>
</el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
@@ -263,6 +265,16 @@ export default {
}
this.getData()
},
download(row) {
// window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
var name = row.fileText;
var url = row.fileTextPath;
const a = document.createElement('a')
a.setAttribute('download', name)
a.setAttribute('target', '_blank')
a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
a.click()
},
// 分页事件
pageChange (page) {
this.pageNo = page
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+3 -3
View File
@@ -613,7 +613,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '4') {
} else if (row.taskInfo === '责任人审核') {
this.$router.push({
name: 'bzjdStep4',
query: {
@@ -624,7 +624,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '5') {
} else if (row.taskInfo === '工程师审核') {
this.$router.push({
name: 'bzjdStep5',
query: {
@@ -635,7 +635,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '6') {
} else if (row.taskInfo === '部长审批') {
this.$router.push({
name: 'bzjdStep6',
query: {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+39 -442
View File
@@ -307,7 +307,7 @@
</div>
<el-table
ref="entryTable"
:data="stahndinfoList"
:data="sarAccessInfoList"
class="un-select"
style="width: 100%"
border
@@ -390,104 +390,6 @@
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
</span>
</el-dialog>
<div>
<table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
@reset="clearAllSearch('sarStandardsSearch')" >
<div slot="content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
<!-- 标准号-->
<el-form-item :label="$t('m.standardNo')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准名称-->
<el-form-item :label="$t('m.standName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="standSortOptions"
clearable/>
</el-form-item>
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 代替标准号-->
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 适用产品线（新增字段）-->
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 关联模块（新增字段）-->
<el-form-item :label="$t('m.associatedModule')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
</el-option>
</el-select>
</el-form-item>
</el-form>
<div style="position:absolute;right: 20px;background-color: white;width: 130px;height: 40px;padding-top: 5px;padding-left: 1px">
<el-button
:loading="searching"
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
@click="searchBtnClick(standCommonlySearch)">
查询
</el-button>
<el-button
size="mini"
class="common-button-default"
v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'"
@click="clearAllSearch('standCommonlySearch')">
清空
</el-button>
</div>
</div>
</table-tools-bar>
</div>
<!--导入模态框-->
<el-dialog title="导入信息" :visible.sync="importmodalFlag" width="400px">
<el-upload
@@ -571,68 +473,6 @@ export default {
// }
// }
return {
selectSarMenu: {}, // 用来记录当前选中的二级菜单对象
tableFlag: '',
isAdvancedSearch: false, // 高级检索窗口是否打开
// 一般检索搜索
standCommonlySearch: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
standType: 'INLAND',
validFlag: '0',
standSort: '',
standNumber: ''
},
standItemSearch: {
standId: '',
responsibleUnit: '',
orgName: '',
validFlag: '0'
},
standItemList: [],
sarStandardsSearch: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
standType: 'INLAND',
validFlag: '0',
menuId: '',
country: '',
standNumber: '',
standName: '',
standState: '',
standNature: '',
issueTime: '',
// applyArctic: '',
replaceStandNum: '',
// replaceStandNumCope: '',
// replaceStandNumList: [],
replacedStandNum: '',
synopsis: '', // 内容摘要
// category: '', // 所属类别
standSort: '' // 标准类别
}, // 分页查询过程中用到的对象
sarConfigStandSearch: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
standType: 'INLAND',
validFlag: '0',
menuId: '',
country: '',
standSort: '',
standNumber: '',
standName: '',
standState: '',
standNature: '',
category: '',
issueTime: '',
applyArctic: '',
replaceStandNum: '',
synopsis: '',
// replaceStandNumCope: '',
replacedStandNum: '',
orderBy:''
}, // 分页查询过程中用到的对象
categoryOptions: [], // 所属类别下拉框
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
@@ -701,8 +541,8 @@ export default {
sarAccessInfoSearchList: [], // 数据搜索 table列表数据
importmodalFlag: false, // 导入model 状态
searching: false,
stahndinfoList: [], // 清单条目 技术要求table 数据
stahndinfoListArry: [], // 清单条目 table选中数据
sarAccessInfoList: [], // 清单条目 技术要求table 数据
sarAccessInfoListArry: [], // 清单条目 table选中数据
moreSearchShow: false, // 多属性搜索 状态
loadData: false, // 提交按钮loading效果
drawerPage: 1, // 数据搜索table页码
@@ -911,8 +751,6 @@ export default {
methods: {
// 高级检索
selectMoreBtn () {
this.isAdvancedSearch = true
this.sarStandardsSearch = []
},
// 法规维护人树
getDept () {
@@ -1175,7 +1013,7 @@ export default {
// 追加字段
this.selectedAccInfoSearchList.map(item => {
let addList;
addList = this.stahndinfoList.findIndex(items => {
addList = this.sarAccessInfoList.findIndex(items => {
return items.id == item.id
})
if(addList > -1){
@@ -1184,7 +1022,7 @@ export default {
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
} else{
this.stahndinfoList.push(item)
this.sarAccessInfoList.push(item)
this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1202,21 +1040,21 @@ export default {
type: 'warning'
})
} else {
let temp = this.stahndinfoList[index - 1]
this.$set(this.stahndinfoList, index - 1, this.stahndinfoList[index])
this.$set(this.stahndinfoList, index, temp)
let temp = this.sarAccessInfoList[index - 1]
this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, temp)
}
},
moveDown (index) {
if (index === (this.stahndinfoList.length - 1)) {
if (index === (this.sarAccessInfoList.length - 1)) {
this.$message({
message: '已经是列表中最后一个素材！',
type: 'warning'
})
} else {
let i = this.stahndinfoList[index + 1]
this.$set(this.stahndinfoList, index + 1, this.stahndinfoList[index])
this.$set(this.stahndinfoList, index, i)
let i = this.sarAccessInfoList[index + 1]
this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, i)
}
},
// 点击清单条目导入按钮事件
@@ -1235,7 +1073,7 @@ export default {
* 删除不想添加的AccessInfo信息
*/
deleteSelectSarAccessInfo () {
if (this.stahndinfoListArry.length > 0) {
if (this.sarAccessInfoListArry.length > 0) {
this.$confirm('确认删除选中数据？', '确认删除', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -1245,14 +1083,14 @@ export default {
}).then(() => {
// i 全部对象数组的下标
// s 选中对象数组的下标
for (var s in this.stahndinfoListArry) {
for (var i in this.stahndinfoList) {
if (this.stahndinfoListArry[s].uuid === this.stahndinfoList[i].uuid) {
this.stahndinfoList.splice(i, 1)
for (var s in this.sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
this.sarAccessInfoList.splice(i, 1)
}
}
}
this.stahndinfoListArry = []
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
} else {
@@ -1261,8 +1099,8 @@ export default {
},
// 清单条目 table select事件
sarAccessInfoSelect (selectData) {
this.stahndinfoListArry = selectData
let stahndinfoListArryId = []
this.sarAccessInfoListArry = selectData
let sarAccessInfoListArryId = []
for(let i=0; i<this.selectData.length; i++){
}
},
@@ -1277,8 +1115,8 @@ export default {
this.$refs['sarAccessForm'].validate((valid) => {
if (valid) {
let rowlist = []
for (let i = 0; i < this.stahndinfoList.length; i++) {
rowlist.push(this.stahndinfoList[i].id)
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
}
rowlist = rowlist.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
@@ -1331,10 +1169,7 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', {
...this.sarAccessInfoSearch,
...this.sarStandardsSearch
}, {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
@@ -1348,6 +1183,7 @@ export default {
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
console.log(val)
},
// 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) {
@@ -1373,10 +1209,10 @@ export default {
exportTestItem () {
let exportNames = this.exportName
let exportList = []
if (this.stahndinfoListArry.length > 0) {
exportList = this.stahndinfoListArry
if (this.sarAccessInfoListArry.length > 0) {
exportList = this.sarAccessInfoListArry
} else {
exportList = this.stahndinfoList
exportList = this.sarAccessInfoList
}
if (exportList != null && exportList.length > 0) {
let accIdAndrestype = []
@@ -1417,9 +1253,9 @@ export default {
var a
var b = ''
if (response.data) {
for (var sADMIN in this.stahndinfoListADMIN) {
for (var sADMIN in this.sarAccessInfoListADMIN) {
for (var iADMIN in response.data) {
if (this.stahndinfoListADMIN[sADMIN].code === response.data[iADMIN].code) {
if (this.sarAccessInfoListADMIN[sADMIN].code === response.data[iADMIN].code) {
// ('在全部对象中的位置' + i)
response.data.splice(i, 1)
b = '数据重复添加,现已自动清除! '
@@ -1428,7 +1264,7 @@ export default {
}
if (response.data.length > 0) {
for (let i = 0; i < response.data.length; i++) {
this.stahndinfoList.push(response.data[i])
this.sarAccessInfoList.push(response.data[i])
}
}
a = response.data.length
@@ -1537,16 +1373,16 @@ export default {
nowstandinfo.askNature = nowstandinfo.askNature.join(',')
// 判断新增还是编辑
if (this.editAddType === 1) {
this.stahndinfoList.push(nowstandinfo)
this.stahndinfoList[this.stahndinfoList.length - 1].uuid = this.number
this.sarAccessInfoList.push(nowstandinfo)
this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number
this.number++
this.isSubmit = false
this.$message.success('添加成功')
} else {
this.stahndinfoList.map((item, index) => {
this.sarAccessInfoList.map((item, index) => {
if (item.uuid === nowstandinfo.uuid) {
// this.stahndinfoList[index] = nowstandinfo
this.$set(this.stahndinfoList, index, nowstandinfo)
// this.sarAccessInfoList[index] = nowstandinfo
this.$set(this.sarAccessInfoList, index, nowstandinfo)
}
})
this.isSubmit = false
@@ -1742,7 +1578,7 @@ export default {
// 新增、编辑标准时验证标准编号是否重复
validCode (rule, value, callback) {
let find = 0
this.stahndinfoList.map(item => {
this.sarAccessInfoList.map(item => {
if (item.code === value) {
find++
}
@@ -1793,176 +1629,10 @@ export default {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
_this: this
}, res => {
this.stahndinfoList = res.data
this.sarAccessInfoList = res.data
}, e => {
})
},
treeClick (treeNode) {
this.selectSarMenu = treeNode
this.standCommonlySearch.menuId = treeNode.id
this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
this.sarStandardsSearch.page = 1
this.standCommonlySearch.page = 1
this.getDomesticStandardTable(this.tableFlag)
},
// 分页查询国内标准
getDomesticStandardTable (item) {
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
const data = item || this.sarStandardsSearch
if (item) {
this.sarStandardsSearch.advanceSearchVOStr = item.advanceSearchVOStr
}
// this.sarStandardsSearch.menuId = this.selectSarMenu.id
const formData = {...data}
if (!item) {
formData.menuId = this.sarStandardsSearch.menuId
} else {
formData.menuId = this.selectSarMenu.id
}
// 排序
formData.orderBy = this.orderBy
// 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'wdsc') {
formData.menuId = undefined
formData.labelMenuId = undefined
formData.collectMenuId = 'wdsc'
} else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
formData.menuId = undefined
formData.labelMenuId = this.selectSarMenu.id
formData.collectMenuId = undefined
} else {
formData.labelMenuId = undefined
formData.collectMenuId = undefined
}
formData.standType = 'INLAND'
this.SarExportSearchEo = formData
this.loading = true
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
}, res => {
this.isAdvancedSearch = false
this.loading = false
if (res.ok) {
for (let i = 0; i < res.data.list.length; i++) {
res.data.list[i].checked = false
if (res.data.list[i].collectId != null && res.data.list[i].collectId !== '') {
res.data.list[i].collectBtn = false
res.data.list[i].cancelCollectBtn = true
} else {
res.data.list[i].collectBtn = true
res.data.list[i].cancelCollectBtn = false
}
res.data.list[i].isSubmit = false
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) {
res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ
}
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
}
}
this.stahndinfoList = res.data.list
this.total = res.data.count
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
this.pageChange(1)
}
} else {
this.$message.error(res.message)
}
}, e => {
this.loading = false
this.stahndinfoList = []
this.total = 0
})
},
// 点击搜索按钮
searchBtnClick (standCommonlySearch) {
let item = this.standCommonlySearch
this.getDomesticStandardTable(item)
this.isAdvancedSearch = false
this.selectLawsStands()
},
// 搜索
getDomesticStandardTableBtn (item) {
this.tableFlag = item
item.page = 1
item.sarStandardsSearch = ''
this.getDomesticStandardTable(item)
},
// 提交配置搜索项
saveConfigStand () {
let search = {}
search.menuId = this.selectSarMenu.id
if (this.selectConfigStand.length === 0) {
this.$message({
showClose: true,
message: '请至少选择一条标准',
type: 'warning'
})
} else {
search.idlist = this.selectConfigStand
this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
_this: this,
loading: 'isSubmit'
}, res => {
if (res.ok) {
this.configStandFlag = false
// this.$message({
// showClose: true,
// message: '配置标准成功!',
// type: 'success'
// })
this.getDomesticStandardTable(this.tableFlag)
}
}, e => {
})
}
},
// 清空搜索框
clearAllSearch (flag) {
this.isAdvancedSearch = false
if (flag === 'sarStandardsSearch') {
// 标准搜索
this.sarStandardsSearch.country = ''
this.sarStandardsSearch.standSort = ''
this.sarStandardsSearch.standNumber = ''
this.sarStandardsSearch.standName = ''
this.sarStandardsSearch.standState = ''
this.sarStandardsSearch.standNature = ''
this.sarStandardsSearch.issueTime = ''
this.sarStandardsSearch.applyArctic = ''
this.sarStandardsSearch.replaceStandNum = ''
this.sarStandardsSearch.replacedStandNum = ''
this.sarStandardsSearch.synopsis = ''
this.sarStandardsSearch.category = ''
this.pageChange(1)
this.getDomesticStandardTable(this.sarStandardsSearch)
} else if (flag === 'standCommonlySearch') {
this.standCommonlySearch.standSort = ''
this.standCommonlySearch.standNumber = ''
this.pageChange(1)
this.getDomesticStandardTable(this.standCommonlySearch)
} else if (flag === 2) {
// 标准条目搜索
this.standItemSearch.responsibleUnit = ''
this.standItemSearch.orgName = ''
} else {
this.configPage = 1
// 游离标准搜索清空
this.sarConfigStandSearch.standSort = ''
this.sarConfigStandSearch.standNumber = ''
this.sarConfigStandSearch.standName = ''
this.sarConfigStandSearch.category = ''
this.sarConfigStandSearch.standNature = ''
this.sarConfigStandSearch.synopsis = ''
this.sarConfigStandSearch.applyArctic = ''
this.sarConfigStandSearch.replaceStandNum = ''
this.selectConfiguraStand()
}
},
}
},
watch: {
// 监听 清单类型
@@ -1976,59 +1646,6 @@ export default {
},
computed: {
...mapGetters(['getAccessStandardRegRow']),
created(){
},
async mounted () {
// 进入页面后查询树形结构目录
await this.selectMenu()
// 进入页面后查询标准体系树形结构目录
await this.selectStandardMenu()
this.treeReload = true
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.allSelectOptions = res.data || {}
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.getGzzOption()
}, e => {
})
this.getDomesticStandardTable(this.tableFlag)
// 加载所有的部门
this.getOrgTreeSource()
// 加载动态表单数据
this.getAddFormFieldList()
this.getDept()
},
destroyed () {
this.allSelectOptions = {}
this.countryOptions = []
this.regionOptions = []
this.standSortOptions = []
this.applyArcticOptions = []
this.standStateOptions = []
this.standNatureOptions = []
this.adoptExtentOptions = []
this.emergyKindOptions = []
this.applyAuthOptions = []
this.categoryOptions = []
this.assemClassOptions = []
this.categoryConfigOptions = []
this.standAttributeList = []
this.zNodesS = []
this.zNodesSItem = []
this.searchInlandNodes = []
this.orgData = []
}
},
mounted () {
this.zqaId =this.$route.query.id;
@@ -2040,8 +1657,7 @@ export default {
}, res => {
this.allSelectOptions = res.data || {}
this.regionOptions = res.data.REGION // 基础信息 区域list
this.applyArcticOptions = res.data.ENERGYTYPES || [] // 基础车型 适用车型list
this.sycpxOptions = res.data.SYCPXCLASS || []// 适用产品线
this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
this.applyOptions = res.data.COUNTRY //适用区域list
@@ -2152,23 +1768,4 @@ export default {
margin: 2px;
}
}
.label-input-form {
&.table-lattice{
/deep/.el-form-item__label {
width:100px;
height:30px;
border: 1px solid #DCDFE6;
border-right: none;
line-height:30px;
text-align: center;
margin-top: 7px;
background: #F9F9F9;
}
/deep/.el-input__inner {
height: 30px;
line-height: 30px;
border-radius: 0 !important;
}
}
}
</style>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+1 -1
View File
@@ -462,7 +462,7 @@ export default {
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 1,
sortKey: 4,
detailedList: '',
detailedListName: '',
energyKind: '',
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+9 -8
View File
@@ -10,8 +10,8 @@
<el-form-item label="清单名称" prop="detailedListName" class="search-item">
<el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="detailedList" class="search-item">
<el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
<el-form-item label="项目名称" prop="projectName" class="search-item">
<el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="适用领域" prop="applicationScope" class="search-item">
<el-select
@@ -246,8 +246,8 @@
align="center">
</el-table-column>
<el-table-column
prop="detailedList"
label="国家/地区"
prop="projectName"
label="项目名称"
align="center">
</el-table-column>
<el-table-column
@@ -462,8 +462,8 @@ export default {
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 1,
detailedList: '',
sortKey: 2,
projectName: '',
detailedListName: '',
energyKind: '',
type: '',
@@ -478,8 +478,8 @@ export default {
type: [
{required: true, message: '国内/海外不能为空', trigger: 'change'}
],
detailedList: [
{required: true, message: '清单类别不能为空', trigger: 'change'}
projectName: [
{required: true, message: '项目名称不能为空', trigger: 'change'}
],
detailedListName: [
{required: true, message: '清单名称不能为空', trigger: 'blur'},
@@ -1097,6 +1097,7 @@ export default {
},
// 提交按钮 事件
saveSarAccess () {
alert()
this.$refs['sarAccessForm'].validate((valid) => {
if (valid) {
let rowlist = []
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+241 -85
View File
@@ -304,7 +304,7 @@
<el-col :span="24" :key="index">
<div class="divider-line">{{ displayLocation.label }}</div>
</el-col>
<template v-if="index === 0" >
<template v-if="displayLocation.label === '基础信息'" >
<el-form-item label="标准类别" prop="standSort" label-width="150px" class="add-form-item">
<el-select v-model="sarStandardsInfoEO.standSort" filterable>
<el-option
@@ -368,14 +368,14 @@
</el-option>
</el-select>
</el-form-item>
<custom-date-pick-with-text2
<custom-date-pick
:config="{
attrName: '发布日期',
attrField: 'issueTime'
}"
v-model="sarStandardsInfoEO.issueTime"
:disabled="formdisableflag"
></custom-date-pick-with-text2>
></custom-date-pick>
<!--</el-form-item>-->
<el-form-item
prop="isRelateAccess"
@@ -419,12 +419,12 @@
></custom-SVPPS>
</template>
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
<custom-date-pick-with-text
<custom-date-pick
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-date-pick-with-text>
></custom-date-pick>
</template>
<template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
<custom-date-pick-group
@@ -443,16 +443,84 @@
:disabled="formdisableflag"
></custom-input-for-standards>
</template>
<!-- 被代替标准编号 废弃-->
<template v-else>
<custom-input
:key="field.attrField"
:config="field"
v-if="field.attrField !== 'BDTBZBH'"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-input>
</template>
<template v-else-if="field.attrField === 'CYCVPPSBM'">
<el-form-item
prop="CYCVPPSBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">乘用车VPPS编码</template>
<tree-select
:disabled="false"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'KCCVPPSBM'">
<el-form-item
prop="KCCVPPSBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">卡车VPPS编码</template>
<tree-select
:disabled="false"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
<el-form-item
prop="DYBXH"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号</template>
<tree-select
width = "340"
:disabled="false"
:data="modelOptions"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="cycvppscn" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'KCCVPPSCN'">
<el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称" label-width="150px" prop="dymc" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.DYMC" disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else>
<custom-input
:key="field.attrField"
:config="field"
v-if="field.attrField !== 'BDTBZBH'"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-input>
</template>
</template>
<template v-else-if="field.attrType === 'INPUT_NUM'">
@@ -488,52 +556,6 @@
:disabled="formdisableflag"
></custom-textarea>
</template>
<template v-else-if="field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.selVal === 'ROLELIST'">
<template v-if="field.attrField === 'XMPGJS'">
<custom-role-tree
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:data-model="sarStandardsInfoEO"
:isRoleHierarchy="false"
roleHierarchyName="VSE,FO,工程师"
></custom-role-tree>
</template>
<template v-else-if="field.attrField === 'ZRBM'">
<custom-org
:key="field.attrField"
:config="field"
:zNodes="orgData"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:data-model="sarStandardsInfoEO"
@on-checked="onChecked"
></custom-org>
</template>
<template v-else-if="field.attrField === 'FGWHR'">
<org-table
:key="field.attrField"
:config="field"
:zNodes="orgData"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:data-model="sarStandardsInfoEO"
></org-table>
</template>
<template v-else>
<custom-org
:key="field.attrField"
:config="field"
:zNodes="orgData"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:data-model="sarStandardsInfoEO"
:initNotCheck="false"
@on-checked="onChecked"
></custom-org>
</template>
</template>
<template v-else-if="field.attrType === 'SEL_OPTION'">
<template>
<custom-select
@@ -545,12 +567,14 @@
</template>
</template>
<template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
<custom-select-array
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-select-array>
<template>
<custom-select-array
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-select-array>
</template>
</template>
</template>
</template>
@@ -1089,6 +1113,8 @@ export default {
label: 'menuName'
},
nodeKey: 'id',
nodeKeyCode: 'code',
nodeKeyModel: 'model',
defaultCheckedKeys: [],
exportLoading : false,
visibleOrgTable: false,
@@ -1183,6 +1209,19 @@ export default {
standSort: '',
standNumber: ''
},
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
defaultCodeProps: {
children: 'children',
label: 'code'
},
defaultModelProps: {
children: 'children',
label: 'model'
},
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
searching: false,
stahndinfoList: [],
tableFlag: '',
@@ -1286,7 +1325,21 @@ export default {
upReplaceNumFlag: 0, // 记录是否修改了代替政策编号
upNumFlag: 0,
orgName: '', // 部门名称
registerPutTime: '' // 注册登记车实施日期
registerPutTime: '', // 注册登记车实施日期
CYCVPPSBM: '',
CYCVPPSCN: '',
KCCVPPSBM: '',
KCCVPPSCN: '',
DYBXH: '',
DYMC: '',
CYSD:'',
CLLX:'',
NYLX:'',
SYCPX:'',
SYRZ:'',
ZRBM:'',
ZRGCS:'',
WSSMR:'',
}, // 标准新增过程中用到的对象
standClass: [], // 标准类别
sarStandardsInfoEO: {
@@ -1405,7 +1458,21 @@ export default {
sentScreenFileFeedback: '',
approvalFileTime: '',
approvalFileFeedback: '',
certPutTimeList: []
certPutTimeList: [],
CYCVPPSBM: '',
CYCVPPSCN: '',
KCCVPPSBM: '',
KCCVPPSCN: '',
DYBXH: '',
DYMC: '',
CYSD:'',
CLLX:'',
NYLX:'',
SYCPX:'',
SYRZ:'',
ZRBM:'',
ZRGCS:'',
WSSMR:'',
}, // 标准新增过程中用到的对象
currentFileList: '', // 当前操作的是哪个FormItem的上传
isList: [
@@ -1654,8 +1721,46 @@ export default {
}
},
methods: {
popoverHideBusVs (checkedIds, checkedData) {
if(checkedData){
this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
this.$forceUpdate()
}
},
popoverHideCarVs (checkedIds, checkedData) {
if(checkedData){
this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
this.$forceUpdate()
}
},
popoverHideModel (checkedIds, checkedData) {
if(checkedData){
this.sarStandardsInfoEO.DYBXH = checkedData.model
this.sarStandardsInfoEO.DYMC = checkedData.name
this.$forceUpdate()
}
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = res.data
})
},
modelFunc(){
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = res.data
})
},
popoverHide (checkedIds, checkedData) {
this.sarStandardsInfoEO.standSystem = checkedData.id
if(checkedData){
this.sarStandardsInfoEO.standSystem = checkedData.id
}
},
closeModal () {
this.productModal = false
@@ -1891,10 +1996,11 @@ export default {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
console.log(this.sarStandardsInfoEO)
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
this.sarStandardsInfoEO.standSort = item.standSort
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
if(this.sarStandardsInfoEO.standSystem){
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
}
this.sarStandardsInfoEO.standSort = item.standSort
if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime)
@@ -1916,13 +2022,22 @@ export default {
if (value && field.attrType === 'DATE_PICKER') {
value = this.$moment(value).format('YYYY-MM-DD')
}
if(field.attrField === 'CYCVPPSBM'){
this.defaultCheckedKeys1 = [value]
}
if(field.attrField === 'KCCVPPSBM'){
this.defaultCheckedKeys2 = [value]
}
if(field.attrField === 'DYBXH'){
this.defaultCheckedKeys3 = [value]
}
field['value'] = value
// 追加用户名称和部门名称和SVPPS名称
if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
let attrFieldName = field.attrField + 'Name'
valueName = dynamicFormField[attrFieldName]
}
field['valueName'] = valueName
// if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
// let attrFieldName = field.attrField + 'Name'
// valueName = dynamicFormField[attrFieldName]
// }
// field['valueName'] = valueName
if (field.showRegionId === location.value) {
if (!location.child) {
location['child'] = []
@@ -1932,6 +2047,7 @@ export default {
})
})
this.dynamicFormField = displayLocation
console.log(this.dynamicFormField)
this.loading = false
})
})
@@ -2653,7 +2769,6 @@ export default {
if (flag) {
// 时间格式修改
let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
console.log(nowstandinfo)
if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
}
@@ -2683,8 +2798,6 @@ export default {
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
})
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
console.log(formFieldList)
console.log(nowstandinfo)
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
_this: this
}, res => {
@@ -3599,9 +3712,50 @@ export default {
const data = this.formFieldListData
this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
})
if(item.attrField === 'WSSMR'){
const options = [
{label:"署名人1",value:"1"},{label:"署名人2",value:"2"}
]
return Object.assign({}, item, {
options: options
})
}else if(item.attrField === 'CYSD'){
return Object.assign({}, item, {
options: this.allSelectOptions["WSCYSD"]
})
}else if(item.attrField === 'CLLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["ENERGYTYPES"]
})
}else if(item.attrField === 'NYLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["NYLXCLASS"]
})
}else if(item.attrField === 'SYCPX'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYCPXCLASS"]
})
}else if(item.attrField === 'SYRZ'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYRZCLASS"]
})
}else if(item.attrField === 'ZRBM'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRBMCLASS"]
})
}else if(item.attrField === 'ZRGCS'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRGCSCLASS"]
})
}else if(item.attrField === 'TXLB'){
return Object.assign({}, item, {
options: this.allSelectOptions["TXLBCLASS"]
})
}else {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
})
}
} else {
return item
}
@@ -3915,6 +4069,8 @@ export default {
// 加载动态表单数据
this.getAddFormFieldList()
this.getDept()
this.busVsFunc()
this.modelFunc()
},
destroyed () {
this.allSelectOptions = {}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+280 -138
View File
@@ -425,14 +425,14 @@
</el-option>
</el-select>
</el-form-item>
<custom-date-pick-with-text2
<custom-date-pick
:config="{
attrName: '发布日期',
attrField: 'issueTime'
}"
v-model="sarStandardsInfoEO.issueTime"
:disabled="formdisableflag"
></custom-date-pick-with-text2>
></custom-date-pick>
<!--</el-form-item>-->
<el-form-item
prop="isRelateAccess"
@@ -475,12 +475,12 @@
></custom-SVPPS>
</template>
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
<custom-date-pick-with-text
<custom-date-pick
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-date-pick-with-text>
></custom-date-pick>
</template>
<template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
<custom-date-pick-group
@@ -501,6 +501,75 @@
:data-source="field.attrField === 'CBBH'"
></custom-input-for-standards>
</template>
<template v-else-if="field.attrField === 'CYCVPPSBM'">
<el-form-item
prop="CYCVPPSBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">乘用车VPPS编码</template>
<tree-select
:disabled="false"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'KCCVPPSBM'">
<el-form-item
prop="KCCVPPSBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">卡车VPPS编码</template>
<tree-select
:disabled="false"
width = "340"
:data="busVppsOptions"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
<el-form-item
prop="DYBXH"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号</template>
<tree-select
width = "340"
:disabled="false"
:data="modelOptions"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="CYCVPPSCN" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'KCCVPPSCN'">
<el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="KCCVPPSCN" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称" label-width="150px" prop="DYMC" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.DYMC" disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else>
<custom-input
:key="field.attrField"
@@ -544,39 +613,6 @@
:disabled="formdisableflag"
></custom-textarea>
</template>
<template v-else-if="field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.selVal === 'ROLELIST'">
<template v-if="field.attrField === 'XMPGJS'">
<custom-role-tree
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:data-model="sarStandardsInfoEO"
:isRoleHierarchy="false"
roleHierarchyName="VSE,FO,工程师"
></custom-role-tree>
</template>
<template v-else-if="field.attrField === 'ZRBM'">
<custom-org
:key="field.attrField"
:config="field"
:zNodes="orgData"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:data-model="sarStandardsInfoEO"
@on-checked="onChecked"
></custom-org>
</template>
<template v-else>
<custom-org
:key="field.attrField"
:config="field"
:zNodes="orgData"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:data-model="sarStandardsInfoEO"></custom-org>
</template>
</template>
<template v-else-if="field.attrType === 'SEL_OPTION'">
<custom-select
:key="field.attrField"
@@ -1067,8 +1103,22 @@ export default {
children: 'children',
label: 'menuName'
},
nodeKeyCode: 'code',
nodeKeyModel: 'model',
nodeKey: 'id',
defaultCheckedKeys: [],
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
defaultCodeProps: {
children: 'children',
label: 'code'
},
defaultModelProps: {
children: 'children',
label: 'model'
},
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
productModal: false, // 模态框是否打开
modalType: '',
productTitle: '', // 模态框标题
@@ -1341,7 +1391,22 @@ export default {
sentScreenFileFeedback: '',
approvalFileTime: '',
approvalFileFeedback: '',
certPutTimeList: []
certPutTimeList: [],
CYCVPPSBM: '',
CYCVPPSCN: '',
KCCVPPSBM: '',
KCCVPPSCN: '',
DYBXH: '',
DYMC: '',
CYSD:'',
CLLX:'',
NYLX:'',
SYCPX:'',
SYRZ:'',
ZRBM:'',
ZRGCS:'',
WSSMR:'',
TXLB:'',
}, // 标准新增过程中用到的对象
currentFileList: '', // 当前操作的是哪个FormItem的上传
isList: [
@@ -1648,11 +1713,46 @@ export default {
watch: {
},
methods: {
popoverHideBusVs (checkedIds, checkedData) {
if(checkedData){
this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
this.$forceUpdate()
}
},
popoverHideCarVs (checkedIds, checkedData) {
if(checkedData){
this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
this.$forceUpdate()
}
},
popoverHideModel (checkedIds, checkedData) {
if(checkedData){
this.sarStandardsInfoEO.DYBXH = checkedData.model
this.sarStandardsInfoEO.DYMC = checkedData.name
this.$forceUpdate()
}
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
this.busVppsOptions = res.data
})
},
modelFunc(){
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
this.modelOptions = res.data
})
},
popoverHide (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.sarStandardsInfoEO.standSystem = checkedData.id
console.log(this.sarStandardsInfoEO.standSystem);
if(checkedData){
this.sarStandardsInfoEO.standSystem = checkedData.id
}
},
closeModal () {
this.productModal = false
@@ -1854,12 +1954,12 @@ export default {
this.addOrUPdateFlag = 2
this.modalshowtitle = '编辑海外标准'
this.modalshowflag = true
this.resolveFormFieldList(item.isRelateAccess)
this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
const formFieldList = this.formFieldList
console.log(formFieldList)
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
this.sarStandardsInfoEO.standSort = item.standSort
@@ -1885,6 +1985,15 @@ export default {
if (value && field.attrType === 'DATE_PICKER') {
value = this.$moment(value).format('YYYY-MM-DD')
}
if(field.attrField === 'CYCVPPSBM'){
this.defaultCheckedKeys1 = [value]
}
if(field.attrField === 'KCCVPPSBM'){
this.defaultCheckedKeys2 = [value]
}
if(field.attrField === 'DYBXH'){
this.defaultCheckedKeys3 = [value]
}
field['value'] = value
// 追加用户名称和部门名称
if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
@@ -2516,81 +2625,71 @@ export default {
this.$message.success('保存成功')
},
// 保存或修改标准
saveOrUpdateStands () {
this.$refs['sarStandardsInfoForm'].validate((valid) => {
if (valid) {
// 验证标准号是否唯一
this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
if (flag) {
// 时间格式修改
let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
// if (nowstandinfo.issueTime != null && nowstandinfo.issueTime !== '') {
// nowstandinfo.issueTime = this.$moment(this.sarStandardsInfoEO.issueTime).format('YYYY-MM-DD')
// }
if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
saveOrUpdateStands () {
this.isSubmit = true
this.$refs['sarStandardsInfoForm'].validate((valid) => {
if (valid) {
// 验证标准号是否唯一
this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
if (flag) {
// 时间格式修改
let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
}
// 代替标准号
if (nowstandinfo.replaceStandNum != null) {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
}
if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '<br />')
}
// 处理动态表单的时间和下拉框格式
const formFieldList = this.formFieldList
const sarStandAttrObj = {}
formFieldList.forEach((item) => {
const value = nowstandinfo[item.attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
}
// 数组处理
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
if (value != null && (value instanceof Array)) {
nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',')
}
}
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
})
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
_this: this
}, res => {
this.isSubmit = false
if (res.ok) {
this.getDomesticStandardTable(this.tableFlag)
this.resetForm()
if (this.addOrUPdateFlag === 1) {
sessionStorage.removeItem('STAND_INLAND')
}
}
}, e => {
this.isSubmit = false
})
} else {
this.isSubmit = false
}
}, e => {})
} else {
this.isSubmit = false
this.$message({
message: '请检查表单是否填写正确',
type: 'warning'
})
}
// 代替标准号
if (nowstandinfo.replaceStandNum != null) {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
}
if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '<br />')
}
// 处理动态表单的时间和下拉框格式
const formFieldList = this.formFieldList
const sarStandAttrObj = {}
formFieldList.forEach((item) => {
const value = nowstandinfo[item.attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
}
// 数组处理
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
if (value != null && (value instanceof Array)) {
nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',')
}
}
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
})
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
// 判断三个实施日期不能全部未N/A和TBD
// if ((nowstandinfo.EOPSSRQ === 'N/A' || nowstandinfo.EOPSSRQ === 'TBD' || nowstandinfo.EOPSSRQ === '已实施') &&
// (nowstandinfo.XCXSSRQ === 'N/A' || nowstandinfo.XCXSSRQ === 'TBD' || nowstandinfo.XCXSSRQ === '已实施') &&
// (nowstandinfo.ZCCSSRQ === 'N/A' || nowstandinfo.ZCCSSRQ === 'TBD' || nowstandinfo.ZCCSSRQ === '已实施')) {
// this.isSubmit = false
// return this.$message.warning('实施日期必须有一项为日期格式')
// }
this.isSubmit = true
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
_this: this
}, res => {
this.isSubmit = false
if (res.ok) {
this.getDomesticStandardTable(this.tableFlag)
this.resetForm()
if (this.addOrUPdateFlag === 1) {
sessionStorage.removeItem('FOREIGN_INLAND')
}
}
}, e => {
this.isSubmit = false
})
} else {
this.isSubmit = false
}
}, e => {})
} else {
this.isSubmit = false
this.$message({
message: '请检查表单是否填写正确',
type: 'warning'
})
}
})
},
},
// 表格排序
sortChange (sortObj) {
if (sortObj.column.order !== 'normal') {
@@ -3488,28 +3587,69 @@ export default {
})
})
},
resolveFormFieldList (isEdit) {
const data = this.formFieldListData
this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
resolveFormFieldList (isEdit) {
const data = this.formFieldListData
this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
if(item.attrField === 'WSSMR'){
const options = [
{label:"署名人1",value:"1"},{label:"署名人2",value:"2"}
]
return Object.assign({}, item, {
options: options
})
}else if(item.attrField === 'CYSD'){
return Object.assign({}, item, {
options: this.allSelectOptions["WSCYSD"]
})
}else if(item.attrField === 'CLLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["ENERGYTYPES"]
})
}else if(item.attrField === 'NYLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["NYLXCLASS"]
})
}else if(item.attrField === 'SYCPX'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYCPXCLASS"]
})
}else if(item.attrField === 'SYRZ'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYRZCLASS"]
})
}else if(item.attrField === 'ZRBM'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRBMCLASS"]
})
}else if(item.attrField === 'ZRGCS'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRGCSCLASS"]
})
}else if(item.attrField === 'TXLB'){
return Object.assign({}, item, {
options: this.allSelectOptions["TXLBCLASS"]
})
}else {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
})
}
} else {
return item
}
})
} else {
return item
}
})
// 处理时间格式的数据
data.forEach(item => {
if (item.attrType === 'DATE_PICKER') {
const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : ''
this.$set(this.sarStandardsInfoEO, item.attrField, date)
} else {
this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '')
}
})
this.resolveFormFieldListRules(isEdit)
},
// 处理时间格式的数据
data.forEach(item => {
if (item.attrType === 'DATE_PICKER') {
const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : ''
this.$set(this.sarStandardsInfoEO, item.attrField, date)
} else {
this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '')
}
})
this.resolveFormFieldListRules(isEdit)
},
/**
* 生成校验规则
*/
@@ -3812,6 +3952,8 @@ export default {
// 加载动态表单数据
this.getAddFormFieldList()
this.getDept()
this.busVsFunc()
this.modelFunc()
},
destroyed () {
this.allSelectOptions = {}
src/router/index.js
+1 -1
View File
@@ -702,7 +702,7 @@ const routes = [
meta: {
requireAuth: false,
// parentPath: '/standAutoSplit',
title: '标准分解单'
title: '拆分结果'
}
},
// 标准编号申领