个人信息页面修改

product
巴卫 2 years ago
parent 23fb59bc07
commit 98aa1626c1

@ -2,22 +2,19 @@
<div class="app-container Profile-container"> <div class="app-container Profile-container">
<el-tabs tab-position="left" style="height:100%" v-model="activeTab" class="profile-tabs" <el-tabs tab-position="left" style="height:100%" v-model="activeTab" class="profile-tabs"
v-loading="userLoading"> v-loading="userLoading">
<!--
<el-tab-pane label="个人资料" name="user"> <el-tab-pane label="个人资料" name="user">
<UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" /> <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="修改密码" name="password"> <el-tab-pane label="修改密码" name="password">
<Password ref="password" v-if="visible.password" /> <Password ref="password" v-if="visible.password" />
</el-tab-pane> </el-tab-pane>
-->
<el-tab-pane disabled name="line"></el-tab-pane> <el-tab-pane disabled name="line"></el-tab-pane>
<el-tab-pane disabled name="line"></el-tab-pane> <!-- <el-tab-pane label="个人资料" name="user">-->
<el-tab-pane label="个人资料" name="user"> <!-- <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo"/>-->
<UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" /> <!-- </el-tab-pane>-->
</el-tab-pane> <!-- <el-tab-pane label="修改密码" name="password">-->
<el-tab-pane label="修改密码" name="password"> <!-- <Password ref="password" v-if="visible.password"/>-->
<Password ref="password" v-if="visible.password" /> <!-- </el-tab-pane>-->
</el-tab-pane>
<el-tab-pane label="我的组织" name="organize"> <el-tab-pane label="我的组织" name="organize">
<div class="JNPF-common-title mb-10"> <div class="JNPF-common-title mb-10">
<h2 class="bold">我的组织 <h2 class="bold">我的组织
@ -99,7 +96,7 @@
<div class="avatar-box"> <div class="avatar-box">
<el-avatar :size="50" :src="define.comUrl + user.avatar" class="avatar" <el-avatar :size="50" :src="define.comUrl + user.avatar" class="avatar"
v-if="user.avatar" /> v-if="user.avatar" />
<!-- <div class="avatar-hover">更换头像</div>--> <div class="avatar-hover">更换头像</div>
</div> </div>
</el-upload> </el-upload>
<!-- <span class="username">{{user.realName}}</span>--> <!-- <span class="username">{{user.realName}}</span>-->

