参数收集待办任务跳转修改

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

@@ -670,12 +670,11 @@
       // }
     },
     mounted() {
-      console.log(this.$route.query)
+      this.GetgetLoginUserType()
+      console.log(this.currentPersonRole)
       if(this.$route.query.type == '1'){
         this.handleOkRoleSwitching()
       }
-      this.GetgetLoginUserType()
-      console.log(this.currentPersonRole)
       setTimeout(() => {
         if (this.currentPersonRole == 'dre') {
           this.handlePreservation()
@@ -710,7 +709,7 @@
       handleOkRoleSwitching() {
         if(this.$route.query.type == '1'){
           let query = {
-            userType:this.$route.query.userType,
+            userType:this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType,
             paramsManifestId: this.$route.query.id,
             projectId: this.$route.query.projectId,
             userId: this.userInfo().id
@@ -718,10 +717,10 @@
           this.confirmLoadingRoleSwitching = true
           postAction('/params/userTypeLog/edit', query).then((res) => {
             if (res.success) {
-              this.currentPersonRole = this.$route.query.userType
+              this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType
               this.visibleRoleSwitching = false
               this.confirmLoadingRoleSwitching = false
-              localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType))
+              localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType))
               this.RoleType.forEach((item,index) => {
                 if(item.value == this.currentPersonRole){
                   this.rolename = item.label

jero-web/src/views/toDoCenter/projectParameterTasks/index.vue

@@ -167,42 +167,97 @@
       },
       //待填写数量
       waitFillClick(item) {
-        let _this = this
+        let query = {
-        item.type = '1'
+          paramsManifestId: item.id,
-        item.userType = 'dre'
+          projectId: item.projectId
-        console.log(item)
+        }
-        let newUrl = _this.$router.resolve({
+        this.loading = true
-          path: '/ParameterItemCollection',
+        let userType = ''
-          query:  item
+        let valueList = []
-          // projectName:this.$route.query.projectName
+        getAction('params/collectManifest/getLoginUserType', query).then((res) => {
+          if(res.result){
+            res.result.find((item,index) => {
+              if(item.value){
+                valueList.push(item.value)
+              }
+            })
+           let flag = valueList.find((item,index) => {
+             return item == 'dre'
+           })
+            let _this = this
+            item.type = '1'
+            item.userType = _this.flag == undefined ?  valueList[0] : 'dre'
+            let newUrl = _this.$router.resolve({
+              path: '/ParameterItemCollection',
+              query:  item
+              // projectName:this.$route.query.projectName
+            })
+            window.open(newUrl.href, '_blank')
+          }
         })
-        window.open(newUrl.href, '_blank')
       },
       //待分配填写人数量
       waitSdtClick(item) {
-        let _this = this
+        let query = {
-        item.type = '1'
+          paramsManifestId: item.id,
-        item.userType = 'sdt'
+          projectId: item.projectId
-        console.log(item)
+        }
-        let newUrl = _this.$router.resolve({
+        this.loading = true
-          path: '/ParameterItemCollection',
+        let userType = ''
-          query:  item
+        let valueList = []
-          // projectName:this.$route.query.projectName
+        getAction('params/collectManifest/getLoginUserType', query).then((res) => {
+          if(res.result){
+            res.result.find((item,index) => {
+              if(item.value){
+                valueList.push(item.value)
+              }
+            })
+            let flag = valueList.find((item,index) => {
+              return item == 'sdt'
+            })
+            let _this = this
+            item.type = '1'
+            item.userType = _this.flag == undefined ?  valueList[0] : 'sdt'
+            let newUrl = _this.$router.resolve({
+              path: '/ParameterItemCollection',
+              query:  item
+              // projectName:this.$route.query.projectName
+            })
+            window.open(newUrl.href, '_blank')
+          }
         })
-        window.open(newUrl.href, '_blank')
+
       },
       //参数待发起数量
       waitCollectClick(item) {
-        let _this = this
+        let query = {
-        item.type = '1'
+          paramsManifestId: item.id,
-        item.userType = 'homo'
+          projectId: item.projectId
-        console.log(item)
+        }
-        let newUrl = _this.$router.resolve({
+        this.loading = true
-          path: '/ParameterItemCollection',
+        let userType = ''
-          query:  item
+        let valueList = []
-          // projectName:this.$route.query.projectName
+        getAction('params/collectManifest/getLoginUserType', query).then((res) => {
+          if(res.result){
+            res.result.find((item,index) => {
+              if(item.value){
+                valueList.push(item.value)
+              }
+            })
+            let flag = valueList.find((item,index) => {
+              return item == 'homo'
+            })
+            let _this = this
+            item.type = '1'
+            item.userType = _this.flag == undefined ?  valueList[0] : 'homo'
+            let newUrl = _this.$router.resolve({
+              path: '/ParameterItemCollection',
+              query:  item
+              // projectName:this.$route.query.projectName
+            })
+            window.open(newUrl.href, '_blank')
+          }
         })
-        window.open(newUrl.href, '_blank')
       },
       SizeChange(page, pageSize) {
         this.pageNo = 1