修改禅道货代的问题

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

@@ -651,10 +651,10 @@ export default {
                     name: 'MBLNO',
                     value: 'mblno',
                 },
-                {
-                    name: 'REF MBLNO',
-                    value: 'refno',
-                },
+                // {
+                //     name: 'REF MBLNO',
+                //     value: 'refno',
+                // },
                 {
                     name: '航班号',
                     value: 'voyageNo',

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

@@ -645,10 +645,10 @@ export default {
                     name: 'MBLNO',
                     value: 'mblno',
                 },
-                {
-                    name: 'REF MBLNO',
-                    value: 'refno',
-                },
+                // {
+                //     name: 'REF MBLNO',
+                //     value: 'refno',
+                // },
                 {
                     name: '航班号',
                     value: 'voyageNo',

src/views/iosBasicData/ComputationCenter/index.vue

@@ -98,7 +98,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 searchLabelWidth: '100',
                 border: true,
                 index: true,
@@ -144,6 +144,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "提单号",
+                        prop: "mblno",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
                         label: "往来单位",
                         prop: "corpCnName",
                         search: true,

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -103,9 +103,15 @@
                 </el-col>
             </el-row>
             <el-form-item label="派车时间:" prop="corpCnName">
-                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%" type="datetime"
+                <!-- <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%" type="datetime"
                     size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择派车时间">
+                </el-date-picker> -->
+                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 160px" type="date"
+                    size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                 </el-date-picker>
+                <el-time-picker v-model="documentForm.dispatchTime2" format="HH:mm:ss" style="width: 140px"
+                    placeholder="请选择时间" size="small">
+                </el-time-picker>
             </el-form-item>
             <el-form-item label="费用确认:" prop="corpCnName">
                 <el-input type="age" style="width: 100%;" v-model="documentForm.costConfirmation" size="small"
@@ -114,13 +120,25 @@
             </el-form-item>
             <div style="display: flex;align-items: center;margin-left: 25px">
                 <span style="width: 60px;text-align: right;">请于</span>
-                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%" type="datetime" size="small"
+                <!-- <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%" type="datetime" size="small"
                     value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+                </el-date-picker> -->
+                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 160px" type="date" size="small"
+                    value-format="yyyy-MM-dd" placeholder="请选择日期">
                 </el-date-picker>
+                <el-time-picker v-model="documentForm.timeOn2" format="HH:mm:ss" style="width:140px" placeholder="请选择时间"
+                    size="small">
+                </el-time-picker>
                 <span>前到达指定工厂,并于</span>
-                <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%" type="datetime" size="small"
+                <!-- <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%" type="datetime" size="small"
                     value-format="yyyy-MM-dd HH:mm:ss"  placeholder="请选择时间">
+                </el-date-picker> -->
+                <el-date-picker v-model="documentForm.endTime" clearable style="width: 160px" type="date" size="small"
+                    value-format="yyyy-MM-dd" placeholder="请选择日期">
                 </el-date-picker>
+                <el-time-picker v-model="documentForm.endTime2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间"
+                    size="small">
+                </el-time-picker>
                 <span>前回场站</span>
             </div>
             <el-form-item label="备注:" prop="remarks">

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -79,25 +79,31 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="请于:" prop="corpCnName">
-                    <el-date-picker v-model="documentForm.goodsTime" clearable style="width: 30%" type="datetime"
-                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+                    <el-date-picker v-model="documentForm.goodsTime" clearable style="width: 160px" type="date"
+                        size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                     </el-date-picker>
+                    <el-time-picker v-model="documentForm.goodsTime2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间" size="small">
+                    </el-time-picker>
                     <span style="margin-left: 10px">前将货物送至指定位置</span>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="请于:" prop="corpCnName">
-                    <el-date-picker v-model="documentForm.clearanceTime" clearable style="width: 30%" type="datetime"
-                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+                    <el-date-picker v-model="documentForm.clearanceTime" clearable style="width: 160px" type="date"
+                        size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                     </el-date-picker>
+                    <el-time-picker v-model="documentForm.clearanceTime2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间" size="small">
+                    </el-time-picker>
                     <span style="margin-left: 10px">前通关</span>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="截单和VGM截止时间:" prop="corpCnName" label-width="130px">
-                    <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 50%" type="datetime"
-                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择截单和VGM截止时间">
+                    <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 160px" type="date"
+                        size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                     </el-date-picker>
+                    <el-time-picker v-model="documentForm.vgmDeadline2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间" size="small">
+                    </el-time-picker>
                 </el-form-item>
             </el-col>
             <el-col :span="24">

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

@@ -671,10 +671,10 @@ export default {
                     name: '航次(VOY)',
                     value: 'voyageNo',
                 },
-                {
-                    name: 'REF MBLNO',
-                    value: 'refno',
-                },
+                // {
+                //     name: 'REF MBLNO',
+                //     value: 'refno',
+                // },
                 {
                     name: 'ETA',
                     value: 'eta',

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -57,11 +57,11 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
-                                <el-form-item label="开户帐号" prop="bankId">
+                                <el-form-item label="开户账号" prop="bankId">
                                     <search-query :datalist="bankData" :selectValue="form.bankId" :clearable="true"
                                         :disabled="editSave || !form.corpId" :filterable="true"
                                         :forParameter="{ key: 'id', label: 'accountBankNo', value: 'id' }" :addIf="true"
-                                        :tableIf="false" placeholder="请选择开户帐号" @addJump="bankJump"
+                                        :tableIf="false" placeholder="请选择开户账号" @addJump="bankJump"
                                         @corpChange="corpChange($event, 'bankId')" @remoteMethod="bcorpsbankListfun"
                                         @corpFocus="bcorpsbankListfun">
                                     </search-query>
@@ -424,7 +424,10 @@ export default {
             saveLoading: false, // 按钮动画
             // 绑定的数据
             form: {
-                dc: 'C'
+                dc: 'C',
+                mblno:null,
+                corpCnName:null,
+                corpId:null
             },
             handleSelectionData: [], // 表格选择的数据
             corpData: [], // 结算单位 数据
@@ -446,9 +449,9 @@ export default {
                 corpCnName: [
                     { required: true, message: '请输入付费对象', trigger: 'blur' },
                 ],
-                bankId: [
-                    { required: true, message: '请输入开户银行', trigger: 'blur' },
-                ],
+                // bankId: [
+                //     { required: true, message: '请输入开户银行', trigger: 'blur' },
+                // ],
                 remarks: [
                     { required: true, message: '请输入付费事由', trigger: 'blur' },
                 ],
@@ -469,6 +472,7 @@ export default {
             // console.log(111111)
             this.form.mblno=this.$route.query.mblno
             this.form.corpCnName=this.$route.query.corpCnName
+            this.form.corpId=this.$route.query.corpId
         }
     },
     methods: {
@@ -705,6 +709,7 @@ export default {
                 this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
                 this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
                 this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + ' 00:00:00' : null
+                this.form.auditDateTo= this.form.auditDateTo ? this.form.auditDateTo.slice(0, 10) + ' 00:00:00' : null
                 this.saveLoading = true // 加载动画
                 this.form.billNoFormat = 'FFSQ'
                 this.form.businessTypeCode = 'FFSQ'
@@ -763,14 +768,14 @@ export default {
                         }).catch(() => {
                             this.saveLoading = false
                         })
-                    }).catch(() => {
-                        this.saveLoading = false
                     })
                 } else {
                     finstlbillsSubmit(this.form).then(res => {
                         this.$message.success('操作成功');
                         this.saveLoading = false // 关闭按钮动画
                         this.finstlbillsDetailfun(res.data.data.id)
+                    }).catch(() => {
+                        this.saveLoading = false
                     })
                 }
             })

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

