膝盖

src/components/schedul/schedul-orderlist.vue

@@ -24,7 +24,6 @@
   .sche_mid .el-input__inner {
     border: 0;
     width: 90%;
-    margin-left: 20px;
     height: 30px;
     line-height: 30px;
   }
@@ -116,14 +115,29 @@
     border: 1px dashed #c0ccda;
     border-radius: 6px;
     box-sizing: border-box;
-    width: 148px;
-    height: 148px;
+    width: 100%;
+    height: 107px;
     cursor: pointer;
     line-height: 146px;
     vertical-align: top;
     font-size: 40px;
     text-align: center;
-    line-height: 148px;
+    line-height: 107px;
+    position: relative;
+    background-size:cover;
+    color:#2961FE;
+    background-repeat: no-repeat;
+  }
+  .schedul_Upload .upDiv{
+    position: absolute;
+    width:100%;
+    height:100%;
+    left:0;
+    top:0;
+  }
+
+  .canClick_Color {
+    color: #2961FE !important;
   }
 
 </style>
@@ -140,24 +154,28 @@
         <div class="scheList_Bottom">
           <div class="sche_List_in" v-if="WorkObj">
             <template v-if="WorkObj.ItemType==1">
-              <div class="sche_Dian"></div>
-              <div class="sche_ListInner">{{WorkObj.ItemName}} </div>
-              <el-checkbox v-model="WorkObj.IsChecked"></el-checkbox>
+                <div class="sche_Dian" style="margin-top:5px;"></div>
+                <div class="sche_ListInner" style="margin:5px 10px 0 0;">{{WorkObj.ItemName}} </div>
+                <el-checkbox style="margin-top:5" v-model="WorkObj.IsChecked"></el-checkbox>
             </template>
             <template v-else-if="WorkObj.ItemType==2">
               <div class="sche_Dian"></div>
-              <div class="sche_ListInner">{{WorkObj.ItemName}} </div>
+              <div class="sche_ListInner" style="flex-shrink: 0">{{WorkObj.ItemName}} </div>
+              <div style="width:100%;">
                 <el-input v-model="WorkObj.WorkContent" placeholder="完成情况怎么样"></el-input>
+              </div>
             </template>
           </div>
+          <div></div>
         </div>
         <div class="sche_Fenye">
           <div class="sche_left">
-            <i class="iconfont icon-arrow-left" @click="WorkMove(1)"></i>
+            <i class="iconfont icon-arrow-left" :class="{'canClick_Color':WorkIndex!=0}" @click="WorkMove(1)"></i>
           </div>
           <div class="sche_Page">{{WorkIndex+1}}/{{this.saveObj.WorkList.length}}</div>
           <div class="sche_left">
-            <i class="iconfont icon-arrow-right1" @click="WorkMove(2)"></i>
+            <i class="iconfont icon-arrow-right1" :class="{'canClick_Color':WorkIndex!=saveObj.WorkList.length-1}"
+              @click="WorkMove(2)"></i>
           </div>
         </div>
       </div>
@@ -170,12 +188,13 @@
           <div class="sche_hengLine"></div>
           <el-popover placement="bottom" popper-class="tufaPop" width="400" trigger="click">
             <div>
-              <el-upload class="schedul_Upload" action="" :show-file-list="false" :http-request="UploadAttachment">
+              <el-upload class="schedul_Upload" action="" :style="{'background-image': 'url('+addMsg2.FileURL+')'}" :show-file-list="false" :http-request="UploadAttachment">
                 <i class="el-icon-plus"></i>
+                <div class="upDiv"></div> 
               </el-upload>
               <el-input type="textarea" style="margin-top:20px;" resize="none" placeholder="添加文字内容"
-                v-model="EmergenciesObj.OtherContent" :rows="5"></el-input>
-              <q-btn color="accent" size="sm" style="float:right;margin-top:10px;" label="保存" />
+                v-model="addMsg2.OtherContent" :rows="5"></el-input>
+              <q-btn color="accent" size="sm" style="float:right;margin-top:10px;" @click="saveTufa" label="保存" />
             </div>
             <div slot="reference" class="addSche">
               <i class="iconfont icon-img_haha"></i>
@@ -189,11 +208,11 @@
         </div>
         <div class="sche_Fenye">
           <div class="sche_left">
-            <i class="iconfont icon-arrow-left" @click="EmergenciesMove(1)"></i>
+            <i class="iconfont icon-arrow-left" :class="{'canClick_Color':EmergenciesIndex!=0}" @click="EmergenciesMove(1)"></i>
           </div>
           <div class="sche_Page">{{EmergenciesIndex+1}}/{{this.saveObj.EmergenciesList.length}}</div>
           <div class="sche_left">
