From aabbb7b5ce7b63b9311499cf0276fc89bbe21faa Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 25 Jul 2022 11:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=AF=B9=E5=A4=96=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E7=AE=A1=E7=90=86=20=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  9 ++
 jero-web/src/common/lang/zh-cn.js             |  9 ++
 .../externalReports/components/addModel.vue   | 91 +++++++++++++++----
 jero-web/src/views/externalReports/index.vue  | 45 ++++++---
 .../commponts/conventionalmodle.vue           |  3 +
 .../ParameterItemCollectionList.vue           | 35 +++++--
 6 files changed, 150 insertions(+), 42 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index c1c5b2d4a..3a21c67e7 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1173,4 +1173,13 @@ module.exports = {
   convertFailed:'Convert Failed',
   standardData:'Standard Data',
   Theorganization:'The Organization',
+  Addingfolder:'Adding a folder',
+  Addingsubfolders:'Adding Subfolders',
+  Editfolder:'Edit Folder',
+  Deletefolders:'Delete Folders',
+  Foldername:'Folder Name',
+  Folderpermissions:'Folder Permissions',
+  Folderorder:'Folder Order',
+  Downloadprivileges:'Download Privileges',
+  Openpersonnel:'Open Personnel'
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 43142beb5..4ca188418 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1177,4 +1177,13 @@ module.exports = {
   convertFailed:'转换失败',
   standardData:'标准数据',
   Theorganization:'组织机构',
+  Addingfolder:'新增文件夹',
+  Addingsubfolders:'新增子文件夹',
+  Editfolder:'编辑文件夹',
+  Deletefolders:'删除文件夹',
+  Foldername:'文件夹名称',
+  Folderpermissions:'文件夹权限',
+  Folderorder:'文件夹顺序',
+  Downloadprivileges:'下载权限',
+  Openpersonnel:'开放人员'
 }
\ No newline at end of file
diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue
index c557ad5d5..190946488 100644
--- a/jero-web/src/views/externalReports/components/addModel.vue
+++ b/jero-web/src/views/externalReports/components/addModel.vue
@@ -1,4 +1,5 @@
 <template>
+  <div>
   <a-modal
     :title="title"
     :maskClosable="false"
@@ -12,33 +13,37 @@
       <a-form>
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
           <a-row :gutter="24">
-            <a-col :span="12">
+            <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
                   <span class="title-text-text"
-                        :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+                        :title="$t('fileName')">{{$t('fileName')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model.trim="formInline.paramsTemplateName"
-                           :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"/>
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessory_id')">
+                    {{ (formInline.fileName === 'null' || formInline.fileName === '' ||
+                    formInline.fileName == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
+          </a-row>
+            <a-row :gutter="24">
+            <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+                  <span class="title-text-text" :title="$t('fileDeclaration')">{{$t('fileDeclaration')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="region">
-                  <j-dict-select-tag class="box-input" v-model="formInline.region"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'region'"/>
+                  <a-input class="box-input add-input"
+                           type="textarea"
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+$t('fileDeclaration')"
+                           v-model="formInline.description"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -48,14 +53,31 @@
               <div class="box-title-text">
                 <div class="title-text">
                 <span class="title-text-text"
-                      :title="$t('contentDescription')">{{$t('contentDescription')}}</span>
+                      :title="$t('Openpersonnel')">{{$t('Openpersonnel')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="description">
-                  <a-input class="box-input add-input"
-                           type="textarea"
-                           :disabled="disabled"
-                           v-model="formInline.description"
-                           :placeholder="$t('PleaseEnter')+$t('contentDescription')"/>
+                  <PersonnelSelection
+                    :query="{db_field_name:'Openpersonnel',db_field_txt:$t('Openpersonnel')}"
+                    :personneQuery="formInline"
+                    @change="PersonnelSelectionChange"
+                    v-model="formInline.Openpersonnel"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('Downloadprivileges')">{{$t('Downloadprivileges')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="description">
+                  <PersonnelSelection
+                    :query="{db_field_name:'Downloadprivileges',db_field_txt:$t('Downloadprivileges')}"
+                    :personneQuery="formInline"
+                    @change="PersonnelSelectionChange"
+                    v-model="formInline.lawEngineerName"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -68,16 +90,21 @@
       <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
     </div>
   </a-modal>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+  </div>
+
 </template>
 
 <script>
 import PersonnelSelection from '@/components/PersonnelSelection/index'
 import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
 
 export default {
   name: 'addModel',
   components: {
-    PersonnelSelection
+    PersonnelSelection,
+    uploadFile
   },
   props: ['url'],
   data() {
@@ -186,6 +213,30 @@ export default {
     projectNameChange(value){
       console.log(value)
     },
+    /** 上传文件的回调 */
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.formInline[this.uploadName] = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
   }
 }
 </script>
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index f261141e4..17b431dae 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -44,17 +44,18 @@
                     <template #overlay>
                       <a-menu
                               @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
-                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('newNode')}}
+                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('Addingfolder')}}
+                        </a-menu-item>
+                        <a-menu-item key="4" @click="orgAdds" v-if="deleteNode"
+                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('Addingsubfolders')}}
                         </a-menu-item>
                         <a-menu-item key="2" @click="orgEdit" v-has="'split:sarFileSplitMenu:update'">
-                          {{$t('modifyNode')}}
+                          {{$t('Editfolder')}}
                         </a-menu-item>
                         <a-menu-item key="3" @click="orgDelete"
-                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('deleteNode')}}
-                        </a-menu-item>
-                        <a-menu-item key="4" @click="orgDelete" v-if="deleteNode"
-                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('add')}}
+                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('Deletefolders')}}
                         </a-menu-item>
