-
请联系司机将货物带回仓库，并由文员或库管进行回库扫描
+
请联系司机将货物带回仓库，并由文员或库管进行回库扫描
', res);
+ if (res.data.code == 200) {
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.AbnormalReviewloading = false; //关闭加载
+ console.log();
+ this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
+ }
+ })
+ .catch(error => {
+ console.log(error, 'error');
+ })
+ .finally(() => {
+ this.AbnormalReviewloading = false; //关闭加载
+ });
+ })
+ .catch(() => {});
+ },
+
// 滞留
retention(row) {
ElMessageBox.confirm('是否确认滞留操作?', '提示', {
@@ -5398,12 +5453,12 @@ export default {
this.loading = true; //开启加载
this.deliveryId = this.$route.query.id;
- if(!this.deliveryId){
+ if (!this.deliveryId) {
ElMessage({
- message: '遇到异常，请刷新页面重试',
- type: 'warning',
- })
- return
+ message: '遇到异常，请刷新页面重试',
+ type: 'warning',
+ });
+ return;
}
const res = await getDetail(this.deliveryId);
@@ -5497,7 +5552,7 @@ export default {
align-items: center;
justify-content: center;
}
-.abnormalBox_flex{
+.abnormalBox_flex {
display: flex;
justify-content: space-between;
}
From 954e0abb63af927dc0d54b0f97517bafabd09cfc Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sat, 12 Oct 2024 21:01:41 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/option/basic/basicMaterial.js | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/option/basic/basicMaterial.js b/src/option/basic/basicMaterial.js
index 6157e252..78fb8eec 100644
--- a/src/option/basic/basicMaterial.js
+++ b/src/option/basic/basicMaterial.js
@@ -160,6 +160,11 @@ export default {
message: '请输入产品编码',
trigger: 'blur',
},
+ {
+ pattern: /^[a-zA-Z0-9]{1,50}$/,
+ message: '产品编码只能包含字母和数字，长度不能超过50位',
+ trigger: 'blur',
+ }
],
overHidden: true,
},
@@ -174,6 +179,11 @@ export default {
message: '请输入物品sku',
trigger: 'blur',
},
+ {
+ pattern: /^[a-zA-Z0-9]{1,50}$/,
+ message: '物品sku只能包含字母和数字，长度不能超过50位',
+ trigger: 'blur',
+ }
],
overHidden: true,
},
From 7932efc01d974f4b01c01649f0a3d82a33c4c9ba Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sat, 12 Oct 2024 21:08:09 +0800
Subject: [PATCH 6/8] =?UTF-8?q?ai=E5=B1=8F=E8=94=BD=E6=B1=87=E9=80=9A?=
=?UTF-8?q?=E5=AD=97=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/page/login/aiqa.vue | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/page/login/aiqa.vue b/src/page/login/aiqa.vue
index 99fbbcf8..99afd2c0 100644
--- a/src/page/login/aiqa.vue
+++ b/src/page/login/aiqa.vue
@@ -138,9 +138,9 @@ const Data = ref({
{
content: '东集pad-q7恢复出厂设置',
},
- {
- content: '货无忧的汇通物流公司编码是多少',
- },
+ // {
+ // content: '货无忧的汇通物流公司编码是多少',
+ // },
{
content: '蓝牙打印机芝柯tx453设备连接密码是多少',
},
@@ -319,11 +319,11 @@ const AiData = (value = '') => {
) {
aiResponse = '东集pad-q7恢复出厂设置教程地址:1、关机状态下，按下【电源键】、【两侧扫描键】； 2、出现开机画面，松开【电源键】，出现工厂模式界面，按键全部松开；3、进入工厂模式后通过方向键选择【wipe data/factory reset】, 按电源键确认进入子菜单，选择【yes】，按【电源键】确认，恢复出厂完成后选择第一个【reboot system now】 ，按【电源键】确认重启设备。视频教程如下:https://mp.weixin.qq.com/s/0CG-jYooh9LJ-9aLauVGfA';
}
- else if (
- lowercaseValue.includes('货无忧的汇通物流公司编码是多少')
- ) {
- aiResponse = '货无忧的汇通物流公司编码是：627683';
- }
+ // else if (
+ // lowercaseValue.includes('货无忧的汇通物流公司编码是多少')
+ // ) {
+ // aiResponse = '货无忧的汇通物流公司编码是：627683';
+ // }
else if (
lowercaseValue.includes('蓝牙打印机芝柯tx453设备连接密码是多少') || lowercaseValue.includes('tx453')
) {
From 99f679b17130d3b355baa93bf4bb2b30ebf17865 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sun, 13 Oct 2024 00:11:09 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E5=91=98?=
=?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deliverylist/distributionDeliveryListedt.vue | 6 +++++-
.../signfor/distributionSignfortreat.vue | 12 +++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 73472cbe..5b765ae8 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -636,9 +636,13 @@
-
+
+
+
+
+
上门照
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 3380bfe8..09701422 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -280,9 +280,14 @@
-
+
+
+
+
+
+
上门照
@@ -445,10 +450,7 @@
-
-
司机备注：
-
{{ form.driverRemarks }}
-
确定
From 7c7253b4a9d49a77cd10de6dd5c2f320c6e0c7ac Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sun, 13 Oct 2024 00:11:26 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E4=BD=8D?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../goodsShelf/basicdataGoodsShelf.vue | 87 ++++++++++---------
1 file changed, 48 insertions(+), 39 deletions(-)
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 50ce03ee..26d387dd 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -1,6 +1,6 @@
-