ocpview-plus 1.3.2 → 1.3.4

package/dist/ocpviewplus.min.esm.js

@@ -453,7 +453,7 @@ common.initEview = function(ViewUI2) {
   common.initAnchor(ViewUI2.Anchor);
 };
 const name = "ocpview-plus";
-const version$2 = "1.3.2";
+const version$2 = "1.3.3";
 const title = "ocpviewPlus";
 const description = "A high quality Service UI components Library with Vue.js";
 const homepage = "";
@@ -4797,7 +4797,7 @@ const _sfc_main$1T = {
 };
 const _hoisted_1$17 = { key: 0 };
 const _hoisted_2$N = { key: 0 };
-const _hoisted_3$t = { href: "javascript:void(0)" };
+const _hoisted_3$u = { href: "javascript:void(0)" };
 function _sfc_render$1B(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Ebutton = resolveComponent("Ebutton");
   const _component_Button = resolveComponent("Button");
@@ -4962,7 +4962,7 @@ function _sfc_render$1B(_ctx, _cache, $props, $setup, $data, $options) {
             })
           ]),
           default: withCtx(() => [
-            createElementVNode("a", _hoisted_3$t, [
+            createElementVNode("a", _hoisted_3$u, [
               _cache[1] || (_cache[1] = createTextVNode(" \u64CD\u4F5C ")),
               createVNode(_component_CommonIcon, { type: "ios-arrow-down" })
             ])
@@ -6375,7 +6375,7 @@ const _hoisted_1$16 = {
   style: { "color": "#348eed" }
 };
 const _hoisted_2$M = { key: 1 };
-const _hoisted_3$s = ["onClick"];
+const _hoisted_3$t = ["onClick"];
 function _sfc_render$1z(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ControlBox = resolveComponent("ControlBox");
   const _component_ShowText = resolveComponent("ShowText");
@@ -6435,7 +6435,7 @@ function _sfc_render$1z(_ctx, _cache, $props, $setup, $data, $options) {
                           label: $options.formatValue(_ctx.form[item.name], _ctx.form, item),
                           contentAlign: "left"
                         }, null, 8, ["label"]))
-                      ], 8, _hoisted_3$s)
+                      ], 8, _hoisted_3$t)
                     ]),
                     _: 2
                   }, 1032, ["label", "prop"])
@@ -8706,7 +8706,7 @@ const _sfc_main$1M = {
 };
 const _hoisted_1$15 = { ref: "head" };
 const _hoisted_2$L = { key: 0 };
-const _hoisted_3$r = { key: 0 };
+const _hoisted_3$s = { key: 0 };
 const _hoisted_4$p = {
   ref: "page",
   name: "page"
@@ -8894,7 +8894,7 @@ function _sfc_render$1y(_ctx, _cache, $props, $setup, $data, $options) {
           };
         })
       ]), 1032, ["row-class-name", "loading", "show-summary", "summary-method", "size", "stripe", "border", "height", "max-height", "show-header", "columns", "data", "onOnSortChange", "onOnCurrentChange", "highlight-row", "onOnRowDblclick", "onOnSelect", "onOnSelectCancel", "onOnSelectionChange", "onOnRowClick", "onOnColumnWidthResize"]),
-      _ctx.$slots.footer ? (openBlock(), createElementBlock("div", _hoisted_3$r, [
+      _ctx.$slots.footer ? (openBlock(), createElementBlock("div", _hoisted_3$s, [
         renderSlot(_ctx.$slots, "footer")
       ])) : createCommentVNode("", true),
       createElementVNode("div", _hoisted_4$p, [
@@ -10184,7 +10184,7 @@ const _sfc_main$1K = {
 };
 const _hoisted_1$14 = ["id"];
 const _hoisted_2$K = { key: 0 };
-const _hoisted_3$q = ["onClick"];
+const _hoisted_3$r = ["onClick"];
 const _hoisted_4$o = {
   key: 0,
   ref: "page",
@@ -10295,7 +10295,7 @@ function _sfc_render$1x(_ctx, _cache, $props, $setup, $data, $options) {
                     contentAlign: config2.contentAlign,
                     class: normalizeClass(_ctx.IsCellError(index, config2))
                   }, null, 8, ["label", "contentAlign", "class"]))
-                ], 8, _hoisted_3$q)
+                ], 8, _hoisted_3$r)
               ])
             };
           })
@@ -10510,7 +10510,7 @@ const _sfc_main$1J = {
 };
 const _hoisted_1$13 = ["textContent"];
 const _hoisted_2$J = { key: 1 };
