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

2022-11-04 13:41:17 +08:00
parent 3cacb86a8b a240e44b8b
commit 314e9a9657
49 changed files with 1227 additions and 538 deletions
@@ -26,11 +26,11 @@
            <a-icon type="codepen"/>
            {{$t('DocumentSplitting')}}
          </div>
-          <div @click="DocumentTranslationClick" v-has="'bussLog:translation'" class="operator-text-text"
-               :title="$t('DocumentTranslation')">
-            <a-icon type="file-pdf"/>
-            {{$t('DocumentTranslation')}}
-          </div>
+<!--          <div @click="DocumentTranslationClick" v-has="'bussLog:translation'" class="operator-text-text"-->
+<!--               :title="$t('DocumentTranslation')">-->
+<!--            <a-icon type="file-pdf"/>-->
+<!--            {{$t('DocumentTranslation')}}-->
+<!--          </div>-->
          <div @click="DocumentComparisonClick" v-has="'bussLog:comparison'" class="operator-text-text"
               :title="$t('DocumentComparison')">
            <a-icon type="wallet"/>
@@ -42,7 +42,7 @@
                      {{title && title.length > 18?title.slice(0,17)+'...':title}}
                    </span>
                    <template #overlay>
-                      <a-menu v-if="$route.query.createBy == userData.username"
+                      <a-menu v-if="$route.query.createBy == userData.username || administrators"
                              @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('newNode')}}
                        </a-menu-item>
@@ -67,19 +67,19 @@
              </div>
              <div class="table-operator">
                <div class="operator-text" @click="handleCopyManage"
-                     v-if="$route.query.createBy == userData.username"
+                     v-if="$route.query.createBy == userData.username || administrators"
                     v-has="'split:sarFileSplitItems:copy'">
                  <a-icon type="copy"/>
                  {{ $t('copy') }}
                </div>
                <div class="operator-text" @click="handleAddManage"
-                     v-if="$route.query.createBy == userData.username"
+                     v-if="$route.query.createBy == userData.username || administrators"
                     v-has="'split:sarFileSplitItems:add'">
                  <a-icon type="plus"/>
                  {{ $t('add') }}
                </div>
                <div class="operator-text upload-split"
-                     v-if="$route.query.createBy == userData.username"
+                     v-if="$route.query.createBy == userData.username || administrators"
                     @click="handleImportManage" v-has="'split:sarFileSplitItems:import'">
                  <a-icon type="import" :rotate="-90" v-if="uploadMenuId===undefined||uploadMenuId===''"/>
                  {{ (uploadMenuId===''||uploadMenuId===undefined)? $t('import'):'' }}
@@ -94,25 +94,25 @@
                  {{ $t('export') }}
                </div>
                <div class="operator-text" @click="handleDownManage"
-                     v-if="$route.query.createBy == userData.username"
+                     v-if="$route.query.createBy == userData.username || administrators"
                     v-has="'split:sarFileSplitItems:template'">
                  <a-icon type="download"/>
                  {{ $t('TemplateDownload') }}
                </div>
                <div class="operator-text" @click="handleMergeManage"
-                     v-if="$route.query.createBy == userData.username"
+                     v-if="$route.query.createBy == userData.username || administrators"
                     v-has="'split:sarFileSplitItems:merge'">
                  <a-icon type="snippets"/>
                  {{ $t('MergerClause') }}
                </div>
                <div class="operator-text" @click="handleManage"
-                     v-if="$route.query.createBy == userData.username"
+                     v-if="$route.query.createBy == userData.username || administrators"
                     v-has="'split:sarFileSplitItems:set'">
                  <a-icon type="setting"/>
                  {{ $t('BatchSetting') }}
                </div>
                <div class="operator-text" @click="handleBatCancel"
-                     v-if="$route.query.createBy == userData.username"
+                     v-if="$route.query.createBy == userData.username || administrators"
                     v-has="'split:sarFileSplitItems:delete'">
                  <a-icon type="delete"/>
                  {{ $t('BatchDelete') }}
@@ -126,7 +126,7 @@
                  :OperationList="OperationList"
                  :infoId="$route.query.infoId"
                  :menuId="menuId"
-                  :showAction="$route.query.createBy == userData.username ? true :false"
+                  :showAction="$route.query.createBy == userData.username || administrators ? true :false"
                  @onSelectChange="onSelectChange"
                  @deleteClick="deleteClick"
                  @editClick="editClick"
