diff --git a/common/style/layout.css b/common/style/layout.css index 062926a..d9c4d75 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -1,3 +1,4 @@ +/** 平板尺寸960*600 **/ page { background-color: #f6f6f6 !important; min-height: 100% !important; @@ -112,40 +113,72 @@ uni-button:after { padding: 0 15px 15px 15px; overflow-y: scroll; } -.grid-table{ +.grid-wrap .grid-table{ width: 100%; border-collapse: separate; border-spacing: 0; border: 1px #e1e1e1; text-align: center; } -.grid-table thead tr th{ +.grid-wrap .grid-table thead tr th{ font-size: 15px; line-height: 18px; padding: 5px 5px; background-color: #e1e1e1; } -.grid-table thead tr th:first-child{ +.grid-wrap .grid-table thead tr th:first-child{ border-top-left-radius: 12px; } -.grid-table thead tr th:last-child{ +.grid-wrap .grid-table thead tr th:last-child{ border-top-right-radius: 12px; } -.grid-table th, .grid-table td { +.grid-wrap .grid-table th, .grid-table td { color: #464646; background-color: #fff; border-right: 1px solid #e1e1e1; border-bottom: 1px solid #e1e1e1; } -.grid-table th:first-child, .grid-table td:first-child{ +.grid-wrap .grid-table th:first-child, .grid-table td:first-child{ border-left: 1px solid #e1e1e1; } -.grid-table td { +.grid-wrap .grid-table td { /* height: 35px; */ line-height: 18px; font-size: 15px; padding: 5px 5px; } +.slide_new { + width: 100%; + height: 100%; + overflow-y: auto; + border-top-left-radius: 12px; + border-top-right-radius: 12px; +} +.zd_wrapper .grid-table { + table-layout: fixed; + width: auto; + min-width: 100%; +} +.zd_wrapper .grid-table td, .zd_wrapper .grid-table th { + box-sizing: border-box; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + white-space: nowrap; + text-align: center; +} +.zd_wrapper .grid-table td:first-child, .zd_wrapper .grid-table th:first-child{ + position: -webkit-sticky; + position: sticky; + left: 0; + z-index: 101; +} +.zd_wrapper .grid-table thead tr th { + position: -webkit-sticky; + position: sticky; + top: 0; + z-index: 100; +} .status-wrap { width: 100%; height: 35px; diff --git a/pages/management/TaskOperate.vue b/pages/management/TaskOperate.vue index 6697ef7..16529ec 100644 --- a/pages/management/TaskOperate.vue +++ b/pages/management/TaskOperate.vue @@ -132,7 +132,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import {instStatusQuery, instPageQuery, instOperation, taskType} from '@/utils/getData1.js' - import {dateFtt} from '@/utils//utils.js' + import {dateFtt} from '@/utils/utils.js' export default { components: { NavBar, diff --git a/pages/management/semifinishedcheck.vue b/pages/management/semifinishedcheck.vue index a7098f2..6bfb70b 100644 --- a/pages/management/semifinishedcheck.vue +++ b/pages/management/semifinishedcheck.vue @@ -33,8 +33,10 @@ --> - - + + + + @@ -42,9 +44,14 @@ 选择 - 缓存线编码 - 缓存线位置编码 - 料箱码 + 序号 + 盘点库区 + 盘点货位 + 物料号 + 物料名称 + 数量 + 单重(g) + 载具号 diff --git a/pages/management/semifinishedchecksearch.vue b/pages/management/semifinishedchecksearch.vue index e69de29..f77e893 100644 --- a/pages/management/semifinishedchecksearch.vue +++ b/pages/management/semifinishedchecksearch.vue @@ -0,0 +1,262 @@ + + + + + \ No newline at end of file diff --git a/static/logo.png b/static/logo.png deleted file mode 100644 index b5771e2..0000000 Binary files a/static/logo.png and /dev/null differ