Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/classlog-form.vue

+<style>
+  .classLog{
+    margin:0 20px;
+    height:600px;
+    overflow:auto;
+  }
+  .classLog::-webkit-scrollbar {
+    width: 3px;
+    height: 3px;
+    background-color: #F5F5F5;
+  }
+  /*!*定义滚动条轨道 内阴影+圆角*!*/
+ .classLog::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    border-radius: 10px;
+    background-color: #F5F5F5;
+  }
+  /*!*定义滑块 内阴影+圆角*!*/
+  .classLog::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
+    background-color: #0ae;
+  }
+  .classLog_Title{
+    font-size:14px;
+    font-weight: bold;
+    color:#2D2D2D;
+  }
+</style>
 <template>
-  <div class="classLog">
+  <div class="classLog" style="margin:0 20px;">
     <q-timeline>
       <template v-for="(item,index) in dataList">
         <q-timeline-entry>
           <template v-slot:title>
-            {{item.LogTypeStr}} {{item.CreatHour}}
+            <div class="classLog_Title">{{item.LogTypeStr}} {{item.CreatHour}}</div>
           </template>
-          <div>
+          <div style="font-size:13px;">
             {{item.CreateByName}}: {{item.LogContent}}
           </div>
         </q-timeline-entry>

src/components/course/lesson-form.vue

@@ -151,7 +151,7 @@
       <div class="calenderHeader">
         <div>
           <el-radio-group v-model="checkedDays" size="mini">
-            <el-radio-button label="日"></el-radio-button>
+            <!-- <el-radio-button label="日"></el-radio-button> -->
             <el-radio-button label="月"></el-radio-button>
             <!-- <el-radio-button style="margin-left:20px;border-left:1px solid #DCDFE6;" label="今天"></el-radio-button> -->
           </el-radio-group>

src/components/course/record-form.vue

 <style>
   #timeleft div {
-    height: 65px;
+    height: 80px;
     color: #333333;
   }
 
@@ -55,6 +55,11 @@
     color:#F28C1D;
     background-color: #FCE8D2;
   }
+.timecenter_Line{
+  border-left:1px solid #366595; 
+  position:absolute;
+  left:130px;
+}  
 </style>
 <template>
   <div class="page-body">
@@ -74,7 +79,7 @@
             </div>
           </div>
           <div class="col-4" id="timecenter">
-            <div style="height:80px;  border-left:1px solid #366595; position:absolute;  left:130px;">
+            <div class="timecenter_Line" :style="{'height':getHeight(dataList.resultList)}">
               <ul>
                 <li class="cicle1" v-for="(item,index) in dataList.resultList" :class="{'reCordRed':item.ColorType==1,'reCordBlue':item.ColorType==2,
                 'reCordOrange':item.ColorType==3}" :style="{'top':getTop(index)}">
@@ -163,6 +168,9 @@
       },
       getTop(index) {
         return index * 77 + 'px';
+      },
+      getHeight(data){
+        return (data.length-1)*80+'px'
       }
     },
   }

src/pages/administration/document.vue

@@ -18,7 +18,7 @@
           </div>
           <q-select @input="getList" filled stack-label option-value="Id" option-label="EmployeeName" use-input
                       v-model="msg.UpdateBy" ref="DeptTier" :options="PersionList" label="发布人" :dense="false"
-                      class="col-3 q-pr-lg q-pb-lg" emit-value map-options   @filter="filterFn">
+                      class="col-3 q-pr-lg" emit-value map-options   @filter="filterFn">
             <template v-slot:no-option>
               <q-item>
                 <q-item-section class="text-grey">
@@ -30,18 +30,22 @@
           <div class="col-3">
             <q-select @input="getList" filled stack-label option-value="Id" option-label="Name"
                       v-model="msg.NoticeState" ref="DeptTier" :options="NoticeList" label="发布状态" :dense="false"
-                      class="col-6 q-pr-lg q-pb-lg" emit-value map-options  />
+                      class="col-6 q-pr-lg" emit-value map-options  />
           </div>
 
         </div>
-        <div class="page-option">
+        <!-- <div class="page-option">
           <q-btn color="accent" class="q-mr-md" icon="add" label="发布公文" @click="addDoc(null)" />
-
-        </div>
+        </div> -->
       </div>
       <div class="page-content">
         <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
                  separator="none" title="" :data="data" :columns="columns" row-key="name">