+
                       </a-menu>
                     </template>
                   </a-dropdown>
@@ -184,15 +185,19 @@
                   :label-col="labelCol"
                   :wrapper-col="wrapperCol"
                 >
-                  <a-form-model-item :label="$t('clauseNo')" prop="name">
-                    <a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('clauseNo')"/>
+                  <a-form-model-item :label="$t('Foldername')" prop="name">
+                    <a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
                   </a-form-model-item>
-                  <a-form-model-item :label="$t('clauseName')" prop="itemName">
-                    <a-input v-model="form.itemName" :placeholder="$t('PleaseEnter')+$t('clauseName')"/>
+                  <a-form-model-item :label="$t('Folderpermissions')" prop="itemName">
+                    <PersonnelSelection
+                                        :personneQuery="form"
+                                        :query="{db_field_name:'Folderpermissions',db_field_txt:$t('Folderpermissions')}"
+                                        @change="PersonnelSelectionChange"
+                                        v-model="form.folderpermissions"/>
                   </a-form-model-item>
-                  <a-form-model-item :label="$t('serialNumber')" prop="displaySeq">
+                  <a-form-model-item :label="$t('Folderorder')" prop="displaySeq">
                     <a-input-number v-model="form.displaySeq" :min="1" :max="99999"
-                                    :placeholder="$t('PleaseEnter')+$t('serialNumber')" :formatter="limitNumber"
+                                    :placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
                                     :parser="limitNumber" style="width: 100%"/>
                     <!--                <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
                   </a-form-model-item>
