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

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',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1425,4 +1425,7 @@ module.exports = {
   filledBy:'待分配填写人',
   parameterToBeInitiated:'参数待发起',
   listTaskConfirmation:'清单任务确认',
+  completednum: '待填写数量',
+  filledBynum:'待分配填写人数量',
+  parameterToBeInitiatednum:'参数待发起数量',
 }

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

@@ -670,6 +670,10 @@
       // }
     },
     mounted() {
+      console.log(this.$route.query)
+      if(this.$route.query.type == '1'){
+        this.handleOkRoleSwitching()
+      }
       this.GetgetLoginUserType()
       console.log(this.currentPersonRole)
       setTimeout(() => {
@@ -704,35 +708,62 @@
         })
       },
       handleOkRoleSwitching() {
-        this.$refs.ruleFormRoleSwitching.validate(valid => {
+        if(this.$route.query.type == '1'){
-          if (valid) {
+          let query = {
-            let query = {
+            userType:this.$route.query.userType,
-              userType: this.formInlineRoleSwitching.roleSwitchingCode,
+            paramsManifestId: this.$route.query.id,
-              paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
-              projectId: this.$route.query.projectId,
+            userId: this.userInfo().id
-              userId: this.userInfo().id
-            }
-            this.confirmLoadingRoleSwitching = true
-            postAction('/params/userTypeLog/edit', query).then((res) => {
-              if (res.success) {
-                this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
-                this.$message.success(this.$t('OperationSuccessful'))
-                this.visibleRoleSwitching = false
-                this.confirmLoadingRoleSwitching = false
-                localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
-                this.RoleType.forEach((item,index) => {
-                  if(item.value == this.currentPersonRole){
-                    this.rolename = item.label
-                  }
-                })
-                this.selectedRowKeysValue = []
-              } else {
-                this.confirmLoadingRoleSwitching = false
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            })
           }
-        })
+          this.confirmLoadingRoleSwitching = true
+          postAction('/params/userTypeLog/edit', query).then((res) => {
+            if (res.success) {
+              this.currentPersonRole = this.$route.query.userType
+              this.visibleRoleSwitching = false
+              this.confirmLoadingRoleSwitching = false
+              localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType))
+              this.RoleType.forEach((item,index) => {
+                if(item.value == this.currentPersonRole){
+                  this.rolename = item.label
+                }
+              })
+              this.selectedRowKeysValue = []
+            } else {
+              this.confirmLoadingRoleSwitching = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        }else {
+          this.$refs.ruleFormRoleSwitching.validate(valid => {
+            if (valid) {
+              let query = {
+                userType: this.formInlineRoleSwitching.roleSwitchingCode,
+                paramsManifestId: this.$route.query.id,
+                projectId: this.$route.query.projectId,
+                userId: this.userInfo().id
+              }
+              this.confirmLoadingRoleSwitching = true
+              postAction('/params/userTypeLog/edit', query).then((res) => {
+                if (res.success) {
+                  this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visibleRoleSwitching = false
+                  this.confirmLoadingRoleSwitching = false
+                  localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
+                  this.RoleType.forEach((item,index) => {
+                    if(item.value == this.currentPersonRole){
+                      this.rolename = item.label
+                    }
+                  })
+                  this.selectedRowKeysValue = []
+                } else {
+                  this.confirmLoadingRoleSwitching = false
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        }
       },
       roleSwitchingClick() {
         this.visibleRoleSwitching = true

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')"
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
-                       v-model="queryParam.title"></j-input>
+                       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')"
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
-                       v-model="queryParam.ListTitle"></j-input>
+                       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,29 @@
         :columns="columns"
       >
         <!--         -->
-        <span slot="operation" slot-scope="text,record">
+
-          <a class="text-operation"
+        <span slot="projectVersion" slot-scope="text,record">
-             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+          <span class="text-operation">{{text ? text:'--'}}</span>
+        </span>
+        <span slot="waitFillNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitFillClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+        <span slot="waitSdtNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitSdtClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+        <span slot="waitCollectNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitCollectClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
         </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 +102,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',
+            dataIndex: 'projectVersion',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('completed'),
-            align: 'center',
-            dataIndex: 'completed',
             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 +165,44 @@
         this.pageNo = page
         this.getList()
       },
-      ProcessingClick() {
+      //待填写数量
-
+      waitFillClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'dre'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //待分配填写人数量
+      waitSdtClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'sdt'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //参数待发起数量
+      waitCollectClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'homo'
+        console.log(item)
+        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 +222,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 +301,8 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 </style>