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

合并代码

This commit is contained in:
Teng 2026-03-06 16:34:16 +08:00
parent 44f6ae31f6
commit ca60f4fca7
14 changed files with 42 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
component/public/huakuai.vue
View File

@ -149,7 +149,6 @@ function onEnd() {
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
// console.log("????", originX.value)
emit('success') emit('success')
} else { } else {
offsetX.value = 0 offsetX.value = 0
@ -166,10 +165,8 @@ onMounted(() => {
'https://www.focusnu.com/media/directive/login/0.png', 'https://www.focusnu.com/media/directive/login/0.png',
'https://www.focusnu.com/media/directive/login/1.png', 'https://www.focusnu.com/media/directive/login/1.png',
'https://www.focusnu.com/media/directive/login/2.png', 'https://www.focusnu.com/media/directive/login/2.png',
// 'https://www.focusnu.com/media/directive/login/3.png'
] ]
bgImage.value = images[Math.floor(Math.random() * images.length)] bgImage.value = images[Math.floor(Math.random() * images.length)]
console.log('加载图片:', bgImage.value)
}) })
</script> </script>

6
pages/NursingNew/component/index.vue
View File

@ -1240,7 +1240,7 @@
.submit { .submit {
width: 100%; width: 100%;
height: 3.2vw; height: 3.2vw;
margin-top: 0.4vw; margin-top: 6vw;
padding-right: 0.2vw; padding-right: 0.2vw;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@ -1362,7 +1362,7 @@
.tittop { .tittop {
height: 2vw; height: 2vw;
font-weight: 400; font-weight: 400;
font-size: 1.5vw; font-size: 35rpx;
color: #333333; color: #333333;
display: flex; display: flex;
align-items: center; align-items: center;
@ -1458,7 +1458,7 @@
.tittop { .tittop {
height: 2vw; height: 2vw;
font-weight: 400; font-weight: 400;
font-size: 1.4vw; font-size: 35rpx;
color: #333333; color: #333333;
display: flex; display: flex;
align-items: center; align-items: center;

62
pages/NursingNew/component/leftcontent/serveswipe.vue
View File

@ -8,10 +8,6 @@
<view class="big-img-text"> <view class="big-img-text">
暂无服务指令 暂无服务指令
</view> </view>
<!-- <view class="juzhong">
<donghua :width="`1200rpx`" :height="`600rpx`" :links="blueArray" :playing="photoplay"
:loop="true" :interval="120" />
</view> -->
</view> </view>
</view> </view>
<view class="btn les" @click="swip(-1)" v-if="plsbuy.length>1"> <view class="btn les" @click="swip(-1)" v-if="plsbuy.length>1">
@ -25,12 +21,6 @@
<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''" <view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"
:style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view> :style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view>
</view> </view>
<!-- <view class="swipeservwe-bgc">
<view class="juzhong" style="top: 25%;">
<donghua :width="`1200rpx`" :height="`600rpx`" :links="blueArray" :playing="photoplay"
:loop="true" :interval="120" />
</view>
</view> -->
<swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="autoplay" :interval="3000" <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="autoplay" :interval="3000"
:duration="500" :current="current2" @change="change"> :duration="500" :current="current2" @change="change">
<swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper"> <swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper">
@ -113,8 +103,6 @@
:src="indexmessage?.previewFile? serverUrl + indexmessage?.previewFile: `/static/index/noorder1.png`" :src="indexmessage?.previewFile? serverUrl + indexmessage?.previewFile: `/static/index/noorder1.png`"
mode="heightFix" /> mode="heightFix" />
</view> </view>
<!-- <image class="big-img" style="width: 320rpx;top:25%;height: 320rpx;" src="/static/index/noorder.png"
mode="aspectFill" /> -->
<view style="display: flex;align-items: center; "> <view style="display: flex;align-items: center; ">
<view class="server-name"> <view class="server-name">
{{ indexmessage?.directiveName }} {{ indexmessage?.directiveName }}
@ -175,7 +163,6 @@
</view> </view>
</view> </view>
<view class="right-menu"> <view class="right-menu">
<!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`" /> -->
<view class="right-scroll"> <view class="right-scroll">
<view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;" <view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;"
@click="zhixing(1,indexmessage)"> @click="zhixing(1,indexmessage)">
@ -196,14 +183,12 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`" /> -->
</view> </view>
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<!-- <tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </tanchuang> -->
<tanchuang :show="open==3" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang> <tanchuang :show="open==3" font="是否结束服务指令？" @back="open = 0" @right="ends()"> </tanchuang>
<view class="mengban" v-if="zdxzdex>0" @click="zdxzdex=0"></view> <view class="mengban" v-if="zdxzdex>0" @click="zdxzdex=0"></view>
<view class="photowall" v-show="zdxzdex>0" :style="zdxzdex?{opacity:1}:{opacity:0}" v-if="zdxzdex"> <view class="photowall" v-show="zdxzdex>0" :style="zdxzdex?{opacity:1}:{opacity:0}" v-if="zdxzdex">
@ -234,12 +219,7 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<!-- <view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;" >
<view v-if="flag" class="lanbt" @click="zhixingsub" >确定</view>
<view v-if="!flag" class="huibt">确定</view>
</view> -->
</view> </view>
<view class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view> <view class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view>
@ -290,13 +270,6 @@
</view> </view>
</view> </view>
<!-- <view class="noarray" v-if="!ilanarr.length">
<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
mode="aspectFill" />
<view class="noarray-font">
暂无照片
</view>
</view> -->
</view> </view>
</scroll-view> </scroll-view>
<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;" <view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;"
@ -307,8 +280,6 @@
</view> </view>
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang> <tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;" /> <errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;" />
<!-- <tanchuang :show="open==3" :font="font" @back="open = 0" @right="del1()" :close="false"> </tanchuang> -->
<severcard ref="severcards"></severcard> <severcard ref="severcards"></severcard>
</view> </view>
</template> </template>
@ -325,7 +296,7 @@
const topbuttontarget = ref(0); const topbuttontarget = ref(0);
const ilanarr = ref([]); const ilanarr = ref([]);
const listobj = ref({}); const listobj = ref({});
// const photoplay = ref(false)
const serverUrl = ref(uni.getStorageSync('imagebase')) const serverUrl = ref(uni.getStorageSync('imagebase'))
const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/') const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
@ -334,7 +305,7 @@
const autoplay = ref(false) const autoplay = ref(false)
const severcards = ref<InstanceType<typeof ChildComponent>>() const severcards = ref<InstanceType<typeof ChildComponent>>()
const init = (e) => { const init = (e) => {
// console.log("啥啊",e)
firstgetqueryCgdList(e); firstgetqueryCgdList(e);
setTimeout(() => { setTimeout(() => {
severcards.value.firstgetqueryCgdList() severcards.value.firstgetqueryCgdList()
@ -362,10 +333,7 @@
let timestampMs = new Date(obj.endTime).getTime(); let timestampMs = new Date(obj.endTime).getTime();
let times = new Date().getTime(); let times = new Date().getTime();
let djs = timestampMs - times; let djs = timestampMs - times;
// let timeendamp = timestampMs + (Number(plsbuy.value[current.value].timeoutDuration)*60);
console.log(timestampMs, '结束时间戳')
console.log(times, '当前时间戳')
console.log(Math.round(djs / 1000), '倒计时时间戳')
djstinme.value = Math.round(djs / 1000); djstinme.value = Math.round(djs / 1000);
if (djstinme.value < 0) { if (djstinme.value < 0) {
plsbuy.value[current.value].chaoshitime = true plsbuy.value[current.value].chaoshitime = true
@ -390,7 +358,7 @@
} }
current.value += e; current.value += e;
current2.value = current.value current2.value = current.value
// console.log(current.value, current.value)
} }
const form = reactive({ const form = reactive({
pageNo: 1, pageNo: 1,
@ -401,7 +369,6 @@
}) })
onMounted(() => { onMounted(() => {
setTimeout(() => { setTimeout(() => {
// photoplay.value = true;
current.value = 0; current.value = 0;
}, 500) }, 500)
}) })
@ -413,18 +380,11 @@
openerror.value = true openerror.value = true
return return
} }
// else {
// font.value = '敬请期待~'
// open.value = 3
// return
// }
// 打包过不了校验 // 打包过不了校验
queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => { queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => {
console.log(res)
zdxzarr.value = res.result; zdxzarr.value = res.result;
zdxzarr.value.forEach(item => { zdxzarr.value.forEach(item => {
item.flag = false item.flag = false
// console.log(item.headPath)
}) })
zdxzdex.value = e; zdxzdex.value = e;
}) })
@ -432,9 +392,7 @@
const plsbuy = ref([]) const plsbuy = ref([])
const flag = ref(false) const flag = ref(false)
const zdwu = (e, k) => { const zdwu = (e, k) => {
// console.log("点完咋不好使啊",zdxzdex.value)
if (zdxzdex.value == 1) { if (zdxzdex.value == 1) {
// console.log("???????",e.flag)
e.flag = !e.flag; e.flag = !e.flag;
zdxzarr.value.forEach((item, i) => { zdxzarr.value.forEach((item, i) => {
if (i != k) { if (i != k) {
@ -547,7 +505,6 @@
return result; return result;
} }
const clickLeftMenu = (index : any, item : object) => { const clickLeftMenu = (index : any, item : object) => {
// console.log("/////")
queryOrderInfoList({ mainId: item.id }).then(res => { queryOrderInfoList({ mainId: item.id }).then(res => {
if (res.result.length > 0) { if (res.result.length > 0) {
res.result.forEach((item, i) => { res.result.forEach((item, i) => {
@ -555,7 +512,6 @@
item.match = splitString(item.directiveName) item.match = splitString(item.directiveName)
}) })
plsbuy.value[index].servebao = res.result plsbuy.value[index].servebao = res.result
// console.log("啥",plsbuy.value)
} }
}) })
} }
@ -771,9 +727,9 @@
} }
const ends = () => { const ends = () => {
console.log("看看传的", { id: endobj.value.id }) // console.log("看看传的", { id: endobj.value.id })
endOrder({ id: endobj.value.id }).then(res => { endOrder({ id: endobj.value.id }).then(res => {
console.log(res) // console.log(res)
if (res.success) { if (res.success) {
open.value = 0; open.value = 0;
endobj.value = {}; endobj.value = {};
@ -1260,6 +1216,7 @@
margin-right: 10rpx; margin-right: 10rpx;
font-weight: 600; font-weight: 600;
margin-top: 1vw; margin-top: 1vw;
z-index: 1;
} }
.server-bgc { .server-bgc {
@ -1805,7 +1762,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
.photowall-name { .photowall-name {
font-size: 38rpx; font-size: 35rpx;
// font-weight: 600; // font-weight: 600;
} }
@ -1995,7 +1952,7 @@
.tittop { .tittop {
height: 2vw; height: 2vw;
font-weight: 400; font-weight: 400;
font-size: 1.4vw; font-size: 35rpx;
color: #333333; color: #333333;
display: flex; display: flex;
align-items: center; align-items: center;
@ -2054,6 +2011,7 @@
border: 2px solid #f8f8f8; border: 2px solid #f8f8f8;
width: 16.5vw; width: 16.5vw;
margin-right: 1.6vw;; margin-right: 1.6vw;;
margin-bottom: 1.6vw;
height: 17vw; height: 17vw;
border-radius: 1.1vw; border-radius: 1.1vw;
background: #fff; background: #fff;

6
pages/NursingNew/component/nurse/bigindex.vue
View File

@ -281,8 +281,7 @@
<view style="margin-left: 5rpx;"> <view style="margin-left: 5rpx;">
<view class="history-name"> <view class="history-name">
{{ splitString(item.directiveName)[0]}} {{ splitString(item.directiveName)[0]}}
<text <text style="font-size: 23rpx;font-weight: 400;"
style="font-size: 23rpx;font-weight: 400;"
v-if="splitString(item.directiveName)[1]"> v-if="splitString(item.directiveName)[1]">
({{ splitString(item.directiveName)[1]}}) ({{ splitString(item.directiveName)[1]}})
</text> </text>
@ -323,8 +322,7 @@
<view style="margin-left: 5rpx;"> <view style="margin-left: 5rpx;">
<view class="history-name"> <view class="history-name">
{{ splitString(item.directiveName)[0]}} {{ splitString(item.directiveName)[0]}}
<text <text style="font-size: 20rpx;font-weight: 400;"
style="font-size: 20rpx;font-weight: 400;"
v-if="splitString(item.directiveName)[1]"> v-if="splitString(item.directiveName)[1]">
({{ splitString(item.directiveName)[1]}}) ({{ splitString(item.directiveName)[1]}})
</text> </text>

6
pages/NursingNew/component/nurse/newindex.vue
View File

@ -737,7 +737,6 @@
({{ splitString(postitem.directiveName)[1]}}) ({{ splitString(postitem.directiveName)[1]}})
</view> </view>
<view class="card-time"> <view class="card-time">
<view class="weight-time"> <view class="weight-time">
{{ postitem.startTime }} {{ postitem.startTime }}
<text style="margin: 0 3rpx;"> <text style="margin: 0 3rpx;">
@ -816,7 +815,6 @@
const nextpageing = ref(false) const nextpageing = ref(false)
let nextPageTimer = null let nextPageTimer = null
// 组件卸载时清理 // 组件卸载时清理
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (nextPageTimer) { if (nextPageTimer) {
@ -828,12 +826,10 @@
if (oldVal[0] === 2) { if (oldVal[0] === 2) {
// 每次触发都立即设为 true // 每次触发都立即设为 true
nextpageing.value = true nextpageing.value = true
// 重置定时器（如果已有） // 重置定时器（如果已有）
if (nextPageTimer) { if (nextPageTimer) {
clearTimeout(nextPageTimer) clearTimeout(nextPageTimer)
} }
// 1 秒后如果未再次触发则设为 false // 1 秒后如果未再次触发则设为 false
nextPageTimer = setTimeout(() => { nextPageTimer = setTimeout(() => {
nextpageing.value = false nextpageing.value = false
@ -854,7 +850,6 @@
{ deep: true }); { deep: true });
watch(() => props.canmove, (newVal, oldVal) => { watch(() => props.canmove, (newVal, oldVal) => {
if (oldVal === false && newVal === true) { if (oldVal === false && newVal === true) {
// console.log("结束")
isTuoing.value = false; isTuoing.value = false;
canmovechange.value = true; canmovechange.value = true;
if (props.isblue == 1) { if (props.isblue == 1) {
@ -863,7 +858,6 @@
getNew() getNew()
} }
else if (props.isblue == 3) { else if (props.isblue == 3) {
// console.log("删除这个", postitem.value)
isDelete.value = true; isDelete.value = true;
deletedonghua.value = false; deletedonghua.value = false;
setTimeout(() => deletedonghua.value = true, 50) setTimeout(() => deletedonghua.value = true, 50)

8
pages/Warehouse/finish.vue
View File

@ -1429,7 +1429,7 @@
const lefttarget = ref(0); const lefttarget = ref(0);
const clickLeftMenu = (index : any, item : any) => { const clickLeftMenu = (index : any, item : any) => {
let num = Math.ceil((index + 1)) let num = Math.ceil((index + 1))
leftscrolltop.value = (num - 2) * 188.5; leftscrolltop.value = (num - 2) * 198;
lefttarget.value = index; lefttarget.value = index;
form.cgdId = plsbuy.value[index].id form.cgdId = plsbuy.value[index].id
form.pageNo = 1 form.pageNo = 1
@ -2275,11 +2275,9 @@
.left-menu-father { .left-menu-father {
margin-top: 10rpx; margin-top: 10rpx;
height: 90vh; height: 91vh;
max-width: 590rpx; max-width: 590rpx;
min-width: 590rpx; min-width: 590rpx;
// background-color: blue;
// background-color: red;
.left-menu-scroll { .left-menu-scroll {
height: 100%; height: 100%;
@ -2287,7 +2285,7 @@
.pls-card { .pls-card {
width: 100%; width: 100%;
height: 358rpx; height: 390rpx;
border: transparent 3rpx solid; border: transparent 3rpx solid;
background-color: #fff; background-color: #fff;
border-radius: 40rpx; border-radius: 40rpx;

4
pages/Warehouse/index/component/index.vue
View File

@ -1249,7 +1249,7 @@
.submit { .submit {
width: 100%; width: 100%;
height: 3.2vw; height: 3.2vw;
margin-top: 0.4vw; margin-top: 6vw;
padding-right: 0.2vw; padding-right: 0.2vw;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@ -1371,7 +1371,7 @@
.tittop { .tittop {
height: 2vw; height: 2vw;
font-weight: 400; font-weight: 400;
font-size: 1.5vw; font-size: 35rpx;
color: #333333; color: #333333;
display: flex; display: flex;
align-items: center; align-items: center;

2
pages/Warehouse/picking.vue
View File

@ -129,7 +129,7 @@
物料信息 物料信息
</view> </view>
<view style="font-weight: 600;font-size: 40rpx;color: #555555;"> <view style="font-weight: 600;font-size: 40rpx;color: #555555;">
￥{{showvalue.totalPrice}} ￥{{Number(showvalue.totalPrice).toFixed(2)}}
</view> </view>
</view> </view>
<view style="display: flex;margin-top: 10rpx;"> <view style="display: flex;margin-top: 10rpx;">

31
pages/login/login.vue
View File

@ -114,9 +114,7 @@
<input class="password" :password="false" v-model="changeform.newpassword" maxlength="15" <input class="password" :password="false" v-model="changeform.newpassword" maxlength="15"
placeholder="请再次输入新密码" /> placeholder="请再次输入新密码" />
</view> </view>
<view class="blue-button" style="margin-top: 80rpx;" @click="openchange=false">确定</view> <view class="blue-button" style="margin-top: 80rpx;" @click="openchange=false">确定</view>
</view> </view>
</view> </view>
<!-- 自动更新组件 --> <!-- 自动更新组件 -->
@ -220,7 +218,6 @@
const getImg = () => { const getImg = () => {
if (/^\d{11}$/.test(form.username)) { if (/^\d{11}$/.test(form.username)) {
isRel(form.username).then((res : any) => { isRel(form.username).then((res : any) => {
console.log("啥啊", res.result)
if (res.result.code == `0`) { if (res.result.code == `0`) {
if(!res.result.orgList.length){ if(!res.result.orgList.length){
uni.showToast({ uni.showToast({
@ -230,17 +227,14 @@
}) })
return return
} }
// console.log("又咋了啊")
uni.setStorageSync('serverUrl', res.result.orgList[0].serverUrl); uni.setStorageSync('serverUrl', res.result.orgList[0].serverUrl);
uni.setStorageSync('orgList', res.result.orgList); uni.setStorageSync('orgList', res.result.orgList);
uni.setStorageSync('orgListName', res.result.orgList[0].departName); uni.setStorageSync('orgListName', res.result.orgList[0].departName);
uni.setStorageSync('orgListCode', res.result.orgList[0].orgCode); uni.setStorageSync('orgListCode', res.result.orgList[0].orgCode);
allserve.value = res.result.orgList allserve.value = res.result.orgList
time.value = Date.now(); time.value = Date.now();
getLoginCode(time.value).then((res : any) => { getLoginCode(time.value).then((res : any) => {
console.log("获取验证码", res)
form.captcha = res.message form.captcha = res.message
canclick.value = true canclick.value = true
}) })
@ -257,7 +251,6 @@
}) })
canclick.value = false; canclick.value = false;
} }
}) })
} else { } else {
if (form.username) { if (form.username) {
@ -276,7 +269,6 @@
const login = () => { const login = () => {
if (isTarget.value) { if (isTarget.value) {
huakuaiOpen.value = true; huakuaiOpen.value = true;
} else { } else {
openbottom.value = true; openbottom.value = true;
} }
@ -293,15 +285,12 @@
} }
jumpFirst.value = true; jumpFirst.value = true;
} }
} }
const loading = ref(0) const loading = ref(0)
const selectserve = ref(false); const selectserve = ref(false);
const huakuaiOK = () => { const huakuaiOK = () => {
uni.setStorageSync('form', form); uni.setStorageSync('form', form);
if (allserve.value.length > 1) { if (allserve.value.length > 1) {
// console.log("aaaaaa");
huakuaiOpen.value = false; huakuaiOpen.value = false;
selectserve.value = true; selectserve.value = true;
} else { } else {
@ -314,22 +303,16 @@
uni.setStorageSync('serverUrl', item.serverUrl); uni.setStorageSync('serverUrl', item.serverUrl);
uni.setStorageSync('orgListName', item.departName); uni.setStorageSync('orgListName', item.departName);
uni.setStorageSync('orgListCode', item.orgCode); uni.setStorageSync('orgListCode', item.orgCode);
setTimeout(() => { setTimeout(() => {
// gotoindex()
getLoginCode(time.value).then((res : any) => { getLoginCode(time.value).then((res : any) => {
console.log("啥啊", res,index)
form.captcha = res.message form.captcha = res.message
if (index) { if (index) {
loginApp(form).then(res => { loginApp(form).then(res => {
if (res.success) { if (res.success) {
uni.setStorageSync('token', res.result.token); uni.setStorageSync('token', res.result.token);
uni.setStorageSync('username', form.username); uni.setStorageSync('username', form.username);
uni.setStorageSync('realname', res.result.userInfo.realname); uni.setStorageSync('realname', res.result.userInfo.realname);
uni.setStorageSync('userInfo', res.result.userInfo); uni.setStorageSync('userInfo', res.result.userInfo);
gotoindex() gotoindex()
} else { } else {
uni.showToast({ uni.showToast({
@ -343,15 +326,12 @@
gotoindex() gotoindex()
} }
}) })
}, 500) }, 500)
} }
const huakuaisuccess = () => { const huakuaisuccess = () => {
form.checkKey = time.value form.checkKey = time.value
huakuaiOpen.value = false huakuaiOpen.value = false
loginApp(form).then(res => { loginApp(form).then(res => {
console.log("没有id吗",res)
if (res.success) { if (res.success) {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
@ -362,7 +342,6 @@
uni.setStorageSync('username', form.username); uni.setStorageSync('username', form.username);
uni.setStorageSync('realname', res.result.userInfo.realname); uni.setStorageSync('realname', res.result.userInfo.realname);
uni.setStorageSync('userInfo', res.result.userInfo); uni.setStorageSync('userInfo', res.result.userInfo);
// huakuaiOK()
if (loading.value === 2) { if (loading.value === 2) {
huakuaiOK() huakuaiOK()
} else { } else {
@ -377,14 +356,6 @@
} }
}) })
} }
// // 生命周期钩子
// onLoad(() => {
// });
// // 生命周期钩子
// onShow(() => {
// });
function init() { function init() {
var monitorModule = uni.requireNativePlugin("MonitorModule") var monitorModule = uni.requireNativePlugin("MonitorModule")
@ -558,7 +529,6 @@
margin-left: 30rpx; margin-left: 30rpx;
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
// margin-top: 50rpx;
} }
.popup-wrapper { .popup-wrapper {
@ -671,7 +641,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
} }
.box { .box {

22
pages/procurement/components/nomessage.vue
View File

@ -27,10 +27,10 @@
<style scoped lang="less"> <style scoped lang="less">
.que { .que {
position: fixed; position: fixed;
top: 12%; top: 0%;
left: 0; left: 9%;
width: 100%; width: 91%;
height: 88%; height: 100%;
z-index: 100; z-index: 100;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
@ -51,12 +51,12 @@
} }
} }
.left-top-white{ .left-top-white{
position: fixed; // position: fixed;
top: 0; // top: 0;
left: 0; // left: 0;
height: 12%; // height: 12%;
width: 50%; // width: 50%;
background-color: #fff; // background-color: #fff;
z-index: 100; // z-index: 100;
} }
</style> </style>

2
pages/procurement/components/purorder.vue
View File

@ -494,9 +494,9 @@
margin: 0.8vw auto 0.25vw; margin: 0.8vw auto 0.25vw;
padding: 0.2vw; padding: 0.2vw;
background: #fff; background: #fff;
border-radius: 1.1vw;
>image { >image {
border-radius: 1vw;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }

6
pages/procurement/material.vue
View File

@ -215,7 +215,7 @@
queryInvoicingList(form).then(res => { queryInvoicingList(form).then(res => {
if (res.result.records.length) { if (res.result.records.length) {
shownomessage.value = false; shownomessage.value = false;
} else { } else if(!InvoicingList.value.length){
shownomessage.value = true; shownomessage.value = true;
} }
res.result.records.forEach(item => { res.result.records.forEach(item => {
@ -463,6 +463,8 @@
dhbl: type.num dhbl: type.num
} }
addShoppingCartList([dt]).then(res => { addShoppingCartList([dt]).then(res => {
console.log("啥啊",[dt])
console.log("返回啥啊",res)
if (res.success) { if (res.success) {
uni.showToast({ uni.showToast({
icon: res.success ? 'success' : 'none', icon: res.success ? 'success' : 'none',
@ -912,7 +914,7 @@
line-height: 1.75vw; line-height: 1.75vw;
position: absolute; position: absolute;
top: 0.8vw; top: 0.8vw;
right: 0.8vw; left: 0.8vw;
} }
image { image {

2
pages/procurement/materialcar.vue
View File

@ -3,7 +3,7 @@
<view class="serchs"> <view class="serchs">
<view class="leftbtn"> <view class="leftbtn">
<view class="ipt"> <view class="ipt">
<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search(0)" /> <input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search" />
<image class="title-input-img" src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo" <image class="title-input-img" src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
@click="search(0)"></image> @click="search(0)"></image>
</view> </view>

7
pages/procurement/purchaseorder.vue
View File

@ -133,19 +133,19 @@
</view> </view>
</view> </view>
</view> </view>
<view class="pls-card center" v-if="plsbuy.length===1&&!shownomessage"> <view class="pls-card center" style="border-color: #fff;" v-if="plsbuy.length===1&&!shownomessage">
<view class="que"> <view class="que">
<image src="/static/index/procurement/que.png" mode="aspectFill"></image> <image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<view>暂无数据</view> <view>暂无数据</view>
</view> </view>
</view> </view>
<view class="pls-card center" v-if="plsbuy.length===1&&!shownomessage"> <view class="pls-card center" style="border-color: #fff;" v-if="plsbuy.length===1&&!shownomessage">
<view class="que"> <view class="que">
<image src="/static/index/procurement/que.png" mode="aspectFill"></image> <image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<view>暂无数据</view> <view>暂无数据</view>
</view> </view>
</view> </view>
<view class="pls-card center" v-if="plsbuy.length===2&&!shownomessage"> <view class="pls-card center" style="border-color: #fff;" v-if="plsbuy.length===2&&!shownomessage">
<view class="que"> <view class="que">
<image src="/static/index/procurement/que.png" mode="aspectFill"></image> <image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<view>暂无数据</view> <view>暂无数据</view>
@ -1705,6 +1705,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.contain-right-nomessage { .contain-right-nomessage {