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

合并一下

This commit is contained in:
Teng 2025-11-21 14:45:52 +08:00
parent 202a63ab24
commit 042b049cf9
6 changed files with 159 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pages/Warehouse/picking.vue
View File

@ -480,7 +480,7 @@
placeholder="采购单号/采购日期/供应商" @confirm="search()" /> placeholder="采购单号/采购日期/供应商" @confirm="search()" />
<image v-show="plzinfo.cgdParamInfo" class="title-input-img" src="@/static/x.png" <image v-show="plzinfo.cgdParamInfo" class="title-input-img" src="@/static/x.png"
@click="plzinfo.cgdParamInfo='';search()" /> @click="plzinfo.cgdParamInfo='';search()" />
<view class="title-input-button" @click="search()"> <view :class="jiansuotarget?`title-input-button-target`:`title-input-button`" @click="search();getdonghua()">
检索 检索
</view> </view>
<view class="filter"> <view class="filter">
@ -2013,6 +2013,13 @@
onUnmounted(() => { onUnmounted(() => {
if (timer) clearInterval(timer); if (timer) clearInterval(timer);
}); });
const jiansuotarget = ref(false);
const getdonghua = () => {
jiansuotarget.value = true;
setTimeout(()=>{
jiansuotarget.value = false;
},200)
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@ -2208,6 +2215,20 @@
align-items: center; align-items: center;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.1); box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.1);
} }
.title-input-button-target {
width: 20%;
margin-left: 2%;
height: 5vh;
border-radius: 40rpx;
font-size: 28rpx;
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
border: 1px solid #1083F8;
color: #1083F8;
display: flex;
justify-content: center;
align-items: center;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.1);
}
} }
.statues-father { .statues-father {

9
pages/login/login.vue
View File

@ -133,7 +133,7 @@
</view> </view>
<view class=""> <view class="">
<view class="small-father"> <view class="small-father">
<view class="small-select" v-for="(item,index) in allserve" @click="changeServe(item.serverUrl)"> <view class="small-select" v-for="(item,index) in allserve" @click="changeServe(item)">
{{ item.departName }} {{ item.departName }}
</view> </view>
</view> </view>
@ -206,6 +206,7 @@
if (res.result.code == `0`) { if (res.result.code == `0`) {
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);
allserve.value = res.result.orgList allserve.value = res.result.orgList
time.value = Date.now(); time.value = Date.now();
@ -216,6 +217,7 @@
}) })
} else { } else {
uni.setStorageSync('serverUrl', ""); uni.setStorageSync('serverUrl', "");
uni.setStorageSync('orgListName', "");
allserve.value = []; allserve.value = [];
uni.showToast({ uni.showToast({
title: res.result.msg, title: res.result.msg,
@ -276,8 +278,9 @@
}, 500) }, 500)
} }
} }
const changeServe = (url : string) => { const changeServe = (item : any) => {
uni.setStorageSync('serverUrl', url); uni.setStorageSync('serverUrl', item.serverUrl);
uni.setStorageSync('orgListName', item.departName);
setTimeout(() => { setTimeout(() => {
jumpTo(`/pages/watch/index`) jumpTo(`/pages/watch/index`)
}, 500) }, 500)

6
pages/procurement/components/carditem.vue
View File

@ -24,11 +24,11 @@
<text style="white-space: nowrap;"> 规格型号: {{v.specificationModel}}</text> <text style="white-space: nowrap;"> 规格型号: {{v.specificationModel}}</text>
</view> </view>
<view> <view>
<text v-if="v.multiUnitType=='1'">采购单价: ￥{{v.oneUnitPrice}} </text> <text v-if="v.multiUnitType=='1'">采购单价: ￥{{Number(v.oneUnitPrice).toFixed(2) }} </text>
<text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text> <text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text>
<text v-if="v.multiUnitType=='2'">采购单价: ￥{{v.twoUnitPrice}} </text> <text v-if="v.multiUnitType=='2'">采购单价: ￥{{Number(v.twoUnitPrice).toFixed(2) }} </text>
<text v-if="v.multiUnitType=='2'">采购单位: {{ v.twoUnit}}</text> <text v-if="v.multiUnitType=='2'">采购单位: {{ v.twoUnit}}</text>
<text v-if="v.multiUnitType=='3'">采购单价: ￥{{v.referenceUnitPrice}} </text> <text v-if="v.multiUnitType=='3'">采购单价: ￥{{ Number(v.referenceUnitPrice).toFixed(2)}} </text>
<text v-if="v.multiUnitType=='3'">采购单位: {{ v.materialUnits}}</text> <text v-if="v.multiUnitType=='3'">采购单位: {{ v.materialUnits}}</text>
</view> </view>
<view> <view>

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

@ -29,7 +29,7 @@
<text style="white-space: nowrap;"> 规格型号: {{v.wlSpecificationModel}}</text> <text style="white-space: nowrap;"> 规格型号: {{v.wlSpecificationModel}}</text>
</view> </view>
<view> <view>
<text>采购单价: ￥{{v.referenceUnitPrice}}</text> <text>采购单价: ￥{{Number(v.referenceUnitPrice).toFixed(2) }}</text>
<text>采购单位: {{v.wlUnits}}</text> <text>采购单位: {{v.wlUnits}}</text>
</view> </view>
<view> <view>

155
pages/procurement/purchaseorder.vue
View File

@ -7,9 +7,9 @@
placeholder="采购单号/采购日期/供应商" @confirm="search()" /> placeholder="采购单号/采购日期/供应商" @confirm="search()" />
<image v-show="plzinfo.cgdParamInfo" class="title-input-img" src="@/static/x.png" <image v-show="plzinfo.cgdParamInfo" class="title-input-img" src="@/static/x.png"
@click="plzinfo.cgdParamInfo=``;search()" /> @click="plzinfo.cgdParamInfo=``;search()" />
<view class="title-input-button" @click="search()"> <button :class="jiansuotarget?`title-input-button-target`:`title-input-button`" @click="search();getdonghua()">
检索 检索
</view> </button>
</view> </view>
<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"
@ -35,7 +35,7 @@
</text> </text>
<view class="title-right-big"> <view class="title-right-big">
{{ v.totalPrice }} {{ Number(v.totalPrice ).toFixed(2) }}
</view> </view>
<image class="title-right-img" src="/static/more.png" @click="openmore(i)" /> <image class="title-right-img" src="/static/more.png" @click="openmore(i)" />
@ -355,7 +355,7 @@
</text> </text>
<text class="dollar-text"> <text class="dollar-text">
{{plsbuy[lefttarget]?.totalPrice}} {{Number(plsbuy[lefttarget]?.totalPrice).toFixed(2) }}
</text> </text>
</view> </view>
<view class="caigou-font"> <view class="caigou-font">
@ -368,16 +368,31 @@
<view class="share-bottom"> <view class="share-bottom">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<image class="share-bottom-img" src="/static/index/youngman.png"></image> <image class="share-bottom-img" src="/static/index/youngman.png"></image>
<view class="share-name"> <view style="margin-left: -20rpx;margin-top: 10rpx;">
{{ plsbuy[lefttarget]?.createBy_dictText }} <view style="display: flex;">
<view class="share-name">
{{ uni.getStorageSync('realname') }}
</view>
<view class="share-font">
采购人
</view>
</view>
<view class="share-phone">
{{ uni.getStorageSync('username') }}
</view>
</view> </view>
<view class="share-font">
采购人
</view>
<view class="company-father">
<view class="company">
{{ uni.getStorageSync('orgListName') }}
</view>
<view class="blue-button" @click="clickshare">
分享
</view> </view>
</view> </view>
<view class="blue-button" @click="clickshare">
分享
</view>
</view> </view>
</view> </view>
</view> </view>
@ -423,13 +438,13 @@
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
canpull: true, canpull: true,
cgdParamInfo:"" cgdParamInfo: ""
}) })
const mobanplzinfo = { const mobanplzinfo = {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
canpull: true, canpull: true,
cgdParamInfo:"" cgdParamInfo: ""
} }
const leftscrolltop = ref(0) const leftscrolltop = ref(0)
@ -438,7 +453,7 @@
const firstgetqueryCgdList = () => { const firstgetqueryCgdList = () => {
queryCgdList(plzinfo).then((res : any) => { queryCgdList(plzinfo).then((res : any) => {
plsbuy.value.push(...res.result.records) plsbuy.value.push(...res.result.records)
// console.log("zzzz", plsbuy.value) console.log("zzzz", plsbuy.value)
if (!res.result.total) { if (!res.result.total) {
nomessageshow.value = true; nomessageshow.value = true;
} }
@ -510,8 +525,8 @@
wlUpperLimit: "", wlUpperLimit: "",
wlLowerLimit: "", wlLowerLimit: "",
suppliersName: "", suppliersName: "",
categoryId_dictText:"", categoryId_dictText: "",
typeId_dictText:"", typeId_dictText: "",
}) })
const goback = () => { const goback = () => {
@ -550,7 +565,7 @@
const InvoicingList = ref([]) const InvoicingList = ref([])
const queryInvo = () => { const queryInvo = () => {
queryCgdInfoList(form).then(res => { queryCgdInfoList(form).then(res => {
console.log(res.result.records,form) // console.log(res.result.records,form)
InvoicingList.value = []; InvoicingList.value = [];
InvoicingList.value.push(...res.result.records); InvoicingList.value.push(...res.result.records);
clickmiddle(middletarget.value); clickmiddle(middletarget.value);
@ -611,7 +626,7 @@
provider: "weixin", provider: "weixin",
scene: "WXSceneSession", scene: "WXSceneSession",
type: 0, type: 0,
href: "https://www.baidu.com/", href: `${uni.getStorageSync('serverUrl')}/h5/advisoryInfo`,
title: "采购单分享", title: "采购单分享",
summary: "采购单", summary: "采购单",
imageUrl: "https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png", imageUrl: "https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png",
@ -659,6 +674,13 @@
} }
}) })
} }
const jiansuotarget = ref(false);
const getdonghua = () => {
jiansuotarget.value = true;
setTimeout(()=>{
jiansuotarget.value = false;
},200)
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@ -696,14 +718,28 @@
margin-left: 2%; margin-left: 2%;
height: 5vh; height: 5vh;
border-radius: 40rpx; border-radius: 40rpx;
font-size: 30rpx; font-size: 28rpx;
background: linear-gradient(to bottom, #e7f4ff, #c5e5ff); background-color: #fff;
border: 2rpx solid #9AD1FF; border: 1rpx solid #D9DADC;
color: #007CFF; color: #555555;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
-webkit-tap-highlight-color: transparent; box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.1);
}
.title-input-button-target {
width: 20%;
margin-left: 2%;
height: 5vh;
border-radius: 40rpx;
font-size: 28rpx;
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
border: 1px solid #1083F8;
color: #1083F8;
display: flex;
justify-content: center;
align-items: center;
box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.1);
} }
} }
@ -1172,7 +1208,9 @@
z-index: 1; z-index: 1;
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 50rpx; padding: 70rpx;
padding-top: 60rpx;
// padding-top: 70rpx;
position: relative; position: relative;
.share-main { .share-main {
@ -1181,23 +1219,48 @@
.share-weight { .share-weight {
font-weight: 600; font-weight: 600;
font-size: 30rpx; font-size: 36rpx;
margin-bottom: 13rpx;
} }
.share-font { .share-font {
color: #666666; color: #666666;
font-size: 30rpx; font-size: 30rpx;
margin-top: 20rpx; margin-top: 7rpx;
width: 450rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.right-flex {
margin-top: -7rpx;
color: #666666;
.dollar-text {
margin-left: -5rpx;
font-weight: 600;
font-size: 55rpx;
}
.caigou-font {
font-size: 23rpx;
color: #888D99;
text-align: end;
} }
} }
} }
.popup-share-content { .popup-share-content {
position: absolute; position: absolute;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 1000rpx; width: 900rpx;
height: 500rpx; height: 480rpx;
background-color: #fff; background-color: #fff;
border-radius: 30rpx; border-radius: 30rpx;
transition: opacity 0.4s ease; transition: opacity 0.4s ease;
@ -1276,21 +1339,29 @@
width: 100%; width: 100%;
padding: 0 50rpx; padding: 0 50rpx;
height: 120rpx; height: 120rpx;
bottom: 70rpx; bottom: 90rpx;
left: 0; left: 0;
display: flex; display: flex;
justify-content: space-between; justify-content: center;
align-items: center; align-items: space-between;
flex-direction: column;
.share-bottom-img { .share-bottom-img {
width: 150rpx; width: 150rpx;
height: 140rpx; height: 140rpx;
} }
.share-phone {
color: #888D99;
margin-left: 15rpx;
// margin-top: 7rpx;
font-size: 30rpx;
}
.share-name { .share-name {
margin: 0 20rpx; margin: 0 15rpx;
font-size: 35rpx; font-size: 35rpx;
color: #555555; color: #666666;
font-weight: 600; font-weight: 600;
} }
@ -1299,10 +1370,24 @@
margin-top: 10rpx; margin-top: 10rpx;
font-size: 24rpx; font-size: 24rpx;
} }
.company-father {
width: 100%;
display: flex;
// align-items: center;
justify-content: space-between;
}
.company {
color: #888D99;
margin-top: 10rpx;
margin-left: 10rpx;
font-size: 30rpx;
}
} }
.blue-button { .blue-button {
margin-top: 60rpx; margin-top: -30rpx;
width: 150rpx; width: 150rpx;
height: 70rpx; height: 70rpx;
border-radius: 40rpx; border-radius: 40rpx;
@ -1405,4 +1490,6 @@
font-size: 35rpx; font-size: 35rpx;
} }
} }
</style> </style>

