1

src/flow/components/handle-job/dynamic-link.vue

@@ -32,6 +32,7 @@
             useMessage().error("不存在的表单，请检查")
             return
         }
+        
         data.currTabComp = `../../views${path}.vue`
     }
 

src/flow/components/handle-job/handle.vue

@@ -35,7 +35,10 @@
         </template>
 
         <!-- 审批项 -->
+        
+        
         <el-form v-if="!data.currJob.hiJob && !orderVue.vueKeySys.sysPaths.includes(data.currElTab.path)" label-width="72px" style="margin-top: 22px;">
+            
             <template v-if="data.currElTab.isAutoAudit !== '1'">
                 <el-form-item :label="t('jfcomment.remark')">
                     <el-input v-model="data.currJob.comment" :autosize="{ minRows: 3, maxRows: 6}" maxlength="50" show-word-limit
@@ -525,11 +528,12 @@
             let elTabs = data.currJob.elTabs.filter(f => (f.isFormEdit !== '0' && !hiJob))
             if (elTabs) {
                 let find = elTabs.find(f => f.isSave !== true);
-                if (find) useMessage().info(find.formName + ' 未保存')
-                else {
+                // 这里测试流程，临时屏蔽判断 todo
+                // if (find) useMessage().info(find.formName + ' 未保存')
+                // else {
                     methods.timeoutLoading()
                     btnMethods.onHandleJob(jobBtn)
-                }
+                // }
                 return
             }
             methods.timeoutLoading()

src/flow/components/index.ts

@@ -15,7 +15,9 @@ import EmailInput from "./form-create/email.vue";
 import SignInput from "./sign/index.vue";
 
 // vite glob导入
-const modules: Record<string, () => Promise<unknown>> = import.meta.glob(['../../views/jsonflow/*/*.vue', '../../views/order/*/*.vue'])
+const modules: Record<string, () => Promise<unknown>> = import.meta.glob(
+    ['../../views/jsonflow/*/*.vue', '../../views/order/*/*.vue', '../../views/purchase/*/*.vue']
+)
 
 /**
  * 导出全局注册工作流审批表单组件

src/flow/components/user-role/picker.vue

@@ -83,7 +83,7 @@
                                     class="bcrumb-item"
                                     @click="goOrganiseLevel(item)"
                             >
-                                <span class="name line-1">{{ item.name }}</span>
+                                <span class="name line-1">{{ item.realName }}</span>
                                 <el-icon style="color: #a1a2a4; width: 16px; height: 16px"><ArrowRight /></el-icon>
                             </span>
                         </div>
@@ -684,13 +684,13 @@
         let name = searchKey.value.toLowerCase();
         await onLoadListenSearch(name)
         if (data.jobType === DIC_PROP.JOB_USER_TYPE[0].value) {
-            data.searchUsers = data.jobTypeUsers.filter((v) => v.name.toLowerCase().includes(name));
+            data.searchUsers = data.jobTypeUsers.filter((v) => v.realName.toLowerCase().includes(name));
         } else if (data.jobType === DIC_PROP.JOB_USER_TYPE[1].value) {
             data.searchUsers = data.jobTypeUsers.filter((v) => v.roleName.toLowerCase().includes(name));
         } else if (data.jobType === DIC_PROP.JOB_USER_TYPE[2].value) {
             data.searchUsers = data.jobTypeUsers.filter((v) => v.postName.toLowerCase().includes(name));
         } else if (data.jobType === DIC_PROP.JOB_USER_TYPE[3].value) {
-            data.searchUsers = data.jobTypeUsers.filter((v) => v.name.toLowerCase().includes(name));
+            data.searchUsers = data.jobTypeUsers.filter((v) => v.realName.toLowerCase().includes(name));
         }
         updateItemChecked()
     };
@@ -709,10 +709,10 @@
     }
 
     function showKeyName(item) {
-        if (userJobType(item)) return item.name
+        if (userJobType(item)) return item.realName
         else if (roleJobType(item)) return item.roleName
         else if (postJobType(item)) return item.postName
-        else if (deptJobType(item)) return item.name
+        else if (deptJobType(item)) return item.realName
     }
 
     const methodsRemote = {
@@ -813,7 +813,7 @@
           display: flex;
           align-items: center;
           max-width: 140px;
-          .name {
+          .realName {
             font-size: 14px;
             font-family: Microsoft YaHei, Microsoft YaHei-Regular;
             font-weight: 400;
@@ -826,7 +826,7 @@
             margin-left: 2px;
           }
           &:last-child {
-            .name {
+            .realName {
               color: #a1a2a4;
             }
             .icon {
@@ -981,6 +981,7 @@
     text-align: center;
     line-height: 24px;
     font-size: 10px;
+    display: none;
   }
 
   .icon {