Browse Source

YT-1715除来采购收货任务,其他pda样式不正确,应和之前样式一致

intex_online20241216
张立 4 months ago
parent
commit
e9383b7084
  1. 8
      src/mycomponents/item/itemCompareQty.vue
  2. 7
      src/mycomponents/job/jobComMainDetailCard.vue
  3. 8
      src/mycomponents/qty/recommendHandleQty.vue
  4. 6
      src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
  5. 6
      src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
  6. 2
      src/pages/purchaseReceipt/job/receiptDetail.vue
  7. 3
      src/pages/purchaseReceipt/job/receiptJob.vue

8
src/mycomponents/item/itemCompareQty.vue

@ -4,7 +4,7 @@
<item :dataContent="dataContent"></item> <item :dataContent="dataContent"></item>
</view> </view>
<view style="width: 40%;display: flex; flex-direction: column; align-items: flex-end; justify-content:flex-end;margin-right: 10rpx;word-break:break-word; "> <view style="width: 40%;display: flex; flex-direction: column; align-items: flex-end; justify-content:flex-end;margin-right: 10rpx;word-break:break-word; ">
<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true" <recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true" :isShowSupplierQty='isShowSupplierQty'
></recommend-qty> ></recommend-qty>
<!-- :objTextStyle='objTextStyle' --> <!-- :objTextStyle='objTextStyle' -->
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
@ -61,7 +61,11 @@
isShowPackCount: { isShowPackCount: {
type: Boolean, type: Boolean,
default: false default: false
} },
isShowSupplierQty: {
type: Boolean,
default: false
},
}, },
watch: { watch: {

7
src/mycomponents/job/jobComMainDetailCard.vue

@ -5,6 +5,7 @@
<itemCompareQty :dataContent="dataContent" <itemCompareQty :dataContent="dataContent"
:isShowPackCount="isShowPackCount" :isShowPackCount="isShowPackCount"
:handleQty="dataContent.handleQty" :isShowPackUnit="false" :handleQty="dataContent.handleQty" :isShowPackUnit="false"
:isShowSupplierQty='isShowSupplierQty'
></itemCompareQty> ></itemCompareQty>
<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" --> <!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
<div class="u-p-l-10"> <div class="u-p-l-10">
@ -78,7 +79,11 @@
isShowPackCount: { isShowPackCount: {
type: Boolean, type: Boolean,
default: false default: false
} },
isShowSupplierQty: {
type: Boolean,
default: false
},
}, },

8
src/mycomponents/qty/recommendHandleQty.vue

@ -10,7 +10,7 @@
{{Number(dataContent.qty)}} {{Number(dataContent.qty)}}
</view> </view>
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
<view class="uni-flex uni-row center" v-if="dataContent.uom != dataContent.supplierUom"> <view class="uni-flex uni-row center" v-if="dataContent.uom != dataContent.supplierUom && isShowSupplierQty">
<span class="uom">|</span> <span class="uom">|</span>
<view class="text_recommend " style="font-size: 30rpx;margin-left: 12rpx;"> <view class="text_recommend " style="font-size: 30rpx;margin-left: 12rpx;">
{{Number(dataContent.supplierQty) || 0}} {{Number(dataContent.supplierQty) || 0}}
@ -85,7 +85,11 @@
isShowCount: { isShowCount: {
type: Boolean, type: Boolean,
default: true default: true
} },
isShowSupplierQty: {
type: Boolean,
default: false
},
}, },
watch: { watch: {

6
src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue

@ -7,7 +7,7 @@
<uni-swipe-action-item :right-options="dataContent.handleQty>0? removeOptions:options" <uni-swipe-action-item :right-options="dataContent.handleQty>0? removeOptions:options"
@click="swipeClick($event,dataContent)"> @click="swipeClick($event,dataContent)">
<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" <itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
:isShowPackUnit="false"></itemCompareQty> :isShowPackUnit="false" :isShowSupplierQty='isShowSupplierQty'></itemCompareQty>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</template> </template>
@ -72,6 +72,10 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
isShowSupplierQty: {
type: Boolean,
default: false
},
}, },
watch: { watch: {

6
src/pages/purchaseReceipt/coms/comReceiptJobCard.vue

@ -1,6 +1,6 @@
<template> <template>
<jobComMainCardAsn :dataContent="dataContent"> <jobComMainCardAsn :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard> <jobComMainDetailCard :dataContent="dataContent" :isShowSupplierQty='isShowSupplierQty'></jobComMainDetailCard>
</jobComMainCardAsn> </jobComMainCardAsn>
</template> </template>
@ -21,6 +21,10 @@
type: Object, type: Object,
default: {} default: {}
}, },
isShowSupplierQty: {
type: Boolean,
default: false
},
}, },
methods: { methods: {

2
src/pages/purchaseReceipt/job/receiptDetail.vue

@ -34,7 +34,7 @@
<!-- 管理精度是批次 --> <!-- 管理精度是批次 -->
<comReceiptDetailCardBacth ref='comReceiptDetailCardBacthRef' :dataContent="item" :index="index" :settingParam="jobContent" <comReceiptDetailCardBacth ref='comReceiptDetailCardBacthRef' :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList' @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'
v-if="managementType == 'BY_BATCH' || managementType =='BY_QUANTITY'" :isNumPackTips='true'> v-if="managementType == 'BY_BATCH' || managementType =='BY_QUANTITY'" :isNumPackTips='true' :isShowSupplierQty='true'>
</comReceiptDetailCardBacth> </comReceiptDetailCardBacth>
<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" @remove="updateData" <com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" @remove="updateData"
@updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList' v-else> @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList' v-else>

3
src/pages/purchaseReceipt/job/receiptJob.vue

@ -10,7 +10,7 @@
<view v-for="(item, index) in jobList" :key="index"> <view v-for="(item, index) in jobList" :key="index">
<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions" <uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
@click="swipeClick($event,item)"> @click="swipeClick($event,item)">
<com-receipt-job-card :dataContent="item" @click='openJobDetail(item)'></com-receipt-job-card> <com-receipt-job-card :dataContent="item" @click='openJobDetail(item)' :isShowSupplierQty='true'></com-receipt-job-card>
</uni-swipe-action-item> </uni-swipe-action-item>
</view> </view>
</uni-swipe-action> </uni-swipe-action>
@ -222,7 +222,6 @@
if (type === "refresh") { if (type === "refresh") {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
var list = res.data.list; var list = res.data.list;
this.totalCount = res.data.total this.totalCount = res.data.total
updateTitle(this.title + "(" + this.totalCount + ")"); updateTitle(this.title + "(" + this.totalCount + ")");

Loading…
Cancel
Save