@@ -320,7 +320,8 @@
        parameter: {},
        widthBrown: '',
        creenWidth: document.body.clientWidth,
-        brownHeight: document.documentElement.clientHeight
+        brownHeight: document.documentElement.clientHeight,
+        administrators:false,
      }
    },
    watch: {
@@ -357,6 +358,14 @@


      this.userData = this.userInfo()
+      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.infoId = this.$route.query.infoId
      console.log('info', this.$route.query)
      this.loadMenuData()
@@ -223,7 +223,7 @@
          ...this.queryParam
        }
        this.loading = true
-        postAction('document/bussDocumentLibraryEO/ocrPageInfo', query).then((res) => {
+        postAction('document/bussDocumentLibraryEO/transPageInfo', query).then((res) => {
          if (res.success) {
            this.dataList = res.result.records || []
            this.total = res.result.total
@@ -416,6 +416,7 @@ export default {
        controlValues: [
          { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' },
          { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' },
+          { validator: this.test }
        ],
        titleDefaultValue: [
          { required: true, message: this.$t('PleaseEnter')+this.$t('DefaultValue'), trigger: 'blur' },
@@ -453,6 +454,14 @@ export default {
    }
  },
  methods: {
+    test(rule, value, callback) {
+      var money = /^[^##！!]*$/
+      if (money.test(value)) {
+        callback()
+      } else {
+        callback(new Error(this.$t('disableInput') + '!#'))
+      }
+    },
    getcontentListedEdit() {
      getAction('sys/dict/getDictItems/cert_category', { }).then((res) => {
        if (res.success) {
@@ -113,7 +113,8 @@
        if (this.idList && this.idList.length > 0) {
          id = this.idList.join(',')
        } else {
-          id = this.$route.query.id
+          id = this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id
+          // id = this.$route.query.id
        }
        getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', {id:id}).then((res) => {
          if (res.success) {
@@ -463,7 +463,7 @@
  import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index'
  import ReferenceParameter from '@/components/ReferenceParameter/index'
  import AssignedBy from '@/components/AssignedBy/index'
-  import ImportFileOnlyList from '@/components/ImportFileOnlyList/index'
+  import ImportFileOnlyList from '@/components/ImportFileOnlyListtag/index'
  import axios from 'axios'
  import { ACCESS_TOKEN } from '@/store/mutation-types'
  import Vue from 'vue'
@@ -684,12 +684,11 @@
      // }
    },
    mounted() {
-      console.log(this.$route.query)
+      this.GetgetLoginUserType()
+      console.log(this.currentPersonRole)
      if(this.$route.query.type == '1'){
        this.handleOkRoleSwitching()
      }
-      this.GetgetLoginUserType()
-      console.log(this.currentPersonRole)
      setTimeout(() => {
        if (this.currentPersonRole == 'dre') {
          this.handlePreservation()
@@ -724,7 +723,7 @@
      handleOkRoleSwitching() {
        if(this.$route.query.type == '1'){
          let query = {
-            userType:this.$route.query.userType,
+            userType:this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType,
            paramsManifestId: this.$route.query.id,
            projectId: this.$route.query.projectId,
            userId: this.userInfo().id
@@ -732,10 +731,10 @@
          this.confirmLoadingRoleSwitching = true
          postAction('/params/userTypeLog/edit', query).then((res) => {
            if (res.success) {
-              this.currentPersonRole = this.$route.query.userType
+              this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType
              this.visibleRoleSwitching = false
              this.confirmLoadingRoleSwitching = false
-              localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType))
+              localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType))
              this.RoleType.forEach((item,index) => {
                if(item.value == this.currentPersonRole){
                  this.rolename = item.label
@@ -935,7 +934,7 @@
          ids: this.selectedRowKeys.join(','),
          exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
        }
-        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.xlsx'
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
        downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear)
      },
      getList(){
@@ -189,8 +189,8 @@
    <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
    <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
    <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
-    <batchModel @batchModel="batchModel" ref="batchModelRef"/>
    <cuibanModel @cibanModel="cibanModel" ref="cModelRef"/>
+    <batchModel @batchModel="batchModel" ref="batchModelRef"/>
    <!--    错误数据提示-->
    <a-modal
      :title="$t('operationFailed')"
@@ -222,8 +222,8 @@
  import batchChangeModel from './batchChangeModel'
  import batchModel from './batchModel'
  import TaskListModel from './TaskListModel'
-  import taskBatSetting from './taskBatSetting'
  import cuibanModel from './cuibanModel'
+  import taskBatSetting from './taskBatSetting'
  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
  import { mapGetters } from 'vuex'
  import store from '@/store/'
@@ -618,6 +618,17 @@
        }

      },
+      // 催办
+      cuibanClick(){
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          this.$refs.cModelRef.getData(this.selectionRowsArray)
+        }
+      },
+      cibanModel(){
+        this.getList()
+      },
      cancleoperationFailed(){
        this.visibleoperationFailed = false
      },
@@ -66,6 +66,7 @@
      :expandIconAsCell='false'
      :expandIconColumnIndex="5"
      :expandIcon="expandIcon"
+      :expandRowByClick="true"
      :loading="loading"
      @expand="expandChange"
      @change="handleTableChange">
@@ -167,42 +167,97 @@
      },
      //待填写数量
      waitFillClick(item) {
-        let _this = this
-        item.type = '1'
-        item.userType = 'dre'
-        console.log(item)
-        let newUrl = _this.$router.resolve({
-          path: '/ParameterItemCollection',
-          query:  item
-          // projectName:this.$route.query.projectName
+        let query = {
+          paramsManifestId: item.id,
+          projectId: item.projectId
+        }
+        this.loading = true
+        let userType = ''
+        let valueList = []
+        getAction('params/collectManifest/getLoginUserType', query).then((res) => {
+          if(res.result){
+            res.result.find((item,index) => {
+              if(item.value){
+                valueList.push(item.value)
+              }
+            })
+           let flag = valueList.find((item,index) => {
+             return item == 'dre'
+           })
+            let _this = this
+            item.type = '1'
+            item.userType = _this.flag == undefined ?  valueList[0] : 'dre'
+            let newUrl = _this.$router.resolve({
+              path: '/ParameterItemCollection',
+              query:  item
+              // projectName:this.$route.query.projectName
+            })
+            window.open(newUrl.href, '_blank')
+          }
        })
-        window.open(newUrl.href, '_blank')
      },
      //待分配填写人数量
      waitSdtClick(item) {
-        let _this = this
-        item.type = '1'
-        item.userType = 'sdt'
-        console.log(item)
-        let newUrl = _this.$router.resolve({
-          path: '/ParameterItemCollection',
-          query:  item
-          // projectName:this.$route.query.projectName
+        let query = {
+          paramsManifestId: item.id,
+          projectId: item.projectId
+        }
+        this.loading = true
+        let userType = ''
+        let valueList = []
+        getAction('params/collectManifest/getLoginUserType', query).then((res) => {
+          if(res.result){
+            res.result.find((item,index) => {
+              if(item.value){
+                valueList.push(item.value)
+              }
+            })
+            let flag = valueList.find((item,index) => {
+              return item == 'sdt'
+            })
+            let _this = this
+            item.type = '1'
+            item.userType = _this.flag == undefined ?  valueList[0] : 'sdt'
+            let newUrl = _this.$router.resolve({
+              path: '/ParameterItemCollection',
+              query:  item
+              // projectName:this.$route.query.projectName
+            })
+            window.open(newUrl.href, '_blank')
+          }
        })
-        window.open(newUrl.href, '_blank')
+
      },
      //参数待发起数量
      waitCollectClick(item) {
-        let _this = this
-        item.type = '1'
-        item.userType = 'homo'
-        console.log(item)
-        let newUrl = _this.$router.resolve({
-          path: '/ParameterItemCollection',
-          query:  item
-          // projectName:this.$route.query.projectName
+        let query = {
+          paramsManifestId: item.id,
+          projectId: item.projectId
+        }
+        this.loading = true
+        let userType = ''
+        let valueList = []
+        getAction('params/collectManifest/getLoginUserType', query).then((res) => {
+          if(res.result){
+            res.result.find((item,index) => {
+              if(item.value){
+                valueList.push(item.value)
+              }
+            })
+            let flag = valueList.find((item,index) => {
+              return item == 'homo'
+            })
+            let _this = this
+            item.type = '1'
+            item.userType = _this.flag == undefined ?  valueList[0] : 'homo'
+            let newUrl = _this.$router.resolve({
+              path: '/ParameterItemCollection',
+              query:  item
+              // projectName:this.$route.query.projectName
+            })
+            window.open(newUrl.href, '_blank')
+          }
        })
-        window.open(newUrl.href, '_blank')
      },
      SizeChange(page, pageSize) {
        this.pageNo = 1