From 396b58f892521977a7b83bf32314dcfd440d9b99 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 17 Oct 2022 10:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=82=E6=95=B0=E4=BB=BB=E5=8A=A1=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=90=8E=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   3 +
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../projectParameterTasks/index.vue           | 103 +++++++++++++-----
 3 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4de6a34dd..327c809ed 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1324,4 +1324,7 @@ module.exports = {
   filledBy:'Filled by',
   parameterToBeInitiated:'Parameter to be initiated',
   listTaskConfirmation:'List task confirmation',
+  completednum: 'Quantity to be filled',
+  filledBynum:'Filled by',
+  parameterToBeInitiatednum:'Parameter to be initiated',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c2a087f24..8ee9717a9 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1425,4 +1425,7 @@ module.exports = {
   filledBy:'待分配填写人',
   parameterToBeInitiated:'参数待发起',
   listTaskConfirmation:'清单任务确认',
+  completednum: '待填写数量',
+  filledBynum:'待分配填写人数量',
+  parameterToBeInitiatednum:'参数待发起数量',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
index 9c75b9f51..ab810c84a 100644
--- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
@@ -8,8 +8,8 @@
               <div class="title-text" :title="$t('RelatedItems')">
                 <span>{{$t('RelatedItems')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
-                       v-model="queryParam.title"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
+                       v-model.trim="queryParam.projectName"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -17,8 +17,8 @@
               <div class="title-text" :title="$t('ListTitle')">
                 <span>{{$t('ListTitle')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
-                       v-model="queryParam.ListTitle"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
+                       v-model.trim="queryParam.title"></a-input>
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -42,14 +42,26 @@
         :columns="columns"
       >
         <!--         -->
-        <span slot="operation" slot-scope="text,record">
+
+        <span slot="projectVersion" slot-scope="text,record">
+          <span class="text-operation">{{text ? text:'--'}}</span>
+        </span>
+        <span slot="waitFillNumoperation" slot-scope="text,record">
           <a class="text-operation"
-             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+             @click="waitFillClick(record)">{{text ? text:'--'}}</a>
+        </span>
+        <span slot="waitSdtNumoperation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="waitSdtClick(record)">{{text ? text:'--'}}</a>
+        </span>
+        <span slot="waitCollectNumoperation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="waitCollectClick(record)">{{text ? text:'--'}}</a>
         </span>
       </a-table>
-      <div class="page" v-if="dataSource && dataSource.length > 0">
+      <div class="page" v-if="dataSource.length > 0">
         <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          :show-total="total => $t('total')+` ${total} ` +$t('strip')"
           show-quick-jumper
           show-size-changer
           :page-size.sync="pageSize"
@@ -87,51 +99,55 @@
           {
             title: this.$t('RelatedItems'),
             align: 'center',
-            dataIndex: 'RelatedItems',
+            dataIndex: 'projectName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('ListTitle'),
             align: 'center',
-            dataIndex: 'ListTitle',
+            dataIndex: 'title',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('relatedVersion'),
             align: 'center',
-            dataIndex: 'relatedVersion',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('completed'),
-            align: 'center',
-            dataIndex: 'completed',
+            dataIndex: 'projectVersion',
             ellipsis: true,
             width: 170,
-            scopedSlots: { customRender: 'operation' }
+            scopedSlots: { customRender: 'projectVersion' }
           },
           {
-            title: this.$t('filledBy'),
+            title: this.$t('completednum'),
             align: 'center',
-            dataIndex: 'filledBy',
+            dataIndex: 'waitFillNum',
             ellipsis: true,
             width: 170,
-            scopedSlots: { customRender: 'operation' }
+            scopedSlots: { customRender: 'waitFillNumoperation' }
           },
           {
-            title: this.$t('parameterToBeInitiated'),
+            title: this.$t('filledBynum'),
             align: 'center',
-            dataIndex: 'parameterToBeInitiated',
+            dataIndex: 'waitSdtNum',
             ellipsis: true,
             width: 170,
-            scopedSlots: { customRender: 'operation' }
+            scopedSlots: { customRender: 'waitSdtNumoperation' }
+          },
+          {
+            title: this.$t('parameterToBeInitiatednum'),
+            align: 'center',
+            dataIndex: 'waitCollectNum',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'waitCollectNumoperation' }
           }
         ]
       }
     },
+    mounted() {
+      this.getList()
+    },
     methods: {
       searchQuery() {
         this.pageNo = 1
@@ -146,8 +162,35 @@
         this.pageNo = page
         this.getList()
       },
-      ProcessingClick() {
-
+      //待填写数量
+      waitFillClick(item) {
+        let _this = this
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //待分配填写人数量
+      waitSdtClick(item) {
+        let _this = this
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //参数待发起数量
+      waitCollectClick(item) {
+        let _this = this
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
       },
       SizeChange(page, pageSize) {
         this.pageNo = 1
@@ -167,7 +210,7 @@
           ...queryParam
         }
         this.loading = true
-        getAction(this.url.list, query).then((res) => {
+        getAction('todoCenter/params/manifest/page', query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
               this.pageNo = 1
@@ -246,4 +289,8 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 </style>
\ No newline at end of file