Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
f979ef5297
|
|
@ -308,7 +308,6 @@
|
|||
font-weight: bold;
|
||||
font-size: 1.6vw;
|
||||
color: #222222;
|
||||
height: 3vw;
|
||||
padding-top: 1.3vw;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
|
|
|
|||
|
|
@ -360,9 +360,9 @@
|
|||
}
|
||||
|
||||
>image {
|
||||
width: 8.5vw;
|
||||
height: 7.5vw;
|
||||
margin: 1.7vw auto 0.25vw;
|
||||
width: 8vw;
|
||||
height: 7vw;
|
||||
margin: 1vw auto 0.25vw;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
let now = new Date();
|
||||
let year = now.getFullYear();
|
||||
let month = (now.getMonth() + 1)<10?'0'+(now.getMonth() + 1):(now.getMonth() + 1);
|
||||
let day = now.getDay()<10?'0'+now.getDay():now.getDay();
|
||||
let day = now.getDate()<10?'0'+now.getDate():now.getDate();
|
||||
times.value = year+'.'+month+'.'+day
|
||||
})
|
||||
const wuobj = ref({})
|
||||
|
|
|
|||
|
|
@ -53,7 +53,15 @@
|
|||
<view class="you">
|
||||
<view class="calculator-father">
|
||||
<view v-for="(item,index) in calculatorArray" :key="index">
|
||||
<view class="calculator-kuai"
|
||||
<view class="calculator-kuai" style="font-size: 33rpx;" v-if="item==`AC`"
|
||||
@click="clickKuai(item,index)">
|
||||
清零
|
||||
</view>
|
||||
<view class="calculator-kuai" v-else-if="item==`AE`"
|
||||
@click="clickKuai(item,index)">
|
||||
<image src="/static/cleanone.png" mode="aspectFill" style="width: 50%;height: 50%;margin-left: -5rpx;"></image>
|
||||
</view>
|
||||
<view class="calculator-kuai" v-else
|
||||
@click="clickKuai(item,index)">
|
||||
{{item}}
|
||||
</view>
|
||||
|
|
@ -158,8 +166,22 @@
|
|||
stringShow.value = toFixed4ByPadStart(relNumber.value)
|
||||
// emit('jjnum',e)
|
||||
}
|
||||
const times = ref(false)
|
||||
const closeIt = () => {
|
||||
emit('right', relNumber.value,props.objtake )
|
||||
if(relNumber.value == 0){
|
||||
uni.showToast({
|
||||
icon:'none',
|
||||
title:"数量不能为0!"
|
||||
})
|
||||
return
|
||||
}
|
||||
if(times.value == false){
|
||||
times.value = true;
|
||||
emit('right', relNumber.value,props.objtake )
|
||||
setTimeout(()=>{
|
||||
times.value = false;
|
||||
},1500)
|
||||
}
|
||||
}
|
||||
function digitCountByString(n) {
|
||||
const s = Math.abs(n).toString();
|
||||
|
|
|
|||
|
|
@ -128,8 +128,6 @@
|
|||
const status = ref('loadmore')
|
||||
const config = ()=>{
|
||||
queryInvoicingList(form).then(res=>{
|
||||
console.log(res)
|
||||
console.log(form)
|
||||
res.result.records.forEach(item=>{
|
||||
item.zk = false;
|
||||
item.scrollleft = 0;
|
||||
|
|
|
|||
|
|
@ -53,7 +53,15 @@
|
|||
<view class="you">
|
||||
<view class="calculator-father">
|
||||
<view v-for="(item,index) in calculatorArray" :key="index">
|
||||
<view class="calculator-kuai"
|
||||
<view class="calculator-kuai" style="font-size: 33rpx;" v-if="item==`AC`"
|
||||
@click="clickKuai(item,index)">
|
||||
清零
|
||||
</view>
|
||||
<view class="calculator-kuai" v-else-if="item==`AE`"
|
||||
@click="clickKuai(item,index)">
|
||||
<image src="/static/cleanone.png" mode="aspectFill" style="width: 50%;height: 50%;margin-left: -5rpx;"></image>
|
||||
</view>
|
||||
<view class="calculator-kuai" v-else
|
||||
@click="clickKuai(item,index)">
|
||||
{{item}}
|
||||
</view>
|
||||
|
|
@ -70,6 +78,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -169,8 +178,22 @@
|
|||
stringShow.value = toFixed4ByPadStart(relNumber.value)
|
||||
// emit('jjnum',e)
|
||||
}
|
||||
const times = ref(false)
|
||||
const closeIt = () => {
|
||||
emit('right', relNumber.value,props.objtake )
|
||||
if(relNumber.value == 0){
|
||||
uni.showToast({
|
||||
icon:'none',
|
||||
title:"数量不能为0!"
|
||||
})
|
||||
return
|
||||
}
|
||||
if(times.value == false){
|
||||
times.value = true;
|
||||
emit('right', relNumber.value,props.objtake )
|
||||
setTimeout(()=>{
|
||||
times.value = false;
|
||||
},1500)
|
||||
}
|
||||
}
|
||||
function digitCountByString(n) {
|
||||
const s = Math.abs(n).toString();
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
<scroll-view scroll-y="true" class="crkscroll" scroll-with-animation @scrolltolower="scrolltolower()">
|
||||
<view class="cgrk" v-for="(v,i) in list" :key='i'>
|
||||
<view>
|
||||
<text>{{v.crkType_dictText}}{{v.crkStatus_dictText}}</text>
|
||||
<text>{{v.crkType_dictText}}-{{v.crkStatus_dictText}}</text>
|
||||
<text>{{v.content}}</text>
|
||||
<text>{{v.createTime}}</text>
|
||||
</view>
|
||||
|
|
|
|||
Loading…
Reference in New Issue