新增题库查询和关联订单

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_1f7iels6h8w.css');
+@import url('//at.alicdn.com/t/font_2077629_cq0udyr5rpk.css');
 .q-scrollarea__thumb{
     z-index: 999999!important;
 }
@@ -25,7 +25,7 @@ body,
     font-family: -apple-system,BlinkMacSystemFont,'pingfang',' Microsoft YaHei',"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
     color: #3f4254;
 }
-.q-position-engine{
+.q-position-engine {
     z-index: 9999;
 }
 .remark-font{

src/components/question/questionlist-form.vue

@@ -46,13 +46,13 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
-        separator="none" :data="data" :columns="columns" row-key="QuestionId" selection="multiple"
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
+        separator="none" :data="data" :columns="columns" row-key="QuestionId" :selection="editStatus?'multiple':'none'"
         :selected.sync="selectedQuestion">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">问题列表</div>
           <q-space />
-          <div class="page-option">
+          <div class="page-option" v-if="editStatus">
             <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增题目" @click="EditQuestion(null)" />
             <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="批量设置" title="批量设置考级程度"
               @click="isShowEdit=true">
@@ -101,16 +101,18 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+            <q-btn v-if="editStatus" flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
               @click="EditQuestion(props.row)" />
-            <q-btn flat size="xs" icon="edit" color="negative" style="font-weight:400" label="删除"
+            <q-btn v-if="editStatus" flat size="xs" icon="edit" color="negative" style="font-weight:400" label="删除"
               @click="setQuestionStatus(props.row)"></q-btn>
-            <q-btn flat size="xs" icon="iconfont icon-shangyi2" :class="{'QuestionisVisible':!props.row.isShowFirst}"
+            <q-btn v-if="editStatus" flat size="xs" icon="iconfont icon-shangyi2" :class="{'QuestionisVisible':!props.row.isShowFirst}"
               color="accent" title="上移" style="font-weight:400;" label="" @click="getUpStatus(props.row,1)"></q-btn>
-            <q-btn flat size="xs" icon="iconfont icon-xiayi" :class="{'QuestionisVisible':!props.row.isShowLast}"
+            <q-btn v-if="editStatus" flat size="xs" icon="iconfont icon-xiayi" :class="{'QuestionisVisible':!props.row.isShowLast}"
               color="accent" title="下移" style="font-weight:400;" label="" @click="getUpStatus(props.row,2)"></q-btn>
-            <q-btn flat size="xs" icon="iconfont icon-fuzhi" color="accent" style="font-weight:400;" label=""
+            <q-btn v-if="editStatus" flat size="xs" icon="iconfont icon-fuzhi" color="accent" style="font-weight:400;" label=""
               @click="getCopyItem(props.row)"></q-btn>
+            <q-btn v-if="!editStatus" flat size="xs" color="primary" style="font-weight:400" label="查看"
+              @click="goDetail(props.row)"/>
           </q-td>
         </template>
       </q-table>
@@ -141,6 +143,10 @@
     props: {
       queryMsg: {
         type: Object,
+      },
+      editStatus:{
+        type: Boolean,
+        default: true
       }
     },
     meta: {
@@ -503,7 +509,7 @@
       },
       //点击跳转
       goDetail(item){
-        this.OpenNewUrl('questionInfo',{
+        this.OpenNewUrl('/course/questionInfo',{
           'QuestionId':item.QuestionId
         })
       }

src/components/sale/orderlist.vue

@@ -51,7 +51,7 @@
           <col width="7%" />
           <col width="7%" />
           <col width="7%" />
-          <col width="7%" />
+          <col width="7%" v-if="viewType==0"/>
           <col>
         </colgroup>
         <tr>
@@ -193,7 +193,7 @@
                 <span style="color: #02C499">{{item.OrderStateName}}</span>
               </div>
             </td>
-            <td style="border:none">
+            <td style="border:none" v-if="viewType==0">
               <template v-if="isEditOrder||AuthorityObj.isShowEdit">
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                   @click="editOrder(item)" />
@@ -599,7 +599,7 @@
                 <span style="color: #02C499">{{item.OrderStateName}}</span>
               </div>
             </td>
-            <td style="border:none;" v-if="AuthorityObj.isShowEdit">
+            <td style="border:none;" v-if="AuthorityObj.isShowEdit && viewType==0">
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑"
                 @click="editOrder(item)" />
               <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;display:none;">
@@ -860,6 +860,10 @@
       isShowEditBtn:{
         type: Number,
         default: null
+      },
+      viewType:{
+        type:Number,
+        default:0
       }
     },
     data() {

src/pages/teacher/testdatabase.vue

+<template>
+  <div>
+    <questionlist-form :queryMsg="qMsg" :editStatus="false"></questionlist-form>
+  </div>
+</template>
+<script>
+  import questionlistForm from '../../components/question/questionlist-form';
+  export default {
+    
+    meta: {
+      title: "题库查询"
+    },
+    components: {
+      questionlistForm
+    },
+    data() {
+      return {
+        qMsg: {
+          BankId: 0,
+          CourseId: 0
+        }
+      }
+    },
+    created() {
+      if (this.$route.query && this.$route.query.CourseId) {
+        this.qMsg.CourseId = this.$route.query.CourseId
+      }
+      if (this.$route.query && this.$route.query.BankId) {
+        this.qMsg.BankId = this.$route.query.BankId
+      }
+    },
+    mounted() {},
+    methods: {}
+  }
+
+</script>

src/router/routes.js

@@ -934,6 +934,16 @@ const routes = [{
     component: () =>
       import("pages/teacher/myClass")
   },
+  {
+    path: "/teacher/testdatabase", //题库查询
+    component: () =>
+      import("pages/teacher/testdatabase")
+  },
+  {
+    path: "/teacher/relation-order", //题库查询
+    component: () =>
+      import("pages/teacher/relationOrder")
+  },
   {
     path: "/teacher/teachMonthLessonCost", //月度课耗
     component: () =>