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

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

Browse Source
This commit is contained in:
super_liu
2021-12-29 15:20:35 +08:00
parent aa6736e652 e2151a85b5
commit cbcccac08e
7 changed files with 417 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+125 -241
View File
@@ -183,7 +183,7 @@
align="center"> align="center">
<template slot-scope="scope"> <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="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
<el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -335,83 +335,6 @@
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
<el-drawer
title="国内标准库"
:visible.sync="listModel2"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content">
<!-- 顶部工具栏 -->
<div class="table-wrap">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table
v-if="listModel2"
ref="selection"
:data="standInfoList2"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
border
@selection-change="handleSelection2"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
label="标准号"
>
<template slot-scope="scope">
<div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
prop="issueTime"
width="110px"
label="发布日期">
<template slot-scope="scope">
{{ formatIssueDate(scope.row.issueTime) }}
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
<pagination :page="standCommonlySearch2.page" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer2">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer2">确定</el-button>
</div>
</div>
</el-drawer>
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" :is-title="drawerTitle"
@@ -475,58 +398,70 @@
:title="PLmodalTitle" :title="PLmodalTitle"
:visible.sync="PLmodalshowflag" :visible.sync="PLmodalshowflag"
:wrapperClosable="false" :wrapperClosable="false"
size="800px"> :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150> <div style="display: flex; height: 100%;">
<el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
<el-input <div v-else style="height: 100%;">
v-model="plForm.technicalRequir" <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
placeholder="请输入核心技术要求" <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
maxlength="500" <div style="overflow: auto;display: flex;" class="BDclass">
></el-input> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</el-form-item> <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> </div>
<el-input </div>
v-model="plForm.changePoint" </div>
placeholder="请输入国内标准的差异点" <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
maxlength="500" <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
></el-input> <el-input
</el-form-item> v-model="plForm.technicalRequir"
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> placeholder="请输入核心技术要求"
<el-input maxlength="500"
v-model="plForm.changePoint" ></el-input>
placeholder="请输入上一版本差异点" </el-form-item>
maxlength="500" <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
></el-input> <el-input
</el-form-item> v-model="plForm.changePoint"
<custom-date-pick-group placeholder="请输入国内标准的差异点"
class="myDataPick" maxlength="500"
:config="{attrName: '新车型实施日期'}" ></el-input>
v-model="plForm.newData" </el-form-item>
></custom-date-pick-group> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<custom-date-pick-group <el-input
class="myDataPick" v-model="plForm.changePoint"
:config="{attrName: '在产车实施日期'}" placeholder="请输入上一版本差异点"
v-model="plForm.onlineData" maxlength="500"
></custom-date-pick-group> ></el-input>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > </el-form-item>
<el-select multiple v-model="plForm.applyArctic"> <custom-date-pick-group
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> class="myDataPick"
</el-select> :config="{attrName: '新车型实施日期'}"
</el-form-item> v-model="plForm.newData"
<el-form-item label="责任人" prop="zrUserId" class="add-form-item"> ></custom-date-pick-group>
<el-input <custom-date-pick-group
style="display: none;" class="myDataPick"
v-model="plForm.zrUserId" :config="{attrName: '在产车实施日期'}"
></el-input> v-model="plForm.onlineData"
<el-input ></custom-date-pick-group>
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)" <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
placeholder="请选择责任人" <el-select multiple v-model="plForm.applyArctic">
v-model="plForm.zrUserName" <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
></el-input> </el-select>
</el-form-item> </el-form-item>
</el-form> <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> </div>
<div id="roleFormButton2" class="demo-drawer-footer"> <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-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
@@ -537,7 +472,8 @@
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px">
<div>相似度:{{ similarityDegree }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -557,6 +493,8 @@
name: "bzjdStep1-1", name: "bzjdStep1-1",
data() { data() {
return { return {
itemsNum: '',
BDtext: false,
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -571,6 +509,7 @@
PLmodalshowflag: false, PLmodalshowflag: false,
PLmodalTitle: '', PLmodalTitle: '',
plForm: { plForm: {
itemsNum: '',
itemsId: '', itemsId: '',
itemsId2: '', itemsId2: '',
technicalRequir: '', technicalRequir: '',
@@ -593,8 +532,6 @@
itermsConditionsFlag: false, itermsConditionsFlag: false,
itermsConditionsTitle: '', itermsConditionsTitle: '',
textStatusMap: {}, textStatusMap: {},
listModel2: false,
standInfoList2: [],
sarType: '', sarType: '',
loading: false, loading: false,
standId: '', standId: '',
@@ -666,7 +603,6 @@
type: '', type: '',
drawerTitle: '', drawerTitle: '',
modalshowflag: false, modalshowflag: false,
modalshowflag2: false,
defaultProps: { defaultProps: {
children: 'children', children: 'children',
label: 'name' label: 'name'
@@ -675,7 +611,8 @@
itemList: [], itemList: [],
zrType: '', zrType: '',
zrIndex: '', zrIndex: '',
zrIdList: [] zrIdList: [],
itemListOld: []
} }
}, },
components: { components: {
@@ -705,7 +642,7 @@
}, },
getBDList () { getBDList () {
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
standHisId: this.oldNumber, standHisId: this.form.oldNumber,
leftOrRight: 'LEFT' leftOrRight: 'LEFT'
}, { }, {
_this: this _this: this
@@ -714,28 +651,29 @@
for (let b = 0; b < res.data.length; b++) { for (let b = 0; b < res.data.length; b++) {
if (this.itemList[a].itemsNum === res.data[b].itemsNum) { if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
this.itemList[a].itemsId = res.data[b].itemsId this.itemList[a].itemsId = res.data[b].itemsId
this.itemList[a].targetStand = res.data[b].targetStand
} }
} }
} }
}, e => { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
}) standHisId: this.form.oldNumber,
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { leftOrRight: 'RIGHT'
standHisId: this.oldNumber, }, {
leftOrRight: 'RIGHT' _this: this
}, { }, res => {
_this: this for (let a = 0; a < this.itemList.length; a++) {
}, res => { for (let b = 0; b < res.data.length; b++) {
for (let a = 0; a < this.itemList.length; a++) { if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
for (let b = 0; b < res.data.length; b++) { this.itemList[a].itemsId2 = res.data[b].itemsId
if (this.itemList[a].itemsNum === res.data[b].itemsNum) { }
this.itemList[a].itemsId2 = res.data[b].itemsId
} }
} }
} }, e => {
})
}, e => { }, e => {
}) })
}, },
checkBD (id,id2) { checkBD (id,id2, itemsNum) {
let itemsEoPage = { let itemsEoPage = {
oldItemId: id, oldItemId: id,
newItemId: id2, newItemId: id2,
@@ -747,6 +685,7 @@
if (res.data.leftString === '' && res.data.rightString === '') { if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = res.data.leftString
this.rightData = res.data.rightString this.rightData = res.data.rightString
this.BDmodel = true this.BDmodel = true
@@ -755,23 +694,39 @@
}) })
}, },
itemEdit (row, type, index) { itemEdit (row, type, index) {
this.PLmodalType = type let itemsEoPage = {
this.PLmodalIndex = index oldItemId: row.itemsId,
if (type === '1') { newItemId: row.itemsId2,
flag: 1
}
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this
}, res => {
this.PLmodalType = type
this.PLmodalIndex = index
this.PLmodalTitle = '编辑' this.PLmodalTitle = '编辑'
} if (res.data.leftString === '' && res.data.rightString === '') {
this.plForm = { this.BDtext = true
technicalRequir: row.technicalRequir, } else {
changePoint: row.changePoint, this.BDtext = false
newData: row.newData, this.leftData = res.data.leftString
onlineData: row.onlineData, this.rightData = res.data.rightString
applyArctic: row.applyArctic, this.similarityDegree = res.data.similarityDegree
zrUserId: row.zrUserId, }
zrUserName: row.zrUserName, this.plForm = {
itemsId: row.itemsId, itemsNum: row.itemsNum,
itemsId2: row.itemsId2 technicalRequir: row.technicalRequir,
} changePoint: row.changePoint,
this.PLmodalshowflag = true 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 () { saveUserInfo2 () {
if (this.PLmodalType === 1) { if (this.PLmodalType === 1) {
@@ -854,6 +809,7 @@
this.form.itemsName1 = bringData[0].oldStandName this.form.itemsName1 = bringData[0].oldStandName
this.form.oldNumber = bringData[0].oldStandId this.form.oldNumber = bringData[0].oldStandId
this.listModel3 = false this.listModel3 = false
this.getBDList()
} else if (this.selectedList3.length > 1) { } else if (this.selectedList3.length > 1) {
this.$message.warning("只能选择一条数据进行导入"); this.$message.warning("只能选择一条数据进行导入");
} else { } else {
@@ -927,30 +883,6 @@
}, e => { }, e => {
}) })
}, },
sarStandCompareHis2 () {
var form = this.standCommonlySearch2
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, {
_this: this
}, res => {
this.standInfoList2 = res.data.list
this.standInfoList2.forEach(item => {
if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) {
item.XCXSSRQ = item.attrInfoMap.XCXSSRQ
}
if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) {
item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ
}
})
this.total2 = res.data.count
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.setMap(res.data.WBZTCLASS)
})
}, e => {
})
},
pageChange (page) { pageChange (page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
this.sarStandCompareHis() this.sarStandCompareHis()
@@ -961,16 +893,6 @@
this.standCommonlySearch.pageSize = pageSize this.standCommonlySearch.pageSize = pageSize
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
pageChange2 (page) {
this.standCommonlySearch2.page = page
this.sarStandCompareHis2()
},
// 分页每页显示数改变后方法
pageSizeChange2 (pageSize) {
this.$store.getters.userInfo.configContent = pageSize
this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2()
},
/** 选择导入数据的方法操作 /** 选择导入数据的方法操作
* */ * */
handleSelection(data) { handleSelection(data) {
@@ -979,12 +901,6 @@
this.selectedList.push(data[i].id); this.selectedList.push(data[i].id);
} }
}, },
handleSelection2 (data) {
this.selectedList2 = [];
for (let i = 0; i < data.length; i++) {
this.selectedList2.push(data[i].id);
}
},
closeDrawer() { closeDrawer() {
this.listModel = false this.listModel = false
}, },
@@ -1008,7 +924,6 @@
this.form.statusId = bringData[0].id this.form.statusId = bringData[0].id
this.form.fileType = bringData[0].fileType this.form.fileType = bringData[0].fileType
this.listModel = false; this.listModel = false;
this.listModel3 = true
this.getDbList() this.getDbList()
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: bringData[0].id, infoId: bringData[0].id,
@@ -1018,6 +933,7 @@
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.listModel3 = true
res.data.list.forEach(item => { res.data.list.forEach(item => {
item.zrUserId = '' item.zrUserId = ''
item.zrUserIdName = '' item.zrUserIdName = ''
@@ -1045,40 +961,6 @@
this.$message.warning("请选择一条数据进行导入"); this.$message.warning("请选择一条数据进行导入");
} }
}, },
closeDrawer2() {
this.listModel2 = false
},
enterDrawer2() {
if (this.selectedList2.length === 1) {
let deposit = new Map();
this.standInfoList2.forEach(item => {
deposit.set(item.id, item);
});
let bringData = [];
for (let i = 0; i < this.selectedList2.length; i++) {
bringData.push(deposit.get(this.selectedList2[i]));
}
// if (bringData[0].splitStatus === '0') {
// this.form.itemsNum1 = bringData[0].standNumSplit
// this.form.itemsName1 = bringData[0].standNameSplit
// } else {
// this.form.itemsNum1 = bringData[0].showNumber
// this.form.itemsName1 = bringData[0].standName
// }
if (bringData[0].standYear) {
this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
} else {
this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber
}
this.form.itemsName1 = bringData[0].standName
this.form.oldNumber = bringData[0].id
this.listModel2 = false
} else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行导入");
}
},
/*** **********************************************/ /*** **********************************************/
/** 流程节点负责人的选择 *****************************/ /** 流程节点负责人的选择 *****************************/
saveUserInfo(data) { saveUserInfo(data) {
@@ -1242,7 +1124,6 @@
this.getData() this.getData()
this.sarStandCompareHis() this.sarStandCompareHis()
this.sarStandCompareHis2()
this.tableHeight = $('.content').height() - 44 this.tableHeight = $('.content').height() - 44
window.onresize = () => { window.onresize = () => {
this.tableHeight = $('.content').height() - 44 this.tableHeight = $('.content').height() - 44
@@ -1263,6 +1144,9 @@
} }
position: relative; position: relative;
height: 100%; height: 100%;
.BDclass {
height: calc(~'100% - 53px');
}
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+123 -238
View File
@@ -190,7 +190,7 @@
align="center"> align="center">
<template slot-scope="scope"> <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="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
<el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -343,86 +343,6 @@
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
<el-drawer
title="国内标准库"
:visible.sync="listModel2"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content">
<!-- 顶部工具栏 -->
<div class="table-wrap">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table
v-if="listModel2"
ref="selection"
:data="standInfoList2"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
border
@selection-change="handleSelection2"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
label="标准号"
>
<template slot-scope="scope">
<div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}
</div>
<div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
prop="issueTime"
width="110px"
label="发布日期">
<template slot-scope="scope">
{{ formatIssueDate(scope.row.issueTime) }}
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
<pagination :page="standCommonlySearch2.page" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer2">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer2">确定</el-button>
</div>
</div>
</el-drawer>
<el-dialog <el-dialog
title="查看条款内容" title="查看条款内容"
:visible.sync="itermsConditionsFlag" :visible.sync="itermsConditionsFlag"
@@ -487,58 +407,70 @@
:title="PLmodalTitle" :title="PLmodalTitle"
:visible.sync="PLmodalshowflag" :visible.sync="PLmodalshowflag"
:wrapperClosable="false" :wrapperClosable="false"
size="800px"> :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150> <div style="display: flex; height: 100%;">
<el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
<el-input <div v-else style="height: 100%;">
v-model="plForm.technicalRequir" <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
placeholder="请输入核心技术要求" <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
maxlength="500" <div style="overflow: auto;display: flex;" class="BDclass">
></el-input> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</el-form-item> <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> </div>
<el-input </div>
v-model="plForm.changePoint" </div>
placeholder="请输入国内标准的差异点" <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
maxlength="500" <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
></el-input> <el-input
</el-form-item> v-model="plForm.technicalRequir"
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> placeholder="请输入核心技术要求"
<el-input maxlength="500"
v-model="plForm.changePoint" ></el-input>
placeholder="请输入上一版本差异点" </el-form-item>
maxlength="500" <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
></el-input> <el-input
</el-form-item> v-model="plForm.changePoint"
<custom-date-pick-group placeholder="请输入国内标准的差异点"
class="myDataPick" maxlength="500"
:config="{attrName: '新车型实施日期'}" ></el-input>
v-model="plForm.newData" </el-form-item>
></custom-date-pick-group> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<custom-date-pick-group <el-input
class="myDataPick" v-model="plForm.changePoint"
:config="{attrName: '在产车实施日期'}" placeholder="请输入上一版本差异点"
v-model="plForm.onlineData" maxlength="500"
></custom-date-pick-group> ></el-input>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > </el-form-item>
<el-select multiple v-model="plForm.applyArctic"> <custom-date-pick-group
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> class="myDataPick"
</el-select> :config="{attrName: '新车型实施日期'}"
</el-form-item> v-model="plForm.newData"
<el-form-item label="责任人" prop="zrUserId" class="add-form-item"> ></custom-date-pick-group>
<el-input <custom-date-pick-group
style="display: none;" class="myDataPick"
v-model="plForm.zrUserId" :config="{attrName: '在产车实施日期'}"
></el-input> v-model="plForm.onlineData"
<el-input ></custom-date-pick-group>
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)" <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
placeholder="请选择责任人" <el-select multiple v-model="plForm.applyArctic">
v-model="plForm.zrUserName" <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
></el-input> </el-select>
</el-form-item> </el-form-item>
</el-form> <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> </div>
<div id="roleFormButton2" class="demo-drawer-footer"> <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-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
@@ -549,7 +481,8 @@
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px">
<div>相似度:{{ similarityDegree }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -570,6 +503,8 @@ export default {
name: "bzjdStep1", name: "bzjdStep1",
data() { data() {
return { return {
itemsNum: '',
BDtext: false,
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -584,6 +519,7 @@ export default {
PLmodalshowflag: false, PLmodalshowflag: false,
PLmodalTitle: '', PLmodalTitle: '',
plForm: { plForm: {
itemsNum: '',
itemsId: '', itemsId: '',
itemsId2: '', itemsId2: '',
technicalRequir: '', technicalRequir: '',
@@ -595,7 +531,6 @@ export default {
zrUserName: '', zrUserName: '',
}, },
cxList: [], cxList: [],
bpnId: '', bpnId: '',
listModel3: false, listModel3: false,
standInfoList3: [], standInfoList3: [],
@@ -606,8 +541,6 @@ export default {
itermsConditionsFlag: false, itermsConditionsFlag: false,
itermsConditionsTitle: '', itermsConditionsTitle: '',
textStatusMap: {}, textStatusMap: {},
listModel2: false,
standInfoList2: [],
sarType: '', sarType: '',
loading: false, loading: false,
standId: '', standId: '',
@@ -662,7 +595,6 @@ export default {
total: 0, total: 0,
total2: 0, total2: 0,
selectedList: [], selectedList: [],
selectedList2: [],
data: [], data: [],
roleForm: { roleForm: {
applyUserIdName: this.$store.getters.userInfo.userName, applyUserIdName: this.$store.getters.userInfo.userName,
@@ -724,7 +656,7 @@ export default {
}, },
getBDList () { getBDList () {
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
standHisId: this.oldNumber, standHisId: this.form.oldNumber,
leftOrRight: 'LEFT' leftOrRight: 'LEFT'
}, { }, {
_this: this _this: this
@@ -733,28 +665,29 @@ export default {
for (let b = 0; b < res.data.length; b++) { for (let b = 0; b < res.data.length; b++) {
if (this.itemList[a].itemsNum === res.data[b].itemsNum) { if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
this.itemList[a].itemsId = res.data[b].itemsId this.itemList[a].itemsId = res.data[b].itemsId
this.itemList[a].targetStand = res.data[b].targetStand
} }
} }
} }
}, e => { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
}) standHisId: this.form.oldNumber,
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { leftOrRight: 'RIGHT'
standHisId: this.oldNumber, }, {
leftOrRight: 'RIGHT' _this: this
}, { }, res => {
_this: this for (let a = 0; a < this.itemList.length; a++) {
}, res => { for (let b = 0; b < res.data.length; b++) {
for (let a = 0; a < this.itemList.length; a++) { if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
for (let b = 0; b < res.data.length; b++) { this.itemList[a].itemsId2 = res.data[b].itemsId
if (this.itemList[a].itemsNum === res.data[b].itemsNum) { }
this.itemList[a].itemsId2 = res.data[b].itemsId
} }
} }
} }, e => {
})
}, e => { }, e => {
}) })
}, },
checkBD (id,id2) { checkBD (id,id2, itemsNum) {
let itemsEoPage = { let itemsEoPage = {
oldItemId: id, oldItemId: id,
newItemId: id2, newItemId: id2,
@@ -766,6 +699,7 @@ export default {
if (res.data.leftString === '' && res.data.rightString === '') { if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = res.data.leftString
this.rightData = res.data.rightString this.rightData = res.data.rightString
this.BDmodel = true this.BDmodel = true
@@ -774,23 +708,39 @@ export default {
}) })
}, },
itemEdit (row, type, index) { itemEdit (row, type, index) {
this.PLmodalType = type let itemsEoPage = {
this.PLmodalIndex = index oldItemId: row.itemsId,
if (type === '1') { newItemId: row.itemsId2,
flag: 1
}
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this
}, res => {
this.PLmodalType = type
this.PLmodalIndex = index
this.PLmodalTitle = '编辑' this.PLmodalTitle = '编辑'
} if (res.data.leftString === '' && res.data.rightString === '') {
this.plForm = { this.BDtext = true
technicalRequir: row.technicalRequir, } else {
changePoint: row.changePoint, this.BDtext = false
newData: row.newData, this.leftData = res.data.leftString
onlineData: row.onlineData, this.rightData = res.data.rightString
applyArctic: row.applyArctic, this.similarityDegree = res.data.similarityDegree
zrUserId: row.zrUserId, }
zrUserName: row.zrUserName, this.plForm = {
itemsId: row.itemsId, itemsNum: row.itemsNum,
itemsId2: row.itemsId2 technicalRequir: row.technicalRequir,
} changePoint: row.changePoint,
this.PLmodalshowflag = true 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 () { saveUserInfo2 () {
if (this.PLmodalType === 1) { if (this.PLmodalType === 1) {
@@ -872,6 +822,7 @@ export default {
this.form.itemsName1 = bringData[0].oldStandName this.form.itemsName1 = bringData[0].oldStandName
this.form.oldNumber = bringData[0].id this.form.oldNumber = bringData[0].id
this.listModel3 = false this.listModel3 = false
this.getBDList()
} else if (this.selectedList3.length > 1) { } else if (this.selectedList3.length > 1) {
this.$message.warning("只能选择一条数据进行导入"); this.$message.warning("只能选择一条数据进行导入");
} else { } else {
@@ -942,29 +893,6 @@ export default {
}, e => { }, e => {
}) })
}, },
sarStandCompareHis2() {
var form = this.standCommonlySearch2
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, {
_this: this
}, res => {
this.standInfoList2 = res.data.list
this.standInfoList2.forEach(item => {
if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) {
item.XCXSSRQ = item.attrInfoMap.XCXSSRQ
}
if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) {
item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ
}
})
this.total2 = res.data.count
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.setMap(res.data.WBZTCLASS)
})
}, e => {
})
},
pageChange(page) { pageChange(page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
this.sarStandCompareHis() this.sarStandCompareHis()
@@ -975,16 +903,6 @@ export default {
this.standCommonlySearch.pageSize = pageSize this.standCommonlySearch.pageSize = pageSize
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
pageChange2(page) {
this.standCommonlySearch2.page = page
this.sarStandCompareHis2()
},
// 分页每页显示数改变后方法
pageSizeChange2(pageSize) {
this.$store.getters.userInfo.configContent = pageSize
this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2()
},
/** 选择导入数据的方法操作 /** 选择导入数据的方法操作
* */ * */
handleSelection(data) { handleSelection(data) {
@@ -993,12 +911,6 @@ export default {
this.selectedList.push(data[i].id); this.selectedList.push(data[i].id);
} }
}, },
handleSelection2(data) {
this.selectedList2 = [];
for (let i = 0; i < data.length; i++) {
this.selectedList2.push(data[i].id);
}
},
closeDrawer() { closeDrawer() {
this.listModel = false this.listModel = false
}, },
@@ -1022,7 +934,6 @@ export default {
this.form.statusId = bringData[0].id this.form.statusId = bringData[0].id
this.form.fileType = bringData[0].fileType this.form.fileType = bringData[0].fileType
this.listModel = false; this.listModel = false;
this.listModel3 = true
this.getDbList() this.getDbList()
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: bringData[0].id, infoId: bringData[0].id,
@@ -1032,6 +943,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.listModel3 = true
res.data.list.forEach(item => { res.data.list.forEach(item => {
item.zrUserId = '' item.zrUserId = ''
item.zrUserIdName = '' item.zrUserIdName = ''
@@ -1049,7 +961,6 @@ export default {
this.itemListOld = res.data.list.filter(item =>{ this.itemListOld = res.data.list.filter(item =>{
return item.workFlowShow === '0' return item.workFlowShow === '0'
}) })
this.getBDList()
} }
this.loading = false this.loading = false
}) })
@@ -1059,33 +970,6 @@ export default {
this.$message.warning("请选择一条数据进行导入"); this.$message.warning("请选择一条数据进行导入");
} }
}, },
closeDrawer2() {
this.listModel2 = false
},
enterDrawer2() {
if (this.selectedList2.length === 1) {
let deposit = new Map();
this.standInfoList2.forEach(item => {
deposit.set(item.id, item);
});
let bringData = [];
for (let i = 0; i < this.selectedList2.length; i++) {
bringData.push(deposit.get(this.selectedList2[i]));
}
if (bringData[0].standYear) {
this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
} else {
this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber
}
this.form.itemsName1 = bringData[0].standName
this.form.oldNumber = bringData[0].id
this.listModel2 = false
} else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行导入");
}
},
/*** **********************************************/ /*** **********************************************/
/** 流程节点负责人的选择 *****************************/ /** 流程节点负责人的选择 *****************************/
saveUserInfo(data) { saveUserInfo(data) {
@@ -1261,7 +1145,6 @@ export default {
}) })
this.sarStandCompareHis() this.sarStandCompareHis()
this.sarStandCompareHis2()
this.tableHeight = $('.content').height() - 44 this.tableHeight = $('.content').height() - 44
window.onresize = () => { window.onresize = () => {
this.tableHeight = $('.content').height() - 44 this.tableHeight = $('.content').height() - 44
@@ -1284,7 +1167,9 @@ export default {
position: relative; position: relative;
height: 100%; height: 100%;
.BDclass {
height: calc(~'100% - 53px');
}
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+94 -57
View File
@@ -191,7 +191,7 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button> <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
<el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -292,27 +292,42 @@
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
<!-- <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">--> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<!-- <el-input--> <el-input
<!-- v-model="plForm.technicalRequir"--> v-model="plForm.technicalRequir"
<!-- placeholder="请输入核心技术要求"--> placeholder="请输入核心技术要求"
<!-- maxlength="500"--> maxlength="500"
<!-- ></el-input>--> ></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">--> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<!-- <el-input--> <el-input
<!-- v-model="plForm.changePoint"--> v-model="plForm.changePoint"
<!-- placeholder="请输入国内标准的差异点"--> placeholder="请输入国内标准的差异点"
<!-- maxlength="500"--> maxlength="500"
<!-- ></el-input>--> ></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">--> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<!-- <el-input--> <el-input
<!-- v-model="plForm.changePoint"--> v-model="plForm.changePoint"
<!-- placeholder="请输入上一版本差异点"--> placeholder="请输入上一版本差异点"
<!-- maxlength="500"--> maxlength="500"
<!-- ></el-input>--> ></el-input>
<!-- </el-form-item>--> </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="complianceRequir" class="add-form-item" > <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
<el-select <el-select
v-model="plForm.complianceRequir" v-model="plForm.complianceRequir"
@@ -328,21 +343,6 @@
maxlength="500" maxlength="500"
></el-input> ></el-input>
</el-form-item> </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> </el-form>
</div> </div>
<div id="roleFormButton2" class="demo-drawer-footer"> <div id="roleFormButton2" class="demo-drawer-footer">
@@ -354,10 +354,21 @@
title="编辑" title="编辑"
:visible.sync="modalshowflag2" :visible.sync="modalshowflag2"
:wrapperClosable="false" :wrapperClosable="false"
size="800px"> :size="form.itemsNum1 ? '1200px' : '800px'">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150> <div style="display: flex; height: 100%;">
<el-button v-if="form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button> <div style="width: 600px; border-right: 1px solid #ccc;">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
<div v-else style="height: 100%;">
<div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
<div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
<div style="overflow: auto;display: flex;" class="BDclass">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</div>
</div>
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
v-model="editForm.technicalRequir" v-model="editForm.technicalRequir"
@@ -410,6 +421,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div>
</div> </div>
<div id="roleFormButton3" class="demo-drawer-footer"> <div id="roleFormButton3" 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-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
@@ -430,7 +442,8 @@
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px">
<div>相似度:{{ similarityDegree }}</div> <div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -451,6 +464,8 @@
name: "bzjdStep3", name: "bzjdStep3",
data() { data() {
return { return {
BDtext: false,
itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
oldNumber: '', oldNumber: '',
@@ -485,6 +500,7 @@
applyArctic: '', // 适用车型 applyArctic: '', // 适用车型
}, },
editForm: { editForm: {
itemsNum: '',
technicalRequir: '', // 核心技术要求 technicalRequir: '', // 核心技术要求
changePoint: '', // 国内标准的差异点 changePoint: '', // 国内标准的差异点
complianceRequir: '', // 符合性要求 complianceRequir: '', // 符合性要求
@@ -557,7 +573,7 @@
}, e => { }, e => {
}) })
}, },
checkBD (id,id2) { checkBD (id,id2, itemsNum) {
let itemsEoPage = { let itemsEoPage = {
oldItemId: id, oldItemId: id,
newItemId: id2, newItemId: id2,
@@ -569,6 +585,7 @@
if (res.data.leftString === '' && res.data.rightString === '') { if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = res.data.leftString
this.rightData = res.data.rightString this.rightData = res.data.rightString
this.BDmodel = true this.BDmodel = true
@@ -577,19 +594,37 @@
}) })
}, },
itemEdit (row) { itemEdit (row) {
this.itemId = row.id let itemsEoPage = {
this.modalshowflag2 = true oldItemId: row.itemsId,
this.editForm = { newItemId: row.itemsId2,
technicalRequir: row.technicalRequir, // 核心技术要求 flag: 1
changePoint: row.changePoint, // 国内标准的差异点
complianceRequir: row.complianceRequir || '1', // 符合性要求
complianceState: row.complianceState, // 合规性分析
newData: row.newData, // 新车型实施日期
onlineData: row.onlineData, // 在产车实施日期
applyArctic: row.applyArctic, // 适用车型
itemsId: row.itemsId,
itemsId2: row.itemsId2
} }
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this
}, res => {
if (res.data.leftString === '' && res.data.rightString === '') {
this.BDtext = true
} else {
this.BDtext = false
this.leftData = res.data.leftString
this.rightData = res.data.rightString
this.similarityDegree = res.data.similarityDegree
}
this.itemId = row.id
this.modalshowflag2 = true
this.editForm = {
itemsNum: row.itemsNum,
technicalRequir: row.technicalRequir, // 核心技术要求
changePoint: row.changePoint, // 国内标准的差异点
complianceRequir: row.complianceRequir || '', // 符合性要求
complianceState: row.complianceState, // 合规性分析
newData: row.newData, // 新车型实施日期
onlineData: row.onlineData, // 在产车实施日期
applyArctic: row.applyArctic, // 适用车型
itemsId: row.itemsId,
itemsId2: row.itemsId2
}
})
}, },
saveUserInfo2 () { saveUserInfo2 () {
for( let a = 0; a < this.itemList.length; a++) { for( let a = 0; a < this.itemList.length; a++) {
@@ -682,7 +717,7 @@
if (this.idList.length > 0) { if (this.idList.length > 0) {
this.plForm.technicalRequir = '' this.plForm.technicalRequir = ''
this.plForm.changePoint = '' this.plForm.changePoint = ''
this.plForm.complianceRequir = '1' this.plForm.complianceRequir = ''
this.plForm.complianceState = '' this.plForm.complianceState = ''
this.plForm.newData = '' this.plForm.newData = ''
this.plForm.onlineData = '' this.plForm.onlineData = ''
@@ -841,14 +876,13 @@
} else { } else {
itemList = data.itemList itemList = data.itemList
} }
console.log(itemList);
itemList.forEach(item => { itemList.forEach(item => {
item.unitDeptName = this.$store.getters.userInfo.institutionName item.unitDeptName = this.$store.getters.userInfo.institutionName
item.onlineData = item.onlineData || '' item.onlineData = item.onlineData || ''
item.newData = item.newData || '' item.newData = item.newData || ''
item.complianceState = item.complianceState || '' item.complianceState = item.complianceState || ''
item.oldNumber = item.oldNumber || '' item.oldNumber = item.oldNumber || ''
item.complianceRequir = item.complianceRequir || '1' item.complianceRequir = item.complianceRequir || ''
item.changePoint = item.changePoint || '' item.changePoint = item.changePoint || ''
item.technicalRequir = item.technicalRequir || '' item.technicalRequir = item.technicalRequir || ''
item.itemsTitle = item.itermsConditions item.itemsTitle = item.itermsConditions
@@ -893,6 +927,9 @@
.myText { .myText {
line-height: 20px; line-height: 20px;
} }
.BDclass {
height: calc(~'100% - 53px');
}
.myDataPick { .myDataPick {
/deep/.el-form-item__content { /deep/.el-form-item__content {
margin-left: 0px !important; margin-left: 0px !important;
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+23 -51
View File
@@ -73,8 +73,8 @@
height="100%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
row-key="id"
> >
<el-table-column type="selection" width="55" align="center"/>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
@@ -85,8 +85,8 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
fixed
show-overflow-tooltip show-overflow-tooltip
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -101,46 +101,46 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-if="!form.itemsNum1"
prop="technicalRequir" prop="technicalRequir"
width="200" width="200"
v-if="!form.itemsNum1"
label="核心技术要求" label="核心技术要求"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND' && form.itemsNum1"
prop="changePoint" prop="changePoint"
width="150" width="150"
v-show="form.itemsNum1"
label="基于上一版本差异" label="基于上一版本差异"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-show="sarType === 'FOREIGN' && form.itemsNum1"
v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
label="相对于国行标差异点" label="相对于国行标差异点"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="180"
show-overflow-tooltip show-overflow-tooltip
width="150"
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="onlineData"
width="180"
show-overflow-tooltip show-overflow-tooltip
width="150"
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="applyArctic" prop="applyArctic"
width="150" width="200"
label="适用车型" label="适用车型"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
@@ -151,39 +151,41 @@
<el-table-column <el-table-column
prop="unitDeptName" prop="unitDeptName"
label="责任部门" label="责任部门"
width="170" width="200"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人" label="责任人"
width="170" width="170"
prop="zrUserName" prop="zrUserName"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceRequir" prop="complianceRequir"
width="150" width="150"
label="符合项状态" label="符合项状态"
show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div> {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
<div v-else>不符合</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="200" width="200"
label="合规性分析" label="合规性分析"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="140" width="140"
v-if="form.itemsNum1" v-show="form.itemsNum1"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -284,6 +286,7 @@
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -304,6 +307,7 @@
name: "bzjdStep4", name: "bzjdStep4",
data() { data() {
return { return {
itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
oldNumber: '', oldNumber: '',
@@ -340,39 +344,7 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
getBDList () { checkBD (id,id2,itemsNum) {
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 = { let itemsEoPage = {
oldItemId: id, oldItemId: id,
newItemId: id2, newItemId: id2,
@@ -384,6 +356,7 @@
if (res.data.leftString === '' && res.data.rightString === '') { if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = res.data.leftString
this.rightData = res.data.rightString this.rightData = res.data.rightString
this.BDmodel = true this.BDmodel = true
@@ -522,7 +495,6 @@
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.loading = false this.loading = false
this.getBDList()
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+26 -69
View File
@@ -73,20 +73,20 @@
height="100%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
row-key="id"
> >
<el-table-column type="selection" width="55" align="center"/>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
fixed
width="70" width="70"
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
fixed
show-overflow-tooltip show-overflow-tooltip
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -101,46 +101,46 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-if="!form.itemsNum1"
prop="technicalRequir" prop="technicalRequir"
width="200" width="200"
v-if="!form.itemsNum1"
label="核心技术要求" label="核心技术要求"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND' && form.itemsNum1"
prop="changePoint" prop="changePoint"
width="150" width="150"
v-show="form.itemsNum1"
label="基于上一版本差异" label="基于上一版本差异"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-show="sarType === 'FOREIGN' && form.itemsNum1"
v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
label="相对于国行标差异点" label="相对于国行标差异点"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="newData" prop="newData"
width="150" width="180"
show-overflow-tooltip
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="onlineData" prop="onlineData"
width="150" width="180"
show-overflow-tooltip
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="applyArctic" prop="applyArctic"
width="150" width="200"
label="适用车型" label="适用车型"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
@@ -151,39 +151,41 @@
<el-table-column <el-table-column
prop="unitDeptName" prop="unitDeptName"
label="责任部门" label="责任部门"
width="170" width="200"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人" label="责任人"
width="170" width="170"
prop="zrUserName" prop="zrUserName"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceRequir" prop="complianceRequir"
width="150" width="150"
label="符合项状态" label="符合项状态"
show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div> {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
<div v-else>不符合</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="200" width="200"
label="合规性分析" label="合规性分析"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
v-if="form.itemsNum1"
width="140" width="140"
v-show="form.itemsNum1"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -289,6 +291,7 @@
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -310,6 +313,7 @@
name: "bzjdStep5", name: "bzjdStep5",
data() { data() {
return { return {
itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
oldNumber: '', oldNumber: '',
@@ -346,39 +350,7 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
getBDList () { checkBD (id,id2,itemsNum) {
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 = { let itemsEoPage = {
oldItemId: id, oldItemId: id,
newItemId: id2, newItemId: id2,
@@ -390,6 +362,7 @@
if (res.data.leftString === '' && res.data.rightString === '') { if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = res.data.leftString
this.rightData = res.data.rightString this.rightData = res.data.rightString
this.BDmodel = true this.BDmodel = true
@@ -397,21 +370,6 @@
} }
}) })
}, },
itemEdit (row) {
this.itemId = row.id
this.modalshowflag2 = true
this.editForm = {
technicalRequir: row.technicalRequir, // 核心技术要求
changePoint: row.changePoint, // 国内标准的差异点
complianceRequir: row.complianceRequir || '1', // 符合性要求
complianceState: row.complianceState, // 合规性分析
newData: row.newData, // 新车型实施日期
onlineData: row.onlineData, // 在产车实施日期
applyArctic: row.applyArctic, // 适用车型
itemsId: row.itemsId,
itemsId2: row.itemsId2
}
},
handleTransfer() { handleTransfer() {
this.drawerModal = true this.drawerModal = true
}, },
@@ -525,7 +483,6 @@
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.loading = false this.loading = false
this.getBDList()
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+24 -52
View File
@@ -73,21 +73,20 @@
height="100%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
row-key="id"
> >
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
fixed
width="70" width="70"
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
fixed
show-overflow-tooltip show-overflow-tooltip
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -102,46 +101,46 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-if="!form.itemsNum1"
prop="technicalRequir" prop="technicalRequir"
width="200" width="200"
v-if="!form.itemsNum1"
label="核心技术要求" label="核心技术要求"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND' && form.itemsNum1"
prop="changePoint" prop="changePoint"
width="150" width="150"
v-show="form.itemsNum1"
label="基于上一版本差异" label="基于上一版本差异"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-show="sarType === 'FOREIGN' && form.itemsNum1"
v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
label="相对于国行标差异点" label="相对于国行标差异点"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="150" width="180"
show-overflow-tooltip show-overflow-tooltip
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="onlineData"
width="150" width="180"
show-overflow-tooltip show-overflow-tooltip
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="applyArctic" prop="applyArctic"
width="150" width="200"
label="适用车型" label="适用车型"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
@@ -152,39 +151,41 @@
<el-table-column <el-table-column
prop="unitDeptName" prop="unitDeptName"
label="责任部门" label="责任部门"
width="170" width="200"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人" label="责任人"
width="170" width="170"
prop="zrUserName" prop="zrUserName"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceRequir" prop="complianceRequir"
width="150" width="150"
label="符合项状态" label="符合项状态"
show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div> {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
<div v-else>不符合</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="200" width="200"
label="合规性分析" label="合规性分析"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
v-if="form.itemsNum1"
width="140" width="140"
v-show="form.itemsNum1"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -288,6 +289,7 @@
title="查看比对内容" title="查看比对内容"
:visible.sync="BDmodel" :visible.sync="BDmodel"
size="1100px"> size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div> <div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;"> <div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div> <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -309,6 +311,7 @@
name: "bzjdStep6", name: "bzjdStep6",
data() { data() {
return { return {
itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
oldNumber: '', oldNumber: '',
@@ -345,39 +348,7 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
getBDList () { checkBD (id,id2,itemsNum) {
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 = { let itemsEoPage = {
oldItemId: id, oldItemId: id,
newItemId: id2, newItemId: id2,
@@ -389,6 +360,7 @@
if (res.data.leftString === '' && res.data.rightString === '') { if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本') this.$message.warning('暂无找到相似的文本')
} else { } else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString this.leftData = res.data.leftString
this.rightData = res.data.rightString this.rightData = res.data.rightString
this.BDmodel = true this.BDmodel = true
@@ -507,9 +479,9 @@
} }
this.sarType = data.standInData || data.sarType this.sarType = data.standInData || data.sarType
this.json = data this.json = data
console.log(data.itemList);
this.itemList = data.itemList this.itemList = data.itemList
this.loading = false this.loading = false
this.getBDList()
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+2 -3
View File
@@ -576,8 +576,7 @@ export default {
window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
}, },
addfjList() { addfjList() {
this.$http.get('lawss/sarStandFile/queryFileInfoNew', { this.$http.get('lawss/sarStandFile/querySourceFileInfo', {
type: '0',
standId: this.form.standId standId: this.form.standId
}, { }, {
_this: this _this: this
@@ -588,7 +587,7 @@ export default {
this.fjList = res.data this.fjList = res.data
this.fzlistModel = true this.fzlistModel = true
} else { } else {
this.$message.warning('当前标准没有' + text + '文件') this.$message.warning('当前标准没有文件')
this.fjList = [] this.fjList = []
} }
} }