From f49f0e467dc21e2e884b93f60e089777be0e6b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Fri, 31 Oct 2025 01:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/orderIssure/newSoIssueNotify.vue   |  4 ++++
 .../modules/orderIssure/searchIssureNotify.vue | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/orderIssure/newSoIssueNotify.vue b/src/views/modules/orderIssure/newSoIssueNotify.vue
index ddad024..a799476 100644
--- a/src/views/modules/orderIssure/newSoIssueNotify.vue
+++ b/src/views/modules/orderIssure/newSoIssueNotify.vue
@@ -1153,6 +1153,7 @@ export default {
       let inData = {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
+        orderType: 'shoporder', // rqrq - 查询shoporder类型的申请单
       }
       this.getAllNotifyStatus()
       getUserNotifyNo(inData).then(({ data }) => {
@@ -1199,6 +1200,7 @@ export default {
       let inData = {
         site: this.$store.state.user.site,
         notifyNo: this.notifyNo,
+        orderType: 'shoporder', // rqrq - 查询shoporder类型的明细
       }
       getNotifyNoDetail(inData).then(({ data }) => {
         if (data.code === 0) {
@@ -1211,6 +1213,7 @@ export default {
       let inData = {
         site: this.$store.state.user.site,
         userName: this.$store.state.user.name,
+        orderType: 'shoporder', // rqrq - 固定为shoporder类型
       }
       createNotify(inData).then(({ data }) => {
         if (data.code === 0) {
@@ -1241,6 +1244,7 @@ export default {
         userName: this.$store.state.user.name,
         outWorkOrderFlag: outWorkOrderFlag,
         remark: this.selectedNotifyRemark,
+        orderType: 'shoporder', // rqrq - 固定为shoporder类型
       }
       this.getAllNotifyStatus()
       createNotify(inData).then(({ data }) => {
diff --git a/src/views/modules/orderIssure/searchIssureNotify.vue b/src/views/modules/orderIssure/searchIssureNotify.vue
index 262cc09..7d4ddf7 100644
--- a/src/views/modules/orderIssure/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/searchIssureNotify.vue
@@ -412,6 +412,7 @@
           issueEndDate: this.dayjs().format("YYYY-MM-DD")+" 23:59:59",
           sql: "",
           orderNo: "",
+          orderType: 'shoporder', // rqrq - 默认查询shoporder类型
         },
         notifyData:{
           site: '',
@@ -1066,10 +1067,15 @@
       },
       refreshCurrentTabTable(){
         if(this.currentRow===''||this.currentRow===null){
-          this.currentRow={site:'',notifyNo:''}
+          this.currentRow={site:'',notifyNo:'',orderType:'shoporder'}
+        }
+        // rqrq - 添加orderType参数
+        let queryData = {
+          ...this.currentRow,
+          orderType: 'shoporder'
         }
         if(this.activeName==='detail'){
-          searchNotifyOrderListNew(this.currentRow).then(({data}) => {
+          searchNotifyOrderListNew(queryData).then(({data}) => {
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList2 = data.rows
@@ -1079,7 +1085,7 @@
             }
           });
         }else if(this.activeName==='sub'){
-          searchNotifyMaterialListNew(this.currentRow).then(({data}) => {
+          searchNotifyMaterialListNew(queryData).then(({data}) => {
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList3 = data.rows
@@ -1089,7 +1095,7 @@
             }
           });
         }else if(this.activeName==='change'){
-          searchNotifyLogNew(this.currentRow).then(({data}) => {
+          searchNotifyLogNew(queryData).then(({data}) => {
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList5 = data.rows
@@ -1099,7 +1105,7 @@
             }
           });
         }else if(this.activeName==='close'){
-          searchNotifyLogCloseNew(this.currentRow).then(({data}) => {
+          searchNotifyLogCloseNew(queryData).then(({data}) => {
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList6 = data.rows
@@ -1109,7 +1115,7 @@
             }
           });
         }else {
-          searchSumNotifyMaterialListNew(this.currentRow).then(({data}) => {
+          searchSumNotifyMaterialListNew(queryData).then(({data}) => {
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList4 = data.rows