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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2021-12-29 05:06:27 +08:00
parent c7dd27cdfb 3dc4806176
commit 59a4b146be
9 changed files with 228 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+35 -11
View File
@@ -69,7 +69,8 @@
<label style=" margin-right: 164px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0"
v-for="(file, fileIndex) in child1Func(child.value)">
<span>
<!-- 单个文件时-->
<span v-if="child.value && child.value.length > 0 && child.value.length === 1">
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -87,6 +88,27 @@
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
<!-- 多个文件时-->
<span v-else-if="child.value && child.value.length > 0">
<div style="margin-left: 19%">
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
</div>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
<el-button
v-if="child.attrField === itemNam "
v-for="(itemNam,index) in itemExistList"
@@ -97,13 +119,13 @@
icon="icon-separate"
>标准分解单
</el-button>
<el-button v-if="child.value && child.value.length > 1"
style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
更多
</el-button>
<!-- <el-button v-if="child.value && child.value.length > 1"-->
<!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
<!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
<!-- 更多-->
<!-- </el-button>-->
</template>
<template v-if="child.value === null">-</template>
<template v-else-if="child.value === null">-</template>
</p>
</template>
<!--修订本-->
@@ -244,9 +266,9 @@
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
sarStandardsInfoEO.issueTime || '-'
}}</span></p>
<p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
standMap[sarStandardsInfoEO.standNature] || '-'
}}</span></p>
<!-- <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
<!-- standMap[sarStandardsInfoEO.standNature] || '-'-->
<!-- }}</span></p>-->
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
style=" margin-right: 150px;">标准体系</label><span>{{
@@ -2076,7 +2098,9 @@ export default {
console.log('1943',child1)
const list = []
if (child1 && child1.length > 1) {
list.push(child1[0])
for (let i = 0; i < child1.length; i++) {
list.push(child1[i])
}
return list
}
return child1
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+3
View File
@@ -103,18 +103,21 @@
<el-table-column
prop="itemsNum"
label="条款号"
fixed
width="170"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
fixed
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+3
View File
@@ -143,17 +143,20 @@
prop="itemsNum"
label="条款号"
width="70"
fixed
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
fixed
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+3
View File
@@ -107,12 +107,14 @@
<el-table-column
prop="itemsNum"
label="条款号"
fixed
width="120"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
width="170"
fixed
label="条款名称"
show-overflow-tooltip
align="center">
@@ -120,6 +122,7 @@
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+3
View File
@@ -82,6 +82,7 @@
<el-table-column
prop="itemsNum"
label="条款号"
fixed
width="120"
align="center">
</el-table-column>
@@ -89,12 +90,14 @@
prop="itemsName"
width="170"
label="条款名称"
fixed
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+121 -76
View File
@@ -84,17 +84,20 @@
prop="itemsNum"
label="条款号"
width="70"
fixed
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
show-overflow-tooltip
fixed
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
@@ -127,23 +130,6 @@
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
</template>
</el-table-column>
<el-table-column
prop="complianceState"
width="200"
label="合规性分析"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="180"
@@ -182,6 +168,23 @@
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
</template>
</el-table-column>
<el-table-column
prop="complianceState"
width="200"
label="合规性分析"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
label="操作"
width="240"
@@ -355,27 +358,42 @@
<div class="demo-drawer-content">
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<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>
<!-- <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="editForm.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="editForm.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="editForm.changePoint"-->
<!-- placeholder="请输入上一版本差异点"-->
<!-- maxlength="500"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="editForm.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="editForm.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="editForm.changePoint"
placeholder="请输入上一版本差异点"
maxlength="500"
></el-input>
</el-form-item>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '新车型实施日期'}"
v-model="editForm.newData"
></custom-date-pick-group>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '在产车实施日期'}"
v-model="editForm.onlineData"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select multiple v-model="editForm.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-select
v-model="editForm.complianceRequir"
@@ -391,21 +409,6 @@
maxlength="500"
></el-input>
</el-form-item>
<!-- <custom-date-pick-group-->
<!-- class="myDataPick"-->
<!-- :config="{attrName: '新车型实施日期'}"-->
<!-- v-model="editForm.newData"-->
<!-- ></custom-date-pick-group>-->
<!-- <custom-date-pick-group-->
<!-- class="myDataPick"-->
<!-- :config="{attrName: '在产车实施日期'}"-->
<!-- v-model="editForm.onlineData"-->
<!-- ></custom-date-pick-group>-->
<!-- <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >-->
<!-- <el-select multiple v-model="editForm.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>
</div>
<div id="roleFormButton3" class="demo-drawer-footer">
@@ -475,20 +478,20 @@
plForm: {
technicalRequir: '', // 核心技术要求
changePoint: '', // 国内标准的差异点
complianceRequir: '1', // 符合性要求
complianceRequir: '', // 符合性要求
complianceState: '', // 合规性分析
newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型
},
editForm: {
// technicalRequir: '', // 核心技术要求
// changePoint: '', // 国内标准的差异点
complianceRequir: '1', // 符合性要求
technicalRequir: '', // 核心技术要求
changePoint: '', // 国内标准的差异点
complianceRequir: '', // 符合性要求
complianceState: '', // 合规性分析
// newData: '', // 新车型实施日期
// onlineData: '', // 在产车实施日期
// applyArctic: '', // 适用车型
newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型
itemsId: '',
},
modalshowflag: false,
@@ -577,13 +580,13 @@
this.itemId = row.id
this.modalshowflag2 = true
this.editForm = {
// technicalRequir: row.technicalRequir, // 核心技术要求
// changePoint: row.changePoint, // 国内标准的差异点
technicalRequir: row.technicalRequir, // 核心技术要求
changePoint: row.changePoint, // 国内标准的差异点
complianceRequir: row.complianceRequir || '1', // 符合性要求
complianceState: row.complianceState, // 合规性分析
// newData: row.newData, // 新车型实施日期
// onlineData: row.onlineData, // 在产车实施日期
// applyArctic: row.applyArctic, // 适用车型
newData: row.newData, // 新车型实施日期
onlineData: row.onlineData, // 在产车实施日期
applyArctic: row.applyArctic, // 适用车型
itemsId: row.itemsId,
itemsId2: row.itemsId2
}
@@ -591,13 +594,13 @@
saveUserInfo2 () {
for( let a = 0; a < this.itemList.length; a++) {
if (this.itemList[a].id === this.itemId) {
// this.itemList[a].technicalRequir = this.editForm.technicalRequir
// this.itemList[a].changePoint = this.editForm.changePoint
this.itemList[a].technicalRequir = this.editForm.technicalRequir
this.itemList[a].changePoint = this.editForm.changePoint
this.itemList[a].complianceRequir = this.editForm.complianceRequir
this.itemList[a].complianceState = this.editForm.complianceState
// this.itemList[a].newData = this.editForm.newData
// this.itemList[a].onlineData = this.editForm.onlineData
// this.itemList[a].applyArctic = this.editForm.applyArctic
this.itemList[a].newData = this.editForm.newData
this.itemList[a].onlineData = this.editForm.onlineData
this.itemList[a].applyArctic = this.editForm.applyArctic
}
}
this.modalshowflag2 = false
@@ -660,13 +663,13 @@
for( let a = 0; a < this.itemList.length; a++) {
for ( let b = 0; b < this.idList.length; b++) {
if (this.itemList[a].id === this.idList[b]) {
// this.itemList[a].technicalRequir = this.plForm.technicalRequir
// this.itemList[a].changePoint = this.plForm.changePoint
this.itemList[a].technicalRequir = this.plForm.technicalRequir
this.itemList[a].changePoint = this.plForm.changePoint
this.itemList[a].complianceRequir = this.plForm.complianceRequir
this.itemList[a].complianceState = this.plForm.complianceState
// this.itemList[a].newData = this.plForm.newData
// this.itemList[a].onlineData = this.plForm.onlineData
// this.itemList[a].applyArctic = this.plForm.applyArctic
this.itemList[a].newData = this.plForm.newData
this.itemList[a].onlineData = this.plForm.onlineData
this.itemList[a].applyArctic = this.plForm.applyArctic
}
}
}
@@ -732,14 +735,56 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
let num3 = 0
let num1 = 0, num2 = 0, num4 = 0, num5 = 0, num6 = 0, b = 0, num3 = 0
for (let a = 0; a < this.itemList.length; a++) {
if (!this.itemList[a].technicalRequir) {
num1++
}
if (!this.itemList[a].changePoint) {
num2++
}
if (!this.itemList[a].complianceRequir) {
num3++
}
if (!this.itemList[a].newData) {
num4++
}
if (!this.itemList[a].onlineData) {
num5++
}
if (!this.itemList[a].applyArctic.length) {
num6++
}
if (!this.itemList[a].zrUserId) {
b++
}
}
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 (num3 > 0) {
this.$message.warning('请输入符合性要求')
} else 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
var json = this.json
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+20 -17
View File
@@ -79,17 +79,20 @@
prop="itemsNum"
label="条款号"
width="70"
fixed
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
fixed
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
@@ -121,23 +124,6 @@
label="相对于国行标差异点"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
show-overflow-tooltip
@@ -174,6 +160,23 @@
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
label="操作"
width="140"
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+20 -17
View File
@@ -78,18 +78,21 @@
<el-table-column
prop="itemsNum"
label="条款号"
fixed
width="70"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
fixed
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
@@ -121,23 +124,6 @@
label="相对于国行标差异点"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="newData"
@@ -174,6 +160,23 @@
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
label="操作"
v-if="form.itemsNum1"
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+20 -17
View File
@@ -79,18 +79,21 @@
<el-table-column
prop="itemsNum"
label="条款号"
fixed
width="70"
align="center">
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
fixed
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
fixed
width="200"
show-overflow-tooltip
align="center">
@@ -122,23 +125,6 @@
label="相对于国行标差异点"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="150"
@@ -175,6 +161,23 @@
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
prop="complianceRequir"
width="150"
label="符合项状态"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.complianceRequir === '1'">符合</div>
<div v-else>不符合</div>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
width="200"
label="合规性分析"
align="center">
</el-table-column>
<el-table-column
label="操作"
v-if="form.itemsNum1"