浏览代码

货代bug 2024-1-23

caojunjie 1 年之前
父节点
当前提交
94ca6bf7d9

+ 209 - 156
src/views/iosBasicData/AirtransportExport/bills/assembly/EntrustmentLnformation.vue

@@ -305,166 +305,178 @@
 
                     </el-col>
                     <el-col :span="12">
-                        <el-col :span="8">
-                            <el-form-item label="长度" prop="length" label-width="50px"
-                                          :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">长度</span>
-                                </span>
-                                <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.length"
-                                                 size="small" autocomplete="off" min="1"
-                                                 :disabled="detailData.seeDisabled" :controls="false"
-                                                 @focus="quantityFocus"
-                                                 clearable placeholder="长度" ></el-input-number>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="宽度" prop="width" label-width="50px"
-                                          :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">宽度</span>
-                                </span>
-                                <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.width"
-                                                 size="small" autocomplete="off" min="1"
-                                                 :disabled="detailData.seeDisabled" :controls="false"
-                                                 @focus="quantityFocus"
-                                                 clearable placeholder="宽度" ></el-input-number>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="高度" prop="height" label-width="50px"
-                                          :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="长度" prop="length" label-width="50px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
+                                    <span slot="label">
+                                        <span style="color: #1e9fff">长度</span>
+                                    </span>
+                                    <el-input style="width: 100%;" v-model="assemblyForm.length"
+                                              size="small" autocomplete="off"
+                                              :disabled="detailData.seeDisabled" :controls="false"
+                                              @input="floatingInput($event,'length')"
+                                              clearable placeholder="长度" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="宽度" prop="width" label-width="50px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">宽度</span>
                                 </span>
-                                <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.height"
-                                                 size="small" autocomplete="off" min="1"
-                                                 :disabled="detailData.seeDisabled" :controls="false"
-                                                 @focus="quantityFocus"
-                                                 clearable placeholder="宽度" ></el-input-number>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="件数" prop="quantity" label-width="50px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                    <el-input style="width: 100%;" v-model="assemblyForm.width"
+                                              size="small" autocomplete="off"
+                                              :disabled="detailData.seeDisabled" :controls="false"
+                                              @input="floatingInput($event,'width')"
+                                              clearable placeholder="宽度" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="高度" prop="height" label-width="50px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
+                                    <span slot="label">
+                                        <span style="color: #1e9fff">宽度</span>
+                                    </span>
+                                    <el-input style="width: 100%;" v-model="assemblyForm.height"
+                                              size="small" autocomplete="off"
+                                              :disabled="detailData.seeDisabled" :controls="false"
+                                              @input="floatingInput($event,'height')"
+                                              clearable placeholder="宽度" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="件数" prop="quantity" label-width="50px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">件数</span>
                                 </span>
-                                <el-input ref="quantityRef" type="number" style="width: 100%;" v-model="assemblyForm.quantity"
-                                          size="small" autocomplete="off" min="1"
-                                          :disabled="detailData.seeDisabled" @input="quantityInput"
-                                          @focus="quantityFocus"
-                                          clearable placeholder="件数" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="包装" prop="packingUnit" label-width="50px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]"  >
+                                    <el-input ref="quantityRef" style="width: 100%;" v-model="assemblyForm.quantity"
+                                              size="small" autocomplete="off" min="1"
+                                              :disabled="detailData.seeDisabled" @input="quantityInput"
+                                              @focus="quantityFocus"
+                                              clearable placeholder="件数" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="包装" prop="packingUnit" label-width="50px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]"  >
                                 <span slot="label">
                                     <span style="color: #1e9fff">包装</span>
                                 </span>
-                                <search-query :datalist="packingUnitData"
-                                              style="margin-right: -10px;"
-                                              :selectValue="assemblyForm.packingUnit"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled || generateBillsfalse"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'packingUnit')"
-                                              @corpChange="corpChange($event,'packingUnit')"
-                                              @corpFocus="remoteMethod($event,'packingUnit')" >
-                                </search-query>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="90px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                    <search-query :datalist="packingUnitData"
+                                                  style="margin-right: -10px;"
+                                                  :selectValue="assemblyForm.packingUnit"
+                                                  :filterable="true"
+                                                  :clearable="true"
+                                                  :remote="true"
+                                                  :disabled="detailData.seeDisabled || generateBillsfalse"
+                                                  :buttonIf="false"
+                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @remoteMethod="remoteMethod($event,'packingUnit')"
+                                                  @corpChange="corpChange($event,'packingUnit')"
+                                                  @corpFocus="remoteMethod($event,'packingUnit')" >
+                                    </search-query>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="90px"
+                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">毛重(KGS)</span>
                                 </span>
-                                <el-input type="number" step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请选择毛重" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="尺码(CBM)" prop="measurement" label-width="90px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                    <el-input style="width: 100%;" v-model="assemblyForm.grossWeight"
+                                              size="small" autocomplete="off"
+                                              :disabled="detailData.seeDisabled"
+                                              @input="floatingInput($event,'grossWeight')"
+                                              clearable placeholder="请选择毛重" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="尺码(CBM)" prop="measurement" label-width="90px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">尺码(CBM)</span>
                                 </span>
