yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

This commit is contained in:
wangweidong 2025-11-21 10:28:39 +08:00
parent 4062e864a9 202a63ab24
commit 88523cc007
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pages/Warehouse/picking.vue
View File

@ -154,7 +154,7 @@
采购单价 采购单价
</view> </view>
<view class="text-anim" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;"> <view class="text-anim" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;">
￥{{showvalue.arrivalPrice?showvalue.arrivalPrice.toFixed(2):showvalue.procurementPrice.toFixed(2)}} ￥{{showvalue.arrivalPrice?Number(showvalue.arrivalPrice).toFixed(2):Number(showvalue.procurementPrice).toFixed(2)}}
</view> </view>
</view> </view>
<view class="" style="width: 33%;"> <view class="" style="width: 33%;">
@ -523,7 +523,7 @@
</text> </text>
<view class="title-right-big"> <view class="title-right-big">
{{ v.totalPrice.toFixed(2) }} {{ Number(v.totalPrice).toFixed(2) }}
</view> </view>
</view> </view>
@ -696,7 +696,7 @@
<text style="font-size: 30rpx;" <text style="font-size: 30rpx;"
:style="{fontWeight:Number(v.arrivalPrice)>0||Number(v.procurementPrice)>0 ?`600`:``}"> :style="{fontWeight:Number(v.arrivalPrice)>0||Number(v.procurementPrice)>0 ?`600`:``}">
{{v.arrivalPrice?v.arrivalPrice.toFixed(2):v.procurementPrice.toFixed(2) }} {{v.arrivalPrice?Number(v.arrivalPrice).toFixed(2):Number(v.procurementPrice).toFixed(2) }}
</text> </text>
</view> </view>
@ -828,7 +828,7 @@
style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;"> style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;">
￥ ￥
</text> </text>
{{showvalue.totalPrice}} {{Number(showvalue.totalPrice).toFixed(2) }}
</view> </view>
</view> </view>
<view class="bottom-right-middle"> <view class="bottom-right-middle">
@ -858,7 +858,7 @@
采购单价 采购单价
</view> </view>
<view class="right-text"> <view class="right-text">
￥{{showvalue.arrivalPrice?showvalue.arrivalPrice:showvalue.procurementPrice}} ￥{{showvalue.arrivalPrice? Number(showvalue.arrivalPrice).toFixed(2):Number(showvalue.procurementPrice).toFixed(2) }}
</view> </view>
</view> </view>
<view class="threeone"> <view class="threeone">
@ -980,7 +980,7 @@
采购单价： 采购单价：
<text style="font-weight: 600;color: black;"> <text style="font-weight: 600;color: black;">
￥{{item.oldPrice.toFixed(2)}} ￥{{Number(item.oldPrice).toFixed(2)}}
</text> </text>
</view> </view>
@ -996,7 +996,7 @@
<view class=""> <view class="">
到货单价： 到货单价：
<text style="font-weight: 600;color: black;"> <text style="font-weight: 600;color: black;">
￥{{item.newPrice.toFixed(2)}} ￥{{Number(item.newPrice).toFixed(2)}}
</text> </text>
</view> </view>
@ -1118,9 +1118,14 @@
// console.log("????",showvalue.value.id,gaijia.value) // console.log("????",showvalue.value.id,gaijia.value)
editPrice({ id: showvalue.value.id, arrivalPrice: gaijia.value }).then((res) => { editPrice({ id: showvalue.value.id, arrivalPrice: gaijia.value }).then((res) => {
// console.log("改价", showvalue.value.id,gaijia.value) // console.log("改价", showvalue.value.id,gaijia.value)
// console.log("res", res) console.log("res", res)
if (res.code == 200) { if (res.code == 200) {
showvalue.value.arrivalPrice = gaijia.value; showvalue.value.arrivalPrice = gaijia.value;
// console.log("000",Number(gaijia.value),Number(showvalue.value.purchaseQuantity))
showvalue.value.totalPrice = Number(gaijia.value) * Number(showvalue.value.purchaseQuantity) ;
plsbuy.value[lefttarget.value].totalPrice = res.result.totalPrice
// showvalue.value.arrivalPrice
// plsbuy.value[lefttarget.value].totalPrice = gaijia.value
opengaijia.value = false; opengaijia.value = false;
} }
}) })

10
pages/procurement/purchaseorder.vue
View File

@ -21,7 +21,7 @@
<view class="more-one" @click="share"> <view class="more-one" @click="share">
分享 分享
</view> </view>
<view class="more-one" @click="bebad(v)"> <view class="more-one" v-if="Number(v.status)<=1" @click="bebad(v)">
作废 作废
</view> </view>
</view> </view>
@ -123,7 +123,7 @@
<view class="" :style="Number(v.status)>1?{color: `#1083F8`}:{}"> <view class="" :style="Number(v.status)>1?{color: `#1083F8`}:{}">
完结 完结
</view> </view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.wjBy "> <view style="font-size: 25rpx;" v-if="Number(v.status)>1 && v.wjBy ">
{{ "[ " + v.wjBy + " ]" }} {{ "[ " + v.wjBy + " ]" }}
</view> </view>
</view> </view>
@ -265,7 +265,7 @@
采购单价 采购单价
</view> </view>
<view class="right-text"> <view class="right-text">
￥{{ showvalue?.procurementPrice.toFixed(2) }} ￥{{ Number(showvalue?.procurementPrice).toFixed(2) }}
</view> </view>
</view> </view>
<view class="threeone"> <view class="threeone">
@ -1126,7 +1126,7 @@
right: 60rpx; right: 60rpx;
top: 15rpx; top: 15rpx;
width: 165rpx; width: 165rpx;
height: 150rpx; // height: 150rpx;
background-color: #fff; background-color: #fff;
z-index: 102; z-index: 102;
border-radius: 35rpx; border-radius: 35rpx;
@ -1139,7 +1139,7 @@
.more-one { .more-one {
width: 100%; width: 100%;
height: 50%; height: 50rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;

2
unpackage/dist/dev/.nvue/pages/camera.js vendored
View File

@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
) )
]); ]);
} }
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]); const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
export { export {
camera as default camera as default
}; };

2
unpackage/dist/dev/.nvue/pages/fullcamera.js vendored
View File

@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
) )
]); ]);
} }
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]); const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
export { export {
fullcamera as default fullcamera as default
}; };