From 11c7cccd5adc4e4a4f53735ea558eb2841e11e66 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Wed, 26 Oct 2022 23:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/extends/FileMangement/fileMangement.vue   |  2 +-
 .../ProcessPermissionAuthorizationForm.vue    | 53 +++++++++++++++----
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/extends/FileMangement/fileMangement.vue b/src/extends/FileMangement/fileMangement.vue
index 8937d84..3970404 100644
--- a/src/extends/FileMangement/fileMangement.vue
+++ b/src/extends/FileMangement/fileMangement.vue
@@ -74,7 +74,7 @@
       },
         methods: {
           //上传文件
-          upload (params){return postAction("/system/sysFile/upload",params)},
+          upload (params){return postAction("/sys/upload/uploadMinio",params)},
           download (params){return getAction("/system/sysFile/download",params)},
           deleteFile (params){return getAction("/system/sysFile/delete",params)},
            intFile(){
diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
index 505584c..88f5b5f 100644
--- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="12">
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['company']" :trigger-change="true" dictCode="" placeholder="请选择流程发起公司" />
+              <j-select-company v-decorator="['company']" multi disabled/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -15,22 +15,22 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['sysOrgCode']" :trigger-change="true" dictCode="" placeholder="请选择流程发起部门" />
+              <j-select-depart v-decorator="['sysOrgCode']" multi disabled/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['createBy']" :trigger-change="true" dictCode="" placeholder="请选择流程发起人" />
+              <j-select-user-by-dep v-decorator="['createBy']" disabled/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="授权人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['authorizationPerson']" :trigger-change="true" dictCode="" placeholder="请选择授权人" />
+              <j-select-user-by-dep v-decorator="['authorizationPerson']" disabled/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="被授权人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['authorizedPerson']" :trigger-change="true" dictCode="" placeholder="请选择被授权人" />
+              <j-select-user-by-dep v-decorator="['authorizedPerson']" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -84,14 +84,16 @@
 
 <script>
 
-  import { httpAction, getAction } from '@/api/manage'
+  import { httpAction, getAction,getCurrentTime } from '@/api/manage'
   import pick from 'lodash.pick'
   import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import JFormContainer from '@/components/jeecg/JFormContainer'
   import JDate from '@/components/jeecg/JDate'
   import JDictSelectTag from "@/components/dict/JDictSelectTag"
   import JSwitch from '@/components/jeecg/JSwitch'
-
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+  import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
+  import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
   export default {
     name: 'ProcessPermissionAuthorizationForm',
     components: {
@@ -99,6 +101,9 @@
       JDate,
       JDictSelectTag,
       JSwitch,
+      JSelectDepart,
+      JSelectUserByDep,
+      JSelectCompany
     },
     props: {
       /*流程数据*/
@@ -150,7 +155,8 @@
           add: "/processpermissionauthorization/processPermissionAuthorization/add",
           edit: "/processpermissionauthorization/processPermissionAuthorization/edit",
           queryById: "/processpermissionauthorization/processPermissionAuthorization/queryById"
-        }
+        },
+        btndisabled: false
       }
     },
     computed: {
@@ -178,6 +184,9 @@
       if (!this.isNew){
         this.init();
       }
+      let company = sessionStorage.getItem("PARENT_ID");
+      let userInfo=sessionStorage.getItem("USER_INFORMATION");
+      this.popupCallback(company,userInfo);
     },
     methods: {
       /*回显数据*/
@@ -211,6 +220,18 @@
           this.form.setFieldsValue(pick(this.data,'company','createTime','sysOrgCode','createBy','authorizationPerson','authorizedPerson','privilegedTimeStart','privilegedTimeEnd','continueAuthorize','privilegedAffirmedTime','authorizationNumberDays','fileId'))
         })
       },
+      close() {
+        //todo 关闭后的回调
+        this.$emit('close')
+      },
+      /*通过审批*/
+      passTask() {
+        this.$emit('passTask')
+      },
+      /*驳回审批*/
+      backTask() {
+        this.$emit('backTask')
+      },
       //渲染流程表单数据
       showFlowData(){
         if(this.formBpm === true){
@@ -253,8 +274,20 @@
 
         })
       },
-      popupCallback(row){
-        this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','authorizationPerson','authorizedPerson','privilegedTimeStart','privilegedTimeEnd','continueAuthorize','privilegedAffirmedTime','authorizationNumberDays','fileId'))
+      popupCallback(company,row){
+        let res=JSON.parse(row);
+        console.log('获取我的数据',res)
+        let param={}
+        param.createBy=res.username;
+        param.authorizationPerson=res.username;
+        param.company=company;
+        param.sysOrgCode=res.departIds;
+        param.createTime= getCurrentTime();
+        this.data=param;
+        let fieldval=pick(this.data,'company','createTime','sysOrgCode','createBy','authorizationPerson','authorizedPerson','privilegedTimeStart','privilegedTimeEnd','continueAuthorize','privilegedAffirmedTime','authorizationNumberDays','fileId')
+        this.$nextTick(() => {
+          this.form.setFieldsValue(fieldval)
+        })
       },
     }
   }