合并代码

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

View File

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

View File

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

View File

@ -8,10 +8,6 @@
<view class="big-img-text">
暂无服务指令
</view>
<!-- <view class="juzhong">
<donghua :width="`1200rpx`" :height="`600rpx`" :links="blueArray" :playing="photoplay"
:loop="true" :interval="120" />
</view> -->
</view>
</view>
<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':''"
:style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></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"
:duration="500" :current="current2" @change="change">
<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`"
mode="heightFix" />
</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 class="server-name">
{{ indexmessage?.directiveName }}
@ -175,7 +163,6 @@
</view>
</view>
<view class="right-menu">
<!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`" /> -->
<view class="right-scroll">
<view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;"
@click="zhixing(1,indexmessage)">
@ -196,14 +183,12 @@
</view>
</view>
</view>
<!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`" /> -->
</view>
</view>
</swiper-item>
</swiper>
</view>
<!-- <tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </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="photowall" v-show="zdxzdex>0" :style="zdxzdex?{opacity:1}:{opacity:0}" v-if="zdxzdex">
@ -234,12 +219,7 @@
</view>
</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 class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view>
@ -290,13 +270,6 @@
</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>
</scroll-view>
<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;"
@ -307,8 +280,6 @@
</view>
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
<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>
</view>
</template>
@ -325,7 +296,7 @@
const topbuttontarget = ref(0);
const ilanarr = ref([]);
const listobj = ref({});
// const photoplay = ref(false)
const serverUrl = ref(uni.getStorageSync('imagebase'))
const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
@ -334,7 +305,7 @@
const autoplay = ref(false)
const severcards = ref<InstanceType<typeof ChildComponent>>()
const init = (e) => {
// console.log("",e)
firstgetqueryCgdList(e);
setTimeout(() => {
severcards.value.firstgetqueryCgdList()
@ -362,10 +333,7 @@
let timestampMs = new Date(obj.endTime).getTime();
let times = new Date().getTime();
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);
if (djstinme.value < 0) {
plsbuy.value[current.value].chaoshitime = true
@ -390,7 +358,7 @@
}
current.value += e;
current2.value = current.value
// console.log(current.value, current.value)
}
const form = reactive({
pageNo: 1,
@ -401,7 +369,6 @@
})
onMounted(() => {
setTimeout(() => {
// photoplay.value = true;
current.value = 0;
}, 500)
})
@ -413,18 +380,11 @@
openerror.value = true
return
}
// else {
// font.value = '~'
// open.value = 3
// return
// }
//
queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => {
console.log(res)
zdxzarr.value = res.result;
zdxzarr.value.forEach(item => {
item.flag = false
// console.log(item.headPath)
})
zdxzdex.value = e;
})
@ -432,9 +392,7 @@
const plsbuy = ref([])
const flag = ref(false)
const zdwu = (e, k) => {
// console.log("使",zdxzdex.value)
if (zdxzdex.value == 1) {
// console.log("???????",e.flag)
e.flag = !e.flag;
zdxzarr.value.forEach((item, i) => {
if (i != k) {
@ -547,7 +505,6 @@
return result;
}
const clickLeftMenu = (index : any, item : object) => {
// console.log("/////")
queryOrderInfoList({ mainId: item.id }).then(res => {
if (res.result.length > 0) {
res.result.forEach((item, i) => {
@ -555,7 +512,6 @@
item.match = splitString(item.directiveName)
})
plsbuy.value[index].servebao = res.result
// console.log("",plsbuy.value)
}
})
}
@ -771,9 +727,9 @@
}
const ends = () => {
console.log("看看传的", { id: endobj.value.id })
// console.log("", { id: endobj.value.id })
endOrder({ id: endobj.value.id }).then(res => {
console.log(res)
// console.log(res)
if (res.success) {
open.value = 0;
endobj.value = {};
@ -1260,6 +1216,7 @@
margin-right: 10rpx;
font-weight: 600;
margin-top: 1vw;
z-index: 1;
}
.server-bgc {
@ -1805,7 +1762,7 @@
margin-bottom: 20rpx;
.photowall-name {
font-size: 38rpx;
font-size: 35rpx;
// font-weight: 600;
}
@ -1995,7 +1952,7 @@
.tittop {
height: 2vw;
font-weight: 400;
font-size: 1.4vw;
font-size: 35rpx;
color: #333333;
display: flex;
align-items: center;
@ -2054,6 +2011,7 @@
border: 2px solid #f8f8f8;
width: 16.5vw;
margin-right: 1.6vw;;
margin-bottom: 1.6vw;
height: 17vw;
border-radius: 1.1vw;
background: #fff;

View File

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

View File

@ -737,7 +737,6 @@
({{ splitString(postitem.directiveName)[1]}})
</view>
<view class="card-time">
<view class="weight-time">
{{ postitem.startTime }}
<text style="margin: 0 3rpx;">
@ -816,7 +815,6 @@
const nextpageing = ref(false)
let nextPageTimer = null
//
onBeforeUnmount(() => {
if (nextPageTimer) {
@ -828,12 +826,10 @@
if (oldVal[0] === 2) {
// true
nextpageing.value = true
//
if (nextPageTimer) {
clearTimeout(nextPageTimer)
}
// 1 false
nextPageTimer = setTimeout(() => {
nextpageing.value = false
@ -854,7 +850,6 @@
{ deep: true });
watch(() => props.canmove, (newVal, oldVal) => {
if (oldVal === false && newVal === true) {
// console.log("")
isTuoing.value = false;
canmovechange.value = true;
if (props.isblue == 1) {
@ -863,7 +858,6 @@
getNew()
}
else if (props.isblue == 3) {
// console.log("", postitem.value)
isDelete.value = true;
deletedonghua.value = false;
setTimeout(() => deletedonghua.value = true, 50)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,7 +3,7 @@
<view class="serchs">
<view class="leftbtn">
<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"
@click="search(0)"></image>
</view>

View File

@ -133,19 +133,19 @@
</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">
<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<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">
<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<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">
<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<view>暂无数据</view>
@ -1705,6 +1705,7 @@
display: flex;
justify-content: center;
align-items: center;
}
.contain-right-nomessage {