货代海运出口10.31

src/util/date.js

@@ -142,3 +142,26 @@ export function getYearDate(){
   const date = new Date();
   return date.getFullYear()
 }
+
+/**
+ * 获取 n 天后的日期
+ * yyyy-MM-dd
+ */
+export const NdayDate = (num) => {
+  let date1 = new Date();
+  //今天时间
+  let time1 = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate();
+  let date2 = new Date(date1);
+  date2.setDate(date1.getDate() + num);
+  //num是正数表示之后的时间，num负数表示之前的时间，0表示今天
+  let time2 = addZero(date2.getFullYear()) + "-" + addZero((date2.getMonth() + 1)) + "-" + addZero(date2.getDate());
+  return time2;
+}
+
+// 补零方法
+function addZero(num) {
+  if (parseInt(num) < 10) {
+    num = '0' + num;
+  }
+  return num;
+}

src/util/messageReminder.js

@@ -8,10 +8,14 @@ import Vue from 'vue';
 export const requiredMessage = (form,data)=>{
   for(let item of data) {
     if (!form[item.value]) {
-      Vue.prototype.$message({
-        message: `请先选择${item.name}`,
-        type: 'warning'
-      });
+      let time // 声明变量用来存放延时器
+      clearTimeout(time) // 关闭上一个延时器
+      time = setTimeout(()=>{
+        Vue.prototype.$message({
+          message: `请先选择${item.name}`,
+          type: 'warning'
+        });
+      })
       return false
     }
   }

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

@@ -322,7 +322,7 @@
                                               :filterable="true"
                                               :clearable="true"
                                               :remote="true"
-                                              :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
+                                              :disabled="detailData.seeDisabled"
                                               :buttonIf="false"
                                               :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                               @remoteMethod="remoteMethod($event,'packingUnit')"

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

@@ -730,15 +730,69 @@
                 feesselectionList:[],
                 selectionDList:[], // 收选择的
                 selectionCList:[], // 付选择的
+                // 需要加判断是否必填的数据
+                messageData:[
+                    {
+                        name:'客户',
+                        value:'corpCnName',
+                    },
+                    {
+                        name:'业务来源',
+                        value:'srcType',
+                    },
+                    {
+                        name:'MBLNO',
+                        value:'mblno',
+                    },
+                    {
+                        name:'HBLNO',
+                        value:'hblno',
+                    },
+                    {
+                        name:'booking NO',
+                        value:'bookingNo',
+                    },
+                    {
+                        name:'外提单号',
+                        value:'refno',
+                    },
+                    {
+                        name:'船名(VSL)',
+                        value:'vesselCnName',
+                    },
+                    {
+                        name:'航次(VOY)',
+                        value:'voyageNo',
+                    },
+                    {
+                        name:'ETD',
+                        value:'etd',
+                    },
+                    {
+                        name:'装货港',
+                        value:'polCnName',
+                    },
+                    {
+                        name:'目的港',
+                        value:'destinationNamePrint',
+                    },
+                    {
+                        name:'包装单位',
+                        value:'packingUnit',
+                    },
+                    {
+                        name:'船公司',
+                        value:'carrierCnName',
+                    },
+                    {
+                        name:'场站',
+                        value:'cyCnName',
+                    },
+                ],
 
             }
         },
         created() {
-            // this.getBcorpsListfun()
-            // this.bfeesListfun()
-            // this.getBunitsPagefun()
-            // this.getRateListfun()
-            // this.getWorkDictsfun()
         },
         methods:{
             // 模板导入
@@ -791,59 +845,9 @@
                     return
                 }
                 // 判断数据需要的数据是否有
