From 4ef9b39175ebbd120f3db20bb5884bb3d920b917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 19 Feb 2024 09:49:19 +0800
Subject: [PATCH 1/4] 02/19

---
 ds-wms-admin-web/.env.development                         | 4 ++--
 .../views/flowcenter/flowInstances/Lowflow/Lowflow.vue    | 1 -
 .../src/views/flowcenter/flowInstances/index.vue          | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ds-wms-admin-web/.env.development b/ds-wms-admin-web/.env.development
index 3db4cdce..7d5e51a8 100644
--- a/ds-wms-admin-web/.env.development
+++ b/ds-wms-admin-web/.env.development
@@ -13,8 +13,8 @@ VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666
 VITE_DROP_CONSOLE = false
 
 # 后台接口父地址(必填)
-# VITE_GLOB_API_URL=http://localhost:3008
-VITE_GLOB_API_URL="/api"   # 开发 测试环境
+VITE_GLOB_API_URL=http://localhost:3008
+# VITE_GLOB_API_URL="/api"   # 开发 测试环境
 
 # File upload address， optional
 #VITE_GLOB_UPLOAD_URL=http://localhost:8091/api/Common/UploadFile
diff --git a/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/Lowflow.vue b/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/Lowflow.vue
index 1cb9a643..74f92990 100644
--- a/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/Lowflow.vue
+++ b/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/Lowflow.vue
@@ -2,7 +2,6 @@
   <el-config-provider namespace="el" :locale="zhCn">
     <FlowDesign :process="process" :fields="fields" />
   </el-config-provider>
-  <h1>123132</h1>
   <el-timeline>
     <!-- <el-timeline-item
       timestamp="2018/4/12"
diff --git a/ds-wms-admin-web/src/views/flowcenter/flowInstances/index.vue b/ds-wms-admin-web/src/views/flowcenter/flowInstances/index.vue
index 91520b57..635b4d58 100644
--- a/ds-wms-admin-web/src/views/flowcenter/flowInstances/index.vue
+++ b/ds-wms-admin-web/src/views/flowcenter/flowInstances/index.vue
@@ -150,10 +150,10 @@
       return postParam
     },
     columns,
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-    },
+    // formConfig: {
+    //   labelWidth: 120,
+    //   schemas: searchFormSchema,
+    // },
     sortFn: (sorter) => {
       // console.log('排序:' + sorter);
       sortInfo = sorter

From a2ab94b393071ae723f075c376c1a3dadda39721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 19 Feb 2024 09:54:11 +0800
Subject: [PATCH 2/4] 02/19

---
 .../Lowflow/nodes/Node/index.vue              | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/nodes/Node/index.vue b/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/nodes/Node/index.vue
index dc1e8a74..60338441 100644
--- a/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/nodes/Node/index.vue
+++ b/ds-wms-admin-web/src/views/flowcenter/flowInstances/Lowflow/nodes/Node/index.vue
@@ -85,20 +85,30 @@
   const Rdata = (taged) => {
     let data = ''
     switch (taged) {
-      case -1:
-        data = '撤销、召回'
-        break
-      case 0:
-        data = '就绪状态'
-        break
+      // case -1:
+      //   data = '撤销、召回'
+      //   break
+      // case 0:
+      //   data = '就绪状态'
+      //   break
+      // case 1:
+      //   data = '正在运行'
+      //   break
+      // case 2:
+      //   data = '驳回'
+      //   break
+      // case 3:
+      //   data = '审核通过'
+      //   break
+
       case 1:
-        data = '正在运行'
+        data = '通过'
         break
       case 2:
-        data = '驳回'
+        data = '不通过'
         break
       case 3:
-        data = '审核通过'
+        data = '驳回'
         break
       default:
         data = '-'

From 0c13cc3a307f493e3c1ea9ee31d977769903ace7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 19 Feb 2024 10:05:42 +0800
Subject: [PATCH 3/4] 02/19

---
 .../views/flowcenter/flowInstances/TenantAuditStepModal.vue    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ds-wms-admin-web/src/views/flowcenter/flowInstances/TenantAuditStepModal.vue b/ds-wms-admin-web/src/views/flowcenter/flowInstances/TenantAuditStepModal.vue
index bf32b682..72c986d7 100644
--- a/ds-wms-admin-web/src/views/flowcenter/flowInstances/TenantAuditStepModal.vue
+++ b/ds-wms-admin-web/src/views/flowcenter/flowInstances/TenantAuditStepModal.vue
@@ -419,8 +419,9 @@
       note: ApiData.note ? ApiData.note : '',
     })
     if (res.succeeded) {
-      finish()
+      BasicModalCancel()
       closeModal()
+      notification.success({ message: res.message, duration: 3 })
     }
   }
   // function handleStep2Next(step2Values: any) {

From 482b8347ed81c658027eee849af2d89a488a91b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 19 Feb 2024 13:57:15 +0800
Subject: [PATCH 4/4] 02/19

---
 .../baseinfo/tenantaudit/Authorization.vue    | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/ds-wms-admin-web/src/views/baseinfo/tenantaudit/Authorization.vue b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/Authorization.vue
index 748c8979..3625d93f 100644
--- a/ds-wms-admin-web/src/views/baseinfo/tenantaudit/Authorization.vue
+++ b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/Authorization.vue
@@ -38,27 +38,42 @@
     {
       field: 'divider-selects',
       component: 'Divider',
-      label: '授权信息',
+      label: '系统授权用户数',
       colProps: { span: 24 },
     },
     {
       field: 'authUserNum',
       label: '租户授权用户数',
-      component: 'Input',
-      labelWidth: '140px',
-      colProps: { span: 24 },
+      component: 'InputNumber',
+      labelWidth: '200px',
+      componentProps: {
+        min: 0,
+        placeholder: '可登陆系统的最大用户数',
+      },
+      colProps: { span: 8 },
     },
   ])
   console.log(props.checkedKeys, 'props.checkedKeys')
 
   // const ASD = () => {
-  props.checkedKeys.forEach((item) => {
+  props.checkedKeys.forEach((item, index) => {
+    if (index == 0) {
+      authorization.value.push({
+        field: 'divider-selects',
+        component: 'Divider',
+        label: '权限模块授权',
+        colProps: { span: 24 },
+      })
+    }
     authorization.value.push({
       field: `${item.key}--authNum`,
       label: `${item.title} 授权数`,
-      component: 'Input',
-      labelWidth: '140px',
-      colProps: { span: 12 },
+      component: 'InputNumber',
+      labelWidth: '200px',
+      componentProps: {
+        min: 0,
+      },
+      colProps: { span: 8 },
     })
   })
   authorization.value.push({