升级版本

lib/vform/designer.es.js

@@ -39345,6 +39345,8 @@ const _sfc_main$4h = {
           fileTypeCheckResult = uploadFileTypes.some((ft) => {
             return extFileName.toLowerCase() === ft.toLowerCase();
           });
+        } else {
+          fileTypeCheckResult = true;
         }
       }
       if (!fileTypeCheckResult) {
@@ -39462,7 +39464,7 @@ const _sfc_main$4h = {
     }
   }
 };
-const _withScopeId$7 = (n) => (pushScopeId("data-v-3a8735ee"), n = n(), popScopeId(), n);
+const _withScopeId$7 = (n) => (pushScopeId("data-v-37f7e06a"), n = n(), popScopeId(), n);
 const _hoisted_1$T = {
   key: 0,
   class: "el-upload__tip"
@@ -39549,7 +39551,7 @@ function _sfc_render$4h(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
 }
-var fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4h, [["render", _sfc_render$4h], ["__scopeId", "data-v-3a8735ee"]]);
+var fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4h, [["render", _sfc_render$4h], ["__scopeId", "data-v-37f7e06a"]]);
 var __glob_0_7$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": fileUploadWidget
@@ -39978,6 +39980,8 @@ const _sfc_main$4d = {
           fileTypeCheckResult = uploadFileTypes.some((ft) => {
             return file.type === "image/" + ft;
           });
+        } else {
+          fileTypeCheckResult = true;
         }
       }
       if (!fileTypeCheckResult) {
@@ -40172,7 +40176,7 @@ function _sfc_render$4d(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
 }
-var pictureUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4d, [["render", _sfc_render$4d], ["__scopeId", "data-v-265b55dc"]]);
+var pictureUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4d, [["render", _sfc_render$4d], ["__scopeId", "data-v-1f46381f"]]);
 var __glob_0_12$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": pictureUploadWidget
@@ -110447,13 +110451,13 @@ var Draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umd.exports
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1726652702966__");
+    var svgDom = document.getElementById("__svg__icons__dom__1727162552170__");
     if (!svgDom) {
       svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
       svgDom.style.position = "absolute";
       svgDom.style.width = "0";
       svgDom.style.height = "0";
-      svgDom.id = "__svg__icons__dom__1726652702966__";
+      svgDom.id = "__svg__icons__dom__1727162552170__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }

lib/vform/designer.umd.js

@@ -39371,6 +39371,8 @@ var __publicField = (obj, key, value2) => {
             fileTypeCheckResult = uploadFileTypes.some((ft) => {
               return extFileName.toLowerCase() === ft.toLowerCase();
             });
+          } else {
+            fileTypeCheckResult = true;
           }
         }
         if (!fileTypeCheckResult) {
@@ -39488,7 +39490,7 @@ var __publicField = (obj, key, value2) => {
       }
     }
   };
-  const _withScopeId$7 = (n) => (require$$0$1.pushScopeId("data-v-3a8735ee"), n = n(), require$$0$1.popScopeId(), n);
+  const _withScopeId$7 = (n) => (require$$0$1.pushScopeId("data-v-37f7e06a"), n = n(), require$$0$1.popScopeId(), n);
   const _hoisted_1$T = {
     key: 0,
     class: "el-upload__tip"
@@ -39575,7 +39577,7 @@ var __publicField = (obj, key, value2) => {
       _: 1
     }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
   }
-  var fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4h, [["render", _sfc_render$4h], ["__scopeId", "data-v-3a8735ee"]]);
+  var fileUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4h, [["render", _sfc_render$4h], ["__scopeId", "data-v-37f7e06a"]]);
   var __glob_0_7$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     "default": fileUploadWidget
@@ -40004,6 +40006,8 @@ var __publicField = (obj, key, value2) => {
             fileTypeCheckResult = uploadFileTypes.some((ft) => {
               return file.type === "image/" + ft;
             });
+          } else {
+            fileTypeCheckResult = true;
           }
         }
         if (!fileTypeCheckResult) {
@@ -40198,7 +40202,7 @@ var __publicField = (obj, key, value2) => {
       _: 1
     }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
   }
