Преглед на файлове

1.箱管 OW 所有箱明细 手动清空数据后不能检索
2.提单修改 补充缺失的字段
3.箱池动态 优化并新加检索条件 调整表格顺序
4.箱轨迹 新加检索条件 去掉默认值
5.海运出口 超过截单日期 去掉多余的限制字段
6.进出场记录 修改提单号字段
7.箱池动态 新加导出功能
9.客户订舱 有分单号时不允许退仓
10.POD场站 海运进出口配箱信息 新加字段
11.发送下货纸 新加 复制功能

qukaidi преди 1 седмица
родител
ревизия
dc0329857b
променени са 28 файла, в които са добавени 1555 реда и са изтрити 553 реда
  1. 7 7
      src/views/basicData/container/archives.vue
  2. 6 3
      src/views/boxManagement/agentBox/detailsPage.vue
  3. 1 1
      src/views/boxManagement/agentBox/index.vue
  4. 3 7
      src/views/boxManagement/boxAdjustment/detailsPage.vue
  5. 1 1
      src/views/boxManagement/boxAdjustment/index.vue
  6. 1 1
      src/views/boxManagement/boxCost/index.vue
  7. 1 1
      src/views/boxManagement/boxExit/index.vue
  8. 137 77
      src/views/boxManagement/boxPoolDynamics/index.vue
  9. 39 19
      src/views/boxManagement/boxTrack/index.vue
  10. 1 1
      src/views/boxManagement/buyContainer/index.vue
  11. 9 6
      src/views/boxManagement/containerNumber/detailsPage.vue
  12. 1 1
      src/views/boxManagement/enterRecord/index.vue
  13. 1 1
      src/views/boxManagement/exitRecord/index.vue
  14. 395 135
      src/views/boxManagement/moveOut/detailsPage.vue
  15. 10 3
      src/views/boxManagement/moveOut/index.vue
  16. 7 4
      src/views/boxManagement/rentalBox/detailsPage.vue
  17. 1 1
      src/views/boxManagement/rentalBox/index.vue
  18. 1 1
      src/views/boxManagement/transferCost/index.vue
  19. 65 2
      src/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox/containers.vue
  20. 75 3
      src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue
  21. 17 1
      src/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue
  22. 4 5
      src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue
  23. 39 5
      src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/components/sendEdi.vue
  24. 6 6
      src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue
  25. 3 0
      src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue
  26. 24 0
      src/views/iosBasicData/podStation/index.vue
  27. 6 4
      src/views/ow/owPut/detailsPage.vue
  28. 694 257
      src/views/ow/owTask/detailsPage.vue

+ 7 - 7
src/views/basicData/container/archives.vue

@@ -533,13 +533,13 @@ export default {
             overHidden: true,
             disabled: false
           },
-          {
-            label: "箱东",
-            prop: "boxEastName",
-            width: 100,
-            overHidden: true,
-            disabled: true
-          },
+          // {
+          //   label: "箱东",
+          //   prop: "boxEastName",
+          //   width: 100,
+          //   overHidden: true,
+          //   disabled: true
+          // },
           {
             label: "限制港口",
             prop: "restrictedPortsName",

+ 6 - 3
src/views/boxManagement/agentBox/detailsPage.vue

@@ -2255,14 +2255,17 @@ export default {
       if (!this.form.id) {
         return this.$message.error("请保存数据");
       }
-      if (this.searchStatus) {
-        return this.$message.error("请清空数据再检索");
-      }
       if (this.query.code) {
+        if (this.searchStatus) {
+          return this.$message.error("请清空数据再检索");
+        }
         this.searchStatus = true;
         let boxNums = this.query.code.split(" ");
         this.form.tradingBoxItemsList = this.form.tradingBoxItemsList.filter(item => boxNums.includes(item.code));
       }
+      if (!this.query.code) {
+        this.searchReset();
+      }
     },
     searchReset() {
       this.searchStatus = false;

+ 1 - 1
src/views/boxManagement/agentBox/index.vue

@@ -25,7 +25,7 @@
         <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" @click="copyButton">复制单据 </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
+          <!-- <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button> -->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>

+ 3 - 7
src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -972,13 +972,6 @@ export default {
             label: "放箱号",
             prop: "containerNumber",
             disabled: false,
-            rules: [
-              {
-                required: true,
-                message: " ",
-                trigger: "blur"
-              }
-            ]
           },
           {
             label: "船公司/车队",
@@ -2639,6 +2632,9 @@ export default {
           //     return this.$message.error("请完善箱型箱量");
           //   }
           // }
+          if(!this.form.containerNumber){
+            return this.$message.error("请点击放箱号的🔍选择放箱号");
+          }
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
               this.$refs.crud.rowCell(row, row.$index);

+ 1 - 1
src/views/boxManagement/boxAdjustment/index.vue

@@ -25,7 +25,7 @@
         <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" @click="copyButton">复制单据 </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
+          <!-- <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button> -->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>

+ 1 - 1
src/views/boxManagement/boxCost/index.vue

@@ -25,7 +25,7 @@
         <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" @click="copyButton">复制单据 </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
+          <!-- <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button> -->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>

+ 1 - 1
src/views/boxManagement/boxExit/index.vue

@@ -12,7 +12,7 @@
           </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
           </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出
+          <!-- <el-button type="warning" size="small" disabled @click="outExport">导 出 -->
           </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">

+ 137 - 77
src/views/boxManagement/boxPoolDynamics/index.vue

@@ -37,20 +37,50 @@
                 @click="allClick('出场导入')">出场导入</el-button> -->
       <el-tabs v-model="activeName" type="card" style="margin-top: 8px;">
         <el-tab-pane label="按港口" name="1">
-          <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-            v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud"
-            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
-            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+          <avue-crud
+            :option="option"
+            :table-loading="loading"
+            :data="data"
+            :page.sync="page"
+            :search.sync="query"
+            v-model="form"
+            id="out-table"
+            :header-cell-class-name="headerClassName"
+            ref="crud"
+            @search-change="searchChange"
+            @search-reset="searchReset"
+            @current-change="currentChange"
+            @size-change="sizeChange"
+            @refresh-change="refreshChange"
+            @on-load="onLoad"
+          >
+            <template slot="menuLeft">
+              <el-button type="warning" size="small" @click="outExport">导 出</el-button>
+            </template>
           </avue-crud>
         </el-tab-pane>
         <el-tab-pane label="按放箱号" name="2">
-          <avue-crud :option="option2" :table-loading="loading2" :data="data2" :page.sync="page2" :search.sync="query2"
-            v-model="form2" id="out-table" :header-cell-class-name="headerClassName" ref="crud2"
-            @search-change="searchChange2" @search-reset="searchReset2" @current-change="currentChange2"
-            @size-change="sizeChange2" @refresh-change="refreshChange2" @on-load="onLoad2"
+          <avue-crud
+            :option="option2"
+            :table-loading="loading2"
+            :data="data2"
+            :page.sync="page2"
+            :search.sync="query2"
+            v-model="form2"
+            id="out-table"
+            :header-cell-class-name="headerClassName"
+            ref="crud2"
+            @search-change="searchChange2"
+            @search-reset="searchReset2"
+            @current-change="currentChange2"
+            @size-change="sizeChange2"
+            @refresh-change="refreshChange2"
+            @on-load="onLoad2"
             @resetColumn="resetColumn('crud2', 'option2', 'optionBack2', 466)"
-            @saveColumn="saveColumn('crud2', 'option2', 'optionBack2', 466)">
+            @saveColumn="saveColumn('crud2', 'option2', 'optionBack2', 466)"
+          >
             <template slot="menuLeft">
+              <el-button type="warning" size="small" @click="outExport2">导 出</el-button>
               <!-- <el-button type="primary" plain size="small"
                                 @click="allClick('空箱出场(EDI)')">空箱出场(EDI)</el-button> -->
               <!-- <el-button type="success" plain size="small"
@@ -68,7 +98,7 @@
               <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">查看</el-button>
             </template>
             <template slot="containerNumber" slot-scope="{ row }">
-              <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.containerNumber }}</span>
+              <span style="color: #1e9fff;cursor: pointer;" @click="rowContainerNumber(row)">{{ row.containerNumber }}</span>
             </template>
           </avue-crud>
         </el-tab-pane>
@@ -96,13 +126,10 @@
           </avue-crud>
         </el-tab-pane> -->
       </el-tabs>
-      <el-dialog title="导入数据" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
-        v-dialog-drag>
-        <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore"
-          :upload-after="onSuccess">
+      <el-dialog title="导入数据" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false" v-dialog-drag>
+        <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore" :upload-after="onSuccess">
           <template slot="excelTemplate">
-            <el-button type="primary" @click="handleGet(excelType)"> 点击下载<i class="el-icon-download el-icon--right"></i>
-            </el-button>
+            <el-button type="primary" @click="handleGet(excelType)"> 点击下载<i class="el-icon-download el-icon--right"></i> </el-button>
           </template>
         </avue-form>
         <p style="text-align: center;color: #DC0505">
@@ -165,7 +192,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [ 10, 20, 30, 40, 50, 100,500,1000]
+        pageSizes: [10, 20, 30, 40, 50, 100, 500, 1000]
       },
       form2: {},
       query2: {},
@@ -174,7 +201,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [ 10, 20, 30, 40, 50, 100,500,1000]
+        pageSizes: [10, 20, 30, 40, 50, 100, 500, 1000]
       },
       form3: {},
       query3: {},
