Prechádzať zdrojové kódy

货代首页 2024-2-22

caojunjie 1 rok pred
rodič
commit
7f52a4cae7

+ 0 - 1
src/views/iosBasicData/AirtransportExport/bills/assembly/businessReports.vue

@@ -4,7 +4,6 @@
                  :table-loading="loading"
                  :data="data"
                  :page.sync="page"
-                 :search.sync="query"
                  :permission="permissionList"
                  v-model="form"
                  ref="crud"

+ 10 - 10
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -401,11 +401,11 @@ import {
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: "",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: "",
+                                //     trigger: "blur"
+                                // }]
                             },
                             {
                                 label: "", // 客户联系人邮箱
@@ -414,11 +414,11 @@ import {
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: " ",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: " ",
+                                //     trigger: "blur"
+                                // }]
                             },
                         ],
                         [

+ 0 - 1
src/views/iosBasicData/AirtransportImport/bills/assembly/businessReports.vue

@@ -4,7 +4,6 @@
                  :table-loading="loading"
                  :data="data"
                  :page.sync="page"
-                 :search.sync="query"
                  :permission="permissionList"
                  v-model="form"
                  ref="crud"

+ 10 - 10
src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -402,11 +402,11 @@ import {
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: "",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: "",
+                                //     trigger: "blur"
+                                // }]
                             },
                             {
                                 label: "", // 客户联系人邮箱
@@ -415,11 +415,11 @@ import {
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: " ",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: " ",
+                                //     trigger: "blur"
+                                // }]
                             },
                         ],
                         [

+ 0 - 1
src/views/iosBasicData/OceanFreightImport/bills/assembly/businessReports.vue

@@ -4,7 +4,6 @@
                  :table-loading="loading"
                  :data="data"
                  :page.sync="page"
-                 :search.sync="query"
                  :permission="permissionList"
                  v-model="form"
                  ref="crud"

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

@@ -427,11 +427,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: "",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: "",
+                                //     trigger: "blur"
+                                // }]
                             },
                             {
                                 label: "", // 客户联系人邮箱
@@ -440,11 +440,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: " ",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: " ",
+                                //     trigger: "blur"
+                                // }]
                             },
                         ],
                         [
@@ -1328,13 +1328,13 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 主表保存接口大保存
             billsSubmitfun(){
-                if (this.form.cargoType = 'dry') {
+                if (this.form.cargoType == 'dry') {
                     // 普货
                     this.form.billNoFormat = 'HYJK-PH'
-                }else if (this.form.cargoType = 'danger'){
+                }else if (this.form.cargoType == 'danger'){
                     // 危险品
                     this.form.billNoFormat = 'HYJK-WXP'
-                }else if (this.form.cargoType = 'reefer') {
+                }else if (this.form.cargoType == 'reefer') {
                     // 冻柜
                     this.form.billNoFormat = 'HYJK-DG'
                 }else {

+ 6 - 0
src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -54,6 +54,9 @@
             <el-table-column
                 prop="accBillNo"
                 label="账单编号" width="140px">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.accBillNo}}</span>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="corpCnName"
@@ -141,6 +144,9 @@
             <el-table-column
                 prop="podCnName"
                 label="目的港" width="100px">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.podCnName}}</span>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="quantityCntrTypesDescr"

+ 12 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -15,6 +15,9 @@
                         <el-table-column
                             prop="billNo"
                             label="BILLNO">
+                            <template slot-scope="{ row }">
+                                <span class="textoverflow">{{row.billNo}}</span>
+                            </template>
                         </el-table-column>
                         <el-table-column
                             prop="hblno"
@@ -23,6 +26,9 @@
                         <el-table-column
                             prop="corpCnName"
                             label="客户">
+                            <template slot-scope="{ row }">
+                                <span class="textoverflow">{{row.corpCnName}}</span>
+                            </template>
                         </el-table-column>
                         <el-table-column
                             prop="polCnName"
@@ -945,4 +951,10 @@
         text-align: center;
         padding: 4px 0;
     }