@ -11,178 +11,178 @@
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('creatorUserId')" >
<el-form-item label="创建人id" <el-form-item label="创建人id"
prop="creatorUserId" > prop="creatorUserId" >
<p>{{dataForm.creatorUserId}}</p> <p>{{dataForm.creatorUserId}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('creatorUserName')" >
<el-form-item label="创建人名称" <el-form-item label="创建人名称"
prop="creatorUserName" > prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p> <p>{{dataForm.creatorUserName}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('contractType')" >
<el-form-item label="合同类型 " <el-form-item label="合同类型 "
prop="contractType" > prop="contractType" >
<p>{{ dataForm.contractType | dynamicText(contractTypeOptions) }} </p> <p>{{ dataForm.contractType | dynamicText(contractTypeOptions) }} </p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('contractCode')" >
<el-form-item label="合同编码" <el-form-item label="合同编码"
prop="contractCode" > prop="contractCode" >
<p>{{dataForm.contractCode}}</p> <p>{{dataForm.contractCode}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('contractName')" >
<el-form-item label="合同名称" <el-form-item label="合同名称"
prop="contractName" > prop="contractName" >
<p>{{dataForm.contractName}}</p> <p>{{dataForm.contractName}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('status')" >
<el-form-item label="合同状态" <el-form-item label="合同状态"
prop="status" > prop="status" >
<p>{{dataForm.status}}</p> <p>{{dataForm.status}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('bidOpeningDate')" >
<el-form-item label="开标日期" <el-form-item label="开标日期"
prop="bidOpeningDate" > prop="bidOpeningDate" >
<p>{{jnpf.dateFormat(dataForm.bidOpeningDate)}}</p> <p>{{jnpf.dateFormat(dataForm.bidOpeningDate)}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('startDate')" >
<el-form-item label="开始日期" <el-form-item label="开始日期"
prop="startDate" > prop="startDate" >
<p>{{jnpf.dateFormat(dataForm.startDate)}}</p> <p>{{jnpf.dateFormat(dataForm.startDate)}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('auditDate')" >
<el-form-item label="审核日期" <el-form-item label="审核日期"
prop="auditDate" > prop="auditDate" >
<p>{{jnpf.dateFormat(dataForm.auditDate)}}</p> <p>{{jnpf.dateFormat(dataForm.auditDate)}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('completionDate')" >
<el-form-item label="供货完成日期" <el-form-item label="供货完成日期"
prop="completionDate" > prop="completionDate" >
<p>{{jnpf.dateFormat(dataForm.completionDate)}}</p> <p>{{jnpf.dateFormat(dataForm.completionDate)}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('closingDate')" >
<el-form-item label="关闭日期" <el-form-item label="关闭日期"
prop="closingDate" > prop="closingDate" >
<p>{{jnpf.dateFormat(dataForm.closingDate)}}</p> <p>{{jnpf.dateFormat(dataForm.closingDate)}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('collectionCycle')" >
<el-form-item label="回款周期(日)" <el-form-item label="回款周期(日)"
prop="collectionCycle" > prop="collectionCycle" >
<p>{{dataForm.collectionCycle}}</p> <p>{{dataForm.collectionCycle}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('signingDate')" >
<el-form-item label="签订日期" <el-form-item label="签订日期"
prop="signingDate" > prop="signingDate" >
<p>{{jnpf.dateFormat(dataForm.signingDate)}}</p> <p>{{jnpf.dateFormat(dataForm.signingDate)}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('endDate')" >
<el-form-item label="截止日期" <el-form-item label="截止日期"
prop="endDate" > prop="endDate" >
<p>{{jnpf.dateFormat(dataForm.endDate)}}</p> <p>{{jnpf.dateFormat(dataForm.endDate)}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('code')" >
<el-form-item label="供应商/客户" <el-form-item label="供应商/客户id"
prop="code" > prop="code" >
<p>{{dataForm.code}}</p> <p>{{dataForm.code}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('name')" >
<el-form-item label="供应商/客户" <el-form-item label="供应商/客户id"
prop="name" > prop="name" >
<p>{{dataForm.name}}</p> <p>{{dataForm.name}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('contractNo')" >
<el-form-item label="对方合同号" <el-form-item label="对方合同号"
prop="contractNo" > prop="contractNo" >
<p>{{dataForm.contractNo}}</p> <p>{{dataForm.contractNo}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('currency')" >
<el-form-item label="币种 " <el-form-item label="币种 "
prop="currency" > prop="currency" >
<p>{{dataForm.currency}}</p> <p>{{dataForm.currency}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('num')" >
<el-form-item label="数量" <el-form-item label="数量"
prop="num" > prop="num" >
<p>{{dataForm.num}}</p> <p>{{dataForm.num}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('amount')" >
<el-form-item label="金额" <el-form-item label="金额"
prop="amount" > prop="amount" >
<p>{{dataForm.amount}}</p> <p>{{dataForm.amount}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" v-if="jnpf.hasFormP('organization')" >
<el-form-item label="库存组织" <el-form-item label="库存组织"
prop="organization" > prop="organization" >
<p>{{dataForm.organization}}</p> <p>{{dataForm.organization}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16" > <el-col :span="16" v-if="jnpf.hasFormP('remark')" >
<el-form-item label="备注" <el-form-item label="备注"
prop="remark" > prop="remark" >
<p>{{dataForm.remark}}</p> <p>{{dataForm.remark}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('classification')" >
<el-form-item label="合同分类 " <el-form-item label="合同分类 "
prop="classification" > prop="classification" >
<p>{{dataForm.classification}}</p> <p>{{dataForm.classification}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('declarationDate')" >
<el-form-item label="申报日期" <el-form-item label="申报日期"
prop="declarationDate" > prop="declarationDate" >
<p>{{dataForm.declarationDate}}</p> <p>{{dataForm.declarationDate}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('deptCode')" >
<el-form-item label="部门编码" <el-form-item label="部门编码"
prop="deptCode" > prop="deptCode" >
<p>{{dataForm.deptCode}}</p> <p>{{dataForm.deptCode}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('creatorusername')" >
<el-form-item label="录入人" <el-form-item label="录入人"
prop="creatorusername" > prop="creatorusername" >
<p>{{dataForm.creatorusername}}</p> <p>{{dataForm.creatorusername}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('deptName')" >
<el-form-item label="部门名称" <el-form-item label="部门名称"
prop="deptName" > prop="deptName" >
<p>{{dataForm.deptName}}</p> <p>{{dataForm.deptName}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('approval')" >
<el-form-item label="集团审批" <el-form-item label="集团审批"
prop="approval" > prop="approval" >
<p>{{dataForm.approval}}</p> <p>{{dataForm.approval}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-tabs v-model="activenydeop" tab-position="top" class="mb-20"> <el-tabs v-model="activeayhzdd" tab-position="top" class="mb-20">
<el-tab-pane label="物料明细"> <el-tab-pane label="物料明细">
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item0List')" >
<el-form-item label-width="0"> <el-form-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">
<h2></h2> <h2></h2>
@ -249,7 +249,7 @@
</el-col> </el-col>
</el-tab-pane > </el-tab-pane >
<el-tab-pane label="附件详情"> <el-tab-pane label="附件详情">
<el-col :span="24" > <el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item1List')" >
<el-form-item label-width="0"> <el-form-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">
<h2></h2> <h2></h2>
@ -305,8 +305,8 @@
collectionCycle : '', collectionCycle : '',
signingDate : '', signingDate : '',
endDate : '', endDate : '',
code : '', code : "",
name : '', name : "",
contractNo : '', contractNo : '',
currency : '', currency : '',
num : '', num : '',
@ -322,7 +322,7 @@
jg_contract_item0List:[], jg_contract_item0List:[],
jg_contract_item1List:[], jg_contract_item1List:[],
}, },
activenydeop:'0', activeayhzdd:'0',
contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}], contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
} }

File diff suppressed because it is too large Load Diff

@ -43,37 +43,37 @@
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column prop="contractCode" label="合同编码" width="0" align="left" <el-table-column prop="contractCode" label="合同编码" width="0" align="left"
/> v-if="jnpf.hasP('contractCode')"/>
<el-table-column prop="contractName" label="合同名称" width="0" align="left" <el-table-column prop="contractName" label="合同名称" width="0" align="left"
/> v-if="jnpf.hasP('contractName')"/>
<el-table-column prop="contractNo" label="对方合同号" width="0" align="left" <el-table-column prop="contractNo" label="对方合同号" width="0" align="left"
/> v-if="jnpf.hasP('contractNo')"/>
<el-table-column label="合同类型 " width="0" prop="contractType" algin="left" <el-table-column label="合同类型 " width="0" prop="contractType" algin="left"
> v-if="jnpf.hasP('contractType')">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.contractType | dynamicText(contractTypeOptions) }} {{ scope.row.contractType | dynamicText(contractTypeOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="classification" label="合同分类 " width="0" align="left" <el-table-column prop="classification" label="合同分类 " width="0" align="left"
/> v-if="jnpf.hasP('classification')"/>
<el-table-column prop="declarationDate" label="申报日期" width="0" align="left" <el-table-column prop="declarationDate" label="申报日期" width="0" align="left"
/> v-if="jnpf.hasP('declarationDate')"/>
<el-table-column prop="name" label="供应商/客户" width="0" align="left" <el-table-column prop="name" label="供应商/客户id" width="0" align="left"
/> v-if="jnpf.hasP('name')"/>
<el-table-column prop="num" label="数量" width="0" align="left" <el-table-column prop="num" label="数量" width="0" align="left"
/> v-if="jnpf.hasP('num')"/>
<el-table-column prop="amount" label="金额" width="0" align="left" <el-table-column prop="amount" label="金额" width="0" align="left"
/> v-if="jnpf.hasP('amount')"/>
<el-table-column prop="deptName" label="部门名称" width="0" align="left" <el-table-column prop="deptName" label="部门名称" width="0" align="left"
/> v-if="jnpf.hasP('deptName')"/>
<el-table-column prop="remark" label="备注" width="0" align="left" <el-table-column prop="remark" label="备注" width="0" align="left"
/> v-if="jnpf.hasP('remark')"/>
<el-table-column prop="creatorusername" label="录入人" width="0" align="left" <el-table-column prop="creatorusername" label="录入人" width="0" align="left"
/> v-if="jnpf.hasP('creatorusername')"/>
<el-table-column prop="status" label="合同状态" width="0" align="left" <el-table-column prop="status" label="合同状态" width="0" align="left"
/> v-if="jnpf.hasP('status')"/>
<el-table-column prop="approval" label="集团审批" width="0" align="left" <el-table-column prop="approval" label="集团审批" width="0" align="left"
/> v-if="jnpf.hasP('approval')"/>
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
@ -138,7 +138,7 @@
{prop: 'contractType', label: '合同类型 '}, {prop: 'contractType', label: '合同类型 '},
{prop: 'classification', label: '合同分类 '}, {prop: 'classification', label: '合同分类 '},
{prop: 'declarationDate', label: '申报日期'}, {prop: 'declarationDate', label: '申报日期'},
{prop: 'name', label: '供应商/客户'}, {prop: 'name', label: '供应商/客户id'},
{prop: 'num', label: '数量'}, {prop: 'num', label: '数量'},
{prop: 'amount', label: '金额'}, {prop: 'amount', label: '金额'},
{prop: 'deptName', label: '部门名称'}, {prop: 'deptName', label: '部门名称'},

Loading…
Cancel
Save