-                                <el-input type="number" step="0.01" style="width: 100%;"
-                                          v-model="assemblyForm.measurement"
-                                          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="goodsValue" label-width="70px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                    <el-input style="width: 100%;"
+                                              v-model="assemblyForm.measurement"
+                                              size="small" autocomplete="off"
+                                              :disabled="detailData.seeDisabled"
+                                              @input="floatingInput($event,'measurement')"
+                                              clearable placeholder="请选择尺码/体积" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="货物价值" prop="goodsValue" label-width="70px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">货物价值</span>
                                 </span>
-                                <el-input type="number" step="0.01" style="width: 100%;"
-                                          v-model="assemblyForm.goodsValue"
-                                          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="billingWeight" label-width="70px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                    <el-input style="width: 100%;"
+                                              v-model="assemblyForm.goodsValue"
+                                              size="small" autocomplete="off"
+                                              :disabled="detailData.seeDisabled"
+                                              @input="floatingInput($event,'goodsValue')"
+                                              clearable placeholder="请输入货物价值" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="计费重量" prop="billingWeight" label-width="70px"
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
-                                    <span style="color: #1e9fff">计费重</span>
+                                    <span style="color: #1e9fff">计费重</span>
                                 </span>
-                                <el-input type="number" step="0.01" style="width: 100%;"
-                                          v-model="assemblyForm.billingWeight"
-                                          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="unit" label-width="70px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                    <el-input style="width: 100%;"
+                                              v-model="assemblyForm.billingWeight"
+                                              size="small" autocomplete="off"
+                                              :disabled="detailData.seeDisabled"
+                                              @input="floatingInput($event,'billingWeight')"
+                                              clearable placeholder="请输入计费重里" ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="计量单位" prop="unit" label-width="70px"
+                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">计量单位</span>
                                 </span>
-                                <search-query :datalist="unitData"
-                                              :selectValue="assemblyForm.unit"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
-                                              @corpFocus="getBunitsPagefun"
-                                              @corpChange="corpChange($event,'unit')">
-                                </search-query>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="运价等级" prop="freightRateGrade" label-width="70px"
-                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                    <search-query :datalist="unitData"
+                                                  :selectValue="assemblyForm.unit"
+                                                  :filterable="true"
+                                                  :clearable="true"
+                                                  :remote="true"
+                                                  :buttonIf="false"
+                                                  :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
+                                                  @corpFocus="getBunitsListfun"
+                                                  @remoteMethod="getBunitsListfun"
+                                                  @corpChange="corpChange($event,'unit')">
+                                    </search-query>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="运价等级" prop="freightRateGrade" label-width="70px" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">运价等级</span>
                                 </span>
-                                <search-query :datalist="freightRateGradeData"
-                                              :selectValue="assemblyForm.freightRateGrade"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
-                                              @corpFocus="getBunitsPagefun"
-                                              @corpChange="corpChange($event,'freightRateGrade')">
-                                </search-query>
-                            </el-form-item>
-                        </el-col>
+                                    <search-query :datalist="freightRateGradeData"
+                                                  :selectValue="assemblyForm.freightRateGrade"
+                                                  :clearable="true"
+                                                  :buttonIf="false"
+                                                  :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                                                  @corpFocus="freightRateGradeWorkDictsfun"
+                                                  @corpChange="corpChange($event,'freightRateGrade')">
+                                    </search-query>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
                         <el-form-item label="件数描述" prop="bookingRemarks" label-width="70px" >
                             <span slot="label">
                                 <span style="color: #1e9fff">件数描述</span>
@@ -529,16 +541,13 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">主运单类型</span>
                                 </span>
-                                <search-query :datalist="cargoTypeData"
+                                <search-query :datalist="waybillTypeData"
                                               :selectValue="assemblyForm.waybillType"
-                                              :filterable="true"
                                               :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
                                               :buttonIf="false"
-                                              @remoteMethod="remoteMethod($event,'waybillType')"
-                                              @corpChange="corpChange($event,'waybillType')"
-                                              @corpFocus="remoteMethod($event,'waybillType')" >
+                                              :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                                              @corpFocus="waybillTypeWorkDictsfun"
+                                              @corpChange="corpChange($event,'waybillType')">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -547,16 +556,17 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">主运单提供者</span>
                                 </span>
-                                <search-query :datalist="cargoTypeData"
+                                <search-query :datalist="waybillCnNameData"
                                               :selectValue="assemblyForm.waybillCnName"
                                               :filterable="true"
                                               :clearable="true"
                                               :remote="true"
                                               :disabled="detailData.seeDisabled"
                                               :buttonIf="false"
-                                              @remoteMethod="remoteMethod($event,'waybillCnName')"
+                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                              @remoteMethod="waybillCnNameBcorpsListfun"
                                               @corpChange="corpChange($event,'waybillCnName')"
-                                              @corpFocus="remoteMethod($event,'waybillCnName')" >
+                                              @corpFocus="waybillCnNameBcorpsListfun" >
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -720,6 +730,8 @@ import {textareaWrap} from "@/util/messageReminder";
 import emailhash from '@/views/iosBasicData/AirtransportExport/bills/assembly/Jsonfile/emailhash.json'
 import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import {NdayDate} from "@/util/date";
