From f0326ed75d02bdc4d9015e41c27daf55513371aa Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Wed, 4 Jan 2023 16:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=B8=BA=E5=AD=97=E5=85=B8=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accessrecords/LndustrialExplosiveCome.vue         | 2 +-
 src/views/accessrecords/LndustrialExplosiveEnter.vue        | 2 +-
 .../accessrecords/ProcessMaterialWarehousingRecord.vue      | 4 ++--
 src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue  | 4 ++--
 src/views/accessrecords/ProcessMaterialsPlanRecord.vue      | 6 +++---
 src/views/activiti/processFinishManage.vue                  | 1 -
 src/views/system/modules/UserModal.vue                      | 3 ++-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/accessrecords/LndustrialExplosiveCome.vue b/src/views/accessrecords/LndustrialExplosiveCome.vue
index 02f8925..c4839c8 100644
--- a/src/views/accessrecords/LndustrialExplosiveCome.vue
+++ b/src/views/accessrecords/LndustrialExplosiveCome.vue
@@ -250,7 +250,7 @@ export default {
         {
           title:'流程发起人',
           align:"center",
-          dataIndex: 'createBy'
+          dataIndex: 'createBy_dictText'
         },
         {
           title:'物资类型',
diff --git a/src/views/accessrecords/LndustrialExplosiveEnter.vue b/src/views/accessrecords/LndustrialExplosiveEnter.vue
index 3938d6a..f4ded38 100644
--- a/src/views/accessrecords/LndustrialExplosiveEnter.vue
+++ b/src/views/accessrecords/LndustrialExplosiveEnter.vue
@@ -221,7 +221,7 @@ export default {
         {
           title:'流程发起人',
           align:"center",
-          dataIndex: 'createBy'
+          dataIndex: 'createBy_dictText'
         },
         // {
         //   title:'关联预算流程',
diff --git a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
index 0366231..a7457b5 100644
--- a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
@@ -50,7 +50,7 @@ aq<template>
 
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="流程发起人">
-              <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
+              <a-input placeholder="请输入流程发起人" v-model="queryParam.realName"/>
             </a-form-item>
           </a-col>
 <!--          <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
@@ -231,7 +231,7 @@ aq<template>
           {
             title:'流程发起人',
             align:"center",
-            dataIndex: 'createBy'
+            dataIndex: 'createBy_dictText'
           },
           {
             title:'描述信息',
diff --git a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
index 4b3bab2..1390ecd 100644
--- a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
@@ -12,7 +12,7 @@
           </a-col>
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="流程发起人">
-              <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
+              <a-input placeholder="请输入流程发起人" v-model="queryParam.realName"/>
             </a-form-item>
           </a-col>
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
@@ -273,7 +273,7 @@
           {
             title:'流程发起人',
             align:"center",
-            dataIndex: 'createBy'
+            dataIndex: 'createBy_dictText'
           },
           {
             title:'描述信息',
diff --git a/src/views/accessrecords/ProcessMaterialsPlanRecord.vue b/src/views/accessrecords/ProcessMaterialsPlanRecord.vue
index 32d6de1..3f25cc9 100644
--- a/src/views/accessrecords/ProcessMaterialsPlanRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialsPlanRecord.vue
@@ -12,7 +12,7 @@
           </a-col>
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="流程发起人">
-              <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
+              <a-input placeholder="请输入流程发起人" v-model="queryParam.realName"/>
             </a-form-item>
           </a-col>
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
@@ -265,7 +265,7 @@
           {
             title:'流程发起人',
             align:"center",
-            dataIndex: 'createBy'
+            dataIndex: 'createBy_dictText'
           },
           {
             title:'物资类型',
@@ -437,7 +437,7 @@
         fieldList.push({type:'sel_depart',value:'company',text:'流程发起公司'})
         fieldList.push({type:'datetime',value:'createTime',text:'流程发起时间'})
         fieldList.push({type:'sel_depart',value:'sysOrgCode',text:'流程发起部门'})
-        fieldList.push({type:'sel_user',value:'createBy',text:'流程发起人'})
+        fieldList.push({type:'sel_user',value:'realName',text:'流程发起人'})
         fieldList.push({type:'int',value:'materialType',text:'物资类型',dictCode:''})
         fieldList.push({type:'date',value:'deliveryTime',text:'出库时间'})
         fieldList.push({type:'string',value:'fileId',text:'文件id',dictCode:''})
diff --git a/src/views/activiti/processFinishManage.vue b/src/views/activiti/processFinishManage.vue
index 47eea2d..336bbdc 100644
--- a/src/views/activiti/processFinishManage.vue
+++ b/src/views/activiti/processFinishManage.vue
@@ -89,7 +89,6 @@
               <span v-else-if="t==5" style="color: orange"> 已删除 </span>
               <span v-else-if="t==2" style="color: green"> 已通过 </span>
               <span v-else-if="t==3" style="color: red"> 已驳回 </span>
-              <span v-else > 未知 </span>
             </template>
           </a-table-column>
          <!-- <a-table-column title="原因详情" dataIndex="deleteReason" :width="150">
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 95c7bda..f55da4e 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -23,7 +23,8 @@
         <a-row :gutter="24">
           <a-col :span="12" >
         <a-form-item label="用户账号" :labelCol="labelCol"  :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入用户账号" v-decorator.trim="[ 'username', validatorRules.username]" :readOnly="!!model.id"/>
+          <!--:readOnly="!!model.id"-->
+          <a-input placeholder="请输入用户账号" v-decorator.trim="[ 'username', validatorRules.username]" />
         </a-form-item>
           </a-col>