Compare commits

..

No commits in common. "cab92e207eceab52bf6f959787fdb076fdcd6f23" and "3cb1d8b7edc202ad3cb8a624868f049c5c4df553" have entirely different histories.

6 changed files with 24 additions and 109 deletions

View File

@ -108,12 +108,3 @@ export const voidedCgdMain = (params) => {
data: params,
})
}
//修改库房物料是否启用
export const updateWarehouserEnabled = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/updateWarehouserEnabled`,
method: 'post',
data: params,
})
}

View File

@ -48,13 +48,11 @@
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scrolltop" class="scroll-Y"
@scrolltolower="scrolltolower" :lower-threshold="200" @scroll="scrollview">
<view class="boxitem" v-for="(v,i) in InvoicingList" :key='i'
:class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i,'ty':v.izEnabled=='1'}"
:class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i}"
@click="shopclick(i)">
<view>
{{v.materialName}}
</view>
<view>采购单位 {{v.materialUnits}}</view>
<view>{{v.materialName}}</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}">
<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill"
@ -230,11 +228,9 @@
<view class="rightcont">
<view>
<text>{{caigouobj.materialName}}</text>
<view class="swsh guodu" :class="caigouobj.izEnabled=='0'?'act':''" @click="caiswitchshyp(caigouobj.izEnabled,caigouobj.id)">
<view class="swsh guodu" :class="shyp?'act':''" @click="switchshyp">
<view class="guodu"></view>
</view>
<view style="margin-left: 5rpx;white-space: nowrap;">{{caigouobj.izEnabled_dictText}}</view>
</view>
<view>
<view>物料编码: {{caigouobj.materialNo}}</view>
@ -344,17 +340,7 @@
</view>
<view class="mengban" v-if="wlxq" @click="qingkong"></view>
<view class="wuliao guodu" :class="wlxq?'':'uncrkcard'">
<view class="name">
<view>{{wuliaoobj.materialName}}</view>
<view>
<view class="swsh guodu" :class="caigouobj.izEnabled=='0'?'act':''"
@click="caiswitchshyp(caigouobj.izEnabled,caigouobj.id)">
<view class="guodu"></view>
</view>
<text>{{caigouobj.izEnabled_dictText}}</text>
</view>
</view>
<view class="name">{{wuliaoobj.materialName}}</view>
<view class="znk tp">
<image class="crkcard-img"
:src="wuliaoobj.materialImg?serverUrl + wuliaoobj.materialImg : '/static/index/warehouse/procurement/k.png'"
@ -403,7 +389,7 @@
<script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
import { queryInvoicingList,updateWarehouserEnabled, getMaterialTreeData, queryNuInfoByNuId, updateKfstatus,queryWlInfoByWlId,addShoppingCartList,queryShoppingCartList } from './api/lunpan.js'
import { queryInvoicingList, getMaterialTreeData, queryNuInfoByNuId, updateKfstatus,queryWlInfoByWlId,addShoppingCartList,queryShoppingCartList } from './api/lunpan.js'
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import shadowview from './components/ShadowView.vue';
import calculator from './components/calculator.vue';
@ -457,23 +443,6 @@
}
})
}
const caiswitchshyp = (code:string,id:string,s:string) =>{
let obj = {
id:id,
izEnabled: code=='0' ? '1' : '0'
}
updateWarehouserEnabled(obj).then(res => {
if (res.success) {
caigouobj.value.izEnabled = (code=='0' ? '1' : '0');
caigouobj.value.izEnabled_dictText = (code =='0' ? '停用' : '启用');
} else {
uni.showToast({
icon: 'error',
title: res.message
})
}
})
}
const shopclick = (i : number, k : number) => {
if (k == 2) {
let num = Math.ceil((i + 1) / 2)
@ -740,16 +709,6 @@
gysarr.value = [];
caigouobj.value = InvoicingList.value[shopitem.value];
caigouobj.value.Limitnum = Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl);
if(shyp.value==false){
uni.showToast({
icon:'none',
title:'该仓库已关闭,无法采购~'
})
setTimeout(()=>{
anmidex.value = -1;
},1000)
return
}
let n = [];
let id = [];
n = caigouobj.value.suppliers_dictText.split(/[, ]+/);
@ -766,9 +725,8 @@
anmidex.value = -1;
break;
case 3:
caigouobj.value = InvoicingList.value[shopitem.value];
let obj = {
wlId:caigouobj.value.wlId,
wlId:InvoicingList.value[shopitem.value].wlId,
nuId:form.nuId
}
queryWlInfoByWlId(obj).then(res=>{
@ -799,13 +757,6 @@
const timers = ref(true)
const connfig = () =>{
if(timers.value==false){return}
if(caigouobj.value.izEnabled=='1'){
uni.showToast({
icon:'none',
title:'该物料已关闭,无法采购~'
})
return
}
timers.value=false;
let dt = {
nuId:form.nuId,
@ -1016,29 +967,11 @@
.name {
width: 100%;
font-weight: bold;
font-size: 1.4vw;
color: #212327;
height: 3vw;
display: flex;
justify-content: space-between;
align-items: center;
view{
>&:nth-child(1){
width: 80%;
height: 3vw;
font-weight: bold;
font-size: 1.4vw;
color: #212327;
line-height: 1.5vw;
}
>&:nth-child(2){
width: 20%;
display: flex;
flex-direction: column;
align-items: center;
text{
color: #333;
}
}
}
line-height: 1.5vw;
}
}
@ -2020,7 +1953,7 @@
background: rgba(255, 255, 255, .7);
border-radius: 1.6vw;
margin: 0 1.3vw 1.2vw 0;
border: 2px solid #fff;
border: 2px dashed #fff;
display: inline-block;
padding: 2.3vw;
position: relative;
@ -2043,16 +1976,13 @@
&:nth-child(1) {
color: #333;
width: 100%;
display: flex;
justify-content: space-between;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-weight: bold;
font-size: 1.5vw;
color: #333;
white-space: nowrap;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
}
&:nth-child(2) {
@ -2154,18 +2084,10 @@
}
}
.ty{
background: #e8e9ed !important;
border: 2px solid #f5f5f5;
view{
color: #666666 !important;
}
}
.active {
border: 2px dashed #017DE9 !important;
}
.swsh {
width: 2.7vw;
height: 1.5vw;

View File

@ -587,7 +587,9 @@
}
const queryInvo = () => {
// console.log("form", form)
queryCgdInfoList(form).then(res => {
queryCgdInfoList(form).then(res => {
console.log(form)
console.log(res.result)
InvoicingList.value.push(...res.result.records);
// console.log("chu", InvoicingList.value)
detailform.wlId = InvoicingList.value[0].wlId

View File

@ -575,7 +575,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/pages/camera.nvue"]]);
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
export {
camera as default
};

View File

@ -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/pages/fullcamera.nvue"]]);
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/fullcamera.nvue"]]);
export {
fullcamera as default
};

File diff suppressed because one or more lines are too long