+import {getBunitsList} from "@/api/iosBasicData/bunits";
+import {getWorkDicts} from "@/api/system/dictbiz";
 
     export default {
         props:{
@@ -750,10 +762,12 @@ import {NdayDate} from "@/util/date";
                         return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
                     }
                 },
+                unitData:[], // 计量单位
+                freightRateGradeData:[], // 运价等级数据
+                waybillTypeData:[], // 主运单类型
+                waybillCnNameData:[], // 主运单提供者
                 // 下面的多选
-                comprehensiveForm:{
-                    random:'', // 是否随机
-                },
+                comprehensiveForm:{},
                 emailhash:emailhash, // 邮箱跳转地址
                 // 多选的数据
                 tabsMultipleChoice:[],
@@ -815,20 +829,24 @@ import {NdayDate} from "@/util/date";
         methods:{
             // 件数聚焦
             quantityFocus(){
-                if (Number(this.assemblyForm.quantity) != Number(this.assemblyForm.waitingBoxList[0].editQuantity)) {
-                    this.$alert('当前数据已经均分箱量,请撤销之后再修改', '提示', {
-                        confirmButtonText: '确定',
-                    });
-                    this.$nextTick(() => {
-                        this.$refs.quantityRef.blur()
-                    })
-                    return
-                }
+                // if (Number(this.assemblyForm.quantity) != Number(this.assemblyForm.waitingBoxList[0].editQuantity)) {
+                //     this.$alert('当前数据已经均分箱量,请撤销之后再修改', '提示', {
+                //         confirmButtonText: '确定',
+                //     });
+                //     this.$nextTick(() => {
+                //         this.$refs.quantityRef.blur()
+                //     })
+                //     return
+                // }
             },
             // 件数监听
             quantityInput(value){
                 this.$set(this.assemblyForm,'quantity',value.replace(/^0+(\d)|[^\d]+/g,''))
             },
+            // 正浮点数正则监听
+            floatingInput(value,name){
+                this.$set(this.assemblyForm,name,regularFloating(value))
+            },
             // 详情接口
             billsDetailfun(){
                 this.$emit('billsDetailfun')
@@ -999,10 +1017,26 @@ import {NdayDate} from "@/util/date";
                         this.DangerousGoodsAdd()
                     }
                 }
+                // 主运单提供者
+                else if (name == 'waybillCnName') {
+                    for(let item of this.waybillCnNameData) {
+                        if (item.cnName == value) {
+                            this.$set(this.assemblyForm,'waybillId',item.id)
+                            this.$set(this.assemblyForm,'waybillCnName',item.cnName)
+                            this.$set(this.assemblyForm,'waybillEnName',item.enName)
+                        }
+                    }
+                }
                 else {
                     this.$set(this.assemblyForm,name,value)
                 }
             },
+            // 获取计算属性数据
+            getBunitsListfun(code){
+                getBunitsList(1,10,{code:code?code:null}).then(res=>{
+                    this.unitData = res.data.data.records
+                })
+            },
             // 危险品弹窗开启
             DangerousGoodsAdd(){
                 if (this.assemblyForm.cargoType == 'danger'){
@@ -1245,6 +1279,25 @@ import {NdayDate} from "@/util/date";
                     this.lineData = res.data.data.records
                 })
             },
+            // 运价数据字典
+            freightRateGradeWorkDictsfun(){
+                getWorkDicts("rate_class_los").then(res => {
+                    this.freightRateGradeData = res.data.data;
+                })
+            },
+            // 主运单类型
+            waybillTypeWorkDictsfun(){
+                getWorkDicts("main_waybill_type").then(res => {
+                    this.waybillTypeData = res.data.data;
+                })
+            },
+            // 获取主运单提供人数据 往来单位数据
+            waybillCnNameBcorpsListfun(cnName){
+                getBcorpslistByType(1,10,{cnName}).then(res=>{
+                    this.waybillCnNameData = res.data.data.records
+                })
+            },
+
 
         }
 

+ 102 - 25
src/views/iosBasicData/AirtransportExport/bills/assembly/mbinformation.vue

@@ -15,7 +15,7 @@
                 </el-col>
                 <el-col :span="6">
                     <el-form-item label="航班日期" prop="etd" label-width="90px"
-                                  :rules="[{required: true,message: '',trigger: 'blur' }]">
+                                  :rules="[{required: true,message: ' ',trigger: 'blur' }]">
                             <span slot="label">
                                 <span style="color: #1e9fff">航班日期</span>
                             </span>
@@ -71,10 +71,10 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierArgreementNo"
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierEnName"
                                   size="small" autocomplete="off"
                                   :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请选择船司约号" ></el-input>
+                                  clearable placeholder="航空公司英文" ></el-input>
                     </el-col>
                 </el-col>
                 <el-col :span="6">
@@ -91,11 +91,11 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="送货时间(参数不知道)" prop="bookingDate" >
+                    <el-form-item label="送货时间" prop="deliverGoodsDate" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">送货时间</span>
                                 </span>
-                        <el-date-picker style="width: 100%;" v-model="assemblyForm.bookingDate"
+                        <el-date-picker style="width: 100%;" v-model="assemblyForm.deliverGoodsDate"
                                         clearable type="date" size="small"
                                         :disabled="detailData.seeDisabled"
                                         value-format="yyyy-MM-dd HH:mm:ss"
