Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 5 months ago
parent
commit
fb90311701
  1. 18
      yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
  2. 20
      yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
  3. 10
      yxt-as-ui/src/views/maintenanceReceive/index.vue
  4. 10
      yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
  5. 10
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
  6. 9
      yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

18
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>
@ -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 { getServiceType, 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
}
})
getServiceType({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).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,17 +251,17 @@ 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 = ''
}
},
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 = ''
}

20
yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue

@ -48,14 +48,14 @@
<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>
<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, getServiceType, selSubjectInfo } from '@/api/Common/dictcommons'
import { getOrgSidByPath, typeValues } from '@/api/Common/dictcommons'
export default {
name: 'SetMealAdd',
@ -246,12 +246,12 @@ export default {
},
methods: {
init() {
getServiceType({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).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
}
@ -352,17 +352,17 @@ 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 = ''
}
},
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 = ''
}

10
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

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

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

9
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

Loading…
Cancel
Save