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:
zhutianqi
2021-08-17 14:20:12 +08:00
parent e46cc77ac6 85ee96e2b5
commit 95aff9cecb
3 changed files with 563 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+154 -52
View File
@@ -3,7 +3,9 @@
<div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
<!--title 标题-->
<div class="details-header">
<span>{{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
<span>{{ sarStandardsInfoEO.standSortShow || '' }} {{
sarStandardsInfoEO.standNumber
}}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
</div>
<!--主体内容-->
<div class="details-content">
@@ -25,8 +27,10 @@
<!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>基础信息</span>-->
<!-- </div>-->
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
:loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<!-- <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
<!-- <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
@@ -66,7 +70,9 @@
sarStandardsInfoEO.issueTime || '-'
}}</span></p>
<p>
<label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}</span>
<label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{
sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
}}</span>
</p>
<p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{
sarStandardsInfoEO.standSystem || '-'
@@ -98,7 +104,8 @@
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
</template>
@@ -116,7 +123,8 @@
<!--其他-->
<template v-else>
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</template>
</div>
@@ -225,7 +233,8 @@
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
</template>
@@ -234,7 +243,8 @@
>
<p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
<span class="modular-content-p-val" v-else>-</span>
@@ -319,7 +329,8 @@
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
</template>
@@ -328,7 +339,8 @@
>
<p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
<span class="modular-content-p-val" v-else>-</span>
@@ -439,7 +451,8 @@
<el-form-item class="search-item">
<el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable maxlength="100"></el-input>
<el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable
maxlength="100"></el-input>
</el-form-item>
<!-- 新车实施日期-->
<el-form-item class="search-item">
@@ -484,7 +497,8 @@
</div>
<div class="action-bar">
<el-button class="common-button-default export-button" icon="export" size="mini"
@click="exportStandardItem" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
@click="exportStandardItem"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
导出
</el-button>
<el-button
@@ -538,7 +552,7 @@
</template>
</el-table-column>
<el-table-column
prop="readContent"
prop="interpretationContent"
label="解读内容"
show-overflow-tooltip
>
@@ -606,7 +620,21 @@
</el-table>
<loading :loading="tableLoading">数据加载中...</loading>
</div>
<pagination :page="standItemSearch.page" :total="standitemTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<el-pagination
@size-change="pageSizeChange"
@current-change="pageChange"
:current-page="1"
:page-sizes="[10, 20, 30, 50]"
:page-size="100"
layout="sizes, prev, pager, next, jumper"
:total="standitemTotal">
</el-pagination>
<!-- <pagination :total="standitemTotal" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>-->
</el-drawer>
<!--新增标准条款-->
<el-drawer
@@ -732,7 +760,8 @@
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag" @click="saveOrUpdateStandItem" :loading="isSubmit">
<el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag"
@click="saveOrUpdateStandItem" :loading="isSubmit">
保存
</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
@@ -775,45 +804,93 @@
<span class="see-drawer-val" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="内容简介">内容简介</label>
<span class="see-drawer-val" :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
<label class="see-drawer-name" title="内容简介">条款内容</label>
<span class="see-drawer-val"
:title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="解读内容">解读内容</label>
<span class="see-drawer-val"
:title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
{{
standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="新车型实施日期">新车型实施日期</label>
<span class="see-drawer-val"
:title="standShowItemEO.xcxssrq">{{
standShowItemEO.xcxssrq ? $moment(standShowItemEO.xcxssrq).format('YYYY-MM-DD') : ''
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="在产车实施日期">在产车实施日期</label>
<span class="see-drawer-val"
:title="standShowItemEO.zccssrq">{{
standShowItemEO.zccssrq ? $moment(standShowItemEO.zccssrq).format('YYYY-MM-DD') : ''
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="适用车型">适用车型</label>
<span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="责任部门">责任部门</label>
<span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
standShowItemEO.responsibleUnit
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="FO">FO</label>
<span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="责任工程师">责任工程师</label>
<span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{
standShowItemEO.dutyEngineerShow
}}</span>
<span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
{{standShowItemEO.dutyEngineer }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="svpps">svpps</label>
<span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>
<label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
<span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
{{standShowItemEO.comparedWithPrevious }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="适用车辆类型">适用车辆类型</label>
<span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
<label class="see-drawer-name" title="符合性状态">符合性状态</label>
<span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
{{standShowItemEO.complianceRequire }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="要求类型">要求类型</label>
<span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>
<span class="see-drawer-val" :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{
standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)
}}</span>
<label class="see-drawer-name" title="合规性分析">合规性分析</label>
<span class="see-drawer-val" :title="standShowItemEO.complianceState">
{{standShowItemEO.complianceState }}</span>
</div>
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="FO">FO</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
<!-- standShowItemEO.dutyEngineerShow-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="svpps">svpps</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="要求类型">要求类型</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
<!-- <span class="see-drawer-val"-->
<!-- :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
<!-- standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
<!-- }}</span>-->
<!-- </div>-->
</div>
</el-drawer>
<!-- 更新LOG -->
@@ -900,10 +977,14 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'" :command="[scope.row, '编辑']">
<el-dropdown-item
:v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'"
:command="[scope.row, '编辑']">
编辑
</el-dropdown-item>
<el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'" :command="[scope.row, '删除']">
<el-dropdown-item
:v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
:command="[scope.row, '删除']">
删除
</el-dropdown-item>
</el-dropdown-menu>
@@ -928,7 +1009,8 @@
<el-input v-model="addForm.title" placeholder="请输入标题"></el-input>
</el-formItem>
<el-formItem label="内容" prop="content" class="add-form-item">
<el-input v-model="addForm.content" :autosize="{ minRows: 3, maxRows: 4}" resize="none" type="textarea" placeholder="请输入内容"></el-input>
<el-input v-model="addForm.content" :autosize="{ minRows: 3, maxRows: 4}" resize="none" type="textarea"
placeholder="请输入内容"></el-input>
</el-formItem>
<el-formItem label="附件" prop="files" class="add-form-item">
<el-upload
@@ -949,7 +1031,8 @@
</el-formItem>
</el-form>
<div slot="footer" class="demo-drawer-footer">
<el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading" icon="el-icon-check" @click="AddKnowSub">
<el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading"
icon="el-icon-check" @click="AddKnowSub">
确定
</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="AddKnowClose">取消</el-button>
@@ -1017,7 +1100,8 @@
</template>
</div>
<div slot="footer" class="demo-drawer-footer">
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="comparisonSub">
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
@click="comparisonSub">
确定
</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="comparisonClose">取消</el-button>
@@ -1043,7 +1127,8 @@
<el-input v-model.trim="listVO.name" placeholder="请输入清单名称" clearable/>
</el-form-item>
<el-form-item label="是否公开" prop="public" class="add-form-item">
<el-radio-group v-model="listVO.public" style="margin-bottom: 0px; display: flex; align-items: center; height: 50px;">
<el-radio-group v-model="listVO.public"
style="margin-bottom: 0px; display: flex; align-items: center; height: 50px;">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
@@ -1051,7 +1136,8 @@
</el-form>
</div>
<div id="listFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="submitDrawerForm('listVO')">
<el-button class="common-button-primary" icon="el-icon-check" type="primary"
@click="submitDrawerForm('listVO')">
确定
</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="AddcomparisonDrawer = false">取消
@@ -1067,7 +1153,8 @@
<p v-html="importForm.content"></p>
</div>
<div slot="footer" class="demo-drawer-footer">
<el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">
<el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check"
@click="importFailed = false">
确认
</el-button>
</div>
@@ -1093,10 +1180,12 @@
></related-terms-select>
</div>
<div class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="handleRelatedTermsDrawerSubmit">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading"
@click="handleRelatedTermsDrawerSubmit">
{{ $t('m.submit') }}
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleRelatedTermsDrawerCancel">
<el-button class="common-button-default" size="mini" icon="el-icon-close"
@click="handleRelatedTermsDrawerCancel">
{{ $t('m.cancel') }}
</el-button>
</div>
@@ -1127,6 +1216,7 @@ export default {
},
data() {
return {
interpretationContent: '',
relatedTermsDrawerVisible: false,
btnLoading: false,
comparisonTitle: '',
@@ -1229,7 +1319,7 @@ export default {
synopsis: '',
responsibleUnit: '',
category: '',
remark: ''
remark: '',
}, // 标准新增过程中用到的对象
standItemEO: {
id: '',
@@ -1981,12 +2071,18 @@ export default {
},
// 分页点击后方法
pageChange(page) {
console.log("page");
console.log(page);
this.standItemSearch.page = page
this.selectSarStandItems()
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
console.log("pageSize");
console.log(pageSize);
// this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
this.standItemSearch.pageSize =pageSize;
this.selectSarStandItems()
// 此处需要调用接口，修改个人配置
},
@@ -2221,8 +2317,11 @@ export default {
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
this.selectedItemList = []
if (res.ok) {
this.standItemList = res.data;
console.log("hello" + this.standItemList + res.data);
this.standItemList = res.data.list;
console.log("standItemList");
console.log(this.standItemList);
console.log("res.data");
console.log(res.data);
this.standitemTotal = res.data.count // 分页需要
}
}, e => {
@@ -2386,14 +2485,17 @@ export default {
},
// 分解单-查看
handlePreview(item) {
console.log(item);
this.standShowItemEO = item
console.log(this.standShowItemEO);
this.showItemInfoModal = true
let fileList = []
item.defaultFileList = []
this.standShowItemEO = JSON.parse(JSON.stringify(item))
if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
}
this.standShowItemEO.applyArctic = this.standShowItemEO.applyArcticShow // 将编辑的显示字段赋值
this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow
// 请求文件信息
if (item.relevanceFile != null && item.relevanceFile !== '') {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+4
View File
@@ -1150,6 +1150,10 @@ export default {
{ required: true, message: '请输入标准名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standEnName: [
{ required: true, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -3
View File
@@ -176,17 +176,17 @@
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineerName"
prop="dutyEngineer"
width="150"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineerName"
prop="authEngineer"
width="150"
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineerName"
prop="qaEngineer"
width="150"
label="质量工程师">
</el-table-column>