10
pages/watch/settings/settings.vue
View File

@ -49,7 +49,7 @@
注销登录 注销登录
</view> </view>
<view class="text-center"> <view class="text-center">
<view>长春市朝阳区久泰开运养老服务有限公司</view> <view>{{ uni.getStorageSync('orgListName') }}</view>
</view> </view>
<exit :show="exitshow" @close="exitshow=false" /> <exit :show="exitshow" @close="exitshow=false" />
@ -80,7 +80,7 @@
<view class="small-father"> <view class="small-father">
<view class="small-select" <view class="small-select"
:style="serverUrl==item.serverUrl?{color:`#0083FF`,borderColor:`#0083FF`}:{}" :style="serverUrl==item.serverUrl?{color:`#0083FF`,borderColor:`#0083FF`}:{}"
v-for="(item,index) in allserve" @click="changeServe(item.serverUrl)"> v-for="(item,index) in allserve" @click="changeServe(item)">
{{ item.departName }} {{ item.departName }}
</view> </view>
</view> </view>
@ -113,8 +113,9 @@
const selectserve = ref(false) const selectserve = ref(false)
const allserve = ref(uni.getStorageSync('orgList')) const allserve = ref(uni.getStorageSync('orgList'))
const changeServe = (url : string) => { const changeServe = (item:any) => {
uni.setStorageSync('serverUrl', url); uni.setStorageSync('serverUrl', item.serverUrl);
uni.setStorageSync('orgListName', item.departName);
uni.showToast({ uni.showToast({
title: '切换机构成功', title: '切换机构成功',
icon: 'success', // 无图标，仅文字 icon: 'success', // 无图标，仅文字
@ -346,6 +347,7 @@
.text-center { .text-center {
margin-top: 40rpx; margin-top: 40rpx;
height: 60rpx;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;