@@ -192,7 +219,7 @@ export default {
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
-        header: false,
+        // header: false,
         menu: false,
         border: true,
         index: true,
@@ -294,6 +321,7 @@ export default {
             search: true,
             type: "select",
             filterable: true,
+            remote: true,
             dicUrl: "/api/blade-los/bcorps/selectList?status=0&corpTypeName=场站&size=5&current=1&shortName={{key}}",
             props: {
               label: "shortName",
@@ -435,69 +463,68 @@ export default {
             name: "bad",
             type: "sum",
             decimals: 0
+          },
+          {
+            name: "occupyNum",
+            type: "sum",
+            decimals: 0
           }
         ],
         column: [
           {
-            label: "放箱号",
-            prop: "containerNumber",
-            width: 150,
-            overHidden: true,
-            search: true,
-            searchOrder: 1
-          },
-          {
-            label: "放箱号类型",
-            prop: "busType",
+            label: "港口",
+            prop: "polName",
             width: 150,
             overHidden: true,
             search: true,
-            searchOrder: 2,
             type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxCategory",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
             props: {
-              label: "dictValue",
-              value: "dictValue"
+              label: "cnName",
+              value: "cnName",
+              desc: "code",
+              res: "data.records"
             }
           },
           {
-            label: "箱东",
-            prop: "boxEastName",
-            width: 150,
+            label: "场站",
+            prop: "stationId",
             overHidden: true,
             hide: true,
             search: true,
-            searchOrder: 3,
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/selectList?status=0&corpTypeName=箱东&size=5&current=1&shortName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/selectList?status=0&corpTypeName=场站&size=5&current=1&shortName={{key}}",
             props: {
               label: "shortName",
-              value: "shortName",
-              desc: "code",
+              value: "id",
               res: "data.records"
             }
           },
           {
-            label: "起运港",
-            prop: "polName",
+            label: "放箱号类型",
+            prop: "busType",
             width: 150,
             overHidden: true,
             search: true,
-            searchOrder: 5,
             type: "select",
-            filterable: true,
-            remote: true,
-            dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxCategory",
             props: {
-              label: "cnName",
-              value: "cnName",
-              desc: "code",
-              res: "data.records"
+              label: "dictValue",
+              value: "dictValue"
             }
           },
           {
+            label: "放箱号",
+            prop: "containerNumber",
+            width: 150,
+            overHidden: true,
+            search: true
+          },
+          {
             label: "起运港场站/堆场",
             prop: "polStationName",
             width: 150,
@@ -509,7 +536,6 @@ export default {
             width: 150,
             overHidden: true,
             search: true,
-            searchOrder: 6,
             type: "select",
             filterable: true,
             remote: true,
@@ -533,7 +559,6 @@ export default {
             width: 150,
             overHidden: true,
             search: true,
-            searchOrder: 7,
             type: "select",
             filterable: true,
             remote: true,
@@ -639,6 +664,56 @@ export default {
     });
   },
   methods: {
+    outExport() {
+      let config = { params: { ...this.query } };
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof value !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
+              }
+              delete config.params[propName];
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: "/api/blade-los/boxPool/listPortExport", //跳转目标窗口的地址
+        query: {
+          ...config.params, //括号内是要传递给新窗口的参数
+          identification: this.url
+        }
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
+    },
+    outExport2() {
+      let config = { params: { ...this.query2 } };
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof value !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
+              }
+              delete config.params[propName];
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: "/api/blade-los/boxPool/listContainerNumberExport", //跳转目标窗口的地址
+        query: {
+          ...config.params, //括号内是要传递给新窗口的参数
+          identification: this.url
+        }
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
+    },
     refreshData() {
       this.refreshChange();
       this.refreshChange2();
@@ -841,6 +916,16 @@ export default {
         copyId: this.selectionList[0].id
       };
     },
+    rowContainerNumber(row) {
+      if (this.verifyTags("放箱号")) {
+        this.$router.push({
+          path: "/boxManagement/containerNumber/index",
+          query: {
+            id: row.id
+          }
+        });
+      }
+    },
     rowEdit(row) {
       this.detailData = {
         id: row.id
@@ -974,31 +1059,6 @@ export default {
       this.isShow = true;
       this.onLoad(this.page, this.query);
     },
-    outExport() {
-      let config = { params: { ...this.query } };
-      if (config.params) {
-        for (const propName of Object.keys(config.params)) {
-          const value = config.params[propName];
-          if (value !== null && typeof value !== "undefined") {
-            if (value instanceof Array) {
-              for (const key of Object.keys(value)) {
-                let params = propName + "[" + key + "]";
-                config.params[params] = value[key];
-              }
-              delete config.params[propName];
-            }
-          }
-        }
-      }
-      const routeData = this.$router.resolve({
-        path: "/api/blade-los/routecost/exportRouteCost", //跳转目标窗口的地址
-        query: {
-          ...config.params, //括号内是要传递给新窗口的参数
-          identification: this.url
-        }
-      });
-      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
-    },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {
       /**

+ 39 - 19
src/views/boxManagement/boxTrack/index.vue

@@ -42,7 +42,6 @@ export default {
       detailsOpen: false,
       loading: false,
       search: {
-        whetherStillBox: "1"
       },
       form: {},
       dataList: [],
@@ -69,7 +68,7 @@ export default {
         menuWidth: 140,
         menu: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 12,
         searchIcon: true,
         searchIndex: 3,
         highlightCurrentRow: true,
@@ -78,29 +77,27 @@ export default {
           {
             label: "箱号",
             prop: "code",
+            width:100,
             overHidden: true,
             search: true
           },
           {
             label: "放箱号",
             prop: "containerNumber",
+            width:120,
             overHidden: true,
             search: true
           },
           {
             label: "箱型",
             prop: "boxType",
-            overHidden: true
-          },
-          {
-            label: "箱东",
-            prop: "boxEastName",
+            width:60,
             overHidden: true
           },
           {
             label: "放箱号类型",
             prop: "boxCategory",
-            width: 100,
+            width: 90,
             search: true,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxCategory",
@@ -113,6 +110,7 @@ export default {
           {
             label: "箱动态",
             prop: "boxDynamics",
+            width:80,
             search: true,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxDynamics",
@@ -125,7 +123,7 @@ export default {
           {
             label: "动态日期",
             prop: "newDate",
-            width: 130,
+            width: 140,
             search: true,
             searchProp: "newDateList",
             type: "date",
@@ -138,35 +136,34 @@ export default {
           {
             label: "港口",
             prop: "portCname",
+            width:140,
             overHidden: true
           },
           {
             label: "场站",
             prop: "stationCname",
-            overHidden: true
-          },
-          {
-            label: "客户名称",
-            prop: "corpName",
+            width:80,
             overHidden: true
           },
           {
             label: "提单号",
             prop: "mblno",
+            width:100,
             search: true,
             overHidden: true
           },
           {
             label: "分单号",
             prop: "hblno",
+            width:100,
             search: true,
             overHidden: true
           },
           {
             label: "是否还箱",
             prop: "whetherStillBox",
+            width:80,
             search: true,
-            searchValue: "1",
             type: "select",
             dicData: [
               {
@@ -183,21 +180,25 @@ export default {
           {
             label: "船名",
             prop: "shipCname",
+            width:100,
             overHidden: true
           },
           {
             label: "航次",
             prop: "voyage",
+            width:80,
             overHidden: true
           },
           {
             label: "ETD",
             prop: "etd",
+            width:100,
             overHidden: true
           },
           {
             label: "POL堆场",
             prop: "polCyCname",
+            width:100,
             overHidden: true
           },
           {
@@ -207,21 +208,37 @@ export default {
             overHidden: true
           },
           {
-            label: "POL提前出场日期",
+            label: "POL提箱进场时间",
             prop: "polPreAppearanceDate",
-            width: 120,
+            width: 140,
+            searchLabelWidth:110,
+            search: true,
+            searchProp: "entryDateList",
+            type: "date",
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             overHidden: true
           },
           {
             label: "POL场站空箱出场日期",
             prop: "polStationEmptyContainerExitDate",
             width: 140,
+            searchLabelWidth:140,
+            search: true,
+            searchProp: "appearDateList",
+            type: "date",
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             overHidden: true
           },
           {
-            label: "POL还箱日期",
+            label: "POL返空日期",
             prop: "polReturnDate",
-            width: 100,
+            width: 140,
             overHidden: true
           },
           {
@@ -233,6 +250,7 @@ export default {
           {
             label: "ETA",
             prop: "eta",
+            width:100,
             overHidden: true
           },
           {
@@ -244,6 +262,7 @@ export default {
           {
             label: "POD场站",
             prop: "podStationCname",
+            width:100,
             overHidden: true
           },
           {
@@ -322,6 +341,7 @@ export default {
     },
     searchChange(params, done) {
       done();
+      this.page.currentPage = 1;
       this.onLoad(this.page, params);
     },
     onLoad(page, params = {}) {

+ 1 - 1
src/views/boxManagement/buyContainer/index.vue

@@ -25,7 +25,7 @@
         <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" @click="copyButton">复制单据 </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
+          <!-- <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button> -->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>

+ 9 - 6
src/views/boxManagement/containerNumber/detailsPage.vue

@@ -57,7 +57,7 @@
               :filterable="true"
               :remote="true"
               dataName="cnName"
-              :disabled="editDisabled || !(form.busType == '自有箱')||form.whetherManuallyCreate==1"
+              :disabled="editDisabled || !(form.busType == '自有箱') || form.whetherManuallyCreate == 1"
             >
             </dic-select>
           </tempalte>
@@ -170,7 +170,7 @@
               key="id"
               label="cnName"
               res="records"
-              :disabled="editDisabled||form.whetherManuallyCreate==1"
+              :disabled="editDisabled || form.whetherManuallyCreate == 1"
               url="/blade-los/bcntrtypes/list?current=1&size=100"
               :filterable="true"
               :remote="true"
@@ -195,7 +195,7 @@
               key="id"
               label="dictValue"
               url="/blade-system/dict-biz/dictionary?code=boxCategory"
-              :disabled="editDisabled||form.whetherManuallyCreate==1"
+              :disabled="editDisabled || form.whetherManuallyCreate == 1"
             ></dic-select>
           </tempalte>
           <tempalte slot="cabinTypeData">
@@ -1798,14 +1798,17 @@ export default {
           return this.$message.error("请保存明细数据再进行检索");
         }
       }
-      if (this.searchStatus) {
-        return this.$message.error("请清空数据再检索");
-      }
       if (this.query.boxCode) {
+        if (this.searchStatus) {
+          return this.$message.error("请清空数据再检索");
+        }
         this.searchStatus = true;
         let boxNums = this.query.boxCode.split(" ");
         this.form.putBoxItemsList = this.form.putBoxItemsList.filter(item => boxNums.includes(item.boxCode));
       }
+      if (!this.query.boxCode) {
+        this.searchReset()
+      }
     },
     searchReset() {
       this.searchStatus = false;

+ 1 - 1
src/views/boxManagement/enterRecord/index.vue

@@ -201,7 +201,7 @@ export default {
           },
           {
             label: "提单号",
-            prop: "mblno",
+            prop: "billNo",
             search: true,
             hide: true,
             overHidden: true

+ 1 - 1
src/views/boxManagement/exitRecord/index.vue

@@ -212,7 +212,7 @@ export default {
           },
           {
             label: "提单号",
-            prop: "mblno",
+            prop: "billNo",
             search: true,
             hide: true,
             overHidden: true

+ 395 - 135
src/views/boxManagement/moveOut/detailsPage.vue

@@ -2,19 +2,25 @@
   <div>
     <div class="customer-head">
       <div class="customer-back">
-        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-          @click="goBack()">返回列表 </el-button>
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left" @click="goBack()">返回列表 </el-button>
         <el-button v-if="form.id && pageIds.length" type="text" @click="lastPage">上一票</el-button>
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small" v-if="editButton"
-          :disabled="showLock ||
-            !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)
-            " @click="inEdit">编 辑
+        <el-button
+          class="el-button--small-yh"
+          style="margin-left: 6px;"
+          type="primary"
+          size="small"
+          v-if="editButton"
+          :disabled="
+            showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)
+          "
+          @click="inEdit"
+          >编 辑
         </el-button>
-        <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
-          :disabled="isSaveBtn" @click="submit">保 存
+        <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small" :disabled="isSaveBtn" @click="submit"
+          >保 存
         </el-button>
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
@@ -37,53 +43,124 @@
           <trade-card title="基础信息">
             <avue-form :option="optionForm" v-model="form" ref="form">
               <tempalte slot="purchaseCompanyName">
-                <dic-select v-model="form.purchaseCompanyName" placeholder="退租方" key="id" label="shortName"
-                  res="records" url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东"
-                  :filterable="true" :remote="true" dataName="shortName"
-                  @selectChange="dicChange('purchaseCompanyName', $event)" :slotRight="true" rightLabel="code"
-                  :disabled="editDisabled"></dic-select>
+                <dic-select
+                  v-model="form.purchaseCompanyName"
+                  placeholder="退租方"
+                  key="id"
+                  label="shortName"
+                  res="records"
+                  url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东"
+                  :filterable="true"
+                  :remote="true"
+                  dataName="shortName"
+                  @selectChange="dicChange('purchaseCompanyName', $event)"
+                  :slotRight="true"
+                  rightLabel="code"
+                  :disabled="editDisabled"
+                ></dic-select>
               </tempalte>
               <tempalte slot="addressCname">
-                <dic-select v-model="form.addressCname" placeholder="港口" key="id" label="cnName" res="records"
-                  url="/blade-los/bports/list?status=0&current=1&size=5" :filterable="true" :remote="true"
-                  dataName="cnName" @selectChange="dicChange('addressCname', $event)" :slotRight="true"
-                  rightLabel="code" :disabled="editDisabled"></dic-select>
+                <dic-select
+                  v-model="form.addressCname"
+                  placeholder="港口"
+                  key="id"
+                  label="cnName"
+                  res="records"
+                  url="/blade-los/bports/list?status=0&current=1&size=5"
+                  :filterable="true"
+                  :remote="true"
+                  dataName="cnName"
+                  @selectChange="dicChange('addressCname', $event)"
+                  :slotRight="true"
+                  rightLabel="code"
+                  :disabled="editDisabled"
+                ></dic-select>
               </tempalte>
               <tempalte slot="stationCname">
-                <dic-select v-model="form.stationCname" placeholder="场站" :key="form.addressId" label="cnName"
-                  res="records" :slotRight="true" rightLabel="code"
+                <dic-select
+                  v-model="form.stationCname"
+                  placeholder="场站"
+                  :key="form.addressId"
+                  label="cnName"
+                  res="records"
+                  :slotRight="true"
+                  rightLabel="code"
                   :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=场站&ids=' + (form.cyText ? form.cyText : '')"
-                  :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname', $event)"
-                  :disabled="editDisabled || !form.addressId"></dic-select>
+                  :filterable="true"
+                  :remote="true"
+                  dataName="cnName"
+                  @selectChange="dicChange('stationCname', $event)"
+                  :disabled="editDisabled || !form.addressId"
+                ></dic-select>
               </tempalte>
               <tempalte slot="totalAmountC">
-                <el-input-number v-model="form.totalAmountC" :min="0" placeholder="请输入 押金" size="small"
-                  :controls="false" style="width:100%" :disabled="editDisabled"></el-input-number>
+                <el-input-number
+                  v-model="form.totalAmountC"
+                  :min="0"
+                  placeholder="请输入 押金"
+                  size="small"
+                  :controls="false"
+                  style="width:100%"
+                  :disabled="editDisabled"
+                ></el-input-number>
               </tempalte>
               <tempalte slot="effectiveDate">
-                <el-date-picker v-model="form.effectiveDate" type="date" size="small" placeholder="请选择 租入日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" @change="dicChange('effectiveDate', $event)"
-                  :disabled="editDisabled || (form.id && form.buxStaus != '录入')">
+                <el-date-picker
+                  v-model="form.effectiveDate"
+                  type="date"
+                  size="small"
+                  placeholder="请选择 租入日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  @change="dicChange('effectiveDate', $event)"
+                  :disabled="editDisabled || (form.id && form.buxStaus != '录入')"
+                >
                 </el-date-picker>
               </tempalte>
             </avue-form>
           </trade-card>
           <trade-card title="箱明细">
-            <avue-crud :option="option" :data="form.tradingBoxItemsList" id="out-table" ref="crud"
-              :header-cell-class-name="headerClassName" :row-style="{ height: '20px', padding: '0px' }"
-              :cell-style="{ height: '20px', padding: '0px' }" :search.sync="query" @search-change="searchChange"
-              @search-reset="searchReset" @selection-change="selectionChange" @row-update="rowUpdate"
+            <avue-crud
+              :option="option"
+              :data="form.tradingBoxItemsList"
+              id="out-table"
+              ref="crud"
+              :header-cell-class-name="headerClassName"
+              :row-style="{ height: '20px', padding: '0px' }"
+              :cell-style="{ height: '20px', padding: '0px' }"
+              :search.sync="query"
+              @search-change="searchChange"
+              @search-reset="searchReset"
+              @selection-change="selectionChange"
+              @row-update="rowUpdate"
               @resetColumn="resetColumn('crud', 'option', 'optionBack', 538)"
-              @saveColumn="saveColumn('crud', 'option', 'optionBack', 538)">
+              @saveColumn="saveColumn('crud', 'option', 'optionBack', 538)"
+            >
               <template slot="menuLeft">
-                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id || form.buxStaus != '录入'"
-                  @click="allClick('一键保存')">一键保存</el-button>
-                <el-button type="info" plain size="small"
+                <el-button
+                  type="info"
+                  plain
+                  size="small"
+                  :disabled="editDisabled || !form.id || form.buxStaus != '录入'"
+                  @click="allClick('一键保存')"
+                  >一键保存</el-button
+                >
+                <el-button
+                  type="info"
+                  plain
+                  size="small"
                   :disabled="editDisabled || form.tradingBoxItemsList.length == 0 || form.buxStaus != '录入'"
-                  @click="allClick('一键编辑')">一键编辑</el-button>
-                <el-button type="danger" plain size="small"
+                  @click="allClick('一键编辑')"
+                  >一键编辑</el-button
+                >
+                <el-button
+                  type="danger"
+                  plain
+                  size="small"
                   :disabled="editDisabled || selectionList.length == 0 || form.buxStaus != '录入'"
-                  @click="allClick('批量删除')">批量删除</el-button>
+                  @click="allClick('批量删除')"
+                  >批量删除</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> -->
@@ -92,60 +169,128 @@
                 </el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{ row, index }">
-                <el-button type="primary" size="mini" icon="el-icon-plus"
-                  :disabled="editDisabled || !form.id || form.buxStaus != '录入'" circle @click="addRow()">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-plus"
+                  :disabled="editDisabled || !form.id || form.buxStaus != '录入'"
+                  circle
+                  @click="addRow()"
+                >
                 </el-button>
               </template>
               <template slot="index" slot-scope="{ row, index }">
                 <span>{{ index + 1 }}</span>
               </template>
               <template slot="boxTypeForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
-                  url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
-                  dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
+                <dic-select
+                  v-if="row.$cellEdit"
+                  v-model="row.boxType"
+                  key="id"
+                  label="cnName"
+                  res="records"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  :filterable="true"
+                  :remote="true"
+                  dataName="cnName"
+                  @selectChange="rowDicChange('boxType', $event, row)"
+                ></dic-select>
                 <span v-else>{{ row.boxType }}</span>
               </template>
               <template slot="codeForm" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit" v-model="row.code" maxlength="11" size="small" placeholder="请输入箱号"
-                  @change="verifyChange('code', row)"></el-input>
+                <el-input
+                  v-if="row.$cellEdit"
+                  v-model="row.code"
+                  maxlength="11"
+                  size="small"
+                  placeholder="请输入箱号"
+                  @change="verifyChange('code', row)"
+                ></el-input>
                 <span v-else>{{ row.code }}</span>
               </template>
               <template slot="currencyForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit" v-model="row.currency" placeholder="币别" label="code"
+                <dic-select
+                  v-if="row.$cellEdit"
+                  v-model="row.currency"
+                  placeholder="币别"
+                  label="code"
                   :url="'/blade-los/bcurrency/obtainRate?deptId=' + deptId + '&date=' + form.effectiveDate + '&type=1'"
-                  :filterable="true" @selectChange="rowDicChange('currency', $event, row)"></dic-select>
+                  :filterable="true"
+                  @selectChange="rowDicChange('currency', $event, row)"
+                ></dic-select>
                 <span v-else>{{ row.currency }}</span>
               </template>
               <tempalte slot="originalBoxEastNameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit" v-model="row.originalBoxEastName" placeholder="箱东" key="id"
-                  label="shortName" res="records"
-                  url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
-                  :remote="true" dataName="shortName" @selectChange="rowDicChange('originalBoxEastName', $event, row)"
-                  :slotRight="true" rightLabel="code">
+                <dic-select
+                  v-if="row.$cellEdit"
+                  v-model="row.originalBoxEastName"
+                  placeholder="箱东"
+                  key="id"
+                  label="shortName"
+                  res="records"
+                  url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东"
+                  :filterable="true"
+                  :remote="true"
+                  dataName="shortName"
+                  @selectChange="rowDicChange('originalBoxEastName', $event, row)"
+                  :slotRight="true"
+                  rightLabel="code"
+                >
                 </dic-select>
                 <span v-else>{{ row.originalBoxEastName }}</span>
               </tempalte>
               <tempalte slot="stationCnameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit" v-model="row.stationCname" placeholder="场站" key="id" label="cnName"
-                  res="records" url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=场站"
-                  :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('stationCname', $event, row)" :slotRight="true"
-                  rightLabel="code"></dic-select>
+                <dic-select
+                  v-if="row.$cellEdit"
+                  v-model="row.stationCname"
+                  placeholder="场站"
+                  key="id"
+                  label="cnName"
+                  res="records"
+                  url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=场站"
+                  :filterable="true"
+                  :remote="true"
+                  dataName="cnName"
+                  @selectChange="rowDicChange('stationCname', $event, row)"
+                  :slotRight="true"
+                  rightLabel="code"
+                ></dic-select>
                 <span v-else>{{ row.stationCname }}</span>
               </tempalte>
               <tempalte slot="restrictedPortsNameForm" slot-scope="{ row }">
-                <dic-select v-show="row.$cellEdit" v-model="row.restrictedPortsName" placeholder="港口" key="id"
-                  label="code" url="/blade-los/bports/listAll?status=0" :filterable="true" :multiple="true"
-                  :collapseTags="true" @selectChange="rowDicChange('restrictedPortsName', $event, row)"
-                  dataType="string" :slotRight="true" rightLabel="code"></dic-select>
+                <dic-select
+                  v-show="row.$cellEdit"
+                  v-model="row.restrictedPortsName"
+                  placeholder="港口"
+                  key="id"
+                  label="code"
+                  url="/blade-los/bports/listAll?status=0"
+                  :filterable="true"
+                  :multiple="true"
+                  :collapseTags="true"
+                  @selectChange="rowDicChange('restrictedPortsName', $event, row)"
+                  dataType="string"
+                  :slotRight="true"
+                  rightLabel="code"
+                ></dic-select>
                 <span v-show="!row.$cellEdit">{{ row.restrictedPortsName }}</span>
               </tempalte>
               <tempalte slot="restrictingShippingCompaniesNameForm" slot-scope="{ row }">
-                <dic-select v-show="row.$cellEdit" v-model="row.restrictingShippingCompaniesName" placeholder="船公司"
-                  key="id" label="cnName" url="/blade-los/bcorps/listAll?status=0&corpTypeName=船公司" :filterable="true"
-                  :multiple="true" :collapseTags="true" :slotRight="true" rightLabel="code"
+                <dic-select
+                  v-show="row.$cellEdit"
+                  v-model="row.restrictingShippingCompaniesName"
+                  placeholder="船公司"
+                  key="id"
+                  label="cnName"
+                  url="/blade-los/bcorps/listAll?status=0&corpTypeName=船公司"
+                  :filterable="true"
+                  :multiple="true"
+                  :collapseTags="true"
+                  :slotRight="true"
+                  rightLabel="code"
                   @selectChange="rowDicChange('restrictingShippingCompaniesName', $event, row)"
-                  dataType="string"></dic-select>
+                  dataType="string"
+                ></dic-select>
                 <span v-show="!row.$cellEdit">{{ row.restrictingShippingCompaniesName }}</span>
               </tempalte>
             </avue-crud>
@@ -157,12 +302,22 @@
         <el-tab-pane label="费用信息">
           <el-card
             v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1 ? true : roleName.indexOf('应付查看') != -1"
-            class="box-card" style="margin: 2px 0">
-            <avue-crud :option="feecOption" :data="form.feeCenterList" id="out-table" ref="crud2"
-              :header-cell-class-name="headerClassName" :row-style="rowStyle" :cell-style="{ padding: '0px' }"
-              @selection-change="feecChange" @row-update="rowUpdate"
+            class="box-card"
+            style="margin: 2px 0"
+          >
+            <avue-crud
+              :option="feecOption"
+              :data="form.feeCenterList"
+              id="out-table"
+              ref="crud2"
+              :header-cell-class-name="headerClassName"
+              :row-style="rowStyle"
+              :cell-style="{ padding: '0px' }"
+              @selection-change="feecChange"
+              @row-update="rowUpdate"
               @resetColumn="resetColumn('crud2', 'feecOption', 'feecOptionBack', 235.2)"
-              @saveColumn="saveColumn('crud2', 'feecOption', 'feecOptionBack', 235.2)">
+              @saveColumn="saveColumn('crud2', 'feecOption', 'feecOptionBack', 235.2)"
+            >
               <template slot="menuLeft">
                 <div style="display: inline-block;margin-right: 20px" class="disabledBox meetSize">
                   <i class="el-icon-coin"></i>
@@ -170,16 +325,21 @@
                 </div>
                 <el-button type="info" plain size="small" @click="allClick('费用一键保存')">一键保存</el-button>
                 <el-button type="info" plain size="small" @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"
-                  @click="allClick('费用申请')">请核费用</el-button>
-                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length != 1"
-                  @click="allClick('C申请修改')">申请修改</el-button>
-                <el-button type="success" plain size="small" :disabled="selectionfeecList.length != 1"
-                  @click="allClick('C申请删除')">申请删除</el-button>
-                <el-button type="danger" plain size="small" :disabled="selectionfeecList.length != 1"
-                  @click="allClick('C取消申请')">取消申请</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" @click="allClick('费用申请')"
+                  >请核费用</el-button
+                >
+                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length != 1" @click="allClick('C申请修改')"
+                  >申请修改</el-button
+                >
+                <el-button type="success" plain size="small" :disabled="selectionfeecList.length != 1" @click="allClick('C申请删除')"
+                  >申请删除</el-button
+                >
+                <el-button type="danger" plain size="small" :disabled="selectionfeecList.length != 1" @click="allClick('C取消申请')"
+                  >取消申请</el-button
+                >
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{ row, index }">
@@ -215,24 +375,47 @@
                 <span v-else>{{ row.stlTtlAmount }}</span>
               </template>
               <template slot="billTypeForm" slot-scope="{ row, index }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.billType" key="id"
-                  label="cnName" res="records" url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20"
-                  :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('billType', $event, row, index)"></dic-select>
+                <dic-select
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.billType"
+                  key="id"
+                  label="cnName"
+                  res="records"
+                  url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20"
+                  :filterable="true"
+                  :remote="true"
+                  dataName="cnName"
+                  @selectChange="rowDicChange('billType', $event, row, index)"
+                ></dic-select>
                 <span v-else>{{ row.billType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{ row, index }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.cntrNo" key="id"
-                  label="code" :mockData="form.tradingBoxItemsList" :filterable="true"></dic-select>
+                <dic-select
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.cntrNo"
+                  key="id"
+                  label="code"
+                  :mockData="form.tradingBoxItemsList"
+                  :filterable="true"
+                ></dic-select>
                 <span v-else>{{ row.cntrNo }}</span>
               </template>
               <template slot="corpCnNameForm" slot-scope="{ row, index }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" :key="row.billType"
-                  v-model="row.corpCnName" placeholder="付费对象" label="shortName" res="records" :slotRight="true"
+                <dic-select
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  :key="row.billType"
+                  v-model="row.corpCnName"
+                  placeholder="付费对象"
+                  label="shortName"
+                  res="records"
+                  :slotRight="true"
                   rightLabel="code"
                   :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.billType"
-                  :filterable="true" :remote="true" dataName="shortName"
-                  @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                  :filterable="true"
+                  :remote="true"
+                  dataName="shortName"
+                  @selectChange="rowDicChange('corpCnName', $event, row)"
+                ></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
                 <!-- <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" key="id" placeholder="付费对象" label="cnName"
                   res="records" url="/blade-los/bcorps/selectList?corpTypeName=船公司&status=0&current=1&size=20"
@@ -241,44 +424,89 @@
                 <span v-else>{{ row.corpCnName }}</span> -->
               </template>
               <template slot="feeCnNameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.feeCnName" key="id"
-                  placeholder="费用名称" label="cnName" res="records"
-                  url="/blade-los/bfees/list?current=1&size=5&status=0&current=1&size=20" :filterable="true"
-                  :remote="true" dataName="cnName" @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
+                <dic-select
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.feeCnName"
+                  key="id"
+                  placeholder="费用名称"
+                  label="cnName"
+                  res="records"
+                  url="/blade-los/bfees/list?current=1&size=5&status=0&current=1&size=20"
+                  :filterable="true"
+                  :remote="true"
+                  dataName="cnName"
+                  @selectChange="rowDicChange('feeCnName', $event, row)"
+                ></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
               </template>
               <template slot="curCodeForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" label="code"
+                <dic-select
+                  v-if="row.$cellEdit"
+                  v-model="row.curCode"
+                  placeholder="币别"
+                  label="code"
                   :url="'/blade-los/bcurrency/obtainRate?deptId=' + deptId + '&date=' + form.effectiveDate + '&type=1'"
-                  :filterable="true" @selectChange="rowDicChange('curCodeC', $event, row)"></dic-select>
+                  :filterable="true"
+                  @selectChange="rowDicChange('curCodeC', $event, row)"
+                ></dic-select>
                 <span v-else>{{ row.curCode }}</span>
               </template>
 
               <template slot="exrateForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.exrate"
-                  :controls="false" placeholder="请输入 汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.exrate"
+                  :controls="false"
+                  placeholder="请输入 汇率"
+                  size="small"
+                  style="width: 100%;"
+                ></el-input-number>
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{ row, index }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.unitNo" label="cnName"
-                  url="/blade-los/bunits/listAll?status=0" :filterable="true"></dic-select>
+                <dic-select
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.unitNo"
+                  label="cnName"
+                  url="/blade-los/bunits/listAll?status=0"
+                  :filterable="true"
+                ></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
               </template>
               <template slot="priceForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.price"
-                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="2"
-                  @change="countChange(row)"></el-input-number>
+                <el-input-number
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.price"
+                  :controls="false"
+                  placeholder="请输入 成本价"
+                  size="small"
+                  style="width: 100%;"
+                  :precision="2"
+                  @change="countChange(row)"
+                ></el-input-number>
                 <span v-else>{{ row.price }}</span>
               </template>
               <template slot="quantityForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.quantity"
-                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="0"
-                  @change="countChange(row)"></el-input-number>
+                <el-input-number
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.quantity"
+                  :controls="false"
+                  placeholder="请输入 成本价"
+                  size="small"
+                  style="width: 100%;"
+                  :precision="0"
+                  @change="countChange(row)"
+                ></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
               <template slot="remarks" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.remarks"
-                  placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <el-input
+                  v-if="row.$cellEdit && !(row.automaticGenerated == 1)"
+                  v-model="row.remarks"
+                  placeholder="请输入 备注"
+                  size="small"
+                  style="width: 100%;"
+                ></el-input>
                 <span v-else>{{ row.remarks }}</span>
               </template>
               <template slot="menu" slot-scope="{ row, index }">
@@ -289,24 +517,43 @@
         </el-tab-pane>
         <el-tab-pane label="文件中心">
           <containerTitle title="上传附件"></containerTitle>
-          <c-upload :data="form.tradingBoxFilesList" :enumerationValue="76"
-            deleteUrl="/api/blade-los/tradingBoxFiles/remove" display :disabled="editButton"></c-upload>
+          <c-upload
+            :data="form.tradingBoxFilesList"
+            :enumerationValue="76"
+            deleteUrl="/api/blade-los/tradingBoxFiles/remove"
+            display
+            :disabled="editButton"
+          ></c-upload>
         </el-tab-pane>
       </el-tabs>
     </div>
     <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL" :type="true"></business-reports>
-    <business-reports :id="form.id" :itemIds="itemCIds" ref="printC" businessValue="MYDL" classifyCode="费用"
-      groupCode="应付" :selecList="selectionfeecList"></business-reports>
+    <business-reports
+      :id="form.id"
+      :itemIds="itemCIds"
+      ref="printC"
+      businessValue="MYDL"
+      classifyCode="费用"
+      groupCode="应付"
+      :selecList="selectionfeecList"
+    ></business-reports>
     <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>
     <!--审核弹窗-->
-    <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
-      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+    <el-dialog
+      append-to-body
+      title="审批进度"
+      class="el-dialogDeep"
+      :visible.sync="checkScheduleDialog"
+      width="40%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :close-on-press-escape="false"
+      v-dialog-drag
+    >
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
-    <el-dialog title="导入数据" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
-      v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore"
-        :upload-after="onSuccess">
+    <el-dialog title="导入数据" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false" v-dialog-drag>
+      <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore" :upload-after="onSuccess">
         <template slot="excelTemplate">
           <el-button type="primary" @click="handleGet"> 点击下载<i class="el-icon-download el-icon--right"></i> </el-button>
         </template>
@@ -315,8 +562,14 @@
         温馨提示 第一次导入时请先下载模板
       </p>
     </el-dialog>
-    <fee-modify ref="feeModify" :form="form" @updateDetail="updateDetail" url="/boxManagement/rentalBox/index"
-      pageStatus="" pageLabel="退租"></fee-modify>
+    <fee-modify
+      ref="feeModify"
+      :form="form"
+      @updateDetail="updateDetail"
+      url="/boxManagement/rentalBox/index"
+      pageStatus=""
+      pageLabel="退租"
+    ></fee-modify>
     <fee-modify-view ref="feeModifyView" :form="form"></fee-modify-view>
   </div>
 </template>
@@ -457,7 +710,7 @@ export default {
       editDisabled: false,
       form: {
         type: "TZ",
-        appearanceType:'退租',
+        appearanceType: "退租",
         tradingBoxItemsList: [],
         feeCenterList: [],
         tradingBoxFilesList: []
@@ -482,6 +735,18 @@ export default {
             disabled: false
           },
           {
+            label: "放箱号",
+            prop: "containerNumber",
+            rules: [
+              {
+                required: true,
+                message: " ",
+                trigger: "blur"
+              }
+            ],
+            disabled: false
+          },
+          {
             label: "合约号",
             prop: "contractNo",
             rules: [
@@ -543,7 +808,7 @@ export default {
             props: {
               label: "dictValue",
               value: "dictValue"
-            },
+            }
           },
           {
             label: "退租箱数",
@@ -611,7 +876,7 @@ export default {
         selection: true,
         align: "center",
         menu: false,
-        index:true,
+        index: true,
         column: [
           // {
           //   label: "index",
@@ -1546,14 +1811,17 @@ export default {
       if (!this.form.id) {
         return this.$message.error("请保存数据");
       }
-      if (this.searchStatus) {
-        return this.$message.error("请清空数据再检索");
-      }
       if (this.query.code) {
+        if (this.searchStatus) {
+          return this.$message.error("请清空数据再检索");
+        }
         this.searchStatus = true;
         let boxNums = this.query.code.split(" ");
         this.form.tradingBoxItemsList = this.form.tradingBoxItemsList.filter(item => boxNums.includes(item.code));
       }
+      if (!this.query.code) {
+        this.searchReset();
+      }
     },
     searchReset() {
       this.searchStatus = false;
@@ -1638,11 +1906,7 @@ export default {
           return this.$message.error("请添加数据");
         }
         for (let row of this.form.tradingBoxItemsList) {
-          if (
-            !row.code ||
-            !row.boxType ||
-            !row.stationCname
-          ) {
+          if (!row.code || !row.boxType || !row.stationCname) {
             this.$refs.crud.rowCell(row, row.$index);
             return this.$message.error("请完善箱明细信息");
           }
@@ -1914,11 +2178,7 @@ export default {
         done();
         if (valid) {
           for (let row of this.form.tradingBoxItemsList) {
-            if (
-              !row.code ||
-              !row.boxType ||
-              !row.stationCname
-            ) {
+            if (!row.code || !row.boxType || !row.stationCname) {
               this.$refs.crud.rowCell(row, row.$index);
               return this.$message.error("请完善箱明细信息");
             }

+ 10 - 3
src/views/boxManagement/moveOut/index.vue

@@ -25,7 +25,7 @@
         <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" @click="copyButton">复制单据 </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
+          <!-- <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button> -->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
@@ -115,15 +115,22 @@ export default {
             }
           },
           {
+            label: "放箱号",
+            prop: "containerNumber",
+            search: true,
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "系统号",
             prop: "sysNo",
-            width: 150,
+            width: 100,
             overHidden: true
           },
           {
             label: "合约号",
             prop: "contractNo",
-            width: 150,
+            width: 100,
             search: true,
             overHidden: true
           },

+ 7 - 4
src/views/boxManagement/rentalBox/detailsPage.vue

@@ -3,7 +3,7 @@
     <div class="customer-head">
       <div class="customer-back">
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left" @click="goBack()">返回列表 </el-button>
-      <el-button v-if="form.id && pageIds.length" type="text" @click="lastPage">上一票</el-button>
+        <el-button v-if="form.id && pageIds.length" type="text" @click="lastPage">上一票</el-button>
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
@@ -2511,14 +2511,17 @@ export default {
       if (!this.form.id) {
         return this.$message.error("请保存数据");
       }
-      if (this.searchStatus) {
-        return this.$message.error("请清空数据再检索");
-      }
       if (this.query.code) {
+        if (this.searchStatus) {
+          return this.$message.error("请清空数据再检索");
+        }
         this.searchStatus = true;
         let boxNums = this.query.code.split(" ");
         this.form.tradingBoxItemsList = this.form.tradingBoxItemsList.filter(item => boxNums.includes(item.code));
       }
+      if (!this.query.code) {
+        this.searchReset();
+      }
     },
     searchReset() {
       this.searchStatus = false;

+ 1 - 1
src/views/boxManagement/rentalBox/index.vue

@@ -25,7 +25,7 @@
         <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" @click="copyButton">复制单据 </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
+          <!-- <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button> -->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>

+ 1 - 1
src/views/boxManagement/transferCost/index.vue

@@ -12,7 +12,7 @@
           </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
           </el-button>
-          <el-button type="warning" size="small"  disabled @click="outExport">导 出
+          <!-- <el-button type="warning" size="small"  disabled @click="outExport">导 出 -->
           </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">

+ 65 - 2
src/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox/containers.vue

@@ -118,7 +118,7 @@
           <el-input v-if="scope.row.edit" v-model="scope.row.marks" size="small" clearable placeholder="请输入MARKS"></el-input>
           <span v-else>{{ scope.row.marks }}</span>
         </template>
-        <!-- <template slot-scope="{ row }" slot="podStationCname">
+        <template slot-scope="{ row }" slot="podStationCname">
           <dic-select
             v-model="row.podStationCname"
             placeholder="场站"
@@ -131,7 +131,7 @@
             @selectChange="rowDicChange('podStationCname', $event, row)"
           ></dic-select>
         </template>
-        <template slot-scope="{ row }" slot="polCyCname">
+        <!-- <template slot-scope="{ row }" slot="polCyCname">
           <dic-select
             v-model="row.polCyCname"
             placeholder="场站"
@@ -155,6 +155,33 @@
           >
           </el-date-picker>
         </template> -->
+        <tempalte slot-scope="{ row }" slot="podCyContact">
+          <dic-select
+            v-if="row.edit"
+            :key="row.podStationId"
+            v-model="row.podCyContact"
+            placeholder="场站联系人"
+            label="cname"
+            res="records"
+            :url="'/blade-los/bcorpsattn/list?pid=' + row.podStationId"
+            :filterable="true"
+            @selectChange="rowDicChange('podCyContact', $event, row)"
+            :disabled="!row.podStationId"
+          ></dic-select>
+          <span v-else>{{ row.podCyContact }}</span>
+        </tempalte>
+        <template slot-scope="{ row }" slot="podCyAddress">
+          <el-input v-if="row.edit" v-model="row.podCyAddress" size="small" clearable placeholder="请输入目的港场站地址"></el-input>
+          <span v-else>{{ row.podCyAddress }}</span>
+        </template>
+        <template slot-scope="{ row }" slot="podCyEmail">
+          <el-input v-if="row.edit" v-model="row.podCyEmail" size="small" clearable placeholder="请输入目的港场站邮箱"></el-input>
+          <span v-else>{{ row.podCyEmail }}</span>
+        </template>
+        <template slot-scope="{ row }" slot="podCyTel">
+          <el-input v-if="row.edit" v-model="row.podCyTel" size="small" clearable placeholder="请输入目的港场站电话"></el-input>
+          <span v-else>{{ row.podCyTel }}</span>
+        </template>
       </avue-crud>
     </basic-container>
     <business-reports
@@ -380,6 +407,30 @@ export default {
             overHidden: true
           },
           {
+            label: "目的港场站联系人",
+            prop: "podCyContact",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "目的港场站地址",
+            prop: "podCyAddress",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "目的港场站邮箱",
+            prop: "podCyEmail",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "目的港场站电话",
+            prop: "podCyTel",
+            width: 120,
+            overHidden: true
+          },
+          {
             label: "remarks",
             prop: "remarks",
             type: "textarea",
@@ -426,6 +477,18 @@ export default {
   created() {},
   methods: {
     rowDicChange(name, row, el, index) {
+      if (name == "podCyContact") {
+        if (row) {
+          el.podCyAddress = row.addr;
+          el.podCyEmail = row.email;
+          el.podCyTel = row.tel;
+        } else {
+          el.podCyContact = null;
+          el.podCyAddress = null;
+          el.podCyEmail = null;
+          el.podCyTel = null;
+        }
+      }
       if (name == "podStationCname") {
         if (row) {
           el.podStationId = row.id;

+ 75 - 3
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -50,7 +50,14 @@
               >
                 {{ $t("btn118n.edit") }}
               </el-button>
-              <el-button type="primary" size="small" @click="containersSubmitListfun" :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"> {{ $t("btn118n.save") }} </el-button>
+              <el-button
+                type="primary"
+                size="small"
+                @click="containersSubmitListfun"
+                :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"
+              >
+                {{ $t("btn118n.save") }}
+              </el-button>
               <el-button
                 type="success"
                 size="small"
@@ -215,8 +222,9 @@
                         placeholder="请输入VGM总重(KGM)"></el-input>
                     <span v-else>{{ row.vgmWeight }}</span>
                 </template> -->
-        <!-- <tempalte slot="podStationCname" slot-scope="{ row }">
+        <tempalte slot="podStationCname" slot-scope="{ row }">
           <dic-select
+            v-if="row.edit"
             v-model="row.podStationCname"
             placeholder="场站"
             label="cnName"
@@ -227,7 +235,8 @@
             dataName="cnName"
             @selectChange="rowDicChange('podStationCname', $event, row)"
           ></dic-select>
-        </tempalte> -->
+          <span v-else>{{ row.podStationCname }}</span>
+        </tempalte>
         <!-- <template slot-scope="{ row }" slot="polCyCname">
           <dic-select
             v-model="row.polCyCname"
@@ -252,6 +261,33 @@
           >
           </el-date-picker>
         </template> -->
+        <tempalte slot-scope="{ row }" slot="podCyContact">
+          <dic-select
+            v-if="row.edit"
+            :key="row.podStationId"
+            v-model="row.podCyContact"
+            placeholder="场站联系人"
+            label="cname"
+            res="records"
+            :url="'/blade-los/bcorpsattn/list?pid=' + row.podStationId"
+            :filterable="true"
+            :disabled="!row.podStationId"
+            @selectChange="rowDicChange('podCyContact', $event, row)"
+          ></dic-select>
+          <span v-else>{{ row.podCyContact }}</span>
+        </tempalte>
+        <template slot-scope="{ row }" slot="podCyAddress">
+          <el-input v-if="row.edit" v-model="row.podCyAddress" size="small" clearable placeholder="请输入目的港场站地址"></el-input>
+          <span v-else>{{ row.podCyAddress }}</span>
+        </template>
+        <template slot-scope="{ row }" slot="podCyEmail">
+          <el-input v-if="row.edit" v-model="row.podCyEmail" size="small" clearable placeholder="请输入目的港场站邮箱"></el-input>
+          <span v-else>{{ row.podCyEmail }}</span>
+        </template>
+        <template slot-scope="{ row }" slot="podCyTel">
+          <el-input v-if="row.edit" v-model="row.podCyTel" size="small" clearable placeholder="请输入目的港场站电话"></el-input>
+          <span v-else>{{ row.podCyTel }}</span>
+        </template>
       </avue-crud>
     </basic-container>
 
@@ -522,6 +558,30 @@ export default {
             prop: "podEmptyContainerReturnDate",
             width: "160",
             overHidden: true
+          },
+          {
+            label: "目的港场站联系人",
+            prop: "podCyContact",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "目的港场站地址",
+            prop: "podCyAddress",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "目的港场站邮箱",
+            prop: "podCyEmail",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "目的港场站电话",
+            prop: "podCyTel",
+            width: 120,
+            overHidden: true
           }
           // {
           //     label: "MARKS",
@@ -578,6 +638,18 @@ export default {
       row.vgmWeight = Number(Number(row.grossWeight ? row.grossWeight : 0) + Number(row.tare ? row.tare : 0)).toFixed(3);
     },
     rowDicChange(name, row, el) {
+      if (name == "podCyContact") {
+        if (row) {
+          el.podCyAddress = row.addr;
+          el.podCyEmail = row.email;
+          el.podCyTel = row.tel;
+        } else {
+          el.podCyContact = null;
+          el.podCyAddress = null;
+          el.podCyEmail = null;
+          el.podCyTel = null;
+        }
+      }
       if (name == "podStationCname") {
         if (row) {
           el.podStationId = row.id;

+ 17 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue

@@ -417,7 +417,8 @@ export default {
       mttachedGoodsdesc: 15,
       mttachedMark: 15,
       mttachedCntry: 3,
-      amendmentFee: 0
+      amendmentFee: 0,
+      isOccupyNum:false,
     };
   },
   props: {
@@ -462,6 +463,11 @@ export default {
         this.amendmentFee = res.data.data;
       }
     });
+    isProcurement({ param: "is.occupyNum" }).then(res => {
+      if (res.data.data == 1) {
+        this.isOccupyNum = true;
+      }
+    });
     // this.reportsListfun()
   },
   methods: {
@@ -582,6 +588,16 @@ export default {
         this.$message.warning("请先选择报表类型");
         return;
       }
+     
+      if (this.isOccupyNum&&this.businesstypeData.reportsType == "RHTZ") {
+        if (this.assemblyForm.boxBelongsTo == "SOC" && this.assemblyForm.billType == "MH") {
+          if (
+            this.assemblyForm.preContainersList.length != this.assemblyForm.preContainersList.filter(item => item.containerNumberStatus == "已选择").length
+          ) {
+            return this.$message.error("请选择放箱号");
+          }
+        }
+      }
       this.addShow = false;
       reportsGetReportData({
         billId: this.assemblyForm.id,

+ 4 - 5
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -844,8 +844,7 @@
                     generateBillsfalse ||
                     (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
                     assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length ||
-                    assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length ||
-                    overTime
+                    assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length
                 "
                 :buttonIf="false"
                 placeholder="请选择承运人"
@@ -1004,7 +1003,7 @@
                     keyValue="dictKey"
                     url="/blade-system/dict-biz/dictionary?code=issue_type_F"
                     :filterable="true"
-                    :disabled="detailData.seeDisabled||overTime"
+                    :disabled="detailData.seeDisabled"
                     :initData="true"
                   ></dic-select>
                 </el-form-item>
@@ -1020,7 +1019,7 @@
                     clearable
                     type="date"
                     size="small"
-                    :disabled="detailData.seeDisabled || isATD||overTime"
+                    :disabled="detailData.seeDisabled || isATD"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期"
                   >
@@ -1166,7 +1165,7 @@
                     :filterable="true"
                     :clearable="true"
                     :remote="true"
-                    :disabled="detailData.seeDisabled||overTime"
+                    :disabled="detailData.seeDisabled"
                     :buttonIf="false"
                     :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                     placeholder="请选择签单地点"

+ 39 - 5
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/components/sendEdi.vue

@@ -4,6 +4,9 @@
       <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">
         <el-popover placement="top" width="400" trigger="click">
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="textarea"> </el-input>
+         <div style="display: flex;justify-content: right;">
+          <el-button type="text" @click="copyText" size="small">复制文本</el-button>
+         </div>
           <el-button slot="reference" size="small">查看</el-button>
         </el-popover>
         <el-button style="margin-left: 10px;" type="warning" size="small" @click="outExport">导出</el-button>
@@ -33,7 +36,7 @@ export default {
   props: {},
   data() {
     return {
-      textarea:'',
+      textarea: "",
       id: null,
       data: [],
       ids: null,
@@ -114,6 +117,17 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(309.6), this.optionBack);
   },
   methods: {
+    async copyText() {
+      if(!this.textarea){
+        return this.$message.error("文本没有内容!");
+      }
+      try {
+        await navigator.clipboard.writeText(this.textarea);
+        this.$message.success("复制成功");
+      } catch (err) {
+        this.$message.error("复制失败");
+      }
+    },
     outExport() {
       this.$confirm("是否导出当前所有数据?", "提示", {
         confirmButtonText: "确定",
@@ -165,11 +179,31 @@ export default {
       this.loading = true;
       sendDeliveryPaper(obj)
         .then(res => {
-          res.data.data.forEach(item=>{
-            this.textarea='开船日期:'+item.etd+'\n目的港:'+item.podEnName+'\n船名:'+item.vesselCnName+'\n航次:'+item.voyageNo+'\n箱主:'+item.boxOwner+'\n入港箱主:'+item.inboundContainerOwner+'\n转港:'+item.potEnName+'\n提单号:'+item.mblno+'\n放箱号:'+item.containerNumber+'货物毛重:'+item.grossWeight
-          })
+          res.data.data.forEach(item => {
+            this.textarea =
+              "开船日期:" +
+              item.etd +
+              "\n目的港:" +
+              item.podEnName +
+              "\n船名:" +
+              item.vesselCnName +
+              "\n航次:" +
+              item.voyageNo +
+              "\n箱主:" +
+              item.boxOwner +
+              "\n入港箱主:" +
+              item.inboundContainerOwner +
+              "\n转港:" +
+              item.potEnName +
+              "\n提单号:" +
+              item.mblno +
+              "\n放箱号:" +
+              item.containerNumber +
+              "货物毛重:" +
+              item.grossWeight;
+          });
           this.data = res.data.data;
-          
+
           // this.page.total = res.data.data.total;
         })
         .finally(() => {

+ 6 - 6
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -635,12 +635,12 @@ export default {
             width: 60,
             overHidden: true
           },
-          {
-            label: "盘存",
-            prop: "storageNum",
-            width: 60,
-            overHidden: true
-          },
+          // {
+          //   label: "盘存",
+          //   prop: "storageNum",
+          //   width: 60,
+          //   overHidden: true
+          // },
           {
             label: "占用",
             prop: "occupyNum",

+ 3 - 0
src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -2972,6 +2972,9 @@ export default {
         this.$refs.importTemp.openDialog();
       }
       if (name == "退舱") {
+        if(this.form.hblno){
+         return this.$message.error("已出号,退仓请联系客服!");
+        }
         this.$confirm("是否退舱?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

+ 24 - 0
src/views/iosBasicData/podStation/index.vue

@@ -217,6 +217,30 @@ export default {
             }
           },
           {
+            label: "目的港场站联系人",
+            prop: "podCyContact",
+            width: 120,
+            overHidden: true,
+          },
+          {
+            label: "目的港场站地址",
+            prop: "podCyAddress",
+            width: 120,
+            overHidden: true,
+          },
+          {
+            label: "目的港场站邮箱",
+            prop: "podCyEmail",
+            width: 120,
+            overHidden: true,
+          },
+          {
+            label: "目的港场站电话",
+            prop: "podCyTel",
+            width: 120,
+            overHidden: true,
+          },
+          {
             label: "MB/L NO",
             prop: "mblno",
             overHidden: true,

+ 6 - 4
src/views/ow/owPut/detailsPage.vue

@@ -3213,15 +3213,17 @@ export default {
           return this.$message.error("请保存明细数据再进行检索");
         }
       }
-      if (this.searchStatus) {
-        return this.$message.error("请清空数据再检索");
-      }
       if (this.boxQuery.code) {
+        if (this.searchStatus) {
+          return this.$message.error("请清空数据再检索");
+        }
         this.searchStatus = true;
         let boxNums = this.boxQuery.code.split(" ");
-        console.log(boxNums);
         this.form.tradingBoxItemsList = this.form.tradingBoxItemsList.filter(item => boxNums.includes(item.code));
       }
+      if (!this.boxQuery.code) {
+        this.searchReset();
+      }
     },
     searchResetBox() {
       this.searchStatus = false;

Файловите разлики са ограничени, защото са твърде много
+ 694 - 257
src/views/ow/owTask/detailsPage.vue


Някои файлове не бяха показани, защото твърде много файлове са промени