+    .textoverflow {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 </style>

+ 0 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue

@@ -4,7 +4,6 @@
                  :table-loading="loading"
                  :data="data"
                  :page.sync="page"
-                 :search.sync="query"
                  :permission="permissionList"
                  v-model="form"
                  ref="crud"

+ 13 - 13
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -429,11 +429,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: "",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: "",
+                                //     trigger: "blur"
+                                // }]
                             },
                             {
                                 label: "", // 客户联系人邮箱
@@ -442,11 +442,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
-                                rules: [{
-                                    required: true,
-                                    message: " ",
-                                    trigger: "blur"
-                                }]
+                                // rules: [{
+                                //     required: true,
+                                //     message: " ",
+                                //     trigger: "blur"
+                                // }]
                             },
                         ],
                         [
@@ -1387,13 +1387,13 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 主表保存接口大保存
             billsSubmitfun(){
-                if (this.form.cargoType = 'dry') {
+                if (this.form.cargoType == 'dry') {
                     // 普货
                     this.form.billNoFormat = 'HYCK-PH'
-                }else if (this.form.cargoType = 'danger'){
+                }else if (this.form.cargoType == 'danger'){
                     // 危险品
                     this.form.billNoFormat = 'HYCK-WXP'
-                }else if (this.form.cargoType = 'reefer') {
+                }else if (this.form.cargoType == 'reefer') {
                     // 冻柜
                     this.form.billNoFormat = 'HYCK-DG'
                 }else {

+ 36 - 18
src/views/iosBasicData/accounts/index.vue

@@ -312,97 +312,115 @@
             {
                 label: "期初数量借方",
                 prop: "quantityOpenDr",
+                width: "100",
                 overHidden: true,
             },
             {
               label: "期初本币借方金额",
               prop: "amountOpenDr",
+              width: "120",
               overHidden: true,
             },
             {
               label: "期初外币借方金额",
               prop: "amountOpenDrUsd",
+              width: "120",
               overHidden: true,
             },
             {
                 label: "期初数量贷方",
                 prop: "quantityOpenCr",
                 overHidden: true,
+                width: "120",
             },
             {
               label: "期初本币贷方金额",
               prop: "amountOpenCr",
               overHidden: true,
+              width: "120",
             },
             {
               label: "期初外币贷方金额",
               prop: "amountOpenCrUsd",
               overHidden: true,
+              width: "120",
             },
             {
                 label: "期初数量余额",
                 prop: "quantityOpenUsdBlc",
                 overHidden: true,
+                width: "120",
             },
             {
-              label: "期初本币余额",
-              prop: "amountOpenBlc",
-              overHidden: true,
+                label: "期初本币余额",
+                prop: "amountOpenBlc",
+                overHidden: true,
+                width: "120",
             },
             {
                 label: "期初外币余额",
                 prop: "amountOpenUsdBlc",
                 overHidden: true,
+                width: "120",
             },
             {
                 label: "本期数量借方",
                 prop: "quantityDr",
+                width: "120",
                 overHidden: true,
             },
             {
-              label: "本期本币借方金额",
-              prop: "amountDr",
-              overHidden: true,
+                label: "本期本币借方金额",
+                prop: "amountDr",
+                width: "120",
+                overHidden: true,
             },
             {
                 label: "本期外币借方金额",
                 prop: "amountDrUsd",
+                width: "120",
                 overHidden: true,
             },
             {
                 label: "本期数量贷方",
                 prop: "quantityCr",
+                width: "120",
                 overHidden: true,
             },
             {
-              label: "本期本币贷方金额",
-              prop: "amountCr",
-              overHidden: true,
+                label: "本期本币贷方金额",
+                prop: "amountCr",
+                width: "120",
+                overHidden: true,
             },
             {
                 label: "本期外币贷方金额",
                 prop: "amountCrUsd",
+                width: "120",
                 overHidden: true,
             },
             {
                 label: "本期数量余额",
                 prop: "quantityUsdBlc",
+                width: "120",
                 overHidden: true,
             },
             {
-              label: "本期本币余额",
-              prop: "amountBlc",
-              overHidden: true,
+                label: "本期本币余额",
+                prop: "amountBlc",
+                width: "120",
+                overHidden: true,
             },
             {
-              label: "本期外币余额",
-              prop: "amountUsdBlc",
-              overHidden: true,
+                label: "本期外币余额",
+                prop: "amountUsdBlc",
+                width: "120",
+                overHidden: true,
             },
             {
-              label: "备注",
-              prop: "remarks",
-              overHidden: true,
+                label: "备注",
+                prop: "remarks",
+                overHidden: true,
             },
           ]
         },

+ 1 - 1
src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -45,7 +45,7 @@
                 prop="billNo"
                 label="原业务编号" width="120px">
                 <template slot-scope="{ row }">
-                    <span>{{row.billNo}}</span>
+                    <span class="textHide" >{{row.billNo}}</span>
                     <!--<span class="textHide" v-if="row.businessBillDivideNo">{{row.businessBillDivideNo}}</span>-->
                     <!--<span class="textHide" v-else>{{row.businessBillNo}}</span>-->
                 </template>

+ 1 - 2
src/views/iosBasicData/finvouchers/assembly/fromtableDetails.vue

@@ -150,7 +150,7 @@
             }
         },
         async created() {
-            this.option = await this.getColumnData(this.getColumnName(321.1), this.optionBack);
+            // this.option = await this.getColumnData(this.getColumnName(321.1), this.optionBack);
         },
         methods:{
             // 获取科目类型数据
@@ -182,7 +182,6 @@
                         this.$set(row,'accountCode',item.code)
                         this.$set(row,'accountCnName',item.cnName)
                         this.$set(row,'accountEnName',item.enName)
-                        console.log(item,184)
                         // 币种
                         this.$set(row,'curCode',item.curCode)
                         // 汇率

+ 40 - 24
src/views/iosBasicData/finvouchers/finvouchersitems.vue

@@ -126,7 +126,7 @@
                     <div>外币核算:</div>
                     <el-row>
                         <el-col :span="4">
-                            <el-form-item label="币种:" prop="voucherType">
+                            <el-form-item label="币种:" prop="curCode">
                                 <el-input style="width: 100%;" v-model="subjectRow.curCode"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入币种" >
@@ -134,7 +134,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="汇率:" prop="voucherType">
+                            <el-form-item label="汇率:" prop="exrate">
                                 <el-input style="width: 100%;" v-model="subjectRow.exrate"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入汇率" >
@@ -142,7 +142,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="借方金额:" prop="voucherType">
+                            <el-form-item label="借方金额:" prop="amountDrUsd">
                                 <el-input style="width: 100%;" v-model="subjectRow.amountDrUsd"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入借方金额" >
@@ -150,7 +150,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="贷方金额:" prop="voucherType">
+                            <el-form-item label="贷方金额:" prop="amountCrUsd">
                                 <el-input style="width: 100%;" v-model="subjectRow.amountCrUsd"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入贷方金额" >
@@ -158,7 +158,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="本币借方:" prop="voucherType">
+                            <el-form-item label="本币借方:" prop="amountDr">
                                 <el-input style="width: 100%;" v-model="subjectRow.amountDr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入本币借方" >
@@ -166,7 +166,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="本币贷方:" prop="voucherType">
+                            <el-form-item label="本币贷方:" prop="amountCr">
                                 <el-input style="width: 100%;" v-model="subjectRow.amountCr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入本币贷方" >
@@ -177,7 +177,7 @@
                     <div>数量核算:</div>
                     <el-row>
                         <el-col :span="4">
-                            <el-form-item label="单位:" prop="voucherType">
+                            <el-form-item label="单位:" prop="unitNo">
                                 <el-input style="width: 100%;" v-model="subjectRow.unitNo"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入单位" >
@@ -185,7 +185,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="规格:" prop="voucherType">
+                            <el-form-item label="规格:" prop="voucherNo">
                                 <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入规格" >
@@ -193,7 +193,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="借方数量:" prop="voucherType">
+                            <el-form-item label="借方数量:" prop="quantityDr">
                                 <el-input style="width: 100%;" v-model="subjectRow.quantityDr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入借方数量" >
@@ -201,7 +201,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="借方单价:" prop="voucherType">
+                            <el-form-item label="借方单价:" prop="voucherNo">
                                 <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入借方单价" >
@@ -209,7 +209,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="贷方数量:" prop="voucherType">
+                            <el-form-item label="贷方数量:" prop="quantityCr">
                                 <el-input style="width: 100%;" v-model="subjectRow.quantityCr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入贷方数量" >
@@ -217,7 +217,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="贷方单价:" prop="voucherType">
+                            <el-form-item label="贷方单价:" prop="voucherNo">
                                 <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入贷方单价" >
@@ -229,7 +229,7 @@
                     <el-row :gutter="40">
                         <el-col :span="12" v-if="subjectAccount.isCorp">
                             <div>客户核算:</div>
-                            <el-form-item label="客户名称:" prop="voucherType">
+                            <el-form-item label="客户名称:" prop="corpCnName">
                                 <el-input style="width: 100%;" v-model="subjectRow.corpCnName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入客户名称" >
@@ -238,7 +238,7 @@
                         </el-col>
                         <el-col :span="12" v-if="subjectAccount.isDept">
                             <div>部门核算:</div>
-                            <el-form-item label="部门名称:" prop="voucherType">
+                            <el-form-item label="部门名称:" prop="deptName">
                                 <el-input style="width: 100%;" v-model="subjectRow.deptName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入部门名称" >
@@ -247,7 +247,7 @@
                         </el-col>
                         <el-col :span="12" v-if="subjectAccount.isEmpl">
                             <div>职员核算:</div>
-                            <el-form-item label="职员名称:" prop="voucherType">
+                            <el-form-item label="职员名称:" prop="emplName">
                                 <el-input style="width: 100%;" v-model="subjectRow.emplName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入职员名称" >
@@ -256,7 +256,7 @@
                         </el-col>
                         <el-col :span="12" v-if="subjectAccount.isItem">
                             <div>项目核算:</div>
-                            <el-form-item label="项目名称:" prop="voucherType">
+                            <el-form-item label="项目名称:" prop="itemName">
                                 <el-input style="width: 100%;" v-model="subjectRow.itemName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入项目名称" >
@@ -279,7 +279,7 @@
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
     import {getWorkDicts} from "@/api/system/dictbiz";
-    import {finvouchersitemsRemove, finvouchersSubmit} from "@/api/iosBasicData/finvouchers";
+    import {finvouchersDetail, finvouchersitemsRemove, finvouchersSubmit} from "@/api/iosBasicData/finvouchers";
     import {getCurrentDate, getYearDate} from "@/util/date";
     import fromtableDetails from "@/views/iosBasicData/finvouchers/assembly/fromtableDetails.vue";
     import {accountsDetail} from "@/api/iosBasicData/accounts";
@@ -306,6 +306,14 @@
             this.getWorkDictsfun()
         },
         methods:{
+            // 详情接口
+            finvouchersDetailfun(id) {
+                this.pageLoading = true
+                finvouchersDetail(id).then(res=>{
+                    this.pageLoading = false
+                    this.form = res.data.data
+                })
+            },
             // 添加分录
             addEntryfun(){
                 let obj = {}
@@ -323,30 +331,38 @@
             },
             // 行删除
             deletefun(row,index){
+                if (row.id) {
+                    this.finvouchersitemsRemovefun(row.id)
+                }
                 this.form.finVouchersItemsList.splice(index,1)
             },
             // 删除分录
             deleteEntryfun(){
                 console.log(this.handleSelectionData,323)
+                if (this.handleSelectionData.length == 0) {
+                    return this.$message.warning('请选择至少一条数据')
+                }
                 let arr = this.handleSelectionData.map(item=>{
                     return item.id
                 })
                 console.log(arr.join(','))
+                this.finvouchersitemsRemovefun(arr.join(','))
             },
             // 大保存
             finvouchersSubmitfun(){
                 this.form.businessTypeCode = 'PZDH'
-                console.log(this.form,337)
-                // this.pageLoading = true
+                this.pageLoading = true
                 finvouchersSubmit(this.form).then(res=>{
-                    console.log(res,338)
-                    // this.pageLoading = false
+                    this.$message.success('操作成功')
+                    this.pageLoading = false
+                    this.finvouchersDetailfun(res.data.data.id)
                 })
             },
             // 分录删除接口
-            finvouchersitemsRemovefun(){
-                finvouchersitemsRemove().then(res=>{
-
+            finvouchersitemsRemovefun(id){
+                finvouchersitemsRemove(id).then(res=>{
+                    this.$message.success('操作成功')
+                    this.finvouchersDetailfun()
                 })
             },
             // 科目编辑打开辅助核算弹窗

+ 25 - 1
src/views/iosBasicData/finvouchers/index.vue

@@ -36,9 +36,19 @@
                              @click="handleDelete">删 除
                   </el-button>
               </template>
+              <template slot="menu" slot-scope="{row}">
+                  <el-button type="text"
+                             size="small"
+                             @click="editFun(row)">编辑
+                  </el-button>
+                  <el-button type="text"
+                             size="small"
+                             @click="rowDel(row)">删除
+                  </el-button>
+              </template>
           </avue-crud>
       </basic-container>
-      <finvouchersitems v-if="!isShow" @goBack="goBack"></finvouchersitems>
+      <finvouchersitems ref="finvouchersitemsRef" v-if="!isShow" @goBack="goBack"></finvouchersitems>
   </div>
 </template>
 
@@ -73,6 +83,7 @@
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
+          menuWidth:'100',
           column: [
             {
               label: "账单编号",
@@ -122,31 +133,37 @@
             {
               label: "借方金额(CNY)",
               prop: "amountDr",
+              width:'140',
               overHidden:true,
             },
             {
               label: "贷方金额(CNY)",
               prop: "amountCr",
+              width:'140',
               overHidden:true,
             },
             {
               label: "借方金额(USD)",
               prop: "amountDrUsd",
+              width:'140',
               overHidden:true,
             },
             {
               label: "贷方金额(USD)",
               prop: "amountCrUsd",
+              width:'140',
               overHidden:true,
             },
             {
               label: "合计本位币借方金额(CNY)",
               prop: "amountDrLoc",
+              width:'170',
               overHidden:true,
             },
             {
               label: "合计本位币贷方金额(CNY)",
               prop: "amountCrLoc",
+              width:'170',
               overHidden:true,
             },
             {
@@ -242,6 +259,13 @@
       addbtnfun(){
           this.isShow = false
       },
+      // 编辑
+      editFun(row) {
+          this.isShow = false
+          this.$nextTick(()=>{
+              this.$refs.finvouchersitemsRef.finvouchersDetailfun(row.id)
+          })
+      },
       // 详情的返回列表
       goBack() {
           // 初始化数据

+ 15 - 0
src/views/system/dept.vue

@@ -112,6 +112,7 @@
               label: "机构名称",
               prop: "deptName",
               search: true,
+              width: '100',
               rules: [{
                 required: true,
                 message: "请输入机构名称",
@@ -143,6 +144,7 @@
               label: "机构全称",
               prop: "fullName",
               search: true,
+              overHidden:true,
               rules: [{
                 required: true,
                 message: "请输入机构全称",
@@ -240,8 +242,21 @@
                   overHidden:true,
               },
               {
+                  label: "开户银行美金",
+                  prop: "bankOfDepositUsd",
+                  width: '100',
+                  overHidden:true,
+              },
+              {
+                  label: "银行地址美金",
+                  prop: "bankAddressUsd",
+                  width: '100',
+                  overHidden:true,
+              },
+              {
                   label: "人民币账号",
                   prop: "rmbAccount",
+                  width: '100',
                   overHidden:true,
               },
               {

+ 2 - 2
src/views/wel/components/losAssembly/losaudit.vue

@@ -200,8 +200,8 @@ export default {
     // 获取数据
     approvalDatafun(){
         approvalData({
-            dateStart:this.realDate[0],
-            dateEnd:this.realDate[1],
+            dateStart:this.realDate[0] + ' 00:00:00',
+            dateEnd:this.realDate[1] + ' 23:59:59',
         }).then(res=>{
             this.form = res.data.data
         })

+ 2 - 3
src/views/wel/components/losAssembly/losleftform.vue

@@ -105,10 +105,9 @@ export default {
     completionRatefun(){
         this.loading = true
         completionRate({
-            dateStart:this.realDate[0],
-            dateEnd:this.realDate[1]
+            dateStart:this.realDate[0] + ' 00:00:00',
+            dateEnd:this.realDate[1] + ' 23:59:59'
         }).then(res=>{
-            console.log(res.data.data,92)
             this.data = res.data.data
         }).finally(() => {
             this.loading = false;

+ 2 - 2
src/views/wel/components/losAssembly/losrealtime.vue

@@ -137,8 +137,8 @@ export default {
     // 获取数据
     businessSumfun(){
         businessSum({
-            dateStart:this.realDate[0],
-            dateEnd:this.realDate[1],
+            dateStart:this.realDate[0] + ' 00:00:00',
+            dateEnd:this.realDate[1] + ' 23:59:59',
         }).then(res=>{
             this.data = res.data.data
         })

+ 2 - 2
src/views/wel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <dev v-if="saberTenantId != 409341">
+      <dev v-if="billType != 12">
           <div v-if="billType && saberTenantId != 212186 && saberTenantId != 504978 && billType != 11">
               <tongjiSchool v-if="billType == 1"></tongjiSchool>
               <landTransportation v-else-if="billType == 7"></landTransportation>
@@ -50,7 +50,7 @@
           </div>
       </dev>
       <!--货代首页 货代billType 12 -->
-      <div v-if="saberTenantId == 409341">
+      <div v-if="billType == 12">
           <los-home :sysType="billType" ></los-home>
       </div>
   </div>