修改问题

src/api/modular/main/BookingLedger.js

@@ -951,9 +951,8 @@ export function PageDataByBooking (parameter) {
 
 export function RefreshBillTrace (parameter) {
   return axios({
-    url: '/BookingOrder/RefreshBillTrace',
-    method: 'post',
-    params: parameter
+    url: '/BookingYunZong/RefreshYunZong?' + parameter,
+    method: 'post'
   })
 }
 

src/components/MultiTab/MultiTab.vue

@@ -68,11 +68,12 @@ export default {
             }
           })
         } else {
-          this[action](targetKey)
+          if (!this.inBookingDetailsSave) {
+            this[action](targetKey)
           const $data = this.needSavePages
           delete $data[targetKey]
           this.setNeedSavePages($data)
-          console.log(this.needSavePages)
+          }
         }
       } else {
         if (targetKey === '/bookingLedger') {

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

@@ -1,9 +1,7 @@
 <template>
   <div class="main">
     <div class="btn-list">
-      <a-popconfirm v-if="details.bsstatus == '已接收'" title="确定通过吗？" ok-text="是" cancel-text="否" @confirm="handleAccept">
-        <a-button type="primary">通过</a-button>
-      </a-popconfirm>
+      <a-button @click="handleAccept" type="primary">通过</a-button>
       <a-button type="primary" v-if="details.bsstatus == '已接收'" @click="handleAutio">驳回</a-button>
       <span v-if="details.bookingno" style="margin: 0 10px;">订舱编号:</span>
       <span v-if="details.bookingno">{{ details.bookingno }}</span>
@@ -417,9 +415,9 @@
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
                     has-feedback
-                    prop="dunno">
+                    prop="CtrnLength">
                     <div class="line-box">
-                      {{ details.dunno }}
+                      {{ details.CtrnLength }}
                       <span class="unit">CM</span>
                     </div>
                   </a-form-model-item>
@@ -431,9 +429,9 @@
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
                     has-feedback
-                    prop="dclass">
+                    prop="CtrnWidth">
                     <div class="line-box">
-                      {{ details.dclass }}
+                      {{ details.CtrnWidth }}
                       <span class="unit">CM</span>
                     </div>
                   </a-form-model-item>
@@ -445,9 +443,9 @@
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
                     has-feedback
-                    prop="linkman">
+                    prop="CtrnHeight">
                     <div class="line-box">
-                      {{ details.linkman }}
+                      {{ details.CtrnHeight }}
                       <span class="unit">CM</span>
                     </div>
                   </a-form-model-item>

src/views/main/BookingCustomerLedger/list/modules/initData.js

@@ -12,8 +12,9 @@ export default {
       slots: { default: 'bsstatusname' }
     },
     { field: 'bookingno', label: 'bookingno', title: '订舱编号', showHeaderOverflow: true, sortable: true },
-    { field: 'carrier', title: '船公司', showHeaderOverflow: true, sortable: true },
-    { field: 'bookingTenantName', title: '订舱人', showHeaderOverflow: true },
+    { field: 'carrier', title: '船公司', showHeaderOverflow: true, sortable: true, width: 60 },
+    { field: 'bookingTenantName', title: '订舱公司', showHeaderOverflow: true },
+    { field: 'bookingUserName', title: '订舱人', showHeaderOverflow: true },
     {
       field: 'cntrtotal',
       label: 'CNTRTOTAL',

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

@@ -460,10 +460,10 @@ export default {
     )
   },
   beforeRouteUpdate(to, from, next) {
-    if (this.inAddSave) {
-      next()
-      return false
-    }
+    // if (this.inAddSave) {
+    //   next()
+    //   return false
+    // }
     if (this.isCopy) {
       const hisData = {
         bookingDetails: this.bookingDetails,
@@ -1300,7 +1300,7 @@ export default {
         const _data = JSON.parse(JSON.stringify(that.bookingDetails))
         delete _data.hbList
         this.setInBookingDetailsSave(true)
-        if (this.isCopy) {
+        if (this.$route.query.isCopy) {
           delete _data.bookingno
           _data.id = 0
           _data.ctnInputs.map((item, index) => {

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

@@ -2036,7 +2036,7 @@ export default {
                   })
                 }
               })
-              const pkgs = Number(item.pkgs) - total
+              const pkgs = this.formatNum(Number(item.pkgs), total, '-', 2)
               item.pkgs = pkgs
             }
             if (item.cbmFlag) {
@@ -2051,7 +2051,7 @@ export default {
                   })
                 }
               })
-              const cbm = Number(item.cbm) - total
+              const cbm = this.formatNum(Number(item.cbm), total, '-', 2)
               item.cbm = cbm
             }
             if (item.kgsFlag) {
@@ -2066,7 +2066,7 @@ export default {
                   })
                 }
               })
