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

src/components/schedul/schedul-orderlist.vue

@@ -291,7 +291,7 @@
             <div>
               <div>
                 <div class="SchImg_List" v-for="(item,index) in addMsg2.FileList">
-                  <img :src="item" alt="">
+                  <img :src="item"  alt="">
                   <i class="iconfont icon-yiquxiao sch_del" @click="handleRemoveAdd(index)"></i>
                 </div>
                 <el-upload class="schedul_Upload" style="display:inline;" action="" list-type="picture-card"
@@ -310,10 +310,12 @@
         </div>
         <div class="secondList_Bottom">
           <div class="tufa_List">
-            <div class="tufa_left" v-if="EmergenciesObj&&EmergenciesObj.FileList">
-              <el-image :src="EmergenciesObj.FileList[0]" :preview-src-list="EmergenciesObj.FileList">
-              </el-image>
-            </div>
+            <template v-if="EmergenciesObj&&EmergenciesObj.FileList.length>0">
+              <div class="tufa_left">
+                <el-image :src="EmergenciesObj.FileList[0]" :preview-src-list="EmergenciesObj.FileList">
+                </el-image>
+              </div>
+            </template>
             <div class="SchOtherContent" v-if="EmergenciesObj.OtherContent">
               {{EmergenciesObj.OtherContent}}
             </div>
@@ -392,7 +394,7 @@
         </div>
         <div class="secondList_Bottom">
           <div class="tufa_List">
-            <div class="tufa_left" v-if="HandoverObj&&HandoverObj.FileList">
+            <div class="tufa_left" v-if="HandoverObj&&HandoverObj.FileList.length>0">
               <el-image :src="HandoverObj.FileList[0]" :preview-src-list="HandoverObj.FileList">
               </el-image>
             </div>
@@ -629,6 +631,13 @@
         SetDutyContent(saveWorkMsg).then(res => {
           this.isShowSure = false;
           this.getWorkList();
+          this.$q.notify({
+            icon: 'iconfont icon-chenggong',
+            color: 'accent',
+            timeout: 2000,
+            message: res.Message,
+            position: 'top'
+          })
         })
         this.isShowSure = false;
       },
@@ -696,11 +705,11 @@
       //修改突发
       EditTufa(obj) {
         this.addMsg2.OtherContent = obj.OtherContent;
-        this.addMsg2.FileList = obj.FileList;
+        this.addMsg2.FileList = JSON.parse(JSON.stringify(obj.FileList));
       },
       EditJiaojie(obj) {
         this.addMsg3.OtherContent = obj.OtherContent;
-        this.addMsg3.FileList = obj.FileList;
+        this.addMsg3.FileList = JSON.parse(JSON.stringify(obj.FileList));
       },
       //删除突发
       delTufa() {

src/pages/scheduling/scheduleBoard.vue

@@ -264,7 +264,7 @@
             <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>
+              <span v-if="dataList.WeekDay"> {{dataList.WeekDay.replace('星期','周')}}</span>
               {{dataList.StartTime}}-{{dataList.EndTime}}
             </div>
             <div class="Sctop_Color">