-  var pictureUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4d, [["render", _sfc_render$4d], ["__scopeId", "data-v-265b55dc"]]);
+  var pictureUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4d, [["render", _sfc_render$4d], ["__scopeId", "data-v-1f46381f"]]);
   var __glob_0_12$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     "default": pictureUploadWidget
@@ -110473,13 +110477,13 @@ ${scopedGridSubformCss}
   if (typeof window !== "undefined") {
     let loadSvg = function() {
       var body = document.body;
-      var svgDom = document.getElementById("__svg__icons__dom__1726652702966__");
+      var svgDom = document.getElementById("__svg__icons__dom__1727162552170__");
       if (!svgDom) {
         svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
         svgDom.style.position = "absolute";
         svgDom.style.width = "0";
         svgDom.style.height = "0";
-        svgDom.id = "__svg__icons__dom__1726652702966__";
+        svgDom.id = "__svg__icons__dom__1727162552170__";
         svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
         svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
       }

src/views/ebo/fast/form/formDevReviewDrawer.vue

@@ -2,7 +2,7 @@
 <template>
 	<el-drawer
 		v-model="visible"
-		v-loading="loading"
+    :loading="loading"
 		:title="showTitle"
 		:before-close="handleClose"
 		:modal="false"
@@ -26,12 +26,13 @@
           :custom-event="false"
           @go-flow-agree="flowAgree"
           @complete="showForm(dataForm)"
+          @flowRegOwner="flowRegOwner"
           :flow-id="dataForm.flowId"
           :flow-status="dataForm.flowStatus"
       />
 		</div>
 		<template #footer v-if="dataForm.btnList.length && dataForm.isLook == 0">
-			<el-button v-for="(item, index) in dataForm.btnList" v-auth="getBtnAuth(item)" v-show="dataForm.isLook == 0" v-prevent-reclick type="primary" @click="btnFormBefore(item,0)"
+			<el-button v-for="(item, index) in dataForm.btnList" v-auth="getBtnAuth(item)" v-show="dataForm.isLook == 0"  :loading="loading" v-prevent-reclick type="primary" @click="btnFormBefore(item,0)"
 				>{{ item.btnLabel }}
 			</el-button>
       <!-- <el-button v-show="dataForm.isLook == 0 && dataForm.showFlowBtn" v-prevent-reclick type="primary" @click="showSubmitFlow"
@@ -77,8 +78,8 @@ const dataForm = reactive({
   flowId:'',
   flowStatus:'',
   flowCategory:'',
-	loading: false,
   showFlowBtn:false,
+  businessNoName:'',
 	formJson: {},
 	formData: {},
 	optionData: {},
@@ -90,6 +91,7 @@ const dataForm = reactive({
   changeNodeHandlerJson:'',
   auditNote:'',
   flowName:'',
+  flowBusinessNo:'',
   flowKey:'',
 	appendButtonClickCall: {
 		appendButtonClickBreakData: '',
@@ -106,12 +108,14 @@ const init = (formCode?: string, formData: any, isLook: number, btnCode: any, cl
   dataForm.auditNote = ''
   dataForm.flowName = ''
   dataForm.flowCategory = ''
+  dataForm.flowBusinessNo = ''
   dataForm.flowKey = ''
   dataForm.flowId = ''
   dataForm.showFlowBtn = false
 	dataForm.isLook = isLook
   dataForm.formCode = formCode
   dataForm.btnCode = btnCode
+  dataForm.businessNoName = ''
 
 	if (formData) {
 		dataForm.id = formData.id
@@ -171,6 +175,15 @@ const showUserList = ()=>{
 
 
 }
+//驳回后为发起人调用
+const flowRegOwner = ()=>{
+  if(dataForm.isLook==0){
+    return
+  }
+  dataForm.isLook = 0;
+  showForm(dataForm)
+  //vFormRef.value.enableForm()
+}
 
 const submitFlow = (userTable: any, auditNote: any)=>{
   console.log("submitFlow")
@@ -198,10 +211,11 @@ const submitFlow = (userTable: any, auditNote: any)=>{
 const flow = ref()
 const showForm = (formData: any) => {
   var formCode = dataForm.formCode
-  var btnCode = dataForm.btnCode
   var data = { formCode: formCode }
 	dataForm.formCode = formCode
+  loading.value = true
 	getFormConfig(data).then(response => {
+    loading.value = false
     if(response.data.isFlow===1){
       dataForm.showFlowBtn = true
       dataForm.flowName = response.data.flowType;
@@ -218,34 +232,10 @@ const showForm = (formData: any) => {
     }
 		dataForm.formJson = JSON.parse(response.data.formJson)
 		dataForm.btnList = response.data.fastFormBtnList
-
+    dataForm.businessNoName = response.data.businessNoName
 		if (dataForm.id != '') {
-			var obj = { devFormCode: dataForm.formCode, btnCode: btnCode, btnFormData: { id: dataForm.id } }
-			getInfo(obj).then(res => {
-        dataForm.flowId = res.data.flowId
-        dataForm.flowStatus = res.data.flowStatus
-				vFormRef.value.setFormJson(dataForm.formJson)
-        /**
-        if(res.data.spmsFileList){
-          res.data.spmsFileList.forEach((f)=>{
-            f.fileUrl = JSON.parse(f.fileUrl);
-          })
-        }**/
 
-				nextTick(() => {
-					if (formData.reportToFormData) {
-						vFormRef.value.setFormData(formData.reportToFormData)
-
-					}
-					vFormRef.value.setFormData(res.data)
-          nextTick(() => {
-            if(dataForm.flowId && dataForm.flowId!=''){
-              flow.value.refresh()
-            }
-            vFormRef.value.handleOnMounted()
-          })
-				})
-			})
+      getInfoDetail(0)
 		} else {
 			vFormRef.value.setFormJson(dataForm.formJson)
 			nextTick(() => {
@@ -259,7 +249,43 @@ const showForm = (formData: any) => {
         })
 			})
 		}
-	})
+	}).finally( ()=> {
+    loading.value = false
+  })
+}
+
+const getInfoDetail = (flag:number) =>{
+  var obj = { devFormCode: dataForm.formCode, btnCode: dataForm.btnCode, btnFormData: { id: dataForm.id } }
+  loading.value = true
+  getInfo(obj).then(res => {
+    loading.value = false
+    dataForm.flowId = res.data.flowId
+    dataForm.flowStatus = res.data.flowStatus
+    dataForm.flowName = dataForm.flowName +":"+res.data[dataForm.businessNoName]
+    dataForm.flowBusinessNo = res.data[dataForm.businessNoName]
+    vFormRef.value.setFormJson(dataForm.formJson)
+    /**
+     if(res.data.spmsFileList){
+     res.data.spmsFileList.forEach((f)=>{
+     f.fileUrl = JSON.parse(f.fileUrl);
+     })
+     }**/
+
+    nextTick(() => {
+      vFormRef.value.setFormData(res.data)
+      nextTick(() => {
+        if(dataForm.flowId && dataForm.flowId!=''){
+          flow.value.refresh()
+        }
+        vFormRef.value.handleOnMounted()
+        if(flag==1){
+          showUserList()
+        }
+      })
+    })
+  }).finally( ()=> {
+    loading.value = false
+  })
 }
 
 const btnFormBefore = (btnData: any,isSubmit: any) => {
@@ -295,7 +321,9 @@ const submitForm = (btnData: any,isSubmit: any) => {
 				if (dataForm.id != '') {
 					obj.btnFormData.id = dataForm.id
 					if (btnData.serviceType == '10') {
+            loading.value = true
 						updateForm(obj).then(res => {
+              loading.value = false
               if(isSubmit==0) {
                 ElMessage.success({
                   message: '修改成功',
@@ -305,19 +333,26 @@ const submitForm = (btnData: any,isSubmit: any) => {
                   }
                 })
               }else{
-                showUserList()
+                getInfoDetail(1)
+
               }
 							//请求后增强
 							btnClickAfterEnhance(btnData, res, obj)
-						})
+						}).finally( ()=> {
+              loading.value = false
+            })
 					}else if (btnData.serviceType == '15') {
             formData.flowKey =  dataForm.flowKey
+            formData.flowId =  dataForm.flowId
             formData.flowName = dataForm.flowName
             formData.flowCategory = dataForm.flowCategory
             formData.auditNote = dataForm.auditNote
+            formData.flowBusinessNo = dataForm.flowBusinessNo
             formData.changeNodeHandlerJson = dataForm.changeNodeHandlerJson
             var obj = { devFormCode: dataForm.formCode, btnCode: btnData.btnCode, btnFormData: formData }
+            loading.value = true
             submitFlowForm(obj).then(res => {
+              loading.value = false
               ElMessage.success({
                 message: '提交流程成功',
                 duration: 500,
@@ -327,6 +362,8 @@ const submitForm = (btnData: any,isSubmit: any) => {
               })
               //请求后增强
               btnClickAfterEnhance(btnData, res, obj)
+            }).finally( ()=> {
+              loading.value = false
             })
           } else if (btnData.serviceType == '55') {
 						defaultBtnServer(obj).then(res => {
@@ -339,11 +376,13 @@ const submitForm = (btnData: any,isSubmit: any) => {
                   }
                 })
               }else{
-                showUserList()
+                getInfoDetail(1)
               }
 							//请求后增强
 							btnClickAfterEnhance(btnData, res, obj)
-						})
+						}).finally( ()=> {
+              loading.value = false
+            })
 					} else if (btnData.serviceType == '60') {
 						btnServerUrl(btnData.btnServerUrl, obj).then(res => {
               if(isSubmit==0) {
@@ -355,15 +394,19 @@ const submitForm = (btnData: any,isSubmit: any) => {
                   }
                 })
               }else{
-                showUserList()
+                getInfoDetail(1)
               }
 							//请求后增强
 							btnClickAfterEnhance(btnData, res, obj)
-						})
+						}).finally( ()=> {
+              loading.value = false
+            })
 					}
 				} else {
 					if (btnData.serviceType == '10') {
+            loading.value = true
 						saveForm(obj).then(res => {
+              loading.value = false
               dataForm.id = res.data
               if(isSubmit==0) {
                 ElMessage.success({
@@ -374,13 +417,17 @@ const submitForm = (btnData: any,isSubmit: any) => {
                   }
                 })
               }else{
-                showUserList()
+                getInfoDetail(1)
               }
 							//请求后增强
 							btnClickAfterEnhance(btnData, res, obj)
-						})
+						}).finally( ()=> {
+              loading.value = false
+            })
 					} else if (btnData.serviceType == '55') {
+            loading.value = true
 						defaultBtnServer(obj).then(res => {
+              loading.value = false
               if(isSubmit==0){
                 ElMessage.success({
                   message: '操作成功',
@@ -390,14 +437,18 @@ const submitForm = (btnData: any,isSubmit: any) => {
                   }
                 })
               }else{
-                showUserList()
+                getInfoDetail(1)
               }
 
 							//请求后增强
 							btnClickAfterEnhance(btnData, res, obj)
-						})
+						}).finally( ()=> {
+              loading.value = false
+            })
 					} else if (btnData.serviceType == '60') {
+            loading.value = true
 						btnServerUrl(btnData.btnServerUrl, obj).then(res => {
+              loading.value = false
               if(isSubmit==0) {
                 ElMessage.success({
                   message: '操作成功',
@@ -407,16 +458,19 @@ const submitForm = (btnData: any,isSubmit: any) => {
                   }
                 })
               }else{
-                showUserList()
+                getInfoDetail(1)
               }
 							//请求后增强
 							btnClickAfterEnhance(btnData, res, obj)
-						})
+						}).finally( ()=> {
+              loading.value = false
+            })
 					}
 				}
 			})
 		})
 		.catch(error => {
+      loading.value = false
 			ElMessage.error({
 				message: error,
 				duration: 500

src/views/ebo/fast/form/indexFormDrawer.vue

@@ -52,6 +52,11 @@
                   <fast-select v-model="dataForm.flowKey" dict-type="flowKey" clearable placeholder="流程名称"></fast-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="4" v-if="dataForm.isFlow=='1'">
+                <el-form-item label="业务编码属性" prop="businessNoName">
+                  <el-input v-model="dataForm.businessNoName"  clearable placeholder="业务单据编码属性"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
 						<el-row>
 							<el-col :span="24">
@@ -143,6 +148,7 @@ const dataForm = reactive({
 	formJson: '',
   isFlow:'0',
   flowKey:'',
+  businessNoName:'',
   flowType:'',
 	formContent: '',
 	otherColumns: '',

src/views/ebo/fast/report/add-or-update.vue

@@ -10,7 +10,7 @@
 	>
 		<template #title><span>快速开发报表</span></template>
 		<div style="padding: 10px">
-			<el-form ref="dataFormRef" :model="dataForm" :rules="dataRules" label-width="100px">
+			<el-form ref="dataFormRef" :model="dataForm" :rules="dataRules" label-width="140px">
 				<el-row>
 					<el-col :span="6">
 						<el-form-item prop="reportCode">
@@ -78,12 +78,29 @@
 							<el-switch v-model="dataForm.isUrl" :active-value="1" :inactive-value="0" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="18">
+					<el-col :span="18" v-if="dataForm.isUrl=='1'">
 						<el-form-item label="URL地址" prop="reportUrl">
 							<el-input v-model="dataForm.reportUrl" placeholder="" clearable />
 						</el-form-item>
 					</el-col>
 				</el-row>
+        <el-row v-if="dataForm.isUrl!='1'">
+          <el-col :span="6">
+            <el-form-item label="是否启用数据权限" prop="isUseDataScope">
+              <el-switch v-model="dataForm.isUseDataScope" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="dataForm.isUseDataScope=='1'">
+            <el-form-item label="数据权限类型" prop="dataScopeListStr">
+              <fast-select v-model="dataForm.dataScopeListStr" dict-type="dataScopeList" multiple="true" clearable placeholder="数据权限类型"></fast-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="dataForm.isUseDataScope=='1'">
+            <el-form-item label="数据权限表别名" prop="dataScopeTableName">
+              <el-input v-model="dataForm.dataScopeTableName" placeholder="" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
 				<el-row>
 					<el-col :span="24">
 						<el-form-item label="报表SQL" prop="reportSql">
@@ -103,7 +120,7 @@
 				<el-row>
 					<el-col :span="24">
 						<el-form-item class="sql-desc">
-							<div>1、变量名：【租户】、【用户名】、【姓名】、【用户ID】、【查询条件】;</div>
+							<div>1、变量名：【租户】、【用户名】、【姓名】、【用户ID】、【数据权限】、【查询条件】、【#列JAVA属性】,其中 【#列JAVA属性】根据业务情况是否需要加单引号;</div>
 							<div>2、显现在SQL中的位置为空时，如有【查询条件】 变量，则将为空的放在【查询条件】位置中，否则叠加条件语句;</div>
 						</el-form-item>
 					</el-col>
@@ -188,11 +205,16 @@ const getReport = (id: number) => {
 			item.searchMode = item.searchMode + ''
 		})
 		Object.assign(dataForm, res.data)
+    if(dataForm.dataScopeList && dataForm.dataScopeList!=''){
+      dataForm.dataScopeListStr = dataForm.dataScopeList.split(',');
+    }
+
 	})
 }
 
 const dataRules = ref({
-	reportName: [{ required: true, message: '必填项不能为空', trigger: 'blur' }]
+	reportName: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
+  dataScopeTableName: [{ required: true, message: '必填项不能为空', trigger: 'blur' }]
 })
 
 const addSearchItem = () => {
@@ -259,7 +281,7 @@ const getExeclTemp = () => {
 				message: '快捷复制导出模型，请粘贴在execl表格中',
 				duration: 500,
 				onClose: () => {
-					//visible.value = false	
+					//visible.value = false
 					//emit('refreshDataList')
 				}
 			})
@@ -283,7 +305,7 @@ const getExeclTemp = () => {
 			message: '快捷复制导出模型，请粘贴在execl表格中',
 			duration: 500,
 			onClose: () => {
-				//visible.value = false	
+				//visible.value = false
 				//emit('refreshDataList')
 			}
 		})
@@ -296,7 +318,11 @@ const submitHandle = () => {
 		if (!valid) {
 			return false
 		}
-
+    if(dataForm.dataScopeListStr!=null && dataForm.dataScopeListStr!=''){
+      dataForm.dataScopeList = dataForm.dataScopeListStr.join(',');
+    }else{
+      dataForm.dataScopeList = '';
+    }
 		useReportSubmitApi(dataForm).then(() => {
 			ElMessage.success({
 				message: '操作成功',

src/views/ebo/fast/report/index.vue

@@ -13,6 +13,12 @@
 			<el-form-item>
 				<el-button v-auth="'ebo:fast:report:save'" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
+      <el-form-item>
+        <el-button v-auth="'ebo:fast:report:exp'" type="primary" @click="expConfig()">导出配置</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button v-auth="'ebo:fast:report:import'" type="primary" @click="importConfig()">导入配置</el-button>
+      </el-form-item>
 			<el-form-item>
 				<el-button v-auth="'ebo:fast:report:delete'" type="danger" @click="deleteBatchHandle()">删除</el-button>
 			</el-form-item>
@@ -88,6 +94,15 @@ const addOrUpdateRef = ref()
 const addOrUpdateHandle = (id?: number) => {
 	addOrUpdateRef.value.init(id)
 }
+
+const expConfig = () =>{
+
+}
+
+const importConfig = () =>{
+
+}
+
 const reviewReport = (row: any) => {
 	router.push({ path: '/ebo/fast/report/reportDevReview/' + row.id })
 }

src/views/ebo/fast/report/reportDevReview.vue

@@ -131,7 +131,7 @@
 import { ArrowDown } from '@element-plus/icons-vue'
 import { onMounted, reactive, ref, watchEffect } from 'vue'
 import { useCrud } from '@/hooks'
-import { useRouter } from 'vue-router'
+import { useRouter,useRoute } from 'vue-router'
 import { IHooksOptions } from '@/hooks/interface'
 import { getReportConfig } from '@/views/ebo/fast/api/report'
 import { getDictLabelList } from '@/utils/tool'
@@ -147,6 +147,7 @@ import ReportDevReviewDialog from "@/views/ebo/fast/report/reportDevReviewDialog
 import { useUserStore } from '@/store/modules/user'
 const useUser = useUserStore()
 const router = useRouter()
+const route = useRoute()
 const reportTableRef = ref()
 const tabsStore = useTabsStore()
 const baseUploadDialogRef = ref()
@@ -201,8 +202,18 @@ const dataForm = reactive({
 	isShowRowCz: false
 })
 
-onMounted(() => {
-	getReport(reportId)
+onMounted(async () => {
+	await getReport(reportId);
+	// 打开弹窗
+	if(route.query.id) {
+		const row = dataForm.fastFormBtnRowList.find((i:any) => i.btnLabel === '详情');
+		console.log('==================',row)
+		if(row) {
+			showBtnForm(row,{
+				id: route.query.id
+			},null)
+		}
+	}
 })
 
 const state: IHooksOptions = reactive({
@@ -532,72 +543,71 @@ const btnClickBeforeEnhance = (btnData: any, rows: any, clickForm: any) => {
 	return bl
 }
 
-const getReport = (id: string) => {
+const getReport = async (id: string) => {
 	var data = { id: id }
-	getReportConfig(data).then(reponse => {
-		document.title = reponse.data.reportName
-		dataForm.isTree = reponse.data.isTree
-		if (dataForm.isTree == 1) {
-			state.limit = 10000
-		}
-		state.queryForm.fastReportCode = reponse.data.reportCode
-		var data = reponse.data.fastReportItemList
-		if (reponse.data.fastFormBtnModelList) {
-			dataForm.fastFormBtnModelList = reponse.data.fastFormBtnModelList
-			var isNeedPrintConnect = 0 //是否需要连接打印机
-			dataForm.fastFormBtnModelList.forEach(item => {
-				if (item.btnLabel.indexOf('打印') >= 0) {
-					isNeedPrintConnect = 1
+	const reponse = await getReportConfig(data);
+	document.title = reponse.data.reportName
+	dataForm.isTree = reponse.data.isTree
+	if (dataForm.isTree == 1) {
+		state.limit = 10000
+	}
+	state.queryForm.fastReportCode = reponse.data.reportCode
+	var data = reponse.data.fastReportItemList
+	if (reponse.data.fastFormBtnModelList) {
+		dataForm.fastFormBtnModelList = reponse.data.fastFormBtnModelList
+		var isNeedPrintConnect = 0 //是否需要连接打印机
+		dataForm.fastFormBtnModelList.forEach(item => {
+			if (item.btnLabel.indexOf('打印') >= 0) {
+				isNeedPrintConnect = 1
+			}
+			if (item.btnShowType == 10) {
+				dataForm.isShowRowCz = true
+				if (item.btnGroupName && item.btnGroupName != '') {
+					dataForm.fastRowManyBtnModelList.push(item)
+					dataForm.btnRowGroupName = item.btnGroupName
+				} else {
+					dataForm.fastFormBtnRowList.push(item)
 				}
-				if (item.btnShowType == 10) {
-					dataForm.isShowRowCz = true
-					if (item.btnGroupName && item.btnGroupName != '') {
-						dataForm.fastRowManyBtnModelList.push(item)
-						dataForm.btnRowGroupName = item.btnGroupName
-					} else {
-						dataForm.fastFormBtnRowList.push(item)
-					}
+			} else {
+				if (item.btnGroupName && item.btnGroupName != '') {
+					dataForm.fastManyBtnModelList.push(item)
+					dataForm.btnGroupName = item.btnGroupName
 				} else {
-					if (item.btnGroupName && item.btnGroupName != '') {
-						dataForm.fastManyBtnModelList.push(item)
-						dataForm.btnGroupName = item.btnGroupName
-					} else {
-						dataForm.fastFormBtnList.push(item)
-					}
+					dataForm.fastFormBtnList.push(item)
 				}
-			})
-			if (isNeedPrintConnect == 1) {
-				doConnect()
 			}
+		})
+		if (isNeedPrintConnect == 1) {
+			doConnect()
 		}
-		for (var i = 0; i < data.length; i++) {
-			if (data[i].isShow == 1) {
-				dataForm.reportColumnData.push(data[i])
-			}
-			if (data[i].isSearch == 1) {
-				dataForm.reportSearchData.push(data[i])
-				if (data[i].searchDefaultValue && data[i].searchDefaultValue != '') {
-					state.queryForm[data[i].columnJavaName] = data[i].searchDefaultValue
-				}
-				dataForm.reportSearchData2.push(data[i].columnJavaName)
-			}
+	}
+	for (var i = 0; i < data.length; i++) {
+		if (data[i].isShow == 1) {
+			dataForm.reportColumnData.push(data[i])
 		}
-		var data2 = reponse.data.fastReportSeachList
-		for (var i = 0; i < data2.length; i++) {
-			if (data2[i].isSearch == 1) {
-				dataForm.reportSearchData.push(data2[i])
-				if (data2[i].searchDefaultValue && data2[i].searchDefaultValue != '') {
-					state.queryForm[data2[i].columnJavaName] = data2[i].searchDefaultValue
-				}
-				dataForm.reportSearchData2.push(data2[i].columnJavaName)
+		if (data[i].isSearch == 1) {
+			dataForm.reportSearchData.push(data[i])
+			if (data[i].searchDefaultValue && data[i].searchDefaultValue != '') {
+				state.queryForm[data[i].columnJavaName] = data[i].searchDefaultValue
 			}
+			dataForm.reportSearchData2.push(data[i].columnJavaName)
 		}
-		if (reponse.data.isUrl == '1') {
-			state.dataListUrl = reponse.data.reportUrl
+	}
+	var data2 = reponse.data.fastReportSeachList
+	for (var i = 0; i < data2.length; i++) {
+		if (data2[i].isSearch == 1) {
+			dataForm.reportSearchData.push(data2[i])
+			if (data2[i].searchDefaultValue && data2[i].searchDefaultValue != '') {
+				state.queryForm[data2[i].columnJavaName] = data2[i].searchDefaultValue
+			}
+			dataForm.reportSearchData2.push(data2[i].columnJavaName)
 		}
+	}
+	if (reponse.data.isUrl == '1') {
+		state.dataListUrl = reponse.data.reportUrl
+	}
 
-		getDataList()
-	})
+	getDataList()
 }
 
 const { getDataList, selectionChangeHandle, sizeChangeHandle, currentChangeHandle, deleteBatchHandle, downloadHandle } = useCrud(state)

src/views/ebo/fast/report/reportDevReviewDialog.vue

@@ -296,8 +296,11 @@ const getReport = (id: string, formObj: any) => {
 	getReportConfig(data).then(reponse => {
 		document.title = reponse.data.reportName
     dataForm.isTree = reponse.data.isTree
+    state.page = 1;
     if (dataForm.isTree == 1) {
       state.limit = 10000
+    }else{
+      state.limit = 10
     }
 		state.queryForm.fastReportCode = reponse.data.reportCode
 		var data = reponse.data.fastReportItemList