@fmdeui/fmui 1.0.174 → 1.0.176

package/es/components/fm-tooltip/index.d.ts

@@ -30,10 +30,15 @@ export declare const FmTooltip: {
             type: ObjectConstructor;
             default: () => void;
         };
+        isDel: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
         content: string;
         params: Record<string, any>;
         label: string;
+        isDel: boolean;
         tipdata: any[];
     }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, HTMLDivElement, ComponentProvideOptions, {
         P: {};
@@ -72,10 +77,15 @@ export declare const FmTooltip: {
             type: ObjectConstructor;
             default: () => void;
         };
+        isDel: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{}>, {}, {}, {}, {}, {
         content: string;
         params: Record<string, any>;
         label: string;
+        isDel: boolean;
         tipdata: any[];
     }>;
     __isFragment?: never;
@@ -111,10 +121,15 @@ export declare const FmTooltip: {
         type: ObjectConstructor;
         default: () => void;
     };
+    isDel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
     content: string;
     params: Record<string, any>;
     label: string;
+    isDel: boolean;
     tipdata: any[];
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
     $slots: {

package/es/components/fm-tooltip/index.vue.d.ts

@@ -38,6 +38,10 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
         default: () => void;
     };
+    isDel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
     label: {
         type: StringConstructor;
@@ -68,10 +72,15 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
         default: () => void;
     };
+    isDel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{}>, {
     content: string;
     params: Record<string, any>;
     label: string;
+    isDel: boolean;
     tipdata: any[];
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, HTMLDivElement>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;

package/es/packages/components/fm-tooltip/index2.vue.mjs

@@ -1,10 +1,11 @@
-import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, renderSlot, createTextVNode, toDisplayString, createBlock, withCtx, createVNode, unref, Fragment, renderList, createElementVNode, createCommentVNode } from 'vue';
+import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, createElementVNode, renderSlot, createTextVNode, toDisplayString, createBlock, withCtx, createVNode, unref, Fragment, renderList, createCommentVNode } from 'vue';
 import { Opportunity } from '@element-plus/icons-vue';
 import '../../stores/index.mjs';
 import { usefmPageFormDatatore } from '../../stores/thepagefromdata.mjs';
 
-const _hoisted_1 = { style: { "display": "inline-flex" } };
-const _hoisted_2 = ["innerHTML"];
+const _hoisted_1 = { style: { "position": "relative", "display": "inline-flex", "align-items": "center", "width": "100%", "max-width": "100%" } };
+const _hoisted_2 = { style: { "flex": "1", "min-width": "0", "position": "relative" } };
+const _hoisted_3 = ["innerHTML"];
 var _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "FmTooltip"
@@ -27,33 +28,44 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => {
       }
