From cf2f12ffcb2cd0d98801341b7f4e83bebc4605de Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Wed, 28 Jun 2023 16:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modular/main/BookingLedger.js         |   4 +-
 src/store/modules/user.js                     |   2 +
 .../BookingCustomerLedger/detail/index.vue    | 194 +++++++++---------
 .../main/BookingCustomerLedger/list/index.vue |  17 +-
 4 files changed, 109 insertions(+), 108 deletions(-)

diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index 47d310a..a5a0f14 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -103,7 +103,7 @@ export function BookingTemplate(parameter) {
  */
 export function GetTemplateShare (parameter) {
   return axios({
-    url: '/BookingTemplate/GetTemplateShare ',
+    url: '/BookingTemplate/GetTemplateShare',
     method: 'get',
     params: parameter
   })
@@ -1025,7 +1025,7 @@ export function BookingCustomerOrderDelete (parameter) {
   return axios({
     url: 'BookingCustomerOrder/Delete',
     method: 'post',
-    params: parameter
+    data: parameter
   })
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 9d2e304..df9730a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -100,6 +100,7 @@ const user = {
             }
             const result = response.data
             Vue.ls.set(ACCESS_TOKEN, result, 7 * 24 * 60 * 60 * 1000)
+            Vue.ls.set('FIRSTFLAG', true, 7 * 24 * 60 * 60 * 1000)
             commit('SET_TOKEN', result)
             resolve()
             // eslint-disable-next-line handle-callback-err
@@ -122,6 +123,7 @@ const user = {
             const result = response.data
             console.log(response, 1111)
             Vue.ls.set(ACCESS_TOKEN, result, 7 * 24 * 60 * 60 * 1000)
+            Vue.ls.set('FIRSTFLAG', true, 7 * 24 * 60 * 60 * 1000)
             commit('SET_TOKEN', result)
             resolve()
           })
diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue
index 225d747..69890c6 100644
--- a/src/views/main/BookingCustomerLedger/detail/index.vue
+++ b/src/views/main/BookingCustomerLedger/detail/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="main">
     <div class="btn-list">
-      <span v-if="details.bookingno">{{ details.bookingno }}</span>
-      <a-button type="primary" @click="handleSave">保存</a-button>
+      <a-button type="primary" v-if="details.bsstatus=='' || !details.bsstatus || details.bsstatus == '已录入' || details.bsstatus == '已驳回'" @click="handleSave">保存</a-button>
       <a-button type="primary" @click="handleCopy">复制</a-button>
       <a-button type="primary">存为模板</a-button>
       <a-button type="danger" v-if="details.bsstatus == '已录入'" @click="handleDelete">删除</a-button>
@@ -11,6 +10,8 @@
         @click="handleSubimt"
         v-if="details.bsstatus == '已录入' || details.bsstatus == '已驳回'">发送订舱</a-button>
       <a-button type="danger" @click="handleCancle" v-if="details.bsstatus == '已提交'">撤销</a-button>
+      <span v-if="details.bookingno" style="margin: 0 10px;">订舱编号:</span>
+      <span v-if="details.bookingno">{{ details.bookingno }}</span>
     </div>
     <a-spin :spinning="loading">
       <div class="box">
@@ -147,8 +148,8 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 has-feedback
-                prop="voyno">
-                <inputView type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
+                prop="contractno">
+                <inputView type="contractno" :parentVal="details.contractno" @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
             <a-col :span="'4-8'">
@@ -320,6 +321,7 @@
                       class="save-btn"
                       type="link"
                       size="small"
+                      style="color:black"
                       icon="save"
                       @click="saveModel('notifyparty')">保存</a-button>
                   </div>
@@ -365,6 +367,7 @@
                   <a-button
                     class="save-btn"
                     type="link"
+                    style="color: black;"
                     size="small"
                     icon="save"
                     @click="saveModel('description')">保存</a-button>
@@ -551,7 +554,7 @@
                     :wrapperCol="wrapperCol"
                     has-feedback
                     prop="dunno">
-                    <inputView type="dunno" size="small" :parentVal="details.dunno" @getInputChange="inputChange" />
+                    <a-input size="small" v-model="details.dunno" />
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="6">
@@ -562,7 +565,7 @@
                     :wrapperCol="wrapperCol"
                     has-feedback
                     prop="dclass">
-                    <inputView type="dclass" size="small" :parentVal="details.dclass" @getInputChange="inputChange" />
+                    <a-input size="small" v-model="details.dclass" />
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="6">
@@ -573,7 +576,7 @@
                     :wrapperCol="wrapperCol"
                     has-feedback
                     prop="linkman">
-                    <inputView type="linkman" size="small" :parentVal="details.linkman" @getInputChange="inputChange" />
+                    <a-input size="small" v-model="details.linkman" />
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="6">
@@ -584,11 +587,11 @@
                     :wrapperCol="wrapperCol"
                     has-feedback
                     prop="linkman">
-                    <inputView type="linkman" size="small" :parentVal="details.linkman" @getInputChange="inputChange" />
+                    <a-input size="small" v-model="details.linkman" />
                   </a-form-model-item>
                 </a-col>
               </a-row>
-              <a-row style="display: flex;" v-if="details.cargoid == 'D'">
+              <a-row style="display: flex;" >
                 <a-upload
                   :customRequest="customRequest"
                   :showUploadList="false"
@@ -850,24 +853,25 @@ export default {
         ctnList: []
       },
       rules: {
-        tempset: [
+        linkman: [
           { required: true, message: '请输入', trigger: 'blur' }
         ],
-        tempid: [
-          { required: true, message: '请选择', trigger: 'blur' }
+        dclass: [
+          { required: true, message: '请输入', trigger: 'blur' }
         ],
-        reeferf: [
+        dunno: [
           { required: true, message: '请输入', trigger: 'blur' }
         ],
-        linkman: [
+        tempset: [
           { required: true, message: '请输入', trigger: 'blur' }
         ],
-        dclass: [
+        tempid: [
           { required: true, message: '请选择', trigger: 'blur' }
         ],
-        dunno: [
+        reeferf: [
           { required: true, message: '请输入', trigger: 'blur' }
         ]
+
       },
       loading: false
     }
@@ -998,98 +1002,100 @@ export default {
       })
     },
     handleSave() {
-      console.log(this.details)
       this.$refs.basicFrom.validate(valid => {
         if (valid) {
           const data = {
-        ...this.details
-      }
-      if (!this.details.serviceList) {
-        this.details.serviceList = []
-      }
-      if (this.details.serviceList.length > 0) {
-        const arr = []
-        this.options.forEach(item => {
-          this.details.serviceList.forEach(ite => {
-            if (item.code === ite) {
-              arr.push({
-                code: item.code,
-                value: item.name
+            ...this.details
+          }
+          if (!this.details.serviceList) {
+            this.details.serviceList = []
+          }
+          if (this.details.serviceList.length > 0) {
+            const arr = []
+            this.options.forEach(item => {
+              this.details.serviceList.forEach(ite => {
+                if (item.code === ite) {
+                  arr.push({
+                    code: item.code,
+                    value: item.name
+                  })
+                }
+              })
+            })
+            data.serviceItemList = arr
+          } else {
+            data.serviceItemList = []
+          }
+          if (!this.isCopy) {
+            const filesArr = []
+            const tempFileNamesArr = []
+            if (this.fileList.length > 0) {
+              this.fileList.forEach(item => {
+                if (item.id.indexOf('\\') != -1) {
+                  tempFileNamesArr.push(item.id)
+                } else {
+                  filesArr.push(item.id)
+                }
               })
             }
-          })
-        })
-        data.serviceItemList = arr
-      } else {
-        data.serviceItemList = []
-      }
-      if (data.cargoid === 'D' && !this.isCopy) {
-        const filesArr = []
-        const tempFileNamesArr = []
-        if (this.fileList.length > 0) {
-          this.fileList.forEach(item => {
-            if (item.id.indexOf('\\') != -1) {
-              tempFileNamesArr.push(item.id)
-            } else {
-              filesArr.push(item.id)
-            }
-          })
-        }
-        data.files = filesArr
-        data.tempFileNames = tempFileNamesArr
-      }
-      if (data.ctnList.length > 0) {
-        data.ctnList.forEach(item => {
-          delete item._X_ROW_KEY
-          delete item.oper
-          this.ctnallList.forEach(ite => {
-            if (ite.code === item.ctncode) {
-              item.ctnall = ite.name
-            }
-          })
-          if (this.isCopy) {
-            delete item.id
+            data.files = filesArr
+            data.tempFileNames = tempFileNamesArr
+          }
+          if (data.ctnList.length > 0) {
+            data.ctnList.forEach(item => {
+              delete item._X_ROW_KEY
+              delete item.oper
+              this.ctnallList.forEach(ite => {
+                if (ite.code === item.ctncode) {
+                  item.ctnall = ite.name
+                }
+              })
+              if (this.isCopy) {
+                delete item.id
+              }
+            })
+          }
+          if (data.files && Object.values(data.files).length === 0) {
+            delete data.files
+          }
+          if (!data.id && !this.isCopy) {
+            data.id = this.id
           }
-        })
-      }
-      if (data.files && Object.values(data.files).length === 0) {
-        delete data.files
-      }
-      if (!data.id && !this.isCopy) {
-        data.id = this.id
-      }
 
-      this.loading = true
-      BookingCustomerOrderSave(data).then(res => {
-        if (res.success) {
-          this.$message.success('保存成功')
-          this.loading = false
-          this.id = res.data.id
-          if (this.isCopy || this.isAdd) {
-            this.$router.replace({
-            name: 'BookingCustomerDetail',
-            query: {
-              id: res.data.id,
-              noOpenTab: true
+          this.loading = true
+          BookingCustomerOrderSave(data).then(res => {
+            if (res.success) {
+              this.$message.success('保存成功')
+              this.loading = false
+              this.id = res.data.id
+              this.getDetail()
+              setTimeout(() => {
+                if (this.isCopy || this.isAdd) {
+                this.$router.replace({
+                  name: 'BookingCustomerDetail',
+                  query: {
+                    id: res.data.id,
+                    noOpenTab: true
+                  }
+                })
+                if (this.isCopy) {
+                  this.isCopy = false
+                }
+              }
+              }, 500);
+            } else {
+              this.loading = false
+              this.$message.error(res.message)
             }
           })
-          if (this.isCopy) {
-            this.isCopy = false
-          }
-          }
         } else {
-          this.loading = false
-          this.$message.error(res.message)
-        }
-      })
+          this.$message.warning('请检查必填项')
         }
+        console.log(valid)
       })
     },
     handleDelete() {
-      const data = {
-        id: this.id
-      }
-      BookingCustomerOrderDelete(data).then(res => {
+      BookingCustomerOrderDelete([this.id]).then(res => {
         if (res.success) {
           this.$message.success('删除成功')
           this.$router.push({ path: 'BookingCustomerLedger' })
diff --git a/src/views/main/BookingCustomerLedger/list/index.vue b/src/views/main/BookingCustomerLedger/list/index.vue
index 46e5256..3f66f2d 100644
--- a/src/views/main/BookingCustomerLedger/list/index.vue
+++ b/src/views/main/BookingCustomerLedger/list/index.vue
@@ -69,8 +69,8 @@
                   <div class="nav-box">
                     <div class="nav" @click="addBooking"><i class="iconfont icon-jiahao2fill"></i>新建</div>
                     <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>复制</div>
-                    <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>导入</div>
-                    <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>模板</div>
+                    <div class="nav" ><i class="iconfont icon-fuzhi"></i>导入</div>
+                    <div class="nav" ><i class="iconfont icon-fuzhi"></i>模板</div>
                     <a-popconfirm
                       title="确定删除当前选中订舱？"
                       ok-text="是"
@@ -1845,10 +1845,7 @@ export default {
       this.deleteBookingOrder(removeArr)
     },
     removeFun(row) {
-      const data = {
-        id: row.id
-      }
-      BookingCustomerOrderDelete(data).then(res => {
+      BookingCustomerOrderDelete([row.id]).then(res => {
         if (res.success) {
           this.$message.success('删除成功')
           this.init(this.searchData)
@@ -1858,15 +1855,11 @@ export default {
       })
     },
     deleteBookingOrder(arr) {
-      DeleteBookingOrder(arr.toString())
+      BookingCustomerOrderDelete(arr)
         .then((res) => {
           if (res.success) {
             this.$message.success('删除成功')
-            const _data = this.gridOptions.data.filter((item) => !arr.includes(item.id))
-            this.$refs.xGrid.reloadData(_data).then(() => {
-              this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length
-            })
-            this.$forceUpdate()
+            this.init(this.searchData)
           } else {
             this.$message.error(res.message)
           }