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/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index d5e16a9ed..0f2f85177 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -1,4 +1,18 @@ // 设置查询区域 +.itemsTextBox { + min-height: 300px; + max-height: 500px; + overflow: auto; + line-height: 20px; + td { + border: 1px solid #606266; + text-align: center; + } + /deep/ td { + border: 1px solid #606266; + text-align: center; + } +} .search-area{ display: flex; justify-content: space-between; 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/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 714e09912..97fad8e2b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -144,7 +144,7 @@

责任部门对接人

- +
@@ -167,7 +167,7 @@

技术管理中心主任

- +
@@ -196,7 +196,7 @@ > 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术管理中心主任' + if ( this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index d0bb9d7a5..2ae9cd88d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -144,7 +144,7 @@

责任部门对接人

- +
@@ -167,7 +167,8 @@

技术管理中心主任

- + +
@@ -197,7 +198,7 @@ > 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术管理中心主任' + if ( this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index a22438391..734a2b504 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -420,7 +420,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index b6e667a05..63914643d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -323,7 +323,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index fe95f97af..57a19019e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -424,7 +424,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 05b0560ca..227a57450 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -260,7 +260,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 7dcd95813..f3b763caf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -417,7 +417,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 1715d4c56..14234cacd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -272,7 +272,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 2c5abc2da..465385560 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -277,7 +277,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 06c2d27d1..f95bc408c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -276,7 +276,7 @@ title="查看条款内容" :visible.sync="itermsConditionsFlag" size="800px"> -
+
关闭
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 f29da4ab8..412e435de 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1057,7 +1057,7 @@ export default { this.listForm.commentText = this.commentText this.listForm.fileName = this.fileInfoList this.listForm.dataList = this.dataList - var json = Object.assign(this.listForm, this.roleForm); + let json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { @@ -1237,7 +1237,7 @@ export default { this.standList.map(item => { let newStand = false; for (let itemKey of this.dataList) { - if (item.id == itemKey.id) { + if (item.id === itemKey.id) { newStand = true; break; } @@ -1246,6 +1246,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); } }); @@ -1300,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 6e7bdb10f..8dfd0b84c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -616,6 +616,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 = '' + } + }) } }); this.standardData = [] @@ -807,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..09d2cf8f8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -418,6 +418,29 @@
+ + +
+
+
{{ item.name }}
+
+
+ + + +
+
+
@@ -745,6 +768,17 @@ > + + + + + @@ -1511,6 +1545,7 @@ qcdw: [], // 起草单位 wssmr: [], // 我司署名人 cysd: '', // 我司参与深度 + cyzbpm:[],// 我司参与制标排名 cllx: [], // 适用车型 nylx: [],// 能源类型 sycpx: [],// 适用产品线 @@ -1616,6 +1651,7 @@ options:[] }, // 适用认证 cysdOptions: [], // 我司参与深度 + cyzbpmOptions:[], // 我司参与制标排名 cbcdOptions: [], // 采标程度 wssmrOptions: [], // 我司署名人 sycpxOptions: { @@ -1679,7 +1715,7 @@ standNature: '', // 标准性质 standEnName: '', // 英文名称 standName: '', // 中文名称 - signFlag: '1', // 是否需要会签 + signFlag: '2', // 是否需要会签 issueTime: '', // 发布时间 isRelateAccess: '', // 是否纳入认证清单 standSystem: '',// 标准体系 @@ -2969,6 +3005,7 @@ this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.wssmrOptions = res.data.WSSMR // 我司署名人 this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 39523e90a..53882e2c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -624,6 +624,29 @@ + + +
+
+
{{ item.name }}
+
+
+ + + +
+
+
@@ -946,6 +969,17 @@ > + + + + + @@ -1404,6 +1438,7 @@ export default { jdwjFileList: [], zbjbdFileList: [], kwjFileList: [], + xdbFileList: [], glwjFileList: [], textStatus:'',//文本状态 textStatusMap: {}, // 文本状态id与name对应 @@ -1569,6 +1604,7 @@ export default { qcdw: '', // 起草单位 wssmr: '', // 我司署名人 cysd: '', // 我司参与深度 + cyzbpm:[],// 我司参与制标排名 cllx: '', // 适用车型 nylx: '',// 能源类型 sycpx: '',// 适用产品线 @@ -1618,6 +1654,7 @@ export default { options:[] }, // 适用认证 cysdOptions: [], // 我司参与深度 + cyzbpmOptions:[], // 我司参与制标排名 wssmrOptions: [], // 我司署名人 qcdwOptions: [], // 起草单位 sycpxOptions: { @@ -2120,6 +2157,9 @@ export default { case 'kwj': this.kwjFileList=fileList; break; + case 'xdb': + this.xdbFileList=fileList; + break; case 'ca': this.caFileList=fileList; break; @@ -2157,6 +2197,9 @@ export default { case 'kwj': this.kwjFileList=fileList; break; + case 'xdb': + this.xdbFileList=fileList; + break; case 'ca': this.caFileList=fileList; break; @@ -2188,6 +2231,8 @@ export default { this.fileList=this.zbjbdFileList; }else if (type==='kwj'){ this.fileList=this.kwjFileList; + }else if (type==='xdb'){ + this.fileList=this.xdbFileList; }else if (type==='glwj'){ this.fileList=this.glwjFileList; } @@ -2388,6 +2433,9 @@ export default { case 'kwj': this.getFileList(value,this.kwjFileList); break; + case 'xdb': + this.getFileList(value,this.xdbFileList); + break; case 'jdwj': this.getFileList(value,this.jdwjFileList); break; @@ -2491,6 +2539,9 @@ export default { this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") + this.form.kwj=this.xdbFileList.map(item => item.response.data.id).join(",") + this.form.kwjName=this.xdbFileList.map(item => item.name).join(",") + this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") this.form.caName=this.caFileList.map(item => item.name).join(",") @@ -2574,6 +2625,7 @@ export default { this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.wssmrOptions = res.data.WSSMR // 我司署名人 this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 96bc0ab91..051c89510 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -112,7 +112,12 @@ >
-
{{ item.name }}
+
+ {{ item.name }} + + + +
-
{{ item.name }}
+
+ {{ item.name }} + + + +
-
{{ item.name }}
+
+ {{ item.name }} + + + +
-
{{ item.name }}
+
+ {{ item.name }} + + + +
-
{{ item.name }}
+
+ {{ item.name }} + + + +
+ + + +
+ + + + + + + + + +
@@ -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 @@