This commit is contained in:
commit
614f9c6133
|
|
@ -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(() => {
|
||||
|
|
|
|||
|
|
@ -3,12 +3,18 @@
|
|||
<view class="kcyj">
|
||||
<view class="kjlt">
|
||||
请领物料
|
||||
<view class="mhao" v-if="Material.length>0">{{Material.length}}</view>
|
||||
<view class="mhao" v-if="Material.length>0">
|
||||
<view class="mhao-font">
|
||||
{{Material.length}}
|
||||
</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>
|
||||
</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'"
|
||||
<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 +22,15 @@
|
|||
<view>-</view>
|
||||
</view>
|
||||
</view>
|
||||
<defaultr cont="暂无数据" v-if="Material.length==0&&timeout" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
|
||||
<view class="que" v-if="Material.length==0&&timeout">
|
||||
<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
|
||||
<view>暂无数据</view>
|
||||
</view>
|
||||
<!-- <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);':''"
|
||||
|
|
@ -157,22 +169,28 @@
|
|||
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;
|
||||
position: absolute;
|
||||
top: -0.8vw;
|
||||
right: -0.4vw;
|
||||
transform: rotate(-90deg);
|
||||
top: -0.2vw;
|
||||
/* 根据视觉需要微调 */
|
||||
right: -0.2vw;
|
||||
box-sizing: border-box;
|
||||
width: 1.8vw;
|
||||
height: 1.8vw;
|
||||
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;
|
||||
.mhao-font{
|
||||
font-size: 25rpx;
|
||||
letter-spacing: -0.05em; /* 负值 = 字符之间更近 */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -234,6 +252,7 @@
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
.kcscrol {
|
||||
width: calc(100% - 10vw);
|
||||
height: 10vw;
|
||||
|
|
@ -250,6 +269,7 @@
|
|||
border-radius: 1.1vw;
|
||||
margin-right: 0.8vw;
|
||||
position: relative;
|
||||
|
||||
.zhanwei {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
|
@ -257,6 +277,7 @@
|
|||
top: 0;
|
||||
left: 0;
|
||||
z-index: 200;
|
||||
|
||||
view {
|
||||
position: absolute;
|
||||
width: 2.2vw;
|
||||
|
|
@ -276,6 +297,7 @@
|
|||
color: rgba(255, 78, 78, 1);
|
||||
}
|
||||
}
|
||||
|
||||
.ytj {
|
||||
min-width: 1.5vw;
|
||||
height: 1.8vw;
|
||||
|
|
@ -316,9 +338,40 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.guodu {
|
||||
transition: .4s;
|
||||
-webkit-transform-style: preserve-3d;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
.que{
|
||||
width: 16vw;
|
||||
height: 16vw;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 82.2vw;
|
||||
height: 10vw;
|
||||
background: rgba(245, 246, 248, 1);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: 20rpx;
|
||||
|
||||
image{
|
||||
width: 12vw;
|
||||
height: 12vw;
|
||||
}
|
||||
view{
|
||||
width: 12vw;
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
bottom: 0.5vw;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
font-weight: 300;
|
||||
font-size: 1.4vw;
|
||||
color: #555555;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -220,6 +220,7 @@
|
|||
position: absolute;
|
||||
bottom: 0.8vw;
|
||||
right: 0vw;
|
||||
|
||||
}
|
||||
}
|
||||
.msitem {
|
||||
|
|
@ -370,7 +371,7 @@
|
|||
|
||||
.itembox{
|
||||
width: 100%;
|
||||
height: 64vh;
|
||||
height: 66vh;
|
||||
padding:1vw 2vw 0 0;
|
||||
|
||||
.box{
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@
|
|||
min-width: 8vw;
|
||||
height: 3.8vw;
|
||||
background: #EDEDEF;
|
||||
border-radius: 1.6vw;
|
||||
border-radius: 3vw;
|
||||
padding: 0 2vw;
|
||||
margin-left: 1vw;
|
||||
border: 1px solid #EDEDEF;
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@
|
|||
font-size: 1.6vw;
|
||||
color: #222222;
|
||||
height: 3vw;
|
||||
padding-top: 1.3vw;
|
||||
padding-top: 1.2vw;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<view class="leftbox">
|
||||
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
|
||||
<view>
|
||||
<text>耗材用品</text>
|
||||
<text>复健用品</text>
|
||||
<view>{{ objtake?.categoryId_dictText }}</view>
|
||||
<view>{{ objtake?.typeId_dictText }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="youcont">
|
||||
|
|
@ -70,15 +70,15 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
|
|||
const showbox = ref(false)
|
||||
watch(()=>props.show,
|
||||
()=>{
|
||||
console.log(props.objtake)
|
||||
// console.log(`11111111111`,props.objtake)
|
||||
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(res)
|
||||
console.log(`wuobj`,res)
|
||||
wuobj.value = res.result
|
||||
})
|
||||
setTimeout(()=>{
|
||||
|
|
@ -113,6 +113,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
|
|||
}
|
||||
.quxiao{
|
||||
background: #EDEDEF;
|
||||
color: #888888;
|
||||
}
|
||||
.plsbuy-bottom-blue {
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
|
|
@ -147,9 +148,11 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
|
|||
width: 100%;
|
||||
margin-top: 0.6vw;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
// justify-content: space-around;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
text {
|
||||
view {
|
||||
width: 6vw;
|
||||
height: 2vw;
|
||||
border-radius: 1vw;
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@
|
|||
font-size: 1.6vw;
|
||||
color: #222222;
|
||||
height: 3vw;
|
||||
padding-top: 1.3vw;
|
||||
padding-top: 1.2vw;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
|
|
@ -266,6 +266,7 @@
|
|||
font-weight: 400;
|
||||
font-size: 1.4vw;
|
||||
color: #555555;
|
||||
margin-left: 1.1vw;
|
||||
}
|
||||
.itemcan{
|
||||
width: 100%;
|
||||
|
|
@ -273,6 +274,8 @@
|
|||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding-left: 1vw;
|
||||
padding-right: 1vw;
|
||||
text{
|
||||
font-weight: 400;
|
||||
font-size: 1.4vw;
|
||||
|
|
@ -280,7 +283,7 @@
|
|||
}
|
||||
}
|
||||
.tit {
|
||||
width: 100%;
|
||||
width: 96.5%;
|
||||
height: 3.5vw;
|
||||
line-height: 6vw;
|
||||
font-weight: 400;
|
||||
|
|
@ -290,6 +293,8 @@
|
|||
justify-content: space-between;
|
||||
align-items: center;
|
||||
border-bottom: 1px solid #E5E5E5;
|
||||
margin: 0 1vw;
|
||||
|
||||
}
|
||||
}
|
||||
.mengban{
|
||||
|
|
@ -338,6 +343,7 @@
|
|||
}
|
||||
.quxiao{
|
||||
background: #EDEDEF;
|
||||
color: #888888;
|
||||
}
|
||||
.plsbuy-bottom-blue {
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
|
|
|
|||
|
|
@ -227,6 +227,7 @@
|
|||
}
|
||||
.quxiao{
|
||||
background: #EDEDEF;
|
||||
color: #888888;
|
||||
}
|
||||
.plsbuy-bottom-blue {
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
|
|
@ -317,6 +318,7 @@
|
|||
font-size: 1.4vw;
|
||||
font-weight: 500;
|
||||
text-align: center;
|
||||
margin-left: 1.5vw;
|
||||
}
|
||||
|
||||
.cont{
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
<view class="leftbox">
|
||||
<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
|
||||
<view>
|
||||
<text>耗材用品</text>
|
||||
<text>复健用品</text>
|
||||
<view v-if="objtake?.categoryId_dictText">{{objtake?.categoryId_dictText}}</view>
|
||||
<view v-if="objtake?.typeId_dictText">{{objtake?.typeId_dictText}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="youcont">
|
||||
|
|
@ -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()
|
||||
|
|
@ -175,7 +176,8 @@
|
|||
.dian{
|
||||
width: 0.5vw;
|
||||
height: 0.5vw;
|
||||
margin: 01.6vw;
|
||||
margin: 1.6vw;
|
||||
margin-right: 1vw;
|
||||
background: #888888;
|
||||
border-radius: 50%;
|
||||
position: relative;
|
||||
|
|
@ -192,24 +194,25 @@
|
|||
background: white;
|
||||
}
|
||||
.riqi{
|
||||
min-width: 7.2vw;
|
||||
width: 12vw;
|
||||
height: 2vw;
|
||||
background: #F9F9FA;
|
||||
border-radius: 1vw;
|
||||
border: 1px solid #D2D2D2;
|
||||
border: 1rpx solid #D2D2D2;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-weight: 400;
|
||||
font-size: 1vw;
|
||||
color: #888888;
|
||||
padding: 0 0.6vw;
|
||||
padding: 0 0.4vw;
|
||||
}
|
||||
.qlr{
|
||||
width: 11vw;
|
||||
font-weight: 400;
|
||||
font-size: 1.3vw;
|
||||
font-size: 1.2vw;
|
||||
color: #999999;
|
||||
margin-left: 1.8vw;
|
||||
margin-left: 1vw;
|
||||
text{
|
||||
color: #333;
|
||||
}
|
||||
|
|
@ -249,12 +252,14 @@
|
|||
|
||||
view {
|
||||
width: 100%;
|
||||
margin-top: 0.6vw;
|
||||
margin-top: 0.3vw;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
// justify-content: space-around;
|
||||
|
||||
text {
|
||||
min-width: 4.8vw;
|
||||
view {
|
||||
width: 6vw;
|
||||
height: 2vw;
|
||||
border-radius: 1vw;
|
||||
border: 1px solid #D2D2D2;
|
||||
|
|
@ -290,7 +295,7 @@
|
|||
height: 3.6vw;
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
margin-top: 1.8vw;
|
||||
margin-top: 1.6vw;
|
||||
|
||||
>view {
|
||||
width: 50%;
|
||||
|
|
@ -311,15 +316,15 @@
|
|||
|
||||
&:nth-child(1) {
|
||||
width: 100%;
|
||||
height: 1.8vw;
|
||||
height: 2vw;
|
||||
font-weight: bold;
|
||||
font-size: 1.6vw;
|
||||
font-size: 1.5vw;
|
||||
color: #222222;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
line-height: 1.8vw;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -365,6 +370,7 @@
|
|||
}
|
||||
.quxiao{
|
||||
background: #EDEDEF;
|
||||
color: #888888;
|
||||
}
|
||||
.plsbuy-bottom-blue {
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@
|
|||
watch(
|
||||
() => props.isShow,
|
||||
(newVal, oldVal) => {
|
||||
console.log("??????",newVal, oldVal)
|
||||
// console.log("??????",newVal, oldVal)
|
||||
// 当旧值为false，新值为true时延迟0.2秒调用方法
|
||||
if (!oldVal && newVal) {
|
||||
transition.value = false;
|
||||
|
|
@ -333,7 +333,7 @@
|
|||
const firstgetqueryCgdList = () => {
|
||||
queryQld(plzinfo).then((res : any) => {
|
||||
transition.value = true;
|
||||
// console.log("kankan",plzinfo,res)
|
||||
// console.log("kankan",res)
|
||||
if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
|
||||
nomessageshow.value = true;
|
||||
return
|
||||
|
|
@ -356,6 +356,8 @@
|
|||
rightarray.value.push(...element.result)
|
||||
rightdonghua.value = true;
|
||||
})
|
||||
}else{
|
||||
rightarray.value = []
|
||||
}
|
||||
|
||||
if (res.result.records.length < plzinfo.pageSize) {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
作废
|
||||
</view>
|
||||
</view>
|
||||
<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true">
|
||||
<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true" v-if="rightarray.length">
|
||||
<image src="/static/index/warehouse/procurement/picking/caigou.png" />
|
||||
<view>
|
||||
提交请购单
|
||||
|
|
@ -183,7 +183,8 @@
|
|||
// 当旧值为false，新值为true时延迟0.2秒调用方法
|
||||
if (!oldVal && newVal) {
|
||||
transition.value = false;
|
||||
// console.log("????",transition.value)
|
||||
plzinfo.pageNo = 1;
|
||||
plzinfo.canpull = true;
|
||||
setTimeout(() => {
|
||||
transition.value = true;
|
||||
lefttarget.value = 0;
|
||||
|
|
@ -286,7 +287,7 @@
|
|||
plsbuy.value = [];
|
||||
// console.log(res)
|
||||
plsbuy.value.push(...res.result.records)
|
||||
// console.log("入参", plzinfo)
|
||||
console.log("入参", plzinfo)
|
||||
console.log("查看数组", res.result.records)
|
||||
alltotal.value = res.result.total
|
||||
|
||||
|
|
@ -426,6 +427,7 @@
|
|||
setTimeout(()=>{
|
||||
plsbuy.value[lefttarget.value] = res.result.result
|
||||
tijiaoshow.value = false;
|
||||
|
||||
rightinfolist();
|
||||
},800)
|
||||
}else{
|
||||
|
|
|
|||
|
|
@ -16,8 +16,7 @@
|
|||
筛选
|
||||
</view>
|
||||
</view>
|
||||
<view class="shx" @click="chongzhi"
|
||||
v-if="form.categoryId!=''||form.wlParamInfo!='' " >
|
||||
<view class="shx" @click="chongzhi" v-if="form.categoryId!=''||form.wlParamInfo!='' ">
|
||||
<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image>
|
||||
<view class="shx-font">
|
||||
重置
|
||||
|
|
@ -30,12 +29,14 @@
|
|||
<view class="shx-font" @click="changePage(1)">
|
||||
请领单
|
||||
</view>
|
||||
<view class="qlthbtn-red" v-if="isQingling"></view>
|
||||
</view>
|
||||
<view class="qlthbtn">
|
||||
<image src="/static/index/requestform/ql1.png" mode="aspectFill"></image>
|
||||
<view class="shx-font" @click="changePage(2)">
|
||||
回退单
|
||||
</view>
|
||||
<view class="qlthbtn-red" v-if="isRead"></view>
|
||||
</view>
|
||||
<view class="qlthbtn" @click="thshow = true">
|
||||
<image src="/static/index/requestform/ql2.png" mode="aspectFill"></image>
|
||||
|
|
@ -48,7 +49,8 @@
|
|||
<addwl :Material="addMaterial" @delall="delall" @del="adddel" @submit="submit"></addwl>
|
||||
<carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status" @comfig="comfig"></carditem>
|
||||
<takeing :show="takeshow" :objtake="objtake" @fill="takeshow = false" @right="right"></takeing>
|
||||
<cgdclass @confirm="confirm" :show="ification" :typenum="0" ref="classication" @fill="ification = false"></cgdclass>
|
||||
<cgdclass @confirm="confirm" :show="ification" :typenum="0" ref="classication" @fill="ification = false">
|
||||
</cgdclass>
|
||||
<medetails :show="detaishow" @fill="detaishow = false" @confirm="confirm" :objtake="objtake"></medetails>
|
||||
<tanchuang @back="tanshow = false" :show="tanshow" font="确定将该物料从本次请领清单中移除吗？" @right="del"></tanchuang>
|
||||
<takerecord :objtake="objtake" :show="recordshow" @fill="recordshow = false"></takerecord>
|
||||
|
|
@ -60,7 +62,7 @@
|
|||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
|
||||
import { queryInvoicingList,wlzd,queryGwcInfo,addGwc ,deleteGwcWl,removeAllGwc,submitQld,requireTH} from '../api/api.js'
|
||||
import { queryInvoicingList, wlzd, queryGwcInfo, addGwc, deleteGwcWl, removeAllGwc, submitQld, requireTH, queryQld } from '../api/api.js'
|
||||
import addwl from '../common/addwl.vue';
|
||||
import carditem from '../common/carditem.vue';
|
||||
import takeing from '../common/takeing.vue';
|
||||
|
|
@ -88,10 +90,15 @@
|
|||
watch(
|
||||
() => props.isShow,
|
||||
(newVal, oldVal) => {
|
||||
form.pageNo = 1;
|
||||
listarr.value = [];
|
||||
form.categoryId = '';
|
||||
form.typeId = '';
|
||||
form.medicationId = '';
|
||||
form.pageNo = 1;
|
||||
form.wlParamInfo = '',
|
||||
config()
|
||||
wuliao()
|
||||
getreddian()
|
||||
if (!oldVal && newVal) {
|
||||
transition.value = false;
|
||||
setTimeout(() => {
|
||||
|
|
@ -114,13 +121,48 @@
|
|||
const errmsg = ref('')
|
||||
const classication = ref<InstanceType<typeof ChildComponent>>()
|
||||
const addMaterial = ref([])
|
||||
|
||||
const isRead = ref(false)
|
||||
const isQingling = ref(false)
|
||||
const getreddian = () => {
|
||||
let plzinfo0 = {
|
||||
pageNo: 1,
|
||||
pageSize: 1,
|
||||
searchContent: "",
|
||||
status: "3",
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
nuId: uni.getStorageSync('nuId')
|
||||
}
|
||||
queryQld(plzinfo0).then((res : any) => {
|
||||
if (res.result.records[0].izYgRead == `N`) {
|
||||
isRead.value = true;
|
||||
} else {
|
||||
isRead.value = false;
|
||||
}
|
||||
})
|
||||
let plzinfo1 = {
|
||||
pageNo: 1,
|
||||
pageSize: 1,
|
||||
searchContent: "",
|
||||
status: "4",
|
||||
elderId: uni.getStorageSync('NUall').elderId,
|
||||
nuId: uni.getStorageSync('nuId')
|
||||
}
|
||||
queryQld(plzinfo1).then((res : any) => {
|
||||
if (res.result.records[0].izYgRead == `N`) {
|
||||
isQingling.value = true;
|
||||
} else {
|
||||
isQingling.value = false;
|
||||
}
|
||||
})
|
||||
}
|
||||
const wuliao = () => {
|
||||
let obj = {
|
||||
nuId: form.nuId,
|
||||
elderId: form.elderId
|
||||
}
|
||||
queryGwcInfo(obj).then(res => {
|
||||
console.log(res)
|
||||
// console.log(res)
|
||||
addMaterial.value = res.result
|
||||
})
|
||||
}
|
||||
|
|
@ -148,6 +190,7 @@
|
|||
thshow.value = false;
|
||||
errmsg.value = res.message;
|
||||
openerror.value = true;
|
||||
console.log("?????")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -216,7 +259,7 @@
|
|||
}
|
||||
const objtake = ref({})
|
||||
const comfig = (v, i, t) => {
|
||||
// console.log(v,i,t)
|
||||
console.log(`看看数据`, v, i, t)
|
||||
switch (t) {
|
||||
case 0:
|
||||
objtake.value = v;
|
||||
|
|
@ -305,9 +348,11 @@
|
|||
setTimeout(() => {
|
||||
subshow.value = false;
|
||||
wuliao();
|
||||
changePage(1)
|
||||
}, 800)
|
||||
} else {
|
||||
errmsg.value = res.result.message;
|
||||
// console.log("!!!!!",res)
|
||||
errmsg.value = res.result.message?res.result.message:res.message
|
||||
openerror.value = true;
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
.buttons-father {
|
||||
width: 100%;
|
||||
height: 90rpx;
|
||||
height: 70rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
.flexend{
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
border-radius: 1.65vw;
|
||||
border: 1rpx solid #D9DADC;
|
||||
font-weight: 400;
|
||||
font-size: 1.2vw;
|
||||
font-size: 1.4vw;
|
||||
color: #222;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
|
@ -88,10 +88,21 @@
|
|||
box-shadow: 0.5rpx 3rpx 3rpx #dadee1;
|
||||
margin: 0 0 0 0.5vw;
|
||||
color: #555555;
|
||||
position: relative;
|
||||
.qlthbtn-red{
|
||||
position: absolute;
|
||||
right: -0vw;
|
||||
top: -0vw;
|
||||
width: 1vw;
|
||||
height: 1vw;
|
||||
background-color: rgba(255, 78, 78, 1);
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
image {
|
||||
width: 1.8vw;
|
||||
height: 1.8vw;
|
||||
margin: 0 0.2vw 0 0;
|
||||
width: 1.5vw;
|
||||
height: 1.5vw;
|
||||
margin: 0.1vw 0.3vw 0 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -135,6 +146,7 @@
|
|||
|
||||
.shx-font {
|
||||
margin-top: 3rpx;
|
||||
// font-size: 1.4vw;
|
||||
// margin-left: -5rpx;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ export const getMaterialTreeData = (params) => {
|
|||
// （业务）获取物料分类树（购物车使用）
|
||||
export const getGwcMaterialTreeData = (params) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=`+params.nuId,
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=` + params
|
||||
.nuId,
|
||||
method: 'get',
|
||||
data: params
|
||||
})
|
||||
|
|
@ -30,7 +31,8 @@ export const getGwcMaterialTreeData = (params) => {
|
|||
// （业务）获取物料分类树（采购单使用）
|
||||
export const getCgdMaterialTreeData = (params) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=`+params.nuId,
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=` + params
|
||||
.nuId,
|
||||
method: 'get',
|
||||
data: params,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1051,7 +1051,7 @@
|
|||
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
|
||||
import calendar from '@/component/public/calendar.vue'
|
||||
import nomessageimge from '@/pages/procurement/components/nomessage.vue';
|
||||
import tanchuang from '@/pages/procurement/components/tanchuang.vue';
|
||||
|
||||
|
||||
const open = ref(0);
|
||||
const typechange = ref(0);
|
||||
|
|
@ -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: '',
|
||||
|
|
@ -1512,6 +1512,7 @@
|
|||
// if (!plzinfo.cgdParamInfo) return
|
||||
plzinfo.pageNo = 1;
|
||||
plsbuy.value = [];
|
||||
plzinfo.canpull = true
|
||||
queryCgdList(plzinfo).then((res : any) => {
|
||||
plsbuy.value.push(...res.result.records)
|
||||
alltotal.value = res.result.total
|
||||
|
|
|
|||
|
|
@ -355,3 +355,27 @@ export const outbound = (params) => {
|
|||
data: params,
|
||||
})
|
||||
}
|
||||
// 盘点单所有的接口
|
||||
// 获得列表
|
||||
export const queryPddList = (params) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddList`,
|
||||
method: 'get',
|
||||
data: params,
|
||||
})
|
||||
}
|
||||
//获得采购人
|
||||
export const queryPddStartByList = (params) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddStartByList`,
|
||||
method: 'get',
|
||||
data: params,
|
||||
})
|
||||
}
|
||||
export const addPddMain = (params) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/addPddMain`,
|
||||
method: 'post',
|
||||
data: params,
|
||||
})
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -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,7 +371,6 @@
|
|||
plsbuy.value = []
|
||||
plsbuy.value.push(...res.result.records)
|
||||
alltotal.value = res.result.total
|
||||
|
||||
if (res.result.records.length) {
|
||||
rightdonghua.value = false;
|
||||
|
||||
|
|
@ -380,6 +379,8 @@
|
|||
rightarray.value.push(...element.result)
|
||||
rightdonghua.value = true;
|
||||
})
|
||||
}else{
|
||||
rightarray.value = []
|
||||
}
|
||||
|
||||
if (res.result.records.length < plzinfo.pageSize) {
|
||||
|
|
|
|||
|
|
@ -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