货代bug 2024-1-26

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

@@ -1043,7 +1043,7 @@
                         value:'mblno',
                     },
                     {
-                        name:'Reference NO',
+                        name:'RET MBLNO',
                         value:'refno',
                     },
                     {

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

@@ -352,118 +352,124 @@
                                       clearable placeholder="请输入HANDLTNG INFORMATION" ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="HB/L付款地点" prop="hpayplace" >
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="HB/L付款地点" prop="hpayplace" >
                         <span slot="label">
                             <span style="color: #1e9fff">HB/L付款地点</span>
                         </span>
-                            <search-query :datalist="hpayplaceData"
-                                          :selectValue="assemblyForm.hpayplace"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                          @remoteMethod="remoteMethod($event,'hpayplace')"
-                                          @corpChange="corpChange($event,'hpayplace')"
-                                          @corpFocus="remoteMethod($event,'hpayplace')" >
-                            </search-query>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="MB/L付款地点" prop="mPayplace" >
+                        <search-query :datalist="hpayplaceData"
+                                      :selectValue="assemblyForm.hpayplace"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="false"
+                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                      @remoteMethod="remoteMethod($event,'hpayplace')"
+                                      @corpChange="corpChange($event,'hpayplace')"
+                                      @corpFocus="remoteMethod($event,'hpayplace')" >
+                        </search-query>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="MB/L付款地点" prop="mPayplace" >
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L付款地点</span>
                         </span>
-                            <search-query :datalist="mpayplaceData"
-                                          :selectValue="assemblyForm.mpayplace"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                          @remoteMethod="remoteMethod($event,'mpayplace')"
-                                          @corpChange="corpChange($event,'mpayplace')"
-                                          @corpFocus="remoteMethod($event,'mpayplace')" >
-                            </search-query>
-                            <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.mPayplace"-->
-                            <!--          size="small" autocomplete="off"-->
-                            <!--          :disabled="detailData.seeDisabled"-->
-                            <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="预付总额" prop="hPayAmount" >
+                        <search-query :datalist="mpayplaceData"
+                                      :selectValue="assemblyForm.mpayplace"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="false"
+                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                      @remoteMethod="remoteMethod($event,'mpayplace')"
+                                      @corpChange="corpChange($event,'mpayplace')"
+                                      @corpFocus="remoteMethod($event,'mpayplace')" >
+                        </search-query>
+                        <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.mPayplace"-->
+                        <!--          size="small" autocomplete="off"-->
+                        <!--          :disabled="detailData.seeDisabled"-->
+                        <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="预付总额" prop="hPayAmount" >
                         <span slot="label">
                             <span style="color: #1e9fff">预付总额</span>
                         </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请输入预付总额" ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="运输条款" prop="serviceTerms" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="请输入预付总额" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="运输条款" prop="serviceTerms" >
                         <span slot="label">
                             <span style="color: #1e9fff">运输条款</span>
                         </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请输入预付总额" ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="签发日期" prop="issueDate" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="请输入预付总额" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="签发日期" prop="issueDate" >
                             <span slot="label">
                                 <span style="color: #1e9fff">签发日期</span>
                             </span>
-                            <el-date-picker v-model="assemblyForm.issueDate" clearable style="width: 100%"
-                                            type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                            value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                            placeholder="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="签发地点" prop="issueAt" >
+                        <el-date-picker v-model="assemblyForm.issueDate" clearable style="width: 100%"
+                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
+                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
+                                        placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="签发地点" prop="issueAt" >
                         <span slot="label">
                             <span style="color: #1e9fff">签发地点</span>
                         </span>
-                            <search-query :datalist="issueAtData"
-                                          :selectValue="assemblyForm.issueAt"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                          @remoteMethod="remoteMethod($event,'issueAt')"
-                                          @corpChange="corpChange($event,'issueAt')"
-                                          @corpFocus="remoteMethod($event,'issueAt')" >
-                            </search-query>
+                        <search-query :datalist="issueAtData"
+                                      :selectValue="assemblyForm.issueAt"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="false"
+                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                      @remoteMethod="remoteMethod($event,'issueAt')"
+                                      @corpChange="corpChange($event,'issueAt')"
+                                      @corpFocus="remoteMethod($event,'issueAt')" >
+                        </search-query>
 
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.billStatus">是否提单确认</el-checkbox>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="提单确认日期" prop="billConfirmDate" >
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="" prop="billConfirmDate" >
+                        <el-checkbox size="medium" :true-label="1" :false-label="0"
+                                     :disabled="detailData.seeDisabled"
+                                     v-model="assemblyForm.billStatus">是否提单确认
+                        </el-checkbox>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="提单确认日期" prop="billConfirmDate" >
                             <span slot="label">
                                 <span style="color: #1e9fff">提单确认日期</span>
                             </span>
-                            <el-date-picker v-model="assemblyForm.billConfirmDate" clearable style="width: 100%"
-                                            type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                            value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                            placeholder="选择日期" >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-
+                        <el-date-picker v-model="assemblyForm.billConfirmDate" clearable style="width: 100%"
+                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
+                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
+                                        placeholder="选择日期" >
+                        </el-date-picker>
+                    </el-form-item>
                 </el-col>
             </el-row>
         </el-form>

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

@@ -243,7 +243,6 @@
                    :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 append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>

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

@@ -604,6 +604,11 @@ import { getDeptTree } from "@/api/system/dept";
                 overHidden:true,
             },
             {
+                label: "所属团队",
+                prop: "teamName",
+                overHidden:true,
+            },
+            {
               label: "客户名",
               prop: "corpCnName",
                 width:"160",

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

@@ -352,118 +352,124 @@
                                       clearable placeholder="请输入HANDLTNG INFORMATION" ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="HB/L付款地点" prop="hpayplace" >
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="HB/L付款地点" prop="hpayplace" >
                         <span slot="label">
                             <span style="color: #1e9fff">HB/L付款地点</span>
                         </span>
-                            <search-query :datalist="hpayplaceData"
-                                          :selectValue="assemblyForm.hpayplace"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                          @remoteMethod="remoteMethod($event,'hpayplace')"
-                                          @corpChange="corpChange($event,'hpayplace')"
-                                          @corpFocus="remoteMethod($event,'hpayplace')" >
-                            </search-query>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="MB/L付款地点" prop="mPayplace" >
+                        <search-query :datalist="hpayplaceData"
+                                      :selectValue="assemblyForm.hpayplace"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="false"
+                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                      @remoteMethod="remoteMethod($event,'hpayplace')"
+                                      @corpChange="corpChange($event,'hpayplace')"
+                                      @corpFocus="remoteMethod($event,'hpayplace')" >
+                        </search-query>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="MB/L付款地点" prop="mPayplace" >
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L付款地点</span>
                         </span>
-                            <search-query :datalist="mpayplaceData"
-                                          :selectValue="assemblyForm.mpayplace"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                          @remoteMethod="remoteMethod($event,'mpayplace')"
-                                          @corpChange="corpChange($event,'mpayplace')"
-                                          @corpFocus="remoteMethod($event,'mpayplace')" >
-                            </search-query>
-                            <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.mPayplace"-->
-                            <!--          size="small" autocomplete="off"-->
-                            <!--          :disabled="detailData.seeDisabled"-->
-                            <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="预付总额" prop="hPayAmount" >
+                        <search-query :datalist="mpayplaceData"
+                                      :selectValue="assemblyForm.mpayplace"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="false"
+                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                      @remoteMethod="remoteMethod($event,'mpayplace')"
+                                      @corpChange="corpChange($event,'mpayplace')"
+                                      @corpFocus="remoteMethod($event,'mpayplace')" >
+                        </search-query>
+                        <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.mPayplace"-->
+                        <!--          size="small" autocomplete="off"-->
+                        <!--          :disabled="detailData.seeDisabled"-->
+                        <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="预付总额" prop="hPayAmount" >
                         <span slot="label">
                             <span style="color: #1e9fff">预付总额</span>
                         </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请输入预付总额" ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="运输条款" prop="serviceTerms" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="请输入预付总额" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="运输条款" prop="serviceTerms" >
                         <span slot="label">
                             <span style="color: #1e9fff">运输条款</span>
                         </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请输入预付总额" ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="签发日期" prop="issueDate" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="请输入预付总额" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="签发日期" prop="issueDate" >
                             <span slot="label">
                                 <span style="color: #1e9fff">签发日期</span>
                             </span>
-                            <el-date-picker v-model="assemblyForm.issueDate" clearable style="width: 100%"
-                                            type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                            value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                            placeholder="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="签发地点" prop="issueAt" >
+                        <el-date-picker v-model="assemblyForm.issueDate" clearable style="width: 100%"
+                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
+                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
+                                        placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="签发地点" prop="issueAt" >
                         <span slot="label">
                             <span style="color: #1e9fff">签发地点</span>
                         </span>
-                            <search-query :datalist="issueAtData"
-                                          :selectValue="assemblyForm.issueAt"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                          @remoteMethod="remoteMethod($event,'issueAt')"
-                                          @corpChange="corpChange($event,'issueAt')"
-                                          @corpFocus="remoteMethod($event,'issueAt')" >
-                            </search-query>
+                        <search-query :datalist="issueAtData"
+                                      :selectValue="assemblyForm.issueAt"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="false"
+                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                      @remoteMethod="remoteMethod($event,'issueAt')"
+                                      @corpChange="corpChange($event,'issueAt')"
+                                      @corpFocus="remoteMethod($event,'issueAt')" >
+                        </search-query>
 
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.billStatus">是否提单确认</el-checkbox>
-                    </el-col>
-                    <el-col :span="12" >
-                        <el-form-item label="提单确认日期" prop="billConfirmDate" >
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="" >
+                        <el-checkbox size="medium" :true-label="1" :false-label="0"
+                                     :disabled="detailData.seeDisabled"
+                                     v-model="assemblyForm.billStatus">是否提单确认
+                        </el-checkbox>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" >
+                    <el-form-item label="提单确认日期" prop="billConfirmDate" >
                             <span slot="label">
                                 <span style="color: #1e9fff">提单确认日期</span>
                             </span>
-                            <el-date-picker v-model="assemblyForm.billConfirmDate" clearable style="width: 100%"
-                                            type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                            value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                            placeholder="选择日期" >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-
+                        <el-date-picker v-model="assemblyForm.billConfirmDate" clearable style="width: 100%"
+                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
+                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
+                                        placeholder="选择日期" >
+                        </el-date-picker>
+                    </el-form-item>
                 </el-col>
             </el-row>
         </el-form>

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

@@ -604,6 +604,11 @@ import { getDeptTree } from "@/api/system/dept";
                 overHidden:true,
             },
             {
+                label: "所属团队",
+                prop: "teamName",
+                overHidden:true,
+            },
+            {
               label: "客户名",
               prop: "corpCnName",
                 width:"160",

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

@@ -608,6 +608,11 @@ import { getDeptTree } from "@/api/system/dept";
                 overHidden:true,
             },
             {
+                label: "所属团队",
+                prop: "teamName",
+                overHidden:true,
+            },
+            {
               label: "客户名",
               prop: "corpCnName",
                 width:"160",

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

@@ -517,6 +517,7 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
+
                 </el-form>
             </div>
         </el-dialog>

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

@@ -608,6 +608,11 @@ import { getDeptTree } from "@/api/system/dept";
                 overHidden:true,
             },
             {
+                label: "所属团队",
+                prop: "teamName",
+                overHidden:true,
+            },
+            {
               label: "客户名",
               prop: "corpCnName",
                 width:"160",

src/views/iosBasicData/aeamends/index.vue

@@ -118,6 +118,11 @@
                   overHidden:true,
               },
               {
+                  label: "所属团队",
+                  prop: "teamName",
+                  overHidden:true,
+              },
+              {
                   label: "原MB/L NO",
                   prop: "mblno",
                   search:true,

src/views/iosBasicData/aiamends/index.vue

@@ -118,6 +118,11 @@
                   overHidden:true,
               },
               {
+                  label: "所属团队",
+                  prop: "teamName",
+                  overHidden:true,
+              },
+              {
                   label: "原MB/L NO",
                   prop: "mblno",
                   search:true,

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -361,6 +361,11 @@ export default {
                             label:'付',
                             value:'C'
                         }],
+                        rules: [{
+                            required: true,
+                            message: "请选择收/付",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "是否公开共享",

src/views/iosBasicData/seamends/index.vue

@@ -118,6 +118,11 @@
                   overHidden:true,
               },
               {
+                  label: "所属团队",
+                  prop: "teamName",
+                  overHidden:true,
+              },
+              {
                   label: "原MB/L NO",
                   prop: "mblno",
                   search:true,

src/views/iosBasicData/siamends/index.vue

@@ -118,6 +118,11 @@
                   overHidden:true,
               },
               {
+                  label: "所属团队",
+                  prop: "teamName",
+                  overHidden:true,
+              },
+              {
                   label: "原MB/L NO",
                   prop: "mblno",
                   search:true,