+          <template v-slot:top="props">
+            <div class="page-option" style="width:100%;">
+              <q-btn color="accent" style="float:right;margin-right:0;" size="sm" class="q-mr-md" icon="add" label="发布公文" @click="addDoc(null)" />
+            </div>
+          </template>
           <template v-slot:body-cell-NoticeStateName="props">
             <q-td :props="props">
               <div class="row" style="line-height: 30px">

src/pages/course/classManage.vue

@@ -22,14 +22,17 @@
           <q-select @input="getClassList" standout="bg-primary text-white" option-value="SId" option-label="SName"
             v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" />
         </div>
-      </div>
-      <div class="page-option">
-        <q-btn color="accent" class="q-mr-md" icon="add" label="新增班级" @click="EditCourse(null)" />
-      </div>
-    </div>
+      </div>    </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
-        separator="none" title="班级信息" :data="data" :columns="columns" row-key="name">
+        separator="none" :data="data" :columns="columns" row-key="name">
+        <template v-slot:top="props">
+          <div class="col-2 q-table__title">班级信息</div>
+          <q-space />
+          <div class="page-option">
+            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增班级" @click="EditCourse(null)" />
+          </div>
+        </template>
         <template v-slot:body-cell-ClassName="props">
           <q-td auto-width :props="props">
             <q-avatar size="md" style="background:#d4dfff;color:#2961FE;font-weight:bold;" v-if="props.row.ClassName">

src/pages/course/course.vue

@@ -16,13 +16,17 @@
             emit-value map-options label="状态" />
         </div>
       </div>
-      <div class="page-option">
-        <q-btn color="accent" class="q-mr-md" icon="add" label="新增课程" @click="EditCourse(null)" />
-      </div>
     </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
-        separator="none" title="课程信息" :data="data" :columns="columns" row-key="name">
+        separator="none" :data="data" :columns="columns" row-key="name">
+        <template v-slot:top="props">
+          <div class="col-2 q-table__title">课程信息</div>
+          <q-space />
+          <div class="page-option">
+            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增课程" @click="EditCourse(null)" />
+          </div>
+        </template>
         <template v-slot:body-cell-CoverImg="props">
           <q-td :props="props">
             <q-avatar square size="100px">

src/pages/sale/myOrder.vue

@@ -142,7 +142,7 @@
               </div>
             </td>
             <td  style="border:none">
-              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="edit(item)"
+              <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="编辑" @click="edit(item)"
                      />
               <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
                 <q-list>
@@ -296,9 +296,20 @@
                 <div class="col">
                   <div class="row" style="justify-content: space-between">
                     <span>收款单据：</span>
-                    <span @click="chanceType(item,1)">修改</span>
+                    <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)"/>
+                  </div>
+                  <div class="row wrap">
+                    <div class="finance row" style="background: rgba(41, 97, 254, 0.2);color: #2961FE">
+                      <span>124</span>
+                    </div>
+                    <div class="finance row" style="background: rgba(41, 97, 254, 0.2);color: #2961FE">
+                      <span>124</span>
+                    </div>
+                  </div>
+                  <div class="row" style="justify-content: space-between">
+                    <span>付款单据：</span>
+                    <q-btn flat size="xs" icon="edit"  style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)"/>
                   </div>
-
                 </div>
               </div>
             </td>
@@ -795,7 +806,7 @@
         let TCIDARR=[]
         TCIDARR.push(obj.ClassId)
         let orderObj = {
-          OrderID:obj.orderId,
+          OrderID:obj.OrderId,
           OrderSource:8,
           Obj: {},
           SourceID:17,
@@ -804,7 +815,7 @@
         this.$router.push({
           path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
           query:{
-            "Type":1,
+            "Type":type,
             "companyID":this.getLocalStorage().School_Id,
             "path": "",
             'blank':'y',
@@ -815,9 +826,6 @@
         });
       }
 
-
-
-
     }
   }
 
@@ -967,5 +975,14 @@
   .myOrder .remarks-b-b{
     text-align: right;position: absolute;right: 0px;bottom: 0px
   }
-
+  .myOrder .on-left{
+    margin-right: 5px;
+  }
+  .myOrder .finance{
+    padding: 1px 10px;
+    align-items: center;
+    justify-content: center;
+    border-radius: 4px;
+    margin-right: 5px;
+  }
 </style>