diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index 3953c3414..0ea9cfe17 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -104,7 +104,7 @@ label-width="150px" > - + - + - + - + - + {{ opt.label }}--> - + - + - + {{ opt.label }} - + - + @@ -477,6 +478,7 @@ @@ -2396,6 +2398,9 @@ export default { this.standItemSearch.parts = '' this.standItemSearch.nameOrRequest = '' this.standItemSearch.fileType = '' + this.standItemSearch.itemsName='' + this.standItemSearch.ZCCSSRQ='' + this.standItemSearch.XCXSSRQ='' this.selectSarStandItems() }, inputChange() { diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 7a03ff0c2..236df3463 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -97,7 +97,7 @@ 属性 - 编辑 + 编辑 编辑 复制 删除 diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index f2d7528f7..59df5b758 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -47,14 +47,14 @@
国外政策
- + @@ -112,14 +112,14 @@
国外政策
- + @@ -170,12 +170,12 @@ > @@ -236,12 +236,12 @@ > @@ -492,6 +492,17 @@ export default { }, e => { }); }, + //点击查看详情 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, //获取政策预警数据(type用于区别分页器切换) getPolicyDate() { this.loading[this.field] = true diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 9339d3260..fb0665afc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -1,903 +1,936 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index b3e076e97..43822317f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -328,11 +328,13 @@ handleSave() { this.saveLoading = true; let _formData = new FormData(); + let json = this.form + json.data = this.data _formData.append("id", this.bpnId || ""); _formData.append("prcType", "3"); _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ - form: this.json, + form: json, commentText: this.commentText })); saveTaskForPub(_formData).then(res => { @@ -400,7 +402,7 @@ this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname this.json = data - this.data = data.info || data.data || [] + this.data = data.info || data.data || data.form.data|| [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index e08b93f6e..cc5a6fc4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -1,450 +1,505 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 6f79d2566..b559eec49 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -1,446 +1,477 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 61b4a50d7..dfadeae1d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -355,19 +355,34 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - var arr = [] - data.summaryList.forEach( item => { - if (item.state != '3') { - arr.push(item) - } - }) - this.json = data - this.data = arr + if (data.oldinfo === undefined) { + this.form.cid = data.cid; + this.form.endTime = data.endTime; + this.form.cname = data.cname; + var arr = []; + data.summaryList.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } else { + this.form.cid = data.oldinfo.cid; + this.form.endTime = data.oldinfo.endTime; + this.form.cname = data.oldinfo.cname; + var arr = []; + data.oldinfo.data.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } - this.oldData = data.oldinfo }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 1144cfc97..8cc1a33ff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -355,18 +355,33 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - var arr = [] - data.summaryList.forEach( item => { - if (item.state != '3') { - arr.push(item) - } - }) - this.json = data - this.data = arr - this.oldData = data.oldinfo + if (data.oldinfo === undefined) { + this.form.cid = data.cid; + this.form.endTime = data.endTime; + this.form.cname = data.cname; + var arr = []; + data.summaryList.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } else { + this.form.cid = data.oldinfo.cid; + this.form.endTime = data.oldinfo.endTime; + this.form.cname = data.oldinfo.cname; + var arr = []; + data.oldinfo.data.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 72dfadb99..4703b35e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -1,440 +1,470 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index f5de1e3ca..8401257ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -42,6 +42,12 @@ +
+
+ 批量编辑 + +
+
+ + + + + + + + + + +
@@ -331,6 +348,73 @@ @submit="handleSubmit" > + +
+ + 在研产品 + + + + + + + + + + + + + +
+ 在产产品 + + + + + + + + + + + + + +
+
+ +
@@ -349,6 +433,27 @@ export default { }, data() { return { + batchEditForm: { + // 在研产品 + // 合规 + complianceReasons :'', + // 不合规 + noCompliance :'', + // 应对措施 + countermeasures :'', + // 完成时间 + completionTime :'', + + // 在产产品 + // 合规 + zcComplianceReasons :'', + // 不合规 + zcNoCompliance:'', + // 应对措施 + zcCountermeasures:'', + // 完成时间 + zcCompletionTime:'' + }, hasChildren: true, active: "1", loading: false, @@ -398,6 +503,83 @@ export default { }; }, methods: { + //批量编辑确定按钮事件 + saveBatchEditForm() { + + // console.log(this.selectList) + for( let a = 0; a < this.dataList.length; a++) { + for ( let b = 0; b < this.selectList.length; b++) { + if (this.dataList[a].id === this.selectList[b]) { + //合规 + this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons + //不合规 + this.dataList[a].noCompliance = this.batchEditForm.noCompliance + //应对措施 + this.dataList[a].countermeasures = this.batchEditForm.countermeasures + //完成时间 + this.dataList[a].completionTime = this.batchEditForm.completionTime + //合规 + this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons + //不合规 + this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance + //应对措施 + this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures + //完成时间 + this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime + }else { + for (let i=0;i 0) { + //合规 + this.batchEditForm.complianceReasons = '' + //不合规 + this.batchEditForm.noCompliance = '' + //应对措施 + this.batchEditForm.countermeasures = '' + //完成时间 + this.batchEditForm.completionTime = '' + //合规 + this.batchEditForm.zcComplianceReasons = '' + //不合规 + this.batchEditForm.zcNoCompliance = '' + //应对措施 + this.batchEditForm.zcCountermeasures = '' + //完成时间 + this.batchEditForm.zcCompletionTime = '' + this.modalshowflag = true + } else { + this.$message.warning('请选择要编辑的数据') + } + }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ @@ -525,7 +707,11 @@ export default { }, //标准表格选择框改变 selectStandChange(data) { - this.selectList = data; + this.selectList = []; + for (let i = 0; i < data.length; i++) { + this.selectList.push(data[i].id); + } + }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { @@ -605,6 +791,25 @@ export default { height: calc(~'100% - 103px'); overflow: auto; + .tableTitle { + margin-bottom: 10px; + height: 30px; + line-height: 30px; + position: relative; + font-size: 13px; + font-weight: bold; + + .tableButton { + position: absolute; + right: 0; + top: 0; + } + + .accessStandardsAndRegulations { + height: 100%; + } + } + .accessStandardsAndRegulations { height: 100%; } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e2a4a8fdc..06bb099c8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1686,7 +1686,7 @@ export default { orgTableValName: '', twoOptions: [], threeOptions: [], - sarType: 'STAND', + sarType: 'INLAND_STAND', productModal: false, // 模态框是否打开 modalType: '', productTitle: '', // 模态框标题 diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 928a2148f..3438cea85 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -341,6 +341,20 @@ label="文本状态" width="110" > + + + +
+ + + @import '~@/assets/styles/mixins'; @import '~@/assets/styles/style'; + /deep/ .yellowClass{ + color: #E6A23C; + } + + /deep/ .redClass{ + color: #F56C6C; + } /deep/ p{ display: inline; } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 1155aea99..d3cd25a02 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -4,10 +4,10 @@ * @date: 2018-09-04 17:47:46 */ // 服务器地址 -// const devIp = '192.168.1.159' +const devIp = '10.96.10.171' +const devInterfacePORT = '9999' +// const devIp = '10.5.103.101' // const devInterfacePORT = '9999' -const devIp = '62.234.136.153' -const devInterfacePORT = '8038' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' @@ -31,7 +31,7 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 const prodIp = '62.234.136.153' -const prodInterfacePORT = '8038' +const prodInterfacePORT = '8033' // 判断环境