-              const kgs = Number(item.kgs) - total
+              const kgs = this.formatNum(Number(item.kgs), total, '-', 2)
               item.kgs = kgs
             }
 
@@ -2164,6 +2164,11 @@ export default {
           console.log(err)
         })
     },
+    formatNum(add, reduce, s, num) {
+      const m = Math.pow(10, num); // num是10的次幂
+      const res = s == '+' ? (add * m + reduce * m) / m : (add * m - reduce * m) / m;
+      return Math.round(res * m) / m;
+    },
     removeFun(selectArr = this.selectArr) {
       const arr = this.orderList.filter((sitem, sindex) => {
         return !selectArr.includes(sindex)

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

@@ -1011,6 +1011,7 @@ export default {
           if (this.firstFlag && this.saveNeedNumber === null) {
             this.getList(this.searchData)
           }
+          this.setInBookingDetailsSave(false)
         }
       }
     }
@@ -1022,7 +1023,7 @@ export default {
     this.onresize()
   },
   methods: {
-    ...mapActions(['setBookingList', 'setBookingGridOptions']),
+    ...mapActions(['setBookingList', 'setBookingGridOptions', 'setInBookingDetailsSave']),
     createdInit() {
       this.showColumns = JSON.parse(JSON.stringify(initData.columns))
       this.formAllData = JSON.parse(JSON.stringify(initData.condAllData))
@@ -1410,11 +1411,15 @@ export default {
         this.$message.warning('请先选择')
         return false
       } else {
-        const data = {
-          ids: arr.join(',')
-        }
+        let str = ''
+        arr.forEach((item, index) => {
+          str += 'Ids=' + item
+          if (index != arr.length - 1) {
+            str += '&'
+          }
+        })
         this.refshYZloading = true
-        RefreshBillTrace(data).then(res => {
+        RefreshBillTrace(str).then(res => {
           if (res.success) {
             this.refshYZloading = false
             this.$message.success('操作成功')
@@ -1426,11 +1431,8 @@ export default {
       }
     },
     handleRefshYZOnce(row, rowIndex) {
-      const data = {
-        ids: row.id
-      }
       row.refshYzitemLoad = true
-      RefreshBillTrace(data).then(res => {
+      RefreshBillTrace('ids=' + row.id).then(res => {
         if (res.success) {
           PageDataByBooking({ id: row.id }).then(ress => {
             const item = ress.data.items[0]

src/views/main/Taskmanage/TaskmanageList/index.vue

@@ -422,12 +422,11 @@ export default {
     '$route': {
       deep: true,
       handler(nD, oD) {
-        console.log(nD)
         if (nD.name === 'Taskmanage_list') {
-          if (this.saveNeedCar !== null) {
+          if (this.saveNeedCar !== null && this.saveNeedCar !== '') {
             let index = 0
             this.gridOptions.data.forEach((ite, inde) => {
-              if (ite.id === this.saveNeedCar) {
+              if (ite.pkId === this.saveNeedCar) {
                 index = inde
               }
             })