+    },
+    isDel: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
     const props = __props;
     const useBaseApi = usefmPageFormDatatore();
     const tipLoadData = computed(() => {
-      var _a;
-      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+      var _a, _b;
+      if (props.isDel) {
+        return useBaseApi.getLableDelLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+      }
+      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_b = props.params) == null ? void 0 : _b.bizType) || "basefrom");
     });
     return (_ctx, _cache) => {
       const _component_el_icon = resolveComponent("el-icon");
       const _component_el_tooltip = resolveComponent("el-tooltip");
       return openBlock(), createElementBlock("div", _hoisted_1, [
-        renderSlot(_ctx.$slots, "default"),
-        createTextVNode(
-          " " + toDisplayString(__props.label) + " ",
-          1
-          /* TEXT */
-        ),
+        createElementVNode("div", _hoisted_2, [
+          renderSlot(_ctx.$slots, "default", {}, () => [
+            createTextVNode(
+              toDisplayString(__props.label),
+              1
+              /* TEXT */
+            )
+          ])
+        ]),
         tipLoadData.value.length > 0 || __props.content ? (openBlock(), createBlock(_component_el_tooltip, {
           key: 0,
           "raw-content": "",
           placement: "top",
-          effect: "light"
+          effect: "light",
+          style: { "position": "absolute", "top": "4px", "right": "4px", "z-index": "10", "line-height": "1" }
         }, {
           content: withCtx(() => [
-            tipLoadData.value.length > 0 ? (openBlock(true), createElementBlock(
+            tipLoadData.value.length > 0 && !__props.isDel ? (openBlock(true), createElementBlock(
               Fragment,
               { key: 0 },
               renderList(tipLoadData.value, (value) => {
@@ -98,13 +110,50 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               }),
               256
               /* UNKEYED_FRAGMENT */
+            )) : createCommentVNode("v-if", true),
+            tipLoadData.value.length > 0 && __props.isDel ? (openBlock(true), createElementBlock(
+              Fragment,
+              { key: 1 },
+              renderList(tipLoadData.value, (value) => {
+                return openBlock(), createElementBlock("p", null, [
+                  _cache[3] || (_cache[3] = createTextVNode(
+                    " \u5220\u9664\u3010",
+                    -1
+                    /* CACHED */
+                  )),
+                  createElementVNode(
+                    "strong",
+                    null,
+                    toDisplayString((value == null ? void 0 : value.supplierName) != null ? (value == null ? void 0 : value.supplierName) + "/" : "") + " " + toDisplayString(value.itemName),
+                    1
+                    /* TEXT */
+                  ),
+                  createTextVNode(
+                    "\u3011" + toDisplayString(value == null ? void 0 : value.price) + "*" + toDisplayString((value == null ? void 0 : value.numA) != null ? value == null ? void 0 : value.numA : value == null ? void 0 : value.num) + "*" + toDisplayString((value == null ? void 0 : value.unit) != null ? value == null ? void 0 : value.unit : (value == null ? void 0 : value.numB) || 1) + "=" + toDisplayString(value == null ? void 0 : value.totalMoney) + "\uFF0C",
+                    1
+                    /* TEXT */
+                  ),
+                  createElementVNode(
+                    "strong",
+                    null,
+                    toDisplayString(value.opUser) + " " + toDisplayString(value.opDate),
+                    1
+                    /* TEXT */
+                  )
+                ]);
+              }),
+              256
+              /* UNKEYED_FRAGMENT */
             )) : (openBlock(), createElementBlock("p", {
-              key: 1,
+              key: 2,
               innerHTML: __props.content
-            }, null, 8, _hoisted_2))
+            }, null, 8, _hoisted_3))
           ]),
           default: withCtx(() => [
-            createVNode(_component_el_icon, { color: "#ff4d4f" }, {
+            createVNode(_component_el_icon, {
+              size: 10,
+              color: "#ff4d4f"
+            }, {
               default: withCtx(() => [
                 createVNode(unref(Opportunity))
               ]),

package/es/packages/stores/thepagefromdata.mjs

@@ -8,6 +8,7 @@ const usefmPageFormDatatore = defineStore("fmPageFormDatatore", () => {
   });
   const setFormData = (data, bizType = "basefrom") => {
     state.formData[bizType] = data;
+    state.currentBizType = bizType;
   };
   const setCurrentBizType = (bizType = "") => {
     state.currentBizType = bizType;
@@ -42,13 +43,38 @@ const usefmPageFormDatatore = defineStore("fmPageFormDatatore", () => {
     }
     return resultLogData;
   };
+  const getLableDelLogData = (table, field, bizid, bizinType = "basefrom") => {
+    const resultLogData = [];
+    const bizType = state.currentBizType != "" ? state.currentBizType : bizinType;
+    if (state.formData[bizType]) {
+      state.formData[bizType].forEach((item) => {
+        var _a, _b;
+        const filteredLogs = (_b = (_a = item.logData) == null ? void 0 : _a.filter(
+          (log) => {
+            var _a2;
+            return log.table === table && log.field === field && ((_a2 = log == null ? void 0 : log.snapshot) == null ? void 0 : _a2.regMainId) === bizid && log.actionType === "delete";
+          }
+        )) != null ? _b : [];
+        filteredLogs.forEach((log) => {
+          resultLogData.push({
+            ...log.snapshot,
+            // 保留原有属性
+            opUser: item.createUserName,
+            opDate: item.createTime
+          });
+        });
+      });
+    }
+    return resultLogData;
+  };
   return {
     setCurrentBizType,
     setFormData,
     getFormData,
     clearFormData,
     clearAllFormData,
-    getLableLogData
+    getLableLogData,
+    getLableDelLogData
   };
 });
 

package/es/stores/thepagefromdata.d.ts

@@ -11,6 +11,7 @@ export declare const usefmPageFormDatatore: StoreDefinition<"fmPageFormDatatore"
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
     getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
+    getLableDelLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
 }, never>, Pick<{
     setCurrentBizType: (bizType?: string) => void;
     setFormData: (data: any, bizType?: string) => void;
@@ -18,6 +19,7 @@ export declare const usefmPageFormDatatore: StoreDefinition<"fmPageFormDatatore"
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
     getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
+    getLableDelLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
 }, never>, Pick<{
     setCurrentBizType: (bizType?: string) => void;
     setFormData: (data: any, bizType?: string) => void;
@@ -25,4 +27,5 @@ export declare const usefmPageFormDatatore: StoreDefinition<"fmPageFormDatatore"
     clearFormData: (bizType?: string) => void;
     clearAllFormData: () => void;
     getLableLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
-}, "setCurrentBizType" | "setFormData" | "getFormData" | "clearFormData" | "clearAllFormData" | "getLableLogData">>;
+    getLableDelLogData: (table: any, field: any, bizid: any, bizinType?: string) => any[];
+}, "setCurrentBizType" | "setFormData" | "getFormData" | "clearFormData" | "clearAllFormData" | "getLableLogData" | "getLableDelLogData">>;

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.174 */
+/*! fmdeui-fmui v1.0.176 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('vue-router'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', 'vue-router', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -4103,6 +4103,7 @@
 	  });
 	  const setFormData = (data, bizType = "basefrom") => {
 	    state.formData[bizType] = data;
+	    state.currentBizType = bizType;
 	  };
 	  const setCurrentBizType = (bizType = "") => {
 	    state.currentBizType = bizType;
@@ -4137,13 +4138,38 @@
 	    }
 	    return resultLogData;
 	  };
+	  const getLableDelLogData = (table, field, bizid, bizinType = "basefrom") => {
+	    const resultLogData = [];
+	    const bizType = state.currentBizType != "" ? state.currentBizType : bizinType;
+	    if (state.formData[bizType]) {
+	      state.formData[bizType].forEach((item) => {
+	        var _a, _b;
+	        const filteredLogs = (_b = (_a = item.logData) == null ? void 0 : _a.filter(
+	          (log) => {
+	            var _a2;
+	            return log.table === table && log.field === field && ((_a2 = log == null ? void 0 : log.snapshot) == null ? void 0 : _a2.regMainId) === bizid && log.actionType === "delete";
+	          }
+	        )) != null ? _b : [];
+	        filteredLogs.forEach((log) => {
+	          resultLogData.push({
+	            ...log.snapshot,
+	            // 保留原有属性
+	            opUser: item.createUserName,
+	            opDate: item.createTime
+	          });
+	        });
+	      });
+	    }
+	    return resultLogData;
+	  };
 	  return {
 	    setCurrentBizType,
 	    setFormData,
 	    getFormData,
 	    clearFormData,
 	    clearAllFormData,
-	    getLableLogData
+	    getLableLogData,
+	    getLableDelLogData
 	  };
 	});
 
@@ -22090,7 +22116,7 @@
 
 	const _hoisted_1$B = { class: "inside_box" };
 	const _hoisted_2$r = { class: "inside_box_title" };
-	const _hoisted_3$i = { class: "check-box" };
+	const _hoisted_3$j = { class: "check-box" };
 	const _hoisted_4$9 = { class: "more_dropdown_icon" };
 	const _hoisted_5$8 = { class: "out_box" };
 	var _sfc_main$P = /* @__PURE__ */ vue.defineComponent({
@@ -22240,7 +22266,7 @@
 	                1
 	                /* TEXT */
 	              ),
-	              vue.createElementVNode("div", _hoisted_3$i, [
+	              vue.createElementVNode("div", _hoisted_3$j, [
 	                vue.createVNode(_component_el_button, {
 	                  size: "small",
 	                  link: "",
@@ -23110,7 +23136,7 @@
 	  class: "table_query_condition"
 	};
 	const _hoisted_2$q = ["element-loading-text"];
-	const _hoisted_3$h = { key: 2 };
+	const _hoisted_3$i = { key: 2 };
 	const _hoisted_4$8 = {
 	  key: 0,
 	  class: "f-table-select__page"
@@ -23962,7 +23988,7 @@
 	                              key: 1,
 	                              scope
 	                            }) : vue.createCommentVNode("v-if", true),
-	                            !item.render && !item.slotName ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$h, [
+	                            !item.render && !item.slotName ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$i, [
 	                              vue.createElementVNode(
 	                                "span",
 	                                null,
@@ -24985,7 +25011,7 @@
 
 	const _hoisted_1$x = { class: "layout-breadcrumb-seting" };
 	const _hoisted_2$o = { class: "layout-breadcrumb-seting-bar-flex" };
-	const _hoisted_3$g = { class: "layout-breadcrumb-seting-bar-flex-label" };
+	const _hoisted_3$h = { class: "layout-breadcrumb-seting-bar-flex-label" };
 	const _hoisted_4$7 = { class: "layout-breadcrumb-seting-bar-flex-value" };
 	const _hoisted_5$7 = { style: { "margin": "10px 0" } };
 	const _hoisted_6$3 = { class: "layout-breadcrumb-seting-bar-flex mt15" };
@@ -25400,7 +25426,7 @@
 	                vue.createElementVNode("div", _hoisted_2$o, [
 	                  vue.createElementVNode(
 	                    "div",
-	                    _hoisted_3$g,
+	                    _hoisted_3$h,
 	                    vue.toDisplayString(_ctx.$t("message.layout.themeColors")),
 	                    1
 	                    /* TEXT */
@@ -27729,7 +27755,7 @@
 
 	const _hoisted_1$v = { style: { "color": "#fff" } };
 	const _hoisted_2$n = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
-	const _hoisted_3$f = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
+	const _hoisted_3$g = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
 	const _hoisted_4$6 = { style: { "margin-top": "10px" } };
 	const _hoisted_5$6 = { class: "dialog-footer" };
 	var _sfc_main$B = /* @__PURE__ */ vue.defineComponent({
@@ -27939,7 +27965,7 @@
 	                default: vue.withCtx(() => [
 	                  vue.createElementVNode(
 	                    "p",
-	                    _hoisted_3$f,
+	                    _hoisted_3$g,
 	                    vue.toDisplayString(_ctx.$t(__props.title)) + vue.toDisplayString(_ctx.$t("\u5217\u8868")),
 	                    1
 	                    /* TEXT */
@@ -28125,7 +28151,7 @@
 
 	const _hoisted_1$u = { style: { "color": "#fff" } };
 	const _hoisted_2$m = { style: { "margin-top": "10px" } };
-	const _hoisted_3$e = { class: "dialog-footer" };
+	const _hoisted_3$f = { class: "dialog-footer" };
 	var _sfc_main$A = /* @__PURE__ */ vue.defineComponent({
 	  __name: "supplierSelectDialog",
 	  props: {
@@ -28269,7 +28295,7 @@
 	          ])
 	        ]),
 	        footer: vue.withCtx(() => [
-	          vue.createElementVNode("div", _hoisted_3$e, [
+	          vue.createElementVNode("div", _hoisted_3$f, [
 	            vue.createVNode(_component_el_button, {
 	              icon: "ele-CircleCloseFilled",
 	              onClick: closeDialog
@@ -28504,7 +28530,7 @@
 
 	const _hoisted_1$t = { style: { "color": "#fff" } };
 	const _hoisted_2$l = { style: { "margin-top": "10px" } };
-	const _hoisted_3$d = { class: "dialog-footer" };
+	const _hoisted_3$e = { class: "dialog-footer" };
 	var _sfc_main$z = /* @__PURE__ */ vue.defineComponent({
 	  __name: "supplierUserSelectDialog",
 	  props: {
@@ -28641,7 +28667,7 @@
 	          ])
 	        ]),
 	        footer: vue.withCtx(() => [
-	          vue.createElementVNode("div", _hoisted_3$d, [
+	          vue.createElementVNode("div", _hoisted_3$e, [
 	            vue.createVNode(_component_el_button, {
 	              icon: "ele-CircleCloseFilled",
 	              onClick: closeDialog
@@ -28833,7 +28859,7 @@
 
 	const _hoisted_1$s = { style: { "color": "#fff" } };
 	const _hoisted_2$k = { style: { "margin-top": "10px" } };
-	const _hoisted_3$c = { class: "dialog-footer" };
+	const _hoisted_3$d = { class: "dialog-footer" };
 	var _sfc_main$y = /* @__PURE__ */ vue.defineComponent({
 	  __name: "accountSelectDialog",
 	  props: {
@@ -28968,7 +28994,7 @@
 	          ])
 	        ]),
 	        footer: vue.withCtx(() => [
-	          vue.createElementVNode("div", _hoisted_3$c, [
+	          vue.createElementVNode("div", _hoisted_3$d, [
 	            vue.createVNode(_component_el_button, {
 	              icon: "ele-CircleCloseFilled",
 	              onClick: closeDialog
@@ -29154,7 +29180,7 @@
 
 	const _hoisted_1$r = { style: { "color": "#fff" } };
 	const _hoisted_2$j = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
-	const _hoisted_3$b = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
+	const _hoisted_3$c = { style: { "padding": "8px 16px", "background-color": "var(--el-color-primary-light-9)", "border-left": "5px solid var(--el-color-primary)", "margin-bottom": "5px" } };
 	const _hoisted_4$5 = { style: { "margin-top": "10px" } };
 	const _hoisted_5$5 = { class: "dialog-footer" };
 	var _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
@@ -29327,7 +29353,7 @@
 	                default: vue.withCtx(() => [
 	                  vue.createElementVNode(
 	                    "p",
-	                    _hoisted_3$b,
+	                    _hoisted_3$c,
 	                    vue.toDisplayString(_ctx.$t(__props.title)) + vue.toDisplayString(_ctx.$t("\u5217\u8868")),
 	                    1
 	                    /* TEXT */
@@ -29480,7 +29506,7 @@
 
 	const _hoisted_1$q = { style: { "color": "#fff" } };
 	const _hoisted_2$i = { style: { "margin-top": "10px" } };
-	const _hoisted_3$a = { class: "dialog-footer" };
+	const _hoisted_3$b = { class: "dialog-footer" };
 	var _sfc_main$w = /* @__PURE__ */ vue.defineComponent({
 	  __name: "linSelectDialog",
 	  props: {
@@ -29617,7 +29643,7 @@
 	          ])
 	        ]),
 	        footer: vue.withCtx(() => [
-	          vue.createElementVNode("div", _hoisted_3$a, [
+	          vue.createElementVNode("div", _hoisted_3$b, [
 	            vue.createVNode(_component_el_button, {
 	              icon: "ele-CircleCloseFilled",
 	              onClick: closeDialog
@@ -29821,7 +29847,7 @@
 
 	const _hoisted_1$p = { style: { "color": "#fff" } };
 	const _hoisted_2$h = { style: { "margin-top": "10px" } };
-	const _hoisted_3$9 = { class: "dialog-footer" };
+	const _hoisted_3$a = { class: "dialog-footer" };
 	var _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
 	  __name: "guideSelectDialog",
 	  props: {
@@ -29958,7 +29984,7 @@
 	          ])
 	        ]),
 	        footer: vue.withCtx(() => [
-	          vue.createElementVNode("div", _hoisted_3$9, [
+	          vue.createElementVNode("div", _hoisted_3$a, [
 	            vue.createVNode(_component_el_button, {
 	              icon: "ele-CircleCloseFilled",
 	              onClick: closeDialog
@@ -30138,7 +30164,7 @@
 
 	const _hoisted_1$o = { style: { "color": "#fff" } };
 	const _hoisted_2$g = { style: { "margin-top": "10px" } };
-	const _hoisted_3$8 = { class: "dialog-footer" };
+	const _hoisted_3$9 = { class: "dialog-footer" };
 	var _sfc_main$u = /* @__PURE__ */ vue.defineComponent({
 	  __name: "dirverSelectDialog",
 	  props: {
@@ -30275,7 +30301,7 @@
 	          ])
 	        ]),
 	        footer: vue.withCtx(() => [
-	          vue.createElementVNode("div", _hoisted_3$8, [
+	          vue.createElementVNode("div", _hoisted_3$9, [
 	            vue.createVNode(_component_el_button, {
 	              icon: "ele-CircleCloseFilled",
 	              onClick: closeDialog
@@ -31448,8 +31474,9 @@
 
 	const FmPeriod = _sfc_main$q;
 
-	const _hoisted_1$k = { style: { "display": "inline-flex" } };
-	const _hoisted_2$e = ["innerHTML"];
+	const _hoisted_1$k = { style: { "position": "relative", "display": "inline-flex", "align-items": "center", "width": "100%", "max-width": "100%" } };
+	const _hoisted_2$e = { style: { "flex": "1", "min-width": "0", "position": "relative" } };
+	const _hoisted_3$8 = ["innerHTML"];
 	var _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
 	  ...{
 	    name: "FmTooltip"
@@ -31472,33 +31499,44 @@
 	      type: Object,
 	      default: () => {
 	      }
+	    },
+	    isDel: {
+	      type: Boolean,
+	      default: false
 	    }
 	  },
 	  setup(__props) {
 	    const props = __props;
 	    const useBaseApi = usefmPageFormDatatore();
 	    const tipLoadData = vue.computed(() => {
-	      var _a;
-	      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+	      var _a, _b;
+	      if (props.isDel) {
+	        return useBaseApi.getLableDelLogData(props.params.table, props.params.field, props.params.bizid, ((_a = props.params) == null ? void 0 : _a.bizType) || "basefrom");
+	      }
+	      return useBaseApi.getLableLogData(props.params.table, props.params.field, props.params.bizid, ((_b = props.params) == null ? void 0 : _b.bizType) || "basefrom");
 	    });
 	    return (_ctx, _cache) => {
 	      const _component_el_icon = vue.resolveComponent("el-icon");
 	      const _component_el_tooltip = vue.resolveComponent("el-tooltip");
 	      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$k, [
-	        vue.renderSlot(_ctx.$slots, "default"),
-	        vue.createTextVNode(
-	          " " + vue.toDisplayString(__props.label) + " ",
-	          1
-	          /* TEXT */
-	        ),
+	        vue.createElementVNode("div", _hoisted_2$e, [
+	          vue.renderSlot(_ctx.$slots, "default", {}, () => [
+	            vue.createTextVNode(
+	              vue.toDisplayString(__props.label),
+	              1
+	              /* TEXT */
+	            )
+	          ])
+	        ]),
 	        tipLoadData.value.length > 0 || __props.content ? (vue.openBlock(), vue.createBlock(_component_el_tooltip, {
 	          key: 0,
 	          "raw-content": "",
 	          placement: "top",
-	          effect: "light"
+	          effect: "light",
+	          style: { "position": "absolute", "top": "4px", "right": "4px", "z-index": "10", "line-height": "1" }
 	        }, {
 	          content: vue.withCtx(() => [
-	            tipLoadData.value.length > 0 ? (vue.openBlock(true), vue.createElementBlock(
+	            tipLoadData.value.length > 0 && !__props.isDel ? (vue.openBlock(true), vue.createElementBlock(
 	              vue.Fragment,
 	              { key: 0 },
 	              vue.renderList(tipLoadData.value, (value) => {
@@ -31543,13 +31581,50 @@
 	              }),
 	              256
 	              /* UNKEYED_FRAGMENT */
+	            )) : vue.createCommentVNode("v-if", true),
+	            tipLoadData.value.length > 0 && __props.isDel ? (vue.openBlock(true), vue.createElementBlock(
+	              vue.Fragment,
+	              { key: 1 },
+	              vue.renderList(tipLoadData.value, (value) => {
+	                return vue.openBlock(), vue.createElementBlock("p", null, [
+	                  _cache[3] || (_cache[3] = vue.createTextVNode(
+	                    " \u5220\u9664\u3010",
+	                    -1
+	                    /* CACHED */
+	                  )),
+	                  vue.createElementVNode(
+	                    "strong",
+	                    null,
+	                    vue.toDisplayString((value == null ? void 0 : value.supplierName) != null ? (value == null ? void 0 : value.supplierName) + "/" : "") + " " + vue.toDisplayString(value.itemName),
+	                    1
+	                    /* TEXT */
+	                  ),
+	                  vue.createTextVNode(
+	                    "\u3011" + vue.toDisplayString(value == null ? void 0 : value.price) + "*" + vue.toDisplayString((value == null ? void 0 : value.numA) != null ? value == null ? void 0 : value.numA : value == null ? void 0 : value.num) + "*" + vue.toDisplayString((value == null ? void 0 : value.unit) != null ? value == null ? void 0 : value.unit : (value == null ? void 0 : value.numB) || 1) + "=" + vue.toDisplayString(value == null ? void 0 : value.totalMoney) + "\uFF0C",
+	                    1
+	                    /* TEXT */
+	                  ),
+	                  vue.createElementVNode(
+	                    "strong",
+	                    null,
+	                    vue.toDisplayString(value.opUser) + " " + vue.toDisplayString(value.opDate),
+	                    1
+	                    /* TEXT */
+	                  )
+	                ]);
+	              }),
+	              256
+	              /* UNKEYED_FRAGMENT */
 	            )) : (vue.openBlock(), vue.createElementBlock("p", {
-	              key: 1,
+	              key: 2,
 	              innerHTML: __props.content
-	            }, null, 8, _hoisted_2$e))
+	            }, null, 8, _hoisted_3$8))
 	          ]),
 	          default: vue.withCtx(() => [
-	            vue.createVNode(_component_el_icon, { color: "#ff4d4f" }, {
+	            vue.createVNode(_component_el_icon, {
+	              size: 10,
+	              color: "#ff4d4f"
+	            }, {
 	              default: vue.withCtx(() => [
 	                vue.createVNode(vue.unref(svg.Opportunity))
 	              ]),