-            <i class="iconfont icon-arrow-right1" @click="EmergenciesMove(2)"></i>
+            <i class="iconfont icon-arrow-right1" :class="{'canClick_Color':EmergenciesIndex!=saveObj.EmergenciesList.length-1}" @click="EmergenciesMove(2)"></i>
           </div>
         </div>
       </div>
@@ -224,6 +243,14 @@
   </div>
 </template>
 <script>
+
+  import {
+    SetDutyContent
+  } from '../../api/scheduling/schedu'
+  import {
+    UploadSelfFile
+  } from '../../api/common/common'
+
   export default {
     props: {
       saveObj: {
@@ -250,10 +277,25 @@
           OtherContent: "", //突发事项、工作交接(值班类型为2.3是使用)内容
           OtherRemark: "", //突发事项、工作交接(值班类型为2.3是使用)备注
         },
+        //突发事件数据
+        addMsg2:{
+          Id: 0, //编号
+          PlanShift: 0, //值班班次
+          PlanType: 2, //值班类型(1-值班事项，2-交接事项，3-突发事项)
+          PlanId: 0, //值班编号
+          FileURL: "", //文件路径
+          OtherContent: "", //突发事项、工作交接(值班类型为2.3是使用)内容
+          OtherRemark: "", //突发事项、工作交接(值班类型为2.3是使用)备注
+        },
+        isShowTufa:false,
       }
     },
     created() {
       console.log("saveObj", this.saveObj);
+    },
+    watch: {
+      saveObj: {
+        handler() {
           if (this.saveObj.EmergenciesList && this.saveObj.EmergenciesList.length > 0) {
             this.EmergenciesObj = this.saveObj.EmergenciesList[this.EmergenciesIndex];
           }
@@ -264,6 +306,10 @@
             this.WorkObj = this.saveObj.WorkList[this.WorkIndex];
           }
         },
+        deep: true
+      },
+    },
+
     methods: {
       WorkMove(type) {
         //上一条
@@ -316,8 +362,21 @@
         }
       },
       //上传
-      UploadAttachment() {
-
+      UploadAttachment(files) {
+        UploadSelfFile('Attachment', files.file, res => {
+          if (res.Code == 1) {
+            console.log(res,'数据');
+            this.addMsg2.FileURL = res.FileUrl;
+          }
+        })
+      },
+      //保存突发事件
+      saveTufa(){
+        this.addMsg2.PlanShift = this.saveObj.Shfit;
+        this.addMsg2.PlanId = this.saveObj.Id;
+        SetDutyContent(this.addMsg2).then(res => {
+            this.$emit('refreshPage');
+        })
       }
     },
   }

src/pages/scheduling/scheduleBoard.vue

@@ -124,9 +124,8 @@
 
   .sche_Topflex {
     display: flex;
-    width: 80%;
+    /* width: 90%; */
     height: 80px;
-    justify-content: space-between;
     align-items: center;
   }
 
@@ -214,6 +213,7 @@
     margin: 15px 20px 0 20px;
     font-size: 14px;
     color: #000000;
+    height:46px;
     padding-bottom: 10px;
     border-bottom: 1px solid #F3F3F3;
   }
@@ -256,8 +256,10 @@
             <div class="Sctop_Color">
               <span class="Scotop_little">校区</span>{{dataList.SchoolName}}
             </div>
-            <div class="Sctop_Color" style="width:300px;">
-              <span class="Scotop_little">时间</span>{{dataList.PlanDate}} {{dataList.WeekDay}}
+            <div class="Sctop_Color" style="width:400px;">
+              <span class="Scotop_little">时间</span>
+              <span v-if="dataList.PlanDate">{{dataList.PlanDate.replaceAll('-','.')}}</span>
+              <span v-if="dataList.WeekDay">{{dataList.WeekDay.replace('星期','周')}}</span>
               {{dataList.StartTime}}-{{dataList.EndTime}}
             </div>
             <div class="Sctop_Color">
@@ -266,7 +268,7 @@
           </div>
         </div>
         <div class="Sche_Bottom">
-          <schedulOrder :save-obj="msg"></schedulOrder>
+          <schedulOrder :save-obj="msg" @refreshPage="refreshPage"></schedulOrder>
           <schedulVisit :save-obj="msg"></schedulVisit>
         </div>
       </div>
@@ -321,6 +323,9 @@
           }
         })
       },
+      refreshPage(){
+        this.getList();
+      }
     },
   }
 </script>
\ No newline at end of file