yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:73333560cf90505d7a612f0e65ff37b3960b7bad
Branches Tags
yangjun:main
..
compare: yangjun:b9d43fe9df3185b3ad0676922420b1a9dacccac2
Branches Tags
yangjun:main

No commits in common. "73333560cf90505d7a612f0e65ff37b3960b7bad" and "b9d43fe9df3185b3ad0676922420b1a9dacccac2" have entirely different histories.
73333560cf ... b9d43fe9df

10 changed files with 43 additions and 99 deletions
Show Stats Expand all files Collapse all files

3
pages.json
View File

@ -200,9 +200,6 @@
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : ""
} }
},
{
"path" : "pages/Warehouse/warehome"
} }
// { // {

7
pages/Warehouse/api/lunpan.js
View File

@ -209,10 +209,3 @@ export const queryPickingRecordList = (params) => {
data: params data: params
}) })
} }
export const editIzNew = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
method: 'post',
data: params,
})
}

86
pages/Warehouse/picking.vue
View File

@ -512,12 +512,8 @@
<view class="left-menu-father"> <view class="left-menu-father">
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop" <scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
@scrolltolower="plsbuytolower" :lower-threshold="400"> @scrolltolower="plsbuytolower" :lower-threshold="400">
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)" <view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i)"
:style="{borderColor: i==lefttarget? ``:`#fff` }"> :style="{borderColor: i==lefttarget? ``:`#fff` }">
<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="pls-card-title">
<view class="title-left"> <view class="title-left">
{{ v.cgdNo }} {{ v.cgdNo }}
@ -567,57 +563,50 @@
</view> </view>
<view class="middle-heng-father"> <view class="middle-heng-father">
<view class="middle-heng"></view> <view class="middle-heng"></view>
<view class="middle-heng" <!-- <view class="middle-heng"
style="border-radius: 20rpx;width: 105%;margin-left: -5%;"> style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view> </view> -->
<view class="middle-heng" v-if="Number(v.status)>=1" <view class="middle-heng" v-if="Number(v.status)==1"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;"> style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view> </view>
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
<view class="middle-ball" <view class="middle-ball"
:style="Number(v.status)>=1?{backgroundColor: `#1083F8`}:{} "> :style="Number(v.status)==1?{backgroundColor: `#1083F8`}:{} ">
</view>
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<view class="middle-ball"
:style="Number(v.status)==1?{backgroundColor: `#1083F8`}:{} ">
</view> </view>
<!-- <view class="middle-ball"
:style="Number(v.status)>=1?{backgroundColor: `#1083F8`}:{} ">
</view> -->
</view> </view>
<view class="end-font"> <view class="end-font">
<!-- <view class="" <!-- <view class=""
:style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} "> :style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} ">
拣货 拣货
</view> --> </view> -->
<view class="" :style="Number(v.status)==1?{color: `#1083F8`}:{}">
<view class="" :style="Number(v.status)>=1?{color: `#1083F8`}:{}">
拣货 拣货
</view> </view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>=1 && v.jhBy"> <view style="font-size: 25rpx;" v-if="Number(v.status)==1 && v.jhBy">
{{ "[ " + v.jhBy + " ]" }} {{ "[ " + v.jhBy + " ]" }}
</view> </view>
</view> </view>
</view> </view>
<view class="pls-card-middle-one"> <view class="pls-card-middle-one">
<view class="middle-title"> <view class="middle-title">
{{ Number(v.status)>=2 ? v.wjTime?.slice(0,10) :""}}
</view>
</view>
<view class="middle-heng-father"> <view class="middle-heng-father">
<view class="middle-heng" <view class="middle-heng"
style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;"> style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
</view> </view>
<view class="middle-heng" v-if="Number(v.status)>=2"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;"> <view class="middle-ball">
</view>
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
<view class="middle-ball"
:style="Number(v.status)>=2?{backgroundColor: `#1083F8`}:{} ">
</view> </view>
</view> </view>
<view class="end-font"> <view class="end-font">
<view :style="Number(v.status)>=2?{color: `#1083F8`}:{}"> <view class="">
完结 完结
</view> </view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>=2 && v.wjBy"> <view class="">
{{ "[ " + v.wjBy + " ]" }}
</view> </view>
</view> </view>
</view> </view>
@ -1085,7 +1074,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue'; import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue';
import { editIzNew,queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js' import { queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import calendar from '@/component/public/calendar.vue' import calendar from '@/component/public/calendar.vue'
import superpicker from '@/component/public/superpicker.vue' import superpicker from '@/component/public/superpicker.vue'
@ -1331,7 +1320,7 @@
const searchValue = ref(""); const searchValue = ref("");
const middletarget = ref(0); const middletarget = ref(0);
const tagesstatues = ["待入库", "待完结", '已完结']; const tagesstatues = ["待入库", "待完结"];
const topbuttontarget = ref(-1); const topbuttontarget = ref(-1);
@ -1347,7 +1336,7 @@
startTime: "", startTime: "",
endTime: "", endTime: "",
cgBy: "", cgBy: "",
nuId: uni.getStorageSync('nuId') nuId:uni.getStorageSync('nuId')
}) })
const mobanplzinfo = { const mobanplzinfo = {
pageNo: 1, pageNo: 1,
@ -1359,7 +1348,7 @@
startTime: "", startTime: "",
endTime: "", endTime: "",
cgBy: "", cgBy: "",
nuId: uni.getStorageSync('nuId') nuId:uni.getStorageSync('nuId')
} }
// 销毁日历 // 销毁日历
const xiaohui = ref(true); const xiaohui = ref(true);
@ -1431,7 +1420,7 @@
}) })
} }
const lefttarget = ref(0); const lefttarget = ref(0);
const clickLeftMenu = (index : any,item:any) => { const clickLeftMenu = (index : any) => {
let num = Math.ceil((index + 1)) let num = Math.ceil((index + 1))
leftscrolltop.value = (num - 2) * 186; leftscrolltop.value = (num - 2) * 186;
lefttarget.value = index; lefttarget.value = index;
@ -1447,11 +1436,6 @@
clickmiddle(0); clickmiddle(0);
} }
}) })
if (item.izNew == 'Y') {
item.izNew = 'N'
editIzNew({ id: item.id })
}
} }
const showvalue = ref({ const showvalue = ref({
materialImg: "", materialImg: "",
@ -1519,6 +1503,7 @@
const InvoicingList = ref([]) const InvoicingList = ref([])
const queryInvo = (index : number) => { const queryInvo = (index : number) => {
queryCgdInfoList(form).then(res => { queryCgdInfoList(form).then(res => {
console.log(res.result.records)
InvoicingList.value = res.result.records; InvoicingList.value = res.result.records;
clickmiddle(index); clickmiddle(index);
}) })
@ -1688,7 +1673,7 @@
filePath: e, filePath: e,
name: 'file', name: 'file',
formData: { formData: {
biz: year + '/' + month + '/sxdPic' biz: 'sxdPic/' + year + '/' + month
}, },
header: { header: {
'X-Access-Token': uni.getStorageSync('token') 'X-Access-Token': uni.getStorageSync('token')
@ -1857,22 +1842,16 @@
cgdId: showvalue.value.cgdId cgdId: showvalue.value.cgdId
} }
pickingInfo(obj).then(res => { pickingInfo(obj).then(res => {
console.log(res)
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: res.message ? res.message : '操作成功' title: res.message
}) })
if (res.success) { albumlist.value = [];
console.log(res.result.cgdInfo) addupimg.value = [];
console.log(plsbuy.value[lefttarget.value]) openjianhuo.value = false;
albumlist.value = []; open.value = 0;
addupimg.value = []; form.cgdId = plsbuy.value[lefttarget.value].id;
openjianhuo.value = false; queryInvo(middletarget.value)
open.value = 0;
form.cgdId = plsbuy.value[lefttarget.value].id;
plsbuy.value[lefttarget.value] = res.result.cgdInfo;
queryInvo(middletarget.value)
}
}) })
} }
const addupimg = ref([]) const addupimg = ref([])
@ -1890,7 +1869,7 @@
filePath: item, filePath: item,
name: 'file', name: 'file',
formData: { formData: {
biz: year + '/' + month + '/jhPic' biz: 'jhPic/' + year + '/' + month
}, },
header: { header: {
'X-Access-Token': uni.getStorageSync('token') 'X-Access-Token': uni.getStorageSync('token')
@ -3198,7 +3177,6 @@
height: 67vh; height: 67vh;
display: flex; display: flex;
margin-top: 20rpx; margin-top: 20rpx;
.photowall-other-one { .photowall-other-one {
width: 28.5%; width: 28.5%;
height: 430rpx; height: 430rpx;

22
pages/Warehouse/warehome.vue
View File

@ -1,22 +0,0 @@
<template>
<view>
<view class="home tp"> <image src="/static/index/warehouse/home/Back2.jpg"></image></view>
</view>
</template>
<script setup lang="ts">
</script>
<style scoped lang="less">
.home{
width: 100vw;
height: 100vh;
}
.tp {
image{
width: 100%;
height: 100%;
}
}
</style>

13
pages/procurement/components/details.vue
View File

@ -2,12 +2,12 @@
<view> <view>
<view class="qbkyj" v-if="show"> <view class="qbkyj" v-if="show">
<view class="titletop">详情</view> <view class="titletop">详情</view>
<view scroll-y="true" class="crdcroll" scroll-with-animation <scroll-view scroll-y="true" class="crdcroll" scroll-with-animation
@scrolltolower="scrolltolower"> @scrolltolower="scrolltolower">
<view class="fler"> <view class="fler">
<scroll-view class="carditem guodu" v-for="(v,index) in InvoicingList" :key="index" <scroll-view class="carditem guodu" v-for="(v,index) in InvoicingList" :key="index"
@touchend="handleTouchEnd($event,v,index)" @touchstart="touchstart($event,v,index)" @touchend="handleTouchEnd($event,v,index)" @touchstart="touchstart($event,v,index)"
scroll-with-animation scroll-x="true" :scroll-left="v.scrollleft" > scroll-with-animation scroll-x="true" :scroll-left="v.scrollleft" @scroll="scroll($event,v)">
<view class="speitem guodu" :class="v.zk?'spleft':''"> <view class="speitem guodu" :class="v.zk?'spleft':''">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image> <image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
<view class="cardp"> <view class="cardp">
@ -61,7 +61,10 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
</view> <view style="height:3vw;width: 100%;display: flex;align-items: center;justify-content: center;">
<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>6"/>
</view>
</scroll-view>
</view> </view>
</view> </view>
</template> </template>
@ -103,7 +106,7 @@
v.scrollleft = 0 v.scrollleft = 0
}else{ }else{
v.zk = true; v.zk = true;
v.scrollleft = 180; v.scrollleft = 150;
} }
solleft(v,i) solleft(v,i)
} }
@ -141,7 +144,7 @@
caigouobj.value.Limitnum = Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl); caigouobj.value.Limitnum = Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl);
caigouobj.value.index = i; caigouobj.value.index = i;
v.zk = x>pageX.value?false:true; v.zk = x>pageX.value?false:true;
v.scrollleft = v.zk?180 : 0; v.scrollleft = v.zk?150 : 0;
} }
const solleft =(v:any,i:number)=>{ const solleft =(v:any,i:number)=>{

1
pages/procurement/material.vue
View File

@ -264,7 +264,6 @@
queryInvo(); queryInvo();
} }
const queryInvo = () => { const queryInvo = () => {
console.log(form)
queryInvoicingList(form).then(res => { queryInvoicingList(form).then(res => {
res.result.records.forEach(item=>{ res.result.records.forEach(item=>{
item.zk = false; item.zk = false;

4
pages/procurement/purchaseorder.vue
View File

@ -513,9 +513,7 @@
if (!plzinfo.canpull) return if (!plzinfo.canpull) return
queryCgdList(plzinfo).then((res : any) => { queryCgdList(plzinfo).then((res : any) => {
plsbuy.value.push(...res.result.records) plsbuy.value.push(...res.result.records)
if(plzinfo.pageNo==1){ clickLeftMenu(lefttarget.value, plsbuy.value[lefttarget.value])
clickLeftMenu(lefttarget.value, plsbuy.value[lefttarget.value])
}
if (res.result.records.length < plzinfo.pageSize) { if (res.result.records.length < plzinfo.pageSize) {
plzinfo.canpull = false; plzinfo.canpull = false;
} }

6
pages/watch/index.vue
View File

@ -696,6 +696,7 @@
handleKey(type) handleKey(type)
} }
const savetypeNow = ref(0); const savetypeNow = ref(0);
const doubleclick = () => { const doubleclick = () => {
savetypeNow.value = leftTargetIndex.value savetypeNow.value = leftTargetIndex.value
uni.setStorageSync('nuId', filteredMenu.value[savetypeNow.value].nuId); uni.setStorageSync('nuId', filteredMenu.value[savetypeNow.value].nuId);
@ -762,11 +763,8 @@
}) })
} else if (typeNow.value === 2) { } else if (typeNow.value === 2) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/Warehouse/Warehouse', url: '/pages/Warehouse/Warehouse'
}) })
// uni.navigateTo({
// url: '/pages/Warehouse/warehome',
// })
} }
break break

BIN
static/index/warehouse/home/Back2.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 100 KiB

BIN
static/index/warehouse/home/warehouse.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 266 KiB