Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213

jero-web/src/views/projectManagement/components/nonConformance.vue

@@ -61,11 +61,16 @@
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="standard" slot-scope="text,result">
+        <span slot="ProcessType" slot-scope="text,result">
            <a @click="standardClick(result)" class="textName" :title="text">
              {{text}}
            </a>
         </span>
+        <span slot="standard" slot-scope="text,result">
+           <a @click="standardhdClick(result)" class="textName" :title="text">
+             {{text}}
+           </a>
+        </span>
       </a-table>
     </div>
     <div class="page" v-if="dataSource.length > 0">
@@ -104,6 +109,7 @@
             title: this.$t('standard'),
             align: 'left',
             dataIndex: 'serialNumber',
+            scopedSlots: { customRender: 'standard' },
             ellipsis: true,
             sorter:true,
             width: 180
@@ -119,7 +125,7 @@
             title: this.$t('ProcessType'),
             align: 'left',
             dataIndex: 'flowType',
-            scopedSlots: { customRender: 'standard' },
+            scopedSlots: { customRender: 'ProcessType' },
             ellipsis: true,
             sorter:true,
             width: 180
@@ -255,6 +261,15 @@
           }
         })
       },
+      standardhdClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.standId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
       standardClick(val) {
         let num = val.prcType
         let query = {