From 5d0ab605b72314a07cfca975ce06e4b597534119 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Tue, 21 May 2024 15:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7/=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=20?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E6=96=B0=E9=A1=B5=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzjd/step2.vue         | 19 ++++++++++++++++---
 .../pages/creatProcess/bzjd/step3.vue         | 19 ++++++++++++++++---
 .../pages/creatProcess/bzjd/step4.vue         | 19 ++++++++++++++++---
 .../pages/creatProcess/bzjd/step5.vue         | 19 ++++++++++++++++---
 .../pages/creatProcess/bzjd/step6-1.vue       | 19 ++++++++++++++++---
 .../pages/creatProcess/bzjd/step6.vue         | 19 ++++++++++++++++---
 6 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 80ee5b5de..68da53db1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -25,10 +25,10 @@
                         <el-row :gutter="24">
                             <el-col :span="24">
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
                                 </el-form-item>
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
                                 </el-form-item>
                                 <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
@@ -374,7 +374,18 @@
                 })
             },
           // 点击跳转标准详情
-          handlePreview (item) {
+          handlePreview (item,standId) {
+            if (standId) {
+              let routeUrl = this.$router.resolve({
+                name: 'OtherStandardDetails',
+                params: {
+                  id: standId,
+                  pageType: this.form.standInData + '_STAND'
+                }
+              })
+              window.open(routeUrl.href, '_blank')
+              return
+            }
             let replaceStandInfoEO ={}
             replaceStandInfoEO.standNumber = item
             this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -544,6 +555,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.standId = data.standId || data.form.standId
+                        this.form.standInData = data.standInData || data.form.standInData
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
                         this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index f4731d27b..ebf9c2de0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -25,10 +25,10 @@
                         <el-row :gutter="24">
                             <el-col :span="24">
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
                                 </el-form-item>
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
                                 </el-form-item>
                                 <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
@@ -769,7 +769,18 @@
                 })
             },
           // 点击跳转标准详情
-          handlePreview (item) {
+          handlePreview (item, standId) {
+            if (standId) {
+              let routeUrl = this.$router.resolve({
+                name: 'OtherStandardDetails',
+                params: {
+                  id: standId,
+                  pageType: this.form.standInData + '_STAND'
+                }
+              })
+              window.open(routeUrl.href, '_blank')
+              return
+            }
             let replaceStandInfoEO ={}
             replaceStandInfoEO.standNumber = item
             this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -988,6 +999,8 @@
                         this.AOLIGEI = data.AOLIGEI
                         this.commentText3 = data.commentText3 || ''
                         this.todoId = res.id
+                        this.form.standId = data.standId || data.form.standId
+                        this.form.standInData = data.standInData || data.form.standInData
                         this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
                         this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 756bade17..d58adf941 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -25,10 +25,10 @@
                         <el-row :gutter="24">
                             <el-col :span="24">
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
                                 </el-form-item>
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
                                 </el-form-item>
                                 <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
@@ -424,7 +424,18 @@
                 })
             },
           // 点击跳转标准详情
-          handlePreview (item) {
+          handlePreview (item,standId) {
+            if (standId) {
+              let routeUrl = this.$router.resolve({
+                name: 'OtherStandardDetails',
+                params: {
+                  id: standId,
+                  pageType: this.form.standInData + '_STAND'
+                }
+              })
+              window.open(routeUrl.href, '_blank')
+              return
+            }
             let replaceStandInfoEO ={}
             replaceStandInfoEO.standNumber = item
             this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -528,6 +539,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.standId = data.standId || data.form.standId
+                        this.form.standInData = data.standInData || data.form.standInData
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
                         this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 67c93d86a..96f38e376 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -25,10 +25,10 @@
                         <el-row :gutter="24">
                             <el-col :span="24">
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
                                 </el-form-item>
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
                                 </el-form-item>
                                 <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
@@ -421,7 +421,18 @@
                 })
             },
           // 点击跳转标准详情
-          handlePreview (item) {
+          handlePreview (item,standId) {
+            if (standId) {
+              let routeUrl = this.$router.resolve({
+                name: 'OtherStandardDetails',
+                params: {
+                  id: standId,
+                  pageType: this.form.standInData + '_STAND'
+                }
+              })
+              window.open(routeUrl.href, '_blank')
+              return
+            }
             let replaceStandInfoEO ={}
             replaceStandInfoEO.standNumber = item
             this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -527,6 +538,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.standId = data.standId || data.form.standId
+                        this.form.standInData = data.standInData || data.form.standInData
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
index e973fd970..6d25e43ef 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
@@ -25,10 +25,10 @@
                         <el-row :gutter="24">
                             <el-col :span="24">
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
                                 </el-form-item>
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
                                 </el-form-item>
                                 <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
@@ -424,7 +424,18 @@
                 })
             },
           // 点击跳转标准详情
-          handlePreview (item) {
+          handlePreview (item,standId) {
+            if (standId) {
+              let routeUrl = this.$router.resolve({
+                name: 'OtherStandardDetails',
+                params: {
+                  id: standId,
+                  pageType: this.form.standInData + '_STAND'
+                }
+              })
+              window.open(routeUrl.href, '_blank')
+              return
+            }
             let replaceStandInfoEO ={}
             replaceStandInfoEO.standNumber = item
             this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -528,6 +539,8 @@
               },{},res=>{
                 let data = JSON.parse(res.mesg)
                 console.log(data)
+                this.form.standId = data.standId || data.form.standId
+                this.form.standInData = data.standInData || data.form.standInData
                 this.form.endTime = data.endTime || data.form.endTime
                 this.form.itemsNum = data.itemsNum || data.form.itemsNum
                 this.form.itemsName = data.itemsName || data.form.itemsName
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 7ff0f4953..89762ab89 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -25,10 +25,10 @@
                         <el-row :gutter="24">
                             <el-col :span="24">
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
                                 </el-form-item>
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                  <span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
+                                  <span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
                                 </el-form-item>
                                 <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
@@ -423,7 +423,18 @@
                 })
             },
           // 点击跳转标准详情
-          handlePreview (item) {
+          handlePreview (item,standId) {
+            if (standId) {
+              let routeUrl = this.$router.resolve({
+                name: 'OtherStandardDetails',
+                params: {
+                  id: standId,
+                  pageType: this.form.standInData + '_STAND'
+                }
+              })
+              window.open(routeUrl.href, '_blank')
+              return
+            }
             let replaceStandInfoEO ={}
             replaceStandInfoEO.standNumber = item
             this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -527,6 +538,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.standId = data.standId || data.form.standId
+                        this.form.standInData = data.standInData || data.form.standInData
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName