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-20 10:50:29 +08:00
parent 7e9ec5d6f9
commit 44b339e2d2
4 changed files with 86 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/Warehouse/picking.vue
View File

@ -809,9 +809,9 @@
{{showvalue.categoryId_dictText}} {{showvalue.categoryId_dictText}}
</view> </view>
<view class="tags-one" v-if="showvalue.typeId_dictText">{{showvalue.typeId_dictText}}</view> <view class="tags-one" v-if="showvalue.typeId_dictText">{{showvalue.typeId_dictText}}</view>
<view class="tags-one" v-if="showvalue.medicationId_dictText"> <!-- <view class="tags-one" v-if="showvalue.medicationId_dictText">
{{showvalue.medicationId_dictText}} {{showvalue.medicationId_dictText}}
</view> </view> -->
</view> </view>
</view> </view>
<view class="right-bottom-right"> <view class="right-bottom-right">

122
pages/procurement/purchaseorder.vue
View File

@ -3,10 +3,10 @@
<view v-show="moreindex!=-1" class="mengban" @click="moreindex=-1"></view> <view v-show="moreindex!=-1" class="mengban" @click="moreindex=-1"></view>
<view class="contain-left"> <view class="contain-left">
<view class="title-input-father"> <view class="title-input-father">
<input class="title-input" type="text" v-model="searchValue" maxlength="15" placeholder="采购单号/采购日期/供应商" <input class="title-input" type="text" v-model="plzinfo.cgdParamInfo" maxlength="15"
@confirm="search()" /> placeholder="采购单号/采购日期/供应商" @confirm="search()" />
<image v-show="searchValue" class="title-input-img" src="@/static/x.png" <image v-show="plzinfo.cgdParamInfo" class="title-input-img" src="@/static/x.png"
@click="searchValue='';search()" /> @click="plzinfo.cgdParamInfo=``;search()" />
<view class="title-input-button" @click="search()"> <view class="title-input-button" @click="search()">
检索 检索
</view> </view>
@ -45,68 +45,103 @@
<view class="pls-card-middle"> <view class="pls-card-middle">
<view class="pls-card-middle-one"> <view class="pls-card-middle-one">
<view class="middle-title"> <view class="middle-title">
{{ v.createTime?.split(' ')[0] }} {{ v.qgDate }}
</view> </view>
<view class="middle-heng-father"> <view class="middle-heng-father">
<view class="middle-heng" <view class="middle-heng"
style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view> style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view>
<view class="middle-heng" v-if="Number(v.status)<3 " <view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;">
style="border-radius: 20rpx;background-color: #1083F8;"></view> </view>
<view class="middle-ball" <!-- <view class="middle-heng" v-if="Number(v.status)<3 "
:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view> style="border-radius: 20rpx;background-color: #1083F8;"></view> -->
<!-- <view class="middle-ball"
:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view> -->
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
</view> </view>
<view class="end-font"> <view class="end-font">
<view class="" :style="Number(v.status)<3?{color: `#1083F8`}:{} "> <!-- <view class="" :style="Number(v.status)<3?{color: `#1083F8`}:{} ">
采购
</view> -->
<view class="" :style="{color: `#1083F8`}">
采购 采购
</view> </view>
<view class=""> <view style="font-size: 25rpx;">
[ {{ v.createBy_dictText }} ] {{ "[ " + v.qgBy + " ]" }}
</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">
{{ v.jhTime?.slice(0,10) }}
</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" v-if="Number(v.status)<3 && Number(v.status)>0 " <!-- <view class="middle-heng"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view> -->
<view class="middle-heng" v-if="Number(v.status)>0"
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" <view class="middle-ball"
:style="Number(v.status)<3 && Number(v.status)>0?{backgroundColor: `#1083F8`}:{} "> :style="Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
</view>
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<view class="middle-ball"
:style="Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
</view> </view>
</view> </view>
<view class="end-font"> <view class="end-font">
<view class="" <view class="" :style="Number(v.status)>0?{color: `#1083F8`}:{}">
:style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} ">
拣货 拣货
</view> </view>
<view class=""> <view style="font-size: 25rpx;" v-if="Number(v.status)>0 && 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">
{{ 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"></view>
style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;"> <!-- <view class="middle-heng"
</view> style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
<view class="middle-heng" v-if="Number(v.status)<3 && Number(v.status)>1 " </view> -->
<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" <view class="middle-ball"
:style="Number(v.status)<3 && 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> </view>
<view class="end-font"> <view class="end-font">
<view class="" <view class="" :style="Number(v.status)>1?{color: `#1083F8`}:{}">
:style="Number(v.status)<3 && Number(v.status)>1?{color: `#1083F8`}:{} "> 完结
</view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy">
{{ "[ " + v.wjBy + " ]" }}
</view>
</view>
<!-- <view class="middle-heng-father">
<view class="middle-heng"
style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
</view>
<view class="middle-ball">
</view>
</view>
<view class="end-font">
<view class="">
完结 完结
</view> </view>
<view class=""> <view class="">
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
<view class="pls-card-end"> <view class="pls-card-end">
@ -116,8 +151,12 @@
{{ v.gysName }} {{ v.gysName }}
</view> </view>
</view> </view>
<view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`"> <!-- <view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`">
{{ v?.cgdType=='9' ?`已作废`:`已确定` }} {{ v?.cgdType=='9' ?`已作废`:`已确定` }}
</view> -->
<view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`">
{{ v?.cgdType=='9' ?`已作废`:tagesstatues[Number(v.status)] }}
</view> </view>
</view> </view>
</view> </view>
@ -127,7 +166,8 @@
<view class="white-zhezhao"></view> <view class="white-zhezhao"></view>
<view class="contain-right"> <view class="contain-right">
<view class="contain-right-title"> <view class="contain-right-title">
<view class="contain-right-button" style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;" @click="ification=true"> <view class="contain-right-button" style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;"
@click="ification=true">
<image class="buttont-img" src="/static/index/purchaseorder/select.png" /> <image class="buttont-img" src="/static/index/purchaseorder/select.png" />
<view class="button-font"> <view class="button-font">
筛选 筛选
@ -141,7 +181,7 @@
</view> </view>
</view> </view>
<view class="contain-right-middle"> <view class="contain-right-middle">
<scroll-view scroll-y="true" class="middle-Y" > <scroll-view scroll-y="true" class="middle-Y">
<view class="middle-Y-father"> <view class="middle-Y-father">
<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i' <view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
:style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent'}" :style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent'}"
@ -179,9 +219,9 @@
<view class="tags-one"> <view class="tags-one">
{{ showvalue?.typeId_dictText }} {{ showvalue?.typeId_dictText }}
</view> </view>
<view class="tags-one"> <!-- <view class="tags-one">
{{ showvalue?.tagName }} {{ showvalue?.tagName }}
</view> </view> -->
</view> </view>
</view> </view>
@ -356,7 +396,8 @@
</view> </view>
</view> </view>
<view class="mengban" v-if="ification" @click="ification = false"></view> <view class="mengban" v-if="ification" @click="ification = false"></view>
<classification @confirm="confirm" :show="ification" :typenum="2" :cgdId="plsbuy[lefttarget]?.id"></classification> <classification @confirm="confirm" :show="ification" :typenum="2" :cgdId="plsbuy[lefttarget]?.id">
</classification>
</view> </view>
</template> </template>
@ -371,7 +412,7 @@
firstgetqueryCgdList(); firstgetqueryCgdList();
serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/'; serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
}) })
const tagesstatues = ["待入库", "待完结", "已完结"];
const searchValue = ref(""); const searchValue = ref("");
const middletarget = ref(0); const middletarget = ref(0);
@ -392,7 +433,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.records.length) { if (res.result.records.length) {
form.cgdId = plsbuy.value[0].id form.cgdId = plsbuy.value[0].id
queryInvo(); queryInvo();
@ -404,13 +445,13 @@
}) })
} }
const confirm =(e:any)=>{ const confirm = (e : any) => {
form.categoryId = e.categoryId; form.categoryId = e.categoryId;
form.typeId = e.typeId; form.typeId = e.typeId;
form.medicationId = e.medicationId; form.medicationId = e.medicationId;
form.suppliers = e.suppliers; form.suppliers = e.suppliers;
form.cgdId = e.cgdId; form.cgdId = e.cgdId;
form.pageNo=1; form.pageNo = 1;
InvoicingList.value = []; InvoicingList.value = [];
queryInvo(); queryInvo();
ification.value = false ification.value = false
@ -462,7 +503,7 @@
typeId: '', typeId: '',
medicationId: '', medicationId: '',
wlParamInfo: '', wlParamInfo: '',
suppliers:'', suppliers: '',
cgdId: "", cgdId: "",
isWaring: 0, isWaring: 0,
canpull: true, canpull: true,
@ -487,12 +528,13 @@
const InvoicingList = ref([]) const InvoicingList = ref([])
const queryInvo = () => { const queryInvo = () => {
queryCgdInfoList(form).then(res => { queryCgdInfoList(form).then(res => {
console.log(res.result.records) // console.log(res.result.records)
InvoicingList.value = [];
InvoicingList.value.push(...res.result.records); InvoicingList.value.push(...res.result.records);
clickmiddle(middletarget.value); clickmiddle(middletarget.value);
}) })
} }
const search = () => { const search = () => {
// if (!searchValue.value) return // if (!searchValue.value) return
form.pageNo = 1; form.pageNo = 1;
@ -501,7 +543,7 @@
// form.wlParamInfo = searchValue.value; // form.wlParamInfo = searchValue.value;
// form.cgdId = plsbuy.value[lefttarget.value].id // form.cgdId = plsbuy.value[lefttarget.value].id
// queryInvo(); // queryInvo();
plzinfo.pageNo = 1; plzinfo.pageNo = 1;
plsbuy.value = []; plsbuy.value = [];
queryCgdList(plzinfo).then((res : any) => { queryCgdList(plzinfo).then((res : any) => {
@ -562,7 +604,7 @@
const badshow = ref(false); const badshow = ref(false);
const donghuacs = ref(false) const donghuacs = ref(false)
const bebad = (v) => { const bebad = (v) => {
if(Number(v.status)==1){ if (Number(v.status) == 1) {
setTimeout(() => { setTimeout(() => {
uni.showToast({ uni.showToast({
title: '只有采购阶段的单据才能作废', title: '只有采购阶段的单据才能作废',

2
unpackage/dist/dev/.nvue/pages/camera.js vendored
View File

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

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