Browse Source

Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

hella_online_20240821
lijuncheng 3 months ago
parent
commit
384c1c8bab
  1. 12
      src/api/request2.js
  2. 30
      src/pages/package/job/overPackageJob.vue
  3. 15
      src/pages/query/item.vue

12
src/api/request2.js

@ -2610,7 +2610,17 @@ export function deliverRequestClose(id) {
data: {}, data: {},
}); });
} }
/**
* 翻包任务 关闭任务
* @param {*} params
*/
export function packageoverRequestClose(id) {
return request({
url: baseApi + "/wms/packageover-job-main/close?id=" + id,
method: "put",
data: {},
});
}
/** /**
* 制品发货申请 提交审批 * 制品发货申请 提交审批
* @param {*} params * @param {*} params

30
src/pages/package/job/overPackageJob.vue

@ -34,6 +34,7 @@
import { import {
cancleTakeOverPageJob, cancleTakeOverPageJob,
getOverPageJobList, getOverPageJobList,
packageoverRequestClose
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
@ -113,6 +114,14 @@
onReady() { onReady() {
this.detailOptions = getDetailOption(); this.detailOptions = getDetailOption();
this.detailGiveupOptions = getDetailGiveupOption(); this.detailGiveupOptions = getDetailGiveupOption();
this.detailOptions = [...this.detailOptions,{
text:"关闭",
style:{
backgroundColor:"#F56C6C"
}
}]
console.log('this.detailGiveupOptions',this.detailGiveupOptions)
console.log('this.detailOptions',this.detailOptions)
}, },
onReachBottom() { onReachBottom() {
// //
@ -278,12 +287,33 @@
this.cancleJob(dataContent.masterId); this.cancleJob(dataContent.masterId);
} }
}); });
} else if (e.content.text == "关闭") {
this.$refs.comMessage.showQuestionMessage("确定要关闭当前任务?",
res => {
if (res) {
this.closeJob(dataContent.masterId);
}
});
} }
}, },
openjobInfoPopup(item) { openjobInfoPopup(item) {
this.$refs.jobInfoPopup.openPopup(item) this.$refs.jobInfoPopup.openPopup(item)
}, },
closeJob(id){
packageoverRequestClose(id).then(res => {
if(res.data){
this.getList("refresh")
uni.showToast({
title:"关闭任务成功"
})
}else {
this.showMessage("关闭任务失败")
}
}).catch(error => {
this.showMessage(error)
})
},
cancleJob(id) { cancleJob(id) {
cancleTakeOverPageJob(id).then(res => { cancleTakeOverPageJob(id).then(res => {

15
src/pages/query/item.vue

@ -3,14 +3,14 @@
<view class="uni-flex" style="flex-direction: column"> <view class="uni-flex" style="flex-direction: column">
<itemFilter ref="filter" @onConfirmClick="confirm"> <itemFilter ref="filter" @onConfirmClick="confirm">
</itemFilter> </itemFilter>
<view class="top" style=""> <view ref="topContent" class="top" >
<com-blank-view @goScan='openScanPopup' v-if="itemCode==''"></com-blank-view> <com-blank-view @goScan='openScanPopup' v-if="itemCode==''"></com-blank-view>
<item-info v-if="itemDetail" :itemdetail='itemDetail'></item-info> <item-info v-if="itemDetail" :itemdetail='itemDetail'></item-info>
<z-tabs v-if="itemCode" :list="tabList" @change="tabChange" /> <z-tabs v-if="itemCode" :list="tabList" @change="tabChange" />
</view> </view>
<view style="padding-top: 230rpx;width:100%"> <view style="width:100%;" :style="{'margin-top':topHeight+'px'}">
<view v-if="totalCount>0" style="margin:10rpx; font-size:35rpx; font-weight:bold">总数 : {{totalCount}} <view v-if="totalCount>0" style="margin:10rpx; font-size:35rpx; font-weight:bold;;">总数 : {{totalCount}}
</view> </view>
<view v-for="(item, index) in dataList" style="width:100%" :key="index"> <view v-for="(item, index) in dataList" style="width:100%" :key="index">
<view class="uni-flex uni-row" <view class="uni-flex uni-row"
@ -51,6 +51,7 @@
import comItemDetailCard from '@/pages/query/coms/comItemDetailCard.vue' import comItemDetailCard from '@/pages/query/coms/comItemDetailCard.vue'
import itemFilter from '@/mycomponents/item/itemFilter.vue' import itemFilter from '@/mycomponents/item/itemFilter.vue'
import comEmptyView from '@/mycomponents/common/comEmptyView.vue' import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
import { nextTick } from 'vue';
export default { export default {
components: { components: {
@ -75,7 +76,8 @@
totalCount: 0, totalCount: 0,
locationCode: "", locationCode: "",
inventoryStatus: "", inventoryStatus: "",
pageSize:10 pageSize:10,
topHeight:115
} }
}, },
// //
@ -134,6 +136,11 @@
this.closeScanPopup(); this.closeScanPopup();
this.itemCode = res.data.list[0].code; this.itemCode = res.data.list[0].code;
this.itemDetail = res.data.list[0]; this.itemDetail = res.data.list[0];
nextTick(()=>{
this.topHeight = this.$refs.topContent.$el.clientHeight
console.log('topContent',this.$refs.topContent)
})
this.tabChange(0) this.tabChange(0)
} else { } else {
this.showMessage('未查找到物料【' + code + '】'); this.showMessage('未查找到物料【' + code + '】');

Loading…
Cancel
Save