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

同步

This commit is contained in:
wangweidong 2025-12-31 15:36:13 +08:00
parent ce4bb0b25a
commit 1a82993c0c
6 changed files with 77 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pages/procurement/api/lunpan.js
View File

@ -408,10 +408,27 @@ export const voidedPddMain = (params) => {
})
}
export const queryCareList = (params) => {
export const queryOrderList = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/warehouse/queryCareList`,
url: `${uni.getStorageSync('serverUrl')}/api/pad/warehouse/queryOrderList`,
method: 'get',
data: params,
})
}
}
export const startDirectiveServe = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/thd/startDirectiveServe`,
method: 'post',
data: params,
})
}
export const finishDirectiveServe = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/thd/finishDirectiveServe`,
method: 'post',
data: params,
})
}

6
pages/procurement/common/thitem.vue
View File

@ -53,7 +53,7 @@
<image class="guodu" :style="v.zk?'transform: rotate(180deg);':''"
:src="'/static/index/procurement/l.png'" mode="aspectFill"></image>
</view>
<view class="zkadd guodu" v-if="status<2">
<view class="zkadd guodu" v-if="status==0">
<view @click.stop="comfig(v,index,1)" @touchend.stop>
添加物料
</view>
@ -124,8 +124,8 @@
const tuihuoshow = ref(false)
const tuihuoobj = ref({})
const comfig = (v, i, t) => {
if (props.status == '0') {
errmsg.value = '未开始服务不能添加退货物料！';
if (props.status == '1') {
errmsg.value = '退货单已完成不能添加退货物料！';
openerror.value = true;
return
}

6
pages/procurement/common/thwl.vue
View File

@ -13,7 +13,7 @@
</view>
<scroll-view scroll-x="true" class="kcscrol guodu" @scroll="onScroll" :class="Material.length==0?'fff':''"
scroll-with-animation :scroll-left="scrollleft"
:style="qb?'width:calc(100% - 21.8vw)':status<2?'width:calc(100% - 9vw)':'width:calc(100% - 5vw)' ">
:style="qb?'width:calc(100% - 21.8vw)':status==0?'width:calc(100% - 9vw)':'width:calc(100% - 5vw)' ">
<view class="yjbox" v-for="(v,i) in Material" :key="i">
<image
:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
@ -28,7 +28,7 @@
style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
</scroll-view>
<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
v-if="status<2">
v-if="status==0">
<view @click="zksq" class="righ0">
{{!qb?'更多':'收起'}}
<image class="guodu" :style="qb?'transform: rotate(180deg);':''"
@ -41,7 +41,7 @@
清空列表
</view>
<view class="guodu" :class="qb?(moredex==3?'avt':''):'righ0'" @click="moredex=3;emit('submit')"
v-if="status==1">
v-if="status==0">
提交退货单
</view>
</view>

65
pages/procurement/retstock.vue
View File

@ -136,7 +136,7 @@
</view>
<view>
<view class="big-time">
{{qcobj.startTime}} - {{qcobj.endTime}}
{{qcobj.startTime.substring(0, 10)}} - {{qcobj.endTime.substring(0, 10)}}
</view>
<view class="icon-people">
<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
@ -149,11 +149,11 @@
业务单号：{{qcobj.orderNo}}
</view>
<view class="icon-button">
<view class="" :class="qcobj.izStart=='N'?'button-left':'button-right'">
<view class="" :class="qcobj.izStart=='N'?'button-right':'button-left'" @click="start()">
开始服务
</view>
<view :class="qcobj.izFinish=='N'?'button-left':'button-right'">
结束服务
<view :class="(qcobj.izFinish=='N'&&qcobj.izStart=='Y')?'button-right':'button-left'" @click="end()">
结束服务
</view>
</view>
</view>
@ -168,7 +168,7 @@
<script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent,watch } from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe,queryCareList } from './api/lunpan.js'
import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe,queryOrderList,startDirectiveServe,finishDirectiveServe } from './api/lunpan.js'
import thwl from './common/thwl.vue'
import thitem from './common/thitem.vue'
@ -255,10 +255,12 @@
ritbot();
})
}
const start = (v, i) => {
startServe({ id: v.id }).then(res => {
const start = () => {
startDirectiveServe({ id: qcobj.value.id }).then(res => {
if (res.success) {
th(v, i)
qcobj.value.izStart = 'Y';
// th(tharrlist.value[cardindex.value],cardindex.value);
qCareList(tharrlist.value[cardindex.value])
} else {
uni.showToast({
icon: 'none',
@ -266,12 +268,24 @@
})
}
})
// startServe({ id: v.id }).then(res => {
// if (res.success) {
// th(v, i)
// } else {
// uni.showToast({
// icon: 'none',
// title: res.message
// })
// }
// })
}
const end = (v, i) => {
finishServe({ id: v.id }).then(res => {
console.log(res)
const end = () => {
finishDirectiveServe({ id: qcobj.value.id }).then(res => {
if (res.success) {
th(v, i)
qcobj.value.izFinish = 'Y';
// th(tharrlist.value[cardindex.value],cardindex.value);
qCareList(tharrlist.value[cardindex.value])
} else {
uni.showToast({
icon: 'none',
@ -279,6 +293,17 @@
})
}
})
// finishServe({ id: v.id }).then(res => {
// console.log(res)
// if (res.success) {
// th(v, i)
// } else {
// uni.showToast({
// icon: 'none',
// title: res.message
// })
// }
// })
}
const status = ref('loadmore')
@ -328,9 +353,16 @@
}
const qcobj = ref({})
const qCareList = (v)=>{
queryCareList({id:v.orderId}).then(res=>{
qcobj.value = res.result
console.log({id:v.orderId})
queryOrderList({id:v.orderId}).then(res=>{
qcobj.value = res.result;
console.log(res)
if(qcobj.value.izStart == 'N'&&qcobj.value.izFinish == 'N'){
openleft.value = true
}
if(qcobj.value.izStart == 'Y'&&qcobj.value.izFinish == 'N'){
openleft.value = false
}
})
}
const addMaterial = ref([])
@ -492,7 +524,7 @@
.big-time {
font-weight: 600;
font-size: 2.8vw;
font-size: 1.8vw;
}
.icon-people {
@ -522,6 +554,7 @@
align-items: center;
border-radius: 1.2vw;
border: 1rpx solid #C7D2E4;
margin:0 1vw;
color: #333333;
}
@ -535,7 +568,7 @@
border-radius: 1.2vw;
border: 1rpx solid #5AAEFF;
color: #249BFA;
margin-left: 1vw;
margin:0 1vw;
background: linear-gradient(to bottom, #fff, #D1EAFF);
}
}

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 {
camera as default
};

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

@ -578,7 +578,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 {
fullcamera as default
};