修改禅道

src/api/boxManagement/buyContainer/index.js

@@ -244,3 +244,10 @@ export function batchUpdatePodStation(data) {
     data: data
   })
 }
+export const getAccurate = (params) => {
+  return request({
+    url: '/api/blade-los/archives/list',
+    method: 'get',
+    params: params
+  })
+}

src/api/iosBasicData/businessCenter/bookingCabin.js

@@ -88,7 +88,7 @@ export function repealCancel(data) {
 //单据复制
 export const copyAgent = (data) => {
     return request({
-        url: '/api/blade-los/putbox/copyDocument',
+        url: '/api/blade-los/bookingCabin/copyBillsBooking',
         method: 'get',
         params: data
     })

src/views/boxManagement/agentBox/detailsPage.vue

@@ -137,8 +137,7 @@
                   @click="allClick('一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
                   @click="allClick('批量删除')">批量删除</el-button>
-                <el-button type="success" size="small" @click="allClick('导入')"
-                  :disabled="!form.id">导入</el-button>
+                <el-button type="success" size="small" @click="allClick('导入')" :disabled="!form.id">导入</el-button>
                 <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0">启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
@@ -399,7 +398,8 @@ import {
   submitBoxList,
   boxRemove,
   copyAgent,
-  pleaseVerifyCost
+  pleaseVerifyCost,
+  getAccurate
 } from "@/api/boxManagement/buyContainer/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1366,37 +1366,44 @@ export default {
   },
   methods: {
     verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {

src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -214,8 +214,8 @@
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus"
-                  :disabled="form.buxStaus == '已确认'" circle @click="feecAddRow()">
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="form.buxStaus == '已确认'" circle
+                  @click="feecAddRow()">
                 </el-button>
               </template>
               <template slot="index" slot-scope="{row,index}">
@@ -288,8 +288,7 @@
                 <span v-else>{{ row.remarks }}</span>
               </template>
               <template slot="menu" slot-scope="{ row, index }">
-                <el-button size="small" icon="el-icon-delete" type="text"
-                  @click="polRowDel(row, index)">删 除</el-button>
+                <el-button size="small" icon="el-icon-delete" type="text" @click="polRowDel(row, index)">删 除</el-button>
               </template>
             </avue-crud>
           </el-card>
@@ -344,7 +343,8 @@ import {
   copyAgent,
   confirm,
   revoke,
-  pleaseVerifyCost
+  pleaseVerifyCost,
+  getAccurate
 } from "@/api/boxManagement/buyContainer/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1238,37 +1238,44 @@ export default {
   },
   methods: {
     verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {

src/views/boxManagement/boxExit/detailsPage.vue

@@ -210,20 +210,20 @@
                   <i class="el-icon-coin"></i>
                   <span>应付费用</span>
                 </div>
-                <el-button type="info" plain size="small" :disabled=" form.buxStaus == '已确认'"
+                <el-button type="info" plain size="small" :disabled="form.buxStaus == '已确认'"
                   @click="allClick('费用一键保存')">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled=" form.buxStaus == '已确认'"
+                <el-button type="info" plain size="small" :disabled="form.buxStaus == '已确认'"
                   @click="allClick('费用一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small"
                   :disabled="selectionfeecList.length == 0 || form.buxStaus == '已确认'"
                   @click="allClick('费用批量删除')">批量删除</el-button>
-                <el-button type="primary" plain size="small" :disabled=" selectionfeecList.length == 0"
+                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0"
                   @click="allClick('费用申请')">请核费用</el-button>
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus"
-                  :disabled=" form.buxStaus == '已确认'" circle @click="feecAddRow()">
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="form.buxStaus == '已确认'" circle
+                  @click="feecAddRow()">
                 </el-button>
               </template>
               <template slot="index" slot-scope="{row,index}">
@@ -352,7 +352,8 @@ import {
   copyAgent,
   confirm,
   revoke,
-  pleaseVerifyCost
+  pleaseVerifyCost,
+  getAccurate
 } from "@/api/boxManagement/buyContainer/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1287,37 +1288,44 @@ export default {
   },
   methods: {
     verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {
@@ -1616,8 +1624,8 @@ export default {
             row.amountUSD = row.amount
             row.amountCNY = 0
           }
-                  if(row.auditStatus>0){
-            this.editDisabled=true
+          if (row.auditStatus > 0) {
+            this.editDisabled = true
             this.optionForm.disabled = true
           }
         })

src/views/boxManagement/boxPoolDynamics/components/importModule.vue

@@ -43,6 +43,8 @@ export default {
                 align: 'center',
                 menu: false,
                 addBtn: false,
+                refreshBtn: false,
+                columnBtn: false,
                 stripe: true,
                 tip: false,
                 selection: true,
@@ -86,6 +88,10 @@ export default {
                         label: '动态日期',
                         prop: 'boxStatusDate',
                         overHidden: true,
+                        width:100,
+                        type: "date",
+                        format: 'yyyy-MM-dd',
+                        valueFormat: 'yyyy-MM-dd'
                     },
                     {
                         label: '单据号',
@@ -110,6 +116,16 @@ export default {
     },
     created() { },
     methods: {
+        calculateCheckDigit(containerNo) {
+            let charCode = "0123456789A?BCDEFGHIJK?LMNOPQRSTU?VWXYZ";
+            let num = 0;
+            for (let i = 0; i < 10; i++) {
+                let idx = charCode.indexOf(containerNo[i]);
+                idx = idx * Math.pow(2, i);
+                num += idx;
+            }
+            return num = (num % 11) % 10;
+        },
         //去重判断
         mergeAndDeduplicate(arr1, arr2) {
             // 合并两个数组
@@ -134,6 +150,7 @@ export default {
         //文件上传成功时的钩子
         onSuccess(res, file) {
             this.data = this.mergeAndDeduplicate(this.data, res.data)
+            this.$message.success('上传成功');
             this.loading = false
         },
         //文件上传失败时的钩子
@@ -198,15 +215,52 @@ export default {
             if (this.selectionList.length == 0) {
                 return this.$message.error("请选择数据");
             }
-            this.loading = true
-            getDicinit('POST', this.url, this.selectionList).then(res => {
-                console.log(11111)
-                this.excelBox = false
-                this.$emit('refreshData')
-            }).finally(() => {
-                this.loading = false;
-            })
-
+            for (let item of this.selectionList) {
+                const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+                if (regex.test(item.boxCode)) {
+                    if (this.calculateCheckDigit(item.boxCode) == item.boxCode[10]) {
+                        this.loading = true
+                        getDicinit('POST', this.url, this.selectionList).then(res => {
+                            this.excelBox = false
+                            this.$emit('refreshData')
+                        }).finally(() => {
+                            this.loading = false;
+                        })
+                    } else {
+                        this.$confirm(`箱号:${item.boxCode}是否强制加入系统?`, '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            this.loading = true
+                            getDicinit('POST', this.url, this.selectionList).then(res => {
+                                console.log(11111)
+                                this.excelBox = false
+                                this.$emit('refreshData')
+                            }).finally(() => {
+                                this.loading = false;
+                            })
+                        })
+                        return
+                    }
+                } else {
+                    this.$confirm(`箱号:${item.boxCode}是否强制加入系统?`, '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.loading = true
+                        getDicinit('POST', this.url, this.selectionList).then(res => {
+                            console.log(11111)
+                            this.excelBox = false
+                            this.$emit('refreshData')
+                        }).finally(() => {
+                            this.loading = false;
+                        })
+                    })
+                    return
+                }
+            }
         },
         cellStyle({ row, column, rowIndex, columnIndex }) {
             if (row.result == '失败') {

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -76,8 +76,7 @@
                   @click="allClick('一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
                   @click="allClick('批量删除')">批量删除</el-button>
-                <el-button type="success" size="small" @click="allClick('导入')"
-                  :disabled="!form.id">导入</el-button>
+                <el-button type="success" size="small" @click="allClick('导入')" :disabled="!form.id">导入</el-button>
                 <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0">启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
@@ -170,13 +169,11 @@
                   <i class="el-icon-coin"></i>
                   <span>应付费用</span>
                 </div>
-                <el-button type="info" plain size="small" :disabled="false"
-                  @click="allClick('费用一键保存')">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled="false"
-                  @click="allClick('费用一键编辑')">一键编辑</el-button>
-                <el-button type="danger" plain size="small" :disabled=" selectionfeecList.length == 0"
+                <el-button type="info" plain size="small" :disabled="false" @click="allClick('费用一键保存')">一键保存</el-button>
+                <el-button type="info" plain size="small" :disabled="false" @click="allClick('费用一键编辑')">一键编辑</el-button>
+                <el-button type="danger" plain size="small" :disabled="selectionfeecList.length == 0"
                   @click="allClick('费用批量删除')">批量删除</el-button>
-                <el-button type="primary" plain size="small" :disabled=" selectionfeecList.length == 0"
+                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0"
                   @click="allClick('费用申请')">请核费用</el-button>
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
@@ -255,8 +252,7 @@
                 <span v-else>{{ row.remarks }}</span>
               </template>
               <template slot="menu" slot-scope="{ row, index }">
-                <el-button size="small" icon="el-icon-delete" type="text"
-                  @click="polRowDel(row, index)">删 除</el-button>
+                <el-button size="small" icon="el-icon-delete" type="text" @click="polRowDel(row, index)">删 除</el-button>
               </template>
             </avue-crud>
           </el-card>
@@ -336,7 +332,8 @@ import {
   submitFeeList,
   enable,
   copyAgent,
-  pleaseVerifyCost
+  pleaseVerifyCost,
+  getAccurate
 } from "@/api/boxManagement/buyContainer/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1184,50 +1181,57 @@ export default {
     this.roleName = localStorage.getItem('roleName').split(',')
     this.option = await this.getColumnData(this.getColumnName(235.1), this.optionBack);
     this.feecOption = await this.getColumnData(this.getColumnName(235.2), this.feecOptionBack);
-    if (this.detailData&&this.detailData.id) {
+    if (this.detailData && this.detailData.id) {
       // this.editButton = true
       // this.editDisabled = true
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id)
     }
-    if (this.detailData&&this.detailData.copyId) {
+    if (this.detailData && this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId)
     }
     this.saveLocalCurrency(this.deptId)
   },
   methods: {
-    verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+      verifyChange(name, row) {
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {
@@ -1588,8 +1592,8 @@ export default {
             row.amountUSD = row.amount
             row.amountCNY = 0
           }
-          if(row.auditStatus>0){
-            this.editDisabled=true
+          if (row.auditStatus > 0) {
+            this.editDisabled = true
             this.optionForm.disabled = true
           }
         })

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -237,6 +237,7 @@ import {
   batchContainerNumber,
   copyAgent
 } from "@/api/boxManagement/containerNumber";
+import { getAccurate } from "@/api/boxManagement/buyContainer/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import businessReports from "@/components/tradeAgency/businessReports.vue";
@@ -967,37 +968,44 @@ export default {
   },
   methods: {
     verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -127,8 +127,7 @@
                   :disabled="form.buxStaus != '已启租'">退租</el-button>
                 <el-button type="danger" plain size="small" @click="allClick('撤销退租')"
                   :disabled="form.buxStaus != '已退租'">撤销退租</el-button>
-                <el-button type="success" size="small" @click="allClick('导入')"
-                  :disabled="!form.id">导入</el-button>
+                <el-button type="success" size="small" @click="allClick('导入')" :disabled="!form.id">导入</el-button>
                 <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0 || form.buxStaus != '已启租'">启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
@@ -297,8 +296,7 @@
                 <span v-else>{{ row.remarks }}</span>
               </template>
               <template slot="menu" slot-scope="{ row, index }">
-                <el-button size="small" icon="el-icon-delete" type="text"
-                  @click="polRowDel(row, index)">删 除</el-button>
+                <el-button size="small" icon="el-icon-delete" type="text" @click="polRowDel(row, index)">删 除</el-button>
               </template>
             </avue-crud>
           </el-card>
@@ -384,7 +382,8 @@ import {
   rentCalculation,
   revokeRentCalculation,
   copyAgent,
-  pleaseVerifyCost
+  pleaseVerifyCost,
+  getAccurate
 } from "@/api/boxManagement/buyContainer/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1422,38 +1421,45 @@ export default {
     this.saveLocalCurrency(this.deptId)
   },
   methods: {
-    verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+   verifyChange(name, row) {
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {

src/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox/containers.vue

@@ -144,6 +144,7 @@ import {
   containersSubmitList,
   containersExportContainers, containersImportBoxNo, containersList
 } from "@/api/iosBasicData/containers";
+import { getAccurate } from "@/api/boxManagement/buyContainer/index.js";
 import { mapGetters } from "vuex";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import bports from "@/views/iosBasicData/bports/index.vue";
@@ -152,7 +153,7 @@ import { bportsList } from "@/api/iosBasicData/bports";
 import { getToken } from "@/util/auth";
 
 export default {
-  components: { SearchQuery, bports,businessReports },
+  components: { SearchQuery, bports, businessReports },
   props: {
     assemblyForm: {},
     detailData: {},
@@ -318,39 +319,43 @@ export default {
       this.$set(row, name, row[name].toLocaleUpperCase().replace(/[\W]/g, ''))
     },
     verifyChange(row, name) {
-      if (name == 'cntrNo') {
-        const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-        if (regex.test(row[name])) {
-          if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-            // this.$message.success('集装箱校验正确!')
-          } else {
-            this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              // this.$message({
-              //   type: 'success',
-              //   message: '删除成功!'
-              // });
-            }).catch(() => {
-              this.$set(row, [name], null)
-            });
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
           }
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
+        })
       }
     },
     calculateCheckDigit(containerNo) {

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -1368,8 +1368,12 @@ export default {
         },
         // 件数聚焦
         quantityFocus() {
-            if (this.assemblyForm.waitingBoxList) {
-                if (Number(this.assemblyForm.waitingBoxList[0].quantity) == 0) {
+           if (this.assemblyForm.containersList&&this.assemblyForm.containersList.length) {
+                let num=0
+                for(let item of this.assemblyForm.containersList){
+                    num+=Number(item.quantity)
+                }
+                if (Number(num) == 0) {
                     this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
                         confirmButtonText: '确定',
                     });
@@ -1381,7 +1385,6 @@ export default {
                     return
                 }
             }
-
         },
         // 件数监听
         quantityInput(value) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -181,6 +181,7 @@ import {
     containersSubmitList,
     containersExportContainers, containersImportBoxNo, containersList, luHaiTongApiDetail
 } from "@/api/iosBasicData/containers";
+import { getAccurate } from "@/api/boxManagement/buyContainer/index.js";
 import { mapGetters } from "vuex";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import bports from "@/views/iosBasicData/bports/index.vue";
@@ -537,39 +538,43 @@ export default {
             this.$set(row, name, row[name].toLocaleUpperCase().replace(/[\W]/g, ''))
         },
         verifyChange(row, name) {
-            if (name == 'cntrNo') {
-                const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-                if (regex.test(row[name])) {
-                    if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-                        // this.$message.success('集装箱校验正确!')
-                    } else {
-                        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-                            confirmButtonText: '确定',
-                            cancelButtonText: '取消',
-                            type: 'warning'
-                        }).then(() => {
-                            // this.$message({
-                            //   type: 'success',
-                            //   message: '删除成功!'
-                            // });
-                        }).catch(() => {
-                            this.$set(row, [name], null)
-                        });
+            if (row[name]) {
+                getAccurate({ accurate: row[name] }).then(res => {
+                    if (res.data.data.records.length == 0) {
+                        const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+                        if (regex.test(row[name])) {
+                            if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                                // this.$message.success('集装箱校验正确!')
+                            } else {
+                                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                                    confirmButtonText: '确定',
+                                    cancelButtonText: '取消',
+                                    type: 'warning'
+                                }).then(() => {
+                                    // this.$message({
+                                    //   type: 'success',
+                                    //   message: '删除成功!'
+                                    // });
+                                }).catch(() => {
+                                    this.$set(row, [name], null)
+                                });
+                            }
+                        } else {
+                            this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                                confirmButtonText: '确定',
+                                cancelButtonText: '取消',
+                                type: 'warning'
+                            }).then(() => {
+                                // this.$message({
+                                //   type: 'success',
+                                //   message: '删除成功!'
+                                // });
+                            }).catch(() => {
+                                this.$set(row, [name], null)
+                            });
+                        }
                     }
-                } else {
-                    this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-                        confirmButtonText: '确定',
-                        cancelButtonText: '取消',
-                        type: 'warning'
-                    }).then(() => {
-                        // this.$message({
-                        //   type: 'success',
-                        //   message: '删除成功!'
-                        // });
-                    }).catch(() => {
-                        this.$set(row, [name], null)
-                    });
-                }
+                })
             }
         },
         calculateCheckDigit(containerNo) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -1507,8 +1507,12 @@ export default {
         },
         // 件数聚焦
         quantityFocus() {
-            if (this.assemblyForm.waitingBoxList) {
-                if (Number(this.assemblyForm.waitingBoxList[0].quantity) == 0) {
+            if (this.assemblyForm.containersList&&this.assemblyForm.containersList.length) {
+                let num=0
+                for(let item of this.assemblyForm.containersList){
+                    num+=Number(item.quantity)
+                }
+                if (Number(num) == 0) {
                     this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
                         confirmButtonText: '确定',
                     });
@@ -1520,7 +1524,6 @@ export default {
                     return
                 }
             }
-
         },
         // 件数监听
         quantityInput(value) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -370,7 +370,7 @@ export default {
                     },
                     {
                         label: "放箱号类型",
-                        prop: "internalBoxClass",
+                        prop: "busType",
                         width: 100,
                         overHidden: true,
                     },

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -169,7 +169,7 @@
                 <template slot="eta" slot-scope="scope">
                     <span>{{
                         scope.row.eta ? scope.row.eta.slice(0, 10) : ""
-                    }}</span>
+                        }}</span>
                 </template>
                 <template slot="updateTime" slot-scope="scope">
                     <span>{{
@@ -732,6 +732,12 @@ export default {
                         searchOrder: 4
                     },
                     {
+                        label: '预定舱单号',
+                        prop: "temporaryNo",
+                        width: "100",
+                        overHidden: true,
+                    },
+                    {
                         label: "船名",
                         prop: "vesselCnName",
                         width: "120",
@@ -2335,8 +2341,8 @@ export default {
                         // this.detailData.seeDisabled = false;
                         // this.detailData.id = this.selectionList[0].id;
                         // this.isShow = false;
-                        let ids=[]
-                        for(let item of this.selectionList){
+                        let ids = []
+                        for (let item of this.selectionList) {
                             ids.push(item.id)
                         }
                         let obj = {

src/views/iosBasicData/businessCenter/bookingCabin/detailsPage.vue

@@ -615,11 +615,13 @@ export default {
           this.form.polId = row.id
           this.form.polCode = row.code
           this.form.polEnName = row.enName
+          this.form.polNamePrint = row.enName
         } else {
           this.form.polId = null
           this.form.polCode = null
           this.form.polEnName = null
           this.form.polCnName = null
+          this.form.polNamePrint = null
         }
       }
       if (name == 'podCnName') {
@@ -627,11 +629,13 @@ export default {
           this.form.podId = row.id
           this.form.podCode = row.code
           this.form.podEnName = row.enName
+          this.form.podNamePrint = row.enName
         } else {
           this.form.podId = null
           this.form.podCode = null
           this.form.podEnName = null
           this.form.podCnName = null
+          this.form.podNamePrint = null
         }
       }
       if (name == 'lineCnName') {

src/views/iosBasicData/businessCenter/bookingCabin/index.vue

@@ -10,9 +10,9 @@
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据
                     </el-button>
-                    <!-- <el-button type="success" size="small" :disabled="selectionList.length != 1"
+                    <el-button type="success" size="small" :disabled="selectionList.length != 1"
                         @click="copyButton">复制单据
-                    </el-button> -->
+                    </el-button>
                     <el-button type="warning" size="small" @click="outExport">导 出</el-button>
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
@@ -66,7 +66,7 @@ export default {
                 menuWidth: 140,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -91,6 +91,13 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: '预定舱单号',
+                        prop: "temporaryNo",
+                        width: "100",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
                         label: 'OP',
                         prop: "operatorName",
                         width: "100",
@@ -98,7 +105,7 @@ export default {
                     },
                     {
                         label: '客服',
-                        prop: "accDeptName",
+                        prop: "customerServiceName",
                         width: "100",
                         overHidden: true,
                     },
@@ -177,8 +184,8 @@ export default {
                     },
 
                     {
-                        label: 'booking NO',
-                        prop: "bookingNo",
+                        label: '船司约号',
+                        prop: "carrierArgreementNo",
                         width: "100",
                         overHidden: true,
                     },
@@ -193,7 +200,7 @@ export default {
                     },
                     {
                         label: '付费方式',
-                        prop: "hpaymode",
+                        prop: "mpaymode",
                         width: "100",
                         overHidden: true,
                     },
@@ -249,6 +256,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: '订舱备注',
+                        prop: "cyRemarks",
+                        width: "100",
+                        overHidden: true,
+                    },
+                    {
                         label: 'MB/L NO',
                         prop: "mblno",
                         width: "100",

src/views/ow/owPut/detailsPage.vue

@@ -41,10 +41,10 @@
           <trade-card title="基础信息">
             <avue-form :option="optionForm" v-model="form" ref="form">
               <tempalte slot="purchaseCompanyName">
-                <dic-select v-model="form.purchaseCompanyName" placeholder="USER" key="id" label="cnName" res="records"
+                <dic-select v-model="form.purchaseCompanyName" placeholder="USER" key="id" label="shortName" res="records"
                   @selectChange="dicChange('purchaseCompanyName', $event)" :disabled="form.whetherEnable == '是'"
                   url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
-                  :remote="true" dataName="cnName" :slotRight="true" rightLabel="code">
+                  :remote="true" dataName="shortName" :slotRight="true" rightLabel="code">
                 </dic-select>
               </tempalte>
               <tempalte slot="containerNumber">
@@ -603,7 +603,8 @@ import {
   revokeCountRent,
   submitRtList,
   pleaseVerifyCost,
-  batchUpdatePodStation
+  batchUpdatePodStation,
+  getAccurate
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -2080,38 +2081,45 @@ export default {
     this.saveLocalCurrency(this.deptId)
   },
   methods: {
-    verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+      verifyChange(name, row) {
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {

src/views/ow/owTask/detailsPage.vue

@@ -598,7 +598,8 @@ import {
   revokeCountRent,
   submitRtList,
   pleaseVerifyCost,
-  batchUpdatePodStation
+  batchUpdatePodStation,
+  getAccurate
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -2050,38 +2051,45 @@ export default {
 
   },
   methods: {
-    verifyChange(name, row) {
-      const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
-      if (regex.test(row[name])) {
-        if (this.calculateCheckDigit(row[name]) == row[name][10]) {
-          // this.$message.success('集装箱校验正确!')
-        } else {
-          this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            // this.$message({
-            //   type: 'success',
-            //   message: '删除成功!'
-            // });
-          }).catch(() => {
-            this.$set(row, [name], null)
-          });
-        }
-      } else {
-        this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // this.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).catch(() => {
-          this.$set(row, [name], null)
-        });
+   verifyChange(name, row) {
+      if (row[name]) {
+        getAccurate({ accurate: row[name] }).then(res => {
+          if (res.data.data.records.length == 0) {
+            const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+            if (regex.test(row[name])) {
+              if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                // this.$message.success('集装箱校验正确!')
+              } else {
+                this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  // this.$message({
+                  //   type: 'success',
+                  //   message: '删除成功!'
+                  // });
+                }).catch(() => {
+                  this.$set(row, [name], null)
+                });
+              }
+            } else {
+              this.$confirm(`箱号:${row[name]}是否强制加入系统?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                // this.$message({
+                //   type: 'success',
+                //   message: '删除成功!'
+                // });
+              }).catch(() => {
+                this.$set(row, [name], null)
+              });
+            }
+          }
+
+        })
       }
     },
     calculateCheckDigit(containerNo) {