Compare commits

...

2 Commits

10 changed files with 128 additions and 100 deletions

View File

@ -62,6 +62,21 @@
const housactive = (index : number) => {
if (index > 5) { return }
if(housedex.value == index){
if (housedex.value == 1) {
navurl.value = 'pages/Warehouse/procurement'
uni.navigateTo({
url: '/' + navurl.value
})
}
if (housedex.value == 2) {
navurl.value = 'pages/Warehouse/purchaseorder'
uni.navigateTo({
url: '/' + navurl.value
})
}
return
}
housedex.value = index;
console.log("index", index)
// .....

View File

@ -32,8 +32,8 @@
</view>
</view>
</view>
<view style="height: 23vw;width: 100%;padding:10vw 40vw ;">
<u-loadmore :status="status" />
<view style="height: 10vw;width: 100%;padding:10vw 40vw;display: flex;flex-direction: column;justify-content: flex-end;">
<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>7"/>
</view>
</scroll-view>
<shadowview :opacity="opacity"></shadowview>
@ -50,7 +50,7 @@
<view class="lefts" v-if="!lie">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scrolltop" class="scroll-Y"
@scrolltolower="scrolltolower" :lower-threshold="200" @scroll="scrollview">
@scrolltolower="scrolltolower" :lower-threshold="400" @scroll="scrollview">
<view class="boxitem" v-for="(v,i) in InvoicingList" :key='i'
:class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i}"
@click="shopclick(i)">
@ -73,8 +73,8 @@
</view>
</view>
</view>
<view style="height: 23vw;width: 100%;padding:10vw 40vw ;">
<u-loadmore :status="status" dashed line nomore-text="已加载全部" />
<view style="height:5vw;width: 100%;padding:1vw 40vw 2vw;display: flex;flex-direction: column;justify-content: flex-end;">
<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>10"/>
</view>
</scroll-view>
<shadowview :opacity="opacity"></shadowview>
@ -137,10 +137,10 @@
<view class="typeitem">
<view class="toptype">
<!-- <view v-for="v in ['三','二','一']">{{v+'级分类'}}</view> -->
<view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})" >全部</view>
<view v-for="v in ['三','二','一']">{{v+'级分类'}}</view>
<!-- <view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})" >全部</view>
<view :class="scroll.act2==-1?'act':''" @click="typescroll(2,-1,{})" >全部</view>
<view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})" >全部</view>
<view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})" >全部</view> -->
</view>
<view class="scroltype">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop3"
@ -179,7 +179,6 @@
<donghua width="2vw" height="2vw" :links="v.url" :playing="i === anmidex"
class="donghua" />
</view>
<text>
{{v.name}}
</text>
@ -487,9 +486,10 @@
res.result.records.forEach((item,i)=>{
item.flag = true
})
console.log(res.result.records)
console.log(res.result)
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
status.value = (res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore');
panduan();
})
}
@ -611,11 +611,11 @@
return
}
InvoicingList.value[shopitem.value].flag = !InvoicingList.value[shopitem.value].flag;
panduan();
setTimeout(()=>{
anmidex.value = -1;
tmr.value = true;
},1000)
panduan();
anmidex.value = -1;
},800)
break;
case 1:
let arr = [];
@ -683,6 +683,7 @@
uni.navigateTo({
url:'/pages/Warehouse/purchaseorder'
})
tmr.value = true;
anmidex.value = -1;
break;
// case 1:
@ -762,10 +763,7 @@
})
}
const panduan =()=>{
animArray.value[0].name =InvoicingList.value[shopitem.value].flag? '取消':'选择'
}
const animArray = ref([
{
let xz = {
url: genPaths(
'/static/index/warehouse/procurement/select',
'select',
@ -775,7 +773,33 @@
false //
),
name: '选择',
imgurl: '/static/index/warehouse/procurement/select/select1.png'
}
let qx = {
url: genPaths(
'/static/index/warehouse/procurement/scrap',
'scrap',
5, //
'png',
0, // 1
false //
),
name: '取消',
}
animArray.value[0] = InvoicingList.value[shopitem.value].flag? qx:xz;
// animArray.value[0].name = InvoicingList.value[shopitem.value].flag? '':''
}
const animArray = ref([
{
url: genPaths(
'/static/index/warehouse/procurement/scrap',
'scrap',
5, //
'png',
0, // 1
false //
),
name: '取消',
},
{
url: genPaths(
@ -787,7 +811,6 @@
false //
),
name: '采 购',
imgurl: '/static/index/warehouse/procurement/procure/procure01.png'
},
{
url: genPaths(
@ -799,7 +822,6 @@
false //
),
name: '物料详情',
imgurl: '/static/index/warehouse/procurement/details/details01.png'
},
{
url: genPaths(
@ -811,7 +833,6 @@
false //
),
name: '删除',
imgurl: '/static/index/warehouse/procurement/del/del1.png'
},
{
url: genPaths(
@ -835,7 +856,6 @@
false //
),
name: '采购单',
imgurl: '/static/index/warehouse/procurement/Purchase/Purchase01.png'
},
])
</script>
@ -1255,11 +1275,11 @@
width: 100%;
height: 9vw;
display: flex;
justify-content: flex-start;
justify-content: space-between;
flex-wrap: wrap;
>view {
width: 7.8vw;
width: 7.4vw;
height: 3.7vw;
display: flex;
justify-content: center;
@ -1280,7 +1300,7 @@
}
.donghua {
margin: 0;
margin: 0 0.1vw;
}
}
@ -1293,11 +1313,11 @@
.typeitem {
width: 100%;
height: 38vh;
height: 40vh;
.scroltype {
width: 100%;
height: calc(34vh - 2vw);
height: calc(36vh);
display: flex;
justify-content: space-around;
.scrl1{
@ -1314,8 +1334,8 @@
}
}
.scroll-Y {
height: calc(38vh - 2vw);
height: calc(35vh - 2vh);
margin-top: 0.5vw;
view {
height: 3.8vw;
background: rgba(255, 255, 255, .5);
@ -1366,8 +1386,6 @@
display: flex;
justify-content: center;
align-items: center;
background: rgba(255, 255, 255, .5);
border:1px solid rgba(255, 255, 255, .5);
font-weight: 400;
font-size: 1.2vw;
color: #333333;
@ -1661,8 +1679,9 @@
}
.yujing {
border: 2px solid rgba(255, 102, 107, 0.51) !important;
box-shadow: 0 0 8px rgba(255, 102, 107, 0.051) inset;
border: 1px solid rgba(250, 177, 181, 0.5) !important;
box-shadow: 5px 2px 8px rgba(250, 177, 181, 1);
view {
.num {

View File

@ -55,10 +55,11 @@
<view>
{{v.materialName}}
</view>
<view>采购单位 {{v.materialUnits}}</view>
<view>物料编码 {{v.materialNo}}</view>
<view>规格型号: {{v.specificationModel}}</view>
<view>采购单位 {{v.materialUnits}}</view>
<view>
<view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
<!-- <view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill"
v-if="v.tagType==1"></image>
<image src="/static/index/warehouse/procurement/yl.png" mode="aspectFill"
@ -66,7 +67,7 @@
<image src="/static/index/warehouse/procurement/bj.png" mode="aspectFill"
v-if="v.tagType>2"></image>
{{v.tagName}}
</view>
</view> -->
<view class="znk">
<image
:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
@ -78,8 +79,8 @@
</view>
</view>
</view>
<view style="height: 23vw;width: 100%;padding:10vw 40vw ;">
<u-loadmore :status="status" />
<view style="height:5vw;width: 100%;padding:1vw 40vw 2vw;display: flex;flex-direction: column;justify-content: flex-end;">
<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>7"/>
</view>
</scroll-view>
<shadowview :opacity="opacity"></shadowview>
@ -122,10 +123,10 @@
</view>
<view class="typeitem">
<view class="toptype">
<!-- <view v-for="v in ['三','二','一']">{{v+'级分类'}}</view> -->
<view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})" >全部</view>
<view v-for="v in ['三','二','一']">{{v+'级分类'}}</view>
<!-- <view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})" >全部</view>
<view :class="scroll.act2==-1?'act':''" @click="typescroll(2,-1,{})" >全部</view>
<view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})" >全部</view>
<view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})" >全部</view> -->
</view>
<view class="scroltype">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop3"
@ -334,7 +335,7 @@
<view class="mengban" v-if="wlxq" @click="qingkong"></view>
<view class="wuliao guodu" :class="wlxq?'':'uncrkcard'">
<view class="name">
<view>{{wuliaoobj.materialName}}</view>
<view>{{wuliaoobj?.materialName}}</view>
<!-- <view>
<view class="swsh guodu" :class="caigouobj.izEnabled=='0'?'act':''"
@click="caiswitchshyp(caigouobj.izEnabled,caigouobj.id)">
@ -345,43 +346,43 @@
</view>
<view class="znk tp">
<image class="crkcard-img"
:src="wuliaoobj.materialImg?serverUrl + wuliaoobj.materialImg : '/static/index/warehouse/procurement/k.png'"
:src="wuliaoobj?.materialImg?serverUrl + wuliaoobj?.materialImg : '/static/index/warehouse/procurement/k.png'"
mode="aspectFill"></image>
</view>
<view class="life">
<view v-if="wuliaoobj.categoryName">{{wuliaoobj.categoryName}}</view>
<view v-if="wuliaoobj.typeName">{{wuliaoobj.typeName}}</view>
<view v-if="wuliaoobj.medicationName">{{wuliaoobj.medicationName}}</view>
<view v-if="wuliaoobj?.categoryName">{{wuliaoobj.categoryName}}</view>
<view v-if="wuliaoobj?.typeName">{{wuliaoobj.typeName}}</view>
<view v-if="wuliaoobj?.medicationName">{{wuliaoobj?.medicationName}}</view>
</view>
<view class="zil">
物料编码: {{ wuliaoobj.materialNo }}
物料编码: {{ wuliaoobj?.materialNo }}
</view>
<view class="zil">
规格型号: {{ wuliaoobj.specificationModel }}
规格型号: {{ wuliaoobj?.specificationModel }}
</view>
<view class="zil">
物料小类: {{wuliaoobj.tagName}}
物料小类: {{wuliaoobj?.tagName}}
</view>
<view class="zil">
物料单位: {{wuliaoobj.materialUnits}}
物料单位: {{wuliaoobj?.materialUnits}}
</view>
<view class="zil">
医保报销: {{ wuliaoobj.izYbbxName }}
医保报销: {{ wuliaoobj?.izYbbxName }}
</view>
<view class="zil">
机构优惠: {{ wuliaoobj.izJgyhName }}
机构优惠: {{ wuliaoobj?.izJgyhName }}
</view>
<view class="dibu">
<view>
<text>{{ wuliaoobj.kcsl }}</text>
<text>{{ wuliaoobj?.kcsl }}</text>
<text>库存数量</text>
</view>
<view>
<text>{{ wuliaoobj.upperLimit }}</text>
<text>{{ wuliaoobj?.upperLimit }}</text>
<text>物料上限 <text class="l"> </text></text>
</view>
<view style="align-items: end;">
<text>{{ wuliaoobj.lowerLimit }}</text>
<text>{{ wuliaoobj?.lowerLimit }}</text>
<text><text class="f"> </text>物料下限 </text>
</view>
</view>
@ -782,15 +783,16 @@
anmidex.value = -1;
break;
case 3:
caigouobj.value = InvoicingList.value[shopitem.value];
let obj = {
wlId:caigouobj.value.wlId,
nuId:form.nuId
}
queryWlInfoByWlId(obj).then(res=>{
wuliaoobj.value = res.result;
wuliaoobj.value = InvoicingList.value[shopitem.value];
wlxq.value = true
})
// let obj = {
// wlId:caigouobj.value.wlId,
// nuId:form.nuId
// }
// queryWlInfoByWlId(obj).then(res=>{
// console.log(res.result,obj)
// wuliaoobj.value = res.result;
// })
break;
case 4:
crk.value = true
@ -1707,11 +1709,11 @@
.typeitem {
width: 100%;
height: 54vh;
height: 57vh;
.scroltype {
width: 100%;
height: calc(55vh - 2vw);
height: calc(57vh);
display: flex;
justify-content: space-around;
.scrl1{
@ -1729,8 +1731,8 @@
}
.scroll-Y {
width: 8.5vw;
height: calc(54vh - 2vw);
height: calc(56vh - 2vh);
margin-top: 0.5vh;
view {
width: 100%;
height: 3.8vw;
@ -1782,8 +1784,6 @@
display: flex;
justify-content: center;
align-items: center;
background: rgba(255, 255, 255, .5);
border:1px solid rgba(255, 255, 255, .5);
font-weight: 400;
font-size: 1.2vw;
color: #333333;
@ -1950,17 +1950,17 @@
font-weight: 400;
font-size: 1.2vw;
color: #555555;
margin-top: .6vw;
margin-top: .4vw;
}
&:nth-child(3) {
&:nth-child(3),&:nth-child(4) {
font-weight: 400;
font-size: 1.2vw;
color: #666666;
margin-top: .6vw;
margin-top: .4vw;
}
>&:nth-child(4) {
>&:nth-child(5) {
width: 100%;
height: 10vw;
position: absolute;
@ -2030,8 +2030,8 @@
}
.yujing {
border: 2px solid rgba(255, 102, 107, 0.51) !important;
box-shadow: 0 0 8px rgba(255, 102, 107, 0.051) inset;
border: 2px solid rgba(250, 177, 181, 0.5) !important;
box-shadow: 0 0 8px rgba(250, 177, 181, 0.5);
view {
.num {

View File

@ -10,7 +10,7 @@
:class="{'yujing':v?.cgdType=='9','active':leftitem==i}"
@click="getmiddle(v,i);saveleftgo = i;">
<view>{{ v.cgdNo }}</view>
<view>{{ v?.cgdNo }}</view>
<view>供应商:{{ v.gysId_dictText }}</view>
<view>采购人: {{ v.createBy_dictText }}</view>
<view>{{ v.qgDate }}</view>
@ -19,7 +19,7 @@
采购金额
</view>
<view>
<text class="dollar">{{v.totalPrice}}</text>
<text class="dollar">{{v?.totalPrice}}</text>
</view>
</view>
@ -43,13 +43,13 @@
<view></view>采购单
</view>
<view class="cgdh brtop">
<view>采购单号<text>{{plsbuy[leftitem].cgdNo}}</text></view>
<view>采购金额<text>{{plsbuy[leftitem].totalPrice}}</text></view>
<view>采购单号<text>{{plsbuy[leftitem]?.cgdNo}}</text></view>
<view>采购金额<text>{{plsbuy[leftitem]?.totalPrice}}</text></view>
</view>
<view class="cgdh">
<view>采购人{{plsbuy[leftitem].createBy_dictText}} </view>
<view>采购日期{{plsbuy[leftitem].qgDate}}</view>
<view>供应商{{plsbuy[leftitem].gysId_dictText}}</view>
<view>采购人{{plsbuy[leftitem]?.createBy_dictText}} </view>
<view>采购日期{{plsbuy[leftitem]?.qgDate}}</view>
<view>供应商{{plsbuy[leftitem]?.gysId_dictText}}</view>
</view>
<scroll-view scroll-y="true" class="cgdscroll" scroll-with-animation>
<view class="fler">
@ -91,10 +91,10 @@
</view>
<view class="typeitem">
<view class="toptype">
<!-- <view v-for="v in ['三','二','一']">{{v+'级分类'}}</view> -->
<view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})">全部</view>
<view v-for="v in ['三','二','一']">{{v+'级分类'}}</view>
<!-- <view :class="scroll.act3==-1?'act':''" @click="typescroll(3,-1,{})">全部</view>
<view :class="scroll.act2==-1?'act':''" @click="typescroll(2,-1,{})">全部</view>
<view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})">全部</view>
<view :class="scroll.act1==-1?'act':''" @click="typescroll(1,-1,{})">全部</view> -->
</view>
<view class="scroltype">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scroll.scrolltop3"
@ -359,8 +359,9 @@
Object.assign(form, mobanform)
form.cgdId = item.id
queryInvo();
// queryInvo();
getMaterial();
typescroll(1,-1,{})
// console.log("", form)
}
const switchshyp = () => {
@ -519,7 +520,6 @@
const getqueryCgdList = () => {
if (!plzinfo.canpull) return
queryCgdList(plzinfo).then((res : any) => {
console.log("请购单", res.result.records)
plsbuy.value.push(...res.result.records)
if (res.result.records.length < plzinfo.pageSize) {
plzinfo.canpull = false;
@ -546,17 +546,13 @@
}
const cell = () => {
queryNuInfoByNuId(form).then(res => {
console.log("ceshi", form, cellobj.value)
cellobj.value = res.result;
shyp.value = res.result.status == 5 ? false : true
})
}
const getMaterial = () => {
getCgdMaterialTreeData(form).then(res => {
// console.log(form)
// console.log(res)
TreeData.value = res.result;
console.log("TreeData.value", TreeData.value)
})
}
const setout = ref(true)
@ -1523,18 +1519,18 @@
.typeitem {
width: 100%;
height: 54vh;
height: 56vh;
.scroltype {
width: 100%;
height: calc(58vh);
height: calc(56vh);
display: flex;
justify-content: space-around;
.scroll-Y {
width: 8.5vw;
height: calc(58vh);
height: calc(55vh - 2vh);
margin-top: 0.5vw;
view {
width: 100%;
height: 3.8vw;
@ -1588,8 +1584,6 @@
display: flex;
justify-content: center;
align-items: center;
background: rgba(255, 255, 255, .5);
border: 1px solid rgba(255, 255, 255, .5);
font-weight: 400;
font-size: 1.2vw;
color: #333333;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB