修改首页流程

jero-web/src/views/dashboard/components/myList.vue

@@ -10,11 +10,11 @@
     <div class="myList-box-content" v-if="dataSource.length > 0">
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
-          <span class="top-text" v-if="item.flowType == 10"
+          <span class="top-text" v-if="item.flowType == 10 || item.flowType == 21"
                 :title="item.projectName+'-'+ item.flowTypeShow">
             {{item.projectName+'-'+ item.flowTypeShow}}
           </span>
-          <span class="top-text" :title="item.serialNumber+'-'+item.flowTypeShow">
+          <span v-else class="top-text" :title="item.serialNumber+'-'+item.flowTypeShow">
             {{item.serialNumber+'-'+item.flowTypeShow}}
           </span>
           <!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
@@ -31,17 +31,22 @@
       <JNoData/>
     </div>
     <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <designCompliance ref="designComplianceRef" @designComplianceList="designComplianceList"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
   import { mapGetters } from 'vuex'
   import moment from 'moment'
   import store from '@/store/'
 
   export default {
     name: 'myList',
+    components:{
+      designCompliance
+    },
     data() {
       return {
         pageSize: 4,
@@ -97,6 +102,9 @@
           path: '/projectRegulationTasks'
         })
       },
+      designComplianceList(){
+         this.queryProcess()
+      },
       prcClick(row) {
         let query = {}
         row.router = this.$route.path
@@ -126,6 +134,19 @@
             }
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '21') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '106'
+            }
+          })
+          window.open(newUrl.href, '_blank')
         } else if (row.flowType == '2') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -143,7 +164,7 @@
             TaskKey: row.taskDefinitionKey,
             isDisplay: true,
             flowType: 2,
-            Sponsor: 'designInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'designDutyName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
@@ -153,13 +174,8 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -211,7 +227,7 @@
             TaskKey: row.taskDefinitionKey,
             flowType: 4,
             isDisplay: true,
-            Sponsor: 'verifyInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'verifyDutyName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
@@ -221,15 +237,10 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
-            path: '/taskListProcess',
+        }
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
       }
-      },
     }
   }
 </script>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue

@@ -208,6 +208,19 @@
             }
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '21') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '106'
+            }
+          })
+          window.open(newUrl.href, '_blank')
         } else if (row.flowType == '2') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {

jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

@@ -203,6 +203,19 @@
             }
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '21') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '106'
+            }
+          })
+          window.open(newUrl.href, '_blank')
         }else if(row.flowType == '2'){
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {

jero-web/src/views/virtualAuthenticationList/index.vue

@@ -49,7 +49,7 @@
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
-      rowKey="id"
+      :rowKey="(record)=>JSON.stringify(record)"
       :data-source="dataSource"
       :columns="columns"
       @change="tableOnChange"
@@ -113,7 +113,8 @@
               <div class="box-title-text-add">
                 <div class="title-text-add">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('CertificationListName')">{{$t('CertificationListName')}}</span>
+                  <span class="title-text-text"
+                        :title="$t('CertificationListName')">{{$t('CertificationListName')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="name">
                   <a-input class="box-input-add"
@@ -147,14 +148,14 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-import VueDraggableResizable from 'vue-draggable-resizable'
+  import VueDraggableResizable from 'vue-draggable-resizable'
-import tableDragResize from '@/mixins/tableDragResize'
+  import tableDragResize from '@/mixins/tableDragResize'
-import { mapGetters } from 'vuex'
+  import { mapGetters } from 'vuex'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
-export default {
+  export default {
-  name:'index',
+    name: 'index',
     components: {
       VueDraggableResizable
     },
@@ -193,7 +194,7 @@ export default {
         visible: false,
         title: this.$t('newlyAdded'),
         userData: {},
-      administrators:false,
+        administrators: false,
         loading: false,
         total: 0,
         pageSize: 10,
@@ -239,7 +240,7 @@ export default {
             width: 400,
             scopedSlots: { customRender: 'operation' }
           }
-      ],
+        ]
       }
     },
     mounted() {
@@ -277,6 +278,18 @@ export default {
       handleDel() {
         if (this.selectedRowKeys.length > 0) {
           let _this = this
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let isTrue
+          for (let i = 0; i < selectedRowKeys.length; i++) {
+            selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
+            if (selectedRowKeys[i].state == 1) {
+              isTrue = false
+              break
+            } else {
+              isTrue = true
+            }
+          }
+          if (isTrue){
             this.$confirm({
               content: _this.$t('ConfirmBatchDeletion'),
               onOk() {
@@ -292,6 +305,9 @@ export default {
                 })
               }
             })
+          }else{
+             this.$message.warning(this.$t(''))
+          }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
@@ -450,7 +466,7 @@ export default {
           ...this.queryParam
         }
         this.loading = true
-      getAction(this.url.list,query).then((res) => {
+        getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
               this.pageNo = 1
@@ -464,22 +480,22 @@ export default {
             this.loading = false
           }
         })
-    },
       }
-}
+    }
+  }
 </script>
 
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.box-title-text {
+  .box-title-text {
     line-height: 1.4;
     display: flex;
     align-items: center;
     margin-bottom: 10px;
-}
+  }
 
-.title-text {
+  .title-text {
     width: 20%;
     min-width: 110px;
     color: #000F16;
@@ -492,39 +508,39 @@ export default {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-}
+  }
 
-.box-input {
+  .box-input {
     display: inline-block;
     width: 70%;
     height: 38px;
     margin-top: 2px;
-}
+  }
 
-.box-button {
+  .box-button {
     height: 38px;
     /*margin-top: 2px;*/
-}
+  }
 
-.text-operation {
+  .text-operation {
     margin-right: 8px;
-}
+  }
 
-.page {
+  .page {
     text-align: right;
     margin-top: 20px;
-}
+  }
 
-.formAdd {
+  .formAdd {
     margin-bottom: 40px;
-}
+  }
 
-.box-title-text-add {
+  .box-title-text-add {
     line-height: 1.4;
     display: flex;
-}
+  }
 
-.title-text-add {
+  .title-text-add {
     width: 114px;
     text-align: right;
     display: inline-block;
@@ -537,30 +553,30 @@ export default {
     height: 42px;
     line-height: 42px;
     margin-top: 3px;
-}
+  }
 
-.Required {
+  .Required {
     color: red;
     margin-right: 4px;
-}
+  }
 
-.title-text-text {
+  .title-text-text {
     margin-top: 9px;
-}
+  }
 
-.itemModel {
+  .itemModel {
     width: calc(100% - 130px);
     display: inline-block;
     margin-top: 2px;
-}
+  }
 
-.box-input-add {
+  .box-input-add {
     display: inline-block;
     height: 38px;
     width: 100%;
-}
+  }
 
-.drawer-bootom-button {
+  .drawer-bootom-button {
     position: absolute;
     bottom: 0;
     z-index: 100;
@@ -571,6 +587,6 @@ export default {
     left: 0;
     background: #fff;
     border-radius: 0 0 2px 2px;
-}
+  }
 </style>