From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js b/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js
index 12d8d09..9b8a46c 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js
@@ -1,10 +1,12 @@
/**
- * 鎸夐挳澶勭悊 椤甸潰灞曠ず涓簍ab閫夐」鍗�
+ * 鎸夐挳澶勭悊 寮圭獥灞曠ず璇︽儏
*/
-import {paramLow,callPreEvent,callPostEvent,replaceFreeMarker} from './BaseAction';
+import {paramLow,callPreEvent,callPostEvent,replaceFreeMarker} from '../BaseAction';
import {validatenull} from "@/util/validate";
import Vue from "vue";
-import ViewDialog from "@/components/actions/ViewDialog";
+import ViewTab from "@/views/base/ViewTab";
+import router from "@/router/router"
+import store from "@/store/index"
export const doAction = (options,callback) => {
const paramVOS = Object.assign({
@@ -26,7 +28,6 @@
Vue.prototype.$message.error("浠呰兘閫夋嫨涓�鏉℃暟鎹潵鎿嶄綔");
return false;
}
-
callPreEvent(options, doBefore, function (options) {
doView(options, function (type,formData) {
callPostEvent(options, doAfter,type, callback);
@@ -52,30 +53,30 @@
}
}
paramVOS.component=component;
- let name="鏌ョ湅璇︽儏"
if(paramVOS.showname){
- name="鏌ョ湅銆�"+replaceFreeMarker(paramVOS.showname,options.dataStore,options.sourceData)+"銆�"
+ const name="鏌ョ湅銆�"+replaceFreeMarker(paramVOS.showname,options.dataStore,options.sourceData)+"銆�";
+ paramVOS.title=name;
}
- paramVOS.title=name;
- const dialogConstructor = Vue.extend(ViewDialog);
- let instance = new dialogConstructor();
- instance.sourceData = options.sourceData;
- instance.dataStore = options.dataStore;
- instance.paramVOS = paramVOS
+ const params= {
+ options: {
+ sourceData: options.sourceData,
+ dataStore: options.dataStore,
+ paramVOS: paramVOS
+ },
+ saveCallback: callback,
+ title: paramVOS.title
+ }
- instance.dialogClose = function () {
- vm.visible = false;
- document.body.removeChild(vm.$el);
- instance.$destroy();
- instance = null;
- };
- if (callback) {
- instance.saveCallback = callback;
- }
- let vm = instance.$mount();
- document.body.appendChild(vm.$el);
- instance.visible = true;
+ store.dispatch("setViewtabparams", params);
+ router.push({
+ name: "鏌ョ湅璇︽儏",
+ query:{
+ name:params.title
+ }
+ //params:params //鍔犲弬鏁板悗椤甸潰鍒锋柊鏃朵細澶氫竴涓�夐」鍗�
+ });
}
+
/**
* 鍓嶇疆浜嬩欢
* @param options 鎸夐挳鐨勯厤缃俊鎭�
--
Gitblit v1.9.3