-const _hoisted_3$p = {
+const _hoisted_3$q = {
   key: 4,
   style: { "margin-left": "10px" }
 };
@@ -10555,7 +10555,7 @@ function _sfc_render$1w(_ctx, _cache, $props, $setup, $data, $options) {
         href: "#",
         onClick: _cache[3] || (_cache[3] = withModifiers((...args) => _ctx.addRow && _ctx.addRow(...args), ["prevent"]))
       }, toDisplayString($data.myConfig.addBtnName), 1)) : createCommentVNode("", true),
-      $data.showBtn && $data.myConfig.addBtnType === "3" && $data.btnReadOnly ? (openBlock(), createElementBlock("span", _hoisted_3$p, toDisplayString($data.myConfig.addBtnName), 1)) : createCommentVNode("", true),
+      $data.showBtn && $data.myConfig.addBtnType === "3" && $data.btnReadOnly ? (openBlock(), createElementBlock("span", _hoisted_3$q, toDisplayString($data.myConfig.addBtnName), 1)) : createCommentVNode("", true),
       $data.showBtn && !$data.myConfig.readOnly && $data.myConfig.addBtnType === "1" ? (openBlock(), createElementBlock("a", {
         key: 5,
         href: "#",
@@ -27104,7 +27104,7 @@ const _hoisted_1$11 = {
   class: "ivu-select-selection"
 };
 const _hoisted_2$I = { class: "ivu-tag-text" };
-const _hoisted_3$o = {
+const _hoisted_3$p = {
   key: 0,
   class: "ivu-tag ivu-tag-checked"
 };
@@ -27167,7 +27167,7 @@ function _sfc_render$1n(_ctx, _cache, $props, $setup, $data, $options) {
           })
         ]),
         default: withCtx(() => [
-          $data.myConfig.maxTagCount !== void 0 && $data.selectedMultiple.length > $data.myConfig.maxTagCount ? (openBlock(), createElementBlock("div", _hoisted_3$o, [
+          $data.myConfig.maxTagCount !== void 0 && $data.selectedMultiple.length > $data.myConfig.maxTagCount ? (openBlock(), createElementBlock("div", _hoisted_3$p, [
             createElementVNode("span", _hoisted_4$m, " + " + toDisplayString($data.selectedMultiple.length - $data.myConfig.maxTagCount) + "... ", 1)
           ])) : createCommentVNode("", true)
         ]),
@@ -30047,7 +30047,7 @@ const _sfc_main$1m = {
 };
 const _hoisted_1$Z = { style: { "text-align": "center" } };
 const _hoisted_2$G = ["onClick"];
-const _hoisted_3$n = ["onClick"];
+const _hoisted_3$o = ["onClick"];
 const _hoisted_4$l = ["src", "data-original"];
 const _hoisted_5$i = { key: 0 };
 function _sfc_render$1e(_ctx, _cache, $props, $setup, $data, $options) {
@@ -30100,7 +30100,7 @@ function _sfc_render$1e(_ctx, _cache, $props, $setup, $data, $options) {
                         color: "#ed4014",
                         size: "16"
                       })
-                    ], 8, _hoisted_3$n)) : createCommentVNode("", true)
+                    ], 8, _hoisted_3$o)) : createCommentVNode("", true)
                   ]),
                   _cache[1] || (_cache[1] = createTextVNode(" \xA0"))
                 ]),
@@ -30496,7 +30496,7 @@ const _hoisted_1$Y = {
   class: "filebtn"
 };
 const _hoisted_2$F = { ref: "photo" };
-const _hoisted_3$m = ["src", "data-original"];
+const _hoisted_3$n = ["src", "data-original"];
 const _hoisted_4$k = ["innerHTML"];
 const _hoisted_5$h = {
   ref: "pdf",
@@ -30597,7 +30597,7 @@ function _sfc_render$1d(_ctx, _cache, $props, $setup, $data, $options) {
           src: $data.imgUrl,
           "data-original": `${$data.imgUrl}`,
           style: { "width": "100%", "height": "100%" }
-        }, null, 8, _hoisted_3$m)
+        }, null, 8, _hoisted_3$n)
       ])
     ], 512), [
       [vShow, false]
@@ -31231,7 +31231,7 @@ const _sfc_main$1j = {
 };
 const _hoisted_1$X = { style: { "text-align": "center" } };
 const _hoisted_2$E = ["onClick"];
-const _hoisted_3$l = ["onClick"];
+const _hoisted_3$m = ["onClick"];
 const _hoisted_4$j = ["src"];
 const _hoisted_5$g = { key: 1 };
 function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
@@ -31284,7 +31284,7 @@ function _sfc_render$1b(_ctx, _cache, $props, $setup, $data, $options) {
                         color: "#ed4014",
                         size: "16"
                       })
