货代bug 2023-12-30

src/views/approveDataH/index.vue

@@ -65,19 +65,19 @@
         </check>
     </reportContainerlos>
 
-      <el-dialog
-          title="打印"
-          :visible.sync="selectPrintingDialog"
-          append-to-body
-          width="70%"
-          :before-close="handleClose">
-          <div>
-              <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
-          </div>
-          <span slot="footer" class="dialog-footer">
-              <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
-          </span>
-      </el-dialog>
+      <!--<el-dialog-->
+      <!--    title="打印"-->
+      <!--    :visible.sync="selectPrintingDialog"-->
+      <!--    append-to-body-->
+      <!--    width="70%"-->
+      <!--    :before-close="handleClose">-->
+      <!--    <div>-->
+      <!--        <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>-->
+      <!--    </div>-->
+      <!--    <span slot="footer" class="dialog-footer">-->
+      <!--        <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>-->
+      <!--    </span>-->
+      <!--</el-dialog>-->
 
   </basic-container>
 </template>
@@ -98,6 +98,7 @@ import reportContainerlos from "@/views/iosBasicData/report-container/report-con
 import {finstlbillsDetail} from "../../api/iosBasicData/finstlbills";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
+import {getList as getreportsList} from "@/api/iosBasicData/reports";
 
 let previousRouterName = "";
 let checkRefresh = "";
