预配舱单

src/components/MultiTab/MultiTab.vue

@@ -235,6 +235,7 @@ export default {
       return (
         <a-tab-pane
           style={{ height: 0 }}
+          disabled={!!this.inBookingDetailsSave}
           tab={this.renderTabPane(page.meta.customTitle || page.meta.title, page.fullPath)}
           key={page.fullPath}
           closable={pages.length > 1 && page.meta.title != '首页'}
@@ -248,6 +249,7 @@ export default {
           <a-tabs
             hideAdd
             type={'editable-card'}
+            disabled={!!this.inBookingDetailsSave}
             v-model={this.activeKey}
             tabBarStyle={{ background: '#FFF', margin: 0, paddingLeft: '16px', paddingTop: '1px' }}
             {...{ on: { edit: onEdit } }}

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

@@ -445,10 +445,6 @@ export default {
     )
   },
   beforeRouteUpdate(to, from, next) {
-    // if (this.inBookingDetailsSave) {
-    //   this.$message.error('保存中，请稍后')
-    //   return false
-    // }
     if (this.inAddSave) {
       next()
       return false
@@ -511,10 +507,6 @@ export default {
     }, 800)
   },
   beforeRouteLeave(to, from, next) {
-    // if (this.inBookingDetailsSave) {
-    //   this.$message.error('保存中，请稍后')
-    //   return false
-    // }
     this.inChildLoading = true
     if (this.isCopy) {
       const hisData = {
@@ -1205,7 +1197,7 @@ export default {
             delete item.id
           })
         }
-        this.$message.loading({ content: '保存中...' })
+        this.$message.loading({ content: '保存中, 请勿切换页面...' })
         console.log('== vuex 开始保存==', this.inBookingDetailsSave)
         BookingOrderSave(_data)
           .then(res => {

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

@@ -24,7 +24,7 @@
                 title="是否发送当前选中预配舱单？"
                 ok-text="是"
                 cancel-text="否"
-                @confirm="sendOrder()"
+                @confirm="sendOrderFun()"
                 @cancel="cancelRemove"
               >
                 <a-button class="order-btn" size="small">发送</a-button>
@@ -970,7 +970,7 @@
         </a-col>
       </a-row>
 
-      <!-- <a-modal width="50vw" :maskClosable="false" v-model="false" title="发送预配舱单">
+      <a-modal width="50vw" :maskClosable="false" v-model="showSendModel" title="发送预配舱单" @cancel="sendClose">
         <div class="trace-box">
           <a-form>
             <a-row :gutter="16">
@@ -981,15 +981,30 @@
                   :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                   has-feedback
                 >
+                  <a-radio-group :options="sendOption" v-model="sendType" />
+                </a-form-item>
+
+                <a-form-item
+                  label="备注"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+                  has-feedback
+                >
+                  <a-textarea
+                    v-model="sendRemarkVal"
+                    placeholder="请输入备注"
+                    :auto-size="{ minRows: 3, maxRows: 5 }"
+                  />
                 </a-form-item>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <template slot="footer">
-          <a-button type="primary" @click="traceSend">订阅</a-button>
+          <a-button type="primary" @click="sendSubmit">确认发送</a-button>
+          <a-button type="primary" @click="sendClose">关闭</a-button>
         </template>
-      </a-modal> -->
+      </a-modal>
     </div>
   </a-modal>
 </template>
@@ -1610,7 +1625,18 @@ export default {
           this.log({ data, selectionRangeIndexes, selectionRangeKeys })
         }
       },
-      selectArr: []
+      selectArr: [],
+      showSendModel: false,
+      sendType: '',
+      sendOption: [
+        { label: '新增', value: '0' },
+        { label: '修改', value: '1' },
+        { label: '删除', value: '2' },
+        { label: '保存', value: '3' },
+        { label: '作废', value: '4' }
+      ],
+      sendRemarkVal: '',
+      sendArr: []
     }
   },
   watch: {
@@ -1855,11 +1881,11 @@ export default {
         this.$message.error(`${tempstr1}已发送，无需重复发送`)
         return false
       }
-      debugger
       if (sendArr.length === 0) {
         this.$message.error('暂无可发送舱单')
         return false
       }
+      this.sendArr = sendArr
       console.log('== 即将发送单号 ==', sendArr)
       const query = this.$qs.stringify({ Ids: sendArr.toString() }, { arrayFormat: 'repeat' })
       seaeEdiCustEDI(query).then((res) => {
@@ -1900,7 +1926,7 @@ export default {
         this.orderDetails[type] = res['name'] || ''
       } else if (type === 'yard') {
         this.orderDetails[type] = res.name || ''
-        this.orderDetails[`${type}id`] = res.code || ''
+        this.orderDetails[`${type}id`] = res.showCode || ''
       } else if (type === 'carrier') {
         this.orderDetails.carrier = res.ediCode || ''
         this.orderDetails.carrierid = res.code || ''
@@ -2142,6 +2168,7 @@ export default {
           this.orderDetails = res.data[0]
         } else {
           this.$message.error(res.message)
+          this.selectArr = []
         }
       })
       .catch((err) => {
@@ -2156,7 +2183,90 @@ export default {
       this.getNoDataInit(true)
       this.editIndex = this.orderList.length - 1
     },
-    
+    sendOrderFun () {
+      console.log(this.selectArr)
+      if (this.selectArr.length === 0) {
+        this.$message.error('请选择发送单号')
+        return false
+      }
+      const sendArr = []
+      let tempstr = ''
+      let tempstr1 = ''
+      this.selectArr.map((item, index) => {
+        if (this.orderList[item].id !== 0) {
+          if (this.orderList[item].state === '已录入') {
+            sendArr.push(this.orderList[item].id)
+          } else {
+            if (this.orderList[item].isHBL) {
+              tempstr1 += `分提单${this.orderList[item].hblno ? this.orderList[item].hblno : item}，`
+            } else {
+              tempstr1 += `主提单${this.orderList[item].mblno ? this.orderList[item].mblno : item}，`
+            }
+          }
+        } else {
+          if (this.orderList[item].isHBL) {
+            tempstr += `分提单${this.orderList[item].hblno ? this.orderList[item].hblno : item}，`
+          } else {
+            tempstr += `主提单${this.orderList[item].mblno ? this.orderList[item].mblno : item}，`
+          }
+        }
+      })
+      console.log(tempstr)
+      if (tempstr) {
+        this.$message.error(`${tempstr}需要先保存再进行发送`)
+        return false
+      }
+      if (tempstr1) {
+        this.$message.error(`${tempstr1}已发送，无需重复发送`)
+        return false
+      }
+      if (sendArr.length === 0) {
+        this.$message.error('暂无可发送舱单')
+        return false
+      }
+      this.sendArr = sendArr
+      this.showSendModel = true
+    },
+    // sendChange (e) {
+    //   this.sendType = e.target.value
+    //   console.log('radio1 checked', e.target.value);
+    // },
+    sendSubmit () {
+      console.log('== 发送 ==', this.sendArr, this.sendType, this.sendRemarkVal)
+      console.log('== 即将发送单号 ==', this.sendArr)
+      if (!this.sendType) {
+        this.$message.error('请选择操作类型')
+        return false
+      }
+      if (!this.sendRemarkVal) {
+        this.$message.error('请输入备注')
+        return false
+      }
+      const query = this.$qs.stringify({
+        Ids: this.sendArr.toString(),
+        type: this.sendType,
+        SENDREMARK: this.sendRemarkVal
+      }, { arrayFormat: 'repeat' })
+      seaeEdiCustEDI(query).then((res) => {
+        if (res.success) {
+          this.$message.success('发送成功')
+          this.selectArr.map((item, index) => {
+            this.orderList[item].state = '已发送'
+          })
+          this.sendClose()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch((err) => {
+        console.log(err)
+      })
+    },
+    sendClose () {
+      this.showSendModel = false
+      this.sendType = ''
+      this.sendRemarkVal = ''
+      console.log('== 关闭 ==')
+    }
   },
 }
 </script>