diff --git a/src/api/process.js b/src/api/process.js index d0084423b..10bc76630 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -79,7 +79,7 @@ export function processCreateStand (data) { export function processCreateBuss (data) { return axios({ - url: '/api/lawss/actSarItemsLaws/processCreateBuss', + url: '/api/lawss/actSarItemsBuss/processCreateBuss', method: 'post', data }) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index f5d615690..6d73b5859 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -57,6 +57,13 @@ {{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}

+

{{ + sarStandardsInfoEO.standName || '-' + }}

+

{{ + sarStandardsInfoEO.standEnName || '-' + }}

+ -

{{ - sarStandardsInfoEO.standName || '-' - }}

-

{{ - sarStandardsInfoEO.standEnName || '-' - }}

+ + + + + +

@@ -1939,6 +2071,7 @@ export default { watch: {}, methods: { child1Func(child1) { + console.log('1943',child1) const list = [] if (child1 && child1.length > 1) { list.push(child1[0]) @@ -1946,6 +2079,33 @@ export default { } return child1 }, + child3Func(child3) { + console.log('1943',child3) + const list = [] + if (child3 && child3.length > 1) { + list.push(child3[0]) + return list + } + return child3 + }, + child4Func(child4) { + console.log('1943',child4) + const list = [] + if (child4 && child4.length > 1) { + list.push(child4[0]) + return list + } + return child4 + }, + child5Func(child5) { + console.log('1943',child5) + const list = [] + if (child5 && child5.length > 1) { + list.push(child5[0]) + return list + } + return child5 + }, handleChange(val) { console.log('1724', val) }, @@ -3478,7 +3638,9 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter(item => item.label === '过程稿件'); + console.log('3535',list) if (location.label === '基础信息' && list && list.length > 0) { + //发布稿必读 if (!list[0].child) { location['child1'] = [] } else { @@ -3486,6 +3648,30 @@ export default { location['child1'] = childList } + //增补件必读 + if (!list[0].child) { + location['child3'] = [] + } else { + const childList = list[0].child.filter(item => item.attrField === 'ZBJBD'); + location['child3'] = childList + + } + //勘误件 + if (!list[0].child) { + location['child4'] = [] + } else { + const childList = list[0].child.filter(item => item.attrField === 'KWJ'); + location['child4'] = childList + + } + //修订本 + if (!list[0].child) { + location['child5'] = [] + } else { + const childList = list[0].child.filter(item => item.attrField === 'XDB'); + location['child5'] = childList + + } } // 动态属性字段-SYRZ 单独添加至基础信息 const list2 = displayLocation.filter(item => item.label === '适用范围'); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 75225cd91..3d6f1cccd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1315,6 +1315,14 @@ export default { this.$message.warning("请勿重复添加数据"); } else { this.dataList.push(item); + this.dataList.forEach(item => { + if(item.XCXSSRQ === null){ + item.XCXSSRQ = '' + } + if(item.ZCCSSRQ === null){ + item.ZCCSSRQ = '' + } + }) exits.push(item.id); } }); @@ -1368,11 +1376,13 @@ export default { this.dataList.forEach(item => { if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ item.xcxssrqgj = '' + this.$set(item, "XCXSSRQ", item.xcxssrqgj) }else{ this.$set(item, "XCXSSRQ", item.xcxssrqgj) } if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ item.zccssrqgj = '' + this.$set(item, "ZCCSSRQ", item.zccssrqgj) }else{ this.$set(item, "ZCCSSRQ", item.zccssrqgj) } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 61f2e77f2..412e435de 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1308,11 +1308,13 @@ export default { this.dataList.forEach(item => { if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ item.xcxssrqgj = '' + this.$set(item, "XCXSSRQ", item.xcxssrqgj) }else{ this.$set(item, "XCXSSRQ", item.xcxssrqgj) } if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ item.zccssrqgj = '' + this.$set(item, "ZCCSSRQ", item.zccssrqgj) }else{ this.$set(item, "ZCCSSRQ", item.zccssrqgj) } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 9fd6c6eb4..8dfd0b84c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -815,7 +815,7 @@ export default { this.listForm.commentText = this.commentText this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); - this.isSubmit = true + // this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 60bd786bf..a5b345fb9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1,3106 +1,3258 @@ - @@ -281,9 +300,17 @@ export default { type: Boolean, default: false }, + opinionsShow: { + type: Boolean, + default: false + }, }, data () { return { + opinionsAdoptedOptions:[ + {value: '1',label: '采纳'}, + {value: '2',label: '不采纳'}, + ], countryOptions:[],//国家地区 standSortOptions: [], // 标准类别 standNatureOptions: [], // 标准性质 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 21b88d8df..9e20fee47 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -18,255 +18,17 @@ label-width="210px" >
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - {{value.name}} -
-
- - - -
-
- -
- - {{value.name}} -
-
- - - -
-
-
- - -
- - {{value.name}} -
-
- - - -
-
- -
- - {{value.name}} -
-
- - - -
-
-
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - -
- - {{value.name}} -
-
- - - -
-
-
- - - - - - - - -
-
+
@@ -812,6 +574,7 @@ + + diff --git a/src/pages/processCenter/pages/phone/qbfs/step2.vue b/src/pages/processCenter/pages/phone/qbfs/step2.vue new file mode 100644 index 000000000..681239939 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/step2.vue @@ -0,0 +1,458 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 6cc6539c6..f25d348ec 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -429,7 +429,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '专委会副主任/起草单位中心主任审定'){ + }else if (row.taskInfo === '起草单位中心主任审定'){ this.$router.push({ name: 'bussLibrary10', query: { @@ -440,7 +440,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '起草单位中心主任审定'){ + }else if (row.taskInfo === '总院院长或总院主管副院长批准'){ this.$router.push({ name: 'bussLibrary11', query: { @@ -451,7 +451,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '主起草人培训'){ + }else if (row.taskInfo === '标准法规部标准化工程师发布'){ this.$router.push({ name: 'bussLibrary12', query: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 195afb22c..52a5786b6 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -454,18 +454,20 @@ + clearable + v-model.trim="editRowData.zccssrqgj" + type="dates" + value-format="yyyy-MM-dd" + placeholder="选择日期"> + clearable + v-model.trim="editRowData.xcxssrqgj" + type="dates" + value-format="yyyy-MM-dd" + placeholder="选择日期"> @@ -1162,46 +1164,26 @@ export default { addSarAccess() { //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { - - //为空转换 - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - //适用车型为空 - if (this.selectedAccInfoSearchList[i].typeApplicable === "[]"){ - this.selectedAccInfoSearchList[i].typeApplicable = null - } - //能源类型为空 - if (this.selectedAccInfoSearchList[i].nylx === "[]"){ - this.selectedAccInfoSearchList[i].nylx = null - } - //责任部门为空 - if (this.selectedAccInfoSearchList[i].zrbm === "[]"){ - this.selectedAccInfoSearchList[i].zrbm = null - } - //试用产品线为空 - if (this.selectedAccInfoSearchList[i].sycpx === "[]"){ - this.selectedAccInfoSearchList[i].sycpx = null - } - } - // 追加字段 + console.log('1168',this.selectedAccInfoSearchList) this.selectedAccInfoSearchList.map(item => { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id === item.id - }) + return items.id === item.id; + }); if (addList > -1) { // this.$refs.accessTypeSelect.clearSelection() - this.$refs.entryTable.clearSelection() + this.$refs.entryTable.clearSelection(); this.$refs.searchTable.clearSelection() this.$message.warning('请勿添加重复数据') } else { this.sarAccessInfoList.push(item) this.sarAccessInfoList.forEach(item => { - this.$set(item, 'xcxssrqgj', item.xcxssrq) - this.$set(item, 'zccssrqgj', item.zccssrq) - if(item.attrInfoCaseMap !== undefined){ - this.$set(item, 'typeApplicable', item.attrInfoCaseMap.cllx) - this.$set(item, 'nylx', item.attrInfoCaseMap.nylx) + this.$set(item, "xcxssrqgj", item.xcxssrq); + this.$set(item, "zccssrqgj", item.zccssrq); + if (item.attrInfoCaseMap !== undefined) { + this.$set(item, "typeApplicable", item.attrInfoCaseMap.cllx); + this.$set(item, "nylx", item.attrInfoCaseMap.nylx); } // 能源类型转换 if (item.nylx !== null) { @@ -1231,6 +1213,20 @@ export default { // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() + this.sarAccessInfoList.forEach(item => { + if(item.nylx === '[]'){ + item.nylx = '' + } + if(item.typeApplicable === '[]'){ + item.typeApplicable = '' + } + if(item.zrbm === '[]'){ + item.zrbm = '' + } + if(item.sycpx === '[]'){ + item.sycpx = '' + } + }) } }) } else { @@ -1477,6 +1473,7 @@ export default { this.sarAccessInfoSearch.page = 1 if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ StandardsInfoPage(this.sarAccessInfoSearch).then(res => { + console.log('1476',res.data.list) this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1484,6 +1481,10 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } + item.zrbm = item.attrInfoCaseMap.zrbm + item.sycpx = item.attrInfoCaseMap.sycpx + item.typeApplicable = item.attrInfoMap.CLLX + item.nylx = item.attrInfoMap.NYLX }) this.drawerTotal = res.data.count }, e => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 1cbe14f95..c09d2d974 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1229,19 +1229,102 @@ export default { } }) }, + // 字段转化 + changeText(val) { + val.forEach(item => { + // 责任部门转换 + if (item.zrbm !== null || item.zrbm !== "") { + let k = (item.zrbm || "").split(',') + for (let i in this.zrbmOptions) { + for (let m = 0; m < k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label + } + item.zrbm = k.join(',') + } + } + } + // 能源类型转换 + if (item.nylx !== null) { + let k = (item.nylx || "").split(',') + for (let i in this.categoryOptions) { + for (let m = 0; m < k.length; m++) { + if (this.categoryOptions[i].value === k[m]) { + k[m] = this.categoryOptions[i].label + } + item.nylx = k.join(',') + } + } + } + // 适用车型转换 + if (item.typeApplicable !== null) { + let k = (item.typeApplicable || "").split(',') + for (let i in this.CycxOptions) { + for (let m = 0; m < k.length; m++) { + if (this.CycxOptions[i].value === k[m]) { + k[m] = this.CycxOptions[i].label + } + item.typeApplicable = k.join(',') + } + } + } + // s适用产品线转换 + if (item.sycpx !== null) { + let k = (item.sycpx || "").split(',') + for (let i in this.sycpxOptions) { + for (let m = 0; m < k.length; m++) { + if (this.sycpxOptions[i].value === k[m]) { + k[m] = this.sycpxOptions[i].label + } + item.sycpx = k.join(',') + } + } + } + // 适用认证转换 + if (item.syrz !== null) { + let k = (item.syrz || "").split(',') + for (let i in this.syrzOptions) { + for (let m = 0; m < k.length; m++) { + if (this.syrzOptions[i].value === k[m]) { + k[m] = this.syrzOptions[i].label + } + item.syrz = k.join(',') + } + } + } + }) + }, pageInfo() { this.sarAccessInfoSearch.pageNo = 1 this.sarAccessInfoSearch.page = 1 if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { StandardsInfoPage(this.sarAccessInfoSearch).then(res => { this.sarAccessInfoSearchList = res.data.list + console.log('1476',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 } + item.zrbm = item.attrInfoCaseMap.zrbm + item.sycpx = item.attrInfoCaseMap.sycpx + item.typeApplicable = item.attrInfoMap.CLLX + // 适用车型转换 + if (item.typeApplicable !== null) { + let k = (item.typeApplicable || "").split(',') + for (let i in this.CycxOptions) { + for (let m = 0; m < k.length; m++) { + if (this.CycxOptions[i].value === k[m]) { + k[m] = this.CycxOptions[i].label + } + item.typeApplicable = k.join(',') + } + } + } + item.nylx = item.attrInfoMap.NYLX }) + this.changeText(this.sarAccessInfoSearchList) this.drawerTotal = res.data.count }, e => { }) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 83dca2e39..32d789d79 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1306,7 +1306,7 @@ export default { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ StandardsInfoPage(this.sarAccessInfoSearch).then(res => { this.sarAccessInfoSearchList = res.data.list - + console.log('1476',res.data.list) //为空转换 for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) { //适用车型为空 @@ -1324,6 +1324,10 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } + item.zrbm = item.attrInfoCaseMap.zrbm + item.sycpx = item.attrInfoCaseMap.sycpx + item.typeApplicable = item.attrInfoMap.CLLX + item.nylx = item.attrInfoMap.NYLX }) this.changeText(this.sarAccessInfoSearchList) this.drawerTotal = res.data.count diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 6297e79dc..f897487fb 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -68,16 +68,16 @@
- - - - - - - - - - + 提交 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + - - - - - - - - - + - - - - - - - - - - - - - - - + - + + + + - - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - + + + + +
@@ -805,10 +811,10 @@ - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - +