提交报价单

package.json

@@ -18,9 +18,11 @@
     "core-js": "^3.6.5",
     "cos-js-sdk-v5": "^1.1.5",
     "element-ui": "^2.14.1",
+    "html2canvas": "^1.0.0-rc.7",
     "js-md5": "^0.7.3",
     "lockr": "^0.8.5",
     "mavon-editor": "^2.9.1",
+    "print-js": "^1.6.0",
     "quasar": "^1.0.0",
     "relation-graph": "^1.0.8",
     "v-viewer": "^1.5.1",

quasar.conf.js

@@ -48,7 +48,7 @@ module.exports = function (ctx) {
     build: {
       vueRouterMode: 'hash', // available values: 'hash', 'history'
       env: ctx.dev ? {
-        API: 'http://eduapi.oytour.com/api'
+        API: 'http://192.168.1.27:8300/api'
       } : {
         API: 'http://eduapi.oytour.com/api'
       },

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_r9bz8pay7o.css');
+@import url('//at.alicdn.com/t/font_2077629_izue8ioqz5e.css');
 
 html,
 body,
@@ -66,7 +66,7 @@ body,
 }
 .svg-icon.svg-icon-positive g [fill] {
     transition: fill .3s ease;
-    fill:var(--q-color-positive) !important;
+    fill:'#C9F7F5' !important;
 }
 .svg-icon.svg-icon-white g [fill] {
     transition: fill .3s ease;

src/api/course/index.js

@@ -270,4 +270,16 @@ export function saveCoursePreferential(data)
         method: 'post',
         data
       })
-}
+}
\ No newline at end of file
+
+/**
+ * 新增修改课程优惠
+ */
+ export function saveCourseOffer(data)
+ {
+     return request({
+         url: "/CourseOffer/SetCourseOffer",
+         method: 'post',
+         data
+       })
+ }
\ No newline at end of file

src/assets/css/table.sass

@@ -86,4 +86,28 @@
     position: sticky
     right: 0
     z-index: 1
-    box-shadow: rgba(0, 0, 0, 0.05) -2px 0px 0px
+    box-shadow: rgba(0, 0, 0, 0.05) -2px 0px 0px
\ No newline at end of file
+.sticky-header-table
+  /* height or max-height is important */
+
+  .q-table__top,
+  .q-table__bottom,
+  thead tr:first-child th
+    /* bg color is important for th; just specify one */
+    background-color: #f5f6f7
+
+  thead tr th
+    position: sticky
+    z-index: 2 !important
+  thead tr th:first-child
+    z-index: 3 !important
+  thead tr:first-child th
+    top: 0
+
+  /* this is when the loading indicator appears */
+  &.q-table--loading thead tr:last-child th
+    /* height of all previous header rows */
+    top: 48px
+.no-bottom-table
+  .q-table__bottom
+    display: none !important
\ No newline at end of file

src/components/global/notify.vue

@@ -48,7 +48,7 @@
                         <img :src="imgCov">
                     </div>
                     <div class="flex row items-center relative-position">
-                        <q-avatar size="30px" font-size="14px" rounded color="positive" class="q-mr-md" text-color="secondary">
+                        <q-avatar size="30px" font-size="14px" rounded style="background:#C9F7F5" class="q-mr-md" text-color="secondary">
                             <img :src="showObj.UserIcon" v-if="showObj.UserIcon">
                             <span v-else>{{showObj.AccountName.substring(0,1)}}</span>
                         </q-avatar>

src/components/global/user-right-box.vue

@@ -6,7 +6,7 @@
             <span class="remark-font">12条未读消息</span>
         </div>
         <div class="q-mt-lg flex">
-            <q-avatar size="100px" font-size="36px" rounded color="positive" text-color="white">
+            <q-avatar size="100px" font-size="36px" rounded style="background:#C9F7F5" text-color="white">
               <img :src="showObj.UserIcon" v-if="showObj.UserIcon">
               <span v-else>{{showObj.AccountName.substring(0,1)}}</span>
             </q-avatar>

src/components/okr/okr-emp-info.vue

@@ -6,7 +6,7 @@
           size="40px"
           font-size="18px"
           rounded
-          color="positive"
+          style="background:#C9F7F5"
           text-color="white"
         >
           <img :src="user.UserIcon" v-if="user.UserIcon" />

src/components/okr/okr-info.vue

@@ -6,7 +6,7 @@
           size="40px"
           font-size="18px"
           rounded
-          color="positive"
+          style="background:#C9F7F5"
           text-color="white"
         >
           <img :src="user.UserIcon" v-if="user.UserIcon" />

src/css/quasar.variables.sass

@@ -18,7 +18,7 @@ $accent    : #232125
 
 $dark      : #1d1d1d
 
-$positive  : #C9F7F5
+$positive  : #21ba45
 $negative  : #f5576c
 $info      : #31CCEC
 $warning   : #F2C037

src/layouts/MainLayout.vue

@@ -23,7 +23,7 @@
            <q-btn flat color="text-black" style="height:50px" @click="showInfo">
             <span class="text-grey q-mr-xs">Hi</span>
             <span class="text-dark q-mr-md">{{(userInfo&& userInfo.AccountName? userInfo.AccountName:"")}} </span>
-            <q-avatar size="35px" rounded color="positive" text-color="white">
+            <q-avatar size="35px" rounded style="background:#C9F7F5" text-color="white">
               <img :src="userInfo.UserIcon" v-if="userInfo&&userInfo.UserIcon">
               <span v-else>{{(userInfo&& userInfo.AccountName? userInfo.AccountName.substring(0,1):"") }}</span>
             </q-avatar>

src/pages/sale/courseList.vue

@@ -149,6 +149,7 @@ li {
               class="q-mr-md"
               icon="add"
               label="创建报价单"
+              @click="createQuotation"
             />
           </div>
         </template>
@@ -287,15 +288,21 @@ li {
         </q-card-section>
       </q-card>
     </q-dialog>
+    <q-dialog v-model="showForm" persistent>
+      <quotation-form :obj="null" @save="showForm=false"></quotation-form>
+    </q-dialog>
   </div>
 </template>
 <script>
 import { queryCoursePage } from "../../api/course/index";
+import quotationForm from '../../components/sale/quotation-form'
 export default {
   meta: {
     title: "课程预览"
   },
-  components: {},
+  components: {
+    quotationForm
+  },
   data() {
     return {
       currentUrl: "",
@@ -303,6 +310,7 @@ export default {
       loading: true,
       carousel:false,
       showContent:'',
+      showForm:false,
       columns: [
         {
           name: "CourseFeature",
@@ -415,6 +423,13 @@ export default {
     this.getcourselist();
   },
   methods: {
+    createQuotation(){
+      this.showForm=true
+      // this.$router.push({
+      //   path: '/sale/createQuotation'
+      // })
+      
+    },
     showContentDialog(content){
       this.showContent=content;
       this.carousel=true

src/router/routes.js

@@ -466,6 +466,11 @@ const routes = [{
         component: () =>
           import("pages/course/question.vue")
       },
+      {
+        path: "/sale/createQuotation", //报价单
+        component: () =>
+          import("pages/sale/quotation.vue")
+      },
       {
         path: "/course/courseinfo",
         component: () => import("pages/course/courseinfo.vue"),