@@ -195,22 +196,30 @@ export default {
           // 当时选择的数据
           this.reportsData = row
           this.checkData = row
-          this.selectPrintingDialog = true
-          let page = {
-              pageSize: 10,
-              currentPage: 1,
-              total: 0
-          }
-          this.$nextTick(()=>{
-              this.$refs.reportformsList.onLoad(page,{
-                  businessType:'HYCK',
-                  classifyCode:'业务',
-                  groupCode:'销售报告'
-              })
+          getreportsList(1, 10, {
+              businessType:'HYCK',
+              classifyCode:'业务',
+              groupCode:'销售报告'
+          }).then(res=>{
+              this.reportRadio(res.data.data.records[0])
           })
+          // this.selectPrintingDialog = true
+          // let page = {
+          //     pageSize: 10,
+          //     currentPage: 1,
+          //     total: 0
+          // }
+          // this.$nextTick(()=>{
+          //     this.$refs.reportformsList.onLoad(page,{
+          //         businessType:'HYCK',
+          //         classifyCode:'业务',
+          //         groupCode:'销售报告'
+          //     })
+          // })
       },
 
       reportRadio(val){
+          console.log(val,222)
           reportsGetReportData({
               billId:this.reportsData.billId,
               reportCode:val.classifyCode,
@@ -233,16 +242,6 @@ export default {
      handleReportPreview(url,data){
         this.reportlist = data // 存一下数据 打印的时候需要传
         console.log(data,220)
-        // 报表取的是最后一项，把第一项的数据赋值给最后一项
-        data[data.length - 1].amountDrUsd = data[0].amountDrUsd
-        data[data.length - 1].amountDr = data[0].amountDr
-        data[data.length - 1].amountCrUsd = data[0].amountCrUsd
-        data[data.length - 1].amountCr = data[0].amountCr
-        data[data.length - 1].amountProfitUsd = data[0].amountProfitUsd
-        data[data.length - 1].amountProfit = data[0].amountProfit
-        data[data.length - 1].amountProfitLoc = data[0].amountProfitLoc
-        data[data.length - 1].rate = data[0].rate
-        data[data.length - 1].grossMargin = data[0].grossMargin
 
       Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
       // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='

src/views/iosBasicData/ComputationCenter/index.vue

@@ -10,7 +10,7 @@
                         <span slot="label">待收</span>
                     </el-tab-pane>
                     <el-tab-pane label="业务单据" name="业务单据">
-                        <span slot="label" style="color: #4c9e44">单据列表</span>
+                        <span slot="label" style="color: #4c9e44">业务单据</span>
                     </el-tab-pane>
                     <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
                 </el-tabs>
@@ -43,13 +43,17 @@
                                @click="chooseSettlement()">选择结算
                     </el-button>
                     <el-button v-if="tabsValue == '业务单据'"
+                               type="primary" size="small" plain
+                               @click="addfun()">添加单据
+                    </el-button>
+                    <el-button v-if="tabsValue == '业务单据'"
                                type="danger" size="small" plain
                                @click="handleDelete()">批量删除
                     </el-button>
                 </template>
                 <template slot="menu" slot-scope="{row}">
                     <el-button v-if="tabsValue == 'C' || tabsValue == 'D'" type="text" size="small" @click="settlementfun(row)" >结算</el-button>
-                    <el-button type="text" size="small" @click="editfun(row)" >编辑</el-button>
+                    <el-button v-if="tabsValue == '业务单据' || tabsValue == '已完成'" type="text" size="small" @click="editfun(row)" >编辑</el-button>
                     <el-button v-if="tabsValue == '业务单据'" type="text" size="small" @click="rowDel(row)" >删除</el-button>
                 </template>
             </avue-crud>
@@ -107,12 +111,19 @@ import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlement
                     column: [
                         {
                             label: "业务类型",
-                            prop: "businessTypes",
+                            prop: "businessType",
+                            hide:false,
+                            overHidden:true,
+                        },
+                        {
+                            label: "业务类型",
+                            prop: "type",
+                            hide:true,
                             overHidden:true,
                         },
                         {
                             label: "单据编号",
-                            prop: "businessNo",
+                            prop: "billNo",
                             search:true,
                             overHidden:true,
                         },
@@ -208,6 +219,11 @@ import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlement
                     this.$refs.settlementDetailsRef.generateFinStlBillsfun(row.id,this.tabsValue)
                 })
             },
+            // 添加
+            addfun(){
+                this.isShow = false
+                this.editSave = false
+            },
             // 编辑
             editfun(row){
                 this.isShow = false
@@ -233,8 +249,12 @@ import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlement
             handleClick(){
                 if (this.tabsValue == 'D') {
                     this.findObject(this.option.column, "invCorpCnName").hide = false
+                    this.findObject(this.option.column, "type").hide = false
+                    this.findObject(this.option.column, "businessType").hide = true
                 }else {
                     this.findObject(this.option.column, "invCorpCnName").hide = true
+                    this.findObject(this.option.column, "type").hide = true
+                    this.findObject(this.option.column, "businessType").hide = false
                 }
                 this.query = {};
                 this.page.currentPage = 1
@@ -347,6 +367,7 @@ import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlement
                         ...Object.assign(params, this.query),
                         type:'销项',
                         status:3,
+                        billStatus:0,
                     })
                 }else if (this.tabsValue == '业务单据') {
                     // 应收应付 业务数据

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -34,7 +34,7 @@
                     <el-row>
                         <el-row>
                             <el-col :span="5">
-                                <el-form-item label="付费对象" prop="corpCnName">
+                                <el-form-item label="往来单位" prop="corpCnName">
                                     <search-query :datalist="corpData"
                                                   :selectValue="form.corpCnName"
                                                   :clearable="true"
@@ -64,7 +64,7 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
-                                <el-form-item label="付费事由" prop="remarks">
+                                <el-form-item label="事由" prop="remarks">
                                     <el-input style="width: 100%;" v-model="form.remarks"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
@@ -73,28 +73,6 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="5">
-                                <el-form-item label="预计收回" prop="estimatedTime">
-                                    <el-date-picker
-                                        v-model="form.estimatedTime"
-                                        type="date"
-                                        style="width: 100%;"
-                                        size="small"
-                                        :disabled="editSave"
-                                        value-format="yyyy-MM-dd"
-                                        placeholder="选择预计收回">
-                                    </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="收款情况" prop="collectionSituation">
-                                    <el-input style="width: 100%;" v-model="form.collectionSituation"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入CHK NO" >
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
                                 <el-form-item label="业务日期" prop="etd">
                                     <el-date-picker
                                         v-model="form.accountDate"
@@ -186,31 +164,31 @@
                                     </el-input>
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="5">
+                                <el-form-item label="业务类型" prop="businessTypes" >
+                                    <search-query :datalist="businessTypesData"
+                                                  :selectValue="form.businessTypes"
+                                                  :clearable="true"
+                                                  :disabled="editSave"
+                                                  :buttonIf="false"
+                                                  :multiple="true"
+                                                  @corpChange="corpChange($event,'businessTypes')">
+                                    </search-query>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="5">
+                                <el-form-item label="船 名" prop="vesselCnName" >
+                                    <el-input style="width: 100%;" v-model="form.vesselCnName"
+                                              size="small" autocomplete="off"
+                                              :disabled="editSave"
+                                              clearable placeholder="请选择船名" ></el-input>
+                                </el-form-item>
+                            </el-col>
                         </el-row>
 
                         <expand :showBtn="true" :showSpan="true">
                             <el-row>
                                 <el-col :span="5">
-                                    <el-form-item label="业务类型" prop="businessTypes" >
-                                        <search-query :datalist="businessTypesData"
-                                                      :selectValue="form.businessTypes"
-                                                      :clearable="true"
-                                                      :disabled="editSave"
-                                                      :buttonIf="false"
-                                                      :multiple="true"
-                                                      @corpChange="corpChange($event,'businessTypes')">
-                                        </search-query>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-form-item label="船 名" prop="vesselCnName" >
-                                        <el-input style="width: 100%;" v-model="form.vesselCnName"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请选择船名" ></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="5">
                                     <el-form-item label="航 次" prop="voyageNo" >
                                         <el-input style="width: 100%;" v-model="form.voyageNo"
                                                   size="small" autocomplete="off"
@@ -613,7 +591,6 @@ export default {
                     if (item.srcIdInvoices) {
                         this.settlementdistar = true
                     }
-
                     return item
                 })
                 this.pageLoading = false

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -13,7 +13,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
-                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '0'"
+                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '0' || form.status == '4'"
                             :loading="saveLoading" @click="settlementApprovefun">提交申请
                 </el-button>
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '1'"
@@ -345,6 +345,7 @@
     import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
+    import {getList as getreportsList} from "@/api/iosBasicData/reports";
 
     export default {
         components: {reportContainer, reportformsList, reports, SearchQuery,expand,finstlbillsitems},
@@ -417,7 +418,6 @@
         methods:{
             // 打印
             reportRadio(val){
-                console.log(val,505)
                 // 获取报表数据
                 reportsGetReportData({
                     billId:this.form.id,
@@ -429,21 +429,28 @@
             },
             // 报表预览
             previewreportfun(){
-                this.saveLoading = true
-                this.selectPrintingDialog = true
-                this.saveLoading = false
-                let page = {
-                    pageSize: 10,
-                    currentPage: 1,
-                    total: 0
-                }
-                this.$nextTick(()=>{
-                    this.$refs.reportformsList.onLoad(page,{
-                        businessType:'FFSQ',
-                        classifyCode:'付费申请',
-                        groupCode:'付费申请'
-                    })
+                getreportsList(1,10,{
+                    businessType:'FFSQ',
+                    classifyCode:'付费申请',
+                    groupCode:'付费申请'
+                }).then(res=>{
+                    this.reportRadio(res.data.data.records[0])
                 })
+                // this.saveLoading = true
+                // // this.selectPrintingDialog = true
+                // this.saveLoading = false
+                // let page = {
+                //     pageSize: 10,
+                //     currentPage: 1,
+                //     total: 0
+                // }
+                // this.$nextTick(()=>{
+                //     this.$refs.reportformsList.onLoad(page,{
+                //         businessType:'FFSQ',
+                //         classifyCode:'付费申请',
+                //         groupCode:'付费申请'
+                //     })
+                // })
             },
             // 批量删除
             batchDeletefun(){

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -27,9 +27,9 @@
                           <el-button type="primary" size="small" :disabled="detailData.seeDisabled" @click="containersSubmitListfun" >批量保存</el-button>
                           <el-button type="success" size="small" :disabled="detailData.seeDisabled || !assemblyForm.id" @click="excelBox = true" >导入箱号,铅封号</el-button>
 
-                          <el-button type="warning" size="small"
-                                     :disabled="numberfalsefun() || assemblyForm.id"
-                                     @click="equalDistribution">平均分配</el-button>
+                          <!--<el-button type="warning" size="small"-->
+                          <!--           :disabled="numberfalsefun() || assemblyForm.id"-->
+                          <!--           @click="equalDistribution">平均分配</el-button>-->
                       </div>
                       <!--<div>-->
                       <!--    <el-button size="small">Copy</el-button>-->

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

@@ -203,7 +203,7 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
                 }else {
                     obj.remarks = this.assemblyForm.remarks
                     obj.businessType = this.assemblyForm.businessType
-                    obj.billId = this.assemblyForm.billId
+                    obj.billId = this.assemblyForm.id
                     obj.billNo = this.assemblyForm.billNo
                     obj.mblno = this.assemblyForm.mblno
                     obj.hblno = this.assemblyForm.hblno
@@ -281,7 +281,10 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             // 单证中心数据获取
             reportslogListfun(documentPage, params = {}){
                 this.loading = true;
-                reportslogList(documentPage.currentPage, documentPage.pageSize, Object.assign(params, this.query)).then(res=>{
+                reportslogList(documentPage.currentPage, documentPage.pageSize, {
+                    ...Object.assign(params, this.query),
+                    billId:this.assemblyForm.id
+                }).then(res=>{
                     const data = res.data.data;
                     this.documentPage.total = data.total;
                     this.documentData = data.records;

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

@@ -153,6 +153,7 @@
                 this.option.columnBtn = false
                 this.option.refreshBtn = false
                 this.$nextTick(()=>{
+                    // console.log(document.querySelector('.avue-crud__menu'),156)
                     document.querySelector('.avue-crud__menu').className = 'avue-crud__menu_height'
                 })
             }else {

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

@@ -159,9 +159,8 @@
                                   :remote="true"
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
-                                  @remoteMethod="getBunitsPagefun($event,'unitNo')"
-                                  @corpChange="corpChange($event,'unitNo',row)"
-                                  @corpFocus="getBunitsPagefun($event,'unitNo')" >
+                                  @corpFocus="getBunitsPagefun"
+                                  @corpChange="corpChange($event,'unitNo',row)" >
                     </search-query>
                     <span v-else>{{row.unitNo}}</span>
                 </template>
@@ -193,11 +192,6 @@
                               placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{row.quantity}}</span>
                 </template>
-                <template slot="payplace" slot-scope="{ row }">
-                    <el-input v-if="row.edit" v-model="row.payplace" size="small"
-                              placeholder="请输入" ></el-input>
-                    <span v-else>{{row.payplace}}</span>
-                </template>
                 <template slot="remarks" slot-scope="{ row }">
                     <el-input v-if="row.edit" v-model="row.remarks" size="small"
                               placeholder="请输入" ></el-input>
@@ -317,9 +311,8 @@
                                   :remote="true"
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
-                                  @remoteMethod="getBunitsPagefun($event,'unitNo')"
-                                  @corpChange="corpChange($event,'unitNo',row)"
-                                  @corpFocus="getBunitsPagefun($event,'unitNo')" >
+                                  @corpFocus="getBunitsPagefun"
+                                  @corpChange="corpChange($event,'unitNo',row)">
                     </search-query>
                     <span v-else>{{row.unitNo}}</span>
                 </template>
@@ -351,11 +344,6 @@
                               placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
                     <span v-else>{{row.quantity}}</span>
                 </template>
-                <template slot="payplace" slot-scope="{ row }">
-                    <el-input v-if="row.edit" v-model="row.payplace" size="small"
-                              placeholder="请输入" ></el-input>
-                    <span v-else>{{row.payplace}}</span>
-                </template>
                 <template slot="remarks" slot-scope="{ row }">
                     <el-input v-if="row.edit" v-model="row.remarks" size="small"
                               placeholder="请输入" ></el-input>
@@ -742,25 +730,20 @@
                             overHidden:true,
                         },
                         {
-                            label: "地址",
-                            prop: "payplace",
-                            width: "100",
-                        },
-                        {
                             label: "备注",
                             prop: "remarks",
                             width: "100",
                         },
-                        {
-                            label: "税率",
-                            prop: "taxRate",
-                            width: "100",
-                        },
-                        {
-                            label: "附加税率",
-                            prop: "surchargeRate",
-                            width: "100",
-                        },
+                        // {
+                        //     label: "税率",
+                        //     prop: "taxRate",
+                        //     width: "100",
+                        // },
+                        // {
+                        //     label: "附加税率",
+                        //     prop: "surchargeRate",
+                        //     width: "100",
+                        // },
                         {
                             label: "单价是否含税",
                             prop: "isTax",
@@ -867,25 +850,20 @@
                             overHidden:true,
                         },
                         {
-                            label: "地址",
-                            prop: "payplace",
-                            width: "100",
-                        },
-                        {
                             label: "备注",
                             prop: "remarks",
                             width: "100",
                         },
-                        {
-                            label: "税率",
-                            prop: "taxRate",
-                            width: "100",
-                        },
-                        {
-                            label: "附加税率",
-                            prop: "surchargeRate",
-                            width: "100",
-                        },
+                        // {
+                        //     label: "税率",
+                        //     prop: "taxRate",
+                        //     width: "100",
+                        // },
+                        // {
+                        //     label: "附加税率",
+                        //     prop: "surchargeRate",
+                        //     width: "100",
+                        // },
                         {
                             label: "单价是否含税",
                             prop: "isTax",
@@ -1134,6 +1112,7 @@
             reportNodeClick(data){
                 this.reportformsObj = data
             },
+            // 生成应收应付
             copyfun(dc){
                 let selection = []
                 if (dc == 'D') {
@@ -1162,7 +1141,6 @@
                     obj.curCode = item.curCode
                     obj.taxRate = item.taxRate
                     obj.paymode = item.paymode
-                    obj.payplace = item.payplace
                     obj.remarks = item.remarks
                     obj.amount = item.amount
                     obj.price = item.price
@@ -1171,7 +1149,10 @@
                     obj.taxRate = item.taxRate
                     obj.unitNo = item.unitNo
                     obj.usdAmount = item.usdAmount
-                    obj.edit = item.edit
+                    obj.edit = true
+                    obj.rmbAmountNet = item.rmbAmountNet
+                    obj.usdAmountNet = item.usdAmountNet
+                    obj.exrate = item.exrate
                     return obj
                 })
                 if (dc == 'D') {
@@ -1292,8 +1273,19 @@
                     // 币种
                     obj.curCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].curCode
                     obj.taxRate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].taxRate
+                    // 汇率
+                    obj.exrate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].exrate
+                    // 单价
+                    obj.price = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].price
+                    // 数量
+                    obj.quantity = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].quantity
+                    // 金额
+                    obj.rmbAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmount
+                    obj.usdAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmount
+                    obj.rmbAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmountNet
+                    obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
                 }else {
-                    // 往来单位
+                    // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
                     obj.corpCnName = this.assemblyForm.corpCnName
                     obj.corpEnName = this.assemblyForm.corpEnName
@@ -1349,8 +1341,24 @@
                     // 币种
                     obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
                     obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
+                    // 汇率
+                    obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
+                    // 单价
+                    obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
+                    // 数量
+                    obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
+                    // 金额
+                    obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
+                    obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
+                    obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
+                    obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
+                }else {
+                    // 往来单位拿主表客户名称
+                    obj.corpId = this.assemblyForm.corpId
+                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpEnName = this.assemblyForm.corpEnName
                 }
-                this.assemblyForm.feeCenterListC.push(obj)
+                this.assemblyForm.feeCenterListC.unshift(obj)
             },
             // 应收编辑
             editDfun(row,index){
@@ -1378,7 +1386,7 @@
                 if (!row.feeId) {
                     sum += ` 序号${index + 1}费用简称`
                 }
-                if (!row.elementsCode) {
+                if (!row.elementsId) {
                     sum += ` 序号${index + 1}核算要素`
                 }
                 if (!row.curCode) {
@@ -1447,7 +1455,7 @@
                     if (!item.feeId) {
                         sum += ` 序号${item.$index + 1}费用简称`
                     }
-                    if (!item.elementsCode) {
+                    if (!item.elementsId) {
                         sum += ` 序号${item.$index + 1}核算要素`
                     }
                     if (!item.curCode) {
@@ -1630,9 +1638,57 @@
                             this.$set(row,'elementsCnName',item.accElementName)
                             this.$set(row,'elementsCode',item.elementsCode)
                             this.$set(row,'elementsEnName',item.elementsEnName)
+                            // 拿取费用简称下的计量单位
+                            this.getBunitsPagefun()
+                            // 币别
+                            this.$set(row,'curCode',item.curNo)
+                            // 汇率
+                            getRateList({current:1,size:10}).then(res=>{
+                                for (let item of res.data.data.records) {
+                                    if (item.code == row.curCode) {
+                                        this.$set(row,'exrate',item.exrate)
+                                    }
+                                }
+                            })
+
+
                         }
                     }
-                }else if (name == 'elementsCnName') {
+                }else if (name == 'unitNo') {
+                    // 计量单位
+                    this.$set(row,name,value)
+                    for (let item of this.unitNoData) {
+                        if (item.code == value) {
+                            // 按箱型
+                            if (item.quantityRule == 1) {
+                                // 选择的箱那边的数据
+                                if (item.quantity) {
+                                    this.$set(row,'quantity',item.quantity)
+                                }
+                            }
+                            // 按票
+                            if (item.quantityRule == 2) {
+                                this.$set(row,'quantity',1)
+                            }
+                            // 按重量
+                            if (item.quantityRule == 3) {
+                                this.$set(row,'quantity',this.assemblyForm.grossWeight)
+                            }
+                            // 按TEU
+                            if (item.quantityRule == 4) {
+                                // this.$set(row,'quantity',this.assemblyForm.measurement)
+                            }
+                            // 按尺码
+                            if (item.quantityRule == 4) {
+                                this.$set(row,'quantity',this.assemblyForm.measurement)
+                            }
+                            // 按件数
+                            if (item.quantityRule == 5) {
+                                this.$set(row,'quantity',this.assemblyForm.quantity)
+                            }
+                        }
+                    }
+                } else if (name == 'elementsCnName') {
                     if (!value) {
                         this.$set(row,'elementsId','')
                         this.$set(row,'elementsCnName','')
@@ -1764,9 +1820,24 @@
                     srcBillId = this.assemblyForm.id
                 }
                 getBunitsPage({srcBillId}).then(res=>{
-                    this.unitNoData = res.data.data
+                    this.unitNoData = []
+                    for (let item of res.data.data) {
+                        // 按箱型
+                        if (item.quantityRule != 1) {
+                            this.unitNoData.push(item)
+                        }
+                    }
+                    let arr = this.assemblyForm.preContainersList.map(item=>{
+                        return {
+                            quantityRule:1, // 1 是按箱量
+                            code:item.cntrTypeCode,
+                            quantity:item.quantity,
+                        }
+                    })
+                    this.unitNoData = [...arr,...this.unitNoData]
                 })
             },
+
             // 获取币别数据
             getRateListfun(cnName){
                 getRateList({current:1,size:10,cnName}).then(res=>{
@@ -1846,7 +1917,7 @@
                     if (!item.feeId) {
                         sum += ` 应收序号${item.$index + 1}费用简称`
                     }
-                    if (!item.elementsCode) {
+                    if (!item.elementsId) {
                         sum += ` 应收序号${item.$index + 1}核算要素`
                     }
                     if (!item.curCode) {
@@ -1860,7 +1931,7 @@
                     if (!item.feeId) {
                         sum += ` 应付序号${item.$index + 1}费用简称`
                     }
-                    if (!item.elementsCode) {
+                    if (!item.elementsId) {
                         sum += ` 应付序号${item.$index + 1}核算要素`
                     }
                     if (!item.curCode) {

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

@@ -25,12 +25,12 @@
                 <!--<el-button  size="small" type="warning" style="margin-right: 8px"-->
                 <!--            :loading="saveLoading" >打 印-->
                 <!--</el-button>-->
-                <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 0"
-                           @click.stop="DocumentApproval">单据请核
-                </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
+                <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 0 || form.status == 4"
+                           @click.stop="DocumentApproval">单据请核
+                </el-button>
                 <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
                 <!--            :loading="saveLoading" @click="editHandle">编 辑-->
                 <!--</el-button>-->
@@ -244,7 +244,7 @@
                     <feecenter :assemblyForm="form" :detailData="detailData" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
-                    <document-center :assemblyForm="form"></document-center>
+                    <document-center ref="documentCenter" :assemblyForm="form" ></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'">
                     <Split-list :detailData="detailData" :assemblyForm="form"
@@ -1479,6 +1479,11 @@ import {popupReminder} from "@/util/messageReminder";
                         this.billsListAllfun(this.form.id)
                     }
                 }
+                if (this.bigtabs == 'dz') {
+                    if (this.form.id) {
+                        this.$refs.documentCenter.reportslogListfun({currentPage:1,pageSize:10})
+                    }
+                }
             },
             // 获取不分页的分单列表
             billsListAllfun(masterId){

src/views/iosBasicData/bfeesdefine/index.vue

@@ -44,15 +44,21 @@
                   </el-button>
               </template>
             <template slot="unitNoForm">
-              <search-query ref="SearchQuery" :disabled="searchDisabled" :selectValue="form.unitNo" :datalist="unitNoData" title="计量单位" :filterable="true" :clearable="true"
-                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                @remoteMethod="getBunitsListfun" @corpChange="unitNoCorpChange">
-                <bunits></bunits>
+              <search-query ref="SearchQuery"
+                            :disabled="searchDisabled"
+                            :selectValue="form.unitNo"
+                            :datalist="unitNoData"
+                            title="计量单位"
+                            :filterable="true"
+                            :clearable="true"
+                            :buttonIf="false"
+                            :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                            @corpChange="unitNoCorpChange">
               </search-query>
             </template>
             <template slot="curNoForm">
               <search-query ref="SearchQuery" :disabled="searchDisabled" :selectValue="form.curNo" :datalist="curNoData" title="币别" :filterable="true" :clearable="true"
-                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                :remote="true" :forParameter="{ key: 'id', label: 'code', value: 'code' }"
                 @remoteMethod="getRateListfun" @corpChange="curNoCorpChange">
                 <rateManagement></rateManagement>
               </search-query>
@@ -123,6 +129,7 @@ import baccelements from "@/views/iosBasicData/baccelements/index.vue";
 
 import { getToken } from "@/util/auth";
 import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
+import {getWorkDicts} from "@/api/system/dictbiz";
 
 
 export default {
@@ -282,12 +289,12 @@ export default {
             label: "计量单位",
             prop: "unitNo",
             formslot: true,
-              overHidden:true,
-            // rules: [{
-            //   required: true,
-            //   message: "请输入计量单位",
-            //   trigger: "blur"
-            // }]
+            overHidden:true,
+            rules: [{
+              required: true,
+              message: "请输入计量单位",
+              trigger: "blur"
+            }]
           },
           {
             label: "币别",
@@ -541,11 +548,12 @@ export default {
       })
     },
     // 获取计算单位数据
-    getBunitsListfun(cnName) {
-      getBunitsList(1, 10, { cnName }).then(res => {
-        this.unitNoData = res.data.data.records
-      })
+    getBunitsListfun() {
+        getWorkDicts('number_rule').then(res=>{
+            this.unitNoData = res.data.data
+        })
     },
+
     // 获取币别数据
     getRateListfun(cnName) {
       getRateList({

src/views/iosBasicData/bunits/index.vue

@@ -50,6 +50,7 @@ import { getBunitsList, getBunitsDetail, addBunits, updateBunits, removeBunits }
 import { mapGetters } from "vuex";
 
 import { getToken } from "@/util/auth";
+import {getWorkDicts} from "@/api/system/dictbiz";
 
 export default {
   data() {
@@ -168,12 +169,20 @@ export default {
           {
             label: "数量规则",
             prop: "quantityRule",
-              overHidden:true,
-            // rules: [{
-            //   required: true,
-            //   message: "请输入数量规则，用于根据单位自动计算数量",
-            //   trigger: "blur"
-            // }]
+            search: true,
+            type: 'select',
+            dicData:[],
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=number_rule",
+            props: {
+                label: "dictValue",
+                value: "dictKey"
+            },
+            overHidden:true,
+            rules: [{
+              required: true,
+              message: "请输入数量规则",
+              trigger: "blur"
+            }]
           },
           // {
           //   label: "quantity_rule=FIXED 时，默认的数量",
@@ -272,6 +281,10 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(296), this.optionBack);
+    // 查询数量规格数据
+      getWorkDicts('number_rule').then(res=>{
+          this.findObject(this.option.column, "quantityRule").dicData = res.data.data
+      })
   },
   methods: {
       // 禁用启用按钮

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoiceitemdetail.vue

@@ -94,9 +94,9 @@
               label="操作"
               width="100">
               <template slot-scope="scope">
-                  <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index)">保存</el-button>
-                  <el-button v-else type="text" size="small" @click="editfun(scope.row,scope.index)" >编辑</el-button>
-                  <el-button type="text" size="small" @click="deletefun(scope.row,scope.index)" >删除</el-button>
+                  <el-button v-if="scope.row.edit" :disabled="editSave" type="text" size="small" @click="savefun(scope.row,scope.index)">保存</el-button>
+                  <el-button v-else type="text" :disabled="editSave" size="small" @click="editfun(scope.row,scope.index)" >编辑</el-button>
+                  <el-button type="text" :disabled="editSave" size="small" @click="deletefun(scope.row,scope.index)" >删除</el-button>
               </template>
           </el-table-column>
       </el-table>
@@ -118,7 +118,11 @@
           handleSelectionData:{
               type:Array,
               default:[],
-          }
+          },
+          editSave:{
+              type:Boolean,
+              default:false,
+          },
       },
     data() {
       return {

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -126,7 +126,7 @@
                 label="操作"
                 width="100">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="deletefun(scope.row,scope.index)">删除</el-button>
+                    <el-button type="text" :disabled="editSave" size="small" @click="deletefun(scope.row,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -13,10 +13,10 @@
                 <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
                             :loading="saveLoading" @click="finInvoicesApprovefun">提交
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="editSave"
+                <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-else
+                <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-else
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
             </div>
@@ -42,7 +42,7 @@
                                             <el-date-picker v-model="form.invoiceDate" clearable
                                                             style="width: 100%;"
                                                             type="date" size="small"
-                                                            :disabled="true"
+                                                            :disabled="editSave"
                                                             value-format="yyyy-MM-dd"
                                                             placeholder="选择开票日期">
                                             </el-date-picker>
@@ -65,7 +65,7 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="24">
+                                    <el-col :span="12">
                                         <el-form-item label="税号" prop="invCorpTaxNo">
                                             <el-input style="width: 100%;" v-model="form.invCorpTaxNo"
                                                       size="small" autocomplete="off"
@@ -75,6 +75,21 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
+                                        <el-form-item label="发票币种" prop="invCurCode">
+                                            <search-query :datalist="invCurCodeData"
+                                                          :selectValue="form.invCurCode"
+                                                          :filterable="true"
+                                                          :clearable="true"
+                                                          :disabled="editSave"
+                                                          :buttonIf="false"
+                                                          placeholder="请选择发票币种"
+                                                          :forParameter="{key:'id',label:'code',value:'code'}"
+                                                          @corpChange="corpChange($event,'invCurCode')"
+                                                          @corpFocus="invCurCodeRateListfun">
+                                            </search-query>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
                                         <el-form-item label="美元银行" prop="invCorpAccountBankUsd">
                                             <el-input style="width: 100%;" v-model="form.invCorpAccountBankUsd"
                                                       size="small" autocomplete="off"
@@ -190,18 +205,19 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="12">
-                                        <el-form-item label="全电发票备注:" prop="invCurCode">
-                                            <el-input style="width: 100%;" v-model="form.elecRemarks"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入全电发票备注" >
-                                            </el-input>
+                                    <el-col :span="8">
+                                        <el-form-item label="开票CNY:" prop="amountCny">
+                                            <span>¥{{form.amountCny}}</span>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="12">
-                                        <el-form-item label="开票合计:" prop="invCurCode">
-                                            <span>¥{{form.amountLoc}}元</span>
+                                    <el-col :span="8">
+                                        <el-form-item label="开票USD:" prop="amountUsd">
+                                            <span>${{form.amountUsd}}</span>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="开票合计:" prop="amountLoc">
+                                            <span>¥{{form.amountLoc}}</span>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
@@ -209,51 +225,40 @@
                         </el-col>
                         <el-col :span="14">
                             <div class="flexBoxRight">
+                                <!--<el-row>-->
+                                <!--    <el-col :span="6">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isDk">整票(不列费用明细)-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="5">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isRp">只提取开票费用-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="3">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isExportMblno">主单号-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="3">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isExportVslvoy">船名航次-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="3">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isExportHblno">分单号-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--</el-row>-->
                                 <el-row>
-                                    <el-col :span="4">
-                                        <el-switch
-                                            v-model="form.stlMode"
-                                            active-value="1"
-                                            inactive-value="0"
-                                            active-color="#66dd7a"
-                                            inactive-color="#4ea6ea"
-                                            active-text="票结"
-                                            inactive-text="月结">
-                                        </el-switch>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isDk">整票(不列费用明细)
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="5">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isRp">只提取开票费用
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isExportMblno">主单号
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isExportVslvoy">船名航次
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isExportHblno">分单号
-                                        </el-checkbox>
-                                    </el-col>
-                                </el-row>
-                                <el-row>
-                                    <el-col :span="8">
+                                    <el-col :span="16">
                                         <el-form-item label="结算单位" prop="corpCnName">
                                             <search-query :datalist="corpData"
                                                           :selectValue="form.corpCnName"
@@ -271,17 +276,6 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="开票日期" prop="invoiceDate">
-                                            <el-date-picker v-model="form.invoiceDate" clearable
-                                                            style="width: 100%;"
-                                                            type="date" size="small"
-                                                            :disabled="editSave"
-                                                            value-format="yyyy-MM-dd"
-                                                            placeholder="选择开票日期">
-                                            </el-date-picker>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
                                         <el-form-item label="税控发票号" prop="taxInvoiceNo">
                                             <el-input style="width: 100%;" v-model="form.taxInvoiceNo"
                                                       size="small" autocomplete="off"
@@ -290,84 +284,43 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="银行账号" prop="bankReceiptAccountNo">
-                                            <search-query :datalist="bankReceiptData"
-                                                          :selectValue="form.bankReceiptAccountNo"
-                                                          :clearable="true"
-                                                          :disabled="editSave || !form.corpId"
-                                                          :buttonIf="false"
-                                                          :remote="true"
-                                                          :filterable="true"
-                                                          placeholder="请输入银行账号"
-                                                          :forParameter="{ key:'id', label:'accountNo', value:'accountNo'}"
-                                                          @corpChange="corpChange($event,'bankReceiptAccountNo')"
-                                                          @remoteMethod="bcorpsbankListfun">
-                                            </search-query>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="银行名称" prop="bankReceiptBankName">
-                                            <el-input style="width: 100%;" v-model="form.bankReceiptBankName"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入银行名称" >
-                                            </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="导出时间" prop="exportDate">
-                                            <el-date-picker v-model="form.exportDate" clearable
+                                    <el-col :span="9">
+                                        <el-form-item label="业务日期" prop="accountDateFrom">
+                                            <el-date-picker v-model="form.accountDateFrom" clearable
                                                             style="width: 100%;"
                                                             type="date" size="small"
                                                             :disabled="editSave"
-                                                            value-format="yyyy-MM-dd HH:mm"
-                                                            placeholder="请选择导出时间">
+                                                            value-format="yyyy-MM-dd"
+                                                            placeholder="选择业务日期">
                                             </el-date-picker>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="16">
-                                        <el-form-item label="业务编号" prop="businessNo">
-                                            <el-input style="width: 100%;" v-model="form.businessNo"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入业务编号" >
-                                            </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="导出人" prop="exportName">
-                                            <el-input style="width: 100%;" v-model="form.exportName"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入导出人" >
-                                            </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="16">
-                                        <el-form-item label="主单编号" prop="mblno">
-                                            <el-input style="width: 100%;" v-model="form.mblno"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入主单编号" >
-                                            </el-input>
+                                    <el-col :span="7">
+                                        <el-form-item label="-" prop="accountDateTo" label-width="30px">
+                                            <el-date-picker v-model="form.accountDateTo" clearable
+                                                            style="width: 100%;"
+                                                            type="date" size="small"
+                                                            :disabled="editSave"
+                                                            value-format="yyyy-MM-dd"
+                                                            placeholder="选择业务日期">
+                                            </el-date-picker>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="导出汇率" prop="exrate">
+                                        <el-form-item label="发票汇率" prop="exrate">
                                             <el-input style="width: 100%;" v-model="form.exrate"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入导出汇率" >
+                                                      clearable placeholder="请输入发票汇率" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="16">
-                                        <el-form-item label="分单编号" prop="hblno">
-                                            <el-input style="width: 100%;" v-model="form.hblno"
+                                        <el-form-item label="业务编号" prop="businessNo">
+                                            <el-input style="width: 100%;" v-model="form.businessNo"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入分单编号" >
+                                                      clearable placeholder="请输入业务编号" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -385,12 +338,12 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="申请单号" prop="applyNo">
-                                            <el-input style="width: 100%;" v-model="form.applyNo"
+                                    <el-col :span="16">
+                                        <el-form-item label="主单编号" prop="mblno">
+                                            <el-input style="width: 100%;" v-model="form.mblno"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入申请单号" >
+                                                      clearable placeholder="请输入主单编号" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -403,12 +356,12 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="所属税种" prop="taxType">
-                                            <el-input style="width: 100%;" v-model="form.taxType"
+                                    <el-col :span="16">
+                                        <el-form-item label="分单编号" prop="hblno">
+                                            <el-input style="width: 100%;" v-model="form.hblno"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入所属税种" >
+                                                      clearable placeholder="请输入分单编号" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -461,27 +414,36 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
+                                    <el-col :span="12">
+                                        <el-form-item label="邮箱" prop="yx">
+                                            <el-input style="width: 100%;" v-model="form.yx"
+                                                      size="small" autocomplete="off"
+                                                      :disabled="editSave"
+                                                      clearable placeholder="请输入邮箱" >
+                                            </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
                                         <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
                                                      :disabled="editSave"
                                                      v-model="form.isExchangeToCny">转换成人民币
                                         </el-checkbox>
-                                        <el-checkbox v-model="appendType" false-label="检索" true-label="追加">追加</el-checkbox>
+                                        <el-checkbox v-model="appendType" :disabled="statusType" false-label="检索" true-label="追加">追加</el-checkbox>
                                         <el-button type="primary"
-                                                   size="small"
+                                                   size="small" :disabled="statusType"
                                                    plain @click="finstlbillslistAccBillV1fun(appendType)">提取费用
                                         </el-button>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="邮箱" prop="checkNo">
-                                            <el-input style="width: 100%;" v-model="form.checkNo"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入邮箱" >
+                                    <el-col :span="24">
+                                        <el-form-item label="全电发票:" prop="elecRemarks">
+                                            <el-input style="width: 100%;" v-model="form.elecRemarks"
+                                                      size="small" autocomplete="off" type="textarea"
+                                                      clearable placeholder="请输入全电发票备注" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
 
+
                                 </el-row>
                             </div>
                         </el-col>
@@ -501,9 +463,9 @@
                                               @corpChange="corpChange($event,'serverName')"
                                               @corpFocus="serverWorkDictsfun" >
                                 </search-query>
-                                <el-button style="margin-left: 10px" size="small" type="primary" @click="invoicingfun" >开票</el-button>
-                                <el-button style="margin-left: 10px" size="small" type="warning" @click="invoicingRevokefun" >撤销开票</el-button>
-                                <el-button size="small" type="danger" @click="batchDeletefun" >批量删除</el-button>
+                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoicingfun" >生成开票明细</el-button>
+                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="warning" @click="invoicingRevokefun" >撤销开票明细</el-button>
+                                <el-button size="small" :disabled="statusType" type="danger" @click="batchDeletefun" >批量删除</el-button>
                             </div>
                             <fininvoicesitems :tableData="tableData"
                                               :handleSelectionData="handleSelectionData"
@@ -514,7 +476,7 @@
                         </el-tab-pane>
                         <el-tab-pane label="开票明细" name="second">
                             <div style="margin-bottom: 10px;display: flex;">
-                                <el-button 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"
@@ -555,37 +517,10 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="发票币种" prop="invCurCode">
-                                <search-query :datalist="invCurCodeData"
-                                              :selectValue="form.invCurCode"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :disabled="editSave"
-                                              :buttonIf="false"
-                                              placeholder="请选择发票币种"
-                                              :forParameter="{key:'id',label:'code',value:'code'}"
-                                              @corpChange="corpChange($event,'invCurCode')"
-                                              @corpFocus="invCurCodeRateListfun">
-                                </search-query>
-                            </el-form-item>
-                        </el-col>
-                        <!--<el-col :span="4">-->
-                        <!--    <el-form-item label="打印次数" prop="invCurCode">-->
-                        <!--        <el-input style="width: 100%;" v-model="form.invCurCode"-->
-                        <!--                  size="small" autocomplete="off"-->
-                        <!--                  :disabled="editSave"-->
-                        <!--                  clearable placeholder="请输入打印次数" >-->
-                        <!--        </el-input>-->
-                        <!--    </el-form-item>-->
-                        <!--</el-col>-->
                     </el-row>
                 </el-card>
             </el-form>
         </div>
-
-
-
     </div>
 </template>
 
@@ -607,17 +542,25 @@ import {
     fininvoiceitemdetailRemove, revokeFinInvoicesDetail,fininvoiceitemdetailSubmit
 } from "@/api/iosBasicData/fininvoices";
 import {getWorkDicts} from "@/api/system/dictbiz";
+import {getCurrentDate} from "@/util/date";
 
 export default {
         components:{ SearchQuery, fininvoicesitems,fininvoiceitemdetail},
         data() {
             return {
+                statusType:false, // 是否已经提交
                 serverData:[], // 开票项目数据
                 detailTabs:'first',
                 appendType:'检索',
                 pageLoading:false, // 全屏加载
                 saveLoading:false, // 按钮加载
-                form:{},
+                form:{
+                    invCurCode:'CNY',
+                    isRp:1,
+                    invType:'全电发票',
+                    taxRate:0,
+                    invoiceDate:getCurrentDate(),
+                },
                 tableData:[], // 费用明细数据
                 InvoicingList:[], // 开票明细数据
                 handleSelectionData:[], // 费用明细选择的数据
@@ -651,12 +594,12 @@ export default {
                     exrate: [
                         {required: true, message: '请输入导入汇率', trigger: 'blur'},
                     ],
-                    taxType: [
-                        {required: true, message: '请输入所属税种', trigger: 'blur'},
-                    ],
                     taxRate: [
                         {required: true, message: '请输入所属税率', trigger: 'blur'},
                     ],
+                    invCurCode: [
+                        {required: true, message: '请输入所属发票币别', trigger: 'blur'},
+                    ],
                 },
             }
         },
@@ -666,6 +609,32 @@ export default {
                 default:false
             }
         },
+        watch:{
+            // 监听 状态
+            "form.status":{
+                // 执行方法
+                handler(oldValue,newValue) {
+                    if (oldValue == 3) {
+                        this.statusType = true
+                    }else {
+                        this.statusType = false
+                    }
+                },
+                deep: true, // 深度监听
+                immediate: true  // 第一次改变就执行
+            },
+        },
+         created() {
+            if (!this.form.id) {
+                getRateList({current:1,size:30}).then(res=>{
+                    for (let item of res.data.data.records) {
+                        if (item.code == "USD") {
+                            this.$set(this.form,'exrate',item.exrate)
+                        }
+                    }
+                })
+            }
+        },
         methods:{
             // 开票明细编辑完成保存
             invoiceSavefun(row){
@@ -694,6 +663,13 @@ export default {
                 if(this.form.invoiceDate) {
                     obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
                 }
+                // 业务日期
+                if (this.form.accountDateFrom) {
+                    this.form.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+                }
+                if (this.form.accountDateTo) {
+                    this.form.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
+                }
                 for (let item of this.handleSelectionData) {
                     // 拿未开票的数据
                     if(item.status == 0) {
@@ -729,6 +705,13 @@ export default {
                 if(this.form.invoiceDate) {
                     obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
                 }
+                // 业务日期
+                if (this.form.accountDateFrom) {
+                    obj.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+                }
+                if (this.form.accountDateTo) {
+                    obj.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
+                }
                 for (let item of this.handleSelectionData) {
                     // 拿未开票的数据
                     if(item.status == 1) {
@@ -791,6 +774,7 @@ export default {
                             this.$message.success('操作成功')
                         })
                     }
+                    console.log(index,794)
                     this.tableData.splice(index,1)
                 })
             },
@@ -942,6 +926,13 @@ export default {
                     if(this.form.invoiceDate) {
                         this.form.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
                     }
+                    // 业务日期
+                    if (this.form.accountDateFrom) {
+                        this.form.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+                    }
+                    if (this.form.accountDateTo) {
+                        this.form.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
+                    }
                     this.form.finInvoicesItemsList = this.handleSelectionData.map(item=>{
                         if (item.currentCurCode == 'CNY') {
                             item.currentAmount = item.currentAmountCNY
@@ -962,9 +953,16 @@ export default {
                     return
                 }
                 let obj = {}
-                //开票日期
-                if(this.form.invoiceDate) {
-                    obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
+                // //开票日期
+                // if(this.form.invoiceDate) {
+                //     obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
+                // }
+                // 业务日期
+                if (this.form.accountDateFrom) {
+                    obj.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+                }
+                if (this.form.accountDateTo) {
+                    obj.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
                 }
                 obj.type = '3'
                 obj.corpCnName = this.form.corpId // 结算单位
@@ -1047,7 +1045,7 @@ export default {
             },
             // 确认申请
             finInvoicesApprovefun(){
-                this.$confirm("确定进行申请操作?", {
+                this.$confirm("确定进行发票申请操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
@@ -1058,6 +1056,7 @@ export default {
                         this.pageLoading = false
                         this.$message.success('操作成功');
                         this.fininvoicesDetailfun(res.data.data.id)
+                        this.editSave = true // 提交之后编辑按钮显示出来
                     }).catch(err=>{
                         this.pageLoading = false
                     })
@@ -1065,7 +1064,7 @@ export default {
             },
             // 撤销申请
             revokeFinInvoicesApprovefun(){
-                this.$confirm("确定进行撤销申请操作?", {
+                this.$confirm("确定进行撤销发票申请操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -13,10 +13,10 @@
                 <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
                             :loading="saveLoading" @click="fininvoicesConfirmFinInvoicesfun">确认开票
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="editSave"
+                <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-else
+                <el-button  size="small" type="primary" :disabled="statusType" style="margin-right: 8px" v-else
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
             </div>
@@ -42,7 +42,7 @@
                                             <el-date-picker v-model="form.invoiceDate" clearable
                                                             style="width: 100%;"
                                                             type="date" size="small"
-                                                            :disabled="true"
+                                                            :disabled="editSave"
                                                             value-format="yyyy-MM-dd"
                                                             placeholder="选择开票日期">
                                             </el-date-picker>
@@ -65,7 +65,7 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="24">
+                                    <el-col :span="12">
                                         <el-form-item label="税号" prop="invCorpTaxNo">
                                             <el-input style="width: 100%;" v-model="form.invCorpTaxNo"
                                                       size="small" autocomplete="off"
@@ -75,6 +75,21 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
+                                        <el-form-item label="发票币种" prop="invCurCode">
+                                            <search-query :datalist="invCurCodeData"
+                                                          :selectValue="form.invCurCode"
+                                                          :filterable="true"
+                                                          :clearable="true"
+                                                          :disabled="editSave"
+                                                          :buttonIf="false"
+                                                          placeholder="请选择发票币种"
+                                                          :forParameter="{key:'id',label:'code',value:'code'}"
+                                                          @corpChange="corpChange($event,'invCurCode')"
+                                                          @corpFocus="invCurCodeRateListfun">
+                                            </search-query>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
                                         <el-form-item label="美元银行" prop="invCorpAccountBankUsd">
                                             <el-input style="width: 100%;" v-model="form.invCorpAccountBankUsd"
                                                       size="small" autocomplete="off"
@@ -190,18 +205,19 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="12">
-                                        <el-form-item label="全电发票备注:" prop="invCurCode">
-                                            <el-input style="width: 100%;" v-model="form.elecRemarks"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入全电发票备注" >
-                                            </el-input>
+                                    <el-col :span="8">
+                                        <el-form-item label="开票CNY:" prop="amountCny">
+                                            <span>¥{{form.amountCny}}</span>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="12">
-                                        <el-form-item label="开票合计:" prop="invCurCode">
-                                            <span>¥{{form.amountLoc}}元</span>
+                                    <el-col :span="8">
+                                        <el-form-item label="开票USD:" prop="amountUsd">
+                                            <span>${{form.amountUsd}}</span>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="开票合计:" prop="amountLoc">
+                                            <span>¥{{form.amountLoc}}</span>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
@@ -209,51 +225,51 @@
                         </el-col>
                         <el-col :span="14">
                             <div class="flexBoxRight">
+                                <!--<el-row>-->
+                                <!--    <el-col :span="4">-->
+                                <!--        <el-switch-->
+                                <!--            v-model="form.stlMode"-->
+                                <!--            active-value="1"-->
+                                <!--            inactive-value="0"-->
+                                <!--            active-color="#66dd7a"-->
+                                <!--            inactive-color="#4ea6ea"-->
+                                <!--            active-text="票结"-->
+                                <!--            inactive-text="月结">-->
+                                <!--        </el-switch>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="6">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isDk">整票(不列费用明细)-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="5">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isRp">只提取开票费用-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="3">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isExportMblno">主单号-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="3">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isExportVslvoy">船名航次-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--    <el-col :span="3">-->
+                                <!--        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"-->
+                                <!--                     :disabled="editSave"-->
+                                <!--                     v-model="form.isExportHblno">分单号-->
+                                <!--        </el-checkbox>-->
+                                <!--    </el-col>-->
+                                <!--</el-row>-->
                                 <el-row>
-                                    <el-col :span="4">
-                                        <el-switch
-                                            v-model="form.stlMode"
-                                            active-value="1"
-                                            inactive-value="0"
-                                            active-color="#66dd7a"
-                                            inactive-color="#4ea6ea"
-                                            active-text="票结"
-                                            inactive-text="月结">
-                                        </el-switch>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isDk">整票(不列费用明细)
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="5">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isRp">只提取开票费用
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isExportMblno">主单号
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isExportVslvoy">船名航次
-                                        </el-checkbox>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
-                                                     :disabled="editSave"
-                                                     v-model="form.isExportHblno">分单号
-                                        </el-checkbox>
-                                    </el-col>
-                                </el-row>
-                                <el-row>
-                                    <el-col :span="8">
+                                    <el-col :span="16">
                                         <el-form-item label="结算单位" prop="corpCnName">
                                             <search-query :datalist="corpData"
                                                           :selectValue="form.corpCnName"
@@ -271,17 +287,6 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="开票日期" prop="invoiceDate">
-                                            <el-date-picker v-model="form.invoiceDate" clearable
-                                                            style="width: 100%;"
-                                                            type="date" size="small"
-                                                            :disabled="editSave"
-                                                            value-format="yyyy-MM-dd"
-                                                            placeholder="选择开票日期">
-                                            </el-date-picker>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
                                         <el-form-item label="税控发票号" prop="taxInvoiceNo">
                                             <el-input style="width: 100%;" v-model="form.taxInvoiceNo"
                                                       size="small" autocomplete="off"
@@ -291,83 +296,42 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="银行账号" prop="bankReceiptAccountNo">
-                                            <search-query :datalist="bankReceiptData"
-                                                          :selectValue="form.bankReceiptAccountNo"
-                                                          :clearable="true"
-                                                          :disabled="editSave || !form.corpId"
-                                                          :buttonIf="false"
-                                                          :remote="true"
-                                                          :filterable="true"
-                                                          placeholder="请输入银行账号"
-                                                          :forParameter="{ key:'id', label:'accountNo', value:'accountNo'}"
-                                                          @corpChange="corpChange($event,'bankReceiptAccountNo')"
-                                                          @remoteMethod="bcorpsbankListfun">
-                                            </search-query>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="银行名称" prop="bankReceiptBankName">
-                                            <el-input style="width: 100%;" v-model="form.bankReceiptBankName"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入银行名称" >
-                                            </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="导出时间" prop="exportDate">
-                                            <el-date-picker v-model="form.exportDate" clearable
+                                        <el-form-item label="业务开始日期" prop="accountDateFrom">
+                                            <el-date-picker v-model="form.accountDateFrom" clearable
                                                             style="width: 100%;"
                                                             type="date" size="small"
                                                             :disabled="editSave"
-                                                            value-format="yyyy-MM-dd HH:mm"
-                                                            placeholder="请选择导出时间">
+                                                            value-format="yyyy-MM-dd"
+                                                            placeholder="选择业务日期">
                                             </el-date-picker>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="16">
-                                        <el-form-item label="业务编号" prop="businessNo">
-                                            <el-input style="width: 100%;" v-model="form.businessNo"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入业务编号" >
-                                            </el-input>
-                                        </el-form-item>
-                                    </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="导出人" prop="exportName">
-                                            <el-input style="width: 100%;" v-model="form.exportName"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入导出人" >
-                                            </el-input>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="16">
-                                        <el-form-item label="主单编号" prop="mblno">
-                                            <el-input style="width: 100%;" v-model="form.mblno"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入主单编号" >
-                                            </el-input>
+                                        <el-form-item label="业务结束日期" prop="accountDateTo">
+                                            <el-date-picker v-model="form.accountDateTo" clearable
+                                                            style="width: 100%;"
+                                                            type="date" size="small"
+                                                            :disabled="editSave"
+                                                            value-format="yyyy-MM-dd"
+                                                            placeholder="选择业务日期">
+                                            </el-date-picker>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="导出汇率" prop="exrate">
+                                        <el-form-item label="发票汇率" prop="exrate">
                                             <el-input style="width: 100%;" v-model="form.exrate"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入导出汇率" >
+                                                      clearable placeholder="请输入发票汇率" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="16">
-                                        <el-form-item label="分单编号" prop="hblno">
-                                            <el-input style="width: 100%;" v-model="form.hblno"
+                                        <el-form-item label="业务编号" prop="businessNo">
+                                            <el-input style="width: 100%;" v-model="form.businessNo"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入分单编号" >
+                                                      clearable placeholder="请输入业务编号" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -385,12 +349,12 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="申请单号" prop="applyNo">
-                                            <el-input style="width: 100%;" v-model="form.applyNo"
+                                    <el-col :span="16">
+                                        <el-form-item label="主单编号" prop="mblno">
+                                            <el-input style="width: 100%;" v-model="form.mblno"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入申请单号" >
+                                                      clearable placeholder="请输入主单编号" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -403,12 +367,21 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+                                    <el-col :span="16">
+                                        <el-form-item label="分单编号" prop="hblno">
+                                            <el-input style="width: 100%;" v-model="form.hblno"
+                                                      size="small" autocomplete="off"
+                                                      :disabled="editSave"
+                                                      clearable placeholder="请输入分单编号" >
+                                            </el-input>
+                                        </el-form-item>
+                                    </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="所属税种" prop="taxType">
-                                            <el-input style="width: 100%;" v-model="form.taxType"
+                                        <el-form-item label="申请单号" prop="applyNo">
+                                            <el-input style="width: 100%;" v-model="form.applyNo"
                                                       size="small" autocomplete="off"
                                                       :disabled="editSave"
-                                                      clearable placeholder="请输入所属税种" >
+                                                      clearable placeholder="请输入申请单号" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -461,27 +434,34 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
+                                    <el-col :span="16">
+                                        <el-form-item label="邮箱" prop="yx">
+                                            <el-input style="width: 100%;" v-model="form.yx"
+                                                      size="small" autocomplete="off"
+                                                      :disabled="editSave"
+                                                      clearable placeholder="请输入邮箱" >
+                                            </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="24">
                                         <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
                                                      :disabled="editSave"
                                                      v-model="form.isExchangeToCny">转换成人民币
                                         </el-checkbox>
-                                        <el-checkbox v-model="appendType" false-label="检索" true-label="追加">追加</el-checkbox>
+                                        <el-checkbox v-model="appendType" :disabled="statusType" false-label="检索" true-label="追加">追加</el-checkbox>
                                         <el-button type="primary"
-                                                   size="small"
+                                                   size="small" :disabled="statusType"
                                                    plain @click="finstlbillslistAccBillV1fun(appendType)">提取费用
                                         </el-button>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="邮箱" prop="checkNo">
-                                            <el-input style="width: 100%;" v-model="form.checkNo"
-                                                      size="small" autocomplete="off"
-                                                      :disabled="editSave"
-                                                      clearable placeholder="请输入邮箱" >
+                                    <el-col :span="24">
+                                        <el-form-item label="全电发票:" prop="elecRemarks">
+                                            <el-input style="width: 100%;" v-model="form.elecRemarks"
+                                                      size="small" autocomplete="off" type="textarea"
+                                                      clearable placeholder="请输入全电发票备注" >
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-
                                 </el-row>
                             </div>
                         </el-col>
@@ -501,9 +481,9 @@
                                               @corpChange="corpChange($event,'serverName')"
                                               @corpFocus="serverWorkDictsfun" >
                                 </search-query>
-                                <el-button style="margin-left: 10px" size="small" type="primary" @click="invoicingfun" >开票</el-button>
-                                <el-button style="margin-left: 10px" size="small" type="warning" @click="invoicingRevokefun" >撤销开票</el-button>
-                                <el-button size="small" type="danger" @click="batchDeletefun" >批量删除</el-button>
+                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoicingfun" >生成开票明细</el-button>
+                                <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="warning" @click="invoicingRevokefun" >撤销开票明细</el-button>
+                                <el-button size="small" :disabled="statusType" type="danger" @click="batchDeletefun" >批量删除</el-button>
                             </div>
                             <fininvoicesitems :tableData="tableData"
                                               :handleSelectionData="handleSelectionData"
@@ -514,7 +494,7 @@
                         </el-tab-pane>
                         <el-tab-pane label="开票明细" name="second">
                             <div style="margin-bottom: 10px;display: flex;">
-                                <el-button size="small" type="danger" @click="invoicingBatchDelete" >批量删除</el-button>
+                                <el-button size="small" :disabled="statusType" type="danger" @click="invoicingBatchDelete" >批量删除</el-button>
                             </div>
                             <fininvoiceitemdetail :tableData="InvoicingList"
                                                   :handleSelectionData="invoicingCheckboxData"
@@ -555,30 +535,6 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="发票币种" prop="invCurCode">
-                                <search-query :datalist="invCurCodeData"
-                                              :selectValue="form.invCurCode"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :disabled="editSave"
-                                              :buttonIf="false"
-                                              placeholder="请选择发票币种"
-                                              :forParameter="{key:'id',label:'code',value:'code'}"
-                                              @corpChange="corpChange($event,'invCurCode')"
-                                              @corpFocus="invCurCodeRateListfun">
-                                </search-query>
-                            </el-form-item>
-                        </el-col>
-                        <!--<el-col :span="4">-->
-                        <!--    <el-form-item label="打印次数" prop="invCurCode">-->
-                        <!--        <el-input style="width: 100%;" v-model="form.invCurCode"-->
-                        <!--                  size="small" autocomplete="off"-->
-                        <!--                  :disabled="editSave"-->
-                        <!--                  clearable placeholder="请输入打印次数" >-->
-                        <!--        </el-input>-->
-                        <!--    </el-form-item>-->
-                        <!--</el-col>-->
                     </el-row>
                 </el-card>
             </el-form>
@@ -611,17 +567,25 @@ import {
     fininvoicesConfirmFinInvoices, fininvoicesRevokeFinInvoices
 } from "@/api/iosBasicData/fininvoices";
 import {getWorkDicts} from "@/api/system/dictbiz";
+import {getCurrentDate} from "@/util/date";
 
 export default {
     components:{ SearchQuery, fininvoicesitems,fininvoiceitemdetail},
     data() {
         return {
+            statusType:false, // 是否确认开票
             serverData:[], // 开票项目数据
             detailTabs:'first',
             appendType:'检索',
             pageLoading:false, // 全屏加载
             saveLoading:false, // 按钮加载
-            form:{},
+            form:{
+                invCurCode:'CNY',
+                isRp:1,
+                invType:'全电发票',
+                taxRate:0,
+                invoiceDate:getCurrentDate(),
+            },
             tableData:[], // 费用明细数据
             InvoicingList:[], // 开票明细数据
             handleSelectionData:[], // 费用明细选择的数据
@@ -655,12 +619,12 @@ export default {
                 exrate: [
                     {required: true, message: '请输入导入汇率', trigger: 'blur'},
                 ],
-                taxType: [
-                    {required: true, message: '请输入所属税种', trigger: 'blur'},
-                ],
                 taxRate:[
                     {required: true, message: '请输入所属税率', trigger: 'blur'},
-                ]
+                ],
+                invCurCode: [
+                    {required: true, message: '请输入所属发票币别', trigger: 'blur'},
+                ],
             },
         }
     },
@@ -670,6 +634,32 @@ export default {
             default:false
         }
     },
+    watch:{
+        // 监听 状态
+        "form.status":{
+            // 执行方法
+            handler(oldValue,newValue) {
+                if (oldValue == 3) {
+                    this.statusType = true
+                }else {
+                    this.statusType = false
+                }
+            },
+            deep: true, // 深度监听
+            immediate: true  // 第一次改变就执行
+        },
+    },
+    created() {
+        if (!this.form.id) {
+            getRateList({current:1,size:30}).then(res=>{
+                for (let item of res.data.data.records) {
+                    if (item.code == "USD") {
+                        this.$set(this.form,'exrate',item.exrate)
+                    }
+                }
+            })
+        }
+    },
     methods:{
         // 开票明细编辑完成保存
         invoiceSavefun(row){
@@ -698,6 +688,13 @@ export default {
             if(this.form.invoiceDate) {
                 obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
             }
+            // 业务日期
+            if (this.form.accountDateFrom) {
+                obj.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+            }
+            if (this.form.accountDateTo) {
+                obj.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
+            }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
                 if(item.status == 0) {
@@ -733,6 +730,13 @@ export default {
             if(this.form.invoiceDate) {
                 obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
             }
+            // 业务日期
+            if (this.form.accountDateFrom) {
+                obj.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+            }
+            if (this.form.accountDateTo) {
+                obj.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
+            }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
                 if(item.status == 1) {
@@ -946,6 +950,13 @@ export default {
                 if(this.form.invoiceDate) {
                     this.form.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
                 }
+                // 业务日期
+                if (this.form.accountDateFrom) {
+                    this.form.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+                }
+                if (this.form.accountDateTo) {
+                    this.form.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
+                }
                 this.form.finInvoicesItemsList = this.handleSelectionData.map(item=>{
                     if (item.currentCurCode == 'CNY') {
                         item.currentAmount = item.currentAmountCNY
@@ -970,6 +981,14 @@ export default {
             if(this.form.invoiceDate) {
                 obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
             }
+            // 业务日期
+            if (this.form.accountDateFrom) {
+                obj.accountDateFrom = this.form.accountDateFrom.slice(0,10) + ' 00:00:00'
+            }
+            if (this.form.accountDateTo) {
+                obj.accountDateTo = this.form.accountDateTo.slice(0,10) + ' 00:00:00'
+            }
+
             obj.type = '3'
             obj.corpCnName = this.form.corpId // 结算单位
             obj.billNo = this.form.bookingNo // 账单号
@@ -1078,7 +1097,7 @@ export default {
         },
         // 确认申请
         fininvoicesConfirmFinInvoicesfun(){
-            this.$confirm("确定进行申请操作?", {
+            this.$confirm("确定进行确认发票操作?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
@@ -1096,7 +1115,7 @@ export default {
         },
         // 撤销申请
         fininvoicesRevokeFinInvoicesfun(){
-            this.$confirm("确定进行撤销申请操作?", {
+            this.$confirm("确定进行撤销确认发票操作?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -9,7 +9,7 @@
                   <el-tab-pane label="业务单据" name="销项">
                       <span slot="label" style="color: #4c9e44">单据列表</span>
                   </el-tab-pane>
-                  <el-tab-pane label="已完成" name="已完成">已完成</el-tab-pane>
+                  <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
               </el-tabs>
           </div>
           <avue-crud v-show="tabsValue == '申请'"
@@ -860,19 +860,23 @@ import {getRateList} from "@/api/iosBasicData/rateManagement";
       // 获取列表数据
       onLoad(page, params = {}) {
         this.loading = true;
+        let type = null
         let status = null
         let billStatus = null
           if (this.tabsValue == '申请') {
+              type = '申请'
               status = 3
               billStatus = 0
           }else if (this.tabsValue == '销项') {
+              type = '销项'
               status = 0
           }else if (this.tabsValue == '已完成') {
+              type = '销项'
               status = 3
           }
         fininvoicesList(page.currentPage, page.pageSize, {
             ...Object.assign(params, this.query),
-            type:this.tabsValue,
+            type:type,
             status:status,
             billStatus:billStatus
         }).then(res => {

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -36,7 +36,7 @@
             </el-table-column>
             <el-table-column
                 prop="lineNo"
-                label="源业务编号" width="120px">
+                label="原业务编号" width="120px">
                 <template slot-scope="{ row }">
                     <span class="textHide" v-if="row.businessBillDivideNo">{{row.businessBillDivideNo}}</span>
                     <span class="textHide" v-else>{{row.businessBillNo}}</span>
@@ -62,11 +62,11 @@
                     </avue-text-ellipsis>
                 </template>
             </el-table-column>
-            <el-table-column label="本币结算金额">
+            <el-table-column label="本币金额">
                 <!--amount-->
                 <el-table-column
                     prop="amountRMB"
-                    label="RMB">
+                    label="CNY">
                 </el-table-column>
                 <el-table-column
                     prop="amountUSD"
@@ -74,7 +74,7 @@
                 </el-table-column>
             </el-table-column>
             <el-table-column
-                label="本次结算币种"
+                label="本次币种"
                 prop="currentStlCurCode" width="100">
                 <template slot-scope="{row}">
                     <search-query v-if="!editSave"
@@ -97,7 +97,7 @@
                 <!--currentStlAmount-->
                 <el-table-column
                     prop="currentStlAmountRMB"
-                    label="RMB" width="60">
+                    label="CNY" width="60">
                     <template slot-scope="scope">
                         <!--<el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse"-->
                         <!--          size="mini" autocomplete="off"-->
@@ -192,10 +192,10 @@
                 </template>
             </el-table-column>
 
-            <el-table-column
-                prop="accBillNo"
-                label="操作(无参数)" width="120px">
-            </el-table-column>
+            <!--<el-table-column-->
+            <!--    prop="accBillNo"-->
+            <!--    label="操作(无参数)" width="120px">-->
+            <!--</el-table-column>-->
             <el-table-column
                 prop="bookingNo"
                 label="BOOKINGNO" width="150px">
@@ -228,7 +228,7 @@
                 <!--currentInvoiceAmount-->
                 <el-table-column
                     prop="currentInvoiceAmountRMB"
-                    label="RMB">
+                    label="CNY">
                 </el-table-column>
                 <el-table-column
                     prop="currentInvoiceAmountUSD"
@@ -255,51 +255,51 @@
                 prop="dc"
                 label="收/付">
             </el-table-column>
-            <el-table-column label="应结算金额">
+            <el-table-column label="应对账金额">
                 <!--unsettledAmount-->
                 <el-table-column
                     prop="unsettledAmountRMB"
-                    label="RMB">
+                    label="CNY">
                 </el-table-column>
                 <el-table-column
                     prop="unsettledAmountUSD"
                     label="USD">
                 </el-table-column>
             </el-table-column>
-            <el-table-column label="已结算金额">
+            <el-table-column label="已对账金额" width="140px">
                 <!--stlTtlAmount-->
                 <el-table-column
                     prop="stlTtlAmountRMB"
-                    label="RMB">
+                    label="CNY">
                 </el-table-column>
                 <el-table-column
                     prop="stlTtlAmountUSD"
                     label="USD">
                 </el-table-column>
             </el-table-column>
-            <el-table-column
-                prop="voyageNo"
-                label="结算单号(暂无字段)">
-                <template slot-scope="{ row }">
-                    <span class="textHide" >{{row.voyageNo}}</span>
-                </template>
-            </el-table-column>
+            <!--<el-table-column-->
+            <!--    prop="voyageNo"-->
+            <!--    label="结算单号(暂无字段)">-->
+            <!--    <template slot-scope="{ row }">-->
+            <!--        <span class="textHide" >{{row.voyageNo}}</span>-->
+            <!--    </template>-->
+            <!--</el-table-column>-->
             <!--paymode-->
-            <el-table-column
-                prop="paymodeH"
-                label="H付费方式">
-            </el-table-column>
-            <el-table-column
-                prop="paymodeM"
-                label="M付费方式">
-            </el-table-column>
-            <el-table-column
-                prop="eta"
-                label="三检单号(暂无字段)">
-                <template slot-scope="{ row }">
-                    <span class="textHide" >{{row.voyageNo}}</span>
-                </template>
-            </el-table-column>
+            <!--<el-table-column-->
+            <!--    prop="paymodeH"-->
+            <!--    label="H付费方式">-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="paymodeM"-->
+            <!--    label="M付费方式">-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="eta"-->
+            <!--    label="三检单号(暂无字段)">-->
+            <!--    <template slot-scope="{ row }">-->
+            <!--        <span class="textHide" >{{row.voyageNo}}</span>-->
+            <!--    </template>-->
+            <!--</el-table-column>-->
             <el-table-column
                 prop="remarkss"
                 label="备注" width="100px">

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -7,9 +7,9 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button  size="small" type="success" style="margin-right: 8px"
-                            :loading="saveLoading" >提取利润及放单
-                </el-button>
+                <!--<el-button  size="small" type="success" style="margin-right: 8px"-->
+                <!--            :loading="saveLoading" >提取利润及放单-->
+                <!--</el-button>-->
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.isChecked == 1"
                             :loading="saveLoading" @click="finstlbillsRevokeReconciliationfun">撤销对账
                 </el-button>
@@ -417,82 +417,34 @@
             <el-card style="margin-top: 10px">
                 <el-row>
                     <el-col :span="4">
-                        <div class="bottomFlex" style="justify-content: space-around">
-                            <!--<div style="text-align: center">-->
-                            <!--    <div class="weightfont">¥</div>-->
-                            <!--    <div>RMB</div>-->
-                            <!--</div>-->
-                            <div>
-                                <div style="color: #81B337">
-                                    <span>应收RMB:</span>
-                                    <span class="weightnum">${{form.amountDr || 0}}元</span>
-                                </div>
-                                <div style="color: #6BBCD1">
-                                    <span>应付RMB:</span>
-                                    <span class="weightnum">${{form.amountCr || 0}}元</span>
-                                </div>
-                            </div>
+                        <div class="bottomFlex" style="color: #81B337">
+                            <span>应收CNY:</span>
+                            <span class="weightnum">${{form.amountDr || 0}}元</span>
                         </div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="bottomFlex" style="justify-content: space-around">
-                            <!--<div style="text-align: center">-->
-                            <!--    <div class="weightfont">$</div>-->
-                            <!--    <div>USD</div>-->
-                            <!--</div>-->
-                            <div>
-                                <div style="color: #81B337">
-                                    <span>应收USD:</span>
-                                    <span class="weightnum">${{form.amountDrUsd || 0}}元</span>
-                                </div>
-                                <div style="color: #6BBCD1">
-                                    <span>应付USD:</span>
-                                    <span class="weightnum">${{form.amountCrUsd || 0}}元</span>
-                                </div>
-                            </div>
+                        <div class="bottomFlex" style="color: #6BBCD1">
+                            <span>应付CNY:</span>
+                            <span class="weightnum">${{form.amountCr || 0}}元</span>
                         </div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="bottomFlex" style="justify-content: space-around">
-                            <!--<div style="text-align: center">-->
-                            <!--    <div class="weightfont">¥</div>-->
-                            <!--    <div>税后RMB</div>-->
-                            <!--</div>-->
-                            <div>
-                                <div style="color: #81B337">
-                                    <span>税后应收RMB:</span>
-                                    <span class="weightnum">¥{{form.amountDrNet || 0}}元</span>
-                                </div>
-                                <div style="color: #6BBCD1">
-                                    <span>税后应付RMB:</span>
-                                    <span class="weightnum">¥{{form.amountCrNet || 0}}元</span>
-                                </div>
-                            </div>
+                        <div class="bottomFlex" style="color: #81B337">
+                            <span>应收USD:</span>
+                            <span class="weightnum">${{form.amountDrUsd || 0}}元</span>
                         </div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="bottomFlex" style="justify-content: space-around">
-                            <!--<div style="text-align: center">-->
-                            <!--    <div class="weightfont">$</div>-->
-                            <!--    <div>税后USD</div>-->
-                            <!--</div>-->
-                            <div>
-                                <div style="color: #81B337">
-                                    <span>税后应收USD:</span>
-                                    <span class="weightnum">${{form.amountDrUsdNet || 0}}元</span>
-                                </div>
-                                <div style="color: #6BBCD1">
-                                    <span>税后应付USD:</span>
-                                    <span class="weightnum">${{form.amountCrUsdNet || 0}}元</span>
-                                </div>
-                            </div>
+                        <div class="bottomFlex" style="color: #6BBCD1">
+                            <span>应付USD:</span>
+                            <span class="weightnum">${{form.amountCrUsd || 0}}元</span>
                         </div>
                     </el-col>
                     <el-col :span="8">
                         <div style="text-align: right">
-                            <el-button  size="small" type="primary" style="margin-right: 8px"
-                                        :loading="saveLoading" >计算合计值
-                            </el-button>
+                            <!--<el-button  size="small" type="primary" style="margin-right: 8px"-->
+                            <!--            :loading="saveLoading" >计算合计值-->
+                            <!--</el-button>-->
                             <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="!form.id"
                                         :loading="saveLoading" @click="ConfirmReceiptfun">批量签收
                             </el-button>
@@ -506,24 +458,15 @@
 
             <el-card style="margin-top: 10px">
                 <div style="margin-bottom: 10px">
-                    <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="editSave"
-                                :loading="saveLoading" @click="Confirminvoicefun">确认发票
-                    </el-button>
-                    <!--<el-button  size="small" type="primary" style="margin-right: 8px"-->
-                    <!--            :loading="saveLoading" @click="editHandle">批量确认发票-->
+                    <!--<el-button  size="small" type="primary" style="margin-right: 8px" :disabled="editSave"-->
+                    <!--            :loading="saveLoading" @click="Confirminvoicefun">确认发票-->
                     <!--</el-button>-->
-                    <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="editSave"
-                                :loading="saveLoading" @click="Notinvoicingfun">不开发票
-                    </el-button>
-                    <!--<el-button  size="small" type="primary" style="margin-right: 8px"-->
-                    <!--            :loading="saveLoading" @click="editHandle">批量不开发票-->
+                    <!--<el-button  size="small" type="primary" style="margin-right: 8px" :disabled="editSave"-->
+                    <!--            :loading="saveLoading" @click="Notinvoicingfun">不开发票-->
                     <!--</el-button>-->
                     <el-button  size="small" type="info" style="margin-right: 8px" :disabled="editSave"
                                 :loading="saveLoading" @click="SelectedRows">确认选定行
                     </el-button>
-                    <!--<el-button  size="small" type="primary" style="margin-right: 8px"-->
-                    <!--            :loading="saveLoading" @click="editHandle">选择操作行-->
-                    <!--</el-button>-->
                 </div>
 
                 <finstlbillsitems :tableData="tableData"
@@ -567,6 +510,7 @@
         },
         data(){
             return {
+                statusType:false, // 确认发票
                 tableData:[],
                 pageLoading:false, // 全屏加载动画
                 saveLoading:false, // 按钮动画
@@ -619,25 +563,19 @@
             }
         },
         watch:{
-            // // 监听业务类型 如果不是分单 可以编辑分单号
-            // form:{
-            //     // 执行方法
-            //     handler(oldValue,newValue) {
-            //         // 只要分单不能编辑
-            //         console.log(this.form,619)
-            //         if (!newValue || JSON.stringify(newValue) == '{}') {
-            //             return
-            //         }
-            //         delete this.form.id
-            //         this.tableData = []
-            //         this.form.finStlBillsItemsList = []
-            //         console.log(newValue)
-            //
-            //
-            //     },
-            //     deep: true, // 深度监听
-            //     immediate: true  // 第一次改变就执行
-            // },
+            // 监听 状态
+            "form.isChecked":{
+                // 执行方法
+                handler(oldValue,newValue) {
+                    if (oldValue == 1) {
+                        this.statusType = true
+                    }else {
+                        this.statusType = false
+                    }
+                },
+                deep: true, // 深度监听
+                immediate: true  // 第一次改变就执行
+            },
         },
         created() {
             this.allyesnoWorkDictsfun() // 获取 字典数据
@@ -737,11 +675,11 @@
                     this.$message.warning('请选择对账单位');
                     return
                 }
-                // 业务类型
-                if (!this.form.businessTypes) {
-                    this.$message.warning('请选择业务类型');
-                    return
-                }
+                // // 业务类型
+                // if (!this.form.businessTypes) {
+                //     this.$message.warning('请选择业务类型');
+                //     return
+                // }
                 if (!this.form.id) {
                     // 是否选择从表数据
                     if (this.handleSelectionData.length == 0) {
@@ -764,7 +702,7 @@
                 this.form.billNoFormat = 'HYDZ'
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账单
-                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
 
                 if (!this.form.id) {
                     this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
@@ -803,7 +741,7 @@
                 this.pageLoading = true
                 finstlbillsDetail(id).then(res=>{
                     this.form = res.data.data
-                    this.form.businessTypes = this.form.businessTypes.split(',') // 业务类型转换成数组显示
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.split(','):'' // 业务类型转换成数组显示
                     this.tableData = this.form.finStlBillsItemsList.map(item=>{
                         if(item.curCode == 'CNY') {
                             this.$set(item,'amountRMB',item.amount)
@@ -840,11 +778,11 @@
                     this.$message.warning('请选择对账单位');
                     return
                 }
-                // 业务类型
-                if (!this.form.businessTypes) {
-                    this.$message.warning('请选择业务类型');
-                    return
-                }
+                // // 业务类型
+                // if (!this.form.businessTypes) {
+                //     this.$message.warning('请选择业务类型');
+                //     return
+                // }
                 delete this.form.id
                 // let obj = JSON.parse(JSON.stringify(this.form))
                 let obj = {}
@@ -863,7 +801,7 @@
                 obj.hblno = this.form.hblno // HB/L NO
                 obj.isChecked = this.form.isChecked // 是否对账（0 未对账 1 已对账）
                 obj.queryAmount = this.form.queryAmount // 查询金额
-                obj.businessType = this.form.businessTypes.join(',') // 业务类型
+                obj.businessType = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                 obj.invoiceStatus = this.form.isInvoice // 发票状态 0 = 未开 9=已开 2 待开 3 不开
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.invoiceNo = this.form.invoiceNo // 发票号
@@ -881,8 +819,10 @@
                     obj.billDateList = this.form.accountDate
                 }
                 finstlbillslistAccBillV1(obj).then(res=>{
-                    this.tableData = res.data.data.map(item=>{
+                    this.tableData = res.data.data.map((item,index)=>{
+                        item.lineNo = Number(index) + 1
                         this.$set(item,'currentStlCurCode',item.curCode)
+                        this.$set(item,'currentStlExrate',item.exrate)
                         if(item.curCode == 'CNY') {
                             this.$set(item,'amountRMB',item.amount)
                             this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
@@ -916,7 +856,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
-                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                     finstlbillsConfirmReconciliation(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -934,7 +874,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
-                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                     finstlbillsRevokeReconciliation(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -1002,7 +942,7 @@
                 this.form.billNoFormat = 'HYDZ'
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' //对账单
-                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                 // 保留id
                 this.form.finStlBillsItemsList = this.handleSelectionData
                 this.pageLoading = true
@@ -1019,7 +959,7 @@
                 this.form.billNoFormat = 'HYDZ'
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账单
-                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
 
                 this.form.finStlBillsItemsList = this.handleSelectionData
                 this.pageLoading = true

src/views/iosBasicData/finstlbills/index.vue

@@ -102,20 +102,31 @@
             {
               label: "业务类型",
               prop: "businessType",
+              overHidden:true,
             },
             {
               label: "单据编号",
               prop: "billNo",
+                search:true,
               overHidden:true,
             },
             {
-              label: "对账/结算日期",
+              label: "对账日期",
               prop: "billDate",
+              search:true,
+              overHidden:true,
+              searchProp: 'billDateList',
+              type: "daterange",
+              searchRange: true,
+              searchDefaultTime: ["00:00:00", "23:59:59"],
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
               width:"150",
             },
             {
-              label: "客户中文名称",
+              label: "客户名称",
               prop: "corpCnName",
+                search:true,
               width:"120",
               overHidden:true,
             },
@@ -163,7 +174,6 @@
                       value:'SI'
                   }
               ],
-
             },
             {
                 label: "本位币应收(CNY)",
@@ -263,6 +273,7 @@
             {
               label: "费用收付",
               prop: "dc",
+                search:true,
               overHidden:true,
             },
             {