-                    ], 8, _hoisted_3$l)) : createCommentVNode("", true)
+                    ], 8, _hoisted_3$m)) : createCommentVNode("", true)
                   ])
                 ]),
                 default: withCtx(() => [
@@ -32333,7 +32333,7 @@ const _sfc_main$1d = {
 };
 const _hoisted_1$T = ["textContent"];
 const _hoisted_2$C = { key: 0 };
-const _hoisted_3$k = { key: 1 };
+const _hoisted_3$l = { key: 1 };
 const _hoisted_4$i = { key: 1 };
 function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Icon = resolveComponent("Icon");
@@ -32370,7 +32370,7 @@ function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
     extra: withCtx(() => [
       _ctx.$slots.btn ? (openBlock(), createElementBlock("div", _hoisted_2$C, [
         renderSlot(_ctx.$slots, "btn")
-      ])) : (openBlock(), createElementBlock("div", _hoisted_3$k, [
+      ])) : (openBlock(), createElementBlock("div", _hoisted_3$l, [
         $data.showBtn && $data.editFlag && !$data.btnReadOnly ? (openBlock(), createElementBlock("a", {
           key: 0,
           href: "#",
@@ -33540,7 +33540,7 @@ const _sfc_main$1a = {
 };
 const _hoisted_1$Q = ["textContent"];
 const _hoisted_2$z = { style: { "padding": "16px" } };
-const _hoisted_3$j = ["textContent"];
+const _hoisted_3$k = ["textContent"];
 const _hoisted_4$h = { key: 1 };
 const _hoisted_5$f = { style: { "padding": "16px" } };
 const _hoisted_6$c = ["textContent"];
@@ -33769,7 +33769,7 @@ function _sfc_render$13(_ctx, _cache, $props, $setup, $data, $options) {
             createElementVNode("span", {
               class: normalizeClass($options.titleClass),
               textContent: toDisplayString($data.myConfig.title)
-            }, null, 10, _hoisted_3$j),
+            }, null, 10, _hoisted_3$k),
             $data.myConfig.hide ? (openBlock(), createBlock(_component_Icon, {
               key: 0,
               class: "efuture-title-icon",
@@ -37580,7 +37580,7 @@ const _sfc_main$Q = {
 };
 const _hoisted_1$I = ["title"];
 const _hoisted_2$v = ["title"];
-const _hoisted_3$i = ["value", "disabled"];
+const _hoisted_3$j = ["value", "disabled"];
 const _hoisted_4$g = ["title"];
 const _hoisted_5$e = ["title"];
 const _hoisted_6$b = {
@@ -37631,7 +37631,7 @@ function _sfc_render$M(_ctx, _cache, $props, $setup, $data, $options) {
         onKeydown: _cache[1] || (_cache[1] = (...args) => _ctx.keyDown && _ctx.keyDown(...args)),
         onKeyup: _cache[2] || (_cache[2] = (...args) => _ctx.keyUp && _ctx.keyUp(...args)),
         onChange: _cache[3] || (_cache[3] = (...args) => _ctx.keyUp && _ctx.keyUp(...args))
-      }, null, 40, _hoisted_3$i),
+      }, null, 40, _hoisted_3$j),
       _cache[18] || (_cache[18] = createElementVNode("span", null, "/", -1)),
       createTextVNode(" " + toDisplayString(_ctx.allPages), 1)
     ], 10, _hoisted_2$v),
@@ -37875,7 +37875,7 @@ const _hoisted_2$u = {
   ref: "page",
   name: "page"
 };
-const _hoisted_3$h = {
+const _hoisted_3$i = {
   key: 0,
   style: { "padding-top": "10px" }
 };
@@ -37971,7 +37971,7 @@ function _sfc_render$L(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       }),
       createElementVNode("div", _hoisted_2$u, [
-        _ctx.myConfig.showPage ? (openBlock(), createElementBlock("div", _hoisted_3$h, [
+        _ctx.myConfig.showPage ? (openBlock(), createElementBlock("div", _hoisted_3$i, [
           createVNode(_component_Card, {
             bordered: false,
             padding: 0,
@@ -40122,8 +40122,9 @@ const _sfc_main$K = {
         showAppendixCol: false,
         appedixLable: "\u9644\u4EF6"
       },
-      showAddBtn: true,
-      showDelBatchBtn: true,
+      btnStyle: "padding-left:0px;padding-right:0px",
+      showAddBtn: false,
+      showDelBatchBtn: false,
       showGrid: true,
       showTitle: true,
       actionAppendixConfig: {
@@ -40135,6 +40136,9 @@ const _sfc_main$K = {
       }
     };
   },
+  created() {
+    this.myConfig = Object.assign({}, this.myConfig, this.config);
+  },
   methods: {
     customInit2() {
       if (this.myConfig.showTitle !== void 0) {
@@ -40180,18 +40184,22 @@ const _sfc_main$K = {
     }
   }
 };
-const _hoisted_1$F = ["onClick"];
-const _hoisted_2$t = {
+const _hoisted_1$F = { key: 0 };
+const _hoisted_2$t = ["onClick"];
+const _hoisted_3$h = {
   key: 0,
   ref: "page",
   style: { "background": "#eee", "padding-top": "5px", "width": "100%" }
 };
 function _sfc_render$H(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_Button = resolveComponent("Button");
+  const _component_Col = resolveComponent("Col");
+  const _component_Divider = resolveComponent("Divider");
+  const _component_Row = resolveComponent("Row");
   const _component_ControlBox = resolveComponent("ControlBox");
   const _component_ShowText = resolveComponent("ShowText");
   const _component_Table = resolveComponent("Table");
   const _component_Page = resolveComponent("Page");
-  const _component_Row = resolveComponent("Row");
   const _component_Card = resolveComponent("Card");
   const _component_ExpandRow = resolveComponent("ExpandRow");
   const _component_Modal = resolveComponent("Modal");
@@ -40202,6 +40210,66 @@ function _sfc_render$H(_ctx, _cache, $props, $setup, $data, $options) {
     "dis-hover": ""
   }, {
     default: withCtx(() => [
+      _ctx.$slots.header ? (openBlock(), createElementBlock("div", _hoisted_1$F, [
+        renderSlot(_ctx.$slots, "header")
+      ])) : withDirectives((openBlock(), createBlock(_component_Row, {
+        key: 1,
+        "class-name": "row-box",
+        type: "flex",
+        justify: "start",
+        align: "middle",
+        gutter: 0,
+        style: { "margin-bottom": "10px" }
+      }, {
+        default: withCtx(() => [
+          $data.showAddBtn ? (openBlock(), createBlock(_component_Col, { key: 0 }, {
+            default: withCtx(() => [
+              createVNode(_component_Button, {
+                style: normalizeStyle($data.btnStyle),
+                customIcon: "iconfont icon-custom-rowadd3",
+                type: "text",
+                disabled: $data.myConfig.readOnly,
+                onClick: _ctx.addRow
+              }, {
+                default: withCtx(() => _cache[1] || (_cache[1] = [
+                  createTextVNode("\u6DFB\u52A0")
+                ])),
+                _: 1
+              }, 8, ["style", "disabled", "onClick"])
+            ]),
+            _: 1
+          })) : createCommentVNode("", true),
+          $data.showAddBtn && $data.showDelBatchBtn ? (openBlock(), createBlock(_component_Col, { key: 1 }, {
+            default: withCtx(() => [
+              createVNode(_component_Divider, {
+                type: "vertical",
+                style: { "margin": "0 6px 0 6px" }
+              })
+            ]),
+            _: 1
+          })) : createCommentVNode("", true),
+          $data.showDelBatchBtn ? (openBlock(), createBlock(_component_Col, { key: 2 }, {
+            default: withCtx(() => [
+              createVNode(_component_Button, {
+                style: normalizeStyle($data.btnStyle),
+                customIcon: "iconfont icon-custom-rowdel3",
+                type: "text",
+                disabled: $data.myConfig.readOnly,
+                onClick: _ctx.delBatchRow
+              }, {
+                default: withCtx(() => _cache[2] || (_cache[2] = [
+                  createTextVNode("\u5220\u9664")
+                ])),
+                _: 1
+              }, 8, ["style", "disabled", "onClick"])
+            ]),
+            _: 1
+          })) : createCommentVNode("", true)
+        ]),
+        _: 1
+      }, 512)), [
+        [vShow, $data.showGrid]
+      ]),
       createVNode(_component_Row, { style: { "margin-top": "10px" } }, {
         default: withCtx(() => [
           createVNode(_component_Table, {
@@ -40245,12 +40313,12 @@ function _sfc_render$H(_ctx, _cache, $props, $setup, $data, $options) {
                       config: config2,
                       rowIndex: index
                     }, null, 8, ["label", "contentAlign", "class", "config", "rowIndex"]))
-                  ], 10, _hoisted_1$F)
+                  ], 10, _hoisted_2$t)
                 ])
               };
             })
           ]), 1032, ["row-class-name", "loading", "size", "stripe", "border", "height", "maxHeight", "show-header", "onOnSelectionChange", "columns", "data", "onOnColumnWidthResize", "show-summary", "summary-method"]),
-          $data.myConfig.showPage ? (openBlock(), createElementBlock("div", _hoisted_2$t, [
+          $data.myConfig.showPage ? (openBlock(), createElementBlock("div", _hoisted_3$h, [
             createVNode(_component_Card, {
               bordered: false,
               padding: 0,
@@ -40287,7 +40355,7 @@ function _sfc_render$H(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       }),
       !_ctx.editRowFlag ? (openBlock(), createBlock(_component_Modal, {
-        key: 0,
+        key: 2,
         modelValue: _ctx.showEditRowForm,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.showEditRowForm = $event),
         width: "90%",
@@ -40306,7 +40374,7 @@ function _sfc_render$H(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       }, 8, ["modelValue", "onOnOk"])) : createCommentVNode("", true)
     ]),
-    _: 1
+    _: 3
   }, 512);
 }
 var EditGridCardS = /* @__PURE__ */ _export_sfc$1(_sfc_main$K, [["render", _sfc_render$H]]);
@@ -46474,6 +46542,8 @@ const _sfc_main$v = {
       myConfig: {
         headStyle: "",
         readOnly: false,
+        showAddBtn: true,
+        showDelBatchBtn: true,
         downfile: "",
         delfile: "",
         pdffile: "/mss-sysconf-boot/downloadPdf?filekey=",
@@ -46505,27 +46575,35 @@ const _sfc_main$v = {
           name: "filememo",
           type: "ComboBox",
           dictkey: "CUSTFILETYPE",
-          visible: false
+          codeWithName: false,
+          width: 300,
+          readOnly: true
         }, {
           label: "\u9644\u4EF6\u7C7B\u578B",
           name: "filemode",
           type: "TextBox",
-          width: 300
+          width: 300,
+          visible: false,
+          readOnly: true
         }, {
           label: "\u6587\u4EF6\u540D\u79F0",
           name: "filename",
-          type: "TextBox"
+          type: "TextBox",
+          width: 200,
+          readOnly: true
         }, {
           label: "\u6587\u4EF6\u5927\u5C0F",
           name: "filesize",
           render: this.sizeActionRender,
-          width: 120
+          width: 120,
+          readOnly: true
         }, {
           label: "\u4E0A\u4F20\u65E5\u671F",
           name: "ph_timestamp",
           type: "DateBox",
           vtype: "datetime",
-          width: 200
+          width: 150,
+          readOnly: true
         }, {
           label: "\u64CD\u4F5C",
           key: "action",
@@ -46595,8 +46673,9 @@ const _sfc_main$v = {
     if (!this.myConfig.pdffile) {
       this.myConfig.pdffile = this.OmdUrl.pdffile;
     }
-    this.myConfig.showAddBtn = false;
-    this.myConfig.showDelBatchBtn = false;
+    if (this.myConfig.showTitle !== void 0) {
+      this.showTitle = this.myConfig.showTitle;
+    }
     this.myConfig.generalOrientation = true;
     if (this.myConfig.fileSize !== void 0) {
       this.fileSize = Number(this.myConfig.fileSize) * 1024;
@@ -46859,7 +46938,7 @@ const _sfc_main$v = {
       let obj = {};
       obj.readOnly = value;
       this.setPro(obj);
-      this.$refs.grid.setReadOnly(true);
+      this.$refs.grid.setReadOnly(value);
       this.setBtnReadOnly(value);
     },
     showTxt(params) {
@@ -48424,6 +48503,7 @@ const _sfc_main$t = {
           if (data.procinfo && data.procinfo.proclist) {
             let result = data.procinfo.proclist || [];
             let copylist = [];
+            let candidateUserList = [];
             if (data.procinfo.cc && data.procinfo.cc.length > 0) {
               data.procinfo.cc.forEach((item) => {
                 let tmp = {};
@@ -48433,13 +48513,24 @@ const _sfc_main$t = {
                 copylist.push(tmp);
               });
             }
-            result.forEach((item) => {
+            if (data.procinfo && data.procinfo.flowerProgress) {
+              if (data.procinfo.flowerProgress.length > 0) {
+                let lastflowerProgress = data.procinfo.flowerProgress[data.procinfo.flowerProgress.length - 1];
+                if (lastflowerProgress && lastflowerProgress.candidateUserList) {
+                  candidateUserList = lastflowerProgress.candidateUserList;
+                }
+              }
+            }
+            result.forEach((item, index) => {
               item.active = false;
               item.tasklist.forEach((list) => {
                 if (list.usernam) {
                   list.userName = list.username.substr(-2, 2);
                 }
               });
+              if (index === result.length - 1) {
+                item.candidateUserList = candidateUserList;
+              }
             });
             if (data.procinfo.btnlist) {
               data.procinfo.btnlist.forEach((el2) => {
@@ -48476,6 +48567,9 @@ const _sfc_main$t = {
         ".billrepeal",
         { billno: this.value.billno },
         (data) => {
+          if (this.$parent && typeof this.$parent.approvalOk === "function") {
+            this.$parent.approvalOk();
+          }
           this.alert(data.msg, null, 3);
           this.showDrawer = false;
         }
@@ -48493,6 +48587,9 @@ const _sfc_main$t = {
         ".billreject",
         para,
         (data) => {
+          if (this.$parent && typeof this.$parent.approvalOk === "function") {
+            this.$parent.approvalOk();
+          }
           this.showDrawer = false;
           this.alert(data.msg, null, 3);
         }
@@ -48516,6 +48613,9 @@ const _sfc_main$t = {
         param.comment = this.idea;
       }
       this.doPost(".billsubmit", param, (data) => {
+        if (this.$parent && typeof this.$parent.approvalOk === "function") {
+          this.$parent.approvalOk();
+        }
         this.showDrawer = false;
         this.$nextTick(() => {
           setTimeout(() => {
@@ -48529,6 +48629,9 @@ const _sfc_main$t = {
         ".billapproval",
         { billno: this.value.billno, comment: this.idea },
         (data) => {
+          if (this.$parent && typeof this.$parent.approvalOk === "function") {
+            this.$parent.approvalOk();
+          }
           this.showDrawer = false;
           this.alert(data.msg, null, 3);
         }
@@ -48736,6 +48839,12 @@ const _sfc_main$t = {
     },
     selectTypeChange() {
       this.clearUser();
+    },
+    getCandidateUserText(candidateUserList) {
+      if (!candidateUserList || candidateUserList.length === 0)
+        return "";
+      let approvers = candidateUserList.map((user) => user.userName).join("\u3001");
+      return approvers;
     }
   },
   mounted() {
@@ -48781,24 +48890,28 @@ const _hoisted_19 = { class: "right" };
 const _hoisted_20 = { class: "top" };
 const _hoisted_21 = { style: { "font-size": "16px" } };
 const _hoisted_22 = { class: "status" };
-const _hoisted_23 = { class: "desc" };
-const _hoisted_24 = ["textContent"];
-const _hoisted_25 = {
+const _hoisted_23 = {
+  key: 0,
+  class: "desc"
+};
+const _hoisted_24 = { class: "desc" };
+const _hoisted_25 = ["textContent"];
+const _hoisted_26 = {
   key: 0,
   class: "card"
 };
-const _hoisted_26 = { class: "main" };
-const _hoisted_27 = { class: "user-list" };
-const _hoisted_28 = { class: "user" };
-const _hoisted_29 = { class: "icon-wrap" };
-const _hoisted_30 = { style: { "z-index": "99" } };
-const _hoisted_31 = {
+const _hoisted_27 = { class: "main" };
+const _hoisted_28 = { class: "user-list" };
+const _hoisted_29 = { class: "user" };
+const _hoisted_30 = { class: "icon-wrap" };
+const _hoisted_31 = { style: { "z-index": "99" } };
+const _hoisted_32 = {
   ref: "foot",
   class: "footer"
 };
-const _hoisted_32 = { style: { "color": "#AF292E" } };
-const _hoisted_33 = { style: { "color": "#AF292E", "cursor": "pointer" } };
-const _hoisted_34 = ["textContent"];
+const _hoisted_33 = { style: { "color": "#AF292E" } };
+const _hoisted_34 = { style: { "color": "#AF292E", "cursor": "pointer" } };
+const _hoisted_35 = ["textContent"];
 function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Col = resolveComponent("Col");
   const _component_Button = resolveComponent("Button");
@@ -49146,7 +49259,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                   class: "log-list",
                   key: index
                 }, [
-                  _cache[23] || (_cache[23] = createElementVNode("div", { class: "line-wrap" }, null, -1)),
+                  _cache[24] || (_cache[24] = createElementVNode("div", { class: "line-wrap" }, null, -1)),
                   createElementVNode("div", _hoisted_16, [
                     item.mulflag === "N" ? (openBlock(), createElementBlock("span", _hoisted_17, toDisplayString(item.username), 1)) : (openBlock(), createBlock(_component_Icon, {
                       key: 1,
@@ -49180,16 +49293,20 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                       createElementVNode("span", _hoisted_22, toDisplayString(item.act_status_name), 1)
                     ]),
                     createElementVNode("div", null, [
+                      index === $data.auditLog.length - 1 && item.candidateUserList && item.candidateUserList.length > 0 ? (openBlock(), createElementBlock("p", _hoisted_23, [
+                        _cache[20] || (_cache[20] = createTextVNode(" \u5F85\u5BA1\u6279\u4EBA\uFF1A")),
+                        createElementVNode("span", null, toDisplayString($options.getCandidateUserText(item.candidateUserList)), 1)
+                      ])) : createCommentVNode("", true),
                       createElementVNode("span", null, toDisplayString(item.act_time_), 1),
-                      createElementVNode("p", _hoisted_23, [
-                        _cache[20] || (_cache[20] = createTextVNode("\u610F\u89C1\uFF1A")),
+                      createElementVNode("p", _hoisted_24, [
+                        _cache[21] || (_cache[21] = createTextVNode("\u610F\u89C1\uFF1A")),
                         createElementVNode("span", {
                           textContent: toDisplayString($options.getMessage(item.message))
-                        }, null, 8, _hoisted_24)
+                        }, null, 8, _hoisted_25)
                       ])
                     ]),
-                    item.tasklist.length > 1 ? (openBlock(), createElementBlock("div", _hoisted_25, [
-                      createElementVNode("ul", _hoisted_26, [
+                    item.tasklist.length > 1 ? (openBlock(), createElementBlock("div", _hoisted_26, [
+                      createElementVNode("ul", _hoisted_27, [
                         createVNode(_component_Row, {
                           type: "flex",
                           justify: "start",
@@ -49201,10 +49318,10 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                                 key: "task_" + index2
                               }, {
                                 default: withCtx(() => [
-                                  createElementVNode("li", _hoisted_27, [
-                                    createElementVNode("div", _hoisted_28, [
+                                  createElementVNode("li", _hoisted_28, [
+                                    createElementVNode("div", _hoisted_29, [
                                       createElementVNode("span", null, toDisplayString(tmp.username), 1),
-                                      createElementVNode("div", _hoisted_29, [
+                                      createElementVNode("div", _hoisted_30, [
                                         item.status === "Y" ? (openBlock(), createBlock(_component_Icon, {
                                           key: 0,
                                           custom: "iconfont icon-custom-wancheng",
@@ -49224,7 +49341,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                                         }))
                                       ])
                                     ]),
-                                    createElementVNode("p", _hoisted_30, toDisplayString(tmp.username), 1)
+                                    createElementVNode("p", _hoisted_31, toDisplayString(tmp.username), 1)
                                   ])
                                 ]),
                                 _: 2
@@ -49251,7 +49368,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                                 type: "text",
                                 onClick: ($event) => $options.showGroupUser(index)
                               }, {
-                                default: withCtx(() => _cache[21] || (_cache[21] = [
+                                default: withCtx(() => _cache[22] || (_cache[22] = [
                                   createTextVNode("\u5C55\u5F00 ")
                                 ])),
                                 _: 2
@@ -49262,7 +49379,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                                 type: "text",
                                 onClick: ($event) => $options.showGroupUser(index)
                               }, {
-                                default: withCtx(() => _cache[22] || (_cache[22] = [
+                                default: withCtx(() => _cache[23] || (_cache[23] = [
                                   createTextVNode(" \u6536\u8D77")
                                 ])),
                                 _: 2
@@ -49280,7 +49397,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           ], 4)
         ]),
-        createElementVNode("div", _hoisted_31, [
+        createElementVNode("div", _hoisted_32, [
           withDirectives(createVNode(_component_Form, { "label-width": 45 }, {
             default: withCtx(() => [
               createVNode(_component_FormItem, { label: "\u6284\u9001:" }, {
@@ -49293,9 +49410,9 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     default: withCtx(() => [
                       createVNode(_component_Col, { span: "2" }, {
                         default: withCtx(() => [
-                          createElementVNode("span", _hoisted_32, toDisplayString($data.copy.length), 1),
-                          _cache[24] || (_cache[24] = createTextVNode()),
-                          _cache[25] || (_cache[25] = createElementVNode("span", null, "\u4EBA", -1))
+                          createElementVNode("span", _hoisted_33, toDisplayString($data.copy.length), 1),
+                          _cache[25] || (_cache[25] = createTextVNode()),
+                          _cache[26] || (_cache[26] = createElementVNode("span", null, "\u4EBA", -1))
                         ]),
                         _: 1
                       }),
@@ -49316,7 +49433,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                                   size: "12",
                                   color: "#AF292E"
                                 }),
-                                _cache[26] || (_cache[26] = createElementVNode("span", { style: { "margin-left": "9px", "color": "#AF292E", "font-size": "14px" } }, " \u6DFB\u52A0\u6284\u9001\u4EBA ", -1))
+                                _cache[27] || (_cache[27] = createElementVNode("span", { style: { "margin-left": "9px", "color": "#AF292E", "font-size": "14px" } }, " \u6DFB\u52A0\u6284\u9001\u4EBA ", -1))
                               ])
                             ]),
                             _: 1
@@ -49364,11 +49481,11 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     default: withCtx(() => [
                       createVNode(_component_Col, { span: "2" }, {
                         default: withCtx(() => [
-                          createElementVNode("span", _hoisted_33, toDisplayString($data.approvals.length), 1),
-                          _cache[27] || (_cache[27] = createTextVNode()),
+                          createElementVNode("span", _hoisted_34, toDisplayString($data.approvals.length), 1),
+                          _cache[28] || (_cache[28] = createTextVNode()),
                           createElementVNode("span", {
                             textContent: toDisplayString($options.info2)
-                          }, null, 8, _hoisted_34)
+                          }, null, 8, _hoisted_35)
                         ]),
                         _: 1
                       }),
@@ -49389,7 +49506,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                                   size: "12",
                                   color: "#AF292E"
                                 }),
-                                _cache[28] || (_cache[28] = createElementVNode("span", { style: { "margin-left": "9px", "color": "#AF292E", "font-size": "14px" } }, " \u6DFB\u52A0\u5BA1\u6279\u4EBA ", -1))
+                                _cache[29] || (_cache[29] = createElementVNode("span", { style: { "margin-left": "9px", "color": "#AF292E", "font-size": "14px" } }, " \u6DFB\u52A0\u5BA1\u6279\u4EBA ", -1))
                               ])
                             ]),
                             _: 1
@@ -49457,7 +49574,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     customIcon: "iconfont icon-custom-submit",
                     onClick: $options.onSubmit
                   }, {
-                    default: withCtx(() => _cache[29] || (_cache[29] = [
+                    default: withCtx(() => _cache[30] || (_cache[30] = [
                       createTextVNode("\u63D0\u4EA4")
                     ])),
                     _: 1
@@ -49471,7 +49588,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     customIcon: "iconfont icon-custom-recall",
                     onClick: $options.billBack
                   }, {
-                    default: withCtx(() => _cache[30] || (_cache[30] = [
+                    default: withCtx(() => _cache[31] || (_cache[31] = [
                       createTextVNode("\u64A4\u56DE")
                     ])),
                     _: 1
@@ -49485,7 +49602,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     customIcon: "iconfont icon-custom-jiaqian",
                     onClick: $options.billBack
                   }, {
-                    default: withCtx(() => _cache[31] || (_cache[31] = [
+                    default: withCtx(() => _cache[32] || (_cache[32] = [
                       createTextVNode("\u52A0\u7B7E")
                     ])),
                     _: 1
@@ -49501,7 +49618,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     customIcon: "iconfont icon-custom-reject",
                     onClick: $options.reject
                   }, {
-                    default: withCtx(() => _cache[32] || (_cache[32] = [
+                    default: withCtx(() => _cache[33] || (_cache[33] = [
                       createTextVNode("\u9A73\u56DE")
                     ])),
                     _: 1
@@ -49515,7 +49632,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                     customIcon: "iconfont icon-custom-approve",
                     onClick: $options.submitApprove
                   }, {
-                    default: withCtx(() => _cache[33] || (_cache[33] = [
+                    default: withCtx(() => _cache[34] || (_cache[34] = [
                       createTextVNode("\u5BA1\u6279")
                     ])),
                     _: 1
@@ -49532,7 +49649,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["modelValue"])
   ]);
 }
-var ApprovalBox = /* @__PURE__ */ _export_sfc$1(_sfc_main$t, [["render", _sfc_render$q], ["__scopeId", "data-v-5dfedae2"]]);
+var ApprovalBox = /* @__PURE__ */ _export_sfc$1(_sfc_main$t, [["render", _sfc_render$q], ["__scopeId", "data-v-2555e92e"]]);
 const _sfc_main$s = {
   name: "moperlog",
   data() {
@@ -50617,8 +50734,9 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     createVNode(_component_ApprovalBox, {
       ref: "approval",
-      config: $data.billApprovalConfig
-    }, null, 8, ["config"]),
+      config: $data.billApprovalConfig,
+      onApprovalOk: $options.approvalOk
+    }, null, 8, ["config", "onApprovalOk"]),
     createVNode(_component_Modal, {
       "class-name": "efuture-billapprovalmainframe",
       modelValue: $data.showApproval,
@@ -51765,8 +51883,6 @@ const _sfc_main$o = {
     this.myConfig.gridConfig.overrideData = this.gridOverrideData;
     this.myConfig.gridConfig.showCondition = false;
     this.myConfig.gridConfig.resources = this.myConfig.resources;
-    this.myConfig.gridConfig.method = this.myConfig.classPrefix + ".search";
-    this.myConfig.gridConfig.response = this.myConfig.response;
     this.myConfig.gridConfig.tableSize = "small";
     this.myConfig.gridConfig.showBorder = false;
     this.myConfig.gridConfig.pageShowSizer = false;
@@ -51776,6 +51892,12 @@ const _sfc_main$o = {
     if (this.myConfig.gridConfig.title !== void 0) {
       this.myConfig.gridtitle = this.myConfig.gridConfig.title;
     }
+    if (!this.myConfig.gridConfig.method) {
+      this.myConfig.gridConfig.method = this.myConfig.classPrefix + ".search";
+    }
+    if (!this.myConfig.gridConfig.response) {
+      this.myConfig.gridConfig.response = this.myConfig.response;
+    }
     this.myConfig.gridConfig.multiSelect = false;
     if (this.myConfig.treeConfig.items) {
       this.myConfig.gridConfig.items = this.$Method.copy(this.myConfig.treeConfig.items);