合并代码
This commit is contained in:
parent
cd6b44efe6
commit
8039afb825
|
|
@ -992,7 +992,7 @@
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
/* 添加毛玻璃效果 */
|
||||
z-index: 98;
|
||||
z-index: 999;
|
||||
|
||||
.popup-overlay-content {
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -419,7 +419,7 @@
|
|||
</view>
|
||||
<!-- 点击的弹出层 -->
|
||||
<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
|
||||
<view class="popup-overlay-content" style="height: 390rpx;" :class="getjiao"
|
||||
<view class="popup-overlay-content" style="height: 390rpx;" popup-overlay:class="getjiao"
|
||||
v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'"
|
||||
:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
|
||||
@click.stop>
|
||||
|
|
@ -1548,7 +1548,7 @@
|
|||
openX.value = Math.floor(res.left) - 18
|
||||
jiao.value[0] = false
|
||||
}
|
||||
if (res.top > 500) {
|
||||
if (res.top > 300) {
|
||||
// 表格太靠上侧，修改到下面
|
||||
openY.value = Math.floor(res.top) + 100;
|
||||
jiao.value[1] = true
|
||||
|
|
@ -1561,7 +1561,7 @@
|
|||
|
||||
showDetail.value[0] = index0;
|
||||
showDetail.value[1] = index1;
|
||||
console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
|
||||
// console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
|
||||
isopacity.value = false;
|
||||
//加动画
|
||||
setTimeout(() => {
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@
|
|||
请领物料
|
||||
<view class="mhao" v-if="Material.length>0">{{Material.length}}</view>
|
||||
</view>
|
||||
<scroll-view scroll-x="true" class="kcscrol guodu" @scroll="onScroll"
|
||||
scroll-with-animation :scroll-left="scrollleft" :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
|
||||
<view class="yjbox" v-for="(v,i) in Material" :key="i" >
|
||||
<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
|
||||
<scroll-view scroll-x="true" class="kcscrol guodu" @scroll="onScroll" scroll-with-animation
|
||||
:scroll-left="scrollleft" :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
|
||||
<view class="yjbox" v-for="(v,i) in Material" :key="i">
|
||||
<image
|
||||
:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
|
||||
mode="aspectFill"></image>
|
||||
<view>{{v.materialInfo?.materialName}}</view>
|
||||
<text class="ytj" v-if="v.qlNum>=0">{{v.qlNum}}</text>
|
||||
|
|
@ -16,9 +17,11 @@
|
|||
<view>-</view>
|
||||
</view>
|
||||
</view>
|
||||
<defaultr cont="暂无数据" v-if="Material.length==0&&timeout" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
|
||||
<defaultr cont="暂无数据" v-if="Material.length==0&&timeout"
|
||||
style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
|
||||
</scroll-view>
|
||||
<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove" v-if="Material.length>0">
|
||||
<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
|
||||
v-if="Material.length>0">
|
||||
<view @click="zksq" class="righ0">
|
||||
{{!qb?'更多':'收起'}}
|
||||
<image class="guodu" :style="qb?'transform: rotate(180deg);':''"
|
||||
|
|
@ -40,46 +43,46 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
|
||||
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
|
||||
import defaultr from './default.vue'
|
||||
import tanchuang from '../common/tanchuang.vue';
|
||||
const props = defineProps({
|
||||
Material:{
|
||||
type:Array,
|
||||
Material: {
|
||||
type: Array,
|
||||
required: true,
|
||||
}
|
||||
});
|
||||
const emit = defineEmits([ 'delall' ,'del','submit'])
|
||||
const emit = defineEmits(['delall', 'del', 'submit'])
|
||||
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
|
||||
const qb = ref(false)
|
||||
const moredex = ref(0)
|
||||
watch(()=>props.Material,
|
||||
()=>{
|
||||
if(props.Material.length==0){
|
||||
qb.value = false;
|
||||
moredex.value=0;
|
||||
}
|
||||
})
|
||||
const delall = ()=>{
|
||||
watch(() => props.Material,
|
||||
() => {
|
||||
if (props.Material.length == 0) {
|
||||
qb.value = false;
|
||||
moredex.value = 0;
|
||||
}
|
||||
})
|
||||
const delall = () => {
|
||||
emit('delall');
|
||||
setTimeout(()=>{
|
||||
setTimeout(() => {
|
||||
moredex.value = 0;
|
||||
qb.value = false;
|
||||
},100)
|
||||
}, 100)
|
||||
}
|
||||
const del =(v)=>{
|
||||
emit('del',v)
|
||||
const del = (v) => {
|
||||
emit('del', v)
|
||||
}
|
||||
const zksq = () =>{
|
||||
if(props.Material.length==0){
|
||||
const zksq = () => {
|
||||
if (props.Material.length == 0) {
|
||||
uni.showToast({
|
||||
icon:'none',
|
||||
title:'请添加请领物料！'
|
||||
icon: 'none',
|
||||
title: '请添加请领物料！'
|
||||
})
|
||||
return
|
||||
}
|
||||
qb.value=!qb.value;
|
||||
moredex.value=0;
|
||||
qb.value = !qb.value;
|
||||
moredex.value = 0;
|
||||
moveleft();
|
||||
}
|
||||
const startX = ref(0)
|
||||
|
|
@ -93,7 +96,7 @@
|
|||
}
|
||||
const scrollleft = ref(0)
|
||||
const canmove = (e : any) => {
|
||||
if(props.Material.length==0){ return }
|
||||
if (props.Material.length == 0) { return }
|
||||
const moveX = e.touches[0].clientX
|
||||
const diff = moveX - startX.value
|
||||
// diff 为负值就是向左滑
|
||||
|
|
@ -129,10 +132,10 @@
|
|||
}
|
||||
}
|
||||
const timeout = ref(false)
|
||||
onMounted(()=>{
|
||||
setTimeout(()=>{
|
||||
onMounted(() => {
|
||||
setTimeout(() => {
|
||||
timeout.value = true
|
||||
},500)
|
||||
}, 500)
|
||||
})
|
||||
</script>
|
||||
|
||||
|
|
@ -157,22 +160,30 @@
|
|||
font-size: 1.4vw;
|
||||
position: relative;
|
||||
z-index: 10;
|
||||
.mhao{
|
||||
width: 1.6vw;
|
||||
min-height: 0vw;
|
||||
border-radius: 0.8vw;
|
||||
border: 1px solid #FF4E4E;
|
||||
font-weight: 400;
|
||||
font-size: 1.1vw;
|
||||
color: #FF4E4E;
|
||||
padding: 0.4vw 0vw;
|
||||
|
||||
.mhao {
|
||||
position: absolute;
|
||||
top: -0.8vw;
|
||||
right: -0.4vw;
|
||||
transform: rotate(-90deg);
|
||||
top: -0.9vw;
|
||||
/* 根据视觉需要微调 */
|
||||
right: -0.5vw;
|
||||
/* 根据视觉需要微调 */
|
||||
box-sizing: border-box;
|
||||
width: 1.8vw;
|
||||
/* 保证两位数也能容纳（可改成 2vw 以更宽松） */
|
||||
height: 1.8vw;
|
||||
/* 圆高，line-height 要与它匹配 */
|
||||
padding: 0 0.15vw;
|
||||
/* 给两位数一点水平缓冲 */
|
||||
border-radius: 50%;
|
||||
border: 1px solid #FF4E4E;
|
||||
color: #FF4E4E;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: transparent;
|
||||
writing-mode: horizontal-tb;
|
||||
/* <- 关键：让内部按横排显示数字（不被父写排规则影响） */
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -221,7 +232,7 @@
|
|||
right: 7.7vw;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
|
||||
&:nth-child(4) {
|
||||
right: 11.6vw;
|
||||
z-index: 2;
|
||||
|
|
@ -234,8 +245,9 @@
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
.kcscrol {
|
||||
width:calc(100% - 10vw);
|
||||
width: calc(100% - 10vw);
|
||||
height: 10vw;
|
||||
white-space: nowrap;
|
||||
margin-left: 0.6vw;
|
||||
|
|
@ -250,14 +262,16 @@
|
|||
border-radius: 1.1vw;
|
||||
margin-right: 0.8vw;
|
||||
position: relative;
|
||||
.zhanwei{
|
||||
|
||||
.zhanwei {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 200;
|
||||
view{
|
||||
|
||||
view {
|
||||
position: absolute;
|
||||
width: 2.2vw;
|
||||
height: 2.2vw;
|
||||
|
|
@ -276,6 +290,7 @@
|
|||
color: rgba(255, 78, 78, 1);
|
||||
}
|
||||
}
|
||||
|
||||
.ytj {
|
||||
min-width: 1.5vw;
|
||||
height: 1.8vw;
|
||||
|
|
@ -288,7 +303,7 @@
|
|||
text-align: center;
|
||||
line-height: 1.75vw;
|
||||
position: absolute;
|
||||
padding: 0 0.8vw;
|
||||
padding: 0 0.8vw;
|
||||
top: 0.8vw;
|
||||
right: 0.8vw;
|
||||
}
|
||||
|
|
@ -316,6 +331,7 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.guodu {
|
||||
transition: .4s;
|
||||
-webkit-transform-style: preserve-3d;
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@
|
|||
position: absolute;
|
||||
bottom: 0.8vw;
|
||||
right: 0vw;
|
||||
|
||||
}
|
||||
}
|
||||
.msitem {
|
||||
|
|
|
|||
|
|
@ -338,6 +338,7 @@
|
|||
}
|
||||
.quxiao{
|
||||
background: #EDEDEF;
|
||||
color: #888888;
|
||||
}
|
||||
.plsbuy-bottom-blue {
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@
|
|||
}
|
||||
.quxiao{
|
||||
background: #EDEDEF;
|
||||
color: #888888;
|
||||
}
|
||||
.plsbuy-bottom-blue {
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
|
|
|
|||
|
|
@ -101,10 +101,11 @@
|
|||
if(props.show==true){
|
||||
let obj = {
|
||||
nuId:uni.getStorageSync('nuId'),
|
||||
elderId:uni.getStorageSync('NUall').id,
|
||||
elderId:uni.getStorageSync('NUall').elderId,
|
||||
wlId:props.objtake.wlId,
|
||||
}
|
||||
queryMaterialInfo(obj).then(res=>{
|
||||
console.log("入参",obj,`返回`,res)
|
||||
wuobj.value = res.result
|
||||
})
|
||||
qglog()
|
||||
|
|
|
|||
|
|
@ -299,6 +299,7 @@
|
|||
elderId:form.elderId
|
||||
}
|
||||
submitQld(obj).then(res=>{
|
||||
console.log("入参",obj,"res",res)
|
||||
if(res.success&&res.result.status=='success'){
|
||||
uni.showToast({
|
||||
icon:'success',
|
||||
|
|
|
|||
|
|
@ -1353,7 +1353,7 @@
|
|||
const nomessageshow = ref(false);
|
||||
const firstgetqueryCgdList = () => {
|
||||
queryCgdList(plzinfo).then((res : any) => {
|
||||
|
||||
console.log("数据呢",res)
|
||||
plsbuy.value.push(...res.result.records)
|
||||
alltotal.value = res.result.total
|
||||
if (!res.result.total) {
|
||||
|
|
@ -1406,7 +1406,7 @@
|
|||
// console.log("!!!!",form)
|
||||
queryCgdInfoList(form).then(res => {
|
||||
InvoicingList.value = []
|
||||
// console.log("数据呢", res.result.records)
|
||||
console.log("数据呢", form)
|
||||
InvoicingList.value.push(...res.result.records);
|
||||
if (form.pageNo) {
|
||||
clickmiddle(0);
|
||||
|
|
@ -1454,7 +1454,7 @@
|
|||
const mobanform = {
|
||||
nuId: '',
|
||||
pageNo: 1,
|
||||
pageSize: 9,
|
||||
pageSize: -1,
|
||||
categoryId: '',
|
||||
typeId: '',
|
||||
medicationId: '',
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@
|
|||
<view class="right-one" v-for="(item,index) in rightarray" :key="index">
|
||||
<view class="right-one-left">
|
||||
<image class="left-image"
|
||||
:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
|
||||
:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
|
||||
mode="aspectFill"></image>
|
||||
<view class="left-tages" style="margin-top: -15rpx;">
|
||||
{{ item.materialInfo.categoryName}}
|
||||
|
|
@ -371,12 +371,14 @@
|
|||
plsbuy.value = []
|
||||
plsbuy.value.push(...res.result.records)
|
||||
alltotal.value = res.result.total
|
||||
|
||||
console.log("?????",res.result.records[0].qldNo)
|
||||
if (res.result.records.length) {
|
||||
rightdonghua.value = false;
|
||||
|
||||
queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
|
||||
console.log("111111111",element)
|
||||
rightarray.value = []
|
||||
|
||||
rightarray.value.push(...element.result)
|
||||
rightdonghua.value = true;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@
|
|||
const mobanform = {
|
||||
nuId: uni.getStorageSync('nuId'),
|
||||
pageNo: 1,
|
||||
pageSize: 9,
|
||||
pageSize: -1,
|
||||
categoryId: '',
|
||||
typeId: '',
|
||||
medicationId: '',
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.0 KiB |
Loading…
Reference in New Issue