4/13

src/api/modular/main/BookingLedger.js

@@ -802,6 +802,6 @@ export function ExcuteShippingOrderCompareBatch(parameter) {
   return axios({
     url: '/TaskShippingOrderCompare/ExcuteShippingOrderCompareBatch',
     method: 'post',
-    params: parameter
+    data: parameter
   })
 }

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

@@ -140,8 +140,8 @@
               row-class-name="line-box"
               :height="tableHeight"
               :checkbox_config="{ checkField: 'checked' }"
-              :scroll-x="{gt: 10, oSize: 10, enabled: false}"
-              :scroll-y="{gt: 20, oSize: 20, enabled: true}"
+              :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
+              :scroll-y="{ gt: 20, oSize: 20, enabled: true }"
               @page-change="handlePageChange"
               @cell-dblclick="handledbclick"
               @resizable-change="resizableChange"
@@ -270,7 +270,69 @@
         </x-card>
       </a-col>
     </a-row>
-
+    <a-modal title="下货纸比对（有差异）" :visible="TaskShippingOrderCompareVisible" width="60%">
+      <template slot="footer">
+        <a-button key="back" @click="TaskShippingOrderCompareHandleCancel">
+          关闭
+        </a-button>
+      </template>
+      <p class="TaskShippingOrderCompareP">
+        {{ TaskShippingOrderCompareData.compareTime }} 比对异常 合计
+        <span class="TaskShippingOrderCompareSpan">{{ TaskShippingOrderCompareData.showDetailList.length }}</span> 条
+      </p>
+      <div class="TaskShippingOrderCompareMainBox">
+        <div class="TaskShippingOrderCompareMain">
+          <div class="TaskShippingOrderCompareMainHeader">
+            <div>
+              <p>提单号：（本地数据）</p>
+              <p>--------------------------</p>
+              <p>{{ TaskShippingOrderCompareData.mBlNo }}</p>
+            </div>
+            <div></div>
+            <div>
+              <p>提单号：（场站数据）</p>
+              <p>--------------------------</p>
+              <p>{{ TaskShippingOrderCompareData.mBlNo }}</p>
+            </div>
+          </div>
+          <div
+            class="TaskShippingOrderCompareMainList"
+            v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
+            :key="index"
+            v-show="item.pCode != 'ContaList'"
+          >
+            <p>{{ item.fieldName }}:</p>
+            <p>{{ item.reqVal }}</p>
+            <p>{{ item.msg }}</p>
+            <p>{{ item.fieldName }}:</p>
+            <p v-html="item.mergeHtml"></p>
+          </div>
+        </div>
+        <div class="TaskShippingOrderCompareMain">
+          <div class="TaskShippingOrderCompareMainHeader Box">
+            <div>
+              <p>箱信息：（本地数据）</p>
+            </div>
+            <div></div>
+            <div>
+              <p>箱信息：（场站数据）</p>
+            </div>
+          </div>
+          <div
+            class="TaskShippingOrderCompareMainList"
+            v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
+            :key="index"
+            v-show="item.pCode == 'ContaList'"
+          >
+            <p>{{ item.fieldName }}:</p>
+            <p>{{ item.reqVal }}</p>
+            <p>{{ item.msg }}</p>
+            <p>{{ item.fieldName }}:</p>
+            <p v-html="item.mergeHtml"></p>
+          </div>
+        </div>
+      </div>
+    </a-modal>
     <a-modal :maskClosable="false" :width="1700" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
       <a-radio-group class="group-label-box" v-model="carrierRadio">
         <p v-if="RecentlyCarrierData.length" class="Awrapper">最近使用 <span class="line"></span></p>
@@ -618,6 +680,10 @@ export default {
   },
   data() {
     return {
+      TaskShippingOrderCompareVisible: false,
+      TaskShippingOrderCompareData: {
+        showDetailList: ''
+      },
       ResetType: true,
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       advanced: false,
@@ -825,6 +891,10 @@ export default {
       this.editingForm.resetFields()
       this.editingModalVisible = false
     },
+    TaskShippingOrderCompareHandleCancel() {
+      this.TaskShippingOrderCompareVisible = false
+    },
+    TaskShippingOrderCompareHandleOk() {},
     vesselSearch(data) {
       if (data) {
         this.WebVessel = data
@@ -1793,22 +1863,24 @@ export default {
       this.goodStatusShow = false
       this.goodStatusData = null
     },
-    checkboxChangeEvent () {
+    checkboxChangeEvent() {
       console.log('== 选中，取消选中 ==', this.$refs.xGrid.getCheckboxRecords())
     },
-    excuteShippingOrderCompareBatch () {
+    excuteShippingOrderCompareBatch() {
       const select = this.$refs.xGrid.getCheckboxRecords()
-      const arr = select.map((item, index) => { return item.id })
+      const arr = select.map((item, index) => {
+        return item.id.toString()
+      })
       if (arr.length === 0) {
         this.$message.error('请选择操作订单')
         return false
       }
-      ExcuteShippingOrderCompareBatch({
-        bookingIds: arr
-      })
+      ExcuteShippingOrderCompareBatch(arr)
         .then(res => {
           if (res.success) {
-            this.$message.success(res.data.msg)
+            // this.$message.success(res.data.msg)
+            this.TaskShippingOrderCompareData = res.data.extra
+            this.TaskShippingOrderCompareVisible = true
           } else {
             this.$message.error(res.data.msg)
           }
@@ -2254,7 +2326,7 @@ export default {
     .active {
       cursor: pointer;
       // color: @primary-color;
-       color: #004d11;
+      color: #004d11;
     }
     &:nth-of-type(3) {
       i {
@@ -2565,4 +2637,53 @@ export default {
   width: 100%;
   text-align: left;
 }
+.TaskShippingOrderCompareP {
+  border-bottom: 1px solid #000;
+  padding-bottom: 5px;
+  .TaskShippingOrderCompareSpan {
+    font-weight: bolder;
+    color: red;
+  }
+}
+.TaskShippingOrderCompareMainBox {
+  height: 55vh;
+  overflow-y: auto;
+  .TaskShippingOrderCompareMain {
+    p {
+      margin-bottom: 0;
+    }
+    .TaskShippingOrderCompareMainHeader {
+      display: flex;
+      > div {
+        flex: 1;
+        > p {
+          &:first-child {
+            font-weight: bolder;
+          }
+        }
+      }
+      &.Box {
+        border-top: 1px solid #000;
+        border-bottom: 1px solid #000;
+        padding: 0.5rem 0;
+        margin-bottom: 0.5rem;
+      }
+    }
+    .TaskShippingOrderCompareMainList {
+      display: flex;
+      align-items: center;
+      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;
+        }
+      }
+    }
+  }
+}
 </style>