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:
11528
2022-03-24 09:19:47 +08:00
parent 947e59f782 d60a23ea57
commit 466d02e5c8
12 changed files with 175 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
-1
View File
@@ -542,7 +542,6 @@ export default {
XCXSSRQLAWS: '',
//是否纳入认证清单
isRelateAccess: '',
standType: 'INLAND',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+43 -23
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
@@ -571,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-->
@@ -585,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"-->
@@ -1076,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="请输入企标英文名称"
@@ -1121,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="请输入标准年份"
@@ -3532,9 +3530,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
@@ -3565,7 +3574,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
},
@@ -3586,7 +3597,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')
}