Browse Source

修改流程创建人为字典项

dev
long 2 years ago
parent
commit
f0326ed75d
  1. 2
      src/views/accessrecords/LndustrialExplosiveCome.vue
  2. 2
      src/views/accessrecords/LndustrialExplosiveEnter.vue
  3. 4
      src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
  4. 4
      src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
  5. 6
      src/views/accessrecords/ProcessMaterialsPlanRecord.vue
  6. 1
      src/views/activiti/processFinishManage.vue
  7. 3
      src/views/system/modules/UserModal.vue

2
src/views/accessrecords/LndustrialExplosiveCome.vue

@ -250,7 +250,7 @@ export default {
{
title:'流程发起人',
align:"center",
dataIndex: 'createBy'
dataIndex: 'createBy_dictText'
},
{
title:'物资类型',

2
src/views/accessrecords/LndustrialExplosiveEnter.vue

@ -221,7 +221,7 @@ export default {
{
title:'流程发起人',
align:"center",
dataIndex: 'createBy'
dataIndex: 'createBy_dictText'
},
// {
// title:'',

4
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:'描述信息',

4
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:'描述信息',

6
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:''})

1
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">

3
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>

Loading…
Cancel
Save