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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml

@@ -28,7 +28,7 @@
     <select id="getInfoList" resultMap="NcrTrackVOResultMap">
         SELECT
         pni.project_name,plb.target_market,plb.project_version,pyni.year_name,
-        pli.serial_number,pli.title,pli.duty_territory,pli.create_time,pli.project_library_id,
+        pli.serial_number,pli.title,pli.duty_territory,pli.create_time,pli.project_library_id,pli.stand_id,
         pti.design_flow_task_status,pti.prehomo_flow_task_status,pti.verify_flow_task_status,pti.design_p_id,pti.prehomo_p_id,pti.verify_p_id,pti.id,pti.project_laws_inventory_id,
         pli.design_initiator_id,pli.design_duty_id,pli.prehomo_initiator_id,pli.prehomo_duty_id,pli.verify_initiator_id,pli.verify_duty_id
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java

@@ -187,6 +187,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             //设计符合性确认
             if(StringUtils.isNotBlank(designPId) && StringUtils.isNotBlank(designFlowTaskStatusName)){
                 NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(),
+                        trackVO.getStandId(),
                         trackVO.getTitle(),
                         trackVO.getDesignPId(),
                         trackVO.getDutyTerritory(),
@@ -206,6 +207,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             //PreHomo确认
             if(StringUtils.isNotBlank(prehomoPId) && StringUtils.isNotBlank(prehomoFlowTaskStatusName)){
                 NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(),
+                        trackVO.getStandId(),
                         trackVO.getTitle(),
                         trackVO.getPrehomoPId(),
                         trackVO.getDutyTerritory(),
@@ -225,6 +227,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             //验证符合性确认
             if(StringUtils.isNotBlank(verifyPId) && StringUtils.isNotBlank(verifyFlowTaskStatusName)){
                 NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(),
+                        trackVO.getStandId(),
                         trackVO.getTitle(),
                         trackVO.getVerifyPId(),
                         trackVO.getDutyTerritory(),
@@ -389,6 +392,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
     }
 
     private NcrTrackVO entityInfo(String serialNumber,
+                                  String standId,
                                   String title,
                                   String flowType,
                                   String dutyTerritory,
@@ -430,6 +434,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         ncrTrackVO.setUuid(uuid);
         ncrTrackVO.setCreateTime(createTime);
         ncrTrackVO.setSerialNumber(serialNumber);//编号
+        ncrTrackVO.setStandId(standId);//id
         ncrTrackVO.setTitle(title);//标题
         if(StringUtils.isNotBlank(flowType)){
             ncrTrackVO.setFlowType(name);//流程类型

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java

@@ -41,6 +41,9 @@ public class NcrTrackVO implements Serializable {
     //中英文切换
     private String cut;
 
+    //文档库ID
+    private String standId;
+
     //编号
     @Excel(name = "编号", width = 20)
     private String serialNumber;

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 = {