吉永导入增加参数 首页弹窗增加像箱来源字段 2023-11-30

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -721,10 +721,15 @@ export default {
       this.switchDialog = val;
     },
     importBox() {
+        if (!this.form.id) {
+            this.$message.error('请先保存数据')
+            return
+        }
       this.findObject(this.excelOption.column, "excelFile").data = {
         corpId: this.form.purchaseCompanyId,
         corpName: this.form.purchaseCompanyName,
-        billType: "BUY"
+        billType: "BUY",
+        pid:this.form.id
       }
       this.excelBox = true
     },

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -941,10 +941,15 @@ export default {
       window.open(`/api/blade-box-tube/transport/export-transport-info?${this.website.tokenHeader}=${getToken()}`);
     },
     importBoxTwo() {
+        if (!this.form.id) {
+            this.$message.error('请先保存数据')
+            return
+        }
       this.findObject(this.excelOption.column, "excelFile").data = {
         corpId: this.form.corpId,
         corpName: this.form.corpName,
-        billType: "CKZY"
+        billType: "CKZY",
+          pid:this.form.id
       }
       this.excelBox = true
     },

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -952,10 +952,15 @@ export default {
       window.open(`/api/blade-box-tube/transport/export-transport-info?${this.website.tokenHeader}=${getToken()}`);
     },
     importBoxTwo() {
+        if (!this.form.id) {
+            this.$message.error('请先保存数据')
+            return
+        }
       this.findObject(this.excelOption.column, "excelFile").data = {
         corpId: this.form.corpId,
         corpName: this.form.corpName,
-        billType: "JKFC"
+        billType: "JKFC",
+          pid:this.form.id
       }
       this.excelBox = true
     },

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -105,7 +105,7 @@
               @click="statusUpdate('3','撤销租金')">撤销租金
           </el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom"
-                     @click="excelBox = true">导入
+                     @click="importBox">导入
           </el-button>
           <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">
             报表打印
@@ -921,6 +921,16 @@ export default {
     onClose(val) {
       this.switchDialog = val;
     },
+      importBox() {
+          if (!this.form.id) {
+              this.$message.error('请先保存数据')
+              return
+          }
+          this.findObject(this.excelOption.column, "excelFile").data = {
+              pid:this.form.id
+          }
+          this.excelBox = true
+      },
     derivation() {
       window.open(`/api/blade-box-tube/tradingBoxRent/export-tradingBox-info?${this.website.tokenHeader}=${getToken()}`);
     },

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -887,8 +887,13 @@ export default {
       this.switchDialog = val;
     },
     importBox() {
+        if (!this.form.id) {
+            this.$message.error('请先保存数据')
+            return
+        }
       this.findObject(this.excelOption.column, "excelFile").data = {
-        billType: "ZC"
+        billType: "ZC",
+          pid:this.form.id
       }
       this.excelBox = true
     },

src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -754,10 +754,15 @@ export default {
       done();
     },
     importBox() {
+        if (!this.form.id) {
+            this.$message.error('请先保存数据')
+            return
+        }
       this.findObject(this.excelOption.column, "excelFile").data = {
         corpId: this.form.purchaseCompanyId,
         corpName: this.form.purchaseCompanyName,
-        billType: "SELL"
+        billType: "SELL",
+        pid:this.form.id
       }
       this.excelBox = true
     },

src/views/wel/home/equipmentControl/components/sales-reached.vue

@@ -106,8 +106,11 @@ export default {
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }
-          , {
+          },{
+                label: '箱来源',
+                prop: 'boxSource',
+                overHidden: true,
+            }, {
             label: '箱动态',
             prop: 'boxAccessStatus',
             overHidden: true,