Merge remote-tracking branch 'origin/master'

jero-web/src/components/tableCollection/index.vue

@@ -140,6 +140,10 @@
       formInline: {
         type: Object,
         default: true
+      },
+      currentPersonRole: {
+        type: String,
+        default: true
       }
     },
     components: {
@@ -203,7 +207,6 @@
         loading: false,
         orderBy: '1',
         orderByField: '',
-        LoginUserType: '', // 登陆人角色状态
         homo: 0, // 认证工程师
         sdt: 0, // 工程接口人
         dre: 0, // 填写人
@@ -339,9 +342,8 @@
         }
         getAction(this.url.getLoginUserType, params).then((res) => {
           if (res.success) {
-            this.LoginUserType = res.result
             this.getTableList()
-            this.$emit('LoginUserType', this.LoginUserType)
+            this.$emit('LoginUserType', res.result)
           }
         })
       },
@@ -414,10 +416,11 @@
       getTableListReset() {
         let params = {
           paramsManifestId: this.paramsManifest.id,
-          userTypes: this.LoginUserType
+          userTypes: this.currentPersonRole
         }
         this.loading = true
         this.$emit('listReset', '')
+        // todo
         getAction(this.url.tableList, params).then((res) => {
           if (res.success) {
             this.dataSource = res.result
@@ -430,6 +433,7 @@
         })
       },
       getTableList() {
+        // todo
         let paramsManifestid
         let url
         if (this.$route.query.it === undefined) {
@@ -443,7 +447,7 @@
           url = 'params/collectManifestHistory/list'
         }
         let params = {
-          userTypes: this.LoginUserType,
+          userTypes: this.currentPersonRole,
           paramsManifestId: paramsManifestid,
           ...this.formInline
         }
@@ -480,6 +484,9 @@
       paramsManifest(newVal, oldVal) {
         this.getData()
         this.getLoginUserType()
+      },
+      currentPersonRole(newVal,oldVal){
+        console.log(newVal,oldVal)
       }
     }
   }

jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue

