From a820ba717beebaf16f2dbcd3dc98be1923caa733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 12 Apr 2023 17:27:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E6=A3=80=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4=E5=8F=8A=E5=88=B7=E6=96=B0=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/detailsTableColumns/index.js  |  2 +-
 .../quality/InspectRequest.vue                | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 7ef9f1a1b..61729ce42 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -218,7 +218,6 @@ export const InspectRequest =  [
   { label: "收货数量", prop: "receiveQty" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
-  { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" },
   { label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
   { label: "库位", prop: 'locationCode' },
   { label: "ERP库位", prop: 'locationErpCode' },
@@ -258,6 +257,7 @@ export const InspectRequest =  [
   { label: "尺寸", prop: 'volume' },
   { label: "重量", prop: 'weight' },
   { label: "其他属性", prop: 'otherPropertyJson' },
+  // { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" },
   // { label: "检验人姓名", prop: 'inspectUserName' },
   // { label: "检验人电话", prop: 'inspectUserPhone' },
   // { label: "检验人邮件", prop: 'inspectUserEmail' },
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
index 3aaa3a2c8..d612a4ff2 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
@@ -737,6 +737,13 @@ export default {
                 delete item.buttonHide
               }
             })
+            // 成功清除检验！操作后,刷新明细列表
+            this.loading = false
+            getDetailed(this.propsData.id, this.URL).then(res => {
+              this.propsData = res
+            })
+            this.paging()
+            this.loading = false
             this.inspectNoticeDetailsTableLoading = false
           }).catch(err => {
             console.log(err)
@@ -864,6 +871,13 @@ export default {
                   item.buttonHide = false
                 }
               })
+              // 检验操作后,刷新明细列表
+              this.loading = false
+              getDetailed(this.propsData.id, this.URL).then(res => {
+                this.propsData = res
+              })
+              this.paging()
+              this.loading = false
             }).catch(err => {
               console.log(err)
             })
@@ -900,6 +914,13 @@ export default {
                   item.buttonHide = false
                 }
               })
+              // 检验操作后,刷新明细列表
+              this.loading = false
+              getDetailed(this.propsData.id, this.URL).then(res => {
+                this.propsData = res
+              })
+              this.paging()
+              this.loading = false
             }).catch(err => {
               console.log(err)
             })
@@ -911,6 +932,7 @@ export default {
       } else if (val[0] == 2) {
         this.inspectShow = false
       }
+      
     },
     // 检验 table添加按钮
     inspectAddTable(val) {

From 8c357d8f9a14f1a01108f25e0874bee4bf4c1b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 12 Apr 2023 18:16:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=90=8E=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
index 5e4c7c742..0bd5be02a 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
@@ -91,7 +91,7 @@ export default {
   },
   data () {
     return {
-      URL: 'wms/job/purchase-return-job',
+      URL: 'wms/store/purchase-return-job',
       //常用按钮数据
       currenButtonData: [
         this.defaultFieldSettingBtn(),//字段设置