@@ -2594,7 +2594,8 @@ export default {
                         path: `/iosBasicData/PaymentApplication/index`,
                         query: {
                             mblno: this.assemblyForm.mblno,
-                            corpCnName: this.selectionCList[0].corpCnName
+                            corpCnName: this.selectionCList[0].corpCnName,
+                            corpId: this.selectionCList[0].corpId
                         }
                     })
                 }

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -28,6 +28,7 @@
                         <el-date-picker v-model="documentForm.billDate" clearable style="width: 100%" type="datetime"
                             size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
                         </el-date-picker>
+
                     </el-col>
                 </el-row>
             </el-form-item>
@@ -103,9 +104,15 @@
                 </el-col>
             </el-row>
             <el-form-item label="派车时间:" prop="corpCnName">
-                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%" type="datetime"
+                <!-- <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 100%" type="datetime"
                     size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择派车时间">
+                </el-date-picker> -->
+                <el-date-picker v-model="documentForm.dispatchTime" clearable style="width: 160px" type="date"
+                    size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                 </el-date-picker>
+                <el-time-picker v-model="documentForm.dispatchTime2" format="HH:mm:ss" style="width: 140px"
+                    placeholder="请选择时间" size="small">
+                </el-time-picker>
             </el-form-item>
             <el-form-item label="费用确认:" prop="corpCnName">
                 <el-input type="age" style="width: 100%;" v-model="documentForm.costConfirmation" size="small"
@@ -114,13 +121,25 @@
             </el-form-item>
             <div style="display: flex;align-items: center;margin-left: 25px">
                 <span style="width: 60px;text-align: right;">请于</span>
-                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%" type="datetime" size="small"
+                <!-- <el-date-picker v-model="documentForm.timeOn" clearable style="width: 30%" type="datetime" size="small"
                     value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+                </el-date-picker> -->
