|
|
|
@ -300,9 +300,13 @@
|
|
|
|
|
>
|
|
|
|
|
<p>{{ item.fieldName }}:</p>
|
|
|
|
|
<p>{{ item.reqVal }}</p>
|
|
|
|
|
<p>{{ item.msg }}</p>
|
|
|
|
|
<p v-if="item.msg">
|
|
|
|
|
<a-icon type="close" :style="{ color: 'red' }" />
|
|
|
|
|
</p>
|
|
|
|
|
<p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
|
|
|
|
|
<p>{{ item.fieldName }}:</p>
|
|
|
|
|
<p v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-if="!isDiff" v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-else>{{ item.targetVal }}</p>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="TaskShippingOrderCompareMain">
|
|
|
|
@ -325,9 +329,13 @@
|
|
|
|
|
>
|
|
|
|
|
<p>{{ item.fieldName }}:</p>
|
|
|
|
|
<p>{{ item.reqVal }}</p>
|
|
|
|
|
<p>{{ item.msg }}</p>
|
|
|
|
|
<p v-if="item.msg">
|
|
|
|
|
<a-icon type="close" :style="{ color: 'red' }" />
|
|
|
|
|
</p>
|
|
|
|
|
<p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
|
|
|
|
|
<p>{{ item.fieldName }}:</p>
|
|
|
|
|
<p v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-if="!isDiff" v-html="item.mergeHtml"></p>
|
|
|
|
|
<p v-else>{{ item.targetVal }}</p>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
@ -2667,7 +2675,8 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
.TaskShippingOrderCompareP {
|
|
|
|
|
border-bottom: 1px solid #000;
|
|
|
|
|
padding-bottom: 5px;
|
|
|
|
|
padding: 5px;
|
|
|
|
|
background: #0000000e;
|
|
|
|
|
.TaskShippingOrderCompareSpan {
|
|
|
|
|
font-weight: bolder;
|
|
|
|
|
color: red;
|
|
|
|
@ -2703,13 +2712,22 @@ export default {
|
|
|
|
|
margin-bottom: 0.5rem;
|
|
|
|
|
> p {
|
|
|
|
|
flex: 1;
|
|
|
|
|
&:nth-child(3) {
|
|
|
|
|
flex: 2;
|
|
|
|
|
background: #facd91;
|
|
|
|
|
border: 1px solid red;
|
|
|
|
|
margin: 0 1rem;
|
|
|
|
|
padding-left: 0.5rem;
|
|
|
|
|
}
|
|
|
|
|
// &:nth-child(3) {
|
|
|
|
|
// flex: 2;
|
|
|
|
|
// margin: 0 1rem;
|
|
|
|
|
// padding-left: 0.5rem;
|
|
|
|
|
// &.TaskShippingOrderCompareMainThird {
|
|
|
|
|
// background: #facd91;
|
|
|
|
|
// border: 1px solid red;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// &.TaskShippingOrderCompareMainThird {
|
|
|
|
|
// flex: 2;
|
|
|
|
|
// background: #facd91;
|
|
|
|
|
// border: 1px solid red;
|
|
|
|
|
// margin: 0 1rem;
|
|
|
|
|
// padding-left: 0.5rem;
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
&.BoxNo {
|
|
|
|
|
padding-top: 0.5rem;
|
|
|
|
|