From 508f39d58f86f821f47504dd0a92adb08bbfcbf2 Mon Sep 17 00:00:00 2001
From: gegeya <gegeya@qq.com>
Date: Fri, 1 Sep 2023 16:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=92=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/course/AddCourse.vue            | 24 ++++++++-----------
 .../src/views/course/EditCourse.vue           | 18 +++++++-------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/course/AddCourse.vue b/ant-design-vue-jeecg/src/views/course/AddCourse.vue
index 9ffbd51..fdce1dd 100644
--- a/ant-design-vue-jeecg/src/views/course/AddCourse.vue
+++ b/ant-design-vue-jeecg/src/views/course/AddCourse.vue
@@ -21,12 +21,7 @@
         <a-col :span="8">
           <a-form-item label="所属院系" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <!-- 删除multi -->
-            <!-- <j-select-depart v-model="model.depid" @change="getMajor()" /> -->
-            <j-select-depart
-              v-decorator="['depid', { initialValue: initiaDeipd }]"
-              :trigger-change="true"
-              @change="getMajor()"
-            />
+            <j-select-depart v-model="model.depid" @change="getMajor()" />
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -110,7 +105,7 @@
             <!-- 修改 -->
             <!--            <j-search-select-tag dict="se_semester,name,id"></j-search-select-tag>-->
             <!-- <j-search-select-tag dict="xueqi" v-model="model.year"></j-search-select-tag> -->
-            <j-dict-select-tag type="radio" v-model="model.semester" dictCode="xueqi" placeholder="请选择" />
+            <j-dict-select-tag type="radio" v-model="model.year" dictCode="xueqi" placeholder="请选择" />
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -443,15 +438,15 @@ export default {
     return {
       fs: false,
       show: false,
-      initiaDeipd: '01dfe0b225894beb9f37d3aa4d93183e',
+
       model: {
         category: 1,
         cooperativeEducation: 0,
-        semester: '1',
-        depid: '01dfe0b225894beb9f37d3aa4d93183e',
-        majorid: '1479007021540012033',
-        verifier: '01dfe0b225894beb9f37d3aa4d93183e',
-        teachingandoffice: 'admin'
+        year: '1',
+        depid: '',
+        majorid: '',
+        verifier: '',
+        teachingandoffice: ''
       },
       dataLoaded: false,
 
@@ -666,10 +661,11 @@ export default {
     getData () {
       getAction(this.url.dqyh).then((res) => {
         if (res.success) {
-          this.model.initiaDeipd = res.result.depid
+          this.model.depid = res.result.depid
           this.model.teachingandoffice = res.result.teachingandoffice
           this.model.majorid = res.result.majorid
           this.model.verifier = res.result.verifier
+
         }
         this.dataLoaded = true // 数据加载完成后设置dataLoaded为true
       })
diff --git a/ant-design-vue-jeecg/src/views/course/EditCourse.vue b/ant-design-vue-jeecg/src/views/course/EditCourse.vue
index f401c5a..d367866 100644
--- a/ant-design-vue-jeecg/src/views/course/EditCourse.vue
+++ b/ant-design-vue-jeecg/src/views/course/EditCourse.vue
@@ -46,7 +46,7 @@
         <a-col :span="8">
           <a-form-item label="课程类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag
-              type="list"
+              type="radio"
               v-decorator="['category']"
               :trigger-change="true"
               dictCode="coursecategory"
@@ -56,12 +56,12 @@
         </a-col>
         <a-col :span="8">
           <a-form-item label="课程性质" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-tree-select
-              v-decorator="['nature']"
-              placeholder="课程性质"
-              dict="se_nature,content,id"
-              pidField="pid"
-              pidValue="0"
+            <j-dict-select-tag
+              type="radio"
+              v-decorator="['nature', { initialValue: '1298167997234712578' }]"
+              :trigger-change="true"
+              dictCode="se_nature,content,id,(pid='0' and id!='1298168032655609858') or pid='1298168032655609858'"
+              placeholder="请选择课程类别"
             />
           </a-form-item>
         </a-col>
@@ -117,7 +117,7 @@
             <!-- <a-input v-decorator="['semester']" placeholder="请输入开课学期"></a-input> -->
             <!-- 修改 -->
             <!--            <j-search-select-tag dict="se_semester,name,id"></j-search-select-tag>-->
-            <j-search-select-tag dict="xueqi" v-model="model.year"></j-search-select-tag>
+            <j-dict-select-tag type="radio" v-model="model.year" dictCode="xueqi" placeholder="请选择" />
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -407,7 +407,7 @@
       <!-- <el-button type="primary" size="small" @click="handleReset" class="el-left">清空</el-button> -->
       <el-button type="primary" size="small" @click="handleOk" class="el-left">确定</el-button>
       <!-- <el-button type="primary" size="small" @click="handleOk" class="el-right">暂存</el-button> -->
-      <el-button type="primary" size="small" @click="handleAdd" class="el-right">增加下一门课</el-button>
+      <!-- <el-button type="primary" size="small" @click="handleAdd" class="el-right">增加下一门课</el-button> -->
     </div>
     <!-- 修改 -->
     <!-- <add-course ref="modalForm" @ok="modalFormOk"></add-course> -->