海运进出口去掉必填项

租箱 代理箱 放箱号 新加箱号检索条件 修改流程
OW提醒 新加角标 提示

src/views/boxManagement/agentBox/detailsPage.vue

@@ -17,6 +17,8 @@
           @click="inEdit"
           >编 辑
         </el-button>
+        <el-button v-if="form.whetherEnable != '是'" type="info" size="small" @click="allClick('启用')">启用</el-button>
+        <el-button v-if="form.whetherEnable == '是'" type="danger" size="small" @click="allClick('撤销启用')">撤销启用</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>
@@ -155,7 +157,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -202,6 +204,9 @@
               :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"
               @select="selectHandle"
               @row-update="rowUpdate"
@@ -209,7 +214,7 @@
               @saveColumn="saveColumn('crud', 'option', 'optionBack', 475)"
             >
               <template slot="menuLeft">
-                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id" @click="allClick('一键保存')">一键保存</el-button>
+                <!-- <el-button type="info" plain size="small" :disabled="editDisabled || !form.id" @click="allClick('一键保存')">一键保存</el-button>
                 <el-button
                   type="info"
                   plain
@@ -217,17 +222,15 @@
                   :disabled="editDisabled || form.tradingBoxItemsList.length == 0"
                   @click="allClick('一键编辑')"
                   >一键编辑</el-button
-                >
+                > -->
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
                   >批量删除</el-button
                 >
-                <el-button type="success" size="small" @click="allClick('导入')" :disabled="!form.id">导入</el-button>
+                <!-- <el-button type="success" size="small" @click="allClick('导入')" :disabled="!form.id">导入</el-button> -->
                 <!-- <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0">启用</el-button> -->
-                <el-button v-if="form.whetherEnable != '是'" type="info" size="small" @click="allClick('启用')">启用</el-button>
-                <el-button v-if="form.whetherEnable == '是'" type="danger" size="small" @click="allClick('撤销启用')">撤销启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
-                <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true" @click="$refs.print.openDialog()">打印报表 </el-button>
+                <!-- <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true" @click="$refs.print.openDialog()">打印报表 </el-button> -->
                 <span style="margin: 0 20px;color:#67C23A;"> 金额本币合计:{{ CNYSUM }} </span>
                 <span style="margin: 0 20px;color:#F56C6C;"> 金额外币合计:{{ USDSUM }} </span>
               </template>
@@ -263,7 +266,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -719,6 +722,8 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      searchStatus: false,
+      query: {},
       CNYSUM: 0,
       USDSUM: 0,
       boxSelectionList: [],
