diff --git a/index.html b/index.html index 4b869f9..0d76a8f 100644 --- a/index.html +++ b/index.html @@ -18,6 +18,7 @@
+ diff --git a/package-lock.json b/package-lock.json index 2fdb913..a2a9a9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "qrcodejs2-fixes": "^0.0.2", "qs": "^6.12.0", "screenfull": "^6.0.2", - "sortablejs": "^1.15.2", + "sortablejs": "^1.15.6", "splitpanes": "^3.1.5", "vue": "^3.4.21", "vue-clipboard3": "^2.0.0", @@ -4128,9 +4128,10 @@ } }, "node_modules/sortablejs": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz", - "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==" + "version": "1.15.6", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.6.tgz", + "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==", + "license": "MIT" }, "node_modules/source-map-js": { "version": "1.0.2", @@ -7521,9 +7522,9 @@ "integrity": "sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==" }, "sortablejs": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz", - "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==" + "version": "1.15.6", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.6.tgz", + "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==" }, "source-map-js": { "version": "1.0.2", diff --git a/package.json b/package.json index aa17aa1..b2d36d4 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "qrcodejs2-fixes": "^0.0.2", "qs": "^6.12.0", "screenfull": "^6.0.2", - "sortablejs": "^1.15.2", + "sortablejs": "^1.15.6", "splitpanes": "^3.1.5", "vue": "^3.4.21", "vue-clipboard3": "^2.0.0", diff --git a/src/views/materialReceiptNotice/componentPrinting.vue b/src/views/materialReceiptNotice/componentPrinting.vue index 89b1f33..e932165 100644 --- a/src/views/materialReceiptNotice/componentPrinting.vue +++ b/src/views/materialReceiptNotice/componentPrinting.vue @@ -1,11 +1,312 @@ - - + \ No newline at end of file + .expandItem { + width: 100%; + height: 30px; + //background-color: #3eaadc; + border-top: 1px solid #ebeef5; + border-right: 8px; + overflow: hidden; + display: flex; + + .expandItemCol { + width: calc(100% / 11); + box-sizing: border-box; + border-left: 1px solid #ebeef5; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } + } +} + +:deep(.el-card) { + padding: 0 !important; + //height: 56px !important; +} + +.btnList { + margin-top: 26px; + display: flex; + justify-content: center; +} + +:deep(.avue-crud__left) { + flex: 1; +} + +:deep(.avue-crud__refreshBtn) { + display: none; +} + +:deep(.avue-crud__gridBtn) { + display: none; +} + +.piliang { + margin-left: 12px; + border: 1px solid #d5d5d5; + border-radius: 8px; + flex: 1; + display: flex; + align-items: center; + box-sizing: border-box; + padding: 4px; +} + +.system-user-container { + //padding: 0 !important; +} + +.multi-line-omit { + word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话 + text-overflow: ellipsis; // 溢出用省略号显示 + overflow: hidden; // 超出的文本隐藏 + display: -webkit-box; // 作为弹性伸缩盒子模型显示 + -webkit-line-clamp: 1; // 显示的行 + -webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列 +} + +.selectBoxes { + display: flex; + flex: 1; + + .selectItem { + margin-right: 16px; + display: flex; + } +} + +:deep(.avue-crud) { + height: 100%; + width: 100%; +} + +:deep(.avue-crud--card) { + display: flex; + flex-direction: column; + flex: 1; +} + +:deep(.avue-crud__body) { + flex: 1; +} + +:deep(.el-table__header) { + height: 40px; +} + +:deep(.el-card__body) { + width: 100% !important; + height: 100% !important; + overflow: hidden !important; + padding: 0 !important; +} + +:deep(.el-table__cell) { + //padding: 0 !important; + //height: 56px !important; +} + +:deep(.el-card) { + padding: 12px; +} + +:deep(.el-form) { + flex: 1; +} + +.system-user-container { + :deep(.el-card__body) { + display: flex; + flex-direction: column; + flex: 1; + overflow: auto; + + .el-table { + flex: 1; + } + } +} + +:deep(.el-col) { + margin-bottom: 16px; +} + +:deep(.cell) { + padding: 0 !important; +} + diff --git a/src/views/materialReceiptNotice/index.vue b/src/views/materialReceiptNotice/index.vue index 034a7db..8673c2b 100644 --- a/src/views/materialReceiptNotice/index.vue +++ b/src/views/materialReceiptNotice/index.vue @@ -15,7 +15,7 @@ - + - - + +