Merge branch 'zcwy-teacher-manage' into master_1202

src/views/lecturer/InsideTeaching.vue

@@ -51,7 +51,7 @@
           style="width: 235px" 
           ></OrgClass>
         </a-form-item>
-        <a-form-item class="select" v-if="moreid == 2">
+        <!-- <a-form-item class="select" v-if="moreid == 2">
           <a-tree-select style="width: 235px;margin-bottom:20px" :fieldNames="{
             children: 'children',
             label: 'name',
@@ -61,7 +61,7 @@
             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
             :tree-data="sysTypeOptions" v-on:keydown.enter="enterPressHadlerSearch">
           </a-tree-select>
-        </a-form-item>
+        </a-form-item> -->
         <!-- <div style="width: 100%;"></div> -->
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="min-width: 200px ; height: auto ;margin-bottom:20px" v-model:value="score" placeholder="请选择评分" showArrow
@@ -424,7 +424,7 @@
           <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate||'-' }}</a-descriptions-item>
           <a-descriptions-item label="参训人数  ">{{ formParam.studys?formParam.studys+'人':'-' }}</a-descriptions-item>
           <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }}</a-descriptions-item>
-          <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item>
+          <!-- <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item> -->
           <a-descriptions-item label="备注  ">{{ formParam.remark||'-' }}</a-descriptions-item>
         </a-descriptions>
         <div v-if="formParam.createFrom == '0'">
@@ -862,13 +862,13 @@ export default {
           )
         }
       },
-      {
+      // {
-        title: '内容分类',
+      //   title: '内容分类',
-        dataIndex: 'courseTypeName',
+      //   dataIndex: 'courseTypeName',
-        key: 'courseTypeName',
+      //   key: 'courseTypeName',
-        ellipsis: true, align: "center",
+      //   ellipsis: true, align: "center",
-        width: 120,
+      //   width: 120,
-      },
+      // },
       {
         title: '授课时长(分钟) ',
         dataIndex: 'teaching',

src/views/lecturer/MonthlyStatistics.vue

@@ -35,7 +35,7 @@
                   :options="PlaceOfPayList" allowClear showSearch
                   v-on:keydown.enter="enterPressHadlerSearch"/>
           </a-form-item> -->
-          <a-form-item class="select " >
+          <!-- <a-form-item class="select " > -->
             <!-- <a-tree-select style="width: 230px"
 								:fieldNames="{
 									children: 'children',
@@ -52,10 +52,10 @@
 								:tree-data="sysTypeOptions"
                 v-on:keydown.enter="enterPressHadlerSearch">
 							</a-tree-select> -->
-            <a-select style="width: 235px" placeholder="请选择培训发生组织" v-model:value="searchParam.trainOrgId"
+            <!-- <a-select style="width: 235px" placeholder="请选择培训发生组织" v-model:value="searchParam.trainOrgId"
                 :options="getOrganizationList">
-              </a-select>
+              </a-select> -->
-          </a-form-item>
+          <!-- </a-form-item> -->
           <div style="display: flex; margin-bottom: 20px">
             <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
             <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
@@ -64,10 +64,10 @@
           </div>
         </a-form>
         <div style="width: 100%;"></div>   
-        <div style="display: flex; margin-bottom: 20px">
+        <!-- <div style="display: flex; margin-bottom: 20px">
             <a-button  class="resetbtn"  @click="handleFeeMonthly" type="primary"><UploadOutlined/>导出
                 </a-button>
-                </div>   
+                </div>    -->
       <!-- 表格 -->
       <div style="padding: 10px 0">
         <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"

src/views/lecturer/Organization.vue

@@ -354,7 +354,7 @@ export default{
         code: null,
         isContains: '0',
         affiliationOrgList: [],
-        locking: 0,
+        locking: 1,
       },
     })
     const PlaceOfPayList = ref([
@@ -638,6 +638,7 @@ const getTableDate = (obj) => {
     })
     const addTeacher=()=>{
       state.teacherdialog=true ,
+      state.formParam.locking = 0
       state.teacherdialogtitle="新增培训发生组织"
       state.vf = true
       lecturer.getAffiliationCode().then(res=>{
@@ -764,7 +765,7 @@ const getTableDate = (obj) => {
         code: null,
         isContains: '0',
         affiliationOrgList: [],
-        locking: 0,
+        locking: 1,
       }
     }
     async function validateField(name) {