Commit bdcd419d authored by 张伯涛's avatar 张伯涛

openApi问题修改

parent f5b5c33d
...@@ -208,6 +208,20 @@ ...@@ -208,6 +208,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位名称:" prop="unitId">
<el-select v-model="form.unitId" placeholder="请选择用户类型" :disabled="formDisabled" style="width: 100%">
<el-option
v-for="(item,index) in unitIdList"
:key="index"
:label="item.unitName"
:value="item.businessId"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="apiSecretKey:" prop="apiSecretKey"> <el-form-item label="apiSecretKey:" prop="apiSecretKey">
...@@ -269,6 +283,7 @@ import { ...@@ -269,6 +283,7 @@ import {
organizationUpdataApi, organizationUpdataApi,
iaminstitutionDecrypt iaminstitutionDecrypt
} from '@/api/openApi' } from '@/api/openApi'
import {listUnitAll} from "@/api/sysUnit";
export default { export default {
name: 'Index', name: 'Index',
...@@ -277,6 +292,7 @@ export default { ...@@ -277,6 +292,7 @@ export default {
}, },
data() { data() {
return { return {
unitIdList: [],
formDisabled: false, formDisabled: false,
dateRange: [], dateRange: [],
// 遮罩层 // 遮罩层
...@@ -292,6 +308,7 @@ export default { ...@@ -292,6 +308,7 @@ export default {
organizationalStructure: '' organizationalStructure: ''
}, },
form: { form: {
unitId: '',
flag: '1', flag: '1',
apiSecretKey: '', apiSecretKey: '',
apiPubKey: '', apiPubKey: '',
...@@ -317,12 +334,19 @@ export default { ...@@ -317,12 +334,19 @@ export default {
} }
}, },
created() { created() {
this.getListUnitAll() // 查询单位下拉
this.getList() // 列表查询 this.getList() // 列表查询
}, },
mounted() { mounted() {
}, },
methods: { methods: {
/** 查询单位下拉*/
getListUnitAll() {
listUnitAll().then(res => {
this.unitIdList = res.data
})
},
/** 新增修改的时候选择时间*/ /** 新增修改的时候选择时间*/
handleChangeTime() { handleChangeTime() {
if (this.dateRange && this.dateRange !== '' && this.dateRange !== undefined && this.dateRange.length > 0) { if (this.dateRange && this.dateRange !== '' && this.dateRange !== undefined && this.dateRange.length > 0) {
...@@ -366,6 +390,7 @@ export default { ...@@ -366,6 +390,7 @@ export default {
/** 表单重置*/ /** 表单重置*/
reset() { reset() {
this.form = { this.form = {
unitId: '',
flag: '1', flag: '1',
apiSecretKey: '', apiSecretKey: '',
apiPubKey: '', apiPubKey: '',
...@@ -465,6 +490,7 @@ export default { ...@@ -465,6 +490,7 @@ export default {
if (this.form.businessId !== undefined) { if (this.form.businessId !== undefined) {
const params = { const params = {
flag: this.form.flag, flag: this.form.flag,
unitId: this.form.unitId,
apiSecretKey: this.form.apiSecretKey, apiSecretKey: this.form.apiSecretKey,
apiPubKey: this.form.apiPubKey, apiPubKey: this.form.apiPubKey,
secretKey: this.encrypt(this.form.secretKey), secretKey: this.encrypt(this.form.secretKey),
...@@ -489,6 +515,7 @@ export default { ...@@ -489,6 +515,7 @@ export default {
} else { } else {
const paramsAdd = { const paramsAdd = {
flag: this.form.flag, flag: this.form.flag,
unitId: this.form.unitId,
apiSecretKey: this.form.apiSecretKey, apiSecretKey: this.form.apiSecretKey,
apiPubKey: this.form.apiPubKey, apiPubKey: this.form.apiPubKey,
secretKey: this.encrypt(this.form.secretKey), secretKey: this.encrypt(this.form.secretKey),
......
...@@ -878,7 +878,7 @@ export default { ...@@ -878,7 +878,7 @@ export default {
homeDisplay: '', homeDisplay: '',
flag: '', flag: '',
qualityLesson: '', qualityLesson: '',
lessonType: '', lessonType: [],
chronologicalOrdering: 1 chronologicalOrdering: 1
}, },
...@@ -1033,16 +1033,16 @@ export default { ...@@ -1033,16 +1033,16 @@ export default {
lessonName: '', lessonName: '',
classHour: '', classHour: '',
classPlan: '', classPlan: '',
classPlanSchool: '',
jobClassify: '', jobClassify: '',
tecClassify: '', tecClassify: '',
tecClassifySchool: '',
difficultyClassify: '', difficultyClassify: '',
lessonBrief: '', lessonBrief: '',
lessonTeaName: '', lessonTeaName: '',
lessonPrice: '', lessonPrice: '',
homeDisplay: '', homeDisplay: '',
flag: '', flag: '',
qualityLesson: '',
lessonType: [],
chronologicalOrdering: 1 chronologicalOrdering: 1
} }
this.loadData() this.loadData()
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="applicantName" label="申请人" :show-overflow-tooltip="true"> <el-table-column prop="applicantName" label="申请人" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.applicantName}} ({{ scope.row.userName }}-{{ scope.row.applicantPhone }}) {{ scope.row.applicantName }} ({{ scope.row.userName }}-{{ scope.row.applicantPhone }})
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="课程名称" prop="roleKey" :show-overflow-tooltip="true"> <el-table-column label="课程名称" prop="roleKey" :show-overflow-tooltip="true">
...@@ -805,18 +805,19 @@ ...@@ -805,18 +805,19 @@
</div> </div>
</div> </div>
</div> </div>
</div> <div class="drawerfooter">
<div class="drawerfooter"> <div class="drawer-area">
<div class="drawer-area"> <div class="test">
<div class="test"> <span style="color: #FF9900;cursor: pointer;" @click="showSelectedLesson"><span style="text-decoration: underline">已选{{ selectedLessonCount }}门</span>课程</span>
<span style="color: #FF9900;cursor: pointer;" @click="showSelectedLesson"><span style="text-decoration: underline">已选{{ selectedLessonCount }}门</span>课程</span> </div>
</div> <div class="cancelArea">
<div class="cancelArea"> <el-button class="cancelBtn" @click="drawerController.drawer = false">取 消</el-button>
<el-button class="cancelBtn" @click="drawerController.drawer = false">取 消</el-button> <el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>
<el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button> </div>
</div> </div>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
</div> </div>
</template> </template>
...@@ -1755,10 +1756,13 @@ input::-webkit-inner-spin-button { ...@@ -1755,10 +1756,13 @@ input::-webkit-inner-spin-button {
} }
.lessonDrawer { .lessonDrawer {
::v-deep .el-drawer__body{
overflow-y: auto;
}
.drawerBoby { .drawerBoby {
width: 100%; width: 100%;
height: 750px;; //height: 750px;;
overflow-y: auto; //overflow-y: auto;
//标题样式 //标题样式
.step-header { .step-header {
...@@ -1809,10 +1813,10 @@ input::-webkit-inner-spin-button { ...@@ -1809,10 +1813,10 @@ input::-webkit-inner-spin-button {
} }
.drawerfooter { .drawerfooter {
position: relative; //position: relative;
top: 2%; //top: 2%;
height: 400px; //height: 400px;
margin: 20px 70px 20px 0;
.drawer-area { .drawer-area {
margin-left: 7%; margin-left: 7%;
display: flex; display: flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment