Skip to content

M
mes-ui
Commit 70d317c7 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'portal' of http://git.mes123.com/zhouyx/mes-ui into portal

parents 9e11f776 d6a25252
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 724 additions and 657 deletions
assets/css/base.less
View file @ 70d317c7
......@@ -711,7 +711,7 @@ textarea::-webkit-input-placeholder {
background: #fff;
padding: 0px 10px 20px 10px;
margin-top: 10px;
overflow: auto;
.zh-title {
font-size: 14px;
padding: 0 5px;
......@@ -1156,7 +1156,7 @@ html [type=button] {
}
}
.tree {
height: calc(100% - 150px);
// height: calc(100% - 150px);
overflow: auto;
}
}
......@@ -1190,4 +1190,10 @@ html [type=button] {
.content {
padding-left: 5px;
}
// 详情弹框css
.row_border_bottom{
border-bottom: 1px solid #E0E0E0;
padding: 15px 20px;
}
\ No newline at end of file
package-lock.json
View file @ 70d317c7
This source diff could not be displayed because it is too large. You can view the blob instead.
pages/basicData/code/detail.vue
View file @ 70d317c7
<template>
<div class="detail">
<Row>
<div >
<!-- <Row> class="detail"
<Filed :span="12" :name="l('businessName')">{{entity.businessName}}</Filed>
<Filed :span="12" :name="l('businessCode')">{{entity.businessCode}}</Filed>
<Filed :span="12" :name="l('prefix')">{{entity.prefix}}</Filed>
......@@ -10,6 +10,36 @@
</Filed>
<Filed :span="12"></Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
</Row> -->
<Row class="row_border_bottom">
<Col :span="8">
<b>{{l('businessName')}}</b>
<p>{{entity.businessName}}</p>
</Col>
<Col :span="8">
<b>{{l('businessCode')}}</b>
<p>{{entity.businessCode}}</p>
</Col>
<Col :span="8">
<b>{{l('prefix')}}</b>
<p>{{entity.prefix}}</p>
</Col>
</Row>
<Row class="row_border_bottom">
<Col :span="8">
<b>{{l('maxSerial')}}</b>
<p>{{entity.maxSerial}}</p>
</Col>
<Col :span="8">
<b>{{l('day')}}</b>
<p><state code="mes_xingchi_system.business_code_config.day" :value="entity.day" /></p>
</Col>
</Row>
<Row class="row_border_bottom">
<Col :span="24">
<b>{{l('remark')}}</b>
<p>{{entity.remark}}</p>
</Col>
</Row>
</div>
</template>
......
pages/basicData/code/index.vue
View file @ 70d317c7
......@@ -27,7 +27,7 @@
<Modal v-model="setModal" title="设置" width="600" footer-hide>
<Set :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情" width="800">
<Modal v-model="detailModal" title="详情" width="900">
<Detail :eid="curId" />
</Modal>
</div>
......
pages/basicData/dic/index.vue
View file @ 70d317c7
This diff is collapsed.
pages/basicData/user/detail.vue
View file @ 70d317c7
<template>
<div class="addUser">
<Form ref="form" :model="entity" :label-width="90">
<Row>
<Col :span="12">
<FormItem :label="l('userName')" prop="userName">{{entity.userName}}</FormItem>
<Row class="row_border_bottom">
<Col :span="8">
<!-- <FormItem :label="l('userName')" prop="userName">{{entity.userName}}</FormItem> -->
<b>{{l('userName')}}</b>
<p>{{entity.userName}}</p>
</Col>
<Col :span="12">
<FormItem :label="l('cardNo')" prop="cardNo">{{entity.cardNo}}</FormItem>
<Col :span="8">
<!-- <FormItem :label="l('cardNo')" prop="cardNo">{{entity.cardNo}}</FormItem> -->
<b>{{l('cardNo')}}</b>
<p>{{entity.cardNo}}</p>
</Col>
<Col :span="12">
<FormItem :label="l('gender')" prop="gender">
<Col :span="8">
<!-- <FormItem :label="l('gender')" prop="gender">
<state code="User.base.gender" :value="entity.gender" type="text"></state>
</FormItem>
</FormItem> -->
<b>{{l('gender')}}</b>
<p><state code="User.base.gender" :value="entity.gender" type="text"></state></p>
</Col>
<Col :span="12">
<FormItem :label="l('birthday')" prop="birthday">{{entity.birthday}}</FormItem>
</Row>
<Row class="row_border_bottom">
<Col :span="8">
<!-- <FormItem :label="l('birthday')" prop="birthday">{{entity.birthday}}</FormItem> -->
<b>{{l('birthday')}}</b>
<p>{{entity.birthday}}</p>
</Col>
<Col :span="12">
<FormItem :label="l('degreeId')" prop="degreeId">
<Col :span="8">
<!-- <FormItem :label="l('degreeId')" prop="degreeId">
<state code="User.base.degree" :value="entity.degreeId" type="text"></state>
</FormItem>
</FormItem> -->
<b>{{l('degreeId')}}</b>
<p><state code="User.base.degree" :value="entity.degreeId" type="text"></state></p>
</Col>
<Col :span="12">
<FormItem :label="l('departmentTitle')" prop="departmentTitle">{{entity.departmentTitle}}</FormItem>
<Col :span="8">
<!-- <FormItem :label="l('departmentTitle')" prop="departmentTitle">{{entity.departmentTitle}}</FormItem> -->
<b>{{l('departmentTitle')}}</b>
<p>{{entity.departmentTitle}}</p>
</Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
</Row>
<Row class="row_border_bottom">
<Col :span="8">
<!-- <FormItem :label="l('status')" prop="status">
<state code="User.base.status" :value="entity.status" type="text"></state>
</FormItem>
</FormItem> -->
<b>{{l('status')}}</b>
<p><state code="User.base.status" :value="entity.status" type="text"></state></p>
</Col>
<Col :span="12">
<FormItem :label="l('phone')" prop="phone">{{entity.phone}}</FormItem>
<Col :span="8">
<!-- <FormItem :label="l('phone')" prop="phone">{{entity.phone}}</FormItem> -->
<b>{{l('phone')}}</b>
<p>{{entity.phone}}</p>
</Col>
<Col :span="12">
<FormItem :label="l('email')" prop="email">{{entity.email}}</FormItem>
<Col :span="8">
<!-- <FormItem :label="l('email')" prop="email">{{entity.email}}</FormItem> -->
<b>{{l('email')}}</b>
<p>{{entity.email}}</p>
</Col>
<!-- <Col :span="12">
<FormItem :label="l('enableEquip')" prop="enableEquip">{{entity.enableEquip}}</FormItem>
</Col> -->
<Col :span="12">
<FormItem :label="l('positionId')" prop="positionId">
</Row>
<Row class="row_border_bottom">
<Col :span="8">
<!-- <FormItem :label="l('positionId')" prop="positionId">
<state code="User.base.position" :value="entity.positionId" type="text"></state>
</FormItem>
</FormItem> -->
<b>{{l('positionId')}}</b>
<p><state code="User.base.position" :value="entity.positionId" type="text"></state></p>
</Col>
<Col :span="12">
<FormItem :label="l('titleId')" prop="titleId">
<Col :span="8">
<!-- <FormItem :label="l('titleId')" prop="titleId">
<state code="User.base.jobtitle" :value="entity.titleId" type="text"></state>
</FormItem>
</FormItem> -->
<b>{{l('titleId')}}</b>
<p><state code="User.base.titleId" :value="entity.titleId" type="text"></state></p>
</Col>
<Col :span="12">
<FormItem :label="l('licensedToWork')" prop="licensedToWork">
<Col :span="8">
<!-- <FormItem :label="l('licensedToWork')" prop="licensedToWork">
<state code="User.base.workLicense" :value="entity.licensedToWork" type="text"></state>
</FormItem>
</FormItem> -->
<b>{{l('workLicense')}}</b>
<p><state code="User.base.workLicense" :value="entity.workLicense" type="text"></state></p>
</Col>
</Row>
<Row class="row_border_bottom">
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">{{entity.remark}}</FormItem>
<!-- <FormItem :label="l('remark')" prop="remark">{{entity.remark}}</FormItem> -->
<b>{{l('remark')}}</b>
<p>{{entity.remark}}</p>
</Col>
</Row>
</Form>
......
pages/basicData/user/index.vue
View file @ 70d317c7
......@@ -38,7 +38,7 @@
<Modal v-model="editModal" title="编辑" footer-hide width="800">
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情" width="800">
<Modal v-model="detailModal" title="详情" width="900">
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment