From 0b2e403ef327029898deab1a9f848dc0b88a0170 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 3 Sep 2024 10:52:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hybrid/html/pointPutawayJob.html | 146 +++++++++++++++++------- src/hybrid/html/purchaseReceiptJob.html | 91 +++++++-------- src/pages/pointPutawayJob/index.vue | 108 ++++++++++++++---- 3 files changed, 228 insertions(+), 117 deletions(-) diff --git a/src/hybrid/html/pointPutawayJob.html b/src/hybrid/html/pointPutawayJob.html index 156a7144..06c908fc 100644 --- a/src/hybrid/html/pointPutawayJob.html +++ b/src/hybrid/html/pointPutawayJob.html @@ -16,52 +16,112 @@ .box { font-size: 13px; /* padding: 10px; */ - /* border: 1px solid #dedede; */ - } - - - .left { - flex: 1; - border-bottom: 1px solid #b1b1b1; - } - .left-item { - display: flex; - border-top: 1px solid #b1b1b1; - border-left: 1px solid #b1b1b1; - border-right: 1px solid #b1b1b1; - /* min-height: 30px; - line-height: 30px; */ - div{ - padding: 10px 10px; - font-size: 16px; + border: 1px solid #dedede; + } + + .left { + border-top: 1px solid #b1b1b1; + border-left: 1px solid #b1b1b1; + flex: 1; + } + + .left-item { + display: flex; + } + + .label { + border-bottom: 1px solid #b1b1b1; + border-right: 1px solid #b1b1b1; + width: 60px; + padding: 0px 5px; + height: 30px; + line-height: 30px; + } + + .value { + border-bottom: 1px solid #b1b1b1; + border-right: 1px solid #b1b1b1; + padding: 0px 5px; + height: 30px; + flex: 1; + width: 0px; + display: flex; + align-items: center; + word-wrap: break-word; + } + + .right { + width: 200px; } - .label{ - width: 100px; - padding: 10px 10px; + + .image { + width: 100%; + height: 202px; + border-bottom: 1px solid #b1b1b1; + border-top: 1px solid #b1b1b1; border-right: 1px solid #b1b1b1; } - } - - - - .relative { - margin-bottom: 20rpx; - position: relative; - } - - .q { - position: absolute; - font-size: 15rem; - color: rgba(0, 0, 0, 0.1); - width: calc(100% - 100px); - right: 0px; - top: 0px; - text-align: center; - height: 100%; - display: flex; - align-items: center; - justify-content: center; - } + + .image img { + width: calc(100% - 4px); + height: calc(100% - 4px); + margin: 2px; + } + + .mb-kw { + border-bottom: 1px solid #dedede; + padding: 10px; + font-size: 15px; + + } + + .mb-kw div { + font-weight: bold; + font-size: 23px; + text-align: center; + } + + .mb-bo { + display: flex; + } + + .mb-bo .mb-left { + flex: 1 + } + + .mb-bo .mb-left .mb-text { + padding: 10px; + } + + .mb-bo .mb-left .mb-text:nth-child(1) { + border-bottom: 1px solid #dedede; + } + + .mb-bo .mb-left .mb-text div { + font-weight: bold; + font-size: 16px; + text-align: center; + } + + .mb-bo .mb-right { + padding: 10px; + width: 230px; + border-left: 1px solid #dedede; + display: flex; + align-items: center; + } + + .mb-bo .mb-right .mb-text { + + width: 100%; + } + + .mb-bo .mb-right .mb-text div { + font-weight: bold; + font-size: 20px; + text-align: center; + width: 100%; + } diff --git a/src/hybrid/html/purchaseReceiptJob.html b/src/hybrid/html/purchaseReceiptJob.html index 9352a1fc..8238cb76 100644 --- a/src/hybrid/html/purchaseReceiptJob.html +++ b/src/hybrid/html/purchaseReceiptJob.html @@ -1,4 +1,3 @@ - @@ -17,59 +16,49 @@ .box { font-size: 13px; /* padding: 10px; */ - } - - .mb-kw { - border-top: 1px solid #dedede; - border-left: 1px solid #dedede; - border-right: 1px solid #dedede; - font-size: 15px; - display: flex; - align-items: center - } - - .top1 th { - font-weight: bold; - font-size: 13px; - padding: 10px; - text-align: left; + /* border: 1px solid #dedede; */ } - table { - border-collapse: collapse; - border: 1px solid #dedede; - /* 设置表格的边框 */ - width: 100% - } - th{ - font-weight: bold; - font-size: 13px; - padding: 10px; - } - td{ - padding: 10px; - - } - td:nth-child(2n){ - width:calc(50% - 100px); - } - td:nth-child(2n+1){ - width:80px; - } - .relative{ - margin-bottom: 10px; - position: relative; - } - - .q{ - position: absolute; - left: 50%; - top:50%; - font-size: 160px; - transform: translate(-50% ,-50%); - color: rgba(0, 0, 0, 0.1); - } + .left { + flex: 1; + border-bottom: 1px solid #b1b1b1; + } + .left-item { + display: flex; + border-top: 1px solid #b1b1b1; + border-left: 1px solid #b1b1b1; + border-right: 1px solid #b1b1b1; + } + + .left-item div{ + padding: 10px 10px; + font-size: 16px; + } + .left-item .label{ + width: 100px; + padding: 10px 10px; + border-right: 1px solid #b1b1b1; + } + + .relative { + margin-bottom: 10px; + position: relative; + } + + .q { + position: absolute; + font-size: 15rem; + color: rgba(0, 0, 0, 0.1); + width: calc(100% - 100px); + right: 0px; + top: 0px; + text-align: center; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 252558db..fcc3fb55 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -42,11 +42,11 @@ 未生成检验申请 - + 没有检验方案 - 检验阶段不存在 + 检验阶段不存在 @@ -245,29 +245,32 @@ ` let str2 = `` - if(item.haveInspectionRequest==='0'){ - str2 =`
-
未生成检验申请
-
` - }else if(item.haveInspectionRequest==='2'){ - str2 =`
-
没有检验方案
-
` - }else if(item.haveInspectionRequest==='3'){ - str2 =`
-
检验阶段不存在
-
` + if (item.haveInspectionRequest === '0') { + str2 = ` +
+
未生成检验申请
+
` + } else if (item.haveInspectionRequest === '2') { + str2 = ` +
+
没有检验方案
+
` + } else if (item.haveInspectionRequest === '3') { + str2 = ` +
+
检验阶段不存在
+
` } let str3 = ` - - - - + + + ` - str += str1 + str2+ str3 + str += str1 + str2 + str3 }) this.newHtmlContent1 = this.newHtmlContent1.replace( "mainBody", str); //替换物品代码 + console.log(333,this.newHtmlContent1) }); }) @@ -347,7 +350,8 @@ number: this.number }).then(async res1 => { this.data1 = res1.data - this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item => item.sampleQty >0) + this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item => item.sampleQty > + 0) if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0) { this.tabIndex = 2 } @@ -391,6 +395,7 @@ flex: 1; border-bottom: 1px solid #b1b1b1; } + .left-item { display: flex; border-top: 1px solid #b1b1b1; @@ -398,10 +403,12 @@ border-right: 1px solid #b1b1b1; min-height: 30px; line-height: 30px; - view{ + + view { padding: 4px 10px; } - .label{ + + .label { width: 100px; padding: 4px 10px; border-right: 1px solid #b1b1b1; @@ -428,4 +435,59 @@ align-items: center; justify-content: center; } - \ No newline at end of file + .mb-kw { + border-bottom: 1px solid #dedede; + padding: 20rpx; + font-size: 30rpx; + + } + + .mb-kw view { + font-weight: bold; + font-size: 46rpx; + text-align: center; + } + + .mb-bo { + display: flex; + } + + .mb-bo .mb-left { + flex: 1 + } + + .mb-bo .mb-left .mb-text { + padding: 20rpx; + } + + .mb-bo .mb-left .mb-text:nth-child(1) { + border-bottom: 1px solid #dedede; + } + + .mb-bo .mb-left .mb-text view { + font-weight: bold; + font-size: 32rpx; + text-align: center; + } + + .mb-bo .mb-right { + padding: 20rpx; + width: 260rpx; + border-left: 1px solid #dedede; + display: flex; + align-items: center; + } + + .mb-bo .mb-right .mb-text { + + width: 100%; + } + + .mb-bo .mb-right .mb-text view { + font-weight: bold; + font-size: 40rpx; + text-align: center; + width: 100%; + } + +