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_20240803
lijuncheng 3 months ago
parent
commit
92384f0cce
  1. 4
      src/manifest.json
  2. 16
      src/mycomponents/scan/winScanButton.vue
  3. 34
      src/pages/fg/receiptByPlan.vue

4
src/manifest.json

@ -3,8 +3,8 @@
"package" : "uni.UNI43932FE", "package" : "uni.UNI43932FE",
"appid" : "__UNI__C9CF4BF", "appid" : "__UNI__C9CF4BF",
"description" : "", "description" : "",
"versionName" : "1.0.68", "versionName" : "1.0.69",
"versionCode" : 68, "versionCode" : 69,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

16
src/mycomponents/scan/winScanButton.vue

@ -1,6 +1,6 @@
<template> <template>
<view> <view>
<view class="scan_float" @click="goScan('bottom')"> <view class="scan_float" ref="scanRef" @click="goScan('bottom')" @touchstart="handleTouchStart" @touchmove.prevent="handleTouchMove">
<image src="@/static/icons_ui/icon_scan_white.svg"></image> <image src="@/static/icons_ui/icon_scan_white.svg"></image>
<view>扫描</view> <view>扫描</view>
</view> </view>
@ -19,7 +19,9 @@
old: { old: {
x: 0, x: 0,
y: 0 y: 0
} },
btnX:20,
btnY:20,
} }
}, },
props: { props: {
@ -30,6 +32,16 @@
}, },
methods: { methods: {
handleTouchStart(e) {
this.btnX = e.changedTouches[0].clientX-e.currentTarget.offsetLeft
this.btnY = e.changedTouches[0].clientY-e.currentTarget.offsetTop
},
handleTouchMove(e) {
console.log("handleTouchMove",e);
this.$refs.scanRef.$el.style.left = e.changedTouches[0].clientX-this.btnX+'px'
this.$refs.scanRef.$el.style.top = e.changedTouches[0].clientY-this.btnY+'px'
},
goScan(content) { goScan(content) {
this.$emit("goScan", ''); this.$emit("goScan", '');
}, },

34
src/pages/fg/receiptByPlan.vue

@ -275,11 +275,9 @@
console.log(JSON.stringify(params)) console.log(JSON.stringify(params))
let list = [] let list = []
try {
var planData = await planReceiptSubmit(params) var planData = await planReceiptSubmit(params)
console.log('planData', planData) console.log('planData', planData)
if (planData.data) { if (planData.data && planData.data.length > 0) {
planData.data.forEach(item => { planData.data.forEach(item => {
list.push({ list.push({
itemCode: item.itemCode, // itemCode: item.itemCode, //
@ -302,17 +300,6 @@
} else { } else {
throw new Error("提交失败") throw new Error("提交失败")
} }
} catch (error) {
console.log('异常', error)
if (error.indexOf('请返回开工阶段') > -1) {
uni.hideLoading()
this.showErrorMessage('计划已完成')
this.clearData()
this.openFg();
return
}
}
// //
let createProductputawaySwitch = getSwitchInfoByCode( let createProductputawaySwitch = getSwitchInfoByCode(
@ -324,14 +311,16 @@
// } // }
// //
if (createProductputawaySwitch) { if (createProductputawaySwitch) {
if (list.length > 0 && list[0].requestNumber) {
createPutawayRequestByPlan(list[0].requestNumber).then(res => { createPutawayRequestByPlan(list[0].requestNumber).then(res => {
createInspectRequestByPlan(list[0].requestNumber) createInspectRequestByPlan(list[0].requestNumber)
}) })
}
} else { // } else { //
if (list.length > 0 && list[0].requestNumber) {
createInspectRequestByPlan(list[0].requestNumber) createInspectRequestByPlan(list[0].requestNumber)
} }
}
var queryParams = { var queryParams = {
filters: [{ filters: [{
@ -375,16 +364,25 @@
this.index = 1; this.index = 1;
this.dataContent.handleQty = 0; this.dataContent.handleQty = 0;
} }
var hintMsg ="提交成功\n生成装配收货记录\n";
if(list.length>0&&list[0].requestNumber){
hintMsg += list[0].requestNumber
}
nextTick(() => { nextTick(() => {
this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list) this.showCommitSuccessMessage(hintMsg, list)
}) })
} catch (error) { } catch (error) {
uni.hideLoading() uni.hideLoading()
var hint = error.message ? error.message : error var hint = error.message ? error.message : error
if (hint.indexOf('请返回开工阶段') > -1) {
this.showErrorMessage('计划已完成')
this.clearData()
this.openFg();
} else {
this.showErrorMessage(hint) this.showErrorMessage(hint)
} }
}
}, },

Loading…
Cancel
Save