Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
b3a26b23c2
|
|
@ -14,7 +14,7 @@
|
|||
<view class="left-menu-father">
|
||||
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
|
||||
@scrolltolower="plsbuytolower" :lower-threshold="400">
|
||||
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i)"
|
||||
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)"
|
||||
:style="{borderColor: i==lefttarget? ``:`#fff` }">
|
||||
|
||||
<view v-if="moreindex==i" class="more-father">
|
||||
|
|
@ -25,9 +25,11 @@
|
|||
作废
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="pls-card-title">
|
||||
<view class="title-left">
|
||||
{{ v.cgdNo }}
|
||||
{ v.cgdNo }
|
||||
</view>
|
||||
<view class="title-right">
|
||||
<text style="position: absolute;bottom: 4rpx;left: -30rpx;">
|
||||
|
|
@ -425,7 +427,7 @@
|
|||
})
|
||||
}
|
||||
const lefttarget = ref(0);
|
||||
const clickLeftMenu = (index : any) => {
|
||||
const clickLeftMenu = (index : any,item:object) => {
|
||||
let num = Math.ceil((index + 1))
|
||||
leftscrolltop.value = (num - 2) * 186;
|
||||
lefttarget.value = index;
|
||||
|
|
@ -439,6 +441,10 @@
|
|||
clickmiddle(0);
|
||||
}
|
||||
})
|
||||
if(item.izNew=='Y'){
|
||||
item.izNew = 'N';
|
||||
|
||||
}
|
||||
}
|
||||
const showvalue = ref({
|
||||
materialImg: ""
|
||||
|
|
|
|||
|
|
@ -189,3 +189,11 @@ export const getTreeDataWlnum = (params) => {
|
|||
data: params,
|
||||
})
|
||||
}
|
||||
|
||||
export const editIzNew = (params) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
|
||||
method: 'post',
|
||||
data: params,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
v.scrollleft = 0
|
||||
}else{
|
||||
v.zk = true;
|
||||
v.scrollleft = 150;
|
||||
v.scrollleft = 170;
|
||||
}
|
||||
solleft(v,i)
|
||||
}
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
caigouobj.value.Limitnum = Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl);
|
||||
caigouobj.value.index = i;
|
||||
v.zk = x>pageX.value?false:true;
|
||||
v.scrollleft = v.zk?150 : 0;
|
||||
v.scrollleft = v.zk?170 : 0;
|
||||
|
||||
}
|
||||
const solleft =(v:any,i:number)=>{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<view>
|
||||
<image src="/static/index/procurement/ddj.png" mode="aspectFill"></image>
|
||||
</view>
|
||||
<view>确认将所有未添加状态的库存预警物料添加至购物车中,并且物料的采购数量为物料的库存上限减去库存数量吗?</view>
|
||||
<view>确认将所有未添加状态的库存预警物料添加至购物车中,并且物料的采购数量为物料的库存上限减去库存数量!</view>
|
||||
<view>
|
||||
<view @click="$emit('back')">取消</view>
|
||||
<view class="qd" @click="add()">确定</view>
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
})
|
||||
setTimeout(()=>{
|
||||
this.$emit('config')
|
||||
},800)
|
||||
},1800)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<style scoped lang="less">
|
||||
.addall{
|
||||
width: 42.4vw;
|
||||
height: 25vw;
|
||||
height: 26vw;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163,167,182,0.16);
|
||||
border-radius: 1.6vw;
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border: 1px solid #888888;
|
||||
border: 1px solid #EDEDEF;
|
||||
}
|
||||
.qd{
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
|
|
@ -78,10 +78,10 @@
|
|||
}
|
||||
}
|
||||
&:nth-child(3){
|
||||
width: 31vw;
|
||||
width: 33vw;
|
||||
height: 3.4vw;
|
||||
font-weight: 400;
|
||||
font-size: 1.2vw;
|
||||
font-size: 1.3vw;
|
||||
color: #888888;
|
||||
line-height: 1.7vw;
|
||||
margin: 0.4vw auto 0;
|
||||
|
|
|
|||
|
|
@ -513,18 +513,18 @@
|
|||
width: 9vw;
|
||||
height: 3.8vw;
|
||||
color: rgba(92, 121, 146, 1);
|
||||
border-radius:1.6vw;
|
||||
border-radius:1.9vw;
|
||||
font-size: 1.8vw;
|
||||
border: 1px solid #A2B4CF;
|
||||
border: 1px solid #EDEDEF;
|
||||
margin-left: 1vw;
|
||||
}
|
||||
.quxiao{
|
||||
background: #FFFFFF;
|
||||
background: #EDEDEF;
|
||||
}
|
||||
.plsbuy-bottom-blue {
|
||||
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
|
||||
border: 1px solid rgba(3,133,250,0.34);
|
||||
background: linear-gradient(-61deg, #EAF5FF, #CBE7FF);
|
||||
color: #0385FA;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@
|
|||
|
||||
text {
|
||||
width: 6vw;
|
||||
font-weight: 300;
|
||||
font-weight: 400;
|
||||
font-size: 1.4vw;
|
||||
color: #222222;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@
|
|||
min-width: 8vw;
|
||||
height: 3.8vw;
|
||||
background: #EDEDEF;
|
||||
border-radius: 1.6vw;
|
||||
border-radius: 1.9vw;
|
||||
padding: 0 2vw;
|
||||
margin-left: 1vw;
|
||||
border: 1px solid #EDEDEF;
|
||||
|
|
@ -388,7 +388,7 @@
|
|||
|
||||
.scroltype {
|
||||
width: 100%;
|
||||
height: calc(85vh - 22vw);
|
||||
height: calc(85vh - 23vw);
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
|
||||
|
|
@ -412,7 +412,7 @@
|
|||
|
||||
.scroll-Y {
|
||||
width: 8.5vw;
|
||||
height: calc(85vh - 22vw);
|
||||
height: calc(85vh - 23vw);
|
||||
|
||||
view {
|
||||
width: 100%;
|
||||
|
|
@ -484,6 +484,7 @@
|
|||
font-size: 1.5vw;
|
||||
color: #333333;
|
||||
line-height: 2.5vw;
|
||||
margin-top: 1vw;
|
||||
}
|
||||
|
||||
.guodu {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</text>
|
||||
|
||||
<view class="title-right-big">
|
||||
{{v.totalPrice}}
|
||||
{{Number(v.totalPrice).toFixed(2)}}
|
||||
</view>
|
||||
|
||||
<!-- <image class="title-right-img" src="/static/more.png" @click="openmore(i)" /> -->
|
||||
|
|
@ -146,13 +146,13 @@
|
|||
<view>
|
||||
<view>{{v.wlName}}</view>
|
||||
<text>{{v.wlMaterialNo}}</text>
|
||||
<text>¥ <text class="q">{{v.totalPrice}}</text></text>
|
||||
<text>¥ <text class="q">{{Number(v.totalPrice).toFixed(2) }}</text></text>
|
||||
</view>
|
||||
<view>
|
||||
<text> 规格型号: {{v.wlSpecificationModel}}</text>
|
||||
</view>
|
||||
<view>
|
||||
<text>采购单价: ¥{{v.arrivalPrice?v.arrivalPrice:v.procurementPrice}}</text>
|
||||
<text>采购单价: ¥{{v.arrivalPrice?Number(v.arrivalPrice).toFixed(2) : Number(v.procurementPrice).toFixed(2) }}</text>
|
||||
<text>采购单位: {{v.wlUnits}}</text>
|
||||
</view>
|
||||
<view></view>
|
||||
|
|
@ -298,7 +298,7 @@
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 1vw;
|
||||
margin-right: 1.5vw;
|
||||
border-radius: 1.6vw;
|
||||
font-weight: 400;
|
||||
font-size: 1.6vw;
|
||||
|
|
@ -436,7 +436,7 @@
|
|||
|
||||
text {
|
||||
min-width: 3vw;
|
||||
font-weight: 300;
|
||||
font-weight: 400;
|
||||
font-size: 1.4vw;
|
||||
color: #222222;
|
||||
white-space: nowrap;
|
||||
|
|
|
|||
|
|
@ -6,16 +6,17 @@
|
|||
<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
|
||||
@click="search(0)"></image>
|
||||
</view>
|
||||
<view @click="search" class="scr">
|
||||
<view @click="search" class="scr guodu">
|
||||
检索
|
||||
</view>
|
||||
<view class="shx" @click="ification=true">
|
||||
<view class="shx guodu" @click="ification=true">
|
||||
<image src="/static/index/procurement/sx.png" mode="aspectFill"></image>
|
||||
筛选
|
||||
</view>
|
||||
<view class="shx" @click="chongzhi"
|
||||
<view class="shx guodu" @click="chongzhi"
|
||||
v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''"
|
||||
>
|
||||
<image src="/static/index/procurement/cz.png" mode="aspectFill"></image>
|
||||
重置
|
||||
</view>
|
||||
<view class="back" @click="uni.navigateBack()">
|
||||
|
|
@ -85,7 +86,7 @@
|
|||
<view class="fiedright">
|
||||
<view @click="uni.navigateTo({ url:'/pages/procurement/materialcar' })">
|
||||
<image src="/static/index/procurement/gc.png" mode="aspectFill"></image>
|
||||
<text v-if="carnum>0">{{carnum>99?'99':carnum}}</text>
|
||||
<text v-if="carnum>0">{{carnum>99?'99+':carnum}}</text>
|
||||
</view>
|
||||
<view @click="uni.navigateTo({ url:'/pages/procurement/purchaseorder' })">
|
||||
<image src="/static/index/procurement/cg.png" mode="aspectFill"></image>
|
||||
|
|
@ -187,11 +188,12 @@
|
|||
warn.pageNo=1;
|
||||
Material.value=[];
|
||||
InvoicingList.value=[];
|
||||
shoppcar();
|
||||
queryInvo();
|
||||
getWaringMaterial()
|
||||
moredex.value=0;
|
||||
shoppcar();
|
||||
shoppcar();
|
||||
queryInvo();
|
||||
getWaringMaterial()
|
||||
shoppcar();
|
||||
|
||||
}
|
||||
const carnum = ref(0)
|
||||
const shoppcar=()=>{
|
||||
|
|
@ -765,23 +767,29 @@
|
|||
image {
|
||||
width: 1.5vw;
|
||||
height: 1.3vw;
|
||||
margin: 0 0.5vw;
|
||||
margin: 0 0.5vw 0 0;
|
||||
}
|
||||
|
||||
}
|
||||
.shx:active,.scr:active{
|
||||
color: #1083F8;
|
||||
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
|
||||
border: 1px solid #1083F8;
|
||||
}
|
||||
.scr {
|
||||
border-radius: 1.65vw;
|
||||
font-weight: 400;
|
||||
font-size: 1.5vw;
|
||||
color: #1083F8;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 8vw;
|
||||
height: 3.3vw;
|
||||
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
|
||||
border: 1px solid #1083F8;
|
||||
margin: 0 0 0 1.2vw;
|
||||
background: rgba(255, 255, 255, 0.6);
|
||||
border: 1px solid #D9DADC;
|
||||
color: #555555;
|
||||
box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
|
||||
}
|
||||
|
||||
.shx {
|
||||
|
|
@ -798,6 +806,7 @@
|
|||
align-items: center;
|
||||
box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
|
||||
margin: 0 0 0 1.2vw;
|
||||
color: #555555;
|
||||
|
||||
image {
|
||||
width: 1.5vw;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
<view class="shx" @click="chongzhi"
|
||||
v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''"
|
||||
>
|
||||
<image src="/static/index/procurement/cz.png" mode="aspectFill"></image>
|
||||
重置
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -131,7 +132,12 @@
|
|||
}
|
||||
const configr=()=>{
|
||||
caigouflag.value = false;
|
||||
search(1)
|
||||
search(1);
|
||||
setTimeout(()=>{
|
||||
uni.navigateTo({
|
||||
url:'/pages/procurement/purchaseorder'
|
||||
})
|
||||
},1000)
|
||||
}
|
||||
let times = null;
|
||||
const setout = ref(true)
|
||||
|
|
@ -261,7 +267,6 @@
|
|||
view{
|
||||
width: 8vw;
|
||||
height: 3.3vw;
|
||||
border-radius: 1.6vw;
|
||||
border: 1px solid #D9DADC;
|
||||
background: rgba(255, 255, 255, 0.9);
|
||||
border-radius: 1.65vw;
|
||||
|
|
@ -272,10 +277,11 @@
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-left:0.6vw;
|
||||
color: #555555;
|
||||
image {
|
||||
width: 1.5vw;
|
||||
height: 1.3vw;
|
||||
margin: 0 0.5vw;
|
||||
width: 2vw;
|
||||
height: 2vw;
|
||||
margin: 0 0.5vw 0 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -316,31 +322,37 @@
|
|||
align-items: center;
|
||||
margin-left:0.6vw;
|
||||
image {
|
||||
width: 1.5vw;
|
||||
height: 1.3vw;
|
||||
margin: 0 0.5vw;
|
||||
width: 1.5vw !important;
|
||||
height: 1.5vw !important;
|
||||
margin: 0 0.5vw 0 0;
|
||||
}
|
||||
|
||||
}
|
||||
.shx:active,.scr:active{
|
||||
color: #1083F8;
|
||||
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
|
||||
border: 1px solid #1083F8;
|
||||
}
|
||||
.scr {
|
||||
border-radius: 1.65vw;
|
||||
font-weight: 400;
|
||||
font-size: 1.5vw;
|
||||
color: #1083F8;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 8vw;
|
||||
height: 3.3vw;
|
||||
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
|
||||
border: 1px solid #1083F8;
|
||||
margin:0 0 0 1.2vw;
|
||||
margin: 0 0 0 1.2vw;
|
||||
background: rgba(255, 255, 255, 0.6);
|
||||
border: 1px solid #D9DADC;
|
||||
color: #555555;
|
||||
box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
|
||||
}
|
||||
|
||||
|
||||
.shx {
|
||||
width: 8.2vw;
|
||||
height: 3.3vw;
|
||||
background: #FFFFFF;
|
||||
background: rgba(255, 255, 255, 0.6);
|
||||
border-radius: 1.65vw;
|
||||
border: 1px solid #D9DADC;
|
||||
font-weight: 400;
|
||||
|
|
@ -350,8 +362,9 @@
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
|
||||
margin:0 0 0 1.2vw;
|
||||
|
||||
margin: 0 0 0 1.2vw;
|
||||
color: #555555;
|
||||
|
||||
image {
|
||||
width: 1.5vw;
|
||||
height: 1.3vw;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<view class="left-menu-father">
|
||||
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
|
||||
@scrolltolower="plsbuytolower" :lower-threshold="400">
|
||||
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i)"
|
||||
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)"
|
||||
:style="{borderColor: i==lefttarget? ``:`#fff` }">
|
||||
|
||||
<view v-if="moreindex==i" class="more-father">
|
||||
|
|
@ -25,6 +25,9 @@
|
|||
作废
|
||||
</view>
|
||||
</view>
|
||||
<text style="display: block;background: #ff5757;
|
||||
position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: -0.1vw;top: -0.1vw;"
|
||||
v-if="v.izNew=='Y'"></text>
|
||||
<view class="pls-card-title">
|
||||
<view class="title-left">
|
||||
{{ v.cgdNo }}
|
||||
|
|
@ -420,7 +423,7 @@
|
|||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
|
||||
import { queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain } from './api/lunpan.js'
|
||||
import { editIzNew,queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain } from './api/lunpan.js'
|
||||
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
|
||||
import classification from './components/cgdclass.vue'
|
||||
import nomessageimge from '@/pages/procurement/components/nomessage.vue';
|
||||
|
|
@ -495,14 +498,14 @@
|
|||
if (!plzinfo.canpull) return
|
||||
queryCgdList(plzinfo).then((res : any) => {
|
||||
plsbuy.value.push(...res.result.records)
|
||||
|
||||
clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
|
||||
if (res.result.records.length < plzinfo.pageSize) {
|
||||
plzinfo.canpull = false;
|
||||
}
|
||||
})
|
||||
}
|
||||
const lefttarget = ref(0);
|
||||
const clickLeftMenu = (index : any) => {
|
||||
const clickLeftMenu = (index : any , item:object) => {
|
||||
let num = Math.ceil((index + 1))
|
||||
leftscrolltop.value = (num - 2) * 186;
|
||||
lefttarget.value = index;
|
||||
|
|
@ -510,6 +513,10 @@
|
|||
form.pageNo = 1
|
||||
form.canpull = true;
|
||||
queryInvo();
|
||||
if(item.izNew=='Y'){
|
||||
item.izNew='N'
|
||||
editIzNew({id:item.id})
|
||||
}
|
||||
}
|
||||
const showvalue = ref({
|
||||
materialImg: "",
|
||||
|
|
@ -584,6 +591,7 @@
|
|||
plzinfo.pageNo = 1;
|
||||
plsbuy.value = [];
|
||||
queryCgdList(plzinfo).then((res : any) => {
|
||||
console.log(res.result.records)
|
||||
plsbuy.value.push(...res.result.records)
|
||||
if (res.result.records.length) {
|
||||
form.cgdId = plsbuy.value[0].id
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 826 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 980 B |
|
|
@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
|
||||
export {
|
||||
camera as default
|
||||
};
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
export {
|
||||
fullcamera as default
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue