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

commit

Browse Source
This commit is contained in:
zhutianqi
2021-12-24 17:34:46 +08:00
parent 2192d72264
commit c190509e5d
5 changed files with 125 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherLawsStandDetails/index.vue
+1 -1
View File
@@ -17,7 +17,7 @@
>
<el-collapse v-model="activeNames" @change="handleChange">
<div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
style="border-top:none;position: absolute;right: 36px;border: none">
style="border-top:none; position: absolute;right: 36px;border: none">
<div class="modular-header" style="height: 50px;">
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
src/pages/details/otherStandardDetails/index.vue
+7 -12
View File
@@ -46,7 +46,7 @@
</template>
<div class="modular-content">
<template v-if="item.label === '基础信息'">
<div class="details-content-modular basic-information" style="border-top:none">
<div class="details-content-modular basic-information" style="border-top:none; border-bottom: none;">
<div class="basic-information-content">
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p class="">
@@ -906,7 +906,6 @@
<!--适用车型-->
<template>
<custom-select-array
:key="applyArcticOptions.options"
:config="applyArcticOptions"
v-model="resolveListForm.applyArctic"
></custom-select-array>
@@ -1020,7 +1019,6 @@
</el-form-item>
<el-row>
<custom-org
key="responsibleUnit"
:config="{
attrName: '责任部门',
attrField: 'responsibleUnit',
@@ -1036,7 +1034,6 @@
</el-row>
<el-row>
<custom-org
key="FO"
:config="{
attrName: 'FO',
attrField: 'FO',
@@ -1052,7 +1049,6 @@
</el-row>
<el-row>
<custom-org
key="dutyEngineer"
:config="{
attrName: '责任工程师',
attrField: 'dutyEngineer',
@@ -1068,7 +1064,6 @@
</el-row>
<el-row>
<custom-SVPPS
key="svpps"
:config="{
attrName: 'SVPPS',
attrField: 'SVPPS',
@@ -1081,8 +1076,8 @@
<el-form-item label="适用车辆类型" prop="applyArctic" class="add-form-item">
<el-select v-model="standItemEO.applyArctic" multiple placeholder="请选择" :filterable="true">
<el-option
v-for="opt in applyArcticOptions"
:key="opt.value"
v-for="(opt, index) in applyArcticOptions"
:key="index"
:label="opt.label"
:value="opt.value">
</el-option>
@@ -1091,8 +1086,8 @@
<el-form-item label="要求类型" prop="claimType" class="add-form-item">
<el-select v-model="standItemEO.claimType" placeholder="请选择" :filterable="true">
<el-option
v-for="opt in requestOptions"
:key="opt.value"
v-for="(opt, index) in requestOptions"
:key="index"
:label="opt.label"
:value="opt.value">
</el-option>
@@ -1105,8 +1100,8 @@
placeholder="请选择"
>
<el-option
v-for="item in BZFGGXOUIUJ"
:key="item.value"
v-for="(item, index) in BZFGGXOUIUJ"
:key="index"
:value="item.value"
:label="item.label"
></el-option>
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+115 -34
View File
@@ -139,51 +139,51 @@
fontWeight: 'bold', height: '48px'}"
row-key="id"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
prop="itemsNum"
label="条款号"
width="70"
align="center">
prop="itemsNum"
label="条款号"
width="70"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
show-overflow-tooltip
align="center">
prop="itemsName"
label="条款名称"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
width="200"
show-overflow-tooltip
align="center">
prop="itermsConditions"
label="条款内容"
width="200"
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>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="technicalRequir"
width="200"
label="核心技术要求"
align="center">
show-overflow-tooltip
prop="technicalRequir"
width="200"
v-if="!form.itemsNum1"
label="核心技术要求"
align="center">
</el-table-column>
<el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND' && form.itemsNum1"
prop="changePoint"
width="150"
label="基于上一版本差异"
align="center">
show-overflow-tooltip
v-if="sarType === 'INLAND' && form.itemsNum1"
prop="changePoint"
width="150"
label="基于上一版本差异"
align="center">
</el-table-column>
<el-table-column
show-overflow-tooltip
v-if="sarType === 'FOREIGN'"
prop="changePoint"
width="150"
label="相对于国行标差异点"
align="center">
show-overflow-tooltip
v-if="sarType === 'FOREIGN'"
prop="changePoint"
width="150"
label="相对于国行标差异点"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
@@ -236,9 +236,18 @@
<el-table-column
label="责任人"
width="170"
prop="zrUserIdName"
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
label="操作"
v-if="form.itemsNum1"
width="140"
align="center">
<template slot-scope="scope">
<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>
<el-collapse accordion>
<el-collapse-item title="审批意见">
@@ -323,6 +332,16 @@
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading>
<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%; 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>
</el-dialog>
</div>
</template>
@@ -336,6 +355,11 @@ export default {
name: "bzjdStep1-6",
data() {
return {
similarityDegree: '',
BDmodel: false,
oldNumber: '',
leftData: '',
rightData: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
itermsConditionsFlag: false,
@@ -366,6 +390,57 @@ export default {
ProcessTitle
},
methods: {
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
}
})
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -418,12 +493,18 @@ export default {
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
} else {
this.form.itemsName1 = data.itemsName1 || ''
this.form.itemsNum1 = data.itemsNum1 || ''
}
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
this.loading = false
this.getBDList()
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1
View File
@@ -525,6 +525,7 @@
this.json = data
this.itemList = data.itemList
this.loading = false
this.getBDList()
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -15
View File
@@ -396,21 +396,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() {
this.drawerModal = true
},
@@ -524,6 +509,7 @@
this.json = data
this.itemList = data.itemList
this.loading = false
this.getBDList()
}).catch(e => {
})
})