-                // 起运港、目的港、
-                // 件重尺、包装单位、箱型、箱量、船公司、场站、
-                const data = [
-                    {
-                        name:'客户',
-                        value:'corpCnName',
-                    },
-                    {
-                        name:'业务来源',
-                        value:'srcType',
-                    },
-                    {
-                        name:'MBLNO',
-                        value:'mblno',
-                    },
-                    {
-                        name:'HBLNO',
-                        value:'hblno',
-                    },
-                    {
-                        name:'booking NO',
-                        value:'bookingNo',
-                    },
-                    {
-                        name:'外提单号',
-                        value:'refno',
-                    },
-                    {
-                        name:'船名(VSL)',
-                        value:'vesselCnName',
-                    },
-                    {
-                        name:'航次(VOY)',
-                        value:'voyageNo',
-                    },
-                    {
-                        name:'ETD',
-                        value:'etd',
-                    },
-                ]
-                console.log(requiredMessage(this.assemblyForm,data))
-
-                // for (let item of messageData) {
-                //     if (!this.assemblyForm[item.value]) {
-                //         this.$message({
-                //             message: `请先选择${item.name}`,
-                //             type: 'warning'
-                //         });
-                //         return
-                //     }
-                // }
-                // etd
-                return
+                if (!requiredMessage(this.assemblyForm,this.messageData)) {
+                    return;
+                }
                 this.assemblyForm.feeCenterListD.push({
                     edit:true
                 })
@@ -857,6 +861,10 @@
                     });
                     return
                 }
+                // 判断数据需要的数据是否有
+                if (!requiredMessage(this.assemblyForm,this.messageData)) {
+                    return;
+                }
                 this.assemblyForm.feeCenterListC.push({
                     edit:true
                 })
@@ -949,8 +957,6 @@
                         }else {
                             this.assemblyForm.feeCenterListC.splice(index, 1)
                         }
-
-
                     }
                 })
             },
@@ -985,7 +991,6 @@
                                 this.$set(row,'usdAmount',row.amount)
                                 this.$set(row,'rmbAmount','')
                             }
-
                         }
                     }
                 } else {

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

@@ -108,6 +108,7 @@
                                                 clearable type="date" size="small"
                                                 :disabled="detailData.seeDisabled"
                                                 value-format="yyyy-MM-dd HH:mm:ss"
+                                                :picker-options="etdPickerOptions"
                                                 placeholder="选择日期">
                                 </el-date-picker>
                             </el-form-item>
@@ -186,7 +187,7 @@
                 </el-col>
             </el-row>
 
-            <el-rwo>
+            <el-row>
                 <el-col :span="6">
                     <el-form-item label="MB/L 发货人" prop="mShipperCnName" >
                         <span slot="label">
@@ -295,7 +296,7 @@
                         </el-form-item>
                     </div>
                 </el-col>
-            </el-rwo>
+            </el-row>
         </el-form>
     </div>
 </template>
@@ -305,6 +306,7 @@
     import {getBvesselsList} from "@/api/iosBasicData/bvessels";
     import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
     import {blinesList} from "@/api/iosBasicData/blines";
+    import {NdayDate} from "@/util/date";
 
     export default {
         components: {SearchQuery},
@@ -318,6 +320,13 @@
         },
         data(){
             return {
+                // 设置当前时间选择的范围
+                etdPickerOptions:{
+                    disabledDate(time) {
+                        // 获取当前日期后的45天 Date.parse(NdayDate(45))
+                        return time.getTime() < Date.now() - 86400000 || time.getTime() > Date.parse(NdayDate(45))
+                    }
+                },
                 vesselData:[], // 船名数据
                 carrierData:[], // 船公司
                 lineData:[], // 航线
@@ -334,18 +343,7 @@
             }
         },
         created() {
-            // this.vesselBvesselsListfun()
-            // this.carrierBcorpsListfun()
-            // this.lineblinesListfun()
-            // this.bookingAgentBcorpsListfun()
-            // // MB/L 发货人
-            // this.mShipperBcorpsListfun()
-            // // MB/L 收货人
-            // this.mConsigneeBcorpsListfun()
-            // // MB/L 通知人
-            // this.mNotifyBcorpsListfun()
-            // // MB/L 第二通知人
-            // this.mNotify2BcorpsListfun()
+
         },
         methods:{
             /* 远程模糊查询操作用户 */

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

@@ -210,9 +210,7 @@
                       </el-row>
                   </el-form>
               </template>
-              <template slot="searchMenu"  slot-scope="{row,size}">
-
-              </template>
+              <template slot="searchMenu"  slot-scope="{row,size}"></template>
 
               <template slot="menuLeft">
                   <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新增海运出口