Browse Source

fix:样式优化

luojie
15881625488@163.com 2 weeks ago
parent
commit
fb1d91d2fd
23 changed files with 447 additions and 136 deletions
  1. +1
    -0
      package.json
  2. +12
    -1
      src/App.vue
  3. +3
    -0
      src/lang/en/business/resource/gyzj/gyzj.js
  4. +4
    -0
      src/lang/en/business/resource/mjy/mjy.js
  5. +3
    -0
      src/lang/zh/business/resource/gyzj/gyzj.js
  6. +4
    -0
      src/lang/zh/business/resource/mjy/mjy.js
  7. +1
    -0
      src/layout/components/AppMain.vue
  8. +4
    -1
      src/main.js
  9. +59
    -26
      src/views/business/resource/gyzj/comps/ffjl/Jy.vue
  10. +3
    -1
      src/views/business/resource/gyzj/comps/ffjl/Xq.vue
  11. +16
    -8
      src/views/business/resource/gyzj/comps/ffjlList.vue
  12. +12
    -8
      src/views/business/resource/gyzj/comps/gyzj/Gh.vue
  13. +42
    -8
      src/views/business/resource/gyzj/comps/gyzj/Jy.vue
  14. +2
    -1
      src/views/business/resource/gyzj/comps/gyzj/Xq.vue
  15. +9
    -4
      src/views/business/resource/gyzj/comps/gyzjList.vue
  16. +75
    -19
      src/views/business/resource/gyzj/index.vue
  17. +59
    -26
      src/views/business/resource/mjy/comps/ffjl/Jy.vue
  18. +2
    -1
      src/views/business/resource/mjy/comps/ffjl/Xq.vue
  19. +10
    -2
      src/views/business/resource/mjy/comps/ffjlList.vue
  20. +42
    -8
      src/views/business/resource/mjy/comps/mjy/Jy.vue
  21. +2
    -1
      src/views/business/resource/mjy/comps/mjy/Xq.vue
  22. +7
    -2
      src/views/business/resource/mjy/comps/mjyList.vue
  23. +75
    -19
      src/views/business/resource/mjy/index.vue

+ 1
- 0
package.json View File

@ -37,6 +37,7 @@
"js-cookie": "3.0.1", "js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1", "jsencrypt": "3.0.0-rc.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"moment": "^2.30.1",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"quill": "2.0.2", "quill": "2.0.2",
"screenfull": "5.0.2", "screenfull": "5.0.2",

+ 12
- 1
src/App.vue View File

@ -150,7 +150,6 @@ export default {
/*详情 */ /*详情 */
.detail-container { .detail-container {
background: #ffffff !important; background: #ffffff !important;
margin: 10px 10px;
.detail-top { .detail-top {
background: #fff; background: #fff;
@ -161,6 +160,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
.left-top { .left-top {
flex-shrink: 0; flex-shrink: 0;
display: flex; display: flex;
@ -178,7 +178,18 @@ export default {
} }
} }
.detail-title {
line-height: 60px;
font-size: 16px;
font-weight: bold;
width: 100%;
margin-top: 10px;
display: flex;
justify-content: center;
}
.detail-content { .detail-content {
padding: 10px 10px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

+ 3
- 0
src/lang/en/business/resource/gyzj/gyzj.js View File

@ -99,4 +99,7 @@ export default {
gdsqr:'发放备注', gdsqr:'发放备注',
cjsj:'创建时间', cjsj:'创建时间',
rkl:'入库净重', rkl:'入库净重',
jysj:'借阅时间',
ffjlxq:'发放回收记录详情',
gyzjxq:'给药制剂详情',
} }

+ 4
- 0
src/lang/en/business/resource/mjy/mjy.js View File

@ -99,4 +99,8 @@ export default {
gdsqr:'发放备注', gdsqr:'发放备注',
cjsj:'创建时间', cjsj:'创建时间',
rkl:'入库毛重', rkl:'入库毛重',
jysj:'借阅时间',
mjyxq:'麻精药详情',
ffjlxq:'发放回收记录详情',
} }

+ 3
- 0
src/lang/zh/business/resource/gyzj/gyzj.js View File

@ -99,4 +99,7 @@ export default {
gdsqr:'发放备注', gdsqr:'发放备注',
cjsj:'创建时间', cjsj:'创建时间',
rkl:'入库净重', rkl:'入库净重',
jysj:'借阅时间',
ffjlxq:'发放回收记录详情',
gyzjxq:'给药制剂详情',
} }

+ 4
- 0
src/lang/zh/business/resource/mjy/mjy.js View File

@ -99,4 +99,8 @@ export default {
gdsqr:'发放备注', gdsqr:'发放备注',
cjsj:'创建时间', cjsj:'创建时间',
rkl:'入库毛重', rkl:'入库毛重',
jysj:'借阅时间',
mjyxq:'麻精药详情',
ffjlxq:'发放回收记录详情',
} }

+ 1
- 0
src/layout/components/AppMain.vue View File

@ -51,6 +51,7 @@ export default {
width: 100%; width: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: #f3f3f3;
} }
.fixed-header + .app-main { .fixed-header + .app-main {

+ 4
- 1
src/main.js View File

@ -5,6 +5,7 @@ import Cookies from 'js-cookie'
import Element from 'element-ui' import Element from 'element-ui'
import './assets/styles/element-variables.scss' import './assets/styles/element-variables.scss'
import '@/assets/styles/index.scss' // global css import '@/assets/styles/index.scss' // global css
import '@/assets/styles/ruoyi.scss' // ruoyi css import '@/assets/styles/ruoyi.scss' // ruoyi css
import App from './App' import App from './App'
@ -80,7 +81,9 @@ DictData.install()
import i18n from './lang' import i18n from './lang'
import _ from 'lodash' import _ from 'lodash'
import moment from "moment";
// 将 moment 挂载到 Vue 原型上
Vue.prototype.$moment = moment;
Vue.use(Element, { Vue.use(Element, {
i18n: (key, value) => i18n.t(key, value), i18n: (key, value) => i18n.t(key, value),
size: Cookies.get('size') || 'mini' // set element-ui default size size: Cookies.get('size') || 'mini' // set element-ui default size

+ 59
- 26
src/views/business/resource/gyzj/comps/ffjl/Jy.vue View File

@ -1,24 +1,34 @@
G<template> G<template>
<div >
<div>
<!-- 借阅弹窗 --> <!-- 借阅弹窗 -->
<el-dialog :title="$t('page.business.resource.gyzj.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-dialog :title="$t('page.business.resource.gyzj.jieyue')" :visible.sync="open" width="500px" append-to-body
:close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('page.business.resource.gyzj.mc')" prop="mc">
<el-input type="text" v-model="form.mc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('page.business.resource.gyzj.bh')" prop="glyj">
<el-input type="text" v-model="form.bh" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('page.business.resource.gyzj.mc')" prop="mc">
<el-input type="text" v-model="form.mc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('page.business.resource.gyzj.bh')" prop="glyj">
<el-input type="text" v-model="form.bh" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('page.business.resource.gyzj.jysj') + ':'" prop="startDate">
<el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
:start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
value-format="yyyy-MM-dd" @change="daterangeChange" style="width: 250px;" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('form.qmyy')" prop="qmyy"> <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@ -47,7 +57,8 @@ G