修改

src/components/schedul/schedul-orderlist.vue

@@ -186,6 +186,8 @@
               <template v-if="WorkObj.ItemType==1">
                 <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" :true-label="1" :false-label="0" v-model="WorkObj.IsChecked">
+                </el-checkbox>
               </template>
               <template v-else-if="WorkObj.ItemType==2">
                 <div class="sche_Dian"></div>
@@ -194,13 +196,10 @@
             </div>
           </div>
           <div>
-            <template v-if="WorkObj.ItemType==1">
-              <el-checkbox style="margin-top:5" :true-label="1" :false-label="0" v-model="WorkObj.IsChecked">
-              </el-checkbox>
-            </template>
             <template v-if="WorkObj.ItemType==2">
               <div style="margin:10px 20px;">
-                <el-input v-model="WorkObj.WorkContent" placeholder="完成情况怎么样"></el-input>
+                <span v-if="WorkObj.WorkContent">{{WorkObj.WorkContent}}</span>
+                <el-input v-else v-model="WorkObj.WorkContent" placeholder="完成情况怎么样"></el-input>
               </div>
             </template>
           </div>
@@ -208,8 +207,16 @@
         <div class="tufa_btm">
           <div>
             <div class="tufa_xiugai">
-              <span style="margin-right:10px;">修改</span>
-              <q-btn color="accent" style="margin-left:10px;" slot="reference" size="sm" label="确认完成" />
+              <template v-if="WorkObj.WorkContent">
+                <el-popover placement="bottom" popper-class="tufaPop" width="410" trigger="click">
+                  <div>
+                    <el-input type="textarea" :rows="4" v-model="WorkContent" />
+                    <q-btn color="accent" size="sm" style="float:right;margin-top:10px;" @click="saveOrder(2)" label="保存" />
+                  </div>
+                    <span slot="reference" style="margin-right:10px;cursor:pointer;" @click="getWorkContnt(WorkObj)">修改</span>
+                </el-popover>
+              </template>
+              <q-btn color="accent" style="margin-left:10px;" v-if="WorkObj.WorkContent==''" slot="reference" @click="saveOrder()" size="sm" label="确认完成" />
             </div>
           </div>
           <div class=" sche_Fenye" v-if="saveObj&&saveObj.WorkList.length>0">
@@ -250,7 +257,10 @@
         <div class="secondList_Bottom">
           <div class="tufa_List">
             <div class="tufa_left" v-if="EmergenciesObj&&EmergenciesObj.FileList">
-              <img :src="EmergenciesObj.FileList[0]" />
+              <el-image 
+                :src="EmergenciesObj.FileList[0]" 
+                :preview-src-list="EmergenciesObj.FileList">
+              </el-image>
             </div>
             <div v-if="EmergenciesObj.OtherContent">
               {{EmergenciesObj.OtherContent}}
@@ -313,7 +323,10 @@
         <div class="secondList_Bottom">
           <div class="tufa_List">
             <div class="tufa_left" v-if="HandoverObj&&HandoverObj.FileList">
-              <img :src="HandoverObj.FileList[0]" />
+            <el-image 
+              :src="HandoverObj.FileList[0]" 
+              :preview-src-list="HandoverObj.FileList">
+            </el-image>
             </div>
             <div v-if="HandoverObj.OtherContent">
               {{HandoverObj.OtherContent}}
@@ -410,6 +423,8 @@
 
         fileListThree:[], //交接说明图片数组
         fileListFour:[],//交接修改图片数组
+
+        WorkContent:''
       }
     },
     created() {
@@ -500,8 +515,11 @@
           }
         })
       },
+      getWorkContnt(obj){
+        this.WorkContent = obj.WorkContent;
+      },
       //保存工作清单
-      saveOrder() {
+      saveOrder(type) {
         var saveWorkMsg = {
           Id: this.WorkObj.Id, //编号
           PlanShift: this.saveObj.Shift, //值班班次
@@ -511,8 +529,12 @@
           WorkIsFinish: this.WorkObj.IsChecked,
           ItemId: this.WorkObj.ItemId,
         };
+        if(type==2){
+          saveWorkMsg.WorkContent = this.WorkContent;
+        }
         SetDutyContent(saveWorkMsg).then(res => {
           this.$emit('refreshPage');
+          this.$refs.hengLine.click();
         })
       },
       //保存突发事件