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:
Teng 2025-11-25 08:46:23 +08:00
parent 445f56398a 54af499b76
commit b9d43fe9df
7 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages/Warehouse/picking.vue
View File

@ -673,7 +673,7 @@
</view>
</view>
<view class="contain-right-middle">
<scroll-view scroll-x="true" class="middle-Y">
<scroll-view scroll-x="true" class="middle-Y" :scroll-left="Invoiscroll" scroll-with-animation>
<view class="middle-Y-father">
<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
:style="{border: middletarget === i? '4rpx solid #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}"
@ -1481,12 +1481,14 @@
cgdId: "",
isWaring: 0
}
const Invoiscroll = ref(0)
const tagsArray = [`待入库`, `挂账中`, `已入库`, `已销账`,]
const clickmiddle = (index : number) => {
// console.log(showvalue.value)
middletarget.value = index;
showvalue.value = InvoicingList.value[index];
showvalue.value.jianhuobtn = false;
Invoiscroll.value = (index - 2) * 205;
if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
showvalue.value.num = showvalue.value.maxnum;
@ -2646,7 +2648,7 @@
}
.tags-one {
width: 130rpx;
min-width: 130rpx;
height: 60rpx;
display: flex;
justify-content: center;
@ -2657,6 +2659,7 @@
margin-top: 10rpx;
font-size: 23rpx;
color: #555555;
padding: 0 0.5vw;
}
}
@ -3149,7 +3152,7 @@
padding: 0 90rpx;
.photowall-title {
margin-top: 80rpx;
margin-top: 50rpx;
display: flex;
justify-content: space-between;
width: 100%;
@ -3173,11 +3176,10 @@
width: 110%;
height: 67vh;
display: flex;
margin-top: 40rpx;
margin-top: 20rpx;
.photowall-other-one {
width: 28.5%;
height: 400rpx;
height: 430rpx;
margin-right: 3vw;
margin-bottom: 3%;
border-radius: 30rpx;

4
pages/procurement/components/carlist.vue
View File

@ -29,7 +29,9 @@
<text style="white-space: nowrap;"> 规格型号: {{v.wlSpecificationModel}}</text>
</view>
<view>
<text>采购单价: ￥{{Number(v.referenceUnitPrice).toFixed(2) }}</text>
<text v-if="v.wlUnits == v.materialUnits">采购单价: ￥{{Number(v.unitPrice).toFixed(2) }}</text>
<text v-if="v.wlUnits == v.twoUnit">采购单价: ￥{{Number(v.twoUnitPrice).toFixed(2) }}</text>
<text v-if="v.wlUnits == v.oneUnit">采购单价: ￥{{Number(v.oneUnitPrice).toFixed(2) }}</text>
<text>采购单位: {{v.wlUnits}}</text>
</view>
<view>

2
pages/procurement/components/classification.vue
View File

@ -56,7 +56,7 @@
</view>
<view class="btnbotm">
<view class="bt" @click="typescroll(1,-1,{});qingkong();config()">重置</view>
<view class="bt" @click="typescroll(1,-1,{});qingkong()">重置</view>
<view class="bt qd" @click="config">确定 <text v-if="num>0">（{{num>99?'99+':num}}件物料）</text></view>
</view>
</view>

4
pages/procurement/materialcar.vue
View File

@ -81,9 +81,6 @@
const status = ref('loading')
const open = ref(0)
onShow(()=>{
nextTick(()=>{
chongzhi();
})
queryInvo()
})
const classication = ref<InstanceType<typeof ChildComponent>>()
@ -106,6 +103,7 @@
item.zk = false;
item.scrollleft = 0;
})
console.log(res.result.records)
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
setout.value = (res.result.total == InvoicingList.value.length ? false : true)

13
pages/procurement/purchaseorder.vue
View File

@ -184,7 +184,7 @@
</view>
</view>
<view class="contain-right-middle">
<scroll-view scroll-y="true" class="middle-Y">
<scroll-view scroll-y="true" class="middle-Y" scroll-with-animation :scroll-top="Invoitop">
<view class="middle-Y-father">
<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
:style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}"
@ -227,9 +227,9 @@
<view class="tags-one">
{{ showvalue?.typeId_dictText }}
</view>
<!-- <view class="tags-one">
{{ showvalue?.tagName }}
</view> -->
<view class="tags-one" v-if="showvalue.medicationId_dictText">
{{showvalue.medicationId_dictText}}
</view>
</view>
</view>
@ -581,9 +581,11 @@
cgdId: "",
isWaring: 0
}
const Invoitop = ref(0)
const clickmiddle = (index : number) => {
middletarget.value = index;
showvalue.value = InvoicingList.value[index];
Invoitop.value = Math.floor(index/3) * 105;
Object.assign(form, mobanform)
form.pageSize = -1;
}
@ -1087,7 +1089,7 @@
}
.tags-one {
width: 130rpx;
min-width: 130rpx;
height: 60rpx;
display: flex;
justify-content: center;
@ -1098,6 +1100,7 @@
margin-top: 20rpx;
font-size: 25rpx;
color: #555555;
padding: 0 0.5vw;
}
}

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 {
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 {
fullcamera as default
};