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

Compare commits

base: yangjun:bf05d362a6dda4154e9c0cb440f4714230b0511c
Branches Tags
yangjun:main
..
compare: yangjun:5b971b58c3d9041fe2ab39f27a366a33d7a9db8a
Branches Tags
yangjun:main

No commits in common. "bf05d362a6dda4154e9c0cb440f4714230b0511c" and "5b971b58c3d9041fe2ab39f27a366a33d7a9db8a" have entirely different histories.
bf05d362a6 ... 5b971b58c3

3 changed files with 13 additions and 26 deletions
Show Stats Expand all files Collapse all files

13
pages/Warehouse/picking.vue
View File

@ -803,19 +803,17 @@
<view class="right-bottom" v-show="!typechange"> <view class="right-bottom" v-show="!typechange">
<view class="right-bottom-left"> <view class="right-bottom-left">
<image class="left-img" <image class="left-img"
:src="showvalue?.materialImg?serverUrl + showvalue?.materialImg : '/static/index/warehouse/procurement/k.png'" :src="showvalue?.materialImg?serverUrl + showvalue?.materialImg : '/static/zhiniaoku.png'"
mode="aspectFill"></image> mode="aspectFill"></image>
<view class="left-tags"> <view class="left-tags">
<view class="tags-one" v-if="showvalue.categoryId_dictText"> <view class="tags-one" v-if="showvalue.categoryId_dictText">
{{showvalue.categoryId_dictText}} {{showvalue.categoryId_dictText}}
</view> </view>
<view class="tags-one" v-if="showvalue.typeId_dictText"> <view class="tags-one" v-if="showvalue.typeId_dictText">{{showvalue.typeId_dictText}}</view>
{{showvalue.typeId_dictText}} <!-- <view class="tags-one" v-if="showvalue.medicationId_dictText">
</view>
<view class="tags-one" v-if="showvalue.medicationId_dictText">
{{showvalue.medicationId_dictText}} {{showvalue.medicationId_dictText}}
</view> </view> -->
</view> </view>
</view> </view>
<view class="right-bottom-right"> <view class="right-bottom-right">
@ -1474,7 +1472,7 @@
} }
const tagsArray = [`待入库`, `挂账中`, `已入库`, `已销账`,] const tagsArray = [`待入库`, `挂账中`, `已入库`, `已销账`,]
const clickmiddle = (index : number) => { const clickmiddle = (index : number) => {
console.log(showvalue.value) // console.log(showvalue.value)
middletarget.value = index; middletarget.value = index;
showvalue.value = InvoicingList.value[index]; showvalue.value = InvoicingList.value[index];
showvalue.value.jianhuobtn = false; showvalue.value.jianhuobtn = false;
@ -2606,7 +2604,6 @@
height: 100%; height: 100%;
width: 30%; width: 30%;
padding-left: 30rpx; padding-left: 30rpx;
padding-top: 30rpx;
.left-img { .left-img {
width: 250rpx; width: 250rpx;

13
pages/procurement/components/calculator.vue
View File

@ -182,8 +182,7 @@
cgdwflag.value = false; cgdwflag.value = false;
type.value = {}; type.value = {};
sx.value = false; sx.value = false;
gysidnum.value = 0; gysidnum.value = 0
isZero.value = false;
} }
}) })
const jssl=()=>{ const jssl=()=>{
@ -217,7 +216,7 @@
const calculatorArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, "AC", 0, "AE"]; const calculatorArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, "AC", 0, "AE"];
const stringShow = ref("0000"); const stringShow = ref("0000");
const relNumber = ref(0); const relNumber = ref(0);
const isZero = ref(false); // const isZero = ref(false);
const clickKuai = (item : any, index : number) => { const clickKuai = (item : any, index : number) => {
blueNumber.value = index; blueNumber.value = index;
setTimeout(() => { setTimeout(() => {
@ -235,13 +234,7 @@
cy() cy()
return return
} }
if(isZero.value == false){
isZero.value = true;
relNumber.value = item;
stringShow.value = toFixed4ByPadStart(relNumber.value);
cy()
return
}
if (digitCountByString(relNumber.value) > 3) { if (digitCountByString(relNumber.value) > 3) {
} else { } else {

13
pages/procurement/purchaseorder.vue
View File

@ -94,7 +94,7 @@
<view class="" :style="Number(v.status)>0?{color: `#1083F8`}:{}"> <view class="" :style="Number(v.status)>0?{color: `#1083F8`}:{}">
拣货 拣货
</view> </view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy "> <view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy">
{{ "[ " + v.jhBy + " ]" }} {{ "[ " + v.jhBy + " ]" }}
</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)>0 && v.jhBy">
{{ "[ " + v.wjBy + " ]" }} {{ "[ " + v.wjBy + " ]" }}
</view> </view>
</view> </view>
@ -935,7 +935,6 @@
.middle-img { .middle-img {
width: 150rpx; width: 150rpx;
height: 150rpx; height: 150rpx;
margin: 0.3vw 0 0 0.15vw;
} }
.middle-right { .middle-right {
@ -1003,13 +1002,11 @@
.right-bottom-left { .right-bottom-left {
height: 100%; height: 100%;
width: 30%; width: 30%;
padding-left: 55rpx; padding-left: 30rpx;
.left-img { .left-img {
width: 270rpx; width: 300rpx;
height: 270rpx; height: 300rpx;
margin-left: 2vw;
margin-top: 5vw;
} }
.left-tags { .left-tags {