Merge branch '250427-bugfix-shl' into test20250220

src/views/lecturer/ExternalTeaching.vue

@@ -28,7 +28,7 @@
           <!-- <div class="select addTimeBox">
             <div class="addTime">授课日期：</div> -->
             <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
-              separator="至" :placeholder="['授课日期开始时间', '授课日期结束时间']
+              separator="至" :placeholder="['授课/开发日期开始时间', '授课/开发日期结束时间']
               "
                v-on:keydown.enter="enterPressHadlerSearch" />
           <!-- </div> -->
@@ -106,7 +106,7 @@
               <a-space>
                 <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
                 <a-button type="link" @click="() => handleModify(record, String(record.courseform))" v-if="record.createFrom == 1&&checkMenu('lecturerRecordsEdit')">编辑</a-button>
-                <a-button v-if="record.isSuperPermission==='true'&&checkMenu('lecturerRecordsDel')" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <a-button v-if="record.createFrom == 1 && record.isSuperPermission==='true'&&checkMenu('lecturerRecordsDel')" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
               </a-space>
             </template>
           </template>
@@ -709,25 +709,25 @@ export default {
           )
         }
       },
-      {
+      // {
-        title: '数据来源',
+      //   title: '数据来源',
-        dataIndex: 'createFrom',
+      //   dataIndex: 'createFrom',
-        key: 'createFrom',
+      //   key: 'createFrom',
-        ellipsis: true, align: "center",
+      //   ellipsis: true, align: "center",
-        width: 120,
+      //   width: 120,
-        customRender: (value) => {
+      //   customRender: (value) => {
-          return (
+      //     return (
-            <div>
+      //       <div>
-              {value.record.createFrom == "0" || value.record.createFrom == "1"
+      //         {value.record.createFrom == "0" || value.record.createFrom == "1"
-                ? {
+      //           ? {
-                  "0": "系统生成",
+      //             "0": "系统生成",
-                  "1": "手动录入",
+      //             "1": "手动录入",
-                }[value.record.createFrom + ""] || ""
+      //           }[value.record.createFrom + ""] || ""
-                : "-"}
+      //           : "-"}
-            </div>
+      //       </div>
-          )
+      //     )
-        }
+      //   }
-      },
+      // },
       {
         title: '操作 ',
         dataIndex: 'operation',

src/views/lecturer/InsideLecturer.vue

@@ -84,7 +84,7 @@
                   </template> -->
                 <div
                   style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;user-select:text"
-                  :title="record.orgName">{{ record.neworganizationName }}</div>
+                  :title="orgSplit(record.orgName)">{{ orgSplit(record.orgName) }}</div>
                 <!-- </a-popover> -->
               </a-space>
             </template>
@@ -1390,6 +1390,14 @@ export default {
         return roleCode.some(t => t == admin)
       }
     }
+    const orgSplit = (val) => {
+      if (val) {
+        const org = val.split('/');
+        const reversedParts = org.reverse();
+        return reversedParts.join('/');
+      }
+      return '';
+    }
     return {
       ...toRefs(state),
       lecturerAdmin,
@@ -1456,6 +1464,7 @@ export default {
       createupdialog,
       removeList,
       checkMenu,
+      orgSplit,
     }
   },
 };

src/views/lecturer/InsideTeaching.vue

@@ -22,7 +22,7 @@
           <!-- <div class="select addTimeBox"> -->
             <!-- <div class="addTime">授课日期</div> -->
             <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
-              separator="至" :placeholder="['授课日期开始时间', '授课日期结束时间']" v-on:keydown.enter="enterPressHadlerSearch" />
+              separator="至" :placeholder="['授课/开发日期开始时间', '授课/开发日期结束时间']" v-on:keydown.enter="enterPressHadlerSearch" />
 <!--    @change="searchTimeChange" -->
           <!-- </div> -->
         </a-form-item>
@@ -299,7 +299,7 @@
                   allowClear 
                   showSearch
                    :filter-option="false"
-                  :options="filterOrgListSearch"
+                  :options="filterOrgListSearch2"
                   @search="handleOrgSearch"
                   @change="changeOrg">
                 </a-select>
@@ -578,6 +578,7 @@ export default {
     const state = reactive({
       orgListSearch: [],
       filterOrgListSearch: [],
+      filterOrgListSearch2: [],
       moreid: 1,
       title: '导入内部授课记录',
       vf: false,
@@ -935,10 +936,11 @@ export default {
         key: 'trainOrgName',
         ellipsis: true, align: "left",
         width: 200,
-         customRender: (value, record) => {
+         customRender: (value) => {
+          const orgName = value.record.trainOrgName ? value.record.trainOrgName.split('/').reverse().join('/') : '-';
           return (
             <div>
-              {value.record.trainOrgName||'-'}
+              {orgName}
             </div>
           )
         }
@@ -996,6 +998,9 @@ export default {
             value: item.id 
           }
         })
+
+        state.filterOrgListSearch2 = state.orgListSearch;
+
         state.orgListSearch.unshift({
           label: '全部', value: ''
         })

src/views/lecturer/LookInsideLecturer.vue

@@ -416,6 +416,11 @@ export default{
         key: 'updateName',
         ellipsis: true, align: "center",
         width: 120,
+        customRender: (value) => {
+          return (
+            <div>{value.record.updateName || '-'}</div>
+          )
+        }
       },
     ])
     //晋级记录列表数据