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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-26 18:05:19 +08:00
parent ed3ccd21f1 de0f9aaa9f
commit 62c667e2cb
27 changed files with 747 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForStandards.vue
+5 -2
View File
@@ -59,7 +59,7 @@
type="primary"
class="common-button-primary"
round
@click="getReplaceLawsNumRowFirst">
@click="getReplaceLawsNumRowFirst(true)">
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
@@ -217,7 +217,10 @@ export default {
this.getReplaceLawsNumRow()
},
// 代替政策号 请求数据
getReplaceLawsNumRowFirst () {
getReplaceLawsNumRowFirst (val) {
if (val) {
this.replaceLawsNumForm.page = '1'
}
if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
} else {
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+6 -3
View File
@@ -53,7 +53,7 @@
type="primary"
class="common-button-primary"
round
@click="getReplaceLawsNumRow">
@click="getReplaceLawsNumRow(true)">
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
@@ -126,7 +126,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div>
</el-dialog>
@@ -227,7 +227,10 @@ export default {
this.getReplaceLawsNumRow()
},
// 代替政策号 请求数据
getReplaceLawsNumRow () {
getReplaceLawsNumRow (val) {
if (val) {
this.replaceLawsNumForm.page = '1'
}
if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
} else {
src/pages/details/otherStandardDetails/index.vue
+3 -3
View File
@@ -38,13 +38,13 @@
<template v-if="item.label === '基础信息'" >
<div class="details-content-modular basic-information" style="border-top:none">
<div class="basic-information-content">
<p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p style="color: #C42626;">
<label style=" margin-right: 150px;">标准编号</label>
<label style=" margin-right: 150px;">标准号</label>
<span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
<span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
</p>
<p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
<!-- <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
<p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p><label style=" margin-right: 150px;">标准性质</label><span>{{ standMap[sarStandardsInfoEO.standNature] || '-' }}</span></p>
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+6 -1
View File
@@ -84,7 +84,7 @@
ref="Form"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
class="label-input-form myForm">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -430,6 +430,11 @@
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzdyStep1-1 {
.myForm {
/deep/.el-form-item__content {
line-height: 10px;
}
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+6 -1
View File
@@ -84,7 +84,7 @@
ref="Form"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
class="label-input-form myForm">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -419,6 +419,11 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzdyStep1 {
.myForm {
/deep/.el-form-item__content {
line-height: 10px;
}
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+44 -32
View File
@@ -158,14 +158,6 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrq"
@@ -176,30 +168,38 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.ssrqgj"
v-model="form.xcxssrq"
type="date"
placeholder="请选择实施日期(国际)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -835,7 +835,7 @@
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
@@ -1076,9 +1076,12 @@
align="center">
</el-table-column>
<el-table-column
prop="standStateShow"
label="标准状态"
prop="textStatus"
label="文本状态"
align="center">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
@@ -1142,6 +1145,7 @@
},
data () {
return {
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
loadSarStandard: false,
verifySarStandard: false,
@@ -1440,6 +1444,13 @@
},
},
methods: {
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
console.log(this.textStatusMap, '文本状态的值')
},
clearFormData(data){
this.form = {
// 基础信息
@@ -1888,11 +1899,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PDF/PPT/PPTX/DOC/DOCX或XLS文件')
return false
}
// 判断文件上传大小
@@ -2129,6 +2140,7 @@
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.qcdwOption = res.data.QCDW // 体系类别
this.setMap(this.standStateOptions)
})
this.busVsFunc()
this.modelFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+51 -31
View File
@@ -147,15 +147,6 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
@@ -167,33 +158,42 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.ssrqgj"
v-model="form.xcxssrq"
type="date"
placeholder="请选择实施日期(国际)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -928,7 +928,27 @@
this.active = name
},
handleSave() {
this.$message.success('保存成功')
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', this.$route.query.type)
_formData.append('json', JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm,
listInfo: this.listInfo,
id: this.id
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+50 -30
View File
@@ -145,14 +145,6 @@
placeholder="请选择标准实施日期(标准文本)">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
@@ -163,30 +155,38 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.ssrqgj"
type="date"
placeholder="请选择实施日期(国际)">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)">
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -921,7 +921,27 @@ export default {
this.active = name
},
handleSave() {
this.$message.success('保存成功')
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', this.$route.query.type)
_formData.append('json', JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm,
listInfo: this.listInfo,
id: this.id
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+28 -28
View File
@@ -149,13 +149,6 @@
placeholder="请选择标准实施日期(标准文本)">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrq"
@@ -165,27 +158,34 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.ssrqgj"
type="date"
placeholder="请选择实施日期(国际)">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)">
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -896,7 +896,7 @@
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
@@ -1463,11 +1463,11 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PDF/PPT/PPTX/DOC/DOCX或XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+6 -1
View File
@@ -78,7 +78,7 @@
ref="Form"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
class="label-input-form myForm">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -534,6 +534,11 @@ export default {
@import '~@/assets/styles/style';
@import '~@/assets/styles/mixins';
.bzzqyjStep1 {
.myForm {
/deep/.el-form-item__content {
line-height: 10px;
}
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1 -1
View File
@@ -355,7 +355,7 @@
this.form.endTime = data.endTime
this.form.cname = data.cname
this.json = data
this.data = data.info
this.data = data.info || []
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+1
View File
@@ -318,6 +318,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+12 -2
View File
@@ -270,11 +270,21 @@
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人'
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = row
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
},
handleTabs(name) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+12 -2
View File
@@ -263,11 +263,21 @@
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人'
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = row
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
},
stateText (row) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+12 -2
View File
@@ -263,11 +263,21 @@
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人'
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = row
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
},
stateText (row) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+12 -2
View File
@@ -263,11 +263,21 @@
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人'
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = row
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
},
stateText (row) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+1 -1
View File
@@ -88,7 +88,7 @@ export default {
this.tabValue = this.list[0].name;
},
beforeRouteLeave(to, from, next) {
const toName = ["ListOfStandardsAndRegulationsDetails", "Details", "ProjectAddEit", "OtherAddEit"];
const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "ProjectAddEit", "OtherAddEit"];
// 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
if (toName.includes(to.name)) {
this.$store.commit("SET_ACCESS_STANDARD_REG_TABS", this.tabValue);
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
-6
View File
@@ -86,12 +86,6 @@
prop="countryArea"
label="国家/地区"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',') > 0">
<span>{{ scope.row.countryArea }}</span>
</span>
<span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
</template>
</el-table-column>
<el-table-column
prop="detailedListName"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+54 -19
View File
@@ -238,12 +238,12 @@
</el-table-column>
<el-table-column
prop="code"
show-overflow-tooltip
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -370,12 +370,13 @@
align="center">
</el-table-column>
<el-table-column
prop="code"
show-overflow-tooltip
width="180px"
fixed="left"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -560,6 +561,7 @@
<el-date-picker
v-model.trim="editRowData.putTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
@@ -567,6 +569,7 @@
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
@@ -574,6 +577,7 @@
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
@@ -675,6 +679,7 @@ export default {
editRowData: {
id: '',
standName: '',
standSortShow:'',
standEnName: '',
typeApplicable: '',
nylx: '',
@@ -714,7 +719,7 @@ export default {
],
detailedListName: [
{required: true, message: '清单名称不能为空', trigger: 'blur'},
{type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
{type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
]
},
disabledFlag: false,
@@ -739,7 +744,7 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
{value: 'FOREIGN_LAWS', label: '国内外政策'},
//{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '}
],
@@ -876,6 +881,7 @@ export default {
// country: 'CN', // 适用区域
standSort: '', // 标准类别
standNumber: '', // 标准编号
standSortShow:'',
standYear: '', // 标准年份
standName: '', // 中文名称
standEnName: '', // 英文名称
@@ -896,6 +902,7 @@ export default {
// country: 'CN', // 适用区域
standSort: '', // 标准类别
standNumber: '', // 标准编号
standSortShow:'',
standYear: '', // 标准年份
standName: '', // 中文名称
standEnName: '', // 英文名称
@@ -1321,7 +1328,7 @@ export default {
editTghisRow(row) {
this.rowList = row
this.editRowData = this.rowList
this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
this.editRowData.standNumber = this.rowList.standNumber
this.drawerEdit = true
},
// 抽屉取消按钮
@@ -1357,15 +1364,17 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
// i 全部对象数组的下标
// s 选中对象数组的下标
for (var s in this.sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
this.sarAccessInfoList.splice(i, 1)
}
let exits = []
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
}
}
exits.push(item)
})
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1449,7 +1458,7 @@ export default {
loading: 'loadData'
}, res => {
if (res.ok) {
this.$message.success('编辑成功')
//this.$message.success('编辑成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
@@ -1467,6 +1476,25 @@ export default {
selectLawsStands () {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
@@ -1886,12 +1914,12 @@ export default {
})
},
// 点击查看
handlePreview (item) {
let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
handlePreview (data) {
let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
let routeUrl = this.$router.resolve({
name: routerName,
params: {
id: item.resId,
id: data.id,
pageType: this.sarAccessInfoSearch.dataSource
}
})
@@ -1994,6 +2022,13 @@ export default {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
}, e => {
})
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+36 -46
View File
@@ -15,10 +15,9 @@
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p" v-if="sarAccessEO.sortKey === '1'">
<label class="transition-box-label">国家/地区：</label>
<span class="transition-box-span" v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo > 0">
<span>{{ sarAccessEO.countryArea }}</span>
<span class="transition-box-span">
{{ sarAccessEO.countryArea }}
</span>
<span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
</p>
<p v-else></p>
<p class="transition-box-p">
@@ -71,26 +70,6 @@
:label="item.label"
/>
</el-select>
<!-- <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
<el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
<el-input
v-model="standardForm.responseUnit"
placeholder="请选择部门"
readonly
id="depBtnsAuth"
slot="reference"
/>
<div class="api">
<laws-tree :zNodes="depNode"
deptSelect
treeDivId="depTreeAuth"
@treeDblClick="(treeId, treeNode) => treeDblAuthDepartClick(treeId, treeNode)"
:editable="false"
ref="depTreeAuth"
class="ztree" style="height: 300px;overflow: auto">
</laws-tree>
</div>
</el-popover>-->
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -117,10 +96,10 @@
</el-button>
</el-form>
<div v-if="!showSelectBox">
<el-form :model="standardForm" class="label-input-form" label-width="108px" inline>
<el-form-item label="英文名称" class="search-item">
<el-form :model="standardFormList" class="label-input-form" label-width="108px" inline>
<el-form-item label="中文名称" class="search-item">
<el-input
v-model="standardForm.standName"
v-model="standardFormList.standName"
placeholder="请输入"
:maxlength="100"
size="small"
@@ -129,7 +108,7 @@
<el-form-item label="适用车型" class="labelBox" label-width="61px">
<el-select
class="showBox"
v-model="standardForm.typeApplicable"
v-model="standardFormList.typeApplicable"
placeholder="请选择"
filterable
size="small"
@@ -142,26 +121,26 @@
/>
</el-select>
</el-form-item>
<el-form-item label="能源类型" >
<el-form-item label="能源类型" label-width="68px" >
<el-select
class="showBox"
v-model="standardForm.nylx"
v-model="standardFormList.nylx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in energyKindOptions"
v-for="item in categoryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="责任部门" >
<el-form-item label="责任部门" label-width="68px" >
<el-select
class="showBox"
v-model="standardForm.zrbm"
v-model="standardFormList.zrbm"
placeholder="请选择"
filterable
size="small"
@@ -174,10 +153,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" >
<el-form-item label="适用产品线" label-width="86px" >
<el-select
class="showBox"
v-model="standardForm.sycpx"
v-model="standardFormList.sycpx"
placeholder="请选择"
filterable
size="small"
@@ -212,14 +191,13 @@
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
prop="code"
fixed="left"
width="180px"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
<span v-else>{{ scope.row.standNumber }}</span>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -227,12 +205,18 @@
label="中文名称"
width="180px"
>
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="standEnName"
align="center"
width="180px"
label="英文名称">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
</template>
</el-table-column>
<el-table-column
prop="typeApplicable"
@@ -409,7 +393,7 @@ export default {
// 适用车型
applyArcticOptions: [],
// 能源类型
energyKindOptions: [],
categoryOptions: [],
// 责任部门
zrbmOptions: [],
// 适用产品线
@@ -428,6 +412,13 @@ export default {
page: 1,
Size: this.$store.getters.userInfo.configContent
},
standardFormList: {
standNumber: '',
standName: '',
responseUnit: '',
page: 1,
Size: this.$store.getters.userInfo.configContent
},
page: 1,
// pageSize: this.$store.getters.userInfo.configContent,
total: 0,
@@ -452,7 +443,7 @@ export default {
dialogColor: false,
dialogType: "",
color: "",
isShow: false
isShow: false,
};
},
methods: {
@@ -493,6 +484,7 @@ export default {
// 根据准入id查询标准法规详情
selectInfobyAccid() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId,
}, {
@@ -506,9 +498,7 @@ export default {
},
back() {
this.$router.push({
name: "AccessStandardsAndRegulations"
});
this.$router.push({name: 'AccessStandardsAndRegulations'})
// this.$router.push(this.$store.state.detailMap)
// this.$store.commit('setDetailMap', '')
},
@@ -632,12 +622,13 @@ export default {
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
},
// 点击查看
handlePreview(item) {
handlePreview(data) {
debugger
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.resId,
pageType: item.sarType
id: data.id,
pageType: data.sarType
}
});
window.open(routeUrl.href, "_blank");
@@ -744,7 +735,6 @@ export default {
let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
this.pageId = accessRow.id
this.sarAccessEO = accessRow;
console.log(this.sarAccessEO)
this.selectInfobyAccid();
this.getOrgTreeSource();
this.getFileInfo();
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+45 -15
View File
@@ -211,13 +211,13 @@
>
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
show-overflow-tooltip
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -338,12 +338,13 @@
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px"
fixed="left"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -576,11 +577,11 @@ export default {
{required: true, message: '国内/海外不能为空', trigger: 'change'}
],
detailedList: [
{required: true, message: '清单类别不能为空', trigger: 'change'}
{required: true, message: '清单类别不能为空', trigger: 'blur'}
],
detailedListName: [
{required: true, message: '清单名称不能为空', trigger: 'blur'},
{type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
{type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
]
},
disabledFlag: false,
@@ -943,6 +944,7 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1187,15 +1189,17 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
// i 全部对象数组的下标
// s 选中对象数组的下标
for (var s in this.sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
this.sarAccessInfoList.splice(i, 1)
}
let exits = []
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
}
}
exits.push(item)
})
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1278,6 +1282,25 @@ export default {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
@@ -1808,6 +1831,13 @@ export default {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+45 -15
View File
@@ -215,13 +215,13 @@
>
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
show-overflow-tooltip
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -342,12 +342,13 @@
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px"
fixed="left"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -571,11 +572,11 @@ export default {
],
projectName: [
{required: true, message: '项目名称不能为空', trigger: 'blur'},
{type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
{type: 'string', max: 100, message: '项目名称不能超过100个字符', trigger: 'blur'}
],
detailedListName: [
{required: true, message: '清单名称不能为空', trigger: 'blur'},
{type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
{type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
]
},
disabledFlag: false,
@@ -941,6 +942,7 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1185,15 +1187,17 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
// i 全部对象数组的下标
// s 选中对象数组的下标
for (var s in this.sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
this.sarAccessInfoList.splice(i, 1)
}
let exits = []
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
}
}
exits.push(item)
})
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1276,6 +1280,13 @@ export default {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.drawerTotal = res.data.list.length
}, e => {
@@ -1808,6 +1819,25 @@ export default {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
}, e => {
})
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+260 -38
View File
@@ -524,6 +524,7 @@
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
@@ -1024,47 +1025,257 @@
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
</div>
</el-dialog>
<table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
@reset="clearAllSearch('sarStandardsSearch')" >
<div slot="content">
<!-- <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
<!-- @reset="clearAllSearch('sarStandardsSearch')" >-->
<!-- <div slot="content">-->
<!-- <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
<!--&lt;!&ndash; 标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardNo')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准名称&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准英文名称&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准类别&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">-->
<!-- <search-select-->
<!-- v-model="sarStandardsSearch.standSort"-->
<!-- :placeholder="$t('m.standardCategoryTips')"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
<!-- :options="standSortOptions"-->
<!-- clearable/>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 文本状态&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 代替标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准年份&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardYear')" class="serch-form-item">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.standYear"-->
<!-- type="date"-->
<!-- placeholder="根据标准年份查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 标准发布日期&ndash;&gt;-->
<!-- <el-form-item label="标准发布日期" class="serch-form-item">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.issueTime"-->
<!-- type="date"-->
<!-- placeholder="根据标准发布日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准性质&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 是否纳入标准清单&ndash;&gt;-->
<!-- <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">-->
<!-- <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">-->
<!-- <el-option value="yes" label="是"></el-option>-->
<!-- <el-option value="no" label="否"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 实施日期&ndash;&gt;-->
<!-- <el-form-item label="实施日期">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.putTime"-->
<!-- type="date"-->
<!-- placeholder="根据实施日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 新车型实施日期&ndash;&gt;-->
<!-- <el-form-item title="新车型实施日期" label="新车型实施日期">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.XCXTime"-->
<!-- type="date"-->
<!-- placeholder="根据新车型实施日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 在产车实施日期&ndash;&gt;-->
<!-- <el-form-item title="在产车实施日期" label="在产车实施日期">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.ZCCTime"-->
<!-- type="date"-->
<!-- placeholder="根据在产车实施日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 归口管理部门&ndash;&gt;-->
<!-- <el-form-item label="归口管理部门">-->
<!-- <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 起草单位&ndash;&gt;-->
<!-- <el-form-item label="起草单位">-->
<!-- <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 我司参与深度&ndash;&gt;-->
<!-- <el-form-item label="我司参与深度">-->
<!-- <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 能源类型&ndash;&gt;-->
<!-- <el-form-item label="能源类型">-->
<!-- <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 适用车型&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 适用产品线（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 适用认证&ndash;&gt;-->
<!-- <el-form-item label="适用认证">-->
<!-- <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 责任部门&ndash;&gt;-->
<!-- <el-form-item label="责任部门">-->
<!-- <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 责任工程师&ndash;&gt;-->
<!-- <el-form-item label="责任工程师">-->
<!-- <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 关联模块-VPPS编码&ndash;&gt;-->
<!-- <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">-->
<!-- <el-input v-model="sarStandardsSearch.svpps" clearable-->
<!-- placeholder="根据关联模块-VPPS编码查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 代替标准号&ndash;&gt;-->
<!-- <el-form-item label="代替标准号">-->
<!-- <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 关联模块-中文名称&ndash;&gt;-->
<!-- <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" clearable-->
<!-- placeholder="根据关联模块-中文名称"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 采标编号&ndash;&gt;-->
<!-- <el-form-item label="采标编号" prop="nameShow">-->
<!-- <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 采标程度&ndash;&gt;-->
<!-- <el-form-item label="采标程度" prop="standNumber">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" clearable-->
<!-- placeholder="根据采标程度查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 引用标准&ndash;&gt;-->
<!-- <el-form-item label="引用标准">-->
<!-- <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 被引用标准&ndash;&gt;-->
<!-- <el-form-item label="被引用标准">-->
<!-- <el-input v-model="sarStandardsSearch.citedStand" clearable-->
<!-- placeholder="根据被引用标准查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 关联模块（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.associatedModule')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- </table-tools-bar>-->
<!-- 高级筛选-->
<el-drawer
title="高级搜索"
size="700px"
:wrapperClosable="false"
:visible.sync="isAdvancedSearch">
<div class="demo-drawer-content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
<!-- 标准号-->
<!-- 标准号-->
<el-form-item :label="$t('m.standardNo')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准名称-->
<!-- 标准名称-->
<el-form-item :label="$t('m.standName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准英文名称-->
<!-- 标准英文名称-->
<el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准类别-->
<!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="standSortOptions"
clearable/>
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="standSortOptions"
clearable/>
</el-form-item>
<!-- 文本状态-->
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 代替标准号-->
<!-- 代替标准号-->
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准年份-->
<!-- 标准年份-->
<el-form-item :label="$t('m.standardYear')" class="serch-form-item">
<el-date-picker
v-model="sarStandardsSearch.standYear"
@@ -1080,21 +1291,21 @@
placeholder="根据标准发布日期查找">
</el-date-picker>
</el-form-item>
<!-- 标准性质-->
<!-- 标准性质-->
<el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 是否纳入标准清单-->
<!-- 是否纳入标准清单-->
<el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
<el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
<el-option value="yes" label="是"></el-option>
<el-option value="no" label="否"></el-option>
</el-select>
</el-form-item>
<!-- 实施日期-->
<!-- 实施日期-->
<el-form-item label="实施日期">
<el-date-picker
v-model="sarStandardsSearch.putTime"
@@ -1102,7 +1313,7 @@
placeholder="根据实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 新车型实施日期-->
<!-- 新车型实施日期-->
<el-form-item title="新车型实施日期" label="新车型实施日期">
<el-date-picker
v-model="sarStandardsSearch.XCXTime"
@@ -1110,7 +1321,7 @@
placeholder="根据新车型实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 在产车实施日期-->
<!-- 在产车实施日期-->
<el-form-item title="在产车实施日期" label="在产车实施日期">
<el-date-picker
v-model="sarStandardsSearch.ZCCTime"
@@ -1118,19 +1329,19 @@
placeholder="根据在产车实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 归口管理部门-->
<!-- 归口管理部门-->
<el-form-item label="归口管理部门">
<el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 起草单位-->
<!-- 起草单位-->
<el-form-item label="起草单位">
<el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 我司参与深度-->
<!-- 我司参与深度-->
<el-form-item label="我司参与深度">
<el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
@@ -1138,88 +1349,88 @@
</el-select>
</el-form-item>
<!-- 能源类型-->
<!-- 能源类型-->
<el-form-item label="能源类型">
<el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 适用车型-->
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 适用产品线（新增字段）-->
<!-- 适用产品线（新增字段）-->
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 适用认证-->
<!-- 适用认证-->
<el-form-item label="适用认证">
<el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 责任部门-->
<!-- 责任部门-->
<el-form-item label="责任部门">
<el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 责任工程师-->
<!-- 责任工程师-->
<el-form-item label="责任工程师">
<el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 关联模块-VPPS编码-->
<!-- 关联模块-VPPS编码-->
<el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
<el-input v-model="sarStandardsSearch.svpps" clearable
placeholder="根据关联模块-VPPS编码查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 代替标准号-->
<!-- 代替标准号-->
<el-form-item label="代替标准号">
<el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块-中文名称-->
<!-- 关联模块-中文名称-->
<el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
<el-input v-model="sarStandardsSearch.standNumber" clearable
placeholder="根据关联模块-中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标编号-->
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow">
<el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标程度-->
<!-- 采标程度-->
<el-form-item label="采标程度" prop="standNumber">
<el-input v-model="sarStandardsSearch.standNumber" clearable
placeholder="根据采标程度查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 引用标准-->
<!-- 引用标准-->
<el-form-item label="引用标准">
<el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 被引用标准-->
<!-- 被引用标准-->
<el-form-item label="被引用标准">
<el-input v-model="sarStandardsSearch.citedStand" clearable
placeholder="根据被引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块（新增字段）-->
<!-- 关联模块（新增字段）-->
<el-form-item :label="$t('m.associatedModule')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
@@ -1229,7 +1440,18 @@
</el-form-item>
</el-form>
</div>
</table-tools-bar>
<div class="demo-drawer-footer">
<el-button
class="common-button-primary"
icon="el-icon-check"
type="primary"
@click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
<el-button
class="common-button-default"
icon="el-icon-close"
@click="clearAllSearch('sarStandardsSearch')">取消</el-button>
</div>
</el-drawer>
</div>
<!-- 分享 全部选人 -->
<org-table
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+8 -7
View File
@@ -483,6 +483,7 @@
</template>
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
<custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
@@ -1572,9 +1573,9 @@ export default {
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
],
standYear: [
// {required: true, message: '标准年份/系列不能为空', trigger: 'change'},
{validator: this.verify.testItemCode, trigger: 'change'},
{type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'}
{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'},
@@ -1582,7 +1583,7 @@ export default {
],
standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
{type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// {validator: this.verify.valiateEnName, trigger: 'blur'}
],
// standState: [
@@ -2004,7 +2005,7 @@ export default {
item.collectBtn = !item.collectBtn
item.cancelCollectBtn = !item.cancelCollectBtn
item.collectId = res.data.id
this.$message.success(res.message)
// this.$message.success(res.message)
} else {
this.$message.warning(res.message)
}
@@ -2073,7 +2074,7 @@ export default {
Object.keys(item.attrInfoMap || {}).forEach((key) => {
item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key]
if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') {
this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key])
this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
}
})
const dynamicFormField = this.sarStandardsInfoEO
@@ -2755,7 +2756,7 @@ export default {
const value = nowstandinfo[item.attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField]
}
// 数组处理
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+2 -1
View File
@@ -1278,13 +1278,14 @@ export default {
}, res => {
if (this.localProTableSearch.prodectCode === 'Maintenance') {
this.localProTableList = res.data.Maintenance.records
this.total = res.data.Maintenance.total
}
else if (this.localProTableSearch.prodectCode === 'notMaintenance')
{
this.localProTableList = res.data.notMaintenance.records
this.total = res.data.notMaintenance.total
}
this.total = res.data.count
// this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => {
// if (item.productBrand === opr.value) {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+39 -13
View File
@@ -78,47 +78,56 @@
>
</el-table-column>
<el-table-column
prop="SSRQ"
prop="ssrq"
width="190px"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQGJ"
prop="xcxssrqgj"
width="190px"
label="新车型实施日期">
<template slot-scope="scope">
<span style="margin-left: 10px">{{scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQGJ"
prop="zccssrqgj"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZRBM"
prop="zrbm"
label="责任部门"
width="180px"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="KCCVPPSBM"
prop="kccvppsbm"
width="180px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="KCCVPPSCN"
prop="cycvppscn"
width="180px"
label="卡车vpps中文名称">
</el-table-column>
<el-table-column
prop="CYCVPPSBM"
prop="cycvppsbm"
width="180px"
label="乘车VPPS编码">
</el-table-column>
<el-table-column
prop="CYCVPPSBM"
prop="cycvppscn"
width="180px"
label="乘车vpps中文名称">
</el-table-column>
@@ -451,10 +460,8 @@ export default {
_this: this
}, res => {
if (res.ok) {
this.$message.success(res.message)
// this.$message.success(res.message)
this.getDataList()
}else {
this.$message.warning(res.message)
}
}, e => {
});
@@ -502,6 +509,17 @@ export default {
this.$message.warning("请选择一条数据进行带入");
}
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
back () {
this.$router.push(this.$store.state.detailMap)
this.$store.commit('setDetailMap', '')
@@ -567,14 +585,22 @@ export default {
ids+=',\''+this.selectList[i].standId+'\''
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
window.open(exportURL)
this.$message.success('导出信息成功')
}
} else if (this.saveExportType === 'all') {
console.log(this.selectList);
let ids = ''
if (this.selectList.length === 0) {
ids='\''+this.dataList[0].standId+'\''
for(let i=1;i<this.dataList.length;i++){
ids+=',\''+this.dataList[i].standId+'\''
}
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL)
window.open(exportURL)
this.$message.success('导出信息成功')
}
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+2 -2
View File
@@ -116,7 +116,7 @@
prop="standId"
fixed="left"
width="180"
label="标准编号">
label="标准号">
<!-- <template slot-scope="scope">-->
<!-- <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
<!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;-->
@@ -229,7 +229,7 @@
style="width: 100%;"
:model="historySeeForm"
>
<el-form-item class="add-form-item" label="标准编号:">
<el-form-item class="add-form-item" label="标准号:">
<div class="seeItem">{{historySeeForm.standId}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="标准名称:">