From 626ef2655b8c8480ac497941c26bc3766a8b6892 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 3 Dec 2024 09:30:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B9=E7=9B=AE--?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B7=A5=E7=A7=8D=E6=97=B6=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E8=8E=B7=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenanceitem/maintenanceitemAdd.vue             | 10 +++++-----
 .../src/views/basicinformation/setmeal/setmealAdd.vue  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index f72ca4f618..cf956689a0 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -23,7 +23,7 @@
               <div class="span-sty"><span class="icon">*</span>工种</div>
               <el-form-item prop="serviceType">
                 <el-select class="addinputInfo" v-model="formobj.serviceType" placeholder="请选择" @change="serviceTypeChange" clearable filterable>
-                  <el-option v-for="item in serviceType_list" :key="item.serviceTypeSid" :label="item.serviceType" :value="item.serviceType"></el-option>
+                  <el-option v-for="item in serviceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -124,7 +124,7 @@
 
 <script>
 import req from '@/api/basicinformation/maintenanceitem'
-import { getServiceType, getOrgSidByPath, selSubjectInfo } from '@/api/Common/dictcommons'
+import { typeValues, getOrgSidByPath, selSubjectInfo } from '@/api/Common/dictcommons'
 
 export default {
   name: 'MaintenanceItemAdd',
@@ -191,7 +191,7 @@ export default {
           this.goodsModel_list = res.data
         }
       })
-      getServiceType({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((res) => {
+      typeValues({ type: 'as_servicesubject' }).then((res) => {
         if (res.success) {
           this.serviceType_list = res.data
         }
@@ -259,9 +259,9 @@ export default {
       }
     },
     serviceTypeChange(value) {
-      const choose = this.serviceType_list.filter((item) => item.serviceType === value)
+      const choose = this.serviceType_list.filter((item) => item.dictValue === value)
       if (choose !== null && choose.length > 0) {
-        this.formobj.serviceTypeSid = choose[0].serviceTypeSid
+        this.formobj.serviceTypeSid = choose[0].dictKey
       } else {
         this.formobj.serviceTypeSid = ''
       }
diff --git a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
index ce21e7f742..46bcbabb14 100644
--- a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
@@ -48,7 +48,7 @@
             <el-table-column label="工种" align="center" width="150">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.serviceType" placeholder="请选择" @change="serviceTypeChange($event, scope.row)" clearable filterable>
-                  <el-option v-for="item in serviceType_list" :key="item.serviceTypeSid" :label="item.serviceType" :value="item.serviceType"></el-option>
+                  <el-option v-for="item in serviceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -178,7 +178,7 @@
 import req from '@/api/basicinformation/setmeal'
 import maintenanceitem from '@/api/basicinformation/maintenanceitem'
 import additionitem from '@/api/basicinformation/additionitem'
-import { getOrgSidByPath, getServiceType, selSubjectInfo } from '@/api/Common/dictcommons'
+import { getOrgSidByPath, typeValues, selSubjectInfo } from '@/api/Common/dictcommons'
 
 export default {
   name: 'SetMealAdd',
@@ -246,7 +246,7 @@ export default {
   },
   methods: {
     init() {
-      getServiceType({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((res) => {
+      typeValues({ type: 'as_servicesubject' }).then((res) => {
         if (res.success) {
           this.serviceType_list = res.data
         }
@@ -352,9 +352,9 @@ export default {
       document.body.click()
     },
     serviceTypeChange(value, row) {
-      const choose = this.serviceType_list.filter((item) => item.serviceType === value)
+      const choose = this.serviceType_list.filter((item) => item.dictValue === value)
       if (choose !== null && choose.length > 0) {
-        row.serviceTypeSid = choose[0].serviceTypeSid
+        row.serviceTypeSid = choose[0].dictKey
       } else {
         row.serviceTypeSid = ''
       }

From 4ec65ecbac8c9a06176e653df6af417edfa1d228 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 3 Dec 2024 09:44:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B9=E7=9B=AE--?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B7=A5=E7=A7=8D=E3=80=81=E7=A7=91=E7=9B=AE?=
 =?UTF-8?q?=E6=97=B6=E6=94=B9=E4=B8=BA=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenanceitem/maintenanceitemAdd.vue         | 12 ++++++------
 .../views/basicinformation/setmeal/setmealAdd.vue  | 14 +++++++-------
 yxt-as-ui/src/views/maintenanceReceive/index.vue   | 10 ++++------
 .../preregistration/preregistrationAdd.vue         | 10 +++++-----
 .../views/operation/repairbill/repairbillAdd.vue   | 10 +++++-----
 .../views/operation/salesticket/salesticketAdd.vue |  9 +--------
 6 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index cf956689a0..0c9d77e7d4 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -33,7 +33,7 @@
               <div class="span-sty"><span class="icon">*</span>科目</div>
               <el-form-item prop="subjectName">
                 <el-select class="addinputInfo" v-model="formobj.subjectName" placeholder="请选择" @change="subjectChange" clearable filterable>
-                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
+                  <el-option v-for="item in subject_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -124,7 +124,7 @@
 
 <script>
 import req from '@/api/basicinformation/maintenanceitem'
-import { typeValues, getOrgSidByPath, selSubjectInfo } from '@/api/Common/dictcommons'
+import { typeValues, getOrgSidByPath } from '@/api/Common/dictcommons'
 
 export default {
   name: 'MaintenanceItemAdd',
@@ -191,7 +191,7 @@ export default {
           this.goodsModel_list = res.data
         }
       })
-      typeValues({ type: 'as_servicesubject' }).then((res) => {
+      typeValues({ type: 'as_servicetype' }).then((res) => {
         if (res.success) {
           this.serviceType_list = res.data
         }
@@ -201,7 +201,7 @@ export default {
           this.manufacturer_list = res.data
         }
       })
-      selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+      typeValues({ type: 'as_servicesubject' }).then.then((resp) => {
         if (resp.success) {
           this.subject_list = resp.data
         }
@@ -251,9 +251,9 @@ export default {
       return val
     },
     subjectChange(value) {
-      const choose = this.subject_list.filter((item) => item.subject === value)
+      const choose = this.subject_list.filter((item) => item.dictValue === value)
       if (choose.length > 0 && choose !== null) {
-        this.formobj.subjectSid = choose[0].subjectSid
+        this.formobj.subjectSid = choose[0].dictKey
       } else {
         this.formobj.subjectSid = ''
       }
diff --git a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
index 46bcbabb14..6e02f06ca0 100644
--- a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
@@ -55,7 +55,7 @@
             <el-table-column label="科目" align="center" width="150">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.subject" placeholder="请选择" @change="subjectChange($event, scope.row)" clearable filterable>
-                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
+                  <el-option v-for="item in subject_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -121,7 +121,7 @@
             <el-table-column label="科目" align="center" width="150">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.subject" placeholder="请选择" @change="subjectChange($event, scope.row)" clearable filterable>
-                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
+                  <el-option v-for="item in subject_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -178,7 +178,7 @@
 import req from '@/api/basicinformation/setmeal'
 import maintenanceitem from '@/api/basicinformation/maintenanceitem'
 import additionitem from '@/api/basicinformation/additionitem'
-import { getOrgSidByPath, typeValues, selSubjectInfo } from '@/api/Common/dictcommons'
+import { getOrgSidByPath, typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'SetMealAdd',
@@ -246,12 +246,12 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'as_servicesubject' }).then((res) => {
+      typeValues({ type: 'as_servicetype' }).then((res) => {
         if (res.success) {
           this.serviceType_list = res.data
         }
       })
-      selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((res) => {
+      typeValues({ type: 'as_servicesubject' }).then((res) => {
         if (res.success) {
           this.subject_list = res.data
         }
@@ -360,9 +360,9 @@ export default {
       }
     },
     subjectChange(value, row) {
-      const choose = this.subject_list.filter((item) => item.subject === value)
+      const choose = this.subject_list.filter((item) => item.dictValue === value)
       if (choose !== null && choose.length > 0) {
-        row.subjectSid = choose[0].subjectSid
+        row.subjectSid = choose[0].dictKey
       } else {
         row.subjectSid = ''
       }
diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue
index b0e83ca924..99670e18db 100644
--- a/yxt-as-ui/src/views/maintenanceReceive/index.vue
+++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue
@@ -28,8 +28,8 @@
               <el-form-item label="科目">
                 <el-select v-model="queryParams.params.subject" filterable clearable placeholder="请选择"
                   style="width:100%">
-                  <el-option v-for="item in subjectList" :key="item.subjectSid" :label="item.subject"
-                    :value="item.subject" />
+                  <el-option v-for="item in subjectList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictValue" />
                 </el-select>
               </el-form-item>
               <el-form-item label="客户名称">
@@ -114,7 +114,6 @@
 <script>
   import req from '@/api/maintenanceReceive/maintenanceReceive.js'
   import {
-    selSubjectInfo,
     typeValues,
     getOrgSidByPath
   } from '@/api/Common/dictcommons'
@@ -245,9 +244,8 @@
             this.billTypeList = res.data
           }
         })
-        selSubjectInfo({
-          useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
-            'defaultOrgPath').lastIndexOf('/') + 1)
+        typeValues({
+          type: 'as_servicesubject'
         }).then((resp) => {
           if (resp.success) {
             this.subjectList = resp.data
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
index 8c19b37fbe..b9ad95c19a 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
@@ -55,7 +55,7 @@
               <div class="span-sty"><span class="icon">*</span>科目</div>
               <el-form-item prop="subject">
                 <el-select class="addinputInfo" v-model="formobj.subject" :disabled="formobj.sitemVos.length > 0" placeholder="请选择" @change="changeSubject" clearable filterable>
-                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
+                  <el-option v-for="item in subject_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -154,7 +154,7 @@
 <script>
 import req from '@/api/operation/preregistration'
 import Pagination from '@/components/pagination'
-import { selAllByOrgSidPath, selSubjectInfo, getServiceItemListPage } from '@/api/Common/dictcommons'
+import { selAllByOrgSidPath, getServiceItemListPage, typeValues } from '@/api/Common/dictcommons'
 import selectCustomer from '@/components/publicPage/selectCustomer'
 
 export default {
@@ -247,7 +247,7 @@ export default {
           this.user_list = resp.data
         }
       })
-      selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+      typeValues({ type: 'as_servicesubject' }).then((resp) => {
         if (resp.success) {
           this.subject_list = resp.data
         }
@@ -327,9 +327,9 @@ export default {
       }
     },
     changeSubject(value) {
-      const choose = this.subject_list.filter((item) => item.subject === value)
+      const choose = this.subject_list.filter((item) => item.dictValue === value)
       if (choose.length > 0 && choose !== null) {
-        this.formobj.subjectSid = choose[0].subjectSid
+        this.formobj.subjectSid = choose[0].dictKey
       } else {
         this.formobj.subjectSid = ''
       }
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index 0d3dd6960e..da3c9408cd 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -40,7 +40,7 @@
               <div class="span-sty"><span class="icon">*</span>科目</div>
               <el-form-item prop="subject">
                 <el-select class="addinputInfo" :disabled="formobj.sitemVos.length > 0 || formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.subject" placeholder="请选择" @change="changeSubject" clearable filterable>
-                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
+                  <el-option v-for="item in subject_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -540,7 +540,7 @@
 <script>
 import req from '@/api/operation/repairbill'
 import additionitem from '@/api/basicinformation/additionitem'
-import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues, getListByUseOrgSid, getServiceItemListPage, getInvoicingList } from '@/api/Common/dictcommons'
+import { selAllByOrgSidPath, getGroupList, typeValues, getListByUseOrgSid, getServiceItemListPage, getInvoicingList } from '@/api/Common/dictcommons'
 import selectCustomer from '@/components/publicPage/selectCustomer'
 
 export default {
@@ -854,7 +854,7 @@ export default {
           this.shClaimType_list = res.data
         }
       })
-      selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+      typeValues({ type: 'as_servicesubject' }).then((resp) => {
         if (resp.success) {
           this.subject_list = resp.data
         }
@@ -990,9 +990,9 @@ export default {
       }
     },
     changeSubject(value) {
-      const choose = this.subject_list.filter((item) => item.subject === value)
+      const choose = this.subject_list.filter((item) => item.dictValue === value)
       if (choose.length > 0 && choose !== null) {
-        this.formobj.subjectSid = choose[0].subjectSid
+        this.formobj.subjectSid = choose[0].dictKey
       } else {
         this.formobj.subjectSid = ''
       }
diff --git a/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
index 5e60d7341b..83710fe8cd 100644
--- a/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
+++ b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
@@ -206,9 +206,8 @@
 <script>
 import req from '@/api/operation/salesticket'
 import additionitem from '@/api/basicinformation/additionitem'
-import { selAllByOrgSidPath, selSubjectInfo, typeValues, listPageSales, getOrgSidByPath, getInvoicingList } from '@/api/Common/dictcommons'
+import { selAllByOrgSidPath, typeValues, listPageSales, getOrgSidByPath, getInvoicingList } from '@/api/Common/dictcommons'
 import selectCustomer from '@/components/publicPage/selectCustomer'
-import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'SalesTicketAdd',
@@ -221,7 +220,6 @@ export default {
       viewState: 1,
       submitdisabled: false,
       user_list: [], // 销售人员
-      subject_list: [], // 科目
       invoiceType_list: [], // 发票类型
       companyInvoicing_list: [], // 开票单位
       activeNames: '1',
@@ -374,11 +372,6 @@ export default {
           this.companyInvoicing_list = res.data
         }
       })
-      selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
-        if (resp.success) {
-          this.subject_list = resp.data
-        }
-      })
       selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.user_list = resp.data