1

src/components/schedul/schedul-orderlist.vue

@@ -13,6 +13,7 @@
     flex: 1;
     margin-bottom: 5px;
     align-items: baseline;
+    position: relative;
   }
 
   .sche_List_in .sche_Dian {
@@ -164,7 +165,22 @@
   .tufaPop .el-upload-list__item {
     margin-bottom: 0;
   }
-
+  .schedu_red {
+    color:var(--q-color-negative) !important;
+  }
+  .SchOtherContent{
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+  }
+  .sch_dagouimg{
+    position: absolute;
+    width:40px;
+    height:40px;
+    right:0px;
+    bottom:-10px;
+  }
 </style>
 <template>
   <div>
@@ -185,9 +201,10 @@
             <div class="sche_List_in" v-if="WorkObj">
               <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>
+                <div class="sche_ListInner">{{WorkObj.ItemName}} </div>
+                <!-- <el-checkbox style="margin-top:5" :true-label="1" :false-label="0" v-model="WorkObj.IsChecked">
+                </el-checkbox> -->
+                <img class="sch_dagouimg" src="../../assets/images/da_gou.png" alt="" />
               </template>
               <template v-else-if="WorkObj.ItemType==2">
                 <div class="sche_Dian"></div>
@@ -199,7 +216,7 @@
             <template v-if="WorkObj.ItemType==2">
               <div style="margin:10px 20px;">
                 <span v-if="WorkObj.WorkContent">{{WorkObj.WorkContent}}</span>
-                <el-input v-else v-model="WorkObj.WorkContent" placeholder="完成情况怎么样"></el-input>
+                <el-input v-else v-model="WorkObj.WorkContent" @focus="isShowSure=true" placeholder="完成情况怎么样"></el-input>
               </div>
             </template>
           </div>
@@ -216,7 +233,12 @@
                     <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="确认完成" />
+              <template v-if="WorkObj.ItemType==1">
+                <q-btn color="accent" style="margin-left:10px;" slot="reference" @click="saveOrder()" size="sm" label="确认完成1" />
+              </template>
+              <template v-if="WorkObj.ItemType==2">
+                <q-btn color="accent" style="margin-left:10px;" v-if="isShowSure" slot="reference" @click="saveOrder()" size="sm" label="确认完成2" />
+              </template>
             </div>
           </div>
           <div class=" sche_Fenye" v-if="saveObj&&saveObj.WorkList.length>0">
@@ -263,7 +285,7 @@
                 :preview-src-list="EmergenciesObj.FileList">
               </el-image>
             </div>
-            <div v-if="EmergenciesObj.OtherContent">
+            <div class="SchOtherContent" v-if="EmergenciesObj.OtherContent">
               {{EmergenciesObj.OtherContent}}
             </div>
           </div>
@@ -280,10 +302,9 @@
                   <el-input type="textarea" style="margin-top:20px;" v-model="addMsg2.OtherContent" :rows="4" />
                   <q-btn color="accent" size="sm" style="float:right;margin-top:10px;" @click="saveEdit(EmergenciesObj)" label="保存" />
                 </div>
-                
-                <span v-if="EmergenciesObj" slot="reference" style="margin-right:10px;cursor:pointer;" @click="EditTufa(EmergenciesObj)">修改</span>
+                <q-btn v-if="EmergenciesObj" slot="reference" flat @click="EditTufa(EmergenciesObj)" color="gray-10" label="修改" />
               </el-popover>
-              |<span v-if="EmergenciesObj" style="margin-left:15px;cursor:pointer;" @click="delTufa()">删除</span>
+              |<q-btn v-if="EmergenciesObj" slot="reference" flat @click="delTufa()" style="margin-left:5px;" class="schedu_red" label="删除" />
             </div>
           </div>
           <div class=" sche_Fenye" v-if="saveObj&&saveObj.EmergenciesList.length>0">
@@ -330,7 +351,7 @@
               :preview-src-list="HandoverObj.FileList">
             </el-image>
             </div>
-            <div v-if="HandoverObj.OtherContent">
+            <div class="SchOtherContent" v-if="HandoverObj.OtherContent">
               {{HandoverObj.OtherContent}}
             </div>
           </div>
@@ -347,9 +368,9 @@
                   <el-input type="textarea" style="margin-top:20px;" v-model="addMsg3.OtherContent" :rows="4" />
                   <q-btn color="accent" size="sm" style="float:right;margin-top:10px;" @click="saveJJEdit(HandoverObj)" label="保存" />
                 </div>
-                <span slot="reference" style="margin-right:10px;cursor:pointer;" @click="EditJiaojie(HandoverObj)">修改</span>
+                <q-btn v-if="HandoverObj" slot="reference" flat @click="EditJiaojie(HandoverObj)" color="gray-10" label="修改" />
               </el-popover>
-              |<span style="margin-left:10px;cursor:pointer;" @click="delJiaojie()">删除</span>
+              |<q-btn v-if="HandoverObj" slot="reference" flat @click="delJiaojie()" style="margin-left:5px;" class="schedu_red" label="删除" />
             </div>
           </div>
           <div class=" sche_Fenye" v-if="saveObj&&saveObj.HandoverList.length>0">
@@ -426,7 +447,8 @@
         fileListThree:[], //交接说明图片数组
         fileListFour:[],//交接修改图片数组
 
-        WorkContent:''
+        WorkContent:'',
+        isShowSure:false //是否显示确认完成按钮
       }
     },
     created() {

src/pages/scheduling/scheduleBoard.vue

@@ -214,8 +214,9 @@
     font-size: 14px;
     color: #000000;
     height: 46px;
-    padding-bottom: 10px;
     border-bottom: 1px solid #F3F3F3;
+    display:flex;
+    align-items: center;
   }
 
   .sche_Dian {