修复问题

src/assets/css/main.less

@@ -12,6 +12,7 @@
 
 // 盒子宽高  
 .size(@w, @h) { width: @w; height: @h; }  
+.min-size(@min-w,@h) { min-width: @min-w; height: @h;}  
   
 // 最小尺寸, 兼容IE6  
 .min-width(@min-w) { min-width: @min-w; _width: @min-w; }  

src/components/SalesVisa/VisaShouSun.vue

@@ -355,7 +355,7 @@
           IsOneDay: '-1',
           IsLeaderOrder:1,
           LossType:2,
-          LossStatus:0
+          LossStatus:2
         },
         //收损设置下拉
         shouSunSelect:[{

src/components/Ticketing/TicketShouSun.vue

@@ -355,7 +355,7 @@
           IsOneDay: '-1',
           IsLeaderOrder:1,
           LossType:1,
-          LossStatus:0
+          LossStatus:2
         },
         //收损设置下拉
         shouSunSelect:[{

src/components/commonPage/commonShouSun.vue

@@ -4,10 +4,23 @@
     }
     .totalShouSan{
         position: absolute;
-        right:60px;
+        left:20px;
         font-size:14px;
         top:15px;
     }
+    .cmShouLastTd{
+        padding:10px 0;
+        position:relative;
+        text-align:right;
+        padding:20px 20px 20px 0;
+    }
+    .totalRemarkSpan{
+        position: absolute;
+        left:20px;
+        top:40px;
+        font-size:12px;
+        color:#E95252;
+    }
 </style>
 
 <template>
@@ -76,12 +89,15 @@
             </tr>
             <tfoot>
                 <tr>
-                    <td style="padding:10px 0;position:relative;" colspan="4">
-                        <input type="button" class="normalBtn" @click="closeDialog()" value="取消" />
-                        <input type="button" class="normalBtn" @click="setShouSun()" value="保存" />
+                    <td class="cmShouLastTd" colspan="4">
                         <span class="totalShouSan">
                             收损总额：<span class="TotalShouSun">{{totalSun}}</span>
                         </span>
+                        <span class="totalRemarkSpan">
+                            只有全部金额都设置完成才会更新订单应收金额
+                        </span>
+                        <input type="button" class="normalBtn" @click="closeDialog()" value="取消" />
+                        <input type="button" class="normalBtn" @click="setShouSun()" value="保存" />
                     </td>
                 </tr>
             </tfoot>

src/components/dmc/manager/dmcShouSun.vue

@@ -354,7 +354,7 @@
           IsOneDay: '-1',
           IsLeaderOrder:1,
           LossType:3,
-          LossStatus:0
+          LossStatus:2
         },
         //收损设置下拉
         shouSunSelect:[{

src/components/index.vue

@@ -6,7 +6,7 @@
             <!-- <i class="iconfont icon-logo"></i>			    	 -->
 			    </div>
 			    <div class="nav-middle">
-			    	<ul class="clearfix" :style="{width:`${allWindowWidth}px`}">
+			    	<ul class="clearfix comIndexUl" :style="{width:`${allWindowWidth}px`}">
                 <li v-for="(item,index) in menuList" v-if="item.MenuUrl!='' && index<=maxLength" :class="{active:item.MenuId==chosenIndex}" @click="goUrl(item.MenuUrl,item.MenuId,index)" >
                   <span class="big_tittle"><i :class="[fontPub,item.icon]" ></i>
                       {{item.MenuName}}
@@ -3272,6 +3272,7 @@ export default {
                       x.fatherCount+=y.childCount;
                     })
                 })
+                this.$forceUpdate();
             } else {
                 this.Error(res.data.message);
             }
@@ -3915,7 +3916,7 @@ export default {
   z-index: 2019128;
 }
 .nav-middle ul li {
-  .size(100px, 100%);
+  .min-size(100px, 100%);
   .fz(14px);
   .center(text-x);
   .hover-bg(#f1f1f1);

src/components/systemManagement/lineManagement.vue

@@ -640,8 +640,8 @@ input[type="number"] {
         </tr>
 
       </table>
-      <input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')"/>
       <input type="button" class="normalBtn" @click="isShowTwo=false" :value="$t('pub.cancelBtn')"/>
+      <input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')"/>
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
                    layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
@@ -845,8 +845,6 @@ export default {
       this.addMsg.LineDirection = getInfo.lineDirection;
       this.addMsg.BackgroundImage = getInfo.BackgroundImage;
       this.addMsg.BroadsideImage = getInfo.BroadsideImage;
-      
-      console.log("this.addMsg.BackgroundImage",getInfo)
     },
     deletelist(lineID) {
       var that = this;
@@ -993,13 +991,13 @@ export default {
         let ckedJoinEmployee = [];
         item.selectOpIdArr.forEach(x => {
           ckedJoinEmployee.push({
-            EmployeeId: x,
+            employeeId: x,
             employeeName: "",
           });
         });
         ckedJoinEmployee.forEach(x => {
           item.employeeList.forEach(y => {
-            if (x.EmployeeId === y.EmployeeId) {
+            if (x.employeeId === y.EmployeeId) {
               x.employeeName = y.EmName;
             }
           });
@@ -1114,12 +1112,13 @@ export default {
           x.joinEmployee.forEach(y => {
             var opBranch = {
               rB_Branch_id: x.rB_Branch_id,
-              EmployeeId: y.EmployeeId
+              EmployeeId: y.employeeId
             };
             lineBranchOPList.push(opBranch);
           });
         }
       });
+
       let msg = {
         lineId: this.upLineId,
         lineBranchList: lineBranchList,