From cd0a567007066aed9ea48a433e7c8e76507740ab Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 18 Jul 2024 17:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE=E5=8D=95--?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/repairbill/repairbillAdd.vue    | 19 ++++++++++++-------
 .../operation/repairbill/repairbillInfo.vue   |  6 ++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index b2b03e7579..87721c0be1 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -543,9 +543,8 @@
 
 <script>
 import req from '@/api/operation/repairbill'
-import maintenanceitem from '@/api/basicinformation/maintenanceitem'
 import additionitem from '@/api/basicinformation/additionitem'
-import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues, getListByUseOrgSid } from '@/api/Common/dictcommons'
+import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues, getListByUseOrgSid, getServiceItemListPage } from '@/api/Common/dictcommons'
 import customer from '../../operation/preregistration/relation/customer'
 import { getStorage } from '@/utils/auth'
 
@@ -591,7 +590,8 @@ export default {
         total: 0,
         params: {
           sitemName: '',
-          orgPath: ''
+          useOrgSid: '',
+          subject: ''
         }
       },
       serviceData: [],
@@ -615,7 +615,9 @@ export default {
         registerRemarks: '',
         billNo: '',
         createByName: '',
+        createBySid: '',
         deptName: '',
+        deptSid: '',
         createDate: '',
         billTypeKey: '',
         billType: '',
@@ -675,7 +677,6 @@ export default {
         sitemVos: [],
         aitemVos: [],
         goodsDetailsVos: [],
-        createBySid: '',
         operatorSid: '',
         nodeCode: '',
         settleVo: {
@@ -1069,10 +1070,11 @@ export default {
       })
     },
     serviceInput(value) {
-      this.serviceQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.serviceQuery.params.useOrgSid = this.formobj.deptSid
       this.serviceQuery.params.sitemName = value
+      this.serviceQuery.params.subject = this.formobj.subject
       this.serviceLoading = true
-      maintenanceitem.listPage(this.serviceQuery).then((response) => {
+      getServiceItemListPage(this.serviceQuery).then((response) => {
         if (response.success) {
           this.serviceLoading = false
           this.serviceData = response.data.records
@@ -1354,7 +1356,9 @@ export default {
         registerRemarks: '',
         billNo: '',
         createByName: '',
+        createBySid: '',
         deptName: '',
+        deptSid: '',
         createDate: '',
         billTypeKey: '',
         billType: '',
@@ -1414,7 +1418,6 @@ export default {
         sitemVos: [],
         aitemVos: [],
         goodsDetailsVos: [],
-        createBySid: '',
         operatorSid: '',
         nodeCode: '',
         settleVo: {
@@ -1450,6 +1453,8 @@ export default {
         useOrgSid: '',
         createOrgSid: ''
       }
+      this.serviceData = []
+      this.subjoinData = []
       this.settleVisible = false
       this.submitdisabled = false
       this.$emit('doback')
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
index 4503345e1f..ecc8d7e751 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
@@ -306,7 +306,9 @@ export default {
         registerRemarks: '',
         billNo: '',
         createByName: '',
+        createBySid: '',
         deptName: '',
+        deptSid: '',
         createDate: '',
         billTypeKey: '',
         billType: '',
@@ -366,7 +368,6 @@ export default {
         sitemVos: [],
         aitemVos: [],
         goodsDetailsVos: [],
-        createBySid: '',
         operatorSid: '',
         nodeCode: '',
         settleVo: {
@@ -510,7 +511,9 @@ export default {
         registerRemarks: '',
         billNo: '',
         createByName: '',
+        createBySid: '',
         deptName: '',
+        deptSid: '',
         createDate: '',
         billTypeKey: '',
         billType: '',
@@ -570,7 +573,6 @@ export default {
         sitemVos: [],
         aitemVos: [],
         goodsDetailsVos: [],
-        createBySid: '',
         operatorSid: '',
         nodeCode: '',
         settleVo: {