货代海运出口10.31

src/components/iosbasic-data/TreeSelect.vue

@@ -210,7 +210,7 @@ export default {
 
 <style lang="scss" scoped>
 // 得用 ::v-deep
-.tree-select__option {
+::v-deep.tree-select__option {
     &.el-select-dropdown__item {
         height: auto;
         line-height: 1;

src/util/messageReminder.js

@@ -0,0 +1,19 @@
+import Vue from 'vue';
+/**
+ * 弹窗必填项判断
+ * form 需要拿取数据的对象
+ * data 需要判断的数组 [{name:'名称',value:'参数'}]
+ * return
+ */
+export const requiredMessage = (form,data)=>{
+  for(let item of data) {
+    if (!form[item.value]) {
+      Vue.prototype.$message({
+        message: `请先选择${item.name}`,
+        type: 'warning'
+      });
+      return false
+    }
+  }
+  return true
+}

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -83,7 +83,6 @@
 
 <script>
 import {
-    containersList,
     containersDetail,
     containersSubmit,
     containersRemove,
@@ -93,7 +92,6 @@ import {
   import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
   import bports from "@/views/iosBasicData/bports/index.vue";
   import {bportsList} from "@/api/iosBasicData/bports";
-import fa from "element-ui/src/locale/lang/fa";
 
   export default {
       components: {SearchQuery,bports},
@@ -213,6 +211,9 @@ import fa from "element-ui/src/locale/lang/fa";
       methods: {
           // 查询件数是否为零
           numberfalsefun() {
+              if (!this.assemblyForm.containersList) {
+                  return false
+              }
               for (let item of this.assemblyForm.containersList) {
                   if (Number(item.quantity) >= 0) {
                       return true

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

@@ -308,7 +308,7 @@
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantity"
                                           size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
+                                          :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
                                           clearable placeholder="件数" ></el-input>
                             </el-form-item>
                         </el-col>
@@ -322,7 +322,7 @@
                                               :filterable="true"
                                               :clearable="true"
                                               :remote="true"
-                                              :disabled="detailData.seeDisabled"
+                                              :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
                                               :buttonIf="false"
                                               :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                               @remoteMethod="remoteMethod($event,'packingUnit')"
@@ -340,7 +340,7 @@
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.grossWeight"
                                           size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
+                                          :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
                                           clearable placeholder="请选择毛重" ></el-input>
                             </el-form-item>
                         </el-col>
@@ -351,7 +351,7 @@
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.measurement"
                                           size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
+                                          :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
                                           clearable placeholder="请选择尺码/体积" ></el-input>
                             </el-form-item>
                         </el-col>
@@ -503,7 +503,11 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="16">
-                    <precontainers :assemblyForm="assemblyForm" :seeDisabled="detailData.seeDisabled" :pid="assemblyForm.id" @billsDetailfun="billsDetailfun"></precontainers>
+                    <precontainers :assemblyForm="assemblyForm"
+                                   :seeDisabled="detailData.seeDisabled || assemblyForm.billType == 'MH'"
+                                   :pid="assemblyForm.id"
+                                   @billsDetailfun="billsDetailfun" >
+                    </precontainers>
                 </el-col>
             </el-row>
             <el-form-item label="备注" prop="remarks" >

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

@@ -630,6 +630,7 @@
     import {getWorkDicts} from "@/api/system/dictbiz";
     import {feecenterTemplateImport, losbfeestemplateGetListTemplate} from "@/api/iosBasicData/bills";
     import {losbfeestemplateDetail} from "@/api/iosBasicData/losbfeestemplate";
+    import {requiredMessage} from "@/util/messageReminder";
 
     export default {
         components: {SearchQuery},
@@ -789,6 +790,60 @@
                     });
                     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
                 this.assemblyForm.feeCenterListD.push({
                     edit:true
                 })

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

@@ -774,7 +774,6 @@ import {dateFormat} from "@/util/date";
             },
             // 下拉的监听事件
             corpChange(value,name){
-                console.log(value,name,769)
                 if (name == 'operatorName') {
                     // OP 下拉赋值 用户管理列表
                     for(let item of this.columnforfun('operatorName').dicData) {
@@ -788,7 +787,6 @@ import {dateFormat} from "@/util/date";
                     // OP 下拉赋值 用户管理列表
                     for(let item of this.columnforfun('accDeptName').dicData) {
                         if (item.title == value) {
-                            console.log(item,783)
                             this.form.accDeptName = item.title
                             this.form.accDeptId = item.id
                         }
@@ -803,6 +801,11 @@ import {dateFormat} from "@/util/date";
                         this.columnforfun('corpAttnName').disabled = true
                         this.columnforfun('corpAttnTel').disabled = true
                         this.columnforfun('corpAttnEmail').disabled = true
+                        // 如果点击清空按钮把值赋值为空
+                        this.form.corpCnName = ''
+                        this.form.corpEnName = ''
+                        this.form.corpId = ''
+                        this.form.corpCode = ''
                     }
                     // 往来单位
                     for(let item of this.columnforfun('corpCnName').dicData) {
@@ -828,6 +831,10 @@ import {dateFormat} from "@/util/date";
                 }
                 else if (name == 'srcType') {
                     if (!value) {
+                        this.$set(this.form,'srcType','')
+                        this.$set(this.form,'srcId','')
+                        this.$set(this.form,'srcCnName','')
+                        this.$set(this.form,'srcEnName','')
                         this.columnforfun('srcCnName').disabled = true
                         return
                     }
@@ -837,6 +844,7 @@ import {dateFormat} from "@/util/date";
                         this.columnforfun('srcCnName').type = ''
                         for(let item of this.columnforfun('srcCnName').dicData) {
                             if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_id) {
+                                console.log(item,847)
                                 this.$set(this.form,'srcId',item.id)
                                 this.$set(this.form,'srcCnName',item.title)
                                 this.$set(this.form,'srcEnName',item.title)