diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 2ce3f679f..0afef8433 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -59,7 +59,7 @@
type="primary"
class="common-button-primary"
round
- @click="getReplaceLawsNumRowFirst">
+ @click="getReplaceLawsNumRowFirst(true)">
@@ -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 {
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index 31d90ad21..08d4408ee 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -53,7 +53,7 @@
type="primary"
class="common-button-primary"
round
- @click="getReplaceLawsNumRow">
+ @click="getReplaceLawsNumRow(true)">
@@ -126,7 +126,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace">
@@ -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 {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 6e3df92b6..d4b576538 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -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">
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
@@ -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()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 89cf5239d..f1d620249 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -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
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index f15c752aa..fff8e5e9e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -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
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 4dde65c7c..b4a7279e8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -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
}
// 判断文件上传大小
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index cc10b90c5..60757cd0d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -86,12 +86,6 @@
prop="countryArea"
label="国家/地区"
align="center">
-
-
- {{ scope.row.countryArea }}
-
- {{ countryAreaMap[scope.row.countryArea] }}
-
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
{
- // 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(() => {})
@@ -1467,6 +1470,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 => {
})
@@ -1994,6 +2016,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 => {
})
},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 3d3213f1e..2e6ab6b5b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -117,10 +117,10 @@
-
-
+
+
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
{
- // 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 => {
})
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 3c8704868..07272fbed 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -215,13 +215,13 @@
>
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
{
- // 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 => {
})
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 59181280b..e9d5466b6 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1573,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'},
@@ -1583,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: [
@@ -2005,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)
}
@@ -2074,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
@@ -2756,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') {