diff --git a/assets/css/page.scss b/assets/css/page.scss
index 7049970..39e62ab 100644
--- a/assets/css/page.scss
+++ b/assets/css/page.scss
@@ -1882,6 +1882,11 @@ $shadow-md: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
&--clickable {
min-height: 48rpx;
justify-content: flex-end;
+
+ .card__value {
+ flex: 0 1 auto;
+ text-align: right;
+ }
}
}
diff --git a/pages.json b/pages.json
index 4d90c3c..3587d84 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,6 @@
"autoscan": true,
"custom": {
"^nbd-print-prop$": "@/scanpages/components/nbd-print-prop.vue",
- "^nbd-print-prop-qr$": "@/scanpages/components/nbd-print-prop-qr.vue",
"^u-(.*)": "uview-pro/components/u-$1/u-$1.vue",
"^nbd-(.*)": "@/components/nbd-$1.vue"
}
diff --git a/scanpages/components/nbd-print-prop-qr.vue b/scanpages/components/nbd-print-prop-qr.vue
deleted file mode 100644
index 105312d..0000000
--- a/scanpages/components/nbd-print-prop-qr.vue
+++ /dev/null
@@ -1,748 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/scanpages/hj/barcode_search.vue b/scanpages/hj/barcode_search.vue
index ce5c1d2..86add79 100644
--- a/scanpages/hj/barcode_search.vue
+++ b/scanpages/hj/barcode_search.vue
@@ -79,7 +79,7 @@
-
-
+
{{ weldingDate || '焊接日期' }}
@@ -406,18 +407,19 @@
.filter-item {
min-width: 0;
+ width: 100%;
height: 70rpx;
display: flex;
align-items: center;
}
.filter-picker {
- flex: 1;
+ flex: 1 1 0;
width: 100%;
+ min-width: 0;
height: 70rpx;
- display: flex;
- align-items: center;
- line-height: 70rpx;
+ display: block;
+ box-sizing: border-box;
}
.filter-btn {
diff --git a/scanpages/hj/material_sampling.vue b/scanpages/hj/material_sampling.vue
index a3ce8fb..6c2e1e6 100644
--- a/scanpages/hj/material_sampling.vue
+++ b/scanpages/hj/material_sampling.vue
@@ -72,7 +72,7 @@
- 专项审核办理人
+ 质检员
{{ specialReviewerName || '请选择' }}
@@ -82,7 +82,7 @@
-
+
@@ -209,7 +209,7 @@
-
@@ -233,7 +233,7 @@ const cuttingFields = [
{ label: '侧2原主编码', key: 'Side2OriginalMainCode' },
{ label: '材料编码批次', key: 'IsMaterialCodeBatchNoAccurate', type: 'tag', tagMatch: true, tagPassText: '准确', tagFailText: '不准确' },
{ label: '材料数量', key: 'IsMaterialQuantityAccurate', type: 'tag', tagMatch: true, tagPassText: '准确', tagFailText: '不准确' },
- { label: '专项审核办理人', key: 'SpecialReviewerName' },
+ { label: '质检员', key: 'SpecialReviewerName' },
{ label: '检查人', key: 'CheckPersonName' },
{ label: '检查时间', key: 'CheckTime' },
{ label: '检查结果', key: 'CheckResult', type: 'tag', tagMatch: '合格' },
@@ -376,7 +376,7 @@ const handleConfirmReviewer = (item) => {
const validateSpecialReviewer = () => {
if (!needSpecialReviewer.value) return true
if (!layingOffForm.value.SpecialReviewerId) {
- uni.showToast({ title: '请选择专项审核办理人', icon: 'none' })
+ uni.showToast({ title: '请选择质检员', icon: 'none' })
return false
}
return true
diff --git a/utils/constant.js b/utils/constant.js
index d38cd15..f721aac 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -89,11 +89,11 @@ export const defaultApps = [{
},
{
name: '焊缝检测',
- icon: 'daiban',
+ icon: 'search',
menuId: "",
path: "/scanpages/hj/weld_appearance",
isScan: true,
- prefix: 'nbd-icon',
+ prefix: 'uicon',
selected: false
},
{