OW 放箱号 箱明细 新加字段 导出新加ids

箱动态查询 admin角色新加 设计报表功能
结算中心 销项发票 自动生成的单据 撤销生成需要同时删掉单据并返回
海运出口 查看放箱号 加上深拷贝
箱量 修改数据时 去掉是否有明细的限制

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -306,8 +306,8 @@
           <template slot="index" slot-scope="{ row, index }">
             <span>{{ index + 1 }}</span>
           </template>
-          <template slot="codeSearch">
-            <el-input v-model="query.code" size="small" placeholder="请输入箱号 多个箱号用空格区分" type="textarea" autosize></el-input>
+          <template slot="boxCodeSearch">
+            <el-input v-model="query.boxCode" size="small" placeholder="请输入箱号 多个箱号用空格区分" type="textarea" autosize></el-input>
           </template>
           <template slot="boxCodeForm" slot-scope="{ row }">
             <el-input
@@ -1286,6 +1286,30 @@ export default {
             overHidden: true
           },
           {
+            label: "目的港场站联系人",
+            prop: "podCyContact",
+            overHidden: true,
+            width: 110
+          },
+          {
+            label: "目的港场站地址",
+            prop: "podCyAddress",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "目的港场站邮箱",
+            prop: "podCyEmail",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "目的港场站电话",
+            prop: "podCyTel",
+            overHidden: true,
+            width: 100
+          },
+          {
             label: "代理名称",
             prop: "agentName",
             cell: true,
@@ -1772,11 +1796,19 @@ export default {
     },
     allClick(name) {
       if (name == "导出") {
+        let ids = [];
+        for (let item of this.selectionList) {
+          ids.push(item.id);
+        }
+        let data = {
+          pid: this.form.id,
+          itemIds: ids.join(",")
+        };
         const routeData = this.$router.resolve({
           path: "/api/blade-los/putboxitems/exportBoxItem", //跳转目标窗口的地址
           query: {
             "Blade-Auth": getToken(),
-            pid: this.form.id //括号内是要传递给新窗口的参数
+            ...data //括号内是要传递给新窗口的参数
           }
         });
         window.open(routeData.href.slice(1, routeData.href.length));

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

@@ -800,7 +800,7 @@ export default {
       this.editStatus = true;
       this.dialogVisible = true;
       this.boxForm = row;
-      this.containerNumberItemList = this.assemblyForm.containerNumberItemList.filter(item => row.cntrTypeCode == item.boxType && item.occupyNum > 0);
+      this.containerNumberItemList = this.deepClone(this.assemblyForm.containerNumberItemList.filter(item => row.cntrTypeCode == item.boxType && item.occupyNum > 0));
     },
     handleClose() {
       this.dialogVisible = false;

src/views/iosBasicData/boxDynamic/index.vue

@@ -17,6 +17,7 @@
             <div style="display: flex;justify-content: flex-end;">
               <el-button type="primary" round @click="search">Search</el-button>
               <el-button type="success" round @click="openReport">Download</el-button>
+              <el-button v-if="roleName.includes('admin')" type="danger" round @click="designReport">Design Report</el-button>
             </div>
           </el-col>
         </el-row>
@@ -63,18 +64,21 @@
     <div style="padding:0 20px 20px 20px;">
       <avue-crud class="diy_table" :option="option" :data="form.tradingBoxItemsList"> </avue-crud>
     </div>
-    <report ref="report" :id="form.id" businessValue="OW-N" classifyCode="动态查询" ></report>
-  </div>
+    <report ref="report" :id="form.id" businessValue="OW-N" classifyCode="动态查询"></report>
+    <reports :id="form.id" :assemblyForm="form" businessValue="OW-N" ref="reports"></reports>
+ </div>
 </template>
 
 <script>
 import { containerDynamicInquiry } from "@/api/iosBasicData/boxDynamic.js";
 import report from "./components/report.vue";
+import reports from "@/components/boxManagement/reports.vue";
 export default {
   name: "箱动态查询",
-  components: { report },
+  components: { report,reports },
   data() {
     return {
+      roleName: localStorage.getItem("roleName"),
       query: {},
       form: {
         tradingBoxItemsList: []
@@ -157,11 +161,17 @@ export default {
 
   created() {},
   methods: {
-    openReport(){
-      if(!this.form.id){
-         return this.$message.error("没数据，不允许打开报表!");
+    openReport() {
+      if (!this.form.id) {
+        return this.$message.error("未查询数据，不允许打开报表!");
       }
-      this.$refs.report.openDialog()
+      this.$refs.report.openDialog();
+    },
+    designReport() {
+      if (!this.form.id) {
+        return this.$message.error("未查询数据，不允许打开设计报表!");
+      }
+      this.$refs.reports.openDialog();
     },
     search() {
       if (!this.query.containerNumber) {
@@ -189,7 +199,7 @@ export default {
 .pageBack {
   background-color: #ffffff;
   width: 100%;
-  height: 100%; 
+  height: 100%;
 }
 .gradient-background {
   /* 背景渐变效果，从右上角到左下角 */

src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -373,7 +373,8 @@ import {
   revokeSettlementV1,
   feeItemsDelete,
   finstlbillslistAccBillByCorp,
-  finstlbillsAdd
+  finstlbillsAdd,
+  finstlbillsRemove
 } from "@/api/iosBasicData/finstlbills";
 import expand from "@/components/basic-container/expand.vue";
 import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -1290,19 +1291,22 @@ export default {
           });
           revokeGenerateFinStlBillsV1C(obj)
             .then(res => {
-              if (this.editButton == false) {
-                this.editDisabled = false;
-                this.optionForm.disabled = false;
-              }
-              this.optionForm.column.forEach(item => {
-                if (item.prop == "billNo") {
-                  item.disabled = true;
-                } else {
-                  item.disabled = false;
-                }
+              // if (this.editButton == false) {
+              //   this.editDisabled = false;
+              //   this.optionForm.disabled = false;
+              // }
+              // this.optionForm.column.forEach(item => {
+              //   if (item.prop == "billNo") {
+              //     item.disabled = true;
+              //   } else {
+              //     item.disabled = false;
+              //   }
+              // });
+              // this.form = res.data.data;
+              // this.getDetail(this.form.id);
+              finstlbillsRemove(this.form.id).then(res => {
+                this.$emit("goBack");
               });
-              this.form = res.data.data;
-              this.getDetail(this.form.id);
             })
             .finally(() => {
               loading.close();
@@ -1317,19 +1321,22 @@ export default {
           });
           revokeGenerateFinStlBillsV1D(obj)
             .then(res => {
-              if (this.editButton == false) {
-                this.editDisabled = false;
-                this.optionForm.disabled = false;
-              }
-              this.optionForm.column.forEach(item => {
-                if (item.prop == "billNo") {
-                  item.disabled = true;
-                } else {
-                  item.disabled = false;
-                }
+              // if (this.editButton == false) {
+              //   this.editDisabled = false;
+              //   this.optionForm.disabled = false;
+              // }
+              // this.optionForm.column.forEach(item => {
+              //   if (item.prop == "billNo") {
+              //     item.disabled = true;
+              //   } else {
+              //     item.disabled = false;
+              //   }
+              // });
+              // this.form = res.data.data;
+              // this.getDetail(this.form.id);
+              finstlbillsRemove(this.form.id).then(res => {
+                this.$emit("goBack");
               });
-              this.form = res.data.data;
-              this.getDetail(this.form.id);
             })
             .finally(() => {
               loading.close();

src/views/iosBasicData/financialManagement/fininvoicesOutput/detailsPage.vue

@@ -366,7 +366,8 @@ import {
   fininvoicesSubmit,
   generateFinInvoicesV1,
   revokeGenerateFinInvoicesV1,
-  fininvoicesAdd
+  fininvoicesAdd,
+  fininvoicesRemove
 } from "@/api/iosBasicData/fininvoices";
 import expand from "@/components/basic-container/expand.vue";
 import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -1271,19 +1272,22 @@ export default {
         });
         revokeGenerateFinInvoicesV1(obj)
           .then(res => {
-            if (this.editButton == false) {
-              this.editDisabled = false;
-              this.optionForm.disabled = false;
-            }
-            this.optionForm.column.forEach(item => {
-              if (item.prop == "billNo") {
-                item.disabled = true;
-              } else {
-                item.disabled = false;
-              }
+            // if (this.editButton == false) {
+            //   this.editDisabled = false;
+            //   this.optionForm.disabled = false;
+            // }
+            // this.optionForm.column.forEach(item => {
+            //   if (item.prop == "billNo") {
+            //     item.disabled = true;
+            //   } else {
+            //     item.disabled = false;
+            //   }
+            // });
+            // this.form = res.data.data;
+            // this.getDetail(this.form.id);
+            fininvoicesRemove(this.form.id).then(res => {
+              this.$emit("goBack");
             });
-            this.form = res.data.data;
-            this.getDetail(this.form.id);
           })
           .finally(() => {
             loading.close();

src/views/ow/owTask/detailsPage.vue

@@ -261,7 +261,7 @@
               <template slot="boxNumber">
                 <el-input-number
                   v-model="form.boxNumber"
-                  :disabled="editDisabled || (fixData && form.whetherEnable == '是') || form.suitcaseNum != 0"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
                   :min="1"
                   :controls="false"
                   placeholder="请输入 箱量"
@@ -308,10 +308,8 @@
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
                   >批量删除</el-button
                 >
-                <el-button type="success" size="small" :disabled="!form.id || form.tradingBoxItemsList.length == 0" @click="allClick('导出')"
-                  >导出</el-button
-                >
-                <el-button type="primary" size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量修改POD场站')">
+                <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出')">导出</el-button>
+                <el-button type="primary" size="small" :disabled="editDisabled" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
                 </el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
@@ -323,13 +321,7 @@
                 <span>{{ index + 1 }}</span>
               </template>
               <template slot="codeSearch">
-                <el-input
-                  v-model="boxQuery.code"
-                  size="small"
-                  placeholder="请输入箱号 多个箱号用空格区分"
-                  type="textarea"
-                  autosize
-                ></el-input>
+                <el-input v-model="boxQuery.code" size="small" placeholder="请输入箱号 多个箱号用空格区分" type="textarea" autosize></el-input>
               </template>
               <template slot="codeForm" slot-scope="{ row }">
                 <el-input
@@ -1120,26 +1112,21 @@
             ></dic-select>
           </tempalte>
           <tempalte slot="polStationCname">
-            <div style="display: flex;">
-              <dic-select
-                v-model="activationForm.polStationCname"
-                placeholder="场站"
-                :key="updateStationKey"
-                label="cnName"
-                res="records"
-                :slotRight="true"
-                rightLabel="code"
-                :url="'/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
-                :filterable="true"
-                :remote="true"
-                dataName="cnName"
-                @selectChange="dicChange('polStationCname2', $event)"
-                :disabled="editDisabled || !activationForm.polCname"
-              ></dic-select>
-              <el-tooltip class="item" effect="dark" content="同步起运港场站" placement="top">
-                <el-button size="small" icon="el-icon-refresh"></el-button>
-              </el-tooltip>
-            </div>
+            <dic-select
+              v-model="activationForm.polStationCname"
+              placeholder="场站"
+              :key="updateStationKey"
+              label="cnName"
+              res="records"
+              :slotRight="true"
+              rightLabel="code"
+              :url="'/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
+              :filterable="true"
+              :remote="true"
+              dataName="cnName"
+              @selectChange="dicChange('polStationCname2', $event)"
+              :disabled="editDisabled || !activationForm.polCname"
+            ></dic-select>
           </tempalte>
           <tempalte slot="podCname">
             <dic-select
@@ -2100,7 +2087,7 @@ export default {
             label: "箱号",
             prop: "code",
             width: 140,
-            searchSpan:12,
+            searchSpan: 12,
             searchPlaceholder: "请输入箱号 多个箱号用空格区分",
             search: true,
             cell: true,
@@ -2125,6 +2112,12 @@ export default {
             overHidden: true
           },
           {
+            label: "收箱号",
+            prop: "offhireReference",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "箱型",
             prop: "boxType",
             width: 100,
@@ -2437,6 +2430,30 @@ export default {
             overHidden: true
           },
           {
+            label: "目的港场站联系人",
+            prop: "podCyContact",
+            overHidden: true,
+            width: 110
+          },
+          {
+            label: "目的港场站地址",
+            prop: "podCyAddress",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "目的港场站邮箱",
+            prop: "podCyEmail",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "目的港场站电话",
+            prop: "podCyTel",
+            overHidden: true,
+            width: 100
+          },
+          {
             label: "启用日期",
             prop: "activationDate",
             // cell: true,
@@ -4284,8 +4301,23 @@ export default {
         this.excelBox = true;
       }
       if (name == "导出") {
+        let ids = [];
+        if (this.boxQuery.code) {
+          for (let item of this.form.tradingBoxItemsList) {
+            ids.push(item.id);
+          }
+        } else {
+          if (this.selectionList.length == 0) {
+            return this.$message.error("请选择箱明细");
+          }
+          for (let item of this.selectionList) {
+            ids.push(item.id);
+          }
+        }
+
         let data = {
-          id: this.form.id
+          id: this.form.id,
+          itemIds: ids.join(",")
         };
         const routeData = this.$router.resolve({
           path: "/api/blade-los/tradingBox/exportTradingBoxItemOut", //跳转目标窗口的地址
@@ -5313,16 +5345,31 @@ export default {
       this.$refs["form3"].validate((valid, done) => {
         done();
         if (valid) {
-          let ids = [];
-          for (let item of this.selectionList) {
-            ids.push(item.id);
+          // let ids = [];
+          // for (let item of this.selectionList) {
+          //   ids.push(item.id);
+          // }
+          let obj = {};
+          if (this.boxQuery.code) {
+            obj = {
+              id: this.form.id,
+              sysNo: this.form.sysNo,
+              ...this.podForm,
+              tradingBoxItemsList: this.form.tradingBoxItemsList
+            };
           }
-          let obj = {
-            id: this.form.id,
-            sysNo: this.form.sysNo,
-            ...this.podForm,
-            tradingBoxItemsList: this.selectionList
-          };
+          if (!this.boxQuery.code) {
+            if (this.selectionList.length == 0) {
+              return this.$message.error("请选择箱明细");
+            }
+            obj = {
+              id: this.form.id,
+              sysNo: this.form.sysNo,
+              ...this.podForm,
+              tradingBoxItemsList: this.selectionList
+            };
+          }
+
           const loading = this.$loading({
             lock: true,
             text: "加载中",