Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/Common/dictcommons.js

@@ -146,6 +146,18 @@ export function getListByUseOrgSid(data) {
   })
 }
 
+// 部门sid获取维修项目(已备案且已启用的)
+export function getServiceItemListPage(data) {
+  return request({
+    url: '/as/v1/AsServiceItem/getServiceItemListPage',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
 // 查询分页列表 -- 客户列表
 export function customerListPage(params) {
   return request({

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')

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: {