diff --git a/.env.development b/.env.development
index 96e32fde..a4608106 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
#VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
#VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
-VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
+VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
# 租户配置
VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
# 是否是测试环境
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index dacc8147..92388b7c 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2085,6 +2085,12 @@ button::after {
vertical-align: middle
}
+.card_item_code {
+ color: #329362;
+ padding: 5px;
+ font-size: 30rpx;
+}
+
.card_packing_code {
color: #3315EB;
padding: 5px;
@@ -2147,10 +2153,10 @@ button::after {
font-size: 32rpx;
}
-.card_item_code {
+/* .card_item_code {
color: #F1A532;
padding: 5px;
-}
+} */
.card_product_date {
color: #329362;
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index a1e31de1..e3a345e2 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -11,8 +11,6 @@
-
-
-
复制
-
+
-
-
-
diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue
index 931f3adc..2000cec1 100644
--- a/src/mycomponents/balance/balanceSelect.vue
+++ b/src/mycomponents/balance/balanceSelect.vue
@@ -6,7 +6,14 @@
-
+
+
+
@@ -37,13 +44,13 @@
},
methods: {
openPopup(items) {
- if(Array.isArray(items)){
+ if (Array.isArray(items)) {
this.balanceItems = items;
- }else{
+ } else {
this.balanceItems = [items];
}
-
-
+
+
this.$refs['popupItems'].open("center");
},
@@ -52,9 +59,12 @@
this.$refs['popupItems'].close();
},
+ close() {
+ this.$refs['popupItems'].close();
+ }
}
}
+
\ No newline at end of file
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index f5fd805e..9ae2850e 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -72,7 +72,7 @@
isShowStatus: {
type: Boolean,
- default: false
+ default: true
},
isShowFromLocation: {
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index 9023f7f6..39b00527 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -72,12 +72,12 @@
type: Boolean,
default: true
},
- bussinessCode:{
+ bussinessCode: {
type: String,
default: ''
}
-
-
+
+
},
data() {
return {
@@ -114,13 +114,13 @@
},
- getScanResult(result) {
+ getScanResult(result) {
this.resultData = result;
- if(!result.package){
- this.showErrorMessage(result.label.code+"包装信息为空")
+ if (!result.package) {
+ this.showErrorMessage(result.label.code + "包装信息为空")
return;
}
- this.getItemCodeType(result.package.itemCode,callBack=>{
+ this.getItemCodeType(result.package.itemCode, callBack => {
this.queryBalance(this.resultData)
})
},
@@ -130,11 +130,15 @@
itemCode: result.package.itemCode,
batch: result.label.batch,
packingNumber: result.label.packingNumber,
- parentPackingNumber:result.package.parentNumber,
+ parentPackingNumber: result.package.parentNumber,
inventoryStatus: this.fromInventoryStatuses,
areaType: this.fromLocationAreaTypeList,
- bussinessCode:this.bussinessCode
+ bussinessCode: this.bussinessCode
}
+ uni.showLoading({
+ title: '查询中',
+ mask: true
+ })
getBalanceByParams(params).then(res => {
uni.hideLoading()
if (res.data.length == 0) {
@@ -149,10 +153,10 @@
"未查找到库存余额"
this.showErrorMessage(hint)
} else if (res.data.length == 1) {
-
+
result.balance = res.data[0]
- if(result.label.packingNumber!=result.balance.packingNumber){
- result.balance.lableQty=result.label.qty
+ if (result.label.packingNumber != result.balance.packingNumber) {
+ result.balance.lableQty = result.label.qty
}
this.$emit("getBalance", result)
// this.closeScanPopup()
@@ -166,7 +170,7 @@
this.showErrorMessage(error)
})
},
- getItemCodeType(itemCode,callBack) {
+ getItemCodeType(itemCode, callBack) {
uni.showLoading({
title: "加载中",
mask: true
@@ -201,7 +205,7 @@
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
- if(this.$refs.comscan){
+ if (this.$refs.comscan) {
this.$refs.comscan.getfocus()
}
}
@@ -215,12 +219,12 @@
closeScanPopup() {
this.$refs.popup.close()
},
- getfocus(){
- if(this.$refs.comscan){
+ getfocus() {
+ if (this.$refs.comscan) {
this.$refs.comscan.getfocus()
}
}
-
+
diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue
index 8a1fab48..ddd06aeb 100644
--- a/src/pages/repleinsh/record/repleinshRecord.vue
+++ b/src/pages/repleinsh/record/repleinshRecord.vue
@@ -1,44 +1,58 @@
-
+
-
+
+
-
+
-
-
-
+
+
-
-
-
-
-
-
-
+
+
@@ -46,93 +60,91 @@
+
\ No newline at end of file
diff --git a/src/pages/repleinsh/record/repleinshRecordV1.vue b/src/pages/repleinsh/record/repleinshRecordV1.vue
new file mode 100644
index 00000000..8a1fab48
--- /dev/null
+++ b/src/pages/repleinsh/record/repleinshRecordV1.vue
@@ -0,0 +1,558 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+