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:
庄新伟
2022-03-15 13:33:38 +08:00
parent 483ac77bad 98b1dded34
commit d81e850d44
79 changed files with 14863 additions and 4908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+1 -1
View File
@@ -214,7 +214,7 @@
</el-dialog>
<!-- 更新LOG -->
<el-dialog
title="更新LOG"
title="更新记录"
:visible.sync="relateDialog"
class="relateClass"
width="60%"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+55 -39
View File
@@ -115,9 +115,10 @@
v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'"
@click="clearAllSearch('standCommonlySearch')">清空
</el-button>
<el-button size="mini" type="primary" class="common-button-primary"
v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn"><i
class="iconfont">&#xe7a5;</i>高级检索
<el-button size="mini" type="primary" class="common-button-default"
v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn">
<!-- <i class="iconfont">&#xe7a5;</i>-->
高级检索
</el-button>
</el-form-item>
</el-form>
@@ -345,29 +346,28 @@
label="收藏" align="center" width="50px"
>
<template slot-scope="scope">
<div
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
@command="handleCommand"
>
<el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
v-if="scope.row.collectBtn"
@click="handleCommand([scope.row, '收藏'])"
>收藏
</el-button>
<el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
v-else
@click="handleCommand([scope.row, '取消收藏'])"
>取消收藏
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '编辑'])"
v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '删除']) "
v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
</el-button>
</div>
<div v-else>
<!-- <div-->
<!-- v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"-->
<!-- @command="handleCommand"-->
<!-- >-->
<!-- <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
<!-- v-if="scope.row.collectBtn"-->
<!-- @click="handleCommand([scope.row, '收藏'])"-->
<!-- >收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
<!-- v-else-->
<!-- @click="handleCommand([scope.row, '取消收藏'])"-->
<!-- >取消收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
<!-- v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
<!-- v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除-->
<!-- </el-button>-->
<!-- </div>-->
<div>
<div @click.stop style="display: inline-block">
<!-- <i class="iconfont">&#xe61e;</i>-->
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
@@ -597,8 +597,9 @@
prop="CYCVPPSBM"
label-width="150px"
class="add-form-item"
label="关联模块--乘用车VPPS编码"
title="关联模块--乘用车VPPS编码"
>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
clearable
@click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
@@ -606,11 +607,12 @@
</template>
<template v-else-if="field.attrField === 'KCCVPPSBM'">
<el-form-item
title="关联模块--卡车VPPS编码"
label="关联模块--卡车VPPS编码"
prop="KCCVPPSBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码"
clearable
@click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
@@ -656,15 +658,16 @@
prop="DYBXH"
label-width="150px"
class="add-form-item"
label="模块结构单元变型号(卡车)"
title="模块结构单元变型号(卡车)"
>
<template slot="label">模块结构单元变型号(卡车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
clearable
@click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
<el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
<el-input
v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
v-model="sarStandardsInfoEO.DYMC = ''"
@@ -684,15 +687,16 @@
prop="DYBXHCAR"
label-width="150px"
class="add-form-item"
label="模块结构单元变型号(乘用车)"
title="模块结构单元变型号(乘用车)"
>
<template slot="label">模块结构单元变型号(乘用车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
clearable
@click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMCCAR'">
<el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
<el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
<el-input
v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
v-model="sarStandardsInfoEO.DYMCCAR = ''"
@@ -2059,9 +2063,9 @@
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
@checkedRole="checkedRole2"
/>
<Role-tree
is-title="选择人员信息"
:is-visible.sync="modalshowflagRole"
@@ -4600,6 +4604,9 @@ export default {
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
formData.issueTime = null
this.loading = true
if(formData.CLLX){
formData.applyArctic = formData.CLLX.join(',')
}
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
}, res => {
@@ -4660,7 +4667,6 @@ export default {
}
}
this.configStandList = res.data.list
console.log(this.configStandList);
this.configTotal = res.data.count
this.selectConfigStand = []
}, e => {
@@ -5816,9 +5822,20 @@ export default {
this.$set(this.textStatusMap, item.value, item.label)
})
},
choiceZRRS(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
choiceZRRS(type, title, nameId) {
this.nodeList2 = []
if (nameId) {
let nameId1 = nameId.split(',')
let idList = []
nameId1.forEach(item => {
let a, b
a = item.substring(item.indexOf('(') +1)
b = a.substring(0, a.lastIndexOf(')'))
idList.push(b)
})
idList = idList.join(',')
this.nodeList2.push(idList)
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -5890,7 +5907,6 @@ export default {
} else if (this.drawerTitle === '查询责任部门') {
this.advanceSearchMapping['ZRBM'] = nameList
}
},
},
computed: {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+24 -29
View File
@@ -111,7 +111,8 @@
@click="clearAllSearch('standCommonlySearch')">清空
</el-button>
<el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>高级查询
<!-- <i class="iconfont">&#xe7a5;</i>-->
高级检索
</el-button>
</el-form-item>
</el-form>
@@ -334,30 +335,27 @@
</el-table-column>
<el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="收藏" align="center" width="50">
<template slot-scope="scope">
<div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"
@command="handleCommand"
>
<el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
v-if="scope.row.collectBtn"
@click="handleCommand([scope.row, '收藏'])"
>收藏
</el-button>
<el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
v-else
@click="handleCommand([scope.row, '取消收藏'])"
>取消收藏
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '编辑'])"
v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '删除']) "
v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">删除
</el-button>
</div>
<div v-else>
<!-- <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
<!-- @command="handleCommand"-->
<!-- >-->
<!-- <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
<!-- v-if="scope.row.collectBtn"-->
<!-- @click="handleCommand([scope.row, '收藏'])"-->
<!-- >收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
<!-- v-else-->
<!-- @click="handleCommand([scope.row, '取消收藏'])"-->
<!-- >取消收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
<!-- v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
<!-- v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">删除-->
<!-- </el-button>-->
<!-- </div>-->
<div>
<div @click.stop style="display: inline-block">
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
v-if="scope.row.collectBtn"
@@ -370,9 +368,7 @@
>
</el-button>
</div>
</div>
</template>
@@ -387,7 +383,7 @@
<el-dialog :visible.sync="exportModelFlag" title="导出文件" width="300px">
<el-form :inline="true" class="label-input-form search-area">
<el-form-item label="导出名称" class="search-item">
<el-input v-model="exportName" @keyup.native="btKeyUp" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
<el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
</el-form-item>
</el-form>
<span slot="footer" class="demo-drawer-footer">
@@ -1051,7 +1047,6 @@
<template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
<template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH' || field.attrField === 'DXBZ'">
<custom-input-for-standards
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
-18
View File
@@ -119,18 +119,6 @@
align="center"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
width="150"
align="center"
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
width="150"
align="center"
label="质量工程师">
</el-table-column>
<el-table-column
prop="actualCloseTime"
width="130"
@@ -194,12 +182,6 @@
<el-form-item class="add-form-item" label="责任工程师:">
<div class="seeItem">{{historySeeForm.dutyEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="认证工程师:">
<div class="seeItem">{{historySeeForm.authEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="质量工程师:">
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="要求关闭时间:">
<div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>