@@ -306,10 +306,6 @@
                                 <span slot="label">
                                     <span style="color: #1e9fff">联系人</span>
                                 </span>
-                            <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.cyContacts"-->
-                            <!--          size="small" autocomplete="off"-->
-                            <!--          :disabled="detailData.seeDisabled || generateBillsfalse"-->
-                            <!--          clearable placeholder="请输入联系人" ></el-input>-->
                             <search-query :datalist="cyContactsData"
                                           :selectValue="assemblyForm.cyContacts"
                                           :filterable="true"
@@ -373,10 +369,6 @@
                                           @corpChange="corpChange($event,'hpayplace')"
                                           @corpFocus="remoteMethod($event,'hpayplace')" >
                             </search-query>
-                            <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.hpayplace"-->
-                            <!--          size="small" autocomplete="off"-->
-                            <!--          :disabled="detailData.seeDisabled"-->
-                            <!--          clearable placeholder="请输入HB/L付款地点" ></el-input>-->
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -441,10 +433,19 @@
                         <span slot="label">
                             <span style="color: #1e9fff">签发地点</span>
                         </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.issueAt"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请输入签发地点" ></el-input>
+                            <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" >
@@ -452,13 +453,14 @@
                     </el-col>
                     <el-col :span="12" >
                         <el-form-item label="提单确认日期" prop="billConfirmDate" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">提单确认日期</span>
-                        </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.issueAt"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请输入提单确认日期" ></el-input>
+                            <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>
 
@@ -474,6 +476,8 @@
     import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
     import {blinesList} from "@/api/iosBasicData/blines";
     import {NdayDate} from "@/util/date";
+    import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
+    import {bportsList} from "@/api/iosBasicData/bports";
 
     export default {
         components: {SearchQuery},
@@ -483,6 +487,9 @@
             },
             detailData:{
                 type:Object,
+            },
+            generateBillsfalse:{
+                type:Boolean
             }
         },
         data(){
@@ -508,6 +515,13 @@
                 // MB/L 第二通知人
                 mnotify2Data:[],
                 cyData:[], // 航站
+                cyContactsData:[], // 航战联系人
+                // HB/L付款地点数据
+                hpayplaceData:[],
+                // MB/L付款地点
+                mpayplaceData:[],
+                // 签单地点
+                issueAtData:[],
 
             }
         },
@@ -518,6 +532,7 @@
             /* 远程模糊查询操作用户 */
             remoteMethod(value,name){
                 let arr = ['mshipper','mconsignee','mnotify','mnotify2']
+                let payplaceArr = ['hpayplace','mpayplace','issueAt']
                 if (name == 'vessel'){
                     this.vesselBvesselsListfun(value)
                 }
@@ -536,6 +551,14 @@
                 else if (name == 'cy') {
                     this.cyBcorpslistByType(value)
                 }
+                // 场站联系人
+                else if (name == 'cyContacts') {
+                    this.cyBcorpsattnListfun()
+                }
+                // HB/L付款状态 MB/L 付款状态
+                else if (payplaceArr.indexOf(name) != -1) {
+                    this[name + 'BportsListfun'](value)
+                }
                 else {}
 
             },
@@ -572,6 +595,34 @@
                         }
                     }
                 }
+                // 航站
+                else if (name == 'cy') {
+                    for(let item of this.cyData) {
+                        if (item.cnName == value) {
+                            this.$set(this.assemblyForm,'cyId',item.id)
+                            this.$set(this.assemblyForm,'cyCode',item.code)
+                            this.$set(this.assemblyForm,'cyCnName',item.cnName)
+                            this.$set(this.assemblyForm,'cyEnName',item.enName)
+                            this.$set(this.assemblyForm,'cyRemarks',item.details) // 客户里的详情信息
+                            // 查询场站联系人
+                            getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
+                                this.$set(this.assemblyForm,'cyTel',res.data.data.records[0].tel)
+                                this.$set(this.assemblyForm,'cyAddress',res.data.data.records[0].addr)
+                                this.$set(this.assemblyForm,'cyContacts',res.data.data.records[0].cname)
+                            })
+                        }
+                    }
+                }
+                // 场站联系人
+                else if (name == 'cyContacts') {
+                    for(let item of this.cyContactsData) {
+                        if (item.cname == value) {
+                            this.$set(this.assemblyForm,'cyTel',item.tel)
+                            this.$set(this.assemblyForm,'cyAddress',item.addr)
+                            this.$set(this.assemblyForm,'cyContacts',item.cname)
+                        }
+                    }
+                }
                 // 航线
                 else if (name == 'line') {
                     for(let item of this[name + 'Data']) {
@@ -598,7 +649,9 @@
                         }
                     }
                 }
-                else {}
+                else {
+                    this.assemblyForm[name] = value
+                }
             },
 
 
@@ -623,6 +676,30 @@
                     this.cyData = res.data.data.records
                 })
             },
