- - {{ - sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear - }} - {{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }} -
+{{ - sarStandardsInfoEO.standName || '-' - }}
-{{ - sarStandardsInfoEO.standEnName || '-' - }}
+
-
-
-
-
-
-
-
-
-
+
-
-
+
-
-
+
-
- {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}
-
-
- {{ sarStandardsInfoEO.issueTime || '-' }}
-
-
-
+
-
-
+
+
+
+
-
- {{ child.value || '-' }}
-
@@ -327,42 +389,46 @@
-
+
+
+
+
+
+
- {{
- file.oldFileName | ellipsis
- }}
-
-
- {{
- file.oldFileName | ellipsis
- }}
-
-
' + itemsNum + '
' + text.replace(/''/g, '\'') }, //查询项目下的标准 getStandData() { @@ -764,6 +809,7 @@ export default { this.$set(items, "standYear", item.standYear); this.$set(items, "standSort", item.standSort); this.$set(items, "standNumber", item.standNumber); + this.$set(items, "termsConditions", item.termsConditions); } }) }) @@ -777,12 +823,28 @@ export default { if(index > -1){ dataListChildren.splice(index, 1) } + let idList = [] dataListChildren.forEach(item => { + idList.push(item.id) item.workPeople = this.$store.getters.userInfo.userName item.workPeopleId = this.$store.getters.userInfo.userId }) + this.$http.post("SarStandItems/sar-stand-items/findTermsConditions",{ + idList: idList + }, { + _this:this + }, res => { + res.data.forEach(val => { + dataListChildren.forEach(item => { + if(item.id == val.id){ + item.termsConditions = val.termsConditions + } + }) + }) + }) this.dataList = dataListChildren; this.total = this.dataList.length; + this.$forceUpdate() } else { let dataChildren = []; let dataListChildren = []; @@ -896,10 +958,23 @@ export default { this.$message.warning("请填写完整的不符合项信息"); this.comFlag = 0; } else { + this.listForm.breakdownList.forEach(item => { + if (item.termsConditions) { + item.termsConditions = '' + } + }); this.listForm.dataList.forEach(item => { + // item.userId = this.$store.getters.userInfo.userId if (item.workPeople === "请选择责任人") { item.workPeople = ""; } + if(item.children){ + item.children.forEach(val => { + if(val.termsConditions){ + delete val.termsConditions + } + }) + } }); this.isSubmit = true; this.listForm.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 6fa6f3872..bd2b139f2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -378,14 +378,33 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.key || item.standId, - pageType: item.standType + '_STAND' + let replaceStandInfoEO ={} + replaceStandInfoEO.standNumber = item.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, { + _this: this + }, res => { + if (res.data != null) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: res.data.id, + pageType:item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + } else { + this.$message.error(res.message) } - }); - window.open(routeUrl.href, "_blank"); + }, e => { + }) + // let routeUrl = this.$router.resolve({ + // name: "OtherStandardDetails", + // params: { + // id: item.key || item.standId, + // pageType: item.standType + '_STAND' + // } + // }); + // window.open(routeUrl.href, "_blank"); }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 69dff7d69..fdf7f409a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -375,14 +375,33 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.key || item.standId, - pageType: item.standType + '_STAND' + let replaceStandInfoEO ={} + replaceStandInfoEO.standNumber = item.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, { + _this: this + }, res => { + if (res.data != null) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: res.data.id, + pageType:item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + } else { + this.$message.error(res.message) } - }); - window.open(routeUrl.href, "_blank"); + }, e => { + }) + // let routeUrl = this.$router.resolve({ + // name: "OtherStandardDetails", + // params: { + // id: item.key || item.standId, + // pageType: item.standType + '_STAND' + // } + // }); + // window.open(routeUrl.href, "_blank"); }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 05b9d1b6a..317eab843 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -558,14 +558,19 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } + }, //流程保存事件 handleSave() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index 40748bebc..632619635 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -289,15 +289,18 @@ export default { methods: { // 点击查看 handlePreview(item) { - console.log(item) - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue index f392d5e59..17a4ccf92 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue @@ -260,14 +260,18 @@ export default { }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.standId, - pageType: 'INLAND_STAND' - } - }) - window.open(routeUrl.href, '_blank') + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //获取数据 getData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 992c110ad..c967540c8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -401,14 +401,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 9fddc149a..b96666714 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -399,14 +399,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index bba4ddd89..10d134bd6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -401,14 +401,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index 139895ed7..e07c3d73f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -318,14 +318,18 @@ export default { }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.standId, - pageType: 'INLAND_STAND' - } - }) - window.open(routeUrl.href, '_blank') + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //获取数据 getData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index a40835243..18180843a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -344,14 +344,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index f6fd8c7e5..7a6509841 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -340,14 +340,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 9ec9a635a..72db29a5f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -250,14 +250,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index aaba103e5..1f0269507 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -604,14 +604,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index a45d42d0f..586efd7db 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -359,14 +359,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index f2cee0352..99393bbe3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -399,14 +399,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 1bc56c492..5ec19a0c2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -401,14 +401,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue index 5ae5aeb15..5784955c5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue @@ -310,7 +310,7 @@ width="150" > - {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} @@ -330,7 +330,7 @@ min-width="300" > - {{ scope.row.standName }} + {{ scope.row.standName }} {{ scope.row.standName }} @@ -339,7 +339,7 @@ width="120" label="发布日期"> - {{ formatIssueDate(scope.row.issueTime) }} + {{ formatIssueDate(scope.row.issueTime) }} {{ formatIssueDate(scope.row.issueTime) }} @@ -349,7 +349,7 @@ label="实施日期"> - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} + {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} {{ scope.row.ssrq }} @@ -360,7 +360,7 @@ width="150" label="新车型实施日期"> - {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }} + {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }} {{ scope.row.xcxssrq }} @@ -369,7 +369,7 @@ width="150" label="在产车实施日期"> - {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }} + {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }} {{ scope.row.zccssrq }} @@ -383,7 +383,7 @@ - {{ + {{ textStatusMap[scope.row.textStatus] }} {{ textStatusMap[scope.row.textStatus] }} @@ -396,7 +396,7 @@ width="150" > - {{ + {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} {{ @@ -418,7 +418,7 @@ min-width="300" > - {{ + {{ scope.row.standName }} {{ @@ -434,7 +434,7 @@ width="120" label="发布日期"> -