+                <el-date-picker v-model="documentForm.timeOn" clearable style="width: 160px" type="date" size="small"
+                    value-format="yyyy-MM-dd" placeholder="请选择日期">
                 </el-date-picker>
+                <el-time-picker v-model="documentForm.timeOn2" format="HH:mm:ss" style="width:140px" placeholder="请选择时间"
+                    size="small">
+                </el-time-picker>
                 <span>前到达指定工厂,并于</span>
-                <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%" type="datetime" size="small"
+                <!-- <el-date-picker v-model="documentForm.endTime" clearable style="width: 30%" type="datetime" size="small"
                     value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+                </el-date-picker> -->
+                <el-date-picker v-model="documentForm.endTime" clearable style="width: 160px" type="date" size="small"
+                    value-format="yyyy-MM-dd" placeholder="请选择日期">
                 </el-date-picker>
+                <el-time-picker v-model="documentForm.endTime2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间"
+                    size="small">
+                </el-time-picker>
                 <span>前回场站</span>
             </div>
             <el-form-item label="备注:" prop="remarks">

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -79,25 +79,34 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="请于:" prop="corpCnName">
-                    <el-date-picker v-model="documentForm.goodsTime" clearable style="width: 30%" type="datetime"
-                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+                    <el-date-picker v-model="documentForm.goodsTime" clearable style="width: 160px" type="date"
+                        size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                     </el-date-picker>
+                    <el-time-picker v-model="documentForm.goodsTime2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间" size="small">
+                    </el-time-picker>
                     <span style="margin-left: 10px">前将货物送至指定位置</span>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="请于:" prop="corpCnName">
-                    <el-date-picker v-model="documentForm.clearanceTime" clearable style="width: 30%" type="datetime"
-                        size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+                    <el-date-picker v-model="documentForm.clearanceTime" clearable style="width: 160px" type="date"
+                        size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                     </el-date-picker>
+                    <el-time-picker v-model="documentForm.clearanceTime2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间" size="small">
+                    </el-time-picker>
                     <span style="margin-left: 10px">前通关</span>
                 </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item label="截单和VGM截止时间:" prop="corpCnName" label-width="130px">
-                    <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 50%" type="datetime"
+                    <!-- <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 50%" type="datetime"
                         size="small" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择截单和VGM截止时间">
+                    </el-date-picker> -->
+                    <el-date-picker v-model="documentForm.vgmDeadline" clearable style="width: 160px" type="date"
+                        size="small" value-format="yyyy-MM-dd" placeholder="请选择日期">
                     </el-date-picker>
+                    <el-time-picker v-model="documentForm.vgmDeadline2" format="HH:mm:ss" style="width: 140px" placeholder="请选择时间" size="small">
+                    </el-time-picker>
                 </el-form-item>
             </el-col>
             <el-col :span="24">

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

@@ -707,10 +707,10 @@ export default {
                     name: 'booking NO',
                     value: 'bookingNo',
                 },
-                {
-                    name: 'REF MBLNO',
-                    value: 'refno',
-                },
+                // {
+                //     name: 'REF MBLNO',
+                //     value: 'refno',
+                // },
                 {
                     name: '船名(VSL)',
                     value: 'vesselCnName',

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -292,7 +292,7 @@
                                                 :clearable="true" :disabled="editSave" :buttonIf="false"
                                                 placeholder="请输入发票类型"
                                                 :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
-                                                @corpChange="corpChange($event, 'isInvoice')"
+                                                @corpChange="corpChange($event, 'invType')"
                                                 @corpFocus="invTypeWorkDictsfun">
                                             </search-query>
                                         </el-form-item>
@@ -399,7 +399,7 @@
                                     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=" statusType" type="danger"
+                                <el-button size="small" :disabled="statusType" type="danger"
                                     @click="batchDeletefun">一键删除</el-button>
 
                                 <el-input style="width: 10%;margin-left: 10px;" v-model="invoiceAmountCNY" size="small"
@@ -1190,7 +1190,9 @@ export default {
                 this.saveLoading = false
                 this.$message.success('操作成功');
                 this.fininvoicesDetailfun(res.data.data.id)
-            })
+            }).catch(() => {
+                this.saveLoading = false
+            });
         },
         // 详情接口
         fininvoicesDetailfun(id) {

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -122,7 +122,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 selection: true,
@@ -142,6 +142,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "提单号",
+                        prop: "mblno",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
                         label: "单据日期",
                         prop: "billDate",
                         overHidden: true,
@@ -230,7 +236,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 selection: true,
@@ -253,6 +259,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "提单号",
+                        prop: "mblno",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
                         label: "客户名称",
                         prop: "corpCnName",
                         width: "120",