From 9cff4a9965a84068fb4fb180a298ad8e7176c68c Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 22 Apr 2024 14:40:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE--?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=8E=B7=E8=AE=B0=E5=BD=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      |  2 +-
 .../supplierdeliverRequestMain.data.ts        | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 5a09e488b..69b2dc1d8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -148,7 +148,7 @@
   </BasicForm>
 
   <!-- 标签打印 -->
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 
  
 </template>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 58ec559cb..a6519e6c7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1692,7 +1692,15 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
-{
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
     label: '计量单位',
     field: 'uom',
     sort: 'custom',
@@ -1705,12 +1713,5 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
-{
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
+
 ]))
\ No newline at end of file

From a57c4e1782bf3f07bfc00f5dc2f4b18c74ef598f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 22 Apr 2024 14:43:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=8F=82=E8=80=83=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=92=8C=E5=8F=82=E8=80=83=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=A1=8C=E5=8E=BB=E6=8E=89=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspection/inspectionRequest/inspectionMain.data.ts     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
index b0c0dddc0..5e3ec8d56 100644
--- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
+++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
@@ -13,8 +13,6 @@ export const InspectionMainRules = reactive({
   requestEndTime: [required],
   batch: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
-  referenceOrderCode: [required],
-  referenceOrderRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   referenceCertificateCode: [required],
   referenceCertificateRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   inspectionType: [required],

From 71e40b04c04de2cff687842a7bda2ab4753d7c2b Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 22 Apr 2024 14:49:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=E9=9C=80=E9=87=8D=E6=96=B0=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E6=98=AF=E5=90=A6=E7=BB=A7=E7=BB=AD=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/package/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index 4b4bc7fad..5f27e619f 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -246,8 +246,9 @@ const formsSuccess = async (formType,data) => {
     await PackageApi.createPackage(data)
     message.success(t('common.createSuccess'))
   } else {
+    await message.confirm('包装修改后需重新打印标签，是否继续保存？')
     await PackageApi.updatePackage(data)
-    message.success(t('common.updateSuccess'))
+    message.success(t('包装信息已修改，请重新打印标签'))
   }
   basicFormRef.value.dialogVisible = false
   getList()