+            // 获取场站下的联系人数据
+            cyBcorpsattnListfun(){
+                getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
+                    this.cyContactsData = res.data.data.records
+                })
+            },
+            // HB/L 付款地点
+            hpayplaceBportsListfun(enName){
+                bportsList(1,10,{enName}).then(res=>{
+                    this.hpayplaceData = res.data.data.records
+                })
+            },
+            // MB/L 付款地点
+            mpayplaceBportsListfun(enName){
+                bportsList(1,10,{enName}).then(res=>{
+                    this.mpayplaceData = res.data.data.records
+                })
+            },
+            // 签单地点
+            issueAtBportsListfun(enName){
+                bportsList(1,10,{enName}).then(res=>{
+                    this.issueAtData = res.data.data.records
+                })
+            },
 
             // 获取航线数据
             lineblinesListfun(cnName){

+ 4 - 2
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -205,7 +205,10 @@
                                     </entrustment-lnformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="MB/L信息" name="third">
-                                    <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
+                                    <mbinformation :assemblyForm="form"
+                                                   :generateBillsfalse="generateBillsfalse"
+                                                   :detailData="detailData">
+                                    </mbinformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="报表管理" name="fourth">
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="KYCK"></reports>
@@ -726,7 +729,6 @@ import {
             userGetListfun(account = undefined,type = false,){
                 userGetList(1,10,{account}).then(res=>{
                     this.columnforfun('operatorName').dicData = res.data.data.records
-
                 })
             },
             // 获取付款方式字典数据

+ 2 - 2
src/views/iosBasicData/ComputationCenter/index.vue

@@ -48,7 +48,7 @@
                     </el-button>
                     <el-button v-if="tabsValue == '业务单据'"
                                type="danger" size="small" plain
-                               @click="handleDelete()">批量删除
+                               @click="handleDelete()">一键删除
                     </el-button>
                 </template>
                 <template slot="menu" slot-scope="{row}">
@@ -363,7 +363,7 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                 this.onLoad(this.page, params);
                 done();
             },
-            // 批量删除
+            // 一键删除
             handleDelete(){
                 if (this.selectionList.length === 0) {
                     this.$message.warning("请选择至少一条数据");

+ 24 - 18
src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -38,7 +38,7 @@
                                     <search-query :datalist="corpData"
                                                   :selectValue="form.corpCnName"
                                                   :clearable="true"
-                                                  :disabled="editSave || tableData.length != 0"
+                                                  :disabled="editSave || tableData.length != 0 || tableData.length > 0"
                                                   :filterable="true"
                                                   :remote="true"
                                                   :buttonIf="false"
@@ -77,7 +77,7 @@
                                     <el-date-picker v-model="form.businessDateStart" clearable
                                                     style="width: 100%;"
                                                     type="date" size="small"
-                                                    :disabled="editSave"
+                                                    :disabled="editSave || tableData.length > 0"
                                                     format="yyyy-MM-dd"
                                                     value-format="yyyy-MM-dd"
                                                     placeholder="选择业务开始日期">
@@ -89,7 +89,7 @@
                                     <el-date-picker v-model="form.businessDateEnd" clearable
                                                     style="width: 100%;"
                                                     type="date" size="small"
-                                                    :disabled="editSave"
+                                                    :disabled="editSave || tableData.length > 0"
                                                     format="yyyy-MM-dd"
                                                     value-format="yyyy-MM-dd"
                                                     placeholder="选择业务结束日期">
@@ -104,7 +104,7 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :buttonIf="false"
-                                                  :disabled="editSave"
+                                                  :disabled="editSave || tableData.length > 0"
                                                   placeholder="请选择方向"
                                                   @corpChange="corpChange($event,'dc')">
                                     </search-query>
@@ -115,7 +115,7 @@
                                     <search-query :datalist="curCodeData"
                                                   :selectValue="form.curCode"
                                                   :clearable="true"
-                                                  :disabled="editSave"
+                                                  :disabled="editSave || tableData.length > 0"
                                                   :buttonIf="false"
                                                   :filterable="true"
                                                   :remote="true"
@@ -130,7 +130,7 @@
                                 <el-form-item label="业务编号" prop="businessNo">
                                     <el-input style="width: 100%;" v-model="form.businessNo"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="editSave || tableData.length > 0"
                                               clearable placeholder="请输入JOB NO" >
                                     </el-input>
                                 </el-form-item>
@@ -139,7 +139,7 @@
                                 <el-form-item label="ACCT NO" prop="accountNo">
                                     <el-input style="width: 100%;" v-model="form.accountNo"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="editSave || tableData.length > 0"
                                               clearable placeholder="请输入ACCT NO" >
                                     </el-input>
                                 </el-form-item>
@@ -148,7 +148,7 @@
                                 <el-form-item label="MBL NO" prop="mblno">
                                     <el-input style="width: 100%;" v-model="form.mblno"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="editSave || tableData.length > 0"
                                               clearable placeholder="请输入MBL NO" >
                                     </el-input>
                                 </el-form-item>
@@ -157,7 +157,7 @@
                                 <el-form-item label="HBL NO" prop="hblno">
                                     <el-input style="width: 100%;" v-model="form.hblno"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="editSave || tableData.length > 0"
                                               clearable placeholder="请输入HBL NO" >
                                     </el-input>
                                 </el-form-item>
@@ -166,7 +166,7 @@
                                 <el-form-item label="对账单号" prop="checkNo">
                                     <el-input style="width: 100%;" v-model="form.checkNo"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="editSave || tableData.length > 0"
                                               clearable placeholder="请输入CHK NO" >
                                     </el-input>
                                 </el-form-item>
@@ -176,7 +176,7 @@
                                     <search-query :datalist="businessTypesData"
                                                   :selectValue="form.businessTypes"
                                                   :clearable="true"
-                                                  :disabled="editSave"
+                                                  :disabled="editSave || tableData.length > 0"
                                                   :buttonIf="false"
                                                   :multiple="true"
                                                   @corpChange="corpChange($event,'businessTypes')">
@@ -187,7 +187,7 @@
                                 <el-form-item label="船 名" prop="vesselCnName" >
                                     <el-input style="width: 100%;" v-model="form.vesselCnName"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="editSave || tableData.length > 0"
                                               clearable placeholder="请选择船名" ></el-input>
                                 </el-form-item>
                             </el-col>
@@ -199,7 +199,7 @@
                                     <el-form-item label="航 次" prop="voyageNo" >
                                         <el-input style="width: 100%;" v-model="form.voyageNo"
                                                   size="small" autocomplete="off"
-                                                  :disabled="editSave"
+                                                  :disabled="editSave || tableData.length > 0"
                                                   clearable placeholder="请选择航次" ></el-input>
                                     </el-form-item>
                                 </el-col>
@@ -209,9 +209,9 @@
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                                    <el-button  size="small" type="" style="margin-right: 8px" :disabled="settlementdistar || editSave"
-                                                :loading="saveLoading" @click="ResetFilter">重置条件
-                                    </el-button>
+                                    <!--<el-button  size="small" type="" style="margin-right: 8px" :disabled="settlementdistar || editSave"-->
+                                    <!--            :loading="saveLoading" @click="ResetFilter">重置条件-->
+                                    <!--</el-button>-->
                                     <el-checkbox v-model="appendType" :disabled="settlementdistar || editSave" false-label="检索" true-label="追加">追加</el-checkbox>
                                     <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="settlementdistar || editSave"
                                                 :loading="saveLoading" @click="finstlbillslistAccBillV1fun(appendType)" >检 索
@@ -230,7 +230,7 @@
                                 :loading="saveLoading" @click="SelectedRows">确认选定行
                     </el-button>
                     <el-button  size="small" type="danger" style="margin-left: 10px" :disabled="editSave"
-                                :loading="saveLoading" @click="batchDeletefun" >批量删除
+                                :loading="saveLoading" @click="batchDeletefun" >一键删除
                     </el-button>
                     <el-input style="width: 10%;margin-left: 10px;" v-model="invoiceAmountCNY"
                               size="small" autocomplete="off" type="numbers"
@@ -506,7 +506,7 @@ export default {
             }
 
         },
-        // 批量删除
+        // 一键删除
         batchDeletefun(){
             if (this.handleSelectionData.length == 0) {
                 return this.$message.warning('请选择要删除的数据')
@@ -815,6 +815,9 @@ export default {
                                 this.$message.success('操作成功')
                             })
                         }
+                        if(arr.length == 0){
+                            this.$message.warning('当前检索暂无数据!')
+                        }
                         this.tableData = arr
                     }
                 })
