修改认证参数角色切换

2022-07-26 12:21:45 +08:00
parent 47eb23796c
commit 6acd3f1fd9
5 changed files with 154 additions and 121 deletions
@@ -1186,4 +1186,7 @@ module.exports = {
  translatedText:'Translated Text',
  Administrativeprivileges:'Administrativ Pprivileges',
  Checkthepermissions:'Check The Permissions',
+  selectDirectorylocation: 'Please select the directory location to add the folder',
+  Fileuploaded:'File uploaded, please wait',
+  uploadedbyyourself:'You can only delete files and data uploaded by yourself',
 }
@@ -577,6 +577,7 @@ module.exports = {
  documentSplitTemplate: '文档拆分模板',
  batSetting: '批量设置',
  selectDirectoryTerms: '请选择添加条款的目录位置',
+  selectDirectorylocation: '请选择添加文件夹的目录位置',
  OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
  OnlyWord: '只能导入word文件',
  labelAreaDeleted: '若进行删除，则该展示区域下标签项都将被删除',
@@ -916,6 +917,7 @@ module.exports = {
  startMonth: '开始日期',
  endMonth: '结束日期',
  Importing: '导入中...',
+  Fileuploaded:'文件上传中，请稍后',
  projectDeliveryDescription: '工程交付说明',
  cancelConfirm: '取消确认',
  currentInformation: '当前信息',
@@ -1190,4 +1192,5 @@ module.exports = {
  translatedText:'译文',
  Administrativeprivileges:'管理权限',
  Checkthepermissions:'查看权限',
+  uploadedbyyourself:'只能删除自己上传的文件数据',
 }
@@ -1,96 +1,70 @@
 <template>
  <div>
-  <a-modal
-    :title="title"
-    :maskClosable="false"
-    :width="800"
-    placement="right"
-    :closable="true"
-    @cancel="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <a-spin :spinning="confirmLoading">
-      <a-form>
-        <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="Required">*</span>
-                  <span class="title-text-text"
-                        :title="$t('fileName')">{{$t('fileName')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="fileName">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('fileName')">
-                    {{ (formInline['fileName'] === 'null' || formInline['fileName'] === '' ||
-                    formInline['fileName'] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                    }}
-                  </a-button>
-                </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="Required">*</span>
-                  <span class="title-text-text" :title="$t('fileDeclaration')">{{$t('fileDeclaration')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="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>
-          </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('Openpersonnel')">{{$t('Openpersonnel')}}</span>-->
-<!--                </div>-->
-<!--                <a-form-model-item class="itemModel" prop="description">-->
-<!--                  <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>-->
-<!--          </a-row>-->
-        </a-form-model>
-      </a-form>
-    </a-spin>
-    <div class="drawer-bootom-button">
-      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
-    </div>
-  </a-modal>
+      <a-modal
+        :title="title"
+        :maskClosable="false"
+        :width="800"
+        placement="right"
+        :closable="true"
+        @cancel="handleCancel"
+        :visible="visible"
+        style="height: 100%;overflow: auto;padding-bottom: 53px;">
+        <a-spin :tip="this.$t('Fileuploaded')" :spinning='spinning'>
+          <a-form>
+            <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="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('fileName')">{{$t('fileName')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel" prop="sourceFileId">
+                      <a-button type="primary" class="button-text"
+                                @click="clickButtonToUpload('sourceFileId')">
+                        {{ (formInline.sourceFileId === 'null' || formInline.sourceFileId === '' ||
+                        formInline.sourceFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                        }}
+                      </a-button>
+                    </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="Required">*</span>-->
+                      <span class="title-text-text" :title="$t('fileDeclaration')">{{$t('fileDeclaration')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel" prop="description">
+                      <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>
+              </a-row>
+            </a-form-model>
+          </a-form>
+        </a-spin>
+        <div class="drawer-bootom-button">
+          <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+          <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+        </div>
+      </a-modal>
    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+<!--    <div class="loading-box" v-if="spinning">-->
+<!--      <div class="loading-content">-->
+<!--        <a-icon class="loading" type="loading"/>-->
+<!--        <div class="loading-tips">-->
+<!--          {{this.$t('Fileuploaded')}}...-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
  </div>

 </template>
@@ -106,26 +80,29 @@ export default {
    PersonnelSelection,
    uploadFile
  },
-  props: ['url'],
+  // props: ['url'],
  data() {
    return {
      formInline: {},
      confirmLoading: false,
+      spinning: false,
      visible: false,
+      url: {
+        add: 'params/template/add',
+        edit: 'params/template/edit',
+      },
      rules: {
-        paramsTemplateName:[
-          { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' },
-          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
-        ],
        description:[
-          { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' },
+          // { required: true, message: this.$t('PleaseEnter')+this.$t('fileDeclaration'), trigger: 'blur' },
+          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
        ],
-        state: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        sourceFileId: [
+          {
+            required: true,
+            message: this.$t('fileName') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
        ],
-        region: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' },
-        ]
      },
      disabled: false,
      projectNameList: [],
@@ -162,7 +139,12 @@ export default {
      })
    },
    handleCancel() {
-      this.visible = false
+      if(this.spinning == true){
+        this.visible = true
+        return
+      }else{
+        this.visible = false
+      }
    },
    handleSubmit() {
      if(this.formInline.paramsTemplateName !== undefined) {
@@ -170,6 +152,7 @@ export default {
      }
      this.$refs.ruleForm.validate(valid => {
        if (valid) {
+          this.spinning = true
          let url = ''
          let Action
          if (this.formInline.id) {
@@ -185,14 +168,14 @@ export default {
              query[res] = query[res].join(',')
            }
          })
-          this.confirmLoading = true
-          Action(url, query).then((res) => {
+          postAction(url, query).then((res) => {
            if (res.success) {
-              this.confirmLoading = false
+              this.spinning = false
              this.$message.success(this.$t('OperationSuccessful'))
              this.visible = false
              this.$emit('addModelList')
            } else {
+              this.spinning = false
              this.$message.warning(this.$t('operationFailed'))
              this.confirmLoading = false
            }
@@ -357,4 +340,40 @@ export default {
 .ant-input-disabled {
  color: rgba(0, 0, 0, 0.65) !important;
 }
+</style>
+<style scoped lang="less">
+.loading-box {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999900;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 8px;
+  user-select: none;
+
+  .loading-content {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    color: #21c9cc;
+    transform: translate(-50%, -50%);
+    text-align: center;
+
+    .loading {
+      font-size: 28px;
+    }
+
+    .spin-loading {
+      animation: rotating 2s linear infinite;
+    }
+
+    .loading-tips {
+      margin-top: 5px;
+      font-size: 16px;
+      color: #21c9cc;
+    }
+  }
+}
 </style>
@@ -164,7 +164,7 @@
                />
              </div>
              <!--  上传文件-->
-              <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+              <addModel  ref="addModelRef" @addModelList="addModelList"/>
              <!--  文件详情-->
              <handleModel :url="url" ref="handleModelRef" />
              <!--          添加节点-->
@@ -189,14 +189,14 @@
                  <a-form-model-item :label="$t('Foldername')" prop="name">
                    <a-input class="box-input add-input" v-model="form.name" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
                  </a-form-model-item>
-                  <a-form-model-item :label="$t('Administrativeprivileges')" prop="itemName">
+                  <a-form-model-item :label="$t('Administrativeprivileges')" prop="Administrativeprivileges">
                    <PersonnelSelection class="box-input add-input"
                                        :personneQuery="form"
                                        :query="{db_field_name:'Administrativeprivileges',db_field_txt:$t('Administrativeprivileges')}"
                                        @change="PersonnelSelectionChange"
                                        v-model="form.Administrativeprivileges"/>
                  </a-form-model-item>
-                  <a-form-model-item :label="$t('Checkthepermissions')" prop="itemName">
+                  <a-form-model-item :label="$t('Checkthepermissions')" prop="Checkthepermissions">
                    <PersonnelSelection
                      class="box-input add-input"
                      :personneQuery="form"
@@ -283,15 +283,17 @@ export default {
      form: {},
      rules: {
        name: [
-          { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
-          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
+          { required: true, message: this.$t('PleaseEnter') + this.$t('Foldername'), trigger: 'blur' },
+          { min: 1, max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' }
        ],
-        itemName: [
-          { required: true, message: this.$t('PleaseEnter') + this.$t('clauseName'), trigger: 'blur' },
-          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
+        Administrativeprivileges: [
+          { required: true, message: this.$t('PleaseSelect') + this.$t('Administrativeprivileges'), trigger: 'change' },
+        ],
+        Checkthepermissions: [
+          { required: true, message: this.$t('PleaseSelect') + this.$t('Checkthepermissions'), trigger: 'change' },
        ],
        displaySeq: [
-          { required: true, message: this.$t('PleaseEnter') + this.$t('serialNumber'), trigger: 'blur' }
+          { required: true, message: this.$t('PleaseEnter') + this.$t('Folderorder'), trigger: 'blur' }
          // { min: 1, max: 99999, message: this.$t('cantExeed') + '99999' + this.$t('characters'), trigger: 'blur' },
        ]
      },
@@ -809,8 +811,15 @@ export default {

      downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear)
    },
-    onChange(){
-
+    onChange(value,dateString){
+      if (this.queryParams.uploadTime && this.queryParams.uploadTime.length > 0) {
+        let dateOne = moment(dateString[0]).format('YYYY-MM-DD')
+        let dateTwo = moment(dateString[1]).format('YYYY-MM-DD')
+        this.queryParams.uploadTime = [dateOne, dateTwo]
+      } else {
+        this.queryParams.uploadTime = []
+        // this.queryParamOne[item + '_name'] = []
+      }
    },
    selectClear() {
      this.$refs.splitDetailTabel.selectedRowKeys = []
@@ -959,7 +968,7 @@ export default {
      if (this.menuId) {
        this.$refs.addModelRef.addModel()
      } else {
-        this.$message.warning(this.$t('selectDirectoryTerms'))
+        this.$message.warning(this.$t('selectDirectorylocation'))
      }

    },
@@ -3,7 +3,7 @@
    <div class="Virtual-detail-header" style="position: fixed;top: 0">
      <div class="Virtual-detail-title">
        <span>
-          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.paramsManifest.title)}}
+          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}}
        </span>
      </div>
    </div>
@@ -648,7 +648,6 @@
    mounted() {
      this.GetgetLoginUserType()
      console.log(this.currentPersonRole)
-      this.LoginUserType()
      setTimeout(() => {
        if (this.currentPersonRole == 'dre') {
          this.handlePreservation()
@@ -1035,12 +1034,12 @@
          this.currentPersonRole = currentPersonRole || userType || val[0].value
        }
        this.RoleType = val
-        this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
-        val.forEach((item,index) => {
+        this.RoleType.forEach((item,index) => {
          if(item.value == this.currentPersonRole){
            this.rolename = item.label
          }
        })
+        this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
        this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
      },
      // 表格所选中得行内容