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

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -128,6 +128,18 @@
       </template>
 
       <template v-else-if="['initCabin', 'ladingBill', 'vgmlink'].includes(modelType)">
+        <div class="model-btn-list" v-if="modelType === 'initCabin'">
+          <a-button class="btn" @click="saveModel" :loading="SaveLoading">保存</a-button>
+          <a-button class="btn" type="primary" @click="sendModel" :loading="SendLoading">发送</a-button>
+          <a-button class="btn" type="primary" @click="removeModel" :loading="DelLoading" v-if="['initCabin'].includes(modelType)">
+            删除
+          </a-button>
+          <template v-if="modelType === 'initCabin'">
+            <a-button class="btn" type="primary" @click="downLoadFile(2, 'EXCEL')" :loading="downLoadEXCELLoading">EXCEL</a-button>
+            <a-button class="btn" type="primary" @click="downLoadFile(1, 'PDF')" :loading="downLoadPDFLoading">PDF</a-button>
+            <a-button class="btn" type="primary" @click="downLoadFile(3, 'DOCX')" :loading="downLoadDOCXLoading">DOCX</a-button>
+          </template>
+        </div>
         <a-form>
           <a-row :gutter="16">
             <div class="item-box to-box" :style="{ paddingTop: '0px' }">
@@ -411,15 +423,13 @@
           </a-row>
         </a-form>
         <template slot="footer">
-          <a-button @click="saveModel" :loading="SaveLoading">保存</a-button>
-          <a-button type="primary" @click="sendModel" :loading="SendLoading">发送</a-button>
-          <a-button type="primary" @click="removeModel" :loading="DelLoading" v-if="['initCabin'].includes(modelType)">
-            删除
-          </a-button>
-          <template v-if="modelType === 'initCabin'"></template>
-          <a-button type="primary" @click="downLoadFile(2, 'EXCEL')" :loading="downLoadEXCELLoading">EXCEL</a-button>
-          <a-button type="primary" @click="downLoadFile(1, 'PDF')" :loading="downLoadPDFLoading">PDF</a-button>
-          <a-button type="primary" @click="downLoadFile(3, 'DOCX')" :loading="downLoadDOCXLoading">DOCX</a-button>
+          <template v-if="['initCabin'].includes(modelType)">
+            <a-button @click="handleModelCancel" >关闭</a-button>
+          </template>
+          <template v-else>
+            <a-button @click="saveModel" :loading="SaveLoading">保存</a-button>
+            <a-button type="primary" @click="sendModel" :loading="SendLoading">发送</a-button>
+          </template>
         </template>
       </template>
     </a-modal>
@@ -1375,7 +1385,7 @@ export default {
         return false
       }
       if (this.traceValue.includes('2') && (!this.details.carrierid || !this.details.carrier)) {
-        this.$message.error('请选择传公司')
+        this.$message.error('请选择船公司')
         return false
       }
       const query = {
@@ -1717,4 +1727,13 @@ export default {
 .trace-check {
   margin-left: 10px;
 }
+.model-btn-list{
+  margin-bottom:15px;
+  .btn{
+    margin-right: 6px;
+    &.ant-btn-primary{
+      color: #fff;
+    }
+  }
+}
 </style>

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

@@ -829,8 +829,15 @@ export default {
         this.$message.error('请选择操作订单')
         return false
       }
+      let errorTip = ''
       select.map((item, index) => {
         console.log(item)
+        if (this.traceValue.includes('1') && (!item.yard || !item.yardid)) {
+          errorTip = `单号${item.mblno}未选择场站`
+        }
+        if (this.traceValue.includes('2') && (!item.carrierid || !item.carrier)) {
+          errorTip = `单号${item.mblno}未选择船公司`
+        }
         const query = {
           businessId: item.id,
           mblno: item.mblno,
@@ -842,6 +849,12 @@ export default {
         }
         arr.push(query)
       })
+
+      if (errorTip !== '') {
+        this.$message.error(errorTip)
+        return false
+      }
+
       SendTrace(arr)
         .then(res => {
           if (res.success) {
@@ -1262,6 +1275,11 @@ export default {
       cursor: pointer;
       color: @primary-color;
     }
+    &:nth-of-type(3){
+      i{
+        opacity: 0;
+      }
+    }
   }
 }
  /deep/ .ant-form-item{