ocpview-plus 1.3.3 → 1.3.5

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.4";
 const title = "ocpviewPlus";
 const description = "A high quality Service UI components Library with Vue.js";
 const homepage = "";
@@ -46576,28 +46576,34 @@ const _sfc_main$v = {
           type: "ComboBox",
           dictkey: "CUSTFILETYPE",
           codeWithName: false,
-          width: 300
+          width: 300,
+          visible: false,
+          readOnly: true
         }, {
           label: "\u9644\u4EF6\u7C7B\u578B",
           name: "filemode",
           type: "TextBox",
           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",
@@ -47074,6 +47080,9 @@ const _sfc_main$v = {
       return check;
     },
     editGrid(params) {
+      if (this.myConfig.beforeUpload) {
+        this.myConfig.beforeUpload();
+      }
       if (!this.billno) {
         this.alert("\u5355\u636E\u4E3B\u5065\u4FE1\u606F\u4E3A\u7A7A,\u4E0D\u5141\u8BB8\u4E0A\u4F20");
         return;
@@ -48497,6 +48506,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 = {};
@@ -48506,13 +48516,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) => {
@@ -48549,6 +48570,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;
         }
@@ -48566,6 +48590,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);
         }
@@ -48589,6 +48616,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(() => {
@@ -48602,6 +48632,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);
         }
@@ -48809,6 +48842,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() {
@@ -48854,24 +48893,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");
@@ -49219,7 +49262,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,
@@ -49253,16 +49296,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",
@@ -49274,10 +49321,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",
@@ -49297,7 +49344,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
@@ -49324,7 +49371,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
@@ -49335,7 +49382,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
@@ -49353,7 +49400,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:" }, {
@@ -49366,9 +49413,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
                       }),
@@ -49389,7 +49436,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
@@ -49437,11 +49484,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
                       }),
@@ -49462,7 +49509,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
@@ -49530,7 +49577,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
@@ -49544,7 +49591,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
@@ -49558,7 +49605,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
@@ -49574,7 +49621,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
@@ -49588,7 +49635,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
@@ -49605,7 +49652,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() {
@@ -50690,8 +50737,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,