diff --git a/common/style/layout.styl b/common/style/layout.styl index a4014a3..2dee157 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -84,6 +84,15 @@ uni-button:after { color: #606266; padding: 0 10rpx; } +.filter_unit { + height: 80rpx; + line-height: 80rpx; + border: 1rpx solid #e5e5e5; + background-color: transparent; + font-size: 28rpx; + color: #606266; + text-align:center; +} .filter_input_disabled { background-color: #eee; } diff --git a/locale/en.json b/locale/en.json index 81ad05f..36b04bd 100644 --- a/locale/en.json +++ b/locale/en.json @@ -72,7 +72,8 @@ "MoveLocation": "Move into Storage Location", "Keyword": "Keyword", "Pointlocation": "Point location", - "Pointlocationcarrier": "Point - location carrier" + "Pointlocationcarrier": "Point - location carrier", + "Unitmeasurement": "Unit of measurement" }, "th": { "MaterialBoxNumber": "Material Box Number", diff --git a/locale/vi.json b/locale/vi.json index 052e3f2..f67e66b 100644 --- a/locale/vi.json +++ b/locale/vi.json @@ -72,7 +72,8 @@ "MoveLocation": "Chuyển vào vị trí kho", "Keyword": "Từ khóa", "Pointlocation": "Điểm", - "Pointlocationcarrier": "Vật chở tại điểm" + "Pointlocationcarrier": "Vật chở tại điểm", + "Unitmeasurement": "Đơn vị đo" }, "th": { "MaterialBoxNumber": "Số hộp vật liệu", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 6de8b0e..24dbb8f 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -72,7 +72,8 @@ "MoveLocation": "移入货位", "Keyword": "关键字", "Pointlocation": "点位", - "Pointlocationcarrier": "点位载具" + "Pointlocationcarrier": "点位载具", + "Unitmeasurement": "计量单位" }, "th": { "MaterialBoxNumber": "料框号", diff --git a/pages/manage/common/cxwl.vue b/pages/manage/common/cxwl.vue index 6f3ad46..de233d2 100644 --- a/pages/manage/common/cxwl.vue +++ b/pages/manage/common/cxwl.vue @@ -15,8 +15,9 @@ {{$t('label.MaterialName')}} - {{$t('MaterialSpecification')}} - {{$t('MaterialCode')}} + {{$t('label.MaterialSpecification')}} + {{$t('label.MaterialCode')}} + {{$t('label.Unitmeasurement')}} @@ -24,6 +25,7 @@ {{e.material_name}} {{e.material_spec}} {{e.material_code}} + {{e.base_unit_name}} diff --git a/pages/manage/rgjl.vue b/pages/manage/rgjl.vue index 71c62a6..c36ab7d 100644 --- a/pages/manage/rgjl.vue +++ b/pages/manage/rgjl.vue @@ -45,7 +45,7 @@ - + {{e.struct_code}} {{e.storagevehicle_code}} {{e.material_name}} @@ -61,7 +61,7 @@ - + @@ -85,8 +85,7 @@ options1: [], index1: '', dataList: [], - pkId: '', - pkObj: {}, + allChecked: [], disabled: false }; }, @@ -123,11 +122,14 @@ } }, async _linegetMaterialDtl () { - this.pkId = '' + this.allChecked = [] try { let res = await linegetMaterialDtl(this.index, this.val2) if (res.status === '200') { this.dataList = [...res.data] + this.dataList.map(el => { + this.$set(el, 'checked', false) + }) } else { this.dataList = [] } @@ -136,17 +138,17 @@ } }, toChek (e) { - this.pkId = this.pkId === e.group_id ? '' : e.group_id - this.pkObj = this.pkId === e.group_id ? e : {} + e.checked = !e.checked + this.allChecked = this.dataList.filter(el => el.checked === true) }, async _callMaterialConfirm () { this.disabled = true - if (!this.pkId || !this.val1 || !this.index1) { + if (!this.allChecked.length === 0 || !this.val1 || !this.index1) { this.disabled = false return } try { - let res = await callMaterialConfirm(this.val1, this.pkObj, this.index1) + let res = await callMaterialConfirm(this.val1, this.allChecked, this.index1) if (res.status === '200') { this.clearUp() } @@ -164,8 +166,7 @@ this.val1 = '' this.val2 = '' this.index1 = '' - this.pkId = '' - this.pkObj = {} + this.allChecked = [] this.dataList = [] } } diff --git a/pages/manage/wlzp.vue b/pages/manage/wlzp.vue index 4d60595..2bedd6b 100644 --- a/pages/manage/wlzp.vue +++ b/pages/manage/wlzp.vue @@ -22,7 +22,10 @@ {{$t('label.MaterialQuantity')}} - + + + {{currentData.base_unit_name}} + diff --git a/pages/manage/zprk.vue b/pages/manage/zprk.vue index 35f0a0a..a261d2e 100644 --- a/pages/manage/zprk.vue +++ b/pages/manage/zprk.vue @@ -43,7 +43,10 @@ {{$t('label.MaterialQuantity')}} - + + + {{currentData.qty_unit_name}} +