对接Pre-Homo流程

jero-web/src/views/phoneView/handlingPage.vue

@@ -3,38 +3,55 @@
     <div class="header-search">
       <van-icon @click="iconClick" class="icon" name="arrow-left"/>
       <span class="header-search-text">
-           EDS1.2 EVO-G1.1-中国-03 Pre-Homo流程
+           {{$route.query.projectName + ' ' + $t('preHomoFlow')}}
         </span>
     </div>
 
     <div class="content">
-      <div class="content-text" @click="handlingClick" v-for="item in 8">
+      <van-list
-        <div class="content-text-left">
+        v-model="loading"
-          <div class="content-text-top">
+        :finished="finished"
+        :finished-text="$t('noMore')"
+        :loading-text="$t('loading')"
+        @load="onLoad"
+      >
+        <div class="content-text" @click="handlingClick" v-for="(item,index) in list">
+          <div class="content-text-left">
+            <div class="content-text-top">
             <span class="content-text-top-left">
-              测试类别
+              {{item.category}}
             </span>
-            <span class="content-text-top-right">
+              <span class="content-text-top-right">
-               测试检验项目
+               {{item.inspectionItem}}
             </span>
+            </div>
+            <div class="content-text-button">
+              <span>{{item.serialNumber}}</span>
+            </div>
           </div>
-          <div class="content-text-button">
+          <div class="content-text-right">
-            <span>ISO 898-1-2013</span>
+            <van-icon name="arrow"/>
           </div>
         </div>
-        <div class="content-text-right">
+      </van-list>
-          <van-icon name="arrow"/>
-        </div>
-      </div>
     </div>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+
   export default {
     name: 'phoneHandlingPage',
     data() {
-      return {}
+      return {
+        page: '/phone/toDoCenter/queryPreHomoPage',
+        list: [],
+        pageNo: 0,
+        pageSize: 10,
+        loading: false,
+        finished: false
+      }
     },
     mounted() {
       document.title = 'NIO GRP'
@@ -43,10 +60,41 @@
       iconClick() {
         this.$router.go(-1)
       },
-      handlingClick() {
+      handlingClick(item) {
         this.$router.push({
           path: '/phonePreHomoMangement'
         })
+      },
+      onLoad() {
+        if (this.finished) {
+          this.list = []
+          this.finished = false
+        } else {
+          this.pageNo++
+          this.getPage()
+        }
+      },
+      getPage() {
+        let params = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          taskDefinitionKey: this.$route.query.taskDefinitionKey,
+          projectLibraryId: this.$route.query.projectLibraryId
+        }
+        getAction(this.page, params).then(res => {
+          if (res.success) {
+            if (res.result.records.length > 0 && this.pageNo > 1) {
+              this.list = this.list.concat(res.result.records)
+            } else if (res.result.records.length > 0 && this.pageNo == 1) {
+              this.list = res.result.records
+            } else if (res.result.records.length == 0) {
+              this.finished = true
+            }
+            this.loading = false
+          } else {
+            this.subscribeList = []
+          }
+        })
       }
     }
   }
@@ -134,4 +182,12 @@
   .content-text-top-right {
     margin-left: 0.3rem;
   }
+
+  .content-text-top-left {
+    word-break: break-all;
+  }
+
+  .content-text-top-right {
+    word-break: break-all;
+  }
 </style>

jero-web/src/views/phoneView/toDoCenter.vue

@@ -256,7 +256,7 @@
         sentProcessFinished: false,
         sentProcessPageNo: 1,
         sentProcessPageSize: 10,
-        phoneQueryValue:'',
+        phoneQueryValue: ''
       }
     },
     mounted() {
@@ -478,7 +478,12 @@
         } else if (row.flowType == '21') {
           this.$router.push({
             path: '/phoneHandlingPage',
-            query: query
+            query: {
+              projectLibraryId: row.projectLibraryId,
+              taskDefinitionKey: row.taskDefinitionKey,
+              isDisplay: isTrue,
+              projectName:row.projectName
+            }
           })
         } else {
           if (isTrue) {
@@ -531,7 +536,7 @@
           pageNo: this.toDoProcessPageNo,
           pageSize: this.toDoProcessPageSize,
           ...form,
-          phoneQueryValue:this.phoneQueryValue
+          phoneQueryValue: this.phoneQueryValue
         }
         getAction('/phone/toDoCenter/queryTodoTaskPage', query).then((res) => {
           if (res.success) {
@@ -557,7 +562,7 @@
           pageNo: this.processDonePageNo,
           pageSize: this.processDonePageSize,
           ...form,
-          phoneQueryValue:this.phoneQueryValue
+          phoneQueryValue: this.phoneQueryValue
         }
         getAction('/todoCenter/projectProcess/doneProcess', query).then((res) => {
           if (res.success) {
@@ -583,7 +588,7 @@
           pageNo: this.sentProcessPageNo,
           pageSize: this.sentProcessPageSize,
           ...form,
-          phoneQueryValue:this.phoneQueryValue
+          phoneQueryValue: this.phoneQueryValue
         }
         getAction('/todoCenter/projectProcess/issuedProcess', query).then((res) => {
           if (res.success) {