diff --git a/src/pages.json b/src/pages.json
index 577ede69..8b9fd09c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1793,9 +1793,25 @@
"style": {
"navigationBarTitleText": "盘点详细",
"enablePullDownRefresh": false
+
+ }
+ },
+ {
+ "path": "pages/count/job/countBlindDetail",
+ "style": {
+ "navigationBarTitleText": "盘点详细(盲盘)",
+ "enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/count/job/countLightDetail",
+ "style": {
+ "navigationBarTitleText": "盘点详细(明盘)",
+ "enablePullDownRefresh": false
+
+ }
+ },
{
"path": "pages/count/record/countRecord",
"style": {
diff --git a/src/pages/count/coms/comCountDetailcards.vue b/src/pages/count/coms/comCountDetailcards.vue
new file mode 100644
index 00000000..7d2fdafb
--- /dev/null
+++ b/src/pages/count/coms/comCountDetailcards.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 复制采购
+ |制品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue
new file mode 100644
index 00000000..5b8e0783
--- /dev/null
+++ b/src/pages/count/job/countBlindDetail.vue
@@ -0,0 +1,650 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{index+1}}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/count/job/countDetail1.vue b/src/pages/count/job/countDetail1.vue
new file mode 100644
index 00000000..ce60eb4e
--- /dev/null
+++ b/src/pages/count/job/countDetail1.vue
@@ -0,0 +1,657 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{index+1}}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index a179dc03..3f6a1ed4 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -162,6 +162,8 @@
filters: filters,
pageNo: this.pageNo,
pageSize: this.pageSize,
+ sort:"number",
+ by:"DESC"
}
getCountJobList(params).then(res => {
@@ -196,6 +198,17 @@
uni.navigateTo({
url: './countDetail?id=' + item.id + '&status=' + item.status
});
+ // //明盘
+ // if(item.isOpenCount=="TRUE"){
+ // uni.navigateTo({
+ // url: './countLightDetail?id=' + item.id + '&status=' + item.status
+ // });
+ // }else {
+ // //盲盘
+ // uni.navigateTo({
+ // url: './countBlindDetail?id=' + item.id + '&status=' + item.status
+ // });
+ // }
},
showItemList(itemList) {
@@ -285,6 +298,8 @@
filters: filters,
pageNo: 1,
pageSize: 100,
+ sort:"number",
+ by:"DESC"
}
getCountJobList(params).then(res => {
uni.hideLoading();
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
new file mode 100644
index 00000000..51f1b74d
--- /dev/null
+++ b/src/pages/count/job/countLightDetail.vue
@@ -0,0 +1,659 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{index+1}}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index 0428580d..cea8602c 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -131,6 +131,7 @@
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
this.businessType = res.businessType;
+ res.fromLocationAreaTypeList.push("INSPECT","SUPPER")
this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup();
@@ -315,7 +316,7 @@
} else {
var detail = item.subList.find(r => {
- if (r.packingNumber == balance.packingNumber &&
+ if (r.packingNumber == pack.number &&
r.batch == balance.batch &&
r.locationCode == balance.locationCode &&
r.inventoryStatus == balance.inventoryStatus) {
@@ -332,7 +333,7 @@
calcHandleQty(this.detailSource);
} else {
if (detail.scaned == true) {
- this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+ this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]已经在列表中")
}
}
}