cloud-web-corejs-haier 1.0.42 → 1.0.44

package/src/components/wf/wfTaskUserRangeDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t1('候选人列表')"
+    :title="$t1('审批人列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"

package/src/components/wf/wfUtil.js

@@ -1,5 +1,5 @@
-import Vue from 'vue';
-import settingConfig from '@/settings.js'
+import Vue from "vue";
+import settingConfig from "@/settings.js";
 
 let f;
 let configUtil = {
@@ -7,7 +7,7 @@ let configUtil = {
     return require(`../../components/wf${path}`).default;
   },
   Vue,
-  settingConfig
+  settingConfig,
 };
 
 f = async function (option) {
@@ -22,8 +22,8 @@ f = async function (option) {
 
     let hasWf = false;
     let wfInfo, currentTask, taskParam;
-    await initWfInfo(that, option).then(res => {
-      if (res && res.type == 'success') {
+    await initWfInfo(that, option).then((res) => {
+      if (res && res.type == "success") {
         if (res.objx && res.objx.instanceId) {
           hasWf = true;
           wfInfo = res.objx;
@@ -44,22 +44,27 @@ f = async function (option) {
 
     let done = () => {
       let $wfBtnRegion = that.$refs[option.wfBtnRegion || "wfBtnRegion"];
-      let $wfViewRegion = that.$refs[(option.wfViewRegion || "wfViewRegion")];
+      let $wfViewRegion = that.$refs[option.wfViewRegion || "wfViewRegion"];
 
-      let wfBtnRegion = $wfBtnRegion ? $wfBtnRegion.$el : that.$el.querySelector(
-        ".el-form .d-header >.fr");
-      let wfViewRegion = $wfViewRegion ? $wfViewRegion.$el : that.$el.querySelector(
-        ".el-form .d-cont");
+      let wfBtnRegion = $wfBtnRegion
+        ? $wfBtnRegion.$el
+        : that.$el.querySelector(".el-form .d-header >.fr");
+      let wfViewRegion = $wfViewRegion
+        ? $wfViewRegion.$el
+        : that.$el.querySelector(".el-form .d-cont");
 
-      let slideWrap = $wfViewRegion ? $wfViewRegion.$el : that.$el.querySelector(
-        ".el-form .slide-wrap");
+      let slideWrap = $wfViewRegion
+        ? $wfViewRegion.$el
+        : that.$el.querySelector(".el-form .slide-wrap");
 
-      let showStartBtn = option.showStartBtn != null ? option.showStartBtn : true;
-      let showModifyBtn = option.showModifyBtn != null ? option.showModifyBtn : true;
+      let showStartBtn =
+        option.showStartBtn != null ? option.showStartBtn : true;
+      let showModifyBtn =
+        option.showModifyBtn != null ? option.showModifyBtn : true;
 
       if (wfInfo) {
         let wfModel = configUtil.settingConfig.wfModel || 1;
-        let url = wfModel == 2 ? '/content2.vue' : '/content.vue';
+        let url = wfModel == 2 ? "/content2.vue" : "/content.vue";
         let a = configUtil.Vue.extend(configUtil.getWfObj(url));
         let defaultShowWfContent = that.$attrs.defaultShowWfContent;
         let instance = new a({
@@ -72,36 +77,43 @@ f = async function (option) {
             _taskParam: taskParam,
             parentVue: that,
             defaultShowWfContent: defaultShowWfContent,
-            wfConfig: option
-          }
+            wfConfig: option,
+          },
         });
         let _hideWf = that._hideWf || that.$attrs._hideWf;
-        let isHideWf = _hideWf === true || _hideWf === 'true';
+        let isHideWf = _hideWf === true || _hideWf === "true";
         if (!_hideWf && slideWrap) {
           let navDom = new configUtil.Vue({
             render: function (h) {
               let node = h("div", {}, [
-                h("a", {
-                  staticClass: "slide-nav",
-                  attrs: {
-                    id: "wfNavBtn"
+                h(
+                  "a",
+                  {
+                    staticClass: "slide-nav",
+                    attrs: {
+                      id: "wfNavBtn",
+                    },
+                    on: {
+                      click: (event) => {
+                        instance.$children[0].handleFold(true);
+                        that.$nextTick(() => {
+                          instance.$el.scrollIntoView();
+                        });
+                      },
+                    },
                   },
-                  on: {
-                    click: (event) => {
-                      instance.$children[0].handleFold(true);
-                      that.$nextTick(() => {
-                        instance.$el.scrollIntoView();
-                      })
-                    }
-                  }
-                }, [h('i', {
-                  staticClass: "ico"
-                }), h("p", that.$t2('流程信息', 'components.wf.wfInfo'))])
+                  [
+                    h("i", {
+                      staticClass: "ico",
+                    }),
+                    h("p", that.$t2("流程信息", "components.wf.wfInfo")),
+                  ]
+                ),
               ]);
               return node;
-            }
+            },
           }).$mount().$el;
-          if (settingConfig.version == 'oa') {
+          if (settingConfig.version == "oa") {
             slideWrap = slideWrap.children[0];
           }
           setTimeout(() => {
@@ -109,7 +121,7 @@ f = async function (option) {
             if (that.$attrs.toWfArea) {
               //待办进来，直接跳到流程模块
               this.$nextTick(() => {
-                navDom.querySelector('a').click();
+                navDom.querySelector("a").click();
               });
               that.$emit("update:toWfArea", false);
             }
@@ -118,51 +130,75 @@ f = async function (option) {
         wfViewRegion && wfViewRegion.append(instance.$mount().$el);
       }
 
-      if (wfBtnRegion && showModifyBtn && hasWf && taskParam && taskParam.url && wfInfo.toSubmit && !option.hiddenAllButton) {
+      if (
+        wfBtnRegion &&
+        showModifyBtn &&
+        hasWf &&
+        taskParam &&
+        taskParam.url &&
+        wfInfo.toSubmit &&
+        !option.hiddenAllButton
+      ) {
         let buttonName = getModifyButtonName(that, taskParam);
         let dom = new configUtil.Vue({
           render: function (h) {
-            let modifyNode = h("el-button", {
-              attrs: {
-                type: "primary",
-                plain: "",
-                icon: "el-icon-edit"
+            let modifyNode = h(
+              "el-button",
+              {
+                attrs: {
+                  type: "primary",
+                  plain: "",
+                  icon: "el-icon-edit",
+                },
+                staticClass: "button-sty",
+                on: {
+                  click: () => {
+                    openWfModifyDialog(that, taskParam, buttonName, wfInfo);
+                  },
+                },
               },
-              staticClass: "button-sty",
-              on: {
-                click: () => {
-                  openWfModifyDialog(that, taskParam, buttonName, wfInfo);
-                }
-              }
-            }, buttonName);
+              buttonName
+            );
             return modifyNode;
-          }
+          },
         }).$mount().$el;
         appendPrevChildDom(wfBtnRegion, dom);
       }
 
-      if (wfBtnRegion && showStartBtn && !hasWf && !option.hiddenAllButton) {
-        let wfStartButtonName = configUtil.settingConfig.wfStartButtonName || this.$t2('流程启动', 'components.wf.wfStart');
+      if (
+        wfBtnRegion &&
+        showStartBtn &&
+        option.injectStartBtn !== false &&
+        !hasWf &&
+        !option.hiddenAllButton
+      ) {
+        let wfStartButtonName =
+          configUtil.settingConfig.wfStartButtonName ||
+          this.$t2("流程启动", "components.wf.wfStart");
         let dom = new configUtil.Vue({
           render: function (h) {
-            let startNode = h("el-button", {
-              attrs: {
-                type: "success",
-                icon: "el-icon-video-play"
+            let startNode = h(
+              "el-button",
+              {
+                attrs: {
+                  type: "success",
+                  icon: "el-icon-video-play",
+                },
+                staticClass: "button-sty",
+                on: {
+                  click: () => {
+                    openStartWfDialog(that, option);
+                  },
+                },
               },
-              staticClass: "button-sty",
-              on: {
-                click: () => {
-                  openStartWfDialog(that, option);
-                }
-              }
-            }, wfStartButtonName);
+              wfStartButtonName
+            );
             return startNode;
-          }
+          },
         }).$mount().$el;
-        appendPrevChildDom(wfBtnRegion, dom)
+        appendPrevChildDom(wfBtnRegion, dom);
       }
-    }
+    };
 
     if (true || wfInfo) {
       if (option.callback) {
@@ -171,7 +207,7 @@ f = async function (option) {
           currentTask,
           taskParam,
           hasWf,
-          done
+          done,
         });
       }
     }
@@ -179,12 +215,12 @@ f = async function (option) {
       done();
     }
   }
-}
+};
 
 function getModifyButtonName(that, taskParam) {
   let buttonName = null;
   if (!taskParam.buttonName || taskParam.buttonName == "修改单据") {
-    buttonName = that.$t2("修改单据", 'components.wf.modifyBill');
+    buttonName = that.$t2("修改单据", "components.wf.modifyBill");
   } else {
     buttonName = taskParam.buttonName;
   }
@@ -194,10 +230,10 @@ function getModifyButtonName(that, taskParam) {
 function getServiceId(str) {
   let serviceId;
   if (str) {
-    let strArr = str.split('/');
-    serviceId = strArr[0] == '/' ? strArr[1] : str;
+    let strArr = str.split("/");
+    serviceId = strArr[0] == "/" ? strArr[1] : str;
   } else {
-    serviceId = '';
+    serviceId = "";
   }
   return serviceId;
 }
@@ -205,9 +241,10 @@ function getServiceId(str) {
 function getCurrentPrefix(serviceId) {
   let currentPrefix;
   if (serviceId) {
-    currentPrefix = serviceId.split('/')[0] == '/' ? serviceId : ('/' + serviceId);
+    currentPrefix =
+      serviceId.split("/")[0] == "/" ? serviceId : "/" + serviceId;
   } else {
-    currentPrefix = '';
+    currentPrefix = "";
   }
   return currentPrefix;
 }
@@ -216,32 +253,32 @@ async function initWfInfo(that, option) {
   let id = option.objId;
   let code = option.wfCode;
   return that.$http({
-    url: getCurrentPrefix(option.serviceId) + '/wf/getWfInfo',
+    url: getCurrentPrefix(option.serviceId) + "/wf/getWfInfo",
     method: `post`,
     data: {
       objTypeCode: code,
-      objId: id
+      objId: id,
     },
     isLoading: true,
-    modalStrictly: true
+    modalStrictly: true,
   });
 }
 
 async function getTaskParams(that, option, taskId) {
   return that.$http({
-    url: getCurrentPrefix(option.serviceId) + '/wf/getTaskVariables',
+    url: getCurrentPrefix(option.serviceId) + "/wf/getTaskVariables",
     method: `post`,
     data: {
-      stringOne: taskId
+      stringOne: taskId,
     },
     isLoading: true,
-    modalStrictly: true
+    modalStrictly: true,
   });
 }
 
 function openStartWfDialog(that, option) {
   let done = () => {
-    let a = configUtil.Vue.extend(configUtil.getWfObj('/wfStartDialog.vue'));
+    let a = configUtil.Vue.extend(configUtil.getWfObj("/wfStartDialog.vue"));
     let instance = new a({
       i18n: that._i18n,
       propsData: {
@@ -251,21 +288,21 @@ function openStartWfDialog(that, option) {
         startParam: option.startParam,
         parentVue: that,
         visible: true,
-        formCode:(option.formCode || null),
-        option
-      }
+        formCode: option.formCode || null,
+        option,
+      },
     });
-    document.body.append(instance.$mount().$el)
-  }
+    document.body.append(instance.$mount().$el);
+  };
   if (option.onStart) {
-    option.onStart(done)
+    option.onStart(done);
   } else {
     done();
   }
 }
 
 function openWfModifyDialog(that, paramData, title, wfInfo) {
-  let a = configUtil.Vue.extend(configUtil.getWfObj('/wfModifyDialog.vue'));
+  let a = configUtil.Vue.extend(configUtil.getWfObj("/wfModifyDialog.vue"));
   let instance = new a({
     i18n: that._i18n,
     propsData: {
@@ -273,10 +310,10 @@ function openWfModifyDialog(that, paramData, title, wfInfo) {
       parentVue: that,
       visible: true,
       wfInfo: wfInfo,
-      title: title
-    }
+      title: title,
+    },
   });
-  document.body.append(instance.$mount().$el)
+  document.body.append(instance.$mount().$el);
 }
 
 function appendPrevChildDom(parentDom, newDom) {
@@ -289,3 +326,4 @@ function appendPrevChildDom(parentDom, newDom) {
 }
 
 export const initWf = f;
+export { openStartWfDialog };