@@ -758,6 +758,7 @@
       //导出
       handleExportManage(){
         if(JSON.stringify(this.parameter)=='{}'){
+          console.log('pppp')
           this.parameter.info_id=this.infoId
           this.parameter.menu_id=this.menuId
         }

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

@@ -72,10 +72,10 @@
 <!--      // 游客 guest-->
       <a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
         <template slot="title" id="popconfirm">
-          <!--      退回-->
+          <!--      添加-->
-          <div @click="returnDataJurisdiction" class="operator-text-title" v-if='currentPersonRole == "sdt" || currentPersonRole == "homo" || currentPersonRole == "dre"'>
+          <div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'>
-            <a-icon type="delete"/>
+            <a-icon type="plus"/>
-            {{$t('sendBack')}}
+            {{$t('addTo')}}
           </div>
           <!--     下发收集 -->
           <div @click="distributionAndCollectionJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -92,45 +92,45 @@
             <a-icon type="setting"/>
             {{$t('SynchronousReportLibrary')}}
           </div>
-          <!--      强制撤回-->
-          <div @click="compulsoryWithdrawaljurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo" || currentPersonRole == "sdt" ||currentPersonRole == "dre"'>
-            <a-icon type="delete"/>
-            {{$t('CompulsoryWithdrawal')}}
-          </div>
-          <!--      分配填写人-->
-          <div @click="assignedBy" class="operator-text-title" v-if='currentPersonRole == "sdt" '>
-            <a-icon type="copy"/>
-            {{$t('Assignedby')}}
-          </div>
-          <!--      引用参数-->
-          <div @click="referenceparameter" class="operator-text-title" v-if='currentPersonRole == "dre" '>
-            <a-icon type="plus"/>
-            {{$t('referenceparameter')}}
-          </div>
           <!--      截止时间-->
           <div @click="TaskCutOffTimeLibrary" class="operator-text-title"  v-if='currentPersonRole == "homo" '>
             <a-icon type="bulb"/>
             {{$t('TaskCutOffTime')}}
           </div>
+          <!--      批量删除-->
+          <div @click="handleDelJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+            <a-icon type="delete"/>
+            {{$t('BatchDelete')}}
+          </div>
         </template>
         <div class="operator-text" style="position: relative">
           <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
         </div>
       </a-popconfirm>
-      <!--      添加-->
+      <!--      分配填写人-->
-      <div @click="handleAdd" class="operator-text" v-if='currentPersonRole == "homo"'>
+      <div @click="assignedBy" class="operator-text" v-if='currentPersonRole == "sdt" '>
+        <a-icon type="copy"/>
+        {{$t('Assignedby')}}
+      </div>
+      <!--      引用参数-->
+      <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" '>
         <a-icon type="plus"/>
-        {{$t('addTo')}}
+        {{$t('referenceparameter')}}
       </div>
       <!--      提交-->
       <div @click="handleSubmit" class="operator-text" v-if='currentPersonRole == "dre"'>
         <a-icon type="check-circle"/>
         {{$t('submit')}}
       </div>
-      <!--      批量删除-->
+      <!--      退回-->
-      <div @click="handleDelJurisdiction" class="operator-text" v-if='currentPersonRole == "homo"'>
+      <div @click="returnDataJurisdiction" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "homo" || currentPersonRole == "dre"'>
         <a-icon type="delete"/>
-        {{$t('BatchDelete')}}
+        {{$t('sendBack')}}
+      </div>
+      <!--      强制撤回-->
+      <div @click="compulsoryWithdrawaljurisdiction" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "sdt" ||currentPersonRole == "dre"'>
+        <a-icon type="delete"/>
+        {{$t('CompulsoryWithdrawal')}}
       </div>
       <!--       角色切换   -->
       <div class="operator-text"
@@ -142,7 +142,7 @@
     <div style="width: 100%">
       <!-- 表格-10控件-->
       <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                        :formInline='formInline' @LoginUserType='LoginUserType' @value='value' @listReset='listReset'/>
+                        :formInline='formInline' :currentPersonRole='currentPersonRole' @value='value' @listReset='listReset' @LoginUserType='LoginUserType'/>
     </div>
     <!--  添加--->
     <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
@@ -207,6 +207,7 @@
       <synchronous-submission-library v-if='areaVisibsynchronous' :paramsManifest='paramsManifest' @GetgetTableList='GetgetTableList'
                            :selectedRowKeysArray='selectedRowKeysArray' @areaVisible='areaVisibsynchronous = false'/>
     </a-modal>
+<!--    切换角色-->
     <a-modal
       :title="$t('roleSwitching')"
       :width="500"
@@ -381,9 +382,6 @@ export default {
         ]
       },
       RoleType: [ // 控件类型
-        {value:'homo', label: '认证工程师' },
-        {value:'sdt', label: '工程接口人' },
-        {value:'dre', label: '填写人' },
       ],
     }
   },
@@ -395,13 +393,15 @@ export default {
     }
   },
   mounted() {
+    this.GetgetLoginUserType()
   },
   methods:{
     handleCancelRoleSwitching() {
       this.visibleRoleSwitching = false
     },
     handleOkRoleSwitching() {
-    //
+      this.visibleRoleSwitching = false
+      this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
     },
     roleSwitchingClick() {
       this.visibleRoleSwitching = true
@@ -722,13 +722,11 @@ export default {
       return flag
     },
     LoginUserType(val) {
+      this.currentPersonRole = val.length > 1 ? val[0].value : ''
       this.RoleType = val
-      val.forEach((item) => {
+      this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole
-        console.log(item,'pppp')
+      this.formInlineRoleSwitching = {...this.formInlineRoleSwitching}
-        // if(item) {
+
-        //
-        // }
-      })
     },
     // 表格所选中得行内容
     rowValue(val) {