@@ -886,6 +889,9 @@ export default {
                                 this.$message.success('操作成功')
                             })
                         }
+                        if(arr.length == 0){
+                            this.$message.warning('当前检索暂无数据!')
+                        }
                         this.tableData = arr
                     }
 

+ 2 - 2
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -608,8 +608,8 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                         value:'voyageNo',
                     },
                     {
-                        name:'ETD',
-                        value:'etd',
+                        name:'ETA',
+                        value:'eta',
                     },
                     {
                         name:'装货港',

+ 5 - 5
src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -261,9 +261,9 @@
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                                    <el-button  size="small" type="" style="margin-right: 8px" :disabled="editSave"
-                                                :loading="saveLoading" @click="ResetFilter">重置条件
-                                    </el-button>
+                                    <!--<el-button  size="small" type="" style="margin-right: 8px" :disabled="editSave"-->
+                                    <!--            :loading="saveLoading" @click="ResetFilter">重置条件-->
+                                    <!--</el-button>-->
                                     <el-checkbox v-model="appendType" :disabled="editSave"
                                                  false-label="检索" true-label="追加">追加</el-checkbox>
                                     <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="editSave"
@@ -838,7 +838,7 @@
                                 })
                             }
                             if(arr.length == 0){
-                                return this.$message.warning('检索暂无数据!')
+                                this.$message.warning('当前检索暂无数据!')
                             }
                             this.tableData = arr
                         }
@@ -901,7 +901,7 @@
                                 })
                             }
                             if(arr.length == 0){
-                                return this.$message.warning('检索暂无数据!')
+                                this.$message.warning('当前检索暂无数据!')
                             }
                             this.tableData = arr
                         }

+ 2 - 2
src/views/iosBasicData/PaymentApplication/index.vue

@@ -37,7 +37,7 @@
                              size="small"
                              icon="el-icon-delete"
                              plain
-                             @click="handleDelete">删 
+                             @click="handleDelete">一键删除
                   </el-button>
               </template>
               <template slot="menu" slot-scope="{row}">
@@ -47,7 +47,7 @@
                   </el-button>
                   <el-button type="text"
                              size="small"
