Skip to content

J
jiedao-app-pda-master
Commit 7b0094d2 authored by xiaoyan's avatar xiaoyan
Browse files
Options

fix: 修改显示

parent d70fad77
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 12 deletions
src/components/order-detail-modal/index.vue
View file @ 7b0094d2
......@@ -113,7 +113,8 @@ export default {
ids?.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id) {
result.push(this.isChinese ? f.attrName : f.attrNameEn)
// result.push(this.isChinese ? f.attrName : f.attrNameEn)
result.push(f.attrName)
}
})
})
......
src/pages/airWarehouseOut/airStartcheckOut.vue
View file @ 7b0094d2
......@@ -56,7 +56,7 @@
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(order.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(order.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
......
src/pages/loading/detail.vue
View file @ 7b0094d2
......@@ -53,9 +53,9 @@
{{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</view>
<!-- 品牌 -->
<view v-if="order.goodsList.some(ele => ele.brandType && [$t('无牌'), $t('有牌'), $t('中性')][ele.brandType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view>
<!-- <view v-if="order.goodsList.some(ele => ele.brandType && [$t('无牌'), $t('有牌'), $t('中性')][ele.brandType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view> -->
<!-- 特性 -->
<view style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</view>
<!-- <view style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</view> -->
<!-- 报关方式 -->
<view style="color: red;fontWeight:bold;" v-if="order.customsType !== 1">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:red;fontWeight:bold;" />
......@@ -63,7 +63,7 @@
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(order.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(order.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
......
src/pages/mergePkg/package.vue
View file @ 7b0094d2
......@@ -84,7 +84,7 @@
</text>
<!-- 包装类型 -->
<text v-for="(unit, index) in uniqueArr(item.units)" :key="index" style="color:red;fontWeight:bold;margin: 0 3px;">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== item.units.split(',').length-1 ? ',':'' }}
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(item.units).length-1 ? ',':'' }}
</text>
<!-- 关联单 -->
<text v-if="item.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(item.orderId)">{{$t('关联单')}}</text>
......
src/pages/tally/detail.vue
View file @ 7b0094d2
......@@ -40,9 +40,9 @@
{{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</view>
<!-- 品牌 -->
<view v-if="order.goodsList.some(ele => ele.feeType && [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view>
<!-- <view v-if="order.goodsList.some(ele => ele.feeType && [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view> -->
<!-- 特性 -->
<view style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</view>
<!-- <view style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</view> -->
<!-- 报关方式 -->
<view v-if="order.customsType !== 1">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:red;fontWeight:bold;" />
......@@ -50,7 +50,7 @@
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(order.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(order.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
......
src/pages/tally/mixOrderList.vue
View file @ 7b0094d2
......@@ -91,7 +91,8 @@ export default {
ids?.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id) {
result.push(this.isChinese ? f.attrName : f.attrNameEn)
// result.push(this.isChinese ? f.attrName : f.attrNameEn)
result.push(f.attrName)
}
})
})
......
src/pages/tally/relatedOrder.vue
View file @ 7b0094d2
......@@ -23,7 +23,7 @@
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(v.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== v.units.split(',').length-1 ? ',':'' }}
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(v.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
......
src/pages/tallyAir/detail.vue
View file @ 7b0094d2
......@@ -62,7 +62,7 @@
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(order.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(order.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment