完善项目--选择工种时改为数据字段获取数据

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 = ''
       }

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 = ''
       }