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
2022-03-24 23:01:40 +08:00
parent d096510113 9f1e1f5ef9
commit 95a9ad61c7
68 changed files with 9540 additions and 9224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+1421 -1417
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+1378 -1377
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+5 -5
View File
@@ -2748,11 +2748,11 @@ export default {
synopsis: [
{type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
],
standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'},
// {validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
],
// standYear: [
// {required: true, message: '标准年份不能为空', trigger: 'change'},
// // {validator: this.verify.testNumberCode, trigger: 'change'},
// {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
// ],
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+141 -130
View File
@@ -71,8 +71,8 @@
<el-form :modal="sarBussionessSearch" :inline="true" class="high-search-form" label-width="110px">
<el-row>
<el-col :span="8">
<el-form-item label="标准号" class="search-item">
<el-input v-model="sarBussionessSearch.standCode" placeholder="根据标准号查找" clearable :maxlength="100"></el-input>
<el-form-item label="企标编号" class="search-item">
<el-input v-model="sarBussionessSearch.standCode" placeholder="根据企标编号查找" clearable :maxlength="100"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -187,11 +187,11 @@
<!-- <el-option v-for="opt in standSortOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-formItem label="标准号" prop="numberName" class="search-item">
<el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
<el-formItem label="企标编号" prop="numberName" class="search-item">
<el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据企标编号查找" :maxlength="100"/>
</el-formItem>
<el-formItem label="标准名称" prop="standName" class="search-item">
<el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
<el-formItem label="中文名称" prop="standName" class="search-item">
<el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据中文名称查找" :maxlength="100"/>
</el-formItem>
<el-form-item class="search-item btn-box">
<el-button
@@ -416,27 +416,27 @@
<el-table-column fixed="right"
v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
<template slot-scope="scope">
<div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
@command="handleCommand"
>
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-if="scope.row.collectBtn"
@click="handleCommand([scope.row, '收藏'])"
>收藏
</el-button>
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-else
@click="handleCommand([scope.row, '取消收藏'])"
>取消收藏
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '编辑'])"
v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '删除']) "
v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除
</el-button>
</div>
<div v-else>
<!-- <div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"-->
<!-- @command="handleCommand"-->
<!-- >-->
<!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
<!-- v-if="scope.row.collectBtn"-->
<!-- @click="handleCommand([scope.row, '收藏'])"-->
<!-- >收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
<!-- v-else-->
<!-- @click="handleCommand([scope.row, '取消收藏'])"-->
<!-- >取消收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
<!-- v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
<!-- v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除-->
<!-- </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="'d9730d984627af948053df56a2db7997'"
v-if="scope.row.collectBtn"
@@ -449,9 +449,7 @@
>
</el-button>
</div>
</div>
</template>
@@ -573,10 +571,17 @@
<el-input
:config="field"
clearable
:title="sarBussionessStandEO[field.attrField]"
v-model="sarBussionessStandEO[field.attrField]"
:disabled="formdisableflag" placeholder="选择起草部门"
@click.native="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDWId)">
:disabled="formdisableflag" placeholder="选择起草部门">
</el-input>
<el-button
type="primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDW)"
class="common-button-primary">手动查找
</el-button>
</el-form-item>
</template>
<!--起草人QCRBUSS-->
@@ -587,7 +592,7 @@
class="add-form-item"
>
<template slot="label">起草人</template>
<el-input v-model="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
<el-input v-model="sarBussionessStandEO[field.attrField]" :title="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
</el-input>
<!-- <el-input-->
<!-- :key="field.attrField"-->
@@ -642,7 +647,7 @@
<el-input
v-model="sarBussionessStandEO.CYCVPPSBMBUSS"
placeholder="选择VPPS编码"
@click.native="choiceZRR2('car', '乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
@click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
</el-form-item>
</el-tooltip>
</template>
@@ -1078,11 +1083,6 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="中文名称" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.standName"
placeholder="请输入企标名称"
clearable></el-input>
</el-form-item>
<el-form-item label="英文名称" title="企标英文名称" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.standEnName"
placeholder="请输入企标英文名称"
@@ -1123,10 +1123,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企标编号" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.standCode" clearable
placeholder="请输入企标编号"></el-input>
</el-form-item>
<el-form-item label="标准年份" class="add-form-item form-item-disabled">
<el-input v-model.number="sarBussionessSearch.standYear"
placeholder="请输入标准年份"
@@ -1226,11 +1222,29 @@
<el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
</el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
<el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.VPPSBMBUSS"
placeholder="选择VPPS编码"
@click.native="choiceZRR2('car', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input>
v-model="sarBussionessSearch.CYCVPPSBMBUSS"
placeholder="请输入关联模块--乘用车VPPS编码"
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.KCVPPSBMBUSS"
placeholder="请输入关联模块--卡车VPPS编码"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.DYBXHBUSS"
placeholder="请输入模块结构单元变型号(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYBXHBUSS"
placeholder="请输入模块结构单元变型号(乘用车)"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -1244,18 +1258,6 @@
@click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])">
</el-input>
</el-form-item>
<!-- <el-form-item label="起草人" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarBussionessSearch.QCRBUSS" clearable placeholder="请输入起草人"></el-input>-->
<!--&lt;!&ndash; <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>&ndash;&gt;-->
<!--&lt;!&ndash; <el-option&ndash;&gt;-->
<!--&lt;!&ndash; v-for="item in qcrOptions"&ndash;&gt;-->
<!--&lt;!&ndash; placeholder="请选择"&ndash;&gt;-->
<!--&lt;!&ndash; :key="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :value="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :label="item.label"&ndash;&gt;-->
<!--&lt;!&ndash; ></el-option>&ndash;&gt;-->
<!--&lt;!&ndash; </el-select>&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- 能源类型-->
<template>
<custom-select-array
@@ -1264,18 +1266,6 @@
v-model="sarBussionessSearch['NYLXCLASS']"
></custom-select-array>
</template>
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarBussionessSearch.NYLXCLASS" filterable clearable>-->
<!-- <el-option-->
<!-- v-for="item in categoryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- 适用产品线（新增字段）-->
<template>
<custom-select-array
:config="sycpxOptions"
@@ -1283,20 +1273,30 @@
v-model="sarBussionessSearch['SYCPXCLASS']"
></custom-select-array>
</template>
<!-- <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarBussionessSearch.SYCPXCLASS" filterable clearable>-->
<!-- <el-option-->
<!-- v-for="item in sycpxOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCVPPSCNBUSS"
placeholder="请输入关联模块--乘用车vpps中文名称"
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" title="关联模块--卡车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.KCVPPSCNBUSS"
placeholder="请输入关联模块--卡车vpps中文名称"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.DYMCBUSS"
placeholder="请输入模块结构单元名称(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYMCBUSS"
placeholder="请输入关联模块--乘用车vpps中文名称"
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -1398,17 +1398,11 @@
border
:height="300"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectReplaceStandNumRowChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
fontWeight: 'bold', height: '48px'}">
<el-table-column
label="企标编号">
<template slot-scope="scope">
<a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
<a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column
@@ -2591,17 +2585,17 @@ export default {
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
if (this.drawerTitle2 === 'VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}
} else {
if (this.drawerTitle2 === 'VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
} else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
@@ -3368,7 +3362,7 @@ export default {
})
},
// 点击查看
handlePreview(item) {
handlePreview(item,fs) {
// const mj = item.attrInfoMap.QBMJ
// if (mj === 'GXNX7D6H59') {
// // C1所有人都可查看
@@ -3446,10 +3440,11 @@ export default {
let routeUrl = this.$router.resolve({
name: 'OtherBussStandardDetails',
params: {
id: item.id,
id: fs ? (fs === 'fs' ? item.standId:item.id) : item.id,
pageType: 'BUSINESS_STAND'
}
})
console.log(routeUrl)
window.open(routeUrl.href, '_blank')
},
// 编辑
@@ -3539,9 +3534,20 @@ export default {
// $('#deptBtn').click()
$('#deptBtn2').click()
},
choiceQCR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
choiceQCR(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
@@ -3572,7 +3578,9 @@ export default {
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
if(this.sarBussionessStandEO.QCDWID && this.sarBussionessStandEO.QCDWID.length > 0){
this.nodeListZRBM = this.sarBussionessStandEO.QCDWID.split(',')
}
this.drawerTitle = title
this.modalshowflagZRBM = true
},
@@ -3593,7 +3601,16 @@ export default {
this.sarBussionessSearch.QCDW = nameList
}
this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
this.$set(this.sarBussionessStandEO, 'QCDW', nameList)
let tNameList = (this.sarBussionessStandEO.QCDW === null || this.sarBussionessStandEO.QCDW === '') ? nameList : this.sarBussionessStandEO.QCDW+','+nameList
const arr=new Set()
let permission = tNameList.split(",");
permission.forEach((item, index) => {
arr.add(item)
})
let nameNew=Array.from(arr).join(',')
this.$set(this.sarBussionessStandEO, 'QCDW', nameNew)
if (this.sarBussionessStandEO.QCRBUSS) {
this.$refs.sarBussionessStandForm.validateField('QCDW')
}
@@ -3624,8 +3641,8 @@ export default {
nowstandinfo.putTime = this.$dateFormat(this.sarBussionessStandEO.putTime, 'yyyy-MM-dd hh:mm:ss')
}
// 代替标准号
if (nowstandinfo.replaceStandNum != null) {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
if (this.sarBussionessStandEO["DTQBBHBUSS"] != null) {
nowstandinfo.replaceStandNum = this.sarBussionessStandEO["DTQBBHBUSS"].replace(/，/ig, ',')
}
if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
@@ -4323,37 +4340,29 @@ export default {
formFieldList.forEach((item) => {
const value = this.sarBussionessSearch[item.attrField]
// 时间格式处理
if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') {
advanceSearchVOList.push({
connect: "and",
field: 'CYCVPPSBM',
type: 'like',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') {
advanceSearchVOList.push({
connect: "and",
field: 'CYCVPPSCN',
type: 'like',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'EQUALS',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
advanceSearchVOList.push({
connect: advanceSearchVOList.length > 0 ? "and" : "",
field: item.attrField || "",
type: "between",
value: (value ? value[0]+','+value[1] : "") || "",
});
}else if (value !== undefined && value !== null && value !== "") {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'like',
value: value
});
}
})
if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') {
advanceSearchVOList.push({
connect: "and",
field: 'BARQ',
type: 'EQUALS',
value: formData.BARQ
});
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData;
@@ -4744,6 +4753,8 @@ export default {
}
if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') {
rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'})
}else if(item.attrLen && item.attrType === 'INPUT_STR'){
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
}
if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'INPUT_STR') {
rule.push({
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+7 -3
View File
@@ -34,6 +34,7 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'1595c63ae9b14631ff3adefe51a92bdb'"
type="primary"
class="common-button-primary"
size="mini"
@@ -43,6 +44,7 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'5c8347d102094d48139b30723e187113'"
class="common-button-default"
size="mini"
@click="clearData">
@@ -56,6 +58,7 @@
<el-button type="primary"
class="common-button-primary add-button"
size="mini"
v-btn-permission="'66ae947771821e3bd064c5594a14d145'"
@click="addData"><i class="el-icon-plus"></i>新增
</el-button>
<!-- <el-button class="common-button-default in-button"-->
@@ -71,6 +74,7 @@
<!-- </el-button>-->
<el-button class="common-button-default"
size="mini"
v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'"
@click="deleteList"><i class="iconfont">&#xe611;</i>删除
</el-button>
</div>
@@ -171,13 +175,13 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">
<el-dropdown-item v-btn-permission="'68bc53399a9e0daf1cc2f1bb2aa1d566'" :command="[scope.row, '查看']">
查看
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']">
<el-dropdown-item v-btn-permission="'cc5d8f1a15726c62c5016e595246ec8b'" :command="[scope.row, '编辑']">
编辑
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']">
<el-dropdown-item v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'" :command="[scope.row, '删除']">
删除
</el-dropdown-item>
</el-dropdown-menu>
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+6 -4
View File
@@ -1419,13 +1419,13 @@
},
productModelAdd: {
id : "",
sorDivide : "INLAND_STAND",
sorDivide : "FOREIGN_LAWS",
menuName : "",
parentId : null,
parentIds : null,
parentIdsName : "",
displaySeq : "",
validFlag : "",
validFlag : "0",
creationTime : "",
modifyTime : "",
remarks : "",
@@ -2257,6 +2257,8 @@
saveProduct (name) {
this.$refs[name].validate((valid) => {
if (valid) {
this.productModelAdd.sorDivide = 'FOREIGN_LAWS'
this.productModelAdd.validFlag = '0'
if (this.modalType === 1) {
this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
_this: this
@@ -2337,11 +2339,11 @@
if(row.parentIds.indexOf(res.data.id) != -1){
this.productModelAdd.parentIds = row.parentIds
}else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}
}else {
this.productModelAdd.parentIds = res.data.id
this.productModelAdd.parentIds = +','+res.data.id+','
idsName = res.data.menuName;
}
this.productModelAdd.parentId = res.data.id
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -160,7 +160,7 @@
</el-button>
<el-button class="common-button-default"
size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑
v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'"><i class="iconfont">&#xe611;</i>编辑
</el-button>
<!--&lt;!&ndash; <el-button class="common-button-default"
size="mini" :loading="searching"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1206 -1206
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+1 -1
View File
@@ -83,7 +83,7 @@
width="80"
align="center">
<template slot-scope="scope">
<el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)">查看</el-button>
<el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)" v-btn-permission="'08e9f28f1afb80b706217bdd9c6323bd'">查看</el-button>
</template>
</el-table-column>
</el-table>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+1 -1
View File
@@ -104,7 +104,7 @@
width="100"
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" type="primary" size="mini" @click="handleProjectCompliance(scope.row)">查看</el-button>
<el-button class="common-button-primary" type="primary" size="mini" @click="handleProjectCompliance(scope.row)" v-btn-permission="'7d79b9521e77c73857ee788e30670e8d'">查看</el-button>
<!-- <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>-->
</template>
</el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
+65 -65
View File
@@ -1,65 +1,65 @@
<!--重点问题项管控-->
<template>
<div id="key-issues">
<div class="non-content">
<el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
<el-tab-pane label="事业部" name="cause">
<business-division></business-division>
</el-tab-pane>
<el-tab-pane label="产品规划部" name="product">
<product-department></product-department>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
export default {
name: "keyIssues",
props:['keynoteActiveName'],
components: {
businessDivision,
productDepartment,
},
data() {
return {
activeName:'cause',
}
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
}
},
};
</script>
<style lang="less" scoped>
#key-issues {
height: 100%;
display: flex;
flex-direction: column;
background-color: #FFFFFF;
.non-content {
height: 100%;
/deep/ .el-tabs {
display: flex;
flex-direction: column;
.el-tabs__content {
flex: 1;
overflow: hidden;
.el-tab-pane {
height: 100%;
}
}
}
}
.el-tabs__nav {
margin-left:20px;
}
}
</style>
<!--重点问题项管控-->
<template>
<div id="key-issues">
<div class="non-content">
<el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
<el-tab-pane label="事业部" name="cause">
<business-division></business-division>
</el-tab-pane>
<el-tab-pane label="产品规划部" name="product">
<product-department></product-department>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
export default {
name: "keyIssues",
props:['keynoteActiveName'],
components: {
businessDivision,
productDepartment,
},
data() {
return {
activeName:'cause',
}
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
}
},
};
</script>
<style lang="less" scoped>
#key-issues {
height: 100%;
display: flex;
flex-direction: column;
background-color: #FFFFFF;
.non-content {
height: 100%;
/deep/ .el-tabs {
display: flex;
flex-direction: column;
.el-tabs__content {
flex: 1;
overflow: hidden;
.el-tab-pane {
height: 100%;
}
}
}
}
.el-tabs__nav {
margin-left:20px;
}
}
</style>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+747 -747
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+6
View File
@@ -7,6 +7,7 @@
<div class="header-right">
<el-button
type="primary"
v-btn-permission="'141c18729a988fe5d9c52296f35ba9f4'"
size="mini"
class="common-button-primary"
v-if="addButton"
@@ -16,6 +17,7 @@
<el-button
type="primary"
size="mini"
v-btn-permission="'42a77131e13b8cc67886025b44d9948d'"
class="common-button-primary"
v-if="addItemButton"
@click="addItem2">
@@ -26,6 +28,7 @@
size="mini"
class="common-button-primary"
v-if="editButton"
v-btn-permission="'a3803aae3f65134dee97c6b03680d4f9'"
@click="editItem">
编辑
</el-button>
@@ -33,6 +36,7 @@
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'db4ab168afb99c61d4f986c9746a7c65'"
v-if="seeButton"
@click="seeItem">
查看
@@ -42,6 +46,7 @@
size="mini"
class="common-button-primary"
v-if="seeItemButton"
v-btn-permission="'e99a7847d5d9d04d4423e8f69e77f080'"
@click="handlePreview(standId)">
查看标准
</el-button>
@@ -50,6 +55,7 @@
size="mini"
class="common-button-default"
v-if="delectButton"
v-btn-permission="'b1391e768988c363b177419e2ae16633'"
@click="delItem">
删除
</el-button>
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+6
View File
@@ -10,6 +10,7 @@
size="mini"
class="common-button-primary"
v-if="addButton"
v-btn-permission="'9b99ffc92c0100dab08b9fd0037e2b06'"
@click="addItem">
新增
</el-button>
@@ -18,6 +19,7 @@
size="mini"
class="common-button-primary"
v-if="addItemButton"
v-btn-permission="'fc429d36f2d117f13f079aab59c28338'"
@click="addItem2">
新增政策
</el-button>
@@ -26,6 +28,7 @@
size="mini"
class="common-button-primary"
v-if="editButton"
v-btn-permission="'8088f3612c206cb5ca5040091a08ac86'"
@click="editItem">
编辑
</el-button>
@@ -34,6 +37,7 @@
size="mini"
class="common-button-primary"
v-if="seeButton"
v-btn-permission="'4abd63ca838a6845bdf6a9e8cbc8ad5b'"
@click="seeItem">
查看
</el-button>
@@ -42,6 +46,7 @@
size="mini"
class="common-button-primary"
v-if="seeItemButton"
v-btn-permission="'acc9bf3585de7dbf7282cc3cf4fb6337'"
@click="handlePreview(standId)">
查看政策
</el-button>
@@ -50,6 +55,7 @@
size="mini"
class="common-button-default"
v-if="delectButton"
v-btn-permission="'19e9ff56a1d5dcde2710036d5cc53ebb'"
@click="delItem">
删除
</el-button>
src/pages/regulatoryRepository/workingGroup/index.vue
+1 -1
View File
@@ -14,7 +14,7 @@
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane>
</el-tabs>
<el-button size="mini" type="primary" @click="statisticsBtn" class="statistics">工作组统计</el-button>
<el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
</div>
</template>
<script>