-                             :disabled="row.status == 1"
+                             :disabled="row.status == 1 || row.status == 3"
                              @click="rowDel(row)">删除
                   </el-button>
               </template>

+ 10 - 4
src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -483,7 +483,7 @@
                                 </search-query>
                                 <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoicingfun" >生成开票明细</el-button>
                                 <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="warning" @click="invoicingRevokefun" >撤销开票明细</el-button>
-                                <el-button size="small" :disabled="editSave" type="danger" @click="batchDeletefun" >批量删除</el-button>
+                                <el-button size="small" :disabled="editSave" type="danger" @click="batchDeletefun" >一键删除</el-button>
 
                                 <el-input style="width: 10%;margin-left: 10px;" v-model="invoiceAmountCNY"
                                           size="small" autocomplete="off" type="numbers"
@@ -506,7 +506,7 @@
                         </el-tab-pane>
                         <el-tab-pane label="开票明细" name="second">
                             <div style="margin-bottom: 10px;display: flex;">
-                                <el-button size="small" :disabled="editSave" type="danger" @click="invoicingBatchDelete" >批量删除</el-button>
+                                <el-button size="small" :disabled="editSave" type="danger" @click="invoicingBatchDelete" >一键删除</el-button>
                             </div>
                             <fininvoiceitemdetail :tableData="InvoicingList"
                                                   :handleSelectionData="invoicingCheckboxData"
@@ -824,7 +824,7 @@ export default {
 
 
         },
-        // 费用明细批量删除
+        // 费用明细一键删除
         batchDeletefun(){
             if (this.handleSelectionData.length == 0) {
                 return this.$message.warning('请选择要删除的数据')
@@ -868,7 +868,7 @@ export default {
                 this.tableData.splice(index,1)
             })
         },
-        // 开票批量删除
+        // 开票一键删除
         invoicingBatchDelete(){
             if (this.invoicingCheckboxData.length == 0) {
                 return this.$message.warning('请选择要删除的数据')
@@ -1099,6 +1099,9 @@ export default {
                                 this.$message.success('操作成功')
                             })
                         }
+                        if (arr.length == 0) {
+                            this.$message.warning('当前检索暂无数据!')
+                        }
                         this.tableData = arr
                     }
                 })
@@ -1140,6 +1143,9 @@ export default {
                                 this.$message.success('操作成功')
                             })
                         }
+                        if (arr.length == 0) {
+                            this.$message.warning('当前检索暂无数据!')
+                        }
                         this.tableData = arr
                     }
 

+ 1 - 1
src/views/iosBasicData/fininvoices/index.vue

@@ -34,7 +34,7 @@
                              size="small"
                              icon="el-icon-delete"
                              plain
-                             @click="handleDelete">删 
+                             @click="handleDelete">一键删除
                   </el-button>
               </template>
               <template slot="menu" slot-scope="{row}">

+ 10 - 4
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -471,7 +471,7 @@
                                 </search-query>
                                 <el-button style="margin-left: 10px" :disabled="!form.id || statusType" size="small" type="primary" @click="invoicingfun" >生成开票明细</el-button>
                                 <el-button style="margin-left: 10px" :disabled="!form.id || statusType" size="small" type="warning" @click="invoicingRevokefun" >撤销开票明细</el-button>
-                                <el-button size="small" :disabled="!form.id || statusType" type="danger" @click="batchDeletefun" >批量删除</el-button>
+                                <el-button size="small" :disabled="!form.id || statusType" type="danger" @click="batchDeletefun" >一键删除</el-button>
 
                                 <el-input style="width: 10%;margin-left: 10px;" v-model="invoiceAmountCNY"
                                           size="small" autocomplete="off" type="numbers"
@@ -495,7 +495,7 @@
                         </el-tab-pane>
                         <el-tab-pane label="开票明细" name="second">
                             <div style="margin-bottom: 10px;display: flex;">
-                                <el-button :disabled="statusType" size="small" type="danger" @click="invoicingBatchDelete" >批量删除</el-button>
+                                <el-button :disabled="statusType" size="small" type="danger" @click="invoicingBatchDelete" >一键删除</el-button>
                             </div>
                             <fininvoiceitemdetail :tableData="InvoicingList"
                                                   :handleSelectionData="invoicingCheckboxData"
@@ -828,7 +828,7 @@ export default {
                     this.fininvoicesDetailfun(this.form.id)
                 })
             },
-            // 费用明细批量删除
+            // 费用明细一键删除
             batchDeletefun(){
                 if (this.handleSelectionData.length == 0) {
                     return this.$message.warning('请选择要删除的数据')
@@ -925,7 +925,7 @@ export default {
                     this.tableData.splice(index,1)
                 })
             },
-            // 开票批量删除
+            // 开票一键删除
             invoicingBatchDelete(){
                 if (this.invoicingCheckboxData.length == 0) {
                     return this.$message.warning('请选择要删除的数据')
@@ -1155,6 +1155,9 @@ export default {
                                     this.$message.success('操作成功')
                                 })
                             }
+                            if (arr.length == 0) {
+                                this.$message.warning('当前检索暂无数据!')
+                            }
                             this.tableData = arr
                         }
                     })