@@ -1092,6 +1097,7 @@ export default {
         menuWidth: 60,
         searchMenuSpan: 18,
         tip: false,
+        index:true,
         border: true,
         addBtn: false,
         viewBtn: false,
@@ -1103,13 +1109,6 @@ export default {
         menu: false,
         column: [
           {
-            label: "index",
-            prop: "index",
-            width: "55",
-            fixed: true,
-            headerslot: true
-          },
-          {
             label: "是否启用",
             prop: "whetherEnable",
             overHidden: true
@@ -1124,6 +1123,7 @@ export default {
             label: "箱号",
             prop: "code",
             width: 140,
+            search: true,
             cell: true,
             slot: true,
             formslot: true,
@@ -2159,6 +2159,24 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
+    searchChange(params, done) {
+      done();
+      if (!this.form.id) {
+        return this.$message.error("请保存数据");
+      }
+      if (this.searchStatus) {
+        return this.$message.error("请清空数据再检索");
+      }
+      if (this.query.code) {
+        this.searchStatus = true;
+        let boxNums = this.query.code.split(" ");
+        this.form.tradingBoxItemsList = this.form.tradingBoxItemsList.filter(item => boxNums.includes(item.code));
+      }
+    },
+    searchReset() {
+      this.searchStatus = false;
+      this.getDetail(this.form.id);
+    },
     boxSelectionChange(list) {
       this.boxSelectionList = list;
     },
@@ -2197,21 +2215,28 @@ export default {
               this.optionForm.disabled = true;
             }
           });
-          this.form = res.data.data;
-          this.updateFormKey = new Date().getTime();
           if (res.data.data.whetherEnable == "是") {
+            this.editDisabled = true;
             this.optionForm.column.forEach(e => {
               if (e.prop == "contractNo" || e.prop == "effectiveDate" || e.prop == "expiryDate" || e.prop == "containerNumber") {
                 e.disabled = true;
               }
             });
-          } else {
+          }
+          if (res.data.data.whetherEnable != "是") {
+            this.editDisabled = false;
             this.optionForm.column.forEach(e => {
               if (e.prop == "contractNo" || e.prop == "effectiveDate" || e.prop == "expiryDate" || e.prop == "containerNumber") {
                 e.disabled = false;
               }
             });
           }
+          this.form = res.data.data;
+          this.updateFormKey = new Date().getTime();
+          if (this.query.code) {
+            this.searchStatus = false;
+            this.searchChange(this.query);
+          }
         })
         .finally(() => {
           loading.close();
@@ -2479,11 +2504,6 @@ export default {
         this.excelBox = true;
       }
       if (name == "启用") {
-        for (let item of this.selectionList) {
-          if (item.whetherEnable == "是") {
-            return this.$message.error("请勿重复启用");
-          }
-        }
         this.form.cyTextOne = this.form.cyText;
         this.activationForm = {
           containerNumber: null,

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -167,7 +167,7 @@
               label="cnName"
               res="records"
               :disabled="editDisabled"
-             url="/blade-los/bcntrtypes/list?current=1&size=100"
+              url="/blade-los/bcntrtypes/list?current=1&size=100"
               :filterable="true"
               :remote="true"
               dataName="cnName"
@@ -269,6 +269,9 @@
           :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"
           @select="selectHandle"
           @row-update="rowUpdate"
@@ -276,8 +279,8 @@
           @saveColumn="saveColumn('crud', 'option', 'optionBack', 460)"
         >
           <template slot="menuLeft">
-            <el-button type="info" plain size="small" :disabled="editDisabled" @click="allClick('一键保存')">一键保存</el-button>
-            <el-button type="info" plain size="small" :disabled="editDisabled" @click="allClick('一键编辑')">一键编辑</el-button>
+            <el-button type="info" plain size="small" :disabled="editDisabled || searchStatus" @click="allClick('一键保存')">一键保存</el-button>
+            <el-button type="info" plain size="small" :disabled="editDisabled || searchStatus" @click="allClick('一键编辑')">一键编辑</el-button>
             <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
               >批量删除</el-button
             >
@@ -293,7 +296,7 @@
                 </el-button> -->
           </template>
           <template slot="indexHeader" slot-scope="{ row, index }">
-            <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled" circle @click="addRow()"> </el-button>
+            <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled || searchStatus" circle @click="addRow()"> </el-button>
           </template>
           <template slot="index" slot-scope="{ row, index }">
             <span>{{ index + 1 }}</span>
@@ -316,7 +319,7 @@
               key="id"
               label="cnName"
               res="records"
-             url="/blade-los/bcntrtypes/list?current=1&size=100"
+              url="/blade-los/bcntrtypes/list?current=1&size=100"
               :filterable="true"
               :remote="true"
               dataName="cnName"
@@ -508,6 +511,8 @@ import { Header } from "element-ui";
 export default {
   data() {
     return {
+      searchStatus: false,
+      query: {},
       saberUserInfo: JSON.parse(localStorage.getItem("saber-userInfo")).content, // 当前登录人个人信息
       activationForm: {},
       activationOption: {
@@ -539,7 +544,7 @@ export default {
       form: {
         busType: "自有箱",
         boxClass: "自有箱",
-        priorityLevel:'1',
+        priorityLevel: "1",
         whetherManuallyCreate: 0,
         putBoxItemsList: []
       },
@@ -960,6 +965,8 @@ export default {
             label: "箱号",
             prop: "boxCode",
             width: 140,
+            searchPlaceholder:'请输入箱号 多个箱号用空格区分',
+            search: true,
             cell: true,
             slot: true,
             formslot: true,
@@ -1610,6 +1617,29 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
+    searchChange(params, done) {
+      done();
+      if (!this.form.id) {
+        return this.$message.error("请保存数据");
+      }
+      for (let item of this.form.putBoxItemsList) {
+        if (item.$cellEdit) {
+          return this.$message.error("请保存明细数据再进行检索");
+        }
+      }
+      if (this.searchStatus) {
+        return this.$message.error("请清空数据再检索");
+      }
+      if (this.query.boxCode) {
+        this.searchStatus = true;
+        let boxNums = this.query.boxCode.split(" ");
+        this.form.putBoxItemsList = this.form.putBoxItemsList.filter(item => boxNums.includes(item.boxCode));
+      }
+    },
+    searchReset() {
+      this.searchStatus = false;
+      this.getDetail(this.form.id);
+    },
     getDetail(id) {
       const loading = this.$loading({
         lock: true,
@@ -1620,6 +1650,10 @@ export default {
       detail({ id: id })
         .then(res => {
           this.form = res.data.data;
+               if (this.query.code) {
+            this.searchStatus = false;
+            this.searchChange(this.query);
+          }
         })
         .finally(() => {
           loading.close();

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

@@ -310,7 +310,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="签单方式" prop="issueType" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+          <el-form-item label="签单方式" prop="issueType">
             <span slot="label">
               <span style="color: #1e9fff">签单方式</span>
             </span>

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -2394,9 +2394,9 @@ export default {
           if (!this.form.srcType || !this.form.srcCnName) {
             msgs.push("业务来源");
           }
-          if (!this.form.issueType) {
-            msgs.push("签单方式");
-          }
+          // if (!this.form.issueType) {
+          //   msgs.push("签单方式");
+          // }
           // if (!this.form.etd) {
           //     msgs.push('ETD')
           // }

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

@@ -984,7 +984,7 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="签单方式" prop="issueType" label-width="80px" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                <el-form-item label="签单方式" prop="issueType" label-width="80px">
                   <span slot="label">
                     <span style="color: #1e9fff">{{ $t("sea118n.issueType") }}</span>
                   </span>

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

@@ -906,7 +906,7 @@ export default {
           },
           {
             label: "HB/L NO",
-            text: "请输入MB/L NO",
+            text: "请输入HB/L NO",
             prop: "hblno",
             disabled: false,
             display: false
@@ -1040,7 +1040,6 @@ export default {
     "form.billType": {
       // 执行方法
       handler(oldValue, newValue) {
-        console.log(oldValue, 11111111111);
         if (oldValue == "MH" || oldValue == "MM") {
           this.basicData.column.forEach(item => {
             if (item.prop == "bookingNo") {
@@ -1116,6 +1115,25 @@ export default {
       },
       deep: true, // 深度监听
       immediate: true // 第一次改变就执行,
+    },
+    billsListAllData: {
+      // 执行方法
+      handler(oldValue, newValue) {
+        if (oldValue.length && this.form.billType == "MM") {
+          this.basicData.column.forEach((item, index) => {
+            if (index == 3) {
+              item.forEach(row => {
+                if (row.prop == "mblno") {
+                  row.disabled = true;
+                }
+              });
+            }
+          });
+          console.log(this.basicData.column)
+        }
+      },
+      deep: true, // 深度监听
+      immediate: true // 第一次改变就执行,
     }
   },
   created() {
@@ -2513,9 +2531,9 @@ export default {
               msgs.push("客服");
             }
           }
-          if (!this.form.issueType) {
-            msgs.push("签单方式");
-          }
+          // if (!this.form.issueType) {
+          //   msgs.push("签单方式");
+          // }
           // if (!this.form.teamName) {
           //     msgs.push('所属团队')
           // }

src/views/ow/owReminder/index.vue

@@ -20,11 +20,31 @@
       >
         <template slot="menuLeft">
           <el-tabs v-model="query.type" type="card" @tab-click="refreshChange">
-            <el-tab-pane label="用箱提箱" name="2"></el-tab-pane>
-            <el-tab-pane label="延期提醒" name="3"></el-tab-pane>
-            <el-tab-pane label="还箱提醒" name="1"></el-tab-pane>
+            <el-tab-pane label="用箱提箱" name="2">
+              <span slot="label">
+                <el-badge :value="badgeNum1" class="item" :max="99">
+                  用箱提箱
+                </el-badge>
+              </span>
+            </el-tab-pane>
+            <el-tab-pane label="延期提醒" name="3">
+              <span slot="label">
+                <el-badge :value="badgeNum2" class="item" :max="99">
+                  延期提醒
+                </el-badge>
+              </span>
+            </el-tab-pane>
+            <el-tab-pane label="还箱提醒" name="1">
+              <span slot="label">
+                <el-badge :value="badgeNum3" class="item" :max="99">
+                  还箱提醒
+                </el-badge>
+              </span>
+            </el-tab-pane>
           </el-tabs>
           <el-button type="warning" size="small" @click="outExport">导 出 </el-button>
+          <el-tag type="danger" v-if="query.type==2">OW(拿)启用并且合同生效日期10天后还有未提箱的</el-tag>
+          <el-tag type="danger" v-if="query.type==3">OW(拿)启用并且合同失效日期前后3天</el-tag>
         </template>
       </avue-crud>
     </basic-container>
@@ -41,6 +61,9 @@ export default {
   name: "OW提醒",
   data() {
     return {
+      badgeNum1: 0,
+      badgeNum2: 0,
+      badgeNum3: 0,
       roleName: localStorage.getItem("roleName"),
       form: {},
       query: {
@@ -256,6 +279,7 @@ export default {
       this.$refs.crud.doLayout();
       this.$refs.crud.dicInit();
     });
+    this.getBadge();
   },
   activated() {
     setTimeout(() => {}, 100);
@@ -276,6 +300,17 @@ export default {
     refreshChange() {
       this.onLoad(this.query);
     },
+    getBadge() {
+      getListReminder({ type: 2 }).then(res => {
+        this.badgeNum1 = res.data.data.length;
+      });
+      getListReminder({ type: 3 }).then(res => {
+        this.badgeNum2 = res.data.data.length;
+      });
+      getListReminder({ type: 1 }).then(res => {
+        this.badgeNum3 = res.data.data.length;
+      });
+    },
     onLoad(page, params = {}) {
       let obj = {};
       obj = {
@@ -285,10 +320,6 @@ export default {
       getListReminder(obj)
         .then(res => {
           this.data = res.data.data;
-          // this.$nextTick(() => {
-          //   this.$refs.crud.doLayout();
-          //   this.$refs.crud.dicInit();
-          // });
         })
         .finally(() => {
           this.loading = false;
@@ -378,4 +409,11 @@ export default {
 ::v-deep .el-col-md-8 {
   width: 24.33333%;
 }
+::v-deep .el-tabs__item {
+  width: 110px !important;
+}
+::v-deep .el-badge__content.is-fixed {
+  top: 10px !important;
+  right: 0px !important;
+}
 </style>