Browse Source

YT-2758二分之一盘点的物料,PDA执行任务时,显示二分之一的标识

intex
张立 2 weeks ago
parent
commit
ddeb76c0a6
  1. 18
      src/common/directory.js
  2. 14
      src/common/style/new_style.css
  3. 15
      src/mycomponents/item/item.vue
  4. 8
      src/pages/count/coms/comCountDetailcards.vue
  5. 2
      src/pages/count/job/countLightDetail.vue
  6. 2
      src/pages/index/index.vue

18
src/common/directory.js

@ -25,6 +25,7 @@ let businessList = [];
let countScopeTypeList = []; let countScopeTypeList = [];
let priorityList = [] let priorityList = []
let shiftList = [] let shiftList = []
let inventoryModeList = []
@ -70,6 +71,7 @@ export function clearCacheData() {
countScopeTypeList = [] countScopeTypeList = []
priorityList = [] priorityList = []
shiftList = [] shiftList = []
inventoryModeList=[]
} }
//获取字典信息 //获取字典信息
@ -709,3 +711,19 @@ export function getShiftName(value) {
} }
return resultInfo return resultInfo
} }
//获取抽检方式
export function getInventoryMode(value) {
var resultInfo = "";
if (inventoryModeList.length == 0) {
inventoryModeList = getDirectoryInfo("inventory_mode")
}
if (inventoryModeList.length > 0) {
for (let item of inventoryModeList) {
if (item.value == value) {
resultInfo = item.label
break;
}
}
}
return resultInfo
}

14
src/common/style/new_style.css

@ -2040,6 +2040,20 @@ button::after {
/* width: 210rpx; */ /* width: 210rpx; */
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
display: flex;
}
.countType{
background-color: #3C9CFF;
border-radius: 30rpx;
padding: 4rpx 12rpx;
font-weight: 100;
font-size: 28rpx;
margin-left: 20rpx;
display: flex;
line-height: 28rpx;
align-items: center;
justify-items: center;
color: white;
} }
.card_itemName_time{ .card_itemName_time{
color: #3315EB; color: #3315EB;

15
src/mycomponents/item/item.vue

@ -3,7 +3,10 @@
<view class="uni-flex u-col-center space-between "> <view class="uni-flex u-col-center space-between ">
<view > <view >
<view class="card_itemCode" :class="openPopup(dataContent)"> <view class="card_itemCode" :class="openPopup(dataContent)">
{{dataContent.itemCode}} <view>{{dataContent.itemCode}}</view>
{{dataContent.countType}}
<view class="countType" v-if="showCountType &&dataContent.countType == 1">1/2</view>
</view> </view>
<view class="card_itemName" style="word-break:break-all;overflow:hidden;white-space:normal;display: flex;align-items: center;" :class="isSpecial ? 'special':''"> <view class="card_itemName" style="word-break:break-all;overflow:hidden;white-space:normal;display: flex;align-items: center;" :class="isSpecial ? 'special':''">
<view style="max-width:280rpx;overflow: hidden;white-space: nowrap;">{{dataContent.itemName}}</view> <view style="max-width:280rpx;overflow: hidden;white-space: nowrap;">{{dataContent.itemName}}</view>
@ -16,6 +19,9 @@
</template> </template>
<script> <script>
import {
getInventoryMode
} from '@/common/directory.js';
export default { export default {
components: { components: {
@ -35,6 +41,10 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
showCountType: {
type: Boolean,
default: false
},
}, },
watch: { watch: {
@ -44,6 +54,9 @@
// console.log(JSON.stringify(val)); // console.log(JSON.stringify(val));
}, },
handleGetInventoryMode(val){
return getInventoryMode(val)
}
}, },
} }
</script> </script>

8
src/pages/count/coms/comCountDetailcards.vue

@ -2,7 +2,7 @@
<view :class="backClass" style="width: 100%; padding: 10rpx; border-radius: 10rpx;"> <view :class="backClass" style="width: 100%; padding: 10rpx; border-radius: 10rpx;">
<view class="uni-flex uni-row space-between " style=""> <view class="uni-flex uni-row space-between " style="">
<view class=""> <view class="">
<item :dataContent="dataContent" style="margin-left: 15rpx;"></item> <item :dataContent="dataContent" style="margin-left: 15rpx;" :showCountType='showCountType'></item>
<batch :batch="dataContent.batch"></batch> <batch :batch="dataContent.batch"></batch>
</view> </view>
<view class=""> <view class="">
@ -104,7 +104,11 @@
isShowRecommendQty: { isShowRecommendQty: {
type: Boolean, type: Boolean,
default: true default: true
} },
showCountType: {
type: Boolean,
default: false
},
}, },
watch: { watch: {
dataContent: { dataContent: {

2
src/pages/count/job/countLightDetail.vue

@ -25,7 +25,7 @@
<view class="uni-flex uni-row " style="align-items: center; margin: 10rpx; border-radius: 10rpx ;"> <view class="uni-flex uni-row " style="align-items: center; margin: 10rpx; border-radius: 10rpx ;">
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" @editItem="editItem" <comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" @editItem="editItem"
:settingParam="jobContent" @remove="updateData" @summCount="summCount" @currentCount="currentCount" :settingParam="jobContent" @remove="updateData" @summCount="summCount" @currentCount="currentCount"
@updateData="updateData"> @updateData="updateData" :showCountType='true'>
</comCountDetailcards> </comCountDetailcards>
</view> </view>
</uni-swipe-action-item> </uni-swipe-action-item>

2
src/pages/index/index.vue

@ -364,7 +364,7 @@
"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason", "unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode", "request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
"count_stage", "inspect_result", "area_type","count_scope_type","priority", "count_stage", "inspect_result", "area_type","count_scope_type","priority",
"receive_status",'deliver_method','duty','duty_details','shift' "receive_status",'deliver_method','duty','duty_details','shift','inventory_mode'
] ]
} }
getDictionaryItem(params).then(res => { getDictionaryItem(params).then(res => {

Loading…
Cancel
Save