Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'

# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js

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

@@ -5,7 +5,7 @@
         {{$t('basicInformationOfParameters')}}
       </div>
       <div class="header-tight">
-        <a-button v-if="this.$route.query.studioEngineer == this.userInfo().id" class="box-button"
+        <a-button v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators" class="box-button"
                   style="line-height: 32px" @click="edit">
           {{$t('edit')}}
         </a-button>
@@ -115,7 +115,8 @@
         {{$t('regulatoryCertificationTaskPlan')}}
       </div>
       <div class="header-tight">
-        <a-button class="box-button" v-if="this.$route.query.studioEngineer == this.userInfo().id"
+        <a-button class="box-button"
+                  v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators"
                   style="line-height: 32px"
                   @click="settingClick">{{$t('setting')}}
         </a-button>
@@ -183,6 +184,7 @@
     data() {
       return {
         queryForm: {},
+        administrators:false,
         activeKey: this.$t('CurrentStatusOfTheProject'),
         url: {
           queryById: 'project/projectLibraryBase/queryById',
@@ -199,6 +201,14 @@
     mounted() {
       this.getForm()
       this.getSetting()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),

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

@@ -76,10 +76,10 @@
       </a-form>
     </div>
     <div class="table-operator">
-<!--      <div class="operator-text" @click="batSettingClick">-->
-<!--        <a-icon type="setting"/>-->
-<!--        {{ $t('batSetting') }}-->
-<!--      </div>-->
+      <div class="operator-text" @click="cuibanClick">
+        <a-icon type="sound"/>
+        {{ $t('CuiBan') }}
+      </div>
       <div @click="BatchMaintenanceProgress" class="operator-text">
         <a-icon type="setting"/>
         {{$t('BatchMaintenanceProgress')}}
@@ -190,6 +190,7 @@
     <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
     <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
     <batchModel @batchModel="batchModel" ref="batchModelRef"/>
+    <cuibanModel @cibanModel="cibanModel" ref="cModelRef"/>
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -222,6 +223,7 @@
   import batchModel from './batchModel'
   import TaskListModel from './TaskListModel'
   import taskBatSetting from './taskBatSetting'
+  import cuibanModel from './cuibanModel'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import store from '@/store/'
@@ -233,6 +235,7 @@
       TaskListModel,
       batchChangeModel,
       batchModel,
+      cuibanModel,
       taskBatSetting
     },
     props: ['isDisplayNum', 'areaOfResponsibility'],
@@ -536,6 +539,17 @@
         let item = JSON.parse(JSON.stringify(val))
         this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus'))
       },
+      // 催办
+      cuibanClick(){
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          this.$refs.cModelRef.getData(this.selectionRowsArray)
+        }
+      },
+      cibanModel(){
+        this.getList()
+      },
       //批量维护进度
 
       BatchMaintenanceProgress() {

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

@@ -0,0 +1,189 @@
+<!--催办-->
+<template>
+  <a-modal
+    :title="title"
+    :width="700"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="visible = false"
+  >
+    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+                      <span class="title-text-text"
+                            :title="$t('taskType')">{{$t('taskType')}}</span>
+            </div>
+<!--            mode="multiple"-->
+            <a-form-model-item class="itemModel" prop="type">
+                <a-select v-model="formInline.type"
+                          class='box-input'
+                          :placeholder="$t('PleaseSelect') + $t('taskType')"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear>
+                  <a-select-option v-for="(item, key) in cuibanList" :key="key" :value="item.value">
+                      <span style="display: inline-block;width: 100%" :title=" item.label ">
+                        {{ item.label }}
+                      </span>
+                  </a-select-option>
+                </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+import { postAction, putAction, getAction } from '@/api/manage'
+
+export default {
+  name: 'TaskListModel',
+  data() {
+    return {
+      formInline: {},
+      selectionRowsArray:[],
+      rules: {
+        type: [
+          {
+            required: true,
+            message: this.$t('PleaseSelect') + this.$t('taskType'),
+            trigger: 'change'
+          }
+          ]
+      },
+      title:'',
+      visible: false,
+      confirmLoading: false,
+      studioList: [],
+      cuibanList:[
+        { label: this.$t('confirmationOfDesignConformity'), value: '2' },
+        { label: this.$t('PrehomoConfirmation'), value: '3' },
+        { label: this.$t('verificationAndConformityconfirmation'), value: '4' },
+      ],
+      ids:'',
+      disabled: false,
+      url: {
+        edit: '/project/projectTaskInventoryEO/edit',
+        addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
+        list: '/project/projectTaskInventoryConditionAssessmentEO/list'
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    getData(val) {
+      this.visible = true
+      this.title = this.$t('CuiBan')
+      this.selectionRowsArray = val
+      this.$nextTick(() => {
+        this.formInline = {}
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    getList(val) {
+      getAction(this.url.list, { projectLawsInventoryId: val.projectLawsInventoryId }).then((res) => {
+        if (res.success) {
+          this.studioList = res.result || []
+        } else {
+          this.studioList = []
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    handleOk() {
+      if (this.disabled) {
+        this.visible = false
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let ProjectTaskUrgVo = {}
+          let projectLawsInventoryId = []
+          this.selectionRowsArray.forEach((item) => {
+            if(item.projectLawsInventoryId){
+              projectLawsInventoryId.push(item.projectLawsInventoryId)
+            }
+          })
+          ProjectTaskUrgVo = {
+              projectLawsInventoryIds: projectLawsInventoryId.join(','),
+              type: this.formInline.type,
+            }
+          this.confirmLoading = true
+          postAction('/project/projectLawsInventoryEO/taskUrg', ProjectTaskUrgVo).then((res) => {
+            if (res.success) {
+              this.visible = false
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$emit('cibanModel')
+            } else {
+              this.$message.warning(res.message)
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text {
+  width: 134px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.headerText {
+  margin-left: 30px;
+  color: #040B29;
+  font-weight: 400;
+}
+</style>

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

@@ -173,7 +173,8 @@
         </div>
       </div>
       <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px">
-        <div @click="handleExport" v-has="'projectLawsInventory:exportData'" v-if="isRoleSwitching"
+        <div @click="handleExport" v-has="'projectLawsInventory:exportData'"
+             v-if="isRoleSwitching || formInlineRoleSwitching.roleSwitchingCode == '12'"
              class="operator-text">
           <a-icon type="export" :rotate="-90"/>
           {{ $t('export') }}

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

@@ -83,14 +83,14 @@
         </div>
         <div class="operator-text"
              v-has="'projectRelatedPersonnel:importExcel'"
-             v-if="this.$route.query.studioEngineer == this.userInfo().id">
+             v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators">
           <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
                       @getList="getPersonnelList"/>
         </div>
         <div class="operator-text"
              @click="batSettingClick"
              v-has="'projectRelatedPersonnel:setting'"
-             v-if="this.$route.query.studioEngineer == this.userInfo().id">
+             v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators">
           <a-icon type="setting"/>
           {{$t('batSetting')}}
         </div>
@@ -388,13 +388,15 @@
           queryCertificationEngineer: '/project/projectRelatedPersonnel/queryCertificationEngineer'
         },
         selectedRowKeys: [],
-        dictOptionsValue: []
+        dictOptionsValue: [],
+        administrators: false
       }
     },
     computed: {
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.$route.query.studioEngineer != this.userInfo().id) {
+        if (this.$route.query.studioEngineer == this.userInfo().id || this.administrators) {
+        } else {
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {
               columnResult.splice(i, 1)
@@ -441,6 +443,14 @@
       getData() {
         this.visible = true
         this.queryParam = {}
+        this.administrators = false
+        if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+          this.userInfo().userRoleList.forEach(res => {
+            if (res.roleCode == 'admin') {
+              this.administrators = true
+            }
+          })
+        }
         this.getList()
         this.queryCertificationEngineer()
       },