Skip to content

F
founder_vue
Commit aecdc16b by 张超军
Options

质量检查

parent 0ed2db10
Showing with 109 additions and 52 deletions
src/assets/css/globalBase.scss
...@@ -5,24 +5,32 @@ ...@@ -5,24 +5,32 @@
border: none; 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; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important; border-color: none !important;
color: #055FE7; color: #055fe7;
} }
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。 // :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; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important; border-color: none !important;
color: #055FE7; color: #055fe7;
.el-range-input { .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表格最底部边框 // 去除table表格最底部边框
.el-table__row>td { .el-table__row > td {
border: none; border: none;
} }
// 去除table表格最底部边框 // 去除table表格最底部边框
...@@ -30,26 +38,26 @@ ...@@ -30,26 +38,26 @@
height: 0px; height: 0px;
} }
/deep/.el-table .el-table__header-wrapper tr th{ /deep/.el-table .el-table__header-wrapper tr th {
background-color: #ECF1F7!important; background-color: #ecf1f7 !important;
font-size: 14px !important; font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important; font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282F3C !important; color: #282f3c !important;
height: 48px !important; height: 48px !important;
padding: 0 !important; padding: 0 !important;
} }
/deep/.el-table .el-table__body tr.current-row > td { /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 { /deep/.el-table .el-table__body tr:hover > td {
background-color: #F2F7FE !important; background-color: #f2f7fe !important;
} }
/deep/.el-table__row { /deep/.el-table__row {
height: 48px !important; height: 48px !important;
} }
/deep/.el-table__row--level-1 { /deep/.el-table__row--level-1 {
.el-table__cell { .el-table__cell {
background-color: #F5F6F7 !important; background-color: #f5f6f7 !important;
} }
} }
...@@ -61,7 +69,6 @@ ...@@ -61,7 +69,6 @@
width: 100% !important; width: 100% !important;
} }
/deep/.btn-prev { /deep/.btn-prev {
cursor: pointer; cursor: pointer;
i { i {
...@@ -104,6 +111,10 @@ ...@@ -104,6 +111,10 @@
padding-left: 10px !important; padding-left: 10px !important;
} }
/deep/.el-input__inner:hover {
cursor: text;
}
// 日期选择器 // 日期选择器
/deep/.el-date-editor { /deep/.el-date-editor {
display: flex; display: flex;
...@@ -112,8 +123,10 @@ ...@@ -112,8 +123,10 @@
/deep/.el-date-editor .el-range-separator { /deep/.el-date-editor .el-range-separator {
line-height: 26px; line-height: 26px;
} }
/deep/.el-input__icon { /deep/.el-date-editor {
height: 32px; /deep/.el-range__close-icon {
height: 32px !important;
}
} }
/deep/ .el-input__icon.el-range__icon.el-icon-date { /deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute; position: absolute;
...@@ -122,27 +135,27 @@ ...@@ -122,27 +135,27 @@
.f-primary-button { .f-primary-button {
cursor: pointer; cursor: pointer;
background: #055FE7 !important; background: #055fe7 !important;
&:hover { &:hover {
background: #377FEC !important; background: #377fec !important;
} }
&:active { &:active {
background: #044CB9 !important; background: #044cb9 !important;
} }
} }
.f-default-button { .f-default-button {
border-radius: 6px; border-radius: 6px;
border: 1px solid #AEB5C2 !important; border: 1px solid #aeb5c2 !important;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #2E3846 !important; color: #2e3846 !important;
&:hover { &:hover {
border: 1px solid #055FE7 !important; border: 1px solid #055fe7 !important;
color: #055FE7 !important; color: #055fe7 !important;
} }
&:active { &:active {
border: 1px solid #044CB9 !important; border: 1px solid #044cb9 !important;
color: #044CB9 !important; color: #044cb9 !important;
} }
} }
src/views/Home.vue
...@@ -892,10 +892,10 @@ export default { ...@@ -892,10 +892,10 @@ export default {
.el-tabs /deep/ { .el-tabs /deep/ {
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
width: 1235px; width: 1235px;
height: 60px; height: 56px;
.el-tabs__header { .el-tabs__header {
margin: 0; margin: 0;
height: 60px; height: 56px;
.el-tabs__nav-wrap.is-top { .el-tabs__nav-wrap.is-top {
height: 100%; height: 100%;
} }
...@@ -1220,7 +1220,7 @@ export default { ...@@ -1220,7 +1220,7 @@ export default {
.main { .main {
// padding: 24px; // padding: 24px;
width: 100%; width: 100%;
height: calc(100% - 60px); height: calc(100% - 56px);
.contain { .contain {
position: relative; position: relative;
......
src/views/cxyrd/QueryConfirm.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="display_style"> <div class="display_style">
<span class="labelFont">条码号：</span> <span class="labelFont">条码号：</span>
<el-input <el-input
class="el_input" class="el_input tmh"
v-model="reqParam.contrastCustomSearchReq.barcode" v-model="reqParam.contrastCustomSearchReq.barcode"
placeholder="请输入条码号" placeholder="请输入条码号"
></el-input> ></el-input>
...@@ -247,8 +247,8 @@ ...@@ -247,8 +247,8 @@
v-show="isShowTip" v-show="isShowTip"
> >
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 0.9375rem" style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​ <span style="color: #055fe7">{{ selectionData.length }}</span> 项​
...@@ -1489,14 +1489,14 @@ b { ...@@ -1489,14 +1489,14 @@ b {
font-size: 12px; font-size: 12px;
} }
.el-button { .el-button {
width: 96px; width: 72px;
height: 32px; height: 32px;
border-radius: 4px; border-radius: 4px;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.el-button__inner { .el-button__inner {
width: 56px; width: 72px;
height: 16px; height: 16px;
font-size: 14px; font-size: 14px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
...@@ -1510,6 +1510,7 @@ b { ...@@ -1510,6 +1510,7 @@ b {
padding: 0 8px !important; padding: 0 8px !important;
background: #ddebff; background: #ddebff;
border-radius: 4px; border-radius: 4px;
font-size: 0.75rem;
} }
.confirm-page { .confirm-page {
...@@ -1608,6 +1609,9 @@ b { ...@@ -1608,6 +1609,9 @@ b {
border-radius: 4px; border-radius: 4px;
// border: 1px solid #e6e6e8; // border: 1px solid #e6e6e8;
} }
.tmh {
width: 232px;
}
/deep/.el-input__inner { /deep/.el-input__inner {
height: 32px !important; height: 32px !important;
} }
...@@ -1690,7 +1694,7 @@ b { ...@@ -1690,7 +1694,7 @@ b {
} }
.el-button--primary { .el-button--primary {
width: 96px; width: 72px;
height: 32px; height: 32px;
line-height: 22px; line-height: 22px;
padding: 0; padding: 0;
......
src/views/drFPTX/Index.vue
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
FPTX的条码号 FPTX的条码号
</div> </div>
<el-table <el-table
:border="false"
height="33rem" height="33rem"
:data="datas" :data="datas"
@selection-change="checkAll1" @selection-change="checkAll1"
......
src/views/drFPTX/RAList.vue
...@@ -247,12 +247,13 @@ ...@@ -247,12 +247,13 @@
<!-- <el-divider style="background-color: #EEEEEE !important;"></el-divider> --> <!-- <el-divider style="background-color: #EEEEEE !important;"></el-divider> -->
<!-- 三 --> <!-- 三 -->
<div class="split-line">
<div class="options"> <div class="options">
<div class="left"> <div class="left">
<div <div
class="btn" class="btn"
@click="batch" @click="batch"
style="font-size:14px" style="font-size:0.875rem"
>批量操作</div> >批量操作</div>
</div> </div>
<div class="right"> <div class="right">
...@@ -260,7 +261,7 @@ ...@@ -260,7 +261,7 @@
v-if="roleArr.includes('B-2-4')" v-if="roleArr.includes('B-2-4')"
class="btn" class="btn"
@click="isShowTjddlBtn" @click="isShowTjddlBtn"
style="font-size:14px" style="font-size:0.875rem"
>添加到队列</div> >添加到队列</div>
<div <div
class="btn" class="btn"
...@@ -268,7 +269,7 @@ ...@@ -268,7 +269,7 @@
@click="getBarcodeSuccess(0)" @click="getBarcodeSuccess(0)"
v-clipboard:success="onCopy" v-clipboard:success="onCopy"
v-clipboard:error="onError" v-clipboard:error="onError"
style="font-size:14px" style="font-size:0.875rem"
> >
复制入库失败编号 复制入库失败编号
</div> </div>
...@@ -278,7 +279,7 @@ ...@@ -278,7 +279,7 @@
@click="getBarcodeSuccess(1)" @click="getBarcodeSuccess(1)"
v-clipboard:success="onCopy" v-clipboard:success="onCopy"
v-clipboard:error="onError" v-clipboard:error="onError"
style="font-size:14px" style="font-size:0.875rem"
> >
复制入库成功编号 复制入库成功编号
</div> </div>
...@@ -288,7 +289,7 @@ ...@@ -288,7 +289,7 @@
@click="getBarcode" @click="getBarcode"
v-clipboard:success="onCopy" v-clipboard:success="onCopy"
v-clipboard:error="onError" v-clipboard:error="onError"
style="font-size:14px" style="font-size:0.875rem"
> >
复制条码 复制条码
</div> </div>
...@@ -296,19 +297,19 @@ ...@@ -296,19 +297,19 @@
v-if='showType!=2' v-if='showType!=2'
class="btn send" class="btn send"
@click="isShowFcxBtn" @click="isShowFcxBtn"
style="font-size:14px" style="font-size:0.875rem"
>发查询</div> >发查询</div>
</div> </div>
</div> </div>
<!--四 --> <!--四 -->
<el-tag <el-tag
style="width: 100%; color: #666666; margin-bottom: 16px" style="width: 100%; color: #666666; margin-bottom: 1rem;background: #ddebff;"
v-show="isShowTip" v-show="isShowTip"
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="iconfont icon-tanhao1" 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> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -317,13 +318,18 @@ ...@@ -317,13 +318,18 @@
<el-link <el-link
type="primary" type="primary"
:underline="false" :underline="false"
style="margin-left: 20px" :style="{
marginLeft: '1.25rem',
color: '#055FE7',
transform: 'translateY(-2px)',
}"
@click="toggleSelection()" @click="toggleSelection()"
>清除</el-link> >清除</el-link>
</el-tag> </el-tag>
<!-- 五 --> <!-- 五 -->
<div v-if="showType == 1 || showType == 3"> <div v-if="showType == 1 || showType == 3">
<el-table <el-table
:border="false"
:class="{delSelection: !selectBoo}" :class="{delSelection: !selectBoo}"
:height="height" :height="height"
ref="multipleTable" ref="multipleTable"
...@@ -511,6 +517,7 @@ ...@@ -511,6 +517,7 @@
</div> </div>
<el-table <el-table
:border="false"
class="bzTable" class="bzTable"
:class="{delSelection: !selectBoo}" :class="{delSelection: !selectBoo}"
v-if="showType == 2" v-if="showType == 2"
...@@ -615,9 +622,9 @@ ...@@ -615,9 +622,9 @@
v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''" v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''"
style="margin-top:6px;margin-right: 5px;" 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: 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> <div>
<div>{{ scope.row.srcBarcode }}</div> <div>{{ scope.row.srcBarcode }}</div>
...@@ -763,6 +770,7 @@ ...@@ -763,6 +770,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<!-- 六 --> <!-- 六 -->
<div <div
class="block" class="block"
...@@ -1841,7 +1849,10 @@ export default { ...@@ -1841,7 +1849,10 @@ export default {
} }
} }
} }
.split-line {
height: 650px;
border-bottom: 1px solid #eee;
}
.options { .options {
height: 72px; height: 72px;
display: flex; display: flex;
...@@ -1906,6 +1917,7 @@ export default { ...@@ -1906,6 +1917,7 @@ export default {
margin-left: 0; margin-left: 0;
} }
img { img {
cursor: pointer;
width: 16px; width: 16px;
height: 16px; height: 16px;
object-fit: fill; object-fit: fill;
......
src/views/zljc/Index.vue
...@@ -82,14 +82,15 @@ ...@@ -82,14 +82,15 @@
>清空</el-button> >清空</el-button>
<el-button <el-button
type="primary" type="primary"
class='sx' class='sx f-primary-button'
@click="onSubmit" @click="onSubmit"
>筛选结果</el-button> >筛选</el-button>
</div> </div>
</div> </div>
<div class="line"> <div class="line">
<div></div> <div></div>
</div> </div>
<div class="split-line">
<div class="cz"> <div class="cz">
<div class="czLeft"> <div class="czLeft">
<div <div
...@@ -243,6 +244,7 @@ ...@@ -243,6 +244,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div>
<div class="footer"> <div class="footer">
<span class="record">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{ <span class="record">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{
Tpage Tpage
...@@ -673,7 +675,11 @@ $tableHeight: var(--tableHeight, 33rem); ...@@ -673,7 +675,11 @@ $tableHeight: var(--tableHeight, 33rem);
.bhgSpan { .bhgSpan {
background: #fe0000; background: #fe0000;
} }
.split-line {
margin: 0 24px;
height: 650px;
border-bottom: 1px solid #eee;
}
// .footer { // .footer {
// position: fixed; // position: fixed;
// bottom: 0; // bottom: 0;
...@@ -713,7 +719,7 @@ $tableHeight: var(--tableHeight, 33rem); ...@@ -713,7 +719,7 @@ $tableHeight: var(--tableHeight, 33rem);
.content { .content {
margin-top: 15px; margin-top: 15px;
width: 100%; width: 100%;
padding: 0 24px; // padding: 0 24px;
box-sizing: border-box; box-sizing: border-box;
.el-tag { .el-tag {
width: 100%; width: 100%;
...@@ -752,8 +758,9 @@ $tableHeight: var(--tableHeight, 33rem); ...@@ -752,8 +758,9 @@ $tableHeight: var(--tableHeight, 33rem);
.cz { .cz {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 0 24px; // padding: 0 24px;
.btn { .btn {
cursor: pointer;
width: 96px; width: 96px;
height: 32px; height: 32px;
border-radius: 4px; border-radius: 4px;
...@@ -795,12 +802,28 @@ $tableHeight: var(--tableHeight, 33rem); ...@@ -795,12 +802,28 @@ $tableHeight: var(--tableHeight, 33rem);
justify-content: space-between; justify-content: space-between;
margin: 24px; margin: 24px;
.left { .left {
.demo-form-inline {
display: flex;
align-items: center;
}
/deep/.el-form-item { /deep/.el-form-item {
height: 32px;
margin-left: 24px; margin-left: 24px;
display: flex;
align-items: center;
.el-input__inner { .el-input__inner {
height: 32px; height: 32px;
} }
} }
.el-form-item__label {
height: 32px !important;
}
.el-form-item__content {
height: 32px !important;
}
.el-input {
height: 32px;
}
.w156 { .w156 {
/deep/.el-input__inner { /deep/.el-input__inner {
width: 156px; width: 156px;
...@@ -822,11 +845,15 @@ $tableHeight: var(--tableHeight, 33rem); ...@@ -822,11 +845,15 @@ $tableHeight: var(--tableHeight, 33rem);
.right { .right {
margin-right: 24px; margin-right: 24px;
/deep/.sx { /deep/.sx {
width: 96px; width: 72px;
height: 32px; height: 32px;
background: #055fe7; background: #055fe7;
border-radius: 4px; border-radius: 4px;
color: #fff; color: #fff;
cursor: pointer;
span {
cursor: pointer;
}
} }
} }
} }
......
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