diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index 037d846..ef669ad 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -262,19 +262,36 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-->
-->
-->
1) {
+ // res = pNum[0] + '.' + pNum[1].substr(0, 1)
+ // console.log(pNum[0], pNum[1].substr(0, 1))
+ // } else {
+ // res = cbm
+ // }
+ console.log('尺码： ', cbm)
this.details.cbm = cbm
}
}
diff --git a/src/views/main/DjyApiAuth/index.vue b/src/views/main/DjyApiAuth/index.vue
index 32b2ecd..16bb9f1 100644
--- a/src/views/main/DjyApiAuth/index.vue
+++ b/src/views/main/DjyApiAuth/index.vue
@@ -25,56 +25,84 @@
-
+
-
+ /> -->
+
+
+
+ {{ item.name }}
+
+
-
+
- -->
+
-
+
-
-
- 启用
-
-
- 禁用
-
-
- 全部
-
-
+
+ 全部
+ 启用
+ 禁用
+
-
+
查询
重置
@@ -137,8 +165,11 @@ import {
DeleteApi,
GetApiDetail,
DisableApi,
- ResetApi
+ ResetApi,
+ SysTenantPage,
+ GetSysUserPage
} from '@/api/modular/main/DjyApiAuth'
+import { AutoComplete } from 'ant-design-vue'
export default {
name: 'BookingLedger',
@@ -146,6 +177,7 @@ export default {
XCard,
columnSetting,
addForm,
+ AutoComplete
},
data() {
return {
@@ -186,12 +218,32 @@ export default {
addFormType: 'add',
addFromIndex: null,
apiInterface: [],
+ TenantData: [],
+ userList: []
}
},
+ computed: {
+ userListArr() {
+ if (this.userList) {
+ const arr = []
+ this.userList.map((item, index) => {
+ if (!arr.includes(item.name)) {
+ arr.push(item.name)
+ }
+ })
+ return arr
+ } else {
+ return []
+ }
+ }
+ },
created() {
this.getList()
this.apiInterface = this.$options.filters['dictData']('api_interface')
console.log('apiInterface', this.apiInterface)
+ SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
+ this.TenantData = res.data.rows
+ })
},
mounted() {},
methods: {
@@ -402,7 +454,37 @@ export default {
cancel() {},
filterOption(input, option) {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
- }
+ },
+ getUserList(name = '') {
+ const tenantName = this.form.getFieldValue('TenantName')
+ let tenantId = ''
+ this.TenantData.map((item, index) => {
+ if (tenantName === item.name) {
+ tenantId = item.id
+ }
+ })
+ GetSysUserPage({
+ name: name,
+ tenantId: tenantId
+ })
+ .then(res => {
+ if (res.success) {
+ this.userList = res.data
+ }
+ })
+ .catch(err => {
+ console.log(err)
+ })
+ },
+ // userSelect(value) {
+ // const index = this.userListArr.indexOf(value)
+ // this.formData.userId = this.userList[index].id || ''
+ // this.formData.userName = this.userList[index].name || ''
+ // this.formData.userCode = this.userList[index].account || '' // ?? 用户代码
+ // },
+ userChange(value) {
+ this.getUserList(value)
+ },
}
}
diff --git a/src/views/main/DjyApiAuth/modules/addForm.vue b/src/views/main/DjyApiAuth/modules/addForm.vue
index fd8c669..492e13c 100644
--- a/src/views/main/DjyApiAuth/modules/addForm.vue
+++ b/src/views/main/DjyApiAuth/modules/addForm.vue
@@ -51,6 +51,7 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
+ prop="tenantName"
>
-
+
-
+ {{ formData.apiKey }}
+
@@ -110,18 +113,6 @@
-
-
- {{ formData.apiKey }}
-
-
-
{
if (res.success) {
@@ -259,14 +251,14 @@ import {
})
},
- // 销售
- saleSelect(value) {
+ userSelect(value) {
const index = this.userListArr.indexOf(value)
this.formData.userId = this.userList[index].id || ''
this.formData.userName = this.userList[index].name || ''
+ this.formData.userCode = this.userList[index].account || '' // ?? 用户代码
},
- saleChange(value) {
- this.getUserList(value, 'sale')
+ userChange(value) {
+ this.getUserList(value)
},
changeExpireDate (date, dateString) {
console.log(dateString)
@@ -297,7 +289,7 @@ import {
},
apiHandleChange (value) {
console.log(value)
- this.formData.apiCode = this.apiInterface[value].id
+ this.formData.apiCode = this.apiInterface[value].code
this.formData.apiName = this.apiInterface[value].name
}
}