Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanyizhou
@@ -82,7 +82,8 @@
|
||||
let routerParam = localStorage.getItem("routerParam");
|
||||
// 路由跳转
|
||||
if(routerParam && routerParam != ''){
|
||||
if (this.showIETips) {//判断是否IE浏览器
|
||||
const UA = navigator.userAgent.toLocaleLowerCase()
|
||||
if (UA.match(/msie/) != null || UA.match(/trident/) != null) {
|
||||
alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器')
|
||||
}
|
||||
const param = routerParam.split("&");
|
||||
|
||||
@@ -84,7 +84,9 @@
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="action-bar">
|
||||
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
|
||||
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
|
||||
批量编辑
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
@@ -120,12 +122,64 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
v-if="!form.itemsNum1"
|
||||
prop="technicalRequir"
|
||||
label="核心技术要求"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="changePoint"
|
||||
v-if="form.itemsNum1"
|
||||
label="基于上一版本差异"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newData"
|
||||
width="180"
|
||||
show-overflow-tooltip
|
||||
label="新车型实施日期"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="onlineData"
|
||||
width="180"
|
||||
show-overflow-tooltip
|
||||
label="在产车型实施日期"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applyArctic"
|
||||
width="200"
|
||||
label="适用车型"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.zrUserId" style="display: none;"/>
|
||||
<el-input v-model="scope.row.zrUserIdName" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>
|
||||
{{ scope.row.applyArctic.toString() }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
width="240"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
|
||||
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -413,11 +467,84 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-drawer
|
||||
:title="PLmodalTitle"
|
||||
:visible.sync="PLmodalshowflag"
|
||||
:wrapperClosable="false"
|
||||
size="800px">
|
||||
<div class="demo-drawer-content">
|
||||
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
|
||||
<el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
|
||||
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
|
||||
<el-input
|
||||
v-model="plForm.technicalRequir"
|
||||
placeholder="请输入核心技术要求"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入上一版本差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '新车型实施日期'}"
|
||||
v-model="plForm.newData"
|
||||
></custom-date-pick-group>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '在产车实施日期'}"
|
||||
v-model="plForm.onlineData"
|
||||
></custom-date-pick-group>
|
||||
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
|
||||
<el-select multiple v-model="plForm.applyArctic">
|
||||
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任人" prop="zrUserId" class="add-form-item">
|
||||
<el-input
|
||||
style="display: none;"
|
||||
v-model="plForm.zrUserId"
|
||||
></el-input>
|
||||
<el-input
|
||||
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
|
||||
placeholder="请选择责任人"
|
||||
v-model="plForm.zrUserName"
|
||||
></el-input>
|
||||
</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="saveUserInfo2">确定</el-button>
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-dialog
|
||||
title="查看比对内容"
|
||||
:visible.sync="BDmodel"
|
||||
size="1100px">
|
||||
<div>相似度:{{ similarityDegree }}</div>
|
||||
<div style="height: 600px;overflow: auto;display: flex;">
|
||||
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
|
||||
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
<script>
|
||||
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
@@ -426,6 +553,28 @@
|
||||
name: "bzjdStep1-1",
|
||||
data() {
|
||||
return {
|
||||
similarityDegree: '',
|
||||
leftData: [],
|
||||
rightData: [],
|
||||
BDmodel: false,
|
||||
PLmodalType: '',
|
||||
PLmodalIndex: '',
|
||||
PLmodalshowflag: false,
|
||||
PLmodalTitle: '',
|
||||
plForm: {
|
||||
itemsId: '',
|
||||
itemsId2: '',
|
||||
technicalRequir: '',
|
||||
changePoint: '',
|
||||
newData: '',
|
||||
onlineData: '',
|
||||
applyArctic: [],
|
||||
zrUserId: '',
|
||||
zrUserName: '',
|
||||
},
|
||||
cxList: [],
|
||||
|
||||
|
||||
listModel3: false,
|
||||
standInfoList3: [],
|
||||
spinShow3: false,
|
||||
@@ -521,11 +670,142 @@
|
||||
}
|
||||
},
|
||||
components: {
|
||||
CustomDatePickGroup,
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
PLedit () {
|
||||
if (this.zrIdList.length > 0) {
|
||||
this.PLmodalType = 2
|
||||
this.PLmodalTitle = '批量编辑'
|
||||
this.plForm = {
|
||||
technicalRequir: '',
|
||||
changePoint: '',
|
||||
newData: '',
|
||||
onlineData: '',
|
||||
applyArctic: [],
|
||||
zrUserId: '',
|
||||
zrUserName: '',
|
||||
}
|
||||
this.PLmodalshowflag = true
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
},
|
||||
getBDList () {
|
||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||
standHisId: this.oldNumber,
|
||||
leftOrRight: 'LEFT'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < res.data.length; b++) {
|
||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||
this.itemList[a].itemsId = res.data[b].itemsId
|
||||
}
|
||||
}
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||
standHisId: this.oldNumber,
|
||||
leftOrRight: 'RIGHT'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < res.data.length; b++) {
|
||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||
this.itemList[a].itemsId2 = res.data[b].itemsId
|
||||
}
|
||||
}
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
checkBD (id,id2) {
|
||||
let itemsEoPage = {
|
||||
oldItemId: id,
|
||||
newItemId: id2,
|
||||
flag: 1
|
||||
}
|
||||
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.data.leftString === '' && res.data.rightString === '') {
|
||||
this.$message.warning('暂无找到相似的文本')
|
||||
} else {
|
||||
this.leftData = res.data.leftString
|
||||
this.rightData = res.data.rightString
|
||||
this.BDmodel = true
|
||||
this.similarityDegree = res.data.similarityDegree
|
||||
}
|
||||
})
|
||||
},
|
||||
itemEdit (row, type, index) {
|
||||
this.PLmodalType = type
|
||||
this.PLmodalIndex = index
|
||||
if (type === '1') {
|
||||
this.PLmodalTitle = '编辑'
|
||||
}
|
||||
this.plForm = {
|
||||
technicalRequir: row.technicalRequir,
|
||||
changePoint: row.changePoint,
|
||||
newData: row.newData,
|
||||
onlineData: row.onlineData,
|
||||
applyArctic: row.applyArctic,
|
||||
zrUserId: row.zrUserId,
|
||||
zrUserName: row.zrUserName,
|
||||
itemsId: row.itemsId,
|
||||
itemsId2: row.itemsId2
|
||||
}
|
||||
this.PLmodalshowflag = true
|
||||
},
|
||||
saveUserInfo2 () {
|
||||
if (this.PLmodalType === 1) {
|
||||
const row = JSON.parse(JSON.stringify(this.itemList[this.PLmodalIndex]))
|
||||
row.technicalRequir = this.plForm.technicalRequir
|
||||
row.changePoint = this.plForm.changePoint
|
||||
row.newData = this.plForm.newData
|
||||
row.onlineData = this.plForm.onlineData
|
||||
row.applyArctic = this.plForm.applyArctic
|
||||
row.zrUserId = this.plForm.zrUserId
|
||||
row.zrUserName = this.plForm.zrUserName
|
||||
this.$set(this.itemList, this.PLmodalIndex, row)
|
||||
} else {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < this.zrIdList.length; b++) {
|
||||
if (this.itemList[a].id === this.zrIdList[b]) {
|
||||
this.itemList[a].technicalRequir = this.plForm.technicalRequir
|
||||
this.itemList[a].changePoint = this.plForm.changePoint
|
||||
this.itemList[a].newData = this.plForm.newData
|
||||
this.itemList[a].onlineData = this.plForm.onlineData
|
||||
this.itemList[a].applyArctic = this.plForm.applyArctic
|
||||
this.itemList[a].zrUserId = this.plForm.zrUserId
|
||||
this.itemList[a].zrUserName = this.plForm.zrUserName
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.PLmodalshowflag = false
|
||||
},
|
||||
cancleUserInfo2 () {
|
||||
this.plForm = {
|
||||
technicalRequir: '',
|
||||
changePoint: '',
|
||||
newData: '',
|
||||
onlineData: '',
|
||||
applyArctic: [],
|
||||
zrUserId: '',
|
||||
zrUserName: '',
|
||||
itemsId: '',
|
||||
itemsId2: ''
|
||||
}
|
||||
this.PLmodalshowflag = false
|
||||
},
|
||||
handleSelection3 (data) {
|
||||
this.selectedList3 = [];
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
@@ -717,6 +997,7 @@
|
||||
this.standId = bringData[0].standId
|
||||
this.statusId = bringData[0].id
|
||||
this.form.statusId = bringData[0].id
|
||||
this.form.fileType = bringData[0].fileType
|
||||
this.listModel = false;
|
||||
this.listModel3 = true
|
||||
this.getDbList()
|
||||
@@ -730,9 +1011,22 @@
|
||||
if (res.ok) {
|
||||
res.data.list.forEach(item => {
|
||||
item.zrUserId = ''
|
||||
item.zrUserIdName= ''
|
||||
item.zrUserIdName = ''
|
||||
})
|
||||
this.itemList = res.data.list
|
||||
this.itemList = res.data.list.filter(item =>{
|
||||
return item.workFlowShow === '1'
|
||||
})
|
||||
this.itemList.map(item => {
|
||||
item.technicalRequir = ''
|
||||
item.changePoint = ''
|
||||
item.newData = ''
|
||||
item.onlineData = ''
|
||||
item.applyArctic = []
|
||||
})
|
||||
this.itemListOld = res.data.list.filter(item =>{
|
||||
return item.workFlowShow === '0'
|
||||
})
|
||||
this.getBDList()
|
||||
}
|
||||
this.loading = false
|
||||
})
|
||||
@@ -778,49 +1072,30 @@
|
||||
},
|
||||
/*** **********************************************/
|
||||
/** 流程节点负责人的选择 *****************************/
|
||||
saveUserInfo (data) {
|
||||
saveUserInfo(data) {
|
||||
if (this.type === 0) {
|
||||
this.roleForm.deptUserId = data[0].id
|
||||
this.roleForm.deptUserIdName = data[0].name
|
||||
} else if (this.type === 1) {
|
||||
this.itemList[this.zrIndex].zrUserId = data[0].id
|
||||
this.itemList[this.zrIndex].zrUserIdName = data[0].name
|
||||
} else {
|
||||
this.itemList.forEach( item => {
|
||||
this.zrIdList.forEach( items => {
|
||||
if (item.id === items) {
|
||||
item.zrUserId = data[0].id
|
||||
item.zrUserIdName = data[0].name
|
||||
}
|
||||
})
|
||||
})
|
||||
this.plForm.zrUserId = data[0].id
|
||||
this.plForm.zrUserName = data[0].name
|
||||
}
|
||||
this.modalshowflag = false
|
||||
},
|
||||
choiceZRRS (row, type, index) {
|
||||
choiceZRRS(row, type, index) {
|
||||
this.type = type
|
||||
if (type === 1) {
|
||||
if (type === 0) {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(row)
|
||||
this.drawerTitle = '选择标准法规部部长'
|
||||
this.modalshowflag = true
|
||||
} else {
|
||||
this.drawerTitle = '选择责任人'
|
||||
this.nodeList = []
|
||||
this.zrIndex = index
|
||||
this.zrType = type
|
||||
this.nodeList.push(row)
|
||||
this.modalshowflag = true
|
||||
} else if (type === 2) {
|
||||
// 批量
|
||||
if (this.zrIdList.length > 0) {
|
||||
this.zrType = type
|
||||
this.nodeList = []
|
||||
this.modalshowflag = true
|
||||
this.drawerTitle = '批量选择责任人'
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
} else {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(row)
|
||||
this.drawerTitle = '选择标准法规部部长'
|
||||
this.modalshowflag = true
|
||||
}
|
||||
},
|
||||
handleSelectionChange (val) {
|
||||
@@ -859,13 +1134,50 @@
|
||||
if (valid) {
|
||||
this.$refs['Form'].validate((valid) => {
|
||||
if (valid) {
|
||||
let b = 0
|
||||
let num1 = 0, num2 = 0, num4 = 0, num5 = 0, num6 = 0, b = 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].newData) {
|
||||
num4++
|
||||
}
|
||||
if (!this.itemList[a].onlineData) {
|
||||
num5++
|
||||
}
|
||||
if (!this.itemList[a].applyArctic.length) {
|
||||
num6++
|
||||
}
|
||||
if (!this.itemList[a].zrUserId) {
|
||||
b++
|
||||
}
|
||||
}
|
||||
if (b > 0) {
|
||||
if (!this.form.itemsNum1) {
|
||||
if (num1 > 0) {
|
||||
this.$message.warning('请输入核心技术要求')
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if (num2 > 0) {
|
||||
if (this.sarType !== 'INLAND') {
|
||||
this.$message.warning('请输入国内标准的差异点')
|
||||
return
|
||||
} else {
|
||||
this.$message.warning('请输入基于上一版本差异')
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
if (num4 > 0) {
|
||||
this.$message.warning('请输入新车型实施日期')
|
||||
} else if (num5 > 0) {
|
||||
this.$message.warning('请输入在产车实施日期')
|
||||
} else if (num6 > 0) {
|
||||
this.$message.warning('请选择适用车型')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请选择责任人')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
@@ -910,6 +1222,15 @@
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.cxList = res.data.ENERGYTYPES // 适用车型
|
||||
this.cxList.forEach(item => {
|
||||
item.value = item.label
|
||||
})
|
||||
})
|
||||
|
||||
this.getData()
|
||||
this.sarStandCompareHis()
|
||||
this.sarStandCompareHis2()
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="action-bar">
|
||||
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">
|
||||
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
|
||||
批量编辑
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -103,11 +103,12 @@
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="170"
|
||||
width="120"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
width="170"
|
||||
label="条款名称"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
@@ -124,13 +125,65 @@
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="!form.itemsNum1"
|
||||
prop="technicalRequir"
|
||||
label="核心技术要求"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="changePoint"
|
||||
v-if="form.itemsNum1"
|
||||
label="基于上一版本差异"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newData"
|
||||
width="180"
|
||||
show-overflow-tooltip
|
||||
label="新车型实施日期"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="onlineData"
|
||||
width="180"
|
||||
show-overflow-tooltip
|
||||
label="在产车型实施日期"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applyArctic"
|
||||
width="200"
|
||||
label="适用车型"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.applyArctic.toString() }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
width="240"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.zrUserId" style="display: none;"/>
|
||||
<el-input v-model="scope.row.zrUserIdName" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>
|
||||
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
|
||||
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -423,26 +476,119 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-drawer
|
||||
:title="PLmodalTitle"
|
||||
:visible.sync="PLmodalshowflag"
|
||||
:wrapperClosable="false"
|
||||
size="800px">
|
||||
<div class="demo-drawer-content">
|
||||
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
|
||||
<el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
|
||||
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
|
||||
<el-input
|
||||
v-model="plForm.technicalRequir"
|
||||
placeholder="请输入核心技术要求"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入上一版本差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '新车型实施日期'}"
|
||||
v-model="plForm.newData"
|
||||
></custom-date-pick-group>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '在产车实施日期'}"
|
||||
v-model="plForm.onlineData"
|
||||
></custom-date-pick-group>
|
||||
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
|
||||
<el-select multiple v-model="plForm.applyArctic">
|
||||
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任人" prop="zrUserId" class="add-form-item">
|
||||
<el-input
|
||||
style="display: none;"
|
||||
v-model="plForm.zrUserId"
|
||||
></el-input>
|
||||
<el-input
|
||||
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
|
||||
placeholder="请选择责任人"
|
||||
v-model="plForm.zrUserName"
|
||||
></el-input>
|
||||
</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="saveUserInfo2">确定</el-button>
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-dialog
|
||||
title="查看比对内容"
|
||||
:visible.sync="BDmodel"
|
||||
size="1100px">
|
||||
<div>相似度:{{ similarityDegree }}</div>
|
||||
<div style="height: 600px;overflow: auto;display: flex;">
|
||||
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
|
||||
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {saveTaskFirst, taskDel} from 'api/process'
|
||||
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {saveTaskFirst, taskDel} from 'api/process'
|
||||
|
||||
export default {
|
||||
name: "bzjdStep1",
|
||||
data() {
|
||||
return {
|
||||
similarityDegree: '',
|
||||
leftData: [],
|
||||
rightData: [],
|
||||
BDmodel: false,
|
||||
PLmodalType: '',
|
||||
PLmodalIndex: '',
|
||||
PLmodalshowflag: false,
|
||||
PLmodalTitle: '',
|
||||
plForm: {
|
||||
itemsId: '',
|
||||
itemsId2: '',
|
||||
technicalRequir: '',
|
||||
changePoint: '',
|
||||
newData: '',
|
||||
onlineData: '',
|
||||
applyArctic: [],
|
||||
zrUserId: '',
|
||||
zrUserName: '',
|
||||
},
|
||||
cxList: [],
|
||||
|
||||
bpnId: '',
|
||||
listModel3: false,
|
||||
standInfoList3: [],
|
||||
spinShow3: false,
|
||||
selectedList3: [],
|
||||
|
||||
//折叠的标志，true为折叠，false为不折叠
|
||||
foldFormFlag: false,
|
||||
itermsConditionsFlag: false,
|
||||
@@ -540,11 +686,142 @@ export default {
|
||||
}
|
||||
},
|
||||
components: {
|
||||
CustomDatePickGroup,
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
PLedit () {
|
||||
if (this.zrIdList.length > 0) {
|
||||
this.PLmodalType = 2
|
||||
this.PLmodalTitle = '批量编辑'
|
||||
this.plForm = {
|
||||
technicalRequir: '',
|
||||
changePoint: '',
|
||||
newData: '',
|
||||
onlineData: '',
|
||||
applyArctic: [],
|
||||
zrUserId: '',
|
||||
zrUserName: '',
|
||||
}
|
||||
this.PLmodalshowflag = true
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
},
|
||||
getBDList () {
|
||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||
standHisId: this.oldNumber,
|
||||
leftOrRight: 'LEFT'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < res.data.length; b++) {
|
||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||
this.itemList[a].itemsId = res.data[b].itemsId
|
||||
}
|
||||
}
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||
standHisId: this.oldNumber,
|
||||
leftOrRight: 'RIGHT'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < res.data.length; b++) {
|
||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||
this.itemList[a].itemsId2 = res.data[b].itemsId
|
||||
}
|
||||
}
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
checkBD (id,id2) {
|
||||
let itemsEoPage = {
|
||||
oldItemId: id,
|
||||
newItemId: id2,
|
||||
flag: 1
|
||||
}
|
||||
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.data.leftString === '' && res.data.rightString === '') {
|
||||
this.$message.warning('暂无找到相似的文本')
|
||||
} else {
|
||||
this.leftData = res.data.leftString
|
||||
this.rightData = res.data.rightString
|
||||
this.BDmodel = true
|
||||
this.similarityDegree = res.data.similarityDegree
|
||||
}
|
||||
})
|
||||
},
|
||||
itemEdit (row, type, index) {
|
||||
this.PLmodalType = type
|
||||
this.PLmodalIndex = index
|
||||
if (type === '1') {
|
||||
this.PLmodalTitle = '编辑'
|
||||
}
|
||||
this.plForm = {
|
||||
technicalRequir: row.technicalRequir,
|
||||
changePoint: row.changePoint,
|
||||
newData: row.newData,
|
||||
onlineData: row.onlineData,
|
||||
applyArctic: row.applyArctic,
|
||||
zrUserId: row.zrUserId,
|
||||
zrUserName: row.zrUserName,
|
||||
itemsId: row.itemsId,
|
||||
itemsId2: row.itemsId2
|
||||
}
|
||||
this.PLmodalshowflag = true
|
||||
},
|
||||
saveUserInfo2 () {
|
||||
if (this.PLmodalType === 1) {
|
||||
const row = JSON.parse(JSON.stringify(this.itemList[this.PLmodalIndex]))
|
||||
row.technicalRequir = this.plForm.technicalRequir
|
||||
row.changePoint = this.plForm.changePoint
|
||||
row.newData = this.plForm.newData
|
||||
row.onlineData = this.plForm.onlineData
|
||||
row.applyArctic = this.plForm.applyArctic
|
||||
row.zrUserId = this.plForm.zrUserId
|
||||
row.zrUserName = this.plForm.zrUserName
|
||||
this.$set(this.itemList, this.PLmodalIndex, row)
|
||||
} else {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < this.zrIdList.length; b++) {
|
||||
if (this.itemList[a].id === this.zrIdList[b]) {
|
||||
this.itemList[a].technicalRequir = this.plForm.technicalRequir
|
||||
this.itemList[a].changePoint = this.plForm.changePoint
|
||||
this.itemList[a].newData = this.plForm.newData
|
||||
this.itemList[a].onlineData = this.plForm.onlineData
|
||||
this.itemList[a].applyArctic = this.plForm.applyArctic
|
||||
this.itemList[a].zrUserId = this.plForm.zrUserId
|
||||
this.itemList[a].zrUserName = this.plForm.zrUserName
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.PLmodalshowflag = false
|
||||
},
|
||||
cancleUserInfo2 () {
|
||||
this.plForm = {
|
||||
technicalRequir: '',
|
||||
changePoint: '',
|
||||
newData: '',
|
||||
onlineData: '',
|
||||
applyArctic: [],
|
||||
zrUserId: '',
|
||||
zrUserName: '',
|
||||
itemsId: '',
|
||||
itemsId2: ''
|
||||
}
|
||||
this.PLmodalshowflag = false
|
||||
},
|
||||
handleSelection3 (data) {
|
||||
this.selectedList3 = [];
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
@@ -747,13 +1024,20 @@ export default {
|
||||
item.zrUserId = ''
|
||||
item.zrUserIdName = ''
|
||||
})
|
||||
|
||||
this.itemList = res.data.list.filter(item =>{
|
||||
return item.workFlowShow === '1'
|
||||
})
|
||||
this.itemList.map(item => {
|
||||
item.technicalRequir = ''
|
||||
item.changePoint = ''
|
||||
item.newData = ''
|
||||
item.onlineData = ''
|
||||
item.applyArctic = []
|
||||
})
|
||||
this.itemListOld = res.data.list.filter(item =>{
|
||||
return item.workFlowShow === '0'
|
||||
})
|
||||
this.getBDList()
|
||||
}
|
||||
this.loading = false
|
||||
})
|
||||
@@ -796,45 +1080,26 @@ export default {
|
||||
if (this.type === 0) {
|
||||
this.roleForm.deptUserId = data[0].id
|
||||
this.roleForm.deptUserIdName = data[0].name
|
||||
} else if (this.type === 1) {
|
||||
this.itemList[this.zrIndex].zrUserId = data[0].id
|
||||
this.itemList[this.zrIndex].zrUserIdName = data[0].name
|
||||
} else {
|
||||
this.itemList.forEach(item => {
|
||||
this.zrIdList.forEach(items => {
|
||||
if (item.id === items) {
|
||||
item.zrUserId = data[0].id
|
||||
item.zrUserIdName = data[0].name
|
||||
}
|
||||
})
|
||||
})
|
||||
this.plForm.zrUserId = data[0].id
|
||||
this.plForm.zrUserName = data[0].name
|
||||
}
|
||||
this.modalshowflag = false
|
||||
},
|
||||
choiceZRRS(row, type, index) {
|
||||
this.type = type
|
||||
if (type === 1) {
|
||||
if (type === 0) {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(row)
|
||||
this.drawerTitle = '选择标准法规部部长'
|
||||
this.modalshowflag = true
|
||||
} else {
|
||||
this.drawerTitle = '选择责任人'
|
||||
this.nodeList = []
|
||||
this.zrIndex = index
|
||||
this.zrType = type
|
||||
this.nodeList.push(row)
|
||||
this.modalshowflag = true
|
||||
} else if (type === 2) {
|
||||
// 批量
|
||||
if (this.zrIdList.length > 0) {
|
||||
this.zrType = type
|
||||
this.nodeList = []
|
||||
this.modalshowflag = true
|
||||
this.drawerTitle = '批量选择责任人'
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
} else {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(row)
|
||||
this.drawerTitle = '选择标准法规部部长'
|
||||
this.modalshowflag = true
|
||||
}
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
@@ -873,13 +1138,50 @@ export default {
|
||||
if (valid) {
|
||||
this.$refs['Form'].validate((valid) => {
|
||||
if (valid) {
|
||||
let b = 0
|
||||
let num1 = 0, num2 = 0, num4 = 0, num5 = 0, num6 = 0, b = 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].newData) {
|
||||
num4++
|
||||
}
|
||||
if (!this.itemList[a].onlineData) {
|
||||
num5++
|
||||
}
|
||||
if (!this.itemList[a].applyArctic.length) {
|
||||
num6++
|
||||
}
|
||||
if (!this.itemList[a].zrUserId) {
|
||||
b++
|
||||
}
|
||||
}
|
||||
if (b > 0) {
|
||||
if (!this.form.itemsNum1) {
|
||||
if (num1 > 0) {
|
||||
this.$message.warning('请输入核心技术要求')
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if (num2 > 0) {
|
||||
if (this.sarType !== 'INLAND') {
|
||||
this.$message.warning('请输入国内标准的差异点')
|
||||
return
|
||||
} else {
|
||||
this.$message.warning('请输入基于上一版本差异')
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
if (num4 > 0) {
|
||||
this.$message.warning('请输入新车型实施日期')
|
||||
} else if (num5 > 0) {
|
||||
this.$message.warning('请输入在产车实施日期')
|
||||
} else if (num6 > 0) {
|
||||
this.$message.warning('请选择适用车型')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请选择责任人')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
@@ -927,6 +1229,15 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.cxList = res.data.ENERGYTYPES // 适用车型
|
||||
this.cxList.forEach(item => {
|
||||
item.value = item.label
|
||||
})
|
||||
})
|
||||
|
||||
this.sarStandCompareHis()
|
||||
this.sarStandCompareHis2()
|
||||
this.tableHeight = $('.content').height() - 44
|
||||
|
||||
@@ -82,11 +82,12 @@
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="170"
|
||||
width="120"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
width="170"
|
||||
label="条款名称"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
@@ -98,15 +99,48 @@
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
||||
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">
|
||||
查看条款内容
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserIdName"
|
||||
v-if="!form.itemsNum1"
|
||||
prop="technicalRequir"
|
||||
label="核心技术要求"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="changePoint"
|
||||
v-if="form.itemsNum1"
|
||||
label="基于上一版本差异"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newData"
|
||||
width="180"
|
||||
show-overflow-tooltip
|
||||
label="新车型实施日期"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="onlineData"
|
||||
width="180"
|
||||
show-overflow-tooltip
|
||||
label="在产车型实施日期"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
label="执行人"
|
||||
width="170"
|
||||
|
||||
@@ -564,8 +564,8 @@
|
||||
flag: 1
|
||||
}
|
||||
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
|
||||
_this: this
|
||||
}, res => {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.data.leftString === '' && res.data.rightString === '') {
|
||||
this.$message.warning('暂无找到相似的文本')
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user