Merge branch 'master' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro

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=http://localhost:3008
-VITE_GLOB_API_URL="/api"   # 开发 测试环境
+# VITE_GLOB_API_URL="/api"   # 开发 测试环境
 
 # File upload address， optional
 #VITE_GLOB_UPLOAD_URL=http://localhost:8091/api/Common/UploadFile

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',
+      component: 'InputNumber',
-      labelWidth: '140px',
+      labelWidth: '200px',
-      colProps: { span: 24 },
+      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',
+      component: 'InputNumber',
-      labelWidth: '140px',
+      labelWidth: '200px',
-      colProps: { span: 12 },
+      componentProps: {
+        min: 0,
+      },
+      colProps: { span: 8 },
     })
   })
   authorization.value.push({

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"

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:
+      // case -1:
-        data = '撤销、召回'
+      //   data = '撤销、召回'
-        break
+      //   break
-      case 0:
+      // case 0:
-        data = '就绪状态'
+      //   data = '就绪状态'
-        break
+      //   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 = '-'

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) {

ds-wms-admin-web/src/views/flowcenter/flowInstances/index.vue

@@ -150,10 +150,10 @@
       return postParam
     },
     columns,
-    formConfig: {
+    // formConfig: {
-      labelWidth: 120,
+    //   labelWidth: 120,
-      schemas: searchFormSchema,
+    //   schemas: searchFormSchema,
-    },
+    // },
     sortFn: (sorter) => {
       // console.log('排序:' + sorter);
       sortInfo = sorter