Skip to content

F
founder_vue
Commit 86860d4b by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents 1a91dd2b 2fa280da
Showing with 242 additions and 99 deletions
src/assets/css/globalBase.scss
......@@ -5,43 +5,105 @@
border: none;
}
// 输入框选中样式
/deep/.el-input.is-active .el-input__inner, /deep/.el-input__inner:focus {
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055FE7;
color: #055fe7;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner, /deep/.el-input__inner:focus-within {
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055FE7;
color: #055fe7;
.el-range-input {
color: #055FE7;
color: #055fe7;
}
}
/deep/.el-table td,
.el-table th.is-leaf {
background-color: #ffffff;
border: none;
// border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid;
}
// 去除table表格最底部边框
.el-table__row > td {
border: none;
}
// 去除table表格最底部边框
.el-table::before {
height: 0px;
}
/deep/.el-table .el-table__header-wrapper tr th{
background-color: #ECF1F7!important;
/deep/.el-table .el-table__header-wrapper tr th {
background-color: #ecf1f7 !important;
font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282F3C !important;
color: #282f3c !important;
height: 48px !important;
padding: 0 !important;
}
/deep/.el-table .el-table__body tr.current-row > td {
background-color: #F2F7FE !important;
background-color: #f2f7fe !important;
}
/deep/.el-table .el-table__body tr:hover > td {
background-color: #F2F7FE !important;
background-color: #f2f7fe !important;
}
/deep/.el-table__row {
height: 48px !important;
}
/deep/.el-table__row--level-1 {
.el-table__cell {
background-color: #F5F6F7 !important;
background-color: #f5f6f7 !important;
}
}
/deep/.el-table .el-table__cell {
padding: 0 !important;
}
/deep/.el-table__body {
width: 100% !important;
}
/deep/.btn-prev {
cursor: pointer;
i {
cursor: pointer;
}
}
/deep/.btn-next {
cursor: pointer;
i {
cursor: pointer;
}
}
// 分页
/deep/.el-pager {
.number {
background-color: transparent !important;
}
.number.active {
background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px;
}
.el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important;
}
}
/deep/ .btn-prev,
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 修改下拉框样式
......@@ -49,6 +111,10 @@
padding-left: 10px !important;
}
/deep/.el-input__inner:hover {
cursor: text;
}
// 日期选择器
/deep/.el-date-editor {
display: flex;
......@@ -57,8 +123,10 @@
/deep/.el-date-editor .el-range-separator {
line-height: 26px;
}
/deep/.el-input__icon {
height: 32px;
/deep/.el-date-editor {
/deep/.el-range__close-icon {
height: 32px !important;
}
}
/deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute;
......@@ -67,27 +135,27 @@
.f-primary-button {
cursor: pointer;
background: #055FE7 !important;
background: #055fe7 !important;
&:hover {
background: #377FEC !important;
background: #377fec !important;
}
&:active {
background: #044CB9 !important;
background: #044cb9 !important;
}
}
.f-default-button {
border-radius: 6px;
border: 1px solid #AEB5C2 !important;
border: 1px solid #aeb5c2 !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #2E3846 !important;
color: #2e3846 !important;
&:hover {
border: 1px solid #055FE7 !important;
color: #055FE7 !important;
border: 1px solid #055fe7 !important;
color: #055fe7 !important;
}
&:active {
border: 1px solid #044CB9 !important;
color: #044CB9 !important;
border: 1px solid #044cb9 !important;
color: #044cb9 !important;
}
}
src/router/modules/leftMenu.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-10 12:00:05
* @LastEditTime: 2022-01-12 11:27:48
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -41,7 +41,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -55,7 +54,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -128,18 +126,6 @@ export default [
component: () => import('@/views/Editor/ajzwbj.vue')
},
{
path: '/cxyrd',
name: 'cxyrd',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '查询与认定',
auth: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/zljc',
name: 'zljc',
hidden: false,
......@@ -176,6 +162,18 @@ export default [
component: () => import('@/views/daxx/Index.vue')
},
{
path: '/cxyrd',
name: 'cxyrd',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '查询与认定',
auth: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/AllPersonnelBaseIndex',
name: 'AllPersonnelBaseIndex',
redirect: '/AllPersonnelBase',
......@@ -318,7 +316,7 @@ export default [
hidden: false,
meta: {
title: '发查询权限',
auth: 'H-4',
auth: 'H-5',
parentId: 'SystemManage'
},
component: () =>
......@@ -380,7 +378,7 @@ export default [
hidden: false,
meta: {
title: '系统分库管理',
auth: 'H-4',
auth: 'H-6',
parentId: 'SystemManage'
},
component: () =>
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -222,7 +222,6 @@
>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="auto"
>
......@@ -1032,7 +1031,7 @@ export default {
* @return {*}
*/
Tpage () {
return Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize);
return Math.round(this.reqParam.page.total / this.reqParam.page.pageSize);
}
},
mounted () {
......
src/views/Home.vue
......@@ -892,10 +892,10 @@ export default {
.el-tabs /deep/ {
font-family: HarmonyOS_Sans_SC;
width: 1235px;
height: 60px;
height: 56px;
.el-tabs__header {
margin: 0;
height: 60px;
height: 56px;
.el-tabs__nav-wrap.is-top {
height: 100%;
}
......@@ -1220,7 +1220,7 @@ export default {
.main {
// padding: 24px;
width: 100%;
height: calc(100% - 60px);
height: calc(100% - 56px);
.contain {
position: relative;
......
src/views/cxyrd/QueryConfirm.vue
......@@ -8,7 +8,7 @@
<div class="display_style">
<span class="labelFont">条码号：</span>
<el-input
class="el_input"
class="el_input tmh"
v-model="reqParam.contrastCustomSearchReq.barcode"
placeholder="请输入条码号"
></el-input>
......@@ -247,8 +247,8 @@
v-show="isShowTip"
>
<i
class="el-icon-info"
style="color: #055fe7; font-size: 0.9375rem"
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
></i>
已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
......@@ -1489,14 +1489,14 @@ b {
font-size: 12px;
}
.el-button {
width: 96px;
width: 72px;
height: 32px;
border-radius: 4px;
margin: 0;
padding: 0;
}
.el-button__inner {
width: 56px;
width: 72px;
height: 16px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
......@@ -1510,6 +1510,7 @@ b {
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
}
.confirm-page {
......@@ -1608,6 +1609,9 @@ b {
border-radius: 4px;
// border: 1px solid #e6e6e8;
}
.tmh {
width: 232px;
}
/deep/.el-input__inner {
height: 32px !important;
}
......@@ -1690,7 +1694,7 @@ b {
}
.el-button--primary {
width: 96px;
width: 72px;
height: 32px;
line-height: 22px;
padding: 0;
......@@ -1795,7 +1799,9 @@ b {
}
.confirm_main {
width: 100%;
height: 60px;
// height: 60px;
height: 620px;
border-bottom: 1px solid #eeeeee;
}
.confirm_main_table {
margin: 6px 0 15px 0;
......
src/views/drFPTX/Index.vue
......@@ -89,6 +89,7 @@
FPTX的条码号
</div>
<el-table
:border="false"
height="33rem"
:data="datas"
@selection-change="checkAll1"
......
src/views/drFPTX/RAList.vue
......@@ -247,12 +247,13 @@
<!-- <el-divider style="background-color: #EEEEEE !important;"></el-divider> -->
<!-- 三 -->
<div class="split-line">
<div class="options">
<div class="left">
<div
class="btn"
@click="batch"
style="font-size:14px"
style="font-size:0.875rem"
>批量操作</div>
</div>
<div class="right">
......@@ -260,7 +261,7 @@
v-if="roleArr.includes('B-2-4')"
class="btn"
@click="isShowTjddlBtn"
style="font-size:14px"
style="font-size:0.875rem"
>添加到队列</div>
<div
class="btn"
......@@ -268,7 +269,7 @@
@click="getBarcodeSuccess(0)"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
style="font-size:14px"
style="font-size:0.875rem"
>
复制入库失败编号
</div>
......@@ -278,7 +279,7 @@
@click="getBarcodeSuccess(1)"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
style="font-size:14px"
style="font-size:0.875rem"
>
复制入库成功编号
</div>
......@@ -288,7 +289,7 @@
@click="getBarcode"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
style="font-size:14px"
style="font-size:0.875rem"
>
复制条码
</div>
......@@ -296,19 +297,19 @@
v-if='showType!=2'
class="btn send"
@click="isShowFcxBtn"
style="font-size:14px"
style="font-size:0.875rem"
>发查询</div>
</div>
</div>
<!--四 -->
<el-tag
style="width: 100%; color: #666666; margin-bottom: 16px"
style="width: 100%; color: #666666; margin-bottom: 1rem;background: #ddebff;"
v-show="isShowTip"
>
<span v-html="'&nbsp;&nbsp;'"></span>
<i
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
......@@ -317,13 +318,18 @@
<el-link
type="primary"
:underline="false"
style="margin-left: 20px"
:style="{
marginLeft: '1.25rem',
color: '#055FE7',
transform: 'translateY(-2px)',
}"
@click="toggleSelection()"
>清除</el-link>
</el-tag>
<!-- 五 -->
<div v-if="showType == 1 || showType == 3">
<el-table
:border="false"
:class="{delSelection: !selectBoo}"
:height="height"
ref="multipleTable"
......@@ -511,6 +517,7 @@
</div>
<el-table
:border="false"
class="bzTable"
:class="{delSelection: !selectBoo}"
v-if="showType == 2"
......@@ -615,9 +622,9 @@
v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''"
style="margin-top:6px;margin-right: 5px;"
>
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 0.4375rem;height: 0.4375rem;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div>
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 0.4375rem;height: 0.4375rem;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
</div>
<div>
<div>{{ scope.row.srcBarcode }}</div>
......@@ -763,6 +770,7 @@
</template>
</el-table-column>
</el-table>
</div>
<!-- 六 -->
<div
class="block"
......@@ -1841,7 +1849,10 @@ export default {
}
}
}
.split-line {
height: 650px;
border-bottom: 1px solid #eee;
}
.options {
height: 72px;
display: flex;
......@@ -1906,6 +1917,7 @@ export default {
margin-left: 0;
}
img {
cursor: pointer;
width: 16px;
height: 16px;
object-fit: fill;
......
src/views/zljc/Index.vue
......@@ -82,14 +82,15 @@
>清空</el-button>
<el-button
type="primary"
class='sx'
class='sx f-primary-button'
@click="onSubmit"
>筛选结果</el-button>
>筛选</el-button>
</div>
</div>
<div class="line">
<div></div>
</div>
<div class="split-line">
<div class="cz">
<div class="czLeft">
<div
......@@ -125,7 +126,7 @@
</el-tag>
<el-table
:max-height="height"
:height="height"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
......@@ -243,6 +244,7 @@
</el-table-column>
</el-table>
</div>
</div>
<div class="footer">
<span class="record">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{
Tpage
......@@ -305,7 +307,7 @@ export default {
width1: 220,
width2: 160,
width3: 110,
height: 550,
height: "33rem",
tableDate: [],
// 当前页数
currPage: 1,
......@@ -482,9 +484,9 @@ export default {
this.isShowTip = false;
this.toggleSelection();
if (this.isShowTip) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
} else {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
}
},
/**
......@@ -498,9 +500,9 @@ export default {
this.toggleSelection();
// this.$set(this.multipleSelection, [])
if (this.isShowTip) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
} else {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
}
},
/**
......@@ -604,7 +606,7 @@ export default {
<style lang="scss" scoped>
// table表的高度
$tableHeight: var(--tableHeight, 550px);
$tableHeight: var(--tableHeight, 33rem);
.czBtn {
width: 72px;
......@@ -673,34 +675,68 @@ $tableHeight: var(--tableHeight, 550px);
.bhgSpan {
background: #fe0000;
}
.split-line {
margin: 0 24px;
height: 650px;
border-bottom: 1px solid #eee;
}
// .footer {
// position: fixed;
// bottom: 0;
// padding: 0 24px;
// box-sizing: border-box;
// margin-top: 16px;
// width: 100%;
// display: flex;
// align-items: center;
// justify-content: space-between;
// .record {
// font-size: 14px;
// font-family: HarmonyOS_Sans_SC;
// color: #666666;
// }
// }
.footer {
padding: 0 24px;
box-sizing: border-box;
margin-top: 16px;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
width: 1544px;
position: absolute;
bottom: 27px;
left: 24px;
.record {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
}
.paging {
float: right;
}
}
// .footer {
// width: 96.5rem;
// position: absolute;
// bottom: 1.6875rem;
// left: 1.5rem;
// }
.content {
margin-top: 24px;
margin-top: 15px;
width: 100%;
padding: 0 24px;
// padding: 0 24px;
box-sizing: border-box;
.el-tag {
width: 100%;
margin-bottom: 24px;
margin-bottom: 15px;
color: #666;
span {
color: #409eff;
}
}
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......@@ -722,8 +758,9 @@ $tableHeight: var(--tableHeight, 550px);
.cz {
display: flex;
justify-content: space-between;
padding: 0 24px;
// padding: 0 24px;
.btn {
cursor: pointer;
width: 96px;
height: 32px;
border-radius: 4px;
......@@ -744,7 +781,7 @@ $tableHeight: var(--tableHeight, 550px);
}
}
.line {
margin: 24px 0;
margin: 15px 0;
width: 100%;
padding: 0 24px;
box-sizing: border-box;
......@@ -765,12 +802,28 @@ $tableHeight: var(--tableHeight, 550px);
justify-content: space-between;
margin: 24px;
.left {
.demo-form-inline {
display: flex;
align-items: center;
}
/deep/.el-form-item {
height: 32px;
margin-left: 24px;
display: flex;
align-items: center;
.el-input__inner {
height: 32px;
}
}
.el-form-item__label {
height: 32px !important;
}
.el-form-item__content {
height: 32px !important;
}
.el-input {
height: 32px;
}
.w156 {
/deep/.el-input__inner {
width: 156px;
......@@ -792,17 +845,21 @@ $tableHeight: var(--tableHeight, 550px);
.right {
margin-right: 24px;
/deep/.sx {
width: 96px;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
color: #fff;
cursor: pointer;
span {
cursor: pointer;
}
}
}
}
/deep/.el-table tr {
height: 55px;
}
// /deep/.el-table tr {
// height: 55px;
// }
/deep/.el-table th > .cell {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
......@@ -836,4 +893,5 @@ $tableHeight: var(--tableHeight, 550px);
position: absolute;
right: 0;
}
@import "@/assets/css/globalBase.scss";
</style>
\ No newline at end of file
src/views/zzwlr/xzry.scss
......@@ -84,16 +84,16 @@
padding: 0 245px;
}
}
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
// .inputBh {
// /deep/.el-input-group__prepend {
// width: 40px;
// text-align: center;
// padding: 0;
// }
// /deep/.el-input__inner {
// width: 224px;
// }
// }
// 滚动条的宽度
/deep/ .el-form::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
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