bzkf30 2 years ago
parent
commit
68db724b4d

+ 5 - 6
src/pages/xdjx/stxkgl/xskcpjb/detail.vue

@@ -31,7 +31,7 @@ const loading = ref(true)
 
 // #region (props)
 const props = defineProps<{
-  // aid: string,
+  aid: string,
   bid: string,
 }>()
 // #endregion
@@ -117,8 +117,7 @@ const handleTableRowBtn_add = () => {
   whichDialogSubmit = 'add'
   dialogForm_Data.value = {
     xsk_id: props.bid,
-    // xsxk_id: props.aid
-
+    xsxk_id: props.aid
   }
   dialogVisible_addOrEdit.value = true
 }
@@ -195,7 +194,7 @@ function queryApi() {
       ...queryForm_Data.value,
       limit: limit.value,
       page: currentPage.value,
-      // xsxk_id: props.aid,
+      xsxk_id: props.aid,
       xsk_id: props.bid,
     }
   }).then((response: { data: { total_rows: string, page_data: TYPE_TABLE_FIELD[] } }) => {
@@ -342,7 +341,7 @@ init()
     </el-form>
     <div class="divider"></div>
     <div>
-      <import-button @success="queryApi" :url="URL_CUT_REF" :importKey="('xsk_id='+bid)"></import-button>
+      <import-button @success="queryApi" :url="URL_CUT_REF" :importKey="('xsxk_id='+aid+'&xsk_id='+bid)"></import-button>
       <el-button @click="handleTableRowBtn_export" type="success">导出打印</el-button>
       <el-button @click="handleTableRowBtn_add" type="primary">新增</el-button>
       <el-button @click="handleTableRowBtn_delete" type="danger">删除</el-button>
@@ -388,7 +387,7 @@ init()
         <!-- <el-input v-model="dialogForm_Data.xskp_xsxm" clearable /> -->
         <remote-select v-model="dialogForm_Data.xskp_xsxh" v-model:model-name="dialogForm_Data.xskp_xsxm"
           :fields="['xsxx_xsxh', 'xsxx_xsxm']" url="/xdjx/stxkgl_xktj_xkqk/index" :d="{
-            // xsxk_id: props.aid,
+            xsxk_id: props.aid,
             xsk_id: props.bid,
           }" :change="(item: any) => {
   dialogForm_Data.grade_id = item.grade_id

+ 2 - 1
src/pages/xdjx/stxkgl/xskcpjb/index.vue

@@ -92,7 +92,7 @@ const handleTableColBtn_audit = (scope: { row: TYPE_TABLE_FIELD }) => {
   dialogVisible_audit.value = true
 }
 const handleTableColBtn_detail = (scope: { row: TYPE_TABLE_FIELD }) => {
-  router.push({ name: DetailName, params: { [DetailParam]: scope.row[TABLE_KEY] } })
+  router.push({ name: DetailName, params: { aid: scope.row.xsxk_id, [DetailParam]: scope.row[TABLE_KEY] } })
 }
 const handleTableColBtn_delete = async (scope: { row: TYPE_TABLE_FIELD }) => {
   const resp = await deleteApi(scope.row[TABLE_KEY]);if(resp.code!=='1')return;ElMessage.success('删除成功');
@@ -280,6 +280,7 @@ init()
       <el-table :data="tableData" @selection-change="handleSelectionChange" v-loading="loading_table"
         element-loading-background="#ffffff70">
         <el-table-column type="selection"></el-table-column><el-table-column type="index" label="序号" width="60" :index="(i: number) => (currentPage - 1) * limit + i + 1" />
+        <el-table-column prop="xsxk_kcmc" label="课程名称" width="auto" show-overflow-tooltip></el-table-column>
         <el-table-column prop="xsk_kcpjmc" label="课程评价名称" width="auto" show-overflow-tooltip></el-table-column>
         <el-table-column prop="xsk_kcpjlx" label="评价类型" width="auto" show-overflow-tooltip></el-table-column>
         <el-table-column prop="xsk_cjr" label="创建人" width="auto" show-overflow-tooltip></el-table-column>

+ 1 - 1
src/router/routes/xdjx.ts

@@ -790,7 +790,7 @@ export default <RouteRecordDetailRaw[]>[
             "redirect": null
           },
           {
-            "path": "detail/:bid",
+            "path": "detail/:aid/:bid",
             "name": "-STXKGL-XSKCPJB-DETAIL",
             "props": true,
             "meta": {