@@ -1198,6 +1201,9 @@ export default {
                                     this.$message.success('操作成功')
                                 })
                             }
+                            if (arr.length == 0) {
+                                this.$message.warning('当前检索暂无数据!')
+                            }
                             this.tableData = arr
                         }
 

+ 1 - 1
src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -34,7 +34,7 @@
                              size="small"
                              icon="el-icon-delete"
                              plain
-                             @click="handleDelete">删 
+                             @click="handleDelete">一键删除
                   </el-button>
               </template>
               <template slot="menu" slot-scope="{row}">

+ 8 - 2
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -483,7 +483,7 @@
                                 </search-query>
                                 <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoicingfun" >生成开票明细</el-button>
                                 <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="warning" @click="invoicingRevokefun" >撤销开票明细</el-button>
-                                <el-button size="small" :disabled="editSave" type="danger" @click="batchDeletefun" >批量删除</el-button>
+                                <el-button size="small" :disabled="editSave" type="danger" @click="batchDeletefun" >一键删除</el-button>
 
                                 <el-input style="width: 10%;margin-left: 10px;" v-model="invoiceAmountCNY"
                                           size="small" autocomplete="off" type="numbers"
@@ -506,7 +506,7 @@
                         </el-tab-pane>
                         <el-tab-pane label="开票明细" name="second">
                             <div style="margin-bottom: 10px;display: flex;">
-                                <el-button size="small" :disabled="editSave" type="danger" @click="invoicingBatchDelete" >批量删除</el-button>
+                                <el-button size="small" :disabled="editSave" type="danger" @click="invoicingBatchDelete" >一键删除</el-button>
                             </div>
                             <fininvoiceitemdetail :tableData="InvoicingList"
                                                   :handleSelectionData="invoicingCheckboxData"
@@ -1099,6 +1099,9 @@ export default {
                                 this.$message.success('操作成功')
                             })
                         }
+                        if (arr.length == 0) {
+                            this.$message.warning('当前检索暂无数据!')
+                        }
                         this.tableData = arr
                     }
                 })
@@ -1140,6 +1143,9 @@ export default {
                                 this.$message.success('操作成功')
                             })
                         }
+                        if (arr.length == 0) {
+                            this.$message.warning('当前检索暂无数据!')
+                        }
                         this.tableData = arr
                     }
 

+ 1 - 1
src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -67,7 +67,7 @@
                              size="small"
                              icon="el-icon-delete"
                              plain
-                             @click="handleDelete">删 
+                             @click="handleDelete">一键删除
                   </el-button>
               </template>
               <template slot="menu" slot-scope="{row}">

+ 6 - 3
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -403,9 +403,9 @@
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                                    <el-button  size="small" type="" style="margin-right: 8px" :disabled="editSave"
-                                                :loading="saveLoading" @click="ResetFilter">重置条件
-                                    </el-button>
+                                    <!--<el-button  size="small" type="" style="margin-right: 8px" :disabled="editSave"-->
+                                    <!--            :loading="saveLoading" @click="ResetFilter">重置条件-->
+                                    <!--</el-button>-->
                                     <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="editSave"
                                                 :loading="saveLoading" @click="finstlbillslistAccBillV1fun" >检 索
                                     </el-button>
@@ -939,6 +939,9 @@
                         }
                         return item
                     })
+                    if (this.tableData.length == 0) {
+                        this.$message.warning('当前检索暂无数据!')
+                    }
                 })
             },
             // 确认发票

+ 1 - 1
src/views/iosBasicData/finstlbills/index.vue

@@ -37,7 +37,7 @@
                              size="small"
                              icon="el-icon-delete"
                              plain
-                             @click="handleDelete">删 
+                             @click="handleDelete">一键删除
                   </el-button>
               </template>
               <template slot="menu" slot-scope="{row}">

+ 1 - 0
src/views/iosBasicData/seamends/amendsDetails.vue

@@ -1165,6 +1165,7 @@ export default {
                 hblno: this.form.hblno ? this.form.hblno : null,
                 refno: this.form.refno ? this.form.refno : null,
                 bookingNo: this.form.bookingNo ? this.form.bookingNo : null,
+                businessType:'SE'
             }).then(res => {
                 this.retrievePopupsType = true
                 this.retrievePopupsData = res.data.data

+ 1 - 0
src/views/iosBasicData/siamends/amendsDetails.vue

@@ -1142,6 +1142,7 @@ export default {
                 hblno: this.form.hblno ? this.form.hblno : null,
                 refno: this.form.refno ? this.form.refno : null,
                 bookingNo: this.form.bookingNo ? this.form.bookingNo : null,
+                businessType:'SI'
             }).then(res => {
                 this.retrievePopupsType = true
                 this.retrievePopupsData = res.data.data

+ 1 - 1
src/views/iosBasicData/siamends/assembly/billgenerated.vue

@@ -12,7 +12,7 @@
             :row-style="rowStyle"
             :row-class-name="rowClassName" >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="lineNo" label="行号" width="50px" ></el-table-column>
+            <el-table-column prop="sort" label="行号" width="50px" ></el-table-column>
             <el-table-column label="账单" prop="accStatus" width="60px" >
                 <template slot-scope="{ row }">
                     <span>{{row.accStatus?'是':'否'}}</span>