Browse Source

1.2.93 全局引入审批相关组件

liuyanpeng 1 year ago
parent
commit
8d13ad891d
3 changed files with 27 additions and 6 deletions
  1. 5 5
      package.json
  2. 7 1
      src/main.js
  3. 15 0
      src/routes/route-base-v4.js

+ 5 - 5
package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.2.92",
+  "version": "1.2.93",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry=http://wuzhixin.vip:4873 -force",
@@ -17,18 +17,18 @@
     "ant-design-vue": "^4.2.1",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "^4.1.59",
-    "client-dic-v3": "^3.0.51",
+    "client-base-v4": "^4.1.60",
+    "client-dic-v3": "^3.0.52",
     "client-eam-v3": "^3.0.96",
     "client-role-v3": "^3.0.25",
-    "client-sensor-v3": "^1.0.2",
+    "client-sensor-v3": "^1.0.3",
     "client-wms-v3": "^3.1.2",
     "client-finance-v3": "^0.0.4",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.8.33",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
-    "pc-component-v3": "^1.1.13",
+    "pc-component-v3": "^1.1.14",
     "qrcode": "^1.5.3",
     "select2": "^4.0.13",
     "select2-bootstrap-theme": "^0.1.0-beta.10",

+ 7 - 1
src/main.js

@@ -56,7 +56,7 @@ import { store } from './store.js';
 import { i18n } from './lang.js';
 import { router } from './routes/index.js';
 
-import { App, Common, PushMessage, CurdWindowModal, AuthImage } from 'client-base-v4/dist/client-base-v4.js';
+import { App, Common, PushMessage, CurdWindowModal, AuthImage, WorkflowUserDefine, ApproveComment, HistoryApproveComment } from 'client-base-v4/dist/client-base-v4.js';
 import { Notify } from 'pc-component-v3/dist/pc-component-v3.js';
 window.Common = Common;
 window.Notify = Notify;
@@ -81,6 +81,12 @@ app.mount('#app');
 app.component('CurdWindowModal', CurdWindowModal);
 // 图片显示
 app.component('AuthImage', AuthImage);
+// 发起审批
+app.component('WorkflowUserDefine', WorkflowUserDefine);
+// 审批状态
+app.component('ApproveComment', ApproveComment);
+// 历史审批记录
+app.component('HistoryApproveComment', HistoryApproveComment);
 
 
 window.app = app;

+ 15 - 0
src/routes/route-base-v4.js

@@ -9,6 +9,8 @@ import {
     SheetWindow,
     TabFormEdit,
     TabFormView,
+    TabFormEdit1,
+    TabFormView1,
     AttributeEditPanel,
     TabAudit,
     Approve,
@@ -138,6 +140,19 @@ const router = [
 
             { path: 'window1/:windowNo', component: CurdWindow1 },
 
+            // eslint-disable-next-line
+            { path: 'window1/window-edit/:type/:uuid', component: TabFormEdit1 },
+            // eslint-disable-next-line
+            { path: 'window1/window-edit/:type/:windowNo/:tabIndex', component: TabFormEdit1 },
+            // eslint-disable-next-line
+            { path: 'window1/window-edit/:type/:windowNo/:tabIndex/:recordId', component: TabFormEdit1 },
+
+            // CRUD不可编辑窗口
+            // eslint-disable-next-line
+            { path: 'window1/window-read/:type/:uuid', component: TabFormView1 },
+            // eslint-disable-next-line
+            { path: 'window1/window-read/:type/:windowNo/:tabIndex/:recordId', component: TabFormView1 },
+
             // 属性编辑窗口
             {
                 path: 'attribute-edit/:uuid', component: AttributeEditPanel,