付费申请快捷查询 新加查新条件 海运进出口 毛重保留三位小数 箱型箱量弹窗 新加内部放箱号 箱管放箱 新加必填项

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -290,6 +290,11 @@ export default {
             label: '箱东',
             prop: 'boxEastName',
             disabled:false,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }]
           },
           {
             label: '放箱号',
@@ -315,7 +320,12 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
-            disabled: false
+            disabled: false,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }]
           },
           {
             label: '起运港',
@@ -372,7 +382,12 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            disabled: false
+            disabled: false,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }]
           },
           {
             label: '有效日期止',
@@ -380,7 +395,12 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            disabled: false
+            disabled: false,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }]
           },
           {
             label: '箱况',
@@ -403,7 +423,12 @@ export default {
           {
             label: '箱型',
             prop: 'boxType',
-            disabled: false
+            disabled: false,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }]
           },
           {
             label: '箱属',

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

@@ -725,7 +725,7 @@
                                     <el-input ref="grossWeightRef" step="0.01" style="width: 100%;"
                                         v-model="assemblyForm.grossWeight" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled" @input="floatingInput($event, 'grossWeight')"
-                                        @focus="quantityFocus" clearable placeholder="请输入毛重"></el-input>
+                                        @focus="quantityFocus" clearable placeholder="请输入毛重" @change="grossWeightChange"></el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -1529,6 +1529,13 @@ export default {
         floatingInput(value, name) {
             this.$set(this.assemblyForm, name, regularFloating(value))
         },
+        grossWeightChange(value) {
+            if (isNaN(Number(value))) {
+                this.$set(this.assemblyForm, 'grossWeight', 0)
+            } else {
+                this.$set(this.assemblyForm, 'grossWeight', Number(value).toFixed(3))
+            }
+        },
         // 详情接口
         billsDetailfun() {
             this.$emit('billsDetailfun')

src/views/iosBasicData/PaymentApplication/assembly/searchPopup.vue

@@ -99,7 +99,7 @@ export default {
                 height: 400,
                 calcHeight: 30,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 24,
                 searchIcon: true,
                 searchIndex: 3,
                 border: true,
@@ -219,15 +219,28 @@ export default {
                     },
                     {
                         label: "船名",
-                        prop: "vesselEnName",
+                        prop: "vesselCnName",
                         width: "100",
                         overHidden: true,
+                        search: true,
+                        searchValue: this.form.vesselCnName,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
                     },
                     {
                         label: "航次",
                         prop: "voyageNo",
                         width: "100",
                         overHidden: true,
+                        search: true,
+                        searchValue: this.form.voyageNo,
                     },
                     {
                         label: "箱型箱量",
@@ -446,6 +459,8 @@ export default {
                     dc: this.form.dc,
                     businessDateStart: this.form.businessDateStart,
                     businessDateEnd: this.form.businessDateEnd,
+                    voyageNo: this.form.voyageNo,
+                    vesselCnName: this.form.vesselCnName,
                 }
             }, 200);
             setTimeout(() => {

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

@@ -573,10 +573,11 @@
                                     <span slot="label">
                                         <span style="color: #1e9fff">毛重(KGS)</span>
                                     </span>
-                                    <el-input ref="grossWeightRef" step="0.01" style="width: 100%;"
+                                    <el-input ref="grossWeightRef" step="0.001" style="width: 100%;"
                                         v-model="assemblyForm.grossWeight" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled" @input="floatingInput($event, 'grossWeight')"
-                                        @focus="quantityFocus" clearable placeholder="请输入毛重"></el-input>
+                                        @focus="quantityFocus" clearable placeholder="请输入毛重"
+                                        @change="grossWeightChange"></el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -998,16 +999,16 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">订舱代理</span>
                                 </span>
-                                  <search-query :datalist="bookingAgentData"
-                                        :selectValue="assemblyForm.bookingAgentCnName" :filterable="true"
-                                        :clearable="true" :remote="true"
-                                        :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
-                                        :buttonIf="false" placeholder="请选择订舱代理"
-                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                        @remoteMethod="remoteMethod($event, 'bookingAgent')"
-                                        @corpChange="corpChange($event, 'bookingAgent')"
-                                        @corpFocus="remoteMethod($event, 'bookingAgent')">
-                                    </search-query>
+                                <search-query :datalist="bookingAgentData"
+                                    :selectValue="assemblyForm.bookingAgentCnName" :filterable="true" :clearable="true"
+                                    :remote="true"
+                                    :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                    :buttonIf="false" placeholder="请选择订舱代理"
+                                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                    @remoteMethod="remoteMethod($event, 'bookingAgent')"
+                                    @corpChange="corpChange($event, 'bookingAgent')"
+                                    @corpFocus="remoteMethod($event, 'bookingAgent')">
+                                </search-query>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -1649,6 +1650,13 @@ export default {
         floatingInput(value, name) {
             this.$set(this.assemblyForm, name, regularFloating(value))
         },
+        grossWeightChange(value) {
+            if (isNaN(Number(value))) {
+                this.$set(this.assemblyForm, 'grossWeight', 0)
+            } else {
+                this.$set(this.assemblyForm, 'grossWeight', Number(value).toFixed(3))
+            }
+        },
         // 详情接口
         billsDetailfun() {
             this.$emit('billsDetailfun')
@@ -1932,10 +1940,10 @@ export default {
                     this.$set(this.assemblyForm, 'carrierEnName', '')
                     this.$set(this.assemblyForm, 'carrierCode', '')
                     this.$set(this.assemblyForm, 'carrierArgreementNo', '')
-                        this.$set(this.assemblyForm, 'bookingAgentId', '')
-                        this.$set(this.assemblyForm, 'bookingAgentEnName', '')
-                        this.$set(this.assemblyForm, 'bookingAgentCnName', '')
-                        this.$set(this.assemblyForm, 'bookingRemarks', '')
+                    this.$set(this.assemblyForm, 'bookingAgentId', '')
+                    this.$set(this.assemblyForm, 'bookingAgentEnName', '')
+                    this.$set(this.assemblyForm, 'bookingAgentCnName', '')
+                    this.$set(this.assemblyForm, 'bookingRemarks', '')
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {

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

@@ -371,6 +371,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "内部放箱号",
+                        prop: "internalContainerNumber",
+                        width: 100,
+                        overHidden: true,
+                    },
+                    {
                         label: "放箱号类型",
                         prop: "busType",
                         width: 100,