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

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

@@ -347,22 +347,22 @@
               :title="text">{{text}}</a>
         </span>
       </a-table>
-<!--      <div class="page" v-if="dataSource.length > 0">-->
-<!--        <a-pagination-->
-<!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
-<!--          show-quick-jumper-->
-<!--          show-size-changer-->
-<!--          :page-size.sync="pageSize"-->
-<!--          :total="total"-->
-<!--          :pageSizeOptions="['50','100','200','300']"-->
-<!--          :current="pageNo"-->
-<!--          @change="onChangeSize"-->
-<!--          @showSizeChange="SizeChange"-->
-<!--        />-->
-<!--      </div>-->
-            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
-              {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
-            </div>
+      <!--      <div class="page" v-if="dataSource.length > 0">-->
+      <!--        <a-pagination-->
+      <!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+      <!--          show-quick-jumper-->
+      <!--          show-size-changer-->
+      <!--          :page-size.sync="pageSize"-->
+      <!--          :total="total"-->
+      <!--          :pageSizeOptions="['50','100','200','300']"-->
+      <!--          :current="pageNo"-->
+      <!--          @change="onChangeSize"-->
+      <!--          @showSizeChange="SizeChange"-->
+      <!--        />-->
+      <!--      </div>-->
+      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
+      </div>
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -1127,12 +1127,6 @@
             text: this.$t('areaOfResponsibility'),
             dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
-          {
-            type: 'Personnel',
-            value: 'regulationOwnerId',
-            valueName: 'regulationOwnerIdName',
-            text: this.$t('regulatoryEngineer')
-          },
           {
             type: 'Personnel',
             value: 'engineeringInterfacePerson',
@@ -1318,6 +1312,7 @@
     mounted() {
       this.JLoading = true
       this.getHeader()
+      this.queryLawEngineerByProjectId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -1366,7 +1361,32 @@
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
       },
+      queryLawEngineerByProjectId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectRelatedPersonnel/queryLawEngineerByProjectId', query).then((res) => {
+          if (res.success) {
+            let regulatoryEngineer = {
+              value: 'regulationOwnerId',
+              text: this.$t('regulatoryEngineer'),
+              options:[],
+            }
+            if (res.result && res.result.length > 0){
+              res.result.forEach(val=>{
+                regulatoryEngineer.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(regulatoryEngineer)
+          } else {
 
+          }
+        })
+      },
       //流程状态点击事件
       designFlowStatusClick(row, name) {
         let query = {}
@@ -1474,7 +1494,11 @@
         getAction(this.url.AndUserId, query).then((res) => {
           if (res.success) {
             // this.isDisplay = true
-            this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
+            if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){
+              this.formInlineRoleSwitching.roleSwitchingCode = '1'
+            }else{
+              this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
+            }
             this.AndUserId = res.result.id
             if (this.formInlineRoleSwitching.roleSwitchingCode) {
               if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
@@ -2081,7 +2105,7 @@
           projectLibraryId: this.$route.query.id,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          roleCode: roleCode,
+          roleCode: roleCode
           // pageNo: this.pageNo,
           // pageSize: this.pageSize
         }
@@ -3029,15 +3053,17 @@
   }
 
   ::v-deep .page .ant-select-selection__rendered {
-    height: 32px!important;
-    line-height: 32px!important;
+    height: 32px !important;
+    line-height: 32px !important;
   }
-  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
+
+  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) {
     text-align: left;
-    padding-left: 16px!important;
+    padding-left: 16px !important;
   }
-  .operator-text-title:last-child{
-     margin-bottom: 0;
+
+  .operator-text-title:last-child {
+    margin-bottom: 0;
   }
 </style>
 <style lang="less">

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -266,7 +266,8 @@
               projectNameId: row.projectNameId,
               targetMarket: row.targetMarket,
               studioEngineer: row.studioEngineer,
-              type: '102'
+              type: '102',
+              roleOpen:'fggcs',
             }
           })
           window.open(newUrl.href, '_blank')
@@ -279,7 +280,7 @@
               projectNameId: row.projectNameId,
               targetMarket: row.targetMarket,
               studioEngineer: row.studioEngineer,
-              type: '106'
+              type: '106',
             }
           })
           window.open(newUrl.href, '_blank')