@@ -220,13 +225,14 @@ import Vue from 'vue'
 import moment from 'moment'
 import eventBUs from '@/common/event'
 import { mapGetters } from 'vuex'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
 
 export default {
   name: 'SplitDetail',
   components: {
     addModel,
     handleModel,
-    // exportTree,
+    PersonnelSelection,
     globalAdvancedQuery
     // ImportFile
   },
@@ -242,6 +248,7 @@ export default {
       },
       pageSize: 10,
       pageNo: 1,
+      disabled:false,
       total: 0,
       tableData: [],
       selectedRowKeys: [],
@@ -393,6 +400,10 @@ export default {
       this.contentVisible = true
       this.contentValue = val
     },
+    PersonnelSelectionChange(value, id) {
+      this.form[value] = id
+      this.form = { ...this.form }
+    },
     //关闭条款内容弹框
     handleCancel() {
       this.contentVisible = false
@@ -549,12 +560,18 @@ export default {
     },
     //树形新增
     orgAdd() {
-      this.menuTitle = this.$t('add')
+      this.menuTitle = this.$t('Addingfolder')
       this.isEdit = false
       this.form = {}
       this.menuRightVisible = true
 
     },
+    orgAdds(){
+      this.menuTitle = this.$t('Addingsubfolders')
+      this.isEdit = false
+      this.form = {}
+      this.menuRightVisible = true
+    },
     //树形修改
     orgEdit() {
       this.menuTitle = this.$t('edit')
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index ead1ddc77..56a23cacc 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -17,6 +17,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('certificationCategory')">
+                    <span class="Required">*</span>
                     <span>{{$t('certificationCategory')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="certCategory">
@@ -35,6 +36,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('configure')">
+                    <span class="Required">*</span>
                     <span>{{$t('configure')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="configIds">
@@ -59,6 +61,7 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}</span>
                   </div>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 682fbe51a..5ef39eb9b 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -108,7 +108,7 @@
             <!--      // R&H Manager manager-->
             <!--      // 系统管理员 admin-->
             <!--      // 游客 guest-->
-            <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+            <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo"'>
               <template slot="title" id="popconfirm">
                 <!--      添加-->
                 <div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -121,10 +121,9 @@
 <!--                  {{$t('distributionAndCollection')}}-->
 <!--                </div>-->
                 <!--      导出-->
-                <div @click="handleExport" class="operator-text-title"
-                     v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+                <div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="export"/>
-                  {{$t('export')}}
+                  {{$t('dataExport')}}
                 </div>
                 <!--     一键下发收集 -->
                 <div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -171,6 +170,11 @@
               <a-icon type="copy"/>
               {{$t('Assignedby')}}
             </div>
+            <!--      导出-->
+            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt"'>
+              <a-icon type="export"/>
+              {{$t('dataExport')}}
+            </div>
             <!--      引用参数-->
             <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" '>
               <a-icon type="plus"/>
@@ -204,7 +208,7 @@
                  v-if="!this.$route.query.it"
                  @click="roleSwitchingClick">
               <a-icon type="select"/>
-              {{ $t('roleSwitching') }}
+              {{ $t('roleSwitching') }} ({{ $t(this.rolename)}})
             </div>
           </div>
           <div style="width: 100%">
@@ -584,6 +588,7 @@
         configureareaVisible: false, // 配置的彈框
         pageNo: 1,
         pageSize: 10,
+        rolename:'',
         total: 0,
         selectedRowKeysArray: '',
         templatetitle: '',
@@ -643,7 +648,7 @@
     mounted() {
       this.GetgetLoginUserType()
       console.log(this.currentPersonRole)
-      // this.LoginUserType()
+      this.LoginUserType()
       setTimeout(() => {
         if (this.currentPersonRole == 'dre') {
           this.handlePreservation()
@@ -690,6 +695,11 @@
                 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
@@ -1026,6 +1036,11 @@
         }
         this.RoleType = val
         this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
+        val.forEach((item,index) => {
+          if(item.value == this.currentPersonRole){
+            this.rolename = item.label
+          }
+        })
         this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
       },
       // 表格所选中得行内容
@@ -1103,7 +1118,7 @@
       },
       getFreeze(callback) {
         let _this = this
-        let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
+        let param = { paramsManifestId: this.$route.query.id, configFlag: 1 }
         axios({
           url: '/jero-boot/params/collectManifest/getConfigLableList',
           method: 'post',
@@ -1659,7 +1674,6 @@
     cursor: pointer;
     border-radius: 4px;
   }
-
   .operator-text-title {
     cursor: pointer;
     margin-right: 22px;
@@ -1808,4 +1822,9 @@
   .text-wraning{
     word-break: break-word;
   }
+</style>
+<style lang='less'>
+.ant-popover-message-title{
+  margin-bottom: -30px;
+}
 </style>
\ No newline at end of file