diff --git a/.env.production b/.env.production
index a24f0435..a35c8e44 100644
--- a/.env.production
+++ b/.env.production
@@ -31,13 +31,13 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 漳州中医院
-VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
# 片仔癀诊断
# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 63e2179b..e50c8dee 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -48,6 +48,7 @@ export function submitBiz(query) {
data: query
});
}
+
export function delmitBiz(query) {
return axios({
url: "/warehouse/inout/delmitBiz",
@@ -164,11 +165,11 @@ export function filterOrderList(query) {
}
export function filterInvoiceList(query) {
- return axios({
- url: "/udiwms/inout/order/filterInvoiceList",
- method: "get",
- params: query
- });
+ return axios({
+ url: "/udiwms/inout/order/filterInvoiceList",
+ method: "get",
+ params: query
+ });
}
diff --git a/src/views/inout/DialogReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue
index 79d6c3f8..c576447c 100644
--- a/src/views/inout/DialogReviewOrder.vue
+++ b/src/views/inout/DialogReviewOrder.vue
@@ -180,6 +180,9 @@ export default {
originCode: this.originCode,
code: this.udiCode.trim(),
}
+ if (tQuery.code.includes(tQuery.originCode.substr(0, tQuery.originCode.length - 1))) {
+ tQuery.originCode = "";
+ }
enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$refs.inputRef.focus();
diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue
index 7ab31513..d116fc91 100644
--- a/src/views/inout/DialogThrReviewOrder.vue
+++ b/src/views/inout/DialogThrReviewOrder.vue
@@ -108,14 +108,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -189,6 +189,9 @@ export default {
originCode: this.originCode,
code: this.udiCode.trim(),
}
+ if (tQuery.code.includes(tQuery.originCode.substr(0,tQuery.originCode.length-1))) {
+ tQuery.originCode = "";
+ }
enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$refs.inputRef.focus();
@@ -203,8 +206,6 @@ export default {
this.originCode = this.udiCode;
} else if (response.code == 501) {
this.checkSuccess = false;
- // this.$refs.inputRef.focus();
- // this.$refs.inputRef.select();
this.originCode = "";
this.$message.error(response.message);
} else if (response.code == 503) {
diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index 3c6fb6ac..7652d1e1 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -253,6 +253,11 @@
prop="count"
width="100"
>
+
-
+
+
@@ -318,7 +320,7 @@
-
+
{
this.productDetailLoading = false
if (res.code === 20000) {
diff --git a/src/views/inout/InvoiceRegCkeck.vue b/src/views/inout/InvoiceRegCkeck.vue
index 2a1e4440..8560cbbd 100644
--- a/src/views/inout/InvoiceRegCkeck.vue
+++ b/src/views/inout/InvoiceRegCkeck.vue
@@ -334,7 +334,7 @@ export default {
{ required: true, message: '请输入发票编码', trigger: 'blur' }
],
price: [{ required: true, message: '请输入发票价格', trigger: 'blur' }],
- invoiceDate: [{ required: true, message: '请输入备注', trigger: 'blur' }]
+ invoiceDate: [{ required: true, message: '请选择开票日期', trigger: 'blur' }]
},
certFileUrl: '',
Upinvoice: false,