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

src/components/schedul/schedul-orderlist.vue

@@ -87,7 +87,6 @@
   }
 
   .schNoneNum {
-    left: 174px !important;
     background-color: rgba(255, 255, 255, 0.5) !important;
   }
 
@@ -149,7 +148,7 @@
           <img src="../../assets/images/work_list.png" />
           <span class="word_sche">工作清单</span>
           <div class="sche_hengLine"></div>
-          <span class="word_scheNumber">{{this.saveObj.WorkList.length}}</span>
+          <span class="word_scheNumber" :class="{'schNoneNum':saveObj.WorkList.length==0}">{{this.saveObj.WorkList.length}}</span>
         </div>
         <div class="scheList_Bottom">
           <div class="sche_List_in" v-if="WorkObj">
@@ -184,8 +183,8 @@
           <img v-if="EmergenciesObj&&EmergenciesObj.FileURL" :src="EmergenciesObj.FileURL" />
           <img v-else src="../../assets/images/tufa.png" />
           <span class="word_sche">突发事件</span>
-          <span class="word_scheNumber">{{this.saveObj.EmergenciesList.length}}</span>
-          <div class="sche_hengLine"></div>
+          <span class="word_scheNumber" style="" :class="{'schNoneNum':saveObj.EmergenciesList.length==0}">{{this.saveObj.EmergenciesList.length}}</span>
+          <div class="sche_hengLine" ref="hengLine"></div>
           <el-popover placement="bottom" popper-class="tufaPop" width="400" trigger="click">
             <div>
               <el-upload class="schedul_Upload" action="" :style="{'background-image': 'url('+addMsg2.FileURL+')'}" :show-file-list="false" :http-request="UploadAttachment">
@@ -221,20 +220,31 @@
           <img src="../../assets/images/jiaojie.png" />
           <span class="word_sche">交接工作说明</span>
           <div class="sche_hengLine"></div>
-          <span class="word_scheNumber schNoneNum">{{this.saveObj.HandoverList.length}}</span>
-          <div class="addSche">
+          <span class="word_scheNumber" style="left:174px;" :class="{'schNoneNum':saveObj.HandoverList.length==0}">{{this.saveObj.HandoverList.length}}</span>
+          <el-popover placement="bottom" popper-class="tufaPop" width="400" trigger="click">
+            <div>
+            <el-upload class="schedul_Upload" action="" :style="{'background-image': 'url('+addMsg3.FileURL+')'}" :show-file-list="false" :http-request="UploadJiaojie">
+                <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="addMsg3.OtherContent" :rows="5"></el-input>
+            <q-btn color="accent" size="sm" style="float:right;margin-top:10px;" @click="saveJiaojie" label="保存" />
+            </div>
+            <div slot="reference" class="addSche">
             <i class="iconfont icon-img_haha"></i>
-          </div>
+            </div>
+        </el-popover>
         </div>
         <div class="secondList_Bottom">
           <div class="sche_ListInner" v-if="HandoverObj">{{HandoverObj.OtherContent}}</div>
         </div>
         <div class="sche_Fenye">
-          <div class="sche_left">
+          <div class="sche_left" :class="{'canClick_Color':HandoverIndex!=0}">
             <i class="iconfont icon-arrow-left" @click="HandoverMove(1)"></i>
           </div>
-          <div class="sche_Page">{{HandoverIndex+1}}/{{this.saveObj.EmergenciesList.length}}</div>
-          <div class="sche_left">
+          <div class="sche_Page">{{HandoverIndex+1}}/{{this.saveObj.HandoverList.length}}</div>
+          <div class="sche_left" :class="{'canClick_Color':HandoverIndex!=saveObj.HandoverList.length-1}">
             <i class="iconfont icon-arrow-right1" @click="HandoverMove(2)"></i>
           </div>
         </div>
@@ -279,6 +289,16 @@
         },
         //突发事件数据
         addMsg2:{
+          Id: 0, //编号
+          PlanShift: 0, //值班班次
+          PlanType: 3, //值班类型(1-值班事项，2-交接事项，3-突发事项)
+          PlanId: 0, //值班编号
+          FileURL: "", //文件路径
+          OtherContent: "", //突发事项、工作交接(值班类型为2.3是使用)内容
+          OtherRemark: "", //突发事项、工作交接(值班类型为2.3是使用)备注
+        },
+        //交接工作说明
+        addMsg3:{
           Id: 0, //编号
           PlanShift: 0, //值班班次
           PlanType: 2, //值班类型(1-值班事项，2-交接事项，3-突发事项)
@@ -287,7 +307,6 @@
           OtherContent: "", //突发事项、工作交接(值班类型为2.3是使用)内容
           OtherRemark: "", //突发事项、工作交接(值班类型为2.3是使用)备注
         },
-        isShowTufa:false,
       }
     },
     created() {
@@ -300,7 +319,7 @@
             this.EmergenciesObj = this.saveObj.EmergenciesList[this.EmergenciesIndex];
           }
           if (this.saveObj.HandoverList && this.saveObj.HandoverList.length > 0) {
-            this.HandoverObj = this.saveObj.EmergenciesList[this.HandoverIndex];
+            this.HandoverObj = this.saveObj.HandoverList[this.HandoverIndex];
           }
           if (this.saveObj.WorkList && this.saveObj.WorkList.length > 0) {
             this.WorkObj = this.saveObj.WorkList[this.WorkIndex];
@@ -365,17 +384,33 @@
       UploadAttachment(files) {
         UploadSelfFile('Attachment', files.file, res => {
           if (res.Code == 1) {
-            console.log(res,'数据');
             this.addMsg2.FileURL = res.FileUrl;
           }
         })
       },
+      UploadJiaojie(files){
+        UploadSelfFile('Attachment', files.file, res => {
+          if (res.Code == 1) {
+            this.addMsg3.FileURL = res.FileUrl;
+          }
+        })
+      },
       //保存突发事件
       saveTufa(){
         this.addMsg2.PlanShift = this.saveObj.Shfit;
         this.addMsg2.PlanId = this.saveObj.Id;
         SetDutyContent(this.addMsg2).then(res => {
             this.$emit('refreshPage');
+            this.$refs.hengLine.click();
+        })
+      },
+      //交接工作
+      saveJiaojie(){
+        this.addMsg3.PlanShift = this.saveObj.Shfit;
+        this.addMsg3.PlanId = this.saveObj.Id;
+        SetDutyContent(this.addMsg3).then(res => {
+            this.$emit('refreshPage');
+            this.$refs.hengLine.click();
         })
       }
     },

src/pages/scheduling/scheduleBoard.vue

@@ -182,7 +182,7 @@
   }
 
   .scheList_TOP img {
-    /* width: 100%; */
+    width: 100%;
     height: 100%;
   }
 
@@ -323,6 +323,7 @@
           }
         })
       },
+      //刷新父页面
       refreshPage(){
         this.getList();
       }