Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/BookingLedger/list/index.vue

@@ -300,10 +300,10 @@
             >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
-              <p v-if="item.msg">
+              <p v-if="item.msg" :style="{ flex: 1 }">
                 <a-icon type="close" :style="{ color: 'red' }" />
               </p>
-              <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
+              <p v-else :style="{ flex: 1 }"><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
               <p v-if="!item.isDiff">{{ item.targetVal }}</p>
               <p v-else v-html="item.mergeHtml"></p>
@@ -329,10 +329,10 @@
             >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
-              <p v-if="item.msg">
+              <p v-if="item.msg" :style="{ flex: 1 }">
                 <a-icon type="close" :style="{ color: 'red' }" />
               </p>
-              <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
+              <p v-else :style="{ flex: 1 }"><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
               <p v-if="!item.isDiff">{{ item.targetVal }}</p>
               <p v-else v-html="item.mergeHtml"></p>
@@ -2707,6 +2707,12 @@ export default {
     .TaskShippingOrderCompareMainHeader {
       display: flex;
       > div {
+        &:nth-child(1) {
+          flex: 3;
+        }
+        &:nth-child(3) {
+          flex: 3;
+        }
         flex: 1;
         > p {
           &:first-child {
@@ -2726,7 +2732,13 @@ export default {
       align-items: center;
       margin-bottom: 0.5rem;
       > p {
-        flex: 1;
+        flex: 2;
+        &:nth-child(1) {
+          flex: 1;
+        }
+        &:nth-child(4) {
+          flex: 1;
+        }
         // &:nth-child(3) {
         //   flex: 2;
         //   margin: 0 1rem;