From 00f73ab72d2b3b2ea8c9fc36be37f6c60049a865 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 5 Dec 2023 13:27:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E6=96=99=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/issue/record/issueRecord.vue | 1 +
pages/setter/index.vue | 42 +++++++++++++++++-------------
2 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index 66d4730e..3adc70a6 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -242,6 +242,7 @@
}
})
}
+ this.resizeCollapse();
// item.handleQty=itemHandleQty;
},
diff --git a/pages/setter/index.vue b/pages/setter/index.vue
index 4579145e..973b000d 100644
--- a/pages/setter/index.vue
+++ b/pages/setter/index.vue
@@ -9,17 +9,21 @@
-
+
-
-
+
+
+
@@ -44,7 +48,9 @@
removeToken
} from '@/common/utils/auth'
import {
- ref,reactive,nextTick
+ ref,
+ reactive,
+ nextTick
} from "vue";
import {
onLoad
@@ -53,18 +59,18 @@
const userName = ref(store.state.user.name);
let test = ref("123");
let userInfo = ref(null);
- onLoad(()=>{
- console.log(11)
- getUserProfile().then(res=>{
- userInfo.value = res.data
- // nextTick(()=>{
- // const userInfo = res.data.nickname
- // console.log("打印",userInfo)
- // })
-
- })
- });
-
+ onLoad(() => {
+ console.log(11)
+ getUserProfile().then(res => {
+ userInfo.value = res.data
+ // nextTick(()=>{
+ // const userInfo = res.data.nickname
+ // console.log("打印",userInfo)
+ // })
+
+ })
+ });
+
function handlerlogout() {
store.dispatch('LogOut', {}).then(() => {
From a8874730311df83e17658d270e7f64ba2cc62d0b Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 7 Dec 2023 13:34:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mycomponents/location/requiredLocation.vue | 11 ++-
mycomponents/recommend/recommend.vue | 3 +-
pages/inspect/coms/inspectComDetailCard.vue | 85 ++++++++++++---------
pages/inspect/job/inspectDetail.vue | 21 +++--
pages/purchaseReceipt/job/receiptDetail.vue | 30 +++++---
5 files changed, 88 insertions(+), 62 deletions(-)
diff --git a/mycomponents/location/requiredLocation.vue b/mycomponents/location/requiredLocation.vue
index a875b339..7aa6746a 100644
--- a/mycomponents/location/requiredLocation.vue
+++ b/mycomponents/location/requiredLocation.vue
@@ -4,12 +4,11 @@
padding-left: 10rpx;
padding-right: 10rpx;
font-size:32rpx;">
- {{title}}
-
- 请扫描
- {{locationCode}}
-
+
+ {{title}}
+ 请扫描
+ {{locationCode}}
+
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index ffbbedd7..0a0ff98b 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -11,7 +11,8 @@
-
+
diff --git a/pages/inspect/coms/inspectComDetailCard.vue b/pages/inspect/coms/inspectComDetailCard.vue
index e788e4ff..68018c78 100644
--- a/pages/inspect/coms/inspectComDetailCard.vue
+++ b/pages/inspect/coms/inspectComDetailCard.vue
@@ -1,13 +1,12 @@
-
-
+
-
+
收货数
{{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}
@@ -25,9 +24,8 @@
{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}
-
+
-
@@ -38,36 +36,50 @@
-
-
-
-
- 不合格数量 ：{{item.failedQty}}
+
+
+
+
+
+ 不合格
+
+
+ {{item.failedQty}}
+
-
- 报废数量 ：{{item.crackQty}}
+
+
+ 报废
+
+
+ {{item.crackQty}}
+
-
- 合格数量 ：{{item.goodQty}}
+
+
+ 合格
+
+
+ {{item.goodQty}}
+
-
+
-
+
-
+
@@ -90,7 +102,7 @@
getUnitInfo,
getInspectType
} from '@/common/directory.js';
-
+
export default {
components: {
itemCompareQty,
@@ -134,9 +146,8 @@
return {
option: [],
showItem: {},
- editItem: {
- },
- editIndex:0,
+ editItem: {},
+ editIndex: 0,
detailOptions: [],
scanOptions: []
}
@@ -157,20 +168,20 @@
},
methods: {
- getInspectType(value){
+ getInspectType(value) {
return getInspectType(value)
},
-
- swipeClick(e, item,index) {
+
+ swipeClick(e, item, index) {
if (e.content.text == "详情") {
this.detail(item)
} else if (e.content.text == "编辑") {
- this.edit(item,index)
+ this.edit(item, index)
} else if (e.content.text == "移除") {
this.remove(item)
}
},
- edit(item,index) {
+ edit(item, index) {
this.editIndex = index;
this.editItem = item;
this.$refs.inspectEdit.openEditPopup(this.editItem);
@@ -189,10 +200,10 @@
item.crackQty = 0;
item.sampleQty = 0;
item.notPassedQty = 0;
- item.inspectResult =""
- item.failedReason =""
- item.handleQty =0;
- item.photos =""
+ item.inspectResult = ""
+ item.failedReason = ""
+ item.handleQty = 0;
+ item.photos = ""
this.$forceUpdate()
this.$emit('remove', item)
}
@@ -201,19 +212,19 @@
confirm(qty) {
this.$emit('updateData')
},
- getInspectResult(result){
- this.dataContent.subList[this.editIndex]= result;
+ getInspectResult(result) {
+ this.dataContent.subList[this.editIndex] = result;
if (this.$refs.collapse1 != undefined) {
this.$nextTick(res => {
this.$refs.collapse1.resize()
})
}
- this.$emit('updateData',)
+ this.$emit('updateData', )
},
getUnitInfo(value) {
return getUnitInfo(value).label
},
-
+
}
}
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index f79f0cb3..79cba6a4 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -1,13 +1,17 @@
+
+
+
+ 检验类型 : {{jobContent.asnNumber}}
+
+
-
-
-
-
+
+
@@ -66,7 +70,7 @@
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import comMessage from '@/mycomponents/common/comMessage.vue'
import inspectComDetailCard from "@/pages/inspect/coms/inspectComDetailCard.vue"
-
+ import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
name: 'returnDetail',
components: {
@@ -76,6 +80,7 @@
winScanPackAndLocation,
comMessage,
inspectComDetailCard,
+ jobTop
},
data() {
return {
@@ -86,7 +91,7 @@
subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源
businessTypeInfo: {},
- fromInventoryStatuses :"",
+ fromInventoryStatuses: "",
managementList: [],
selectedItem: {},
failedQty: 0,
@@ -195,7 +200,7 @@
res.photos = ""
res.inspectResult = ""
})
- that.fromInventoryStatuses = that.jobContent.outInventoryStatuses
+ that.fromInventoryStatuses = that.jobContent.outInventoryStatuses
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 25262234..9d3e8512 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -1,5 +1,13 @@
+
+
+
+ 发货单号 : {{jobContent.asnNumber}}
+
+
+
+
@@ -71,6 +79,7 @@
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue'
+ import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
name: 'receipt_detail',
@@ -79,7 +88,8 @@
winScanPack,
comReceiptDetailCard,
requiredLocation,
- comMessage
+ comMessage,
+ jobTop
},
data() {
return {
@@ -182,7 +192,7 @@
} else {
that.showMessage('列表数据为0');
}
- updateTitle(that.jobContent.number);
+ // updateTitle("采购收货-" + that.jobContent.number);
}
}).catch(error => {
uni.hideLoading()
@@ -216,7 +226,7 @@
calcHandleQty(this.detailSource);
this.continueScan()
this.$forceUpdate()
- var list =this.detailSource[0].subList;
+ var list = this.detailSource[0].subList;
}
}
}
@@ -252,12 +262,12 @@
})
},
- commit() {
- this.scanCount = getScanCount(this.subList);
- if( this.scanCount==0){
- this.showErrorMessage("扫描数为0,请先扫描")
- return;
- }
+ commit() {
+ this.scanCount = getScanCount(this.subList);
+ if (this.scanCount == 0) {
+ this.showErrorMessage("扫描数为0,请先扫描")
+ return;
+ }
//校验库位、
if (!this.checkLocation()) {
return
@@ -347,7 +357,7 @@
checkLocation() {
var isPass = true;
- if (this.toLocationCode == ""||this.toLocationCode ==null) {
+ if (this.toLocationCode == "" || this.toLocationCode == null) {
this.$refs.comMessage.showMessage('请扫描收货库位', res => {
if (res) {
this.$refs.requiredLocation.showLocation();