ソースを参照

货代发票列表和详情 2023-11-28

caojunjie 1 年間 前
コミット
be587b1085

+ 16 - 1
src/api/iosBasicData/fininvoices.js

@@ -41,5 +41,20 @@ export const fininvoicesSubmit = (row) => {
     data: row
   })
 }
-
+// 确认 业务-发票
+export const fininvoicesConfirmFinInvoices = (row) => {
+  return request({
+    url: '/api/blade-los/fininvoices/confirmFinInvoices',
+    method: 'post',
+    data: row
+  })
+}
+// 业务-发票 撤销
+export const fininvoicesRevokeFinInvoices = (row) => {
+  return request({
+    url: '/api/blade-los/fininvoices/revokeFinInvoices',
+    method: 'post',
+    data: row
+  })
+}
 

+ 129 - 252
src/views/iosBasicData/fininvoices/assembly/fininvoicesitems.vue

@@ -31,320 +31,153 @@
             <el-table-column
                 prop="billNo"
                 label="单据编号">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.mblno}}</span>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="billDate"
-                label="对账/结算日期">
-            </el-table-column>
-            <el-table-column
-                prop="accountDate"
-                label="业务财务日期">
-            </el-table-column>
-            <el-table-column
-                prop="accountYear"
-                label="财务年">
-            </el-table-column>
-            <el-table-column
-                prop="accountMonth"
-                label="财务月">
-            </el-table-column>
-            <el-table-column
-                prop="accountDay"
-                label="财务日">
-            </el-table-column>
-            <el-table-column
-                prop="sourceId"
-                label="费用中心 id">
-            </el-table-column>
-            <el-table-column
-                prop="corpId"
-                label="客户 id">
-            </el-table-column>
-            <el-table-column
-                prop="corpCnName"
-                label="客户中文名称">
+                prop="description"
+                label="收费内容">
             </el-table-column>
             <el-table-column
-                prop="corpEnName"
-                label="客户英文名称">
+                prop="descriptionMerge"
+                label="合并收费内容" width="120px">
             </el-table-column>
             <el-table-column
-                prop="deptId"
-                label="业务所在部门 Id">
+                prop="isChequeSigned"
+                label="支票是否签收" width="120px">
             </el-table-column>
             <el-table-column
-                prop="deptName"
-                label="业务所在部门">
+                prop="isInvoiceSigned"
+                label="发票是否签收" width="120px">
             </el-table-column>
             <el-table-column
-                prop="operatorId"
-                label="业务操作 Id">
+                prop="amount"
+                label="账单金额">
             </el-table-column>
             <el-table-column
-                prop="operatorName"
-                label="业务操作">
+                prop="currentCurCode"
+                label="本次发票币种" width="120px">
+                <template slot-scope="{row}">
+                    <search-query :datalist="curCodeData"
+                                  :selectValue="row.currentCurCode"
+                                  :filterable="true"
+                                  :clearable="true"
+                                  :remote="true"
+                                  :buttonIf="false"
+                                  :forParameter="{key:'id',label:'code',value:'code'}"
+                                  @remoteMethod="getRateListfun"
+                                  @corpChange="corpChange($event,row)"
+                                  @corpFocus="getRateListfun">
+                    </search-query>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="srcType"
-                label="业务来源">
+                prop="currentExrate"
+                label="本次发票汇率" width="100px">
             </el-table-column>
             <el-table-column
-                prop="srcId"
-                label="来源 id">
+                prop="currentTaxRate"
+                label="本次发票税率" width="100px">
+                <template slot-scope="{row}">
+                    <el-input style="width: 100%;" v-model="row.currentTaxRate"
+                              size="mini" autocomplete="off"
+                              clearable placeholder="请输入本次发票税率" @input="currentInput" >
+                    </el-input>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="srcCnName"
-                label="来源中文">
+                prop="currentSurRate"
+                label="本次发票附加税率" width="120px">
+                <template slot-scope="{row}">
+                    <el-input style="width: 100%;" v-model="row.currentSurRate"
+                              size="mini" autocomplete="off"
+                              clearable placeholder="请输入本次发票附加税率" @input="currentInput(row)" >
+                    </el-input>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="srcEnName"
-                label="来源英文">
+                prop="currentAmountTax"
+                label="税额">
             </el-table-column>
             <el-table-column
-                prop="lineId"
-                label="航线 id">
+                prop="currentAmountNet"
+                label="去税金额">
             </el-table-column>
             <el-table-column
-                prop="lineCnName"
-                label="航线中文名称">
+                prop="uninvoicedAmount"
+                label="已开发票金额" width="120px">
             </el-table-column>
             <el-table-column
-                prop="lineEnName"
-                label="航线英文名称">
+                prop="currentAmount"
+                label="本次发票金额" width="120px">
+                <template slot-scope="{row}">
+                    <el-input style="width: 100%;" v-model="row.currentAmount"
+                              size="mini" autocomplete="off"
+                              clearable placeholder="请输入本次发票金额" >
+                    </el-input>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="vesselId"
-                label="船名 id">
+                prop="currentAmountLoc"
+                label="本次发票本币金额" width="120px">
             </el-table-column>
             <el-table-column
-                prop="vesselCnName"
-                label="中文船名">
+                prop="billDate"
+                label="开票日期" width="140px">
             </el-table-column>
             <el-table-column
-                prop="vesselEnName"
-                label="英文船名">
+                prop="corpCnName"
+                label="客户中文名称" width="140px">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.corpCnName}}</span>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="voyageNo"
-                label="航次">
+                prop="corpEnName"
+                label="客户英文名称" width="140px">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.corpEnName}}</span>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="mblno"
                 label="MB/L NO">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.mblno}}</span>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="hblno"
                 label="HB/L NO">
             </el-table-column>
             <el-table-column
-                prop="iqNo"
-                label="检验检疫 NO">
-            </el-table-column>
-            <el-table-column
-                prop="etd"
-                label="开船日期">
-            </el-table-column>
-            <el-table-column
-                prop="eta"
-                label="到港日期">
-            </el-table-column>
-            <el-table-column
-                prop="polId"
-                label="装货港 id">
-            </el-table-column>
-            <el-table-column
-                prop="polCode"
-                label="装货港代码">
-            </el-table-column>
-            <el-table-column
-                prop="polCnName"
-                label="装货港中文名称">
-            </el-table-column>
-            <el-table-column
-                prop="polEnName"
-                label="装货港英文名称">
-            </el-table-column>
-            <el-table-column
-                prop="podId"
-                label="卸货港 id">
-            </el-table-column>
-            <el-table-column
-                prop="podCode"
-                label="卸货港代码">
-            </el-table-column>
-            <el-table-column
-                prop="podCnName"
-                label="卸货港中文名称">
-            </el-table-column>
-            <el-table-column
-                prop="podEnName"
-                label="卸货港英文名称">
-            </el-table-column>
-            <el-table-column
-                prop="cntrNo"
-                label="箱号">
-            </el-table-column>
-            <el-table-column
-                prop="quantityPackingDescr"
-                label="商品包装件数英文">
-            </el-table-column>
-            <el-table-column
-                prop="quantityCntrTypesDescr"
-                label="集装箱箱型箱数英文">
-            </el-table-column>
-            <el-table-column
-                prop="feeId"
-                label="费用 Id">
-            </el-table-column>
-            <el-table-column
-                prop="feeCode"
-                label="费用编号">
-            </el-table-column>
-            <el-table-column
                 prop="feeCnName"
-                label="费用中文名称">
-            </el-table-column>
-            <el-table-column
-                prop="feeEnName"
-                label="费用英文名称">
+                label="费用名称">
             </el-table-column>
             <el-table-column
                 prop="paymode"
                 label="付款方式">
             </el-table-column>
             <el-table-column
-                prop="accBillId"
-                label="账单 Id">
-            </el-table-column>
-            <el-table-column
                 prop="accBillNo"
                 label="账单编号">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.mblno}}</span>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="accDate"
                 label="账单日期">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.mblno}}</span>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="dc"
                 label="费用收付">
             </el-table-column>
             <el-table-column
-                prop="quantity"
-                label="数量">
-            </el-table-column>
-            <el-table-column
-                prop="unitNo"
-                label="单位">
-            </el-table-column>
-            <el-table-column
-                prop="price"
-                label="单价">
-            </el-table-column>
-            <el-table-column
-                prop="curCode"
-                label="原币种">
-            </el-table-column>
-            <el-table-column
-                prop="exrate"
-                label="原汇率">
-            </el-table-column>
-            <el-table-column
-                prop="isTax"
-                label="是否含税">
-            </el-table-column>
-            <el-table-column
-                prop="taxType"
-                label="税种">
-            </el-table-column>
-            <el-table-column
-                prop="taxRate"
-                label="税率%">
-            </el-table-column>
-            <el-table-column
-                prop="surchargeRate"
-                label="附加税率%">
-            </el-table-column>
-            <el-table-column
-                prop="amountDiscount"
-                label="折扣金额">
-            </el-table-column>
-            <el-table-column
-                prop="amountTax"
-                label="税额">
-            </el-table-column>
-            <el-table-column
-                prop="amountNet"
-                label="去税金额">
-            </el-table-column>
-            <el-table-column
-                prop="amount"
-                label="金额">
-            </el-table-column>
-            <el-table-column
-                prop="amountTaxLoc"
-                label="本币税额">
-            </el-table-column>
-            <el-table-column
-                prop="amountNetLoc"
-                label="本币去税金额">
-            </el-table-column>
-            <el-table-column
-                prop="amountDiscountLoc"
-                label="本币折扣金额">
-            </el-table-column>
-            <el-table-column
-                prop="amountLoc"
-                label="本币金额">
-            </el-table-column>
-            <el-table-column
-                prop="description"
-                label="收费内容">
-            </el-table-column>
-            <el-table-column
-                prop="descriptionMerge"
-                label="合并收费内容">
-            </el-table-column>
-            <el-table-column
-                prop="currentCurCode"
-                label="本次发票币种">
-            </el-table-column>
-            <el-table-column
-                prop="currentExrate"
-                label="本次发票汇率">
-            </el-table-column>
-            <el-table-column
-                prop="currentTaxRate"
-                label="本次发票税率">
-            </el-table-column>
-            <el-table-column
-                prop="currentSurRate"
-                label="本次发票附加税率">
-            </el-table-column>
-            <el-table-column
-                prop="currentAmountTax"
-                label="税额">
-            </el-table-column>
-            <el-table-column
-                prop="currentAmountNet"
-                label="去税金额">
-            </el-table-column>
-            <el-table-column
-                prop="currentAmount"
-                label="本次发票金额">
-            </el-table-column>
-            <el-table-column
-                prop="currentAmountLoc"
-                label="本次发票本币金额">
-            </el-table-column>
-            <el-table-column
-                prop="isChequeSigned"
-                label="支票是否签收">
-            </el-table-column>
-            <el-table-column
-                prop="isInvoiceSigned"
-                label="发票是否签收">
-            </el-table-column>
-            <el-table-column
                 prop="lineNo"
                 label="备注">
             </el-table-column>
@@ -353,19 +186,57 @@
 </template>
 
 <script>
+    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+    import {getRateList} from "@/api/iosBasicData/rateManagement";
+
     export default {
+        components: {SearchQuery},
         props:{
             tableData:{
                 type:Array,
                 default:[]
             },
+            handleSelectionData:{
+                type:Array,
+                default:[],
+            }
         },
         data(){
             return {
-
+                curCodeData:[], // 本次币种
             }
         },
         methods:{
+            // 下拉回调
+            corpChange(value,row){
+                console.log(value)
+                for (let item of this.curCodeData) {
+                    if (item.code == value) {
+                        this.$set(row,'currentCurCode',item.code)
+                        this.$set(row,'currentExrate',item.exrate) // 本次发票税率
+
+                        if (value == 'USD') {
+                            this.$set(row,'currentAmountLoc',(Number(row.amount) * Number(row.currentExrate)).toFixed(2))
+                        }else {
+                            this.$set(row,'currentAmountLoc',row.amount)
+                        }
+                    }
+                }
+            },
+            // 税率监听
+            currentInput(row){
+                // 税额 两个税率加起来 / 100 乘 账单金额
+                let current = Number(row.currentTaxRate) + Number(row.currentSurRate)
+                this.$set(row,'currentAmountTax',(current / 100) * Number(row.amount)) // 税额
+                this.$set(row,'currentAmountNet',Number(row.amount) - row.currentAmountTax) // 去税金额
+            },
+            // 获取币别数据
+            getRateListfun(cnName){
+                getRateList({current:1,size:10,cnName}).then(res=>{
+                    this.curCodeData = res.data.data.records
+                })
+            },
+
             // 表头样式
             tableHeaderCellStyle({row,column,rowIndex, columnIndex}){
                 return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff"
@@ -494,4 +365,10 @@
 ::v-deep.current-row {
     background: red;
 }
+.textHide {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
 </style>

+ 276 - 67
src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -15,6 +15,12 @@
                            size="small"
                            plain>导出到税控
                 </el-button>
+                <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == 1"
+                            :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销发票
+                </el-button>
+                <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"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
@@ -28,7 +34,7 @@
                 <el-card class="box-card">
                     <el-row>
                         <el-col :span="5">
-                            <el-form-item label="业务编号" prop="businessNo">
+                            <el-form-item label="业务编号" prop="billNo">
                                 <el-input style="width: 100%;" v-model="form.billNo"
                                           size="small" autocomplete="off"
                                           :disabled="true"
@@ -51,7 +57,7 @@
                             <el-form-item label="制单人" prop="createUserName">
                                 <el-input style="width: 100%;" v-model="form.createUserName"
                                           size="small" autocomplete="off"
-                                          :disabled="editSave"
+                                          :disabled="true"
                                           clearable placeholder="请输入制单人" >
                                 </el-input>
                             </el-form-item>
@@ -91,7 +97,7 @@
                                 <el-form-item label="发票号码" prop="invoiceNo">
                                     <el-input style="width: 100%;" v-model="form.invoiceNo"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="true"
                                               clearable placeholder="请输入发票号码" >
                                     </el-input>
                                 </el-form-item>
@@ -102,7 +108,7 @@
                                                     style="width: 100%;"
                                                     type="date" size="small"
                                                     :disabled="true"
-                                                    value-format="yyyy-MM-dd HH:mm"
+                                                    value-format="yyyy-MM-dd HH:mm:ss"
                                                     placeholder="选择开票日期">
                                     </el-date-picker>
                                 </el-form-item>
@@ -111,45 +117,76 @@
                                 <el-form-item label="税号" prop="invCorpTaxNo">
                                     <el-input style="width: 100%;" v-model="form.invCorpTaxNo"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="true"
                                               clearable placeholder="请输入税号" >
                                     </el-input>
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="24">
+                                <el-form-item label="开票单位" prop="invCorpCnName">
+                                    <search-query :datalist="invCorpData"
+                                                  :selectValue="form.invCorpCnName"
+                                                  :clearable="true"
+                                                  :disabled="editSave"
+                                                  :buttonIf="false"
+                                                  :remote="true"
+                                                  :filterable="true"
+                                                  placeholder="请选择开票单位"
+                                                  :forParameter="{ key:'id', label:'cnName', value:'cnName'}"
+                                                  @corpChange="corpChange($event,'invCorpCnName')"
+                                                  @remoteMethod="invCorpBcorpsListfun"
+                                                  @corpFocus="invCorpBcorpsListfun" >
+                                    </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"
-                                              :disabled="editSave"
+                                              :disabled="true"
                                               clearable placeholder="请输入美元银行" >
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="美元账户" prop="invCorpAccountNoUsd">
-                                    <el-input style="width: 100%;" v-model="form.invCorpAccountNoUsd"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入美元账户" >
-                                    </el-input>
+                                    <search-query :datalist="invCorpAccountUSDData"
+                                                  :selectValue="form.invCorpAccountNoUsd"
+                                                  :clearable="true"
+                                                  :disabled="editSave || !form.invCorpId"
+                                                  :buttonIf="false"
+                                                  :remote="true"
+                                                  :filterable="true"
+                                                  placeholder="请输入美元账户"
+                                                  :forParameter="{ key:'id', label:'accountNo', value:'accountNo'}"
+                                                  @corpChange="corpChange($event,'invCorpAccountNoUsd')"
+                                                  @remoteMethod="invCorpAccountBankUsdListfun">
+                                    </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.invCorpAccountNoCny"
+                                <el-form-item label="人民币银行" prop="invCorpAccountBankCny">
+                                    <el-input style="width: 100%;" v-model="form.invCorpAccountBankCny"
                                               size="small" autocomplete="off"
-                                              :disabled="editSave"
+                                              :disabled="true"
                                               clearable placeholder="请输入美元银行" >
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="人民币账户" prop="invCorpAccountNoUsd">
-                                    <el-input style="width: 100%;" v-model="form.invCorpAccountNoCny"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入美元账户" >
-                                    </el-input>
+                                <el-form-item label="人民币账户" prop="invCorpAccountNoCny">
+                                    <search-query :datalist="invCorpAccountCNYData"
+                                                  :selectValue="form.invCorpAccountNoCny"
+                                                  :clearable="true"
+                                                  :disabled="editSave || !form.invCorpId"
+                                                  :buttonIf="false"
+                                                  :remote="true"
+                                                  :filterable="true"
+                                                  placeholder="请输入人民币账户"
+                                                  :forParameter="{ key:'id', label:'accountNo', value:'accountNo'}"
+                                                  @corpChange="corpChange($event,'invCorpAccountNoCny')"
+                                                  @remoteMethod="invCorpAccountBankCnyListfun">
+                                    </search-query>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -167,7 +204,7 @@
                                                     style="width: 100%;"
                                                     type="date" size="small"
                                                     :disabled="editSave"
-                                                    value-format="yyyy-MM-dd HH:mm"
+                                                    value-format="yyyy-MM-dd HH:mm:ss"
                                                     placeholder="请输入开航日期">
                                     </el-date-picker>
                                 </el-form-item>
@@ -232,15 +269,6 @@
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="24">
-                                <el-form-item label="开票单位" prop="invCorpCnName">
-                                    <el-input style="width: 100%;" v-model="form.invCorpCnName"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入开票单位" >
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
                         </el-row>
                     </div>
                     <div class="cardBox flexBoxRight">
@@ -250,6 +278,8 @@
                                     v-model="form.stlMode"
                                     active-value="1"
                                     inactive-value="0"
+                                    active-color="#66dd7a"
+                                    inactive-color="#4ea6ea"
                                     active-text="票结"
                                     inactive-text="月结">
                                 </el-switch>
@@ -309,7 +339,7 @@
                                                     style="width: 100%;"
                                                     type="date" size="small"
                                                     :disabled="editSave"
-                                                    value-format="yyyy-MM-dd HH:mm"
+                                                    value-format="yyyy-MM-dd HH:mm:ss"
                                                     placeholder="选择开票日期">
                                     </el-date-picker>
                                 </el-form-item>
@@ -364,7 +394,7 @@
                                     <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>
@@ -406,15 +436,20 @@
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="发票类型" prop="invType">
-                                    <el-input style="width: 100%;" v-model="form.invType"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入发票类型" >
-                                    </el-input>
+                                    <search-query :datalist="invTypeData"
+                                                  :selectValue="form.invType"
+                                                  :clearable="true"
+                                                  :disabled="editSave"
+                                                  :buttonIf="false"
+                                                  placeholder="请输入发票类型"
+                                                  :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                                                  @corpChange="corpChange($event,'isInvoice')"
+                                                  @corpFocus="invTypeWorkDictsfun" >
+                                    </search-query>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="账单号" prop="bookingNo">
+                                <el-form-item label="无字段账单号" prop="bookingNo">
                                     <el-input style="width: 100%;" v-model="form.bookingNo"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
@@ -457,6 +492,7 @@
                                                   :disabled="editSave"
                                                   :buttonIf="false"
                                                   :multiple="true"
+                                                  :collapseTags="true"
                                                   placeholder="请输入业务类型"
                                                   @corpChange="corpChange($event,'businessTypes')">
                                     </search-query>
@@ -527,17 +563,20 @@
                 </el-card>
 
                 <el-card style="margin-top: 10px">
-                    <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
-                        <div>
-                            <el-button size="small" type="primary">新 建</el-button>
-                            <el-button size="small" type="danger">删 除</el-button>
-                        </div>
-                        <div>
-                            <el-button size="small" type="primary" plain>全部选择</el-button>
-                            <el-button size="small" type="primary" plain>确认费用</el-button>
-                        </div>
-                    </div>
-                    <fininvoicesitems :tableData="[]"></fininvoicesitems>
+                    <!--<div style="margin-bottom: 10px;display: flex;justify-content: space-between">-->
+                    <!--    <div>-->
+                    <!--        <el-button size="small" type="primary">新 建</el-button>-->
+                    <!--        <el-button size="small" type="danger">删 除</el-button>-->
+                    <!--    </div>-->
+                    <!--    <div>-->
+                    <!--        <el-button size="small" type="primary" plain>全部选择</el-button>-->
+                    <!--        <el-button size="small" type="primary" plain>确认费用</el-button>-->
+                    <!--    </div>-->
+                    <!--</div>-->
+                    <fininvoicesitems :tableData="tableData"
+                                      :handleSelectionData="handleSelectionData"
+                                      @handleSelectionChange="handleSelectionChange">
+                    </fininvoicesitems>
                 </el-card>
 
             </el-form>
@@ -552,17 +591,29 @@ import {finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
 import {bcorpsbankList, getBcorpsList} from "@/api/iosBasicData/bcorps";
 import {bportsList} from "@/api/iosBasicData/bports";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {fininvoicesDetail, fininvoicesSubmit} from "@/api/iosBasicData/fininvoices";
+import {
+    fininvoicesConfirmFinInvoices,
+    fininvoicesDetail,
+    fininvoicesRevokeFinInvoices,
+    fininvoicesSubmit
+} from "@/api/iosBasicData/fininvoices";
+import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
+import {getWorkDicts} from "@/api/system/dictbiz";
 
 export default {
-        components:{SearchQuery, fininvoicesitems},
+        components:{finstlbillsitems, SearchQuery, fininvoicesitems},
         data() {
             return {
                 pageLoading:false, // 全屏加载
                 saveLoading:false, // 按钮加载
                 form:{},
+                tableData:[], // 从表数据
+                handleSelectionData:[], // 选择的数据
                 corpData:[], // 结算单位数据
-                bankReceiptData:[], // 银行账号数据
+                invCorpData:[], // 开票单位
+                bankReceiptData:[], // 结算单位银行账号数据
+                invCorpAccountCNYData:[],// 开票单位CNY银行数据
+                invCorpAccountUSDData:[], // 开票单位USD银行数据
                 // 业务类型
                 businessTypesData:[
                     {
@@ -578,6 +629,7 @@ export default {
                 podData:[], // 卸货港
                 polData:[], // 装货港
                 invCurCodeData:[], // 发票币种
+                invTypeData:[], // 发票类型
             }
         },
         props:{
@@ -587,6 +639,7 @@ export default {
             }
         },
         methods:{
+            fininvoicesConfirmFinInvoices,
             // 下拉框的回调
             corpChange(value,name){
                 // 结算单位
@@ -606,7 +659,29 @@ export default {
                         }
                     }
                 }
-                // 银行账户
+                // 开票单位
+                else if (name == 'invCorpCnName') {
+                    this.$set(this.form,'invCorpAccountBankUsd','')
+                    this.$set(this.form,'invCorpAccountNoUsd','')
+                    this.$set(this.form,'invCorpAccountBankCny','')
+                    this.$set(this.form,'invCorpAccountNoCny','')
+                    if (!value) {
+                        this.$set(this.form,'invCorpId','')
+                        this.$set(this.form,'invCorpCnName','')
+                        this.$set(this.form,'invCorpEnName','')
+                        return
+                    }
+                    for(let item of this.invCorpData) {
+                        if (item.cnName == value) {
+                            this.$set(this.form,'invCorpId',item.id)
+                            this.$set(this.form,'invCorpCnName',item.cnName)
+                            this.$set(this.form,'invCorpEnName',item.enName)
+                            this.invCorpAccountBankCnyListfun()
+                            this.invCorpAccountBankUsdListfun()
+                        }
+                    }
+                }
+                // 结算单位银行账户
                 else if(name == 'bankReceiptAccountNo') {
                     for(let item of this.bankReceiptData) {
                         if (item.accountNo == value) {
@@ -615,37 +690,140 @@ export default {
                         }
                     }
                 }
+                // 开票单位的CNY银行账户
+                else if (name == 'invCorpAccountNoCny') {
+                    for (let item of this.invCorpAccountCNYData) {
+                        if (item.accountNo == value) {
+                            this.$set(this.form,'invCorpAccountBankCny',item.accountBank)
+                            this.$set(this.form,'invCorpAccountNoCny',item.accountNo)
+                        }
+                    }
+                }
+                // 开票单位的USD银行账户
+                else if (name == 'invCorpAccountNoUsd') {
+                    for (let item of this.invCorpAccountUSDData) {
+                        if (item.accountNo == value) {
+                            this.$set(this.form,'invCorpAccountBankUsd',item.accountBank)
+                            this.$set(this.form,'invCorpAccountNoUsd',item.accountNo)
+                        }
+                    }
+                }
                 else {
                     this.$set(this.form,name,value)
                 }
 
             },
+            // 下面表格多选
+            handleSelectionChange(arr){
+                this.handleSelectionData = arr
+            },
             // 编辑事件
             editHandle(){
-
+                this.editSave = false
             },
             // 保存按钮事件
             editCustomer(){
-
-                // this.fininvoicesSubmitfun()
+                // 开票单位
+                if (!this.form.corpId) {
+                    this.$message.warning('请选择开票单位');
+                    return
+                }
+                // 进项  销项
+                this.form.type = '进项'
+                this.form.billNoFormat = 'HYFP'
+                this.form.businessTypeCode = 'HYFP'
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
+                if (!this.form.id) {
+                    this.form.finInvoicesItemsList = this.handleSelectionData
+                }
+                this.saveLoading = true
+                this.fininvoicesSubmitfun(this.form)
             },
             // 检索
             finstlbillslistAccBillV1fun(){
-                console.log(this.form,624)
-                // finstlbillslistAccBillV1().then(res=>{
-                //
-                // })
+                if (!this.form.corpId) {
+                    this.$message.warning('请选择结算单位');
+                    return
+                }
+                delete this.form.id
+                let obj = {}
+                obj.type = '3'
+                obj.corpCnName = this.form.corpId // 结算单位
+                obj.invoiceDate = this.form.invoiceDate //开票日期
+                obj.billNo = this.form.bookingNo // 账单号
+                obj.businessBillNo = this.form.billNo // 业务编号
+                obj.mblno = this.form.mblno // 主单编号
+                obj.hblno = this.form.hblno // 分单编号
+                obj.checkBillNo = this.form.checkNo // 对账单号
+                obj.bookingNo = this.form.bookingNo // 订舱号(BOOK NO)
+                obj.curCode = this.form.curCode // 币种
+                obj.businessType = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
+                finstlbillslistAccBillV1(obj).then(res=>{
+                    this.tableData = res.data.data.map((item,index)=>{
+                        item.lineNo = index // 行号
+                        item.accBillId = item.id
+                        item.accBillNo = item.billNo
+                        item.accDate = item.createTime
+
+                        item.currentAmount = Number(item.amount) - Number(item.uninvoicedAmount) // 本次发票金额
+
+                        delete item.id
+                        return item
+                    })
+                })
             },
             // 保存接口
-            fininvoicesSubmitfun(){
-                fininvoicesSubmit().then(res=>{
-                    console.log(res,'保存')
+            fininvoicesSubmitfun(obj){
+                fininvoicesSubmit(obj).then(res=>{
+                    this.saveLoading = false
+                    this.$message.success('操作成功');
+                    this.fininvoicesDetailfun(res.data.data.id)
                 })
             },
             // 详情接口
-            fininvoicesDetailfun(){
-                fininvoicesDetail().then(res=>{
-                    console.log(res,648)
+            fininvoicesDetailfun(id){
+                this.pageLoading = true
+                fininvoicesDetail(id).then(res=>{
+                    this.form = res.data.data
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.split(','):[] // 业务类型转换成数组显示
+                    this.tableData = this.form.finInvoicesItemsList
+                    this.pageLoading = false
+                })
+            },
+            // 确认发票
+            fininvoicesConfirmFinInvoicesfun(){
+                this.$confirm("确定进行对账操作?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(res=>{
+                    this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
+                    fininvoicesConfirmFinInvoices(this.form).then(res=>{
+                        this.pageLoading = false
+                        this.$message.success('操作成功');
+                        this.fininvoicesDetailfun(res.data.data.id)
+                    }).catch(err=>{
+                        this.pageLoading = false
+                    })
+                })
+            },
+            // 撤销发票
+            fininvoicesRevokeFinInvoicesfun(){
+                this.$confirm("确定进行撤销对账操作?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(res=>{
+                    this.pageLoading = true
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
+                    fininvoicesRevokeFinInvoices(this.form).then(res=>{
+                        this.pageLoading = false
+                        this.$message.success('操作成功');
+                        this.fininvoicesDetailfun(res.data.data.id)
+                    }).catch(err=>{
+                        this.pageLoading = false
+                    })
                 })
             },
             //返回列表
@@ -658,6 +836,12 @@ export default {
                     this.corpData = res.data.data.records
                 })
             },
+            // 获取客户名称数据 开票单位数据
+            invCorpBcorpsListfun(cnName){
+                getBcorpsList(1,10,{cnName}).then(res=>{
+                    this.invCorpData = res.data.data.records
+                })
+            },
             // 根据往来单位选择调用获取银行数据
             bcorpsbankListfun(accountNo){
                 bcorpsbankList(1,10,{
@@ -668,6 +852,26 @@ export default {
                     this.bankReceiptData = res.data.data.records
                 })
             },
+            // 根据开票单位获取CNY银行数据
+            invCorpAccountBankUsdListfun(accountNo){
+                bcorpsbankList(1,10,{
+                    curNo:'USD',
+                    pid:this.form.invCorpId,
+                    accountNo:accountNo
+                }).then(res=>{
+                    this.invCorpAccountUSDData = res.data.data.records
+                })
+            },
+            // 根据开票单位获取CNY银行数据
+            invCorpAccountBankCnyListfun(accountNo){
+                bcorpsbankList(1,10,{
+                    curNo:'CNY',
+                    pid:this.form.invCorpId,
+                    accountNo:accountNo
+                }).then(res=>{
+                    this.invCorpAccountCNYData = res.data.data.records
+                })
+            },
             // 获取币别数据
             getRateListfun(cnName){
                 getRateList({current:1,size:10,cnName}).then(res=>{
@@ -698,7 +902,12 @@ export default {
                     this.polData = res.data.data.records
                 })
             },
-
+            // 发票类型字典数据
+            invTypeWorkDictsfun(){
+                getWorkDicts('inv_type_los').then(res=>{
+                    this.invTypeData = res.data.data;
+                })
+            },
 
         },
     }

+ 166 - 488
src/views/iosBasicData/fininvoices/index.vue

@@ -37,6 +37,44 @@
                              @click="handleDelete">删 除
                   </el-button>
               </template>
+              <template slot="menu" slot-scope="{row}">
+                  <el-button type="text"
+                             size="small"
+                             @click="editFun(row)">编辑
+                  </el-button>
+                  <el-button type="text"
+                             size="small"
+                             @click="rowDel(row)">删除
+                  </el-button>
+              </template>
+              <template slot-scope="scope" slot="billNo">
+                  <avue-text-ellipsis :text="scope.row.billNo" :height="30" use-tooltip placement="top">
+                      <small slot="more">...</small>
+                  </avue-text-ellipsis>
+              </template>
+              <template slot-scope="scope" slot="corpCnName">
+                  <avue-text-ellipsis :text="scope.row.corpCnName" :height="30" use-tooltip placement="top">
+                      <small slot="more">...</small>
+                  </avue-text-ellipsis>
+              </template>
+              <template slot-scope="scope" slot="corpEnName">
+                  <avue-text-ellipsis :text="scope.row.corpEnName" :height="30" use-tooltip placement="top">
+                      <small slot="more">...</small>
+                  </avue-text-ellipsis>
+              </template>
+              <template slot-scope="scope" slot="invCorpCnName">
+                  <avue-text-ellipsis :text="scope.row.invCorpCnName" :height="30" use-tooltip placement="top">
+                      <small slot="more">...</small>
+                  </avue-text-ellipsis>
+              </template>
+              <template slot-scope="scope" slot="invCorpEnName">
+                  <avue-text-ellipsis :text="scope.row.invCorpEnName" :height="30" use-tooltip placement="top">
+                      <small slot="more">...</small>
+                  </avue-text-ellipsis>
+              </template>
+              <template slot-scope="scope" slot="stlMode">
+                  <span>{{scope.row.stlMode?'月结':'票结'}}</span>
+              </template>
           </avue-crud>
       </basic-container>
       <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack"></fininvoicesDetails>
@@ -81,98 +119,9 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
+            menuWidth:100,
           column: [
             {
-              label: "主键",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入主键",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "分公司 Id",
-              prop: "branchId",
-              rules: [{
-                required: true,
-                message: "请输入分公司 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建人 Id",
-              prop: "createUser",
-              rules: [{
-                required: true,
-                message: "请输入创建人 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建人",
-              prop: "createUserName",
-              rules: [{
-                required: true,
-                message: "请输入创建人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建部门 Id",
-              prop: "createDept",
-              rules: [{
-                required: true,
-                message: "请输入创建部门 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建部门",
-              prop: "createDeptName",
-              rules: [{
-                required: true,
-                message: "请输入创建部门",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改人 Id",
-              prop: "updateUser",
-              rules: [{
-                required: true,
-                message: "请输入修改人 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改人",
-              prop: "updateUserName",
-              rules: [{
-                required: true,
-                message: "请输入修改人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改时间",
-              prop: "updateTime",
-              rules: [{
-                required: true,
-                message: "请输入修改时间",
-                trigger: "blur"
-              }]
-            },
-            {
               label: "单据编号",
               prop: "billNo",
               rules: [{
@@ -211,38 +160,21 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
             {
               label: "原发票号码",
               prop: "origInvoiceNo",
-              rules: [{
-                required: true,
-                message: "请输入原发票号码",
-                trigger: "blur"
-              }]
+                width:"120"
             },
             {
               label: "税务发票号码",
               prop: "taxInvoiceNo",
-              rules: [{
-                required: true,
-                message: "请输入税务发票号码",
-                trigger: "blur"
-              }]
+                width:"150"
             },
             {
-              label: "发票类型:全电",
+              label: "全电发票",
               prop: "invType",
-              rules: [{
-                required: true,
-                message: "请输入发票类型:全电",
-                trigger: "blur"
-              }]
             },
             {
-              label: "所属税种: 普通发票 专用发票",
+              label: "普通发票/专用发票",
               prop: "taxType",
-              rules: [{
-                required: true,
-                message: "请输入所属税种: 普通发票 专用发票",
-                trigger: "blur"
-              }]
+                width:"160"
             },
             {
               label: "税率 %",
@@ -254,13 +186,8 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
               }]
             },
             {
-              label: "结算方式(0 票结 1月结)",
+              label: "结算方式",
               prop: "stlMode",
-              rules: [{
-                required: true,
-                message: "请输入结算方式(0 票结 1月结)",
-                trigger: "blur"
-              }]
             },
             {
               label: "发票币种",
@@ -272,553 +199,294 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
               }]
             },
             {
-              label: "客户 id",
-              prop: "corpId",
-              rules: [{
-                required: true,
-                message: "请输入客户 id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "客户中文名称,显示不修改",
+              label: "客户中文名称",
               prop: "corpCnName",
-              rules: [{
-                required: true,
-                message: "请输入客户中文名称,显示不修改",
-                trigger: "blur"
-              }]
+                width:"120"
             },
             {
-              label: "客户英文名称,显示不修改",
+              label: "客户英文名称",
               prop: "corpEnName",
-              rules: [{
-                required: true,
-                message: "请输入客户英文名称,显示不修改",
-                trigger: "blur"
-              }]
+                width:"120"
             },
             {
-              label: "客户开票单位名称,可修改",
+              label: "客户开票单位名称",
               prop: "corpInvoiceHeader",
-              rules: [{
-                required: true,
-                message: "请输入客户开票单位名称,可修改",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "开票单位 id",
-              prop: "invCorpId",
-              rules: [{
-                required: true,
-                message: "请输入开票单位 id",
-                trigger: "blur"
-              }]
+                width:"150"
             },
             {
               label: "开票单位中文名称",
               prop: "invCorpCnName",
-              rules: [{
-                required: true,
-                message: "请输入开票单位中文名称",
-                trigger: "blur"
-              }]
+                width:"160"
             },
             {
               label: "开票单位英文名称",
               prop: "invCorpEnName",
-              rules: [{
-                required: true,
-                message: "请输入开票单位英文名称",
-                trigger: "blur"
-              }]
+                width:"150"
             },
             {
               label: "开票单位税号",
               prop: "invCorpTaxNo",
-              rules: [{
-                required: true,
-                message: "请输入开票单位税号",
-                trigger: "blur"
-              }]
+                width:"140"
             },
             {
-              label: "开票单位 CNY 开户银行",
+              label: "开票单位CNY开户银行",
               prop: "invCorpAccountBankCny",
-              rules: [{
-                required: true,
-                message: "请输入开票单位 CNY 开户银行",
-                trigger: "blur"
-              }]
+                width:"160"
             },
             {
-              label: "开票单位 CNY 银行账号",
+              label: "开票单位CNY银行账号",
               prop: "invCorpAccountNoCny",
-              rules: [{
-                required: true,
-                message: "请输入开票单位 CNY 银行账号",
-                trigger: "blur"
-              }]
+                width:"160"
             },
             {
-              label: "开票单位 CNY 开户银行",
+              label: "开票单位USD开户银行",
               prop: "invCorpAccountBankUsd",
-              rules: [{
-                required: true,
-                message: "请输入开票单位 CNY 开户银行",
-                trigger: "blur"
-              }]
+                width:"160"
             },
             {
-              label: "开票单位 CNY 银行账号",
+              label: "开票单位USD银行账号",
               prop: "invCorpAccountNoUsd",
-              rules: [{
-                required: true,
-                message: "请输入开票单位 CNY 银行账号",
-                trigger: "blur"
-              }]
+                width:"160"
             },
             {
-              label: "船名航次",
+              label: "船名/航次",
               prop: "vesselVoyno",
-              rules: [{
-                required: true,
-                message: "请输入船名、航次",
-                trigger: "blur"
-              }]
+                width:"100"
             },
             {
               label: "开船日",
               prop: "etd",
-              rules: [{
-                required: true,
-                message: "请输入开船日",
-                trigger: "blur"
-              }]
             },
             {
               label: "装货港",
               prop: "pol",
-              rules: [{
-                required: true,
-                message: "请输入装货港",
-                trigger: "blur"
-              }]
             },
             {
               label: "卸货港",
               prop: "pod",
-              rules: [{
-                required: true,
-                message: "请输入卸货港",
-                trigger: "blur"
-              }]
             },
             {
               label: "目的地",
               prop: "destination",
-              rules: [{
-                required: true,
-                message: "请输入目的地",
-                trigger: "blur"
-              }]
             },
             {
-              label: "箱型箱量",
+              label: "箱型/箱量",
               prop: "containers",
-              rules: [{
-                required: true,
-                message: "请输入箱型、箱量",
-                trigger: "blur"
-              }]
+                width:"100"
             },
             {
-              label: "币种,用于检索费用,空字符串表示所有币种",
+              label: "币种",
               prop: "curCode",
-              rules: [{
-                required: true,
-                message: "请输入币种,用于检索费用,空字符串表示所有币种",
-                trigger: "blur"
-              }]
             },
             {
-              label: "原汇率,外币转为本币的汇率",
+              label: "原汇率",
               prop: "exrate",
-              rules: [{
-                required: true,
-                message: "请输入原汇率,外币转为本币的汇率",
-                trigger: "blur"
-              }]
             },
             {
-              label: "是否转换为人民币(0 否 1是)",
+              label: "是否转换为人民币",
               prop: "isExchangeToCny",
-              rules: [{
-                required: true,
-                message: "请输入是否转换为人民币(0 否 1是)",
-                trigger: "blur"
-              }]
+                width:"140",
+                dicData:[{
+                    label:'否',
+                    value:0
+                },{
+                    label:'是',
+                    value:1
+                },]
             },
             {
-              label: "业务类型,用于检索费用",
+              label: "业务类型",
               prop: "businessTypes",
-              rules: [{
-                required: true,
-                message: "请输入业务类型,用于检索费用",
-                trigger: "blur"
-              }]
             },
             {
-              label: "业务单据编号,用于检索费用",
+              label: "业务单据编号",
               prop: "businessNo",
-              rules: [{
-                required: true,
-                message: "请输入业务单据编号,用于检索费用",
-                trigger: "blur"
-              }]
+                width:"120",
             },
             {
-              label: "对账单编号,用于检索费用",
+              label: "对账单编号",
               prop: "checkNo",
-              rules: [{
-                required: true,
-                message: "请输入对账单编号,用于检索费用",
-                trigger: "blur"
-              }]
+                width:"120",
             },
             {
-              label: "MBL NO,用于检索费用",
+              label: "MBL NO",
               prop: "mblno",
-              rules: [{
-                required: true,
-                message: "请输入MBL NO,用于检索费用",
-                trigger: "blur"
-              }]
             },
             {
-              label: "HBL NO,用于检索费用",
+              label: "HBL NO",
               prop: "hblno",
-              rules: [{
-                required: true,
-                message: "请输入HBL NO,用于检索费用",
-                trigger: "blur"
-              }]
             },
             {
-              label: "订舱,用于检索费用",
+              label: "订舱",
               prop: "bookingNo",
-              rules: [{
-                required: true,
-                message: "请输入订舱,用于检索费用",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "船名 id",
-              prop: "vesselId",
-              rules: [{
-                required: true,
-                message: "请输入船名 id",
-                trigger: "blur"
-              }]
             },
             {
               label: "中文船名",
               prop: "vesselCnName",
-              rules: [{
-                required: true,
-                message: "请输入中文船名",
-                trigger: "blur"
-              }]
             },
             {
               label: "英文船名",
               prop: "vesselEnName",
-              rules: [{
-                required: true,
-                message: "请输入英文船名",
-                trigger: "blur"
-              }]
             },
             {
               label: "航次",
               prop: "voyageNo",
-              rules: [{
-                required: true,
-                message: "请输入航次",
-                trigger: "blur"
-              }]
             },
             {
               label: "财务开始日期",
               prop: "accountDateFrom",
-              rules: [{
-                required: true,
-                message: "请输入财务开始日期",
-                trigger: "blur"
-              }]
+                width:"100",
             },
             {
               label: "财务结束日期",
               prop: "accountDateTo",
-              rules: [{
-                required: true,
-                message: "请输入财务结束日期",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "申请人 Id",
-              prop: "applicantId",
-              rules: [{
-                required: true,
-                message: "请输入申请人 Id",
-                trigger: "blur"
-              }]
+                width:"100",
             },
             {
               label: "申请人",
               prop: "applicantName",
-              rules: [{
-                required: true,
-                message: "请输入申请人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "审核人 Id",
-              prop: "approverId",
-              rules: [{
-                required: true,
-                message: "请输入审核人 Id",
-                trigger: "blur"
-              }]
             },
             {
               label: "审核人",
               prop: "approverName",
-              rules: [{
-                required: true,
-                message: "请输入审核人",
-                trigger: "blur"
-              }]
             },
             {
-              label: "是否代理发票, 0 否, 1 是",
+              label: "是否代理发票",
               prop: "isAgent",
-              rules: [{
-                required: true,
-                message: "请输入是否代理发票, 0 否, 1 是",
-                trigger: "blur"
-              }]
+                width:"120",
+                dicData:[{
+                    label:'否',
+                    value:0
+                },{
+                    label:'是',
+                    value:1
+                },]
             },
             {
-              label: "是否 DK, 0 否, 1 是",
+              label: "是否DK",
               prop: "isDk",
-              rules: [{
-                required: true,
-                message: "请输入是否 DK, 0 否, 1 是",
-                trigger: "blur"
-              }]
+                dicData:[{
+                    label:'否',
+                    value:0
+                },{
+                    label:'是',
+                    value:1
+                },]
             },
             {
-              label: "是否 RP, 0 否, 1 是",
+              label: "是否RP",
               prop: "isRp",
-              rules: [{
-                required: true,
-                message: "请输入是否 RP, 0 否, 1 是",
-                trigger: "blur"
-              }]
+                dicData:[{
+                    label:'否',
+                    value:0
+                },{
+                    label:'是',
+                    value:1
+                },]
             },
             {
-              label: "RP 名称",
+              label: "RP名称",
               prop: "rpName",
-              rules: [{
-                required: true,
-                message: "请输入RP 名称",
-                trigger: "blur"
-              }]
             },
             {
               label: "导出日期",
               prop: "exportDate",
-              rules: [{
-                required: true,
-                message: "请输入导出日期",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "导出人 Id",
-              prop: "exportId",
-              rules: [{
-                required: true,
-                message: "请输入导出人 Id",
-                trigger: "blur"
-              }]
+              width: "100"
             },
             {
               label: "导出人",
               prop: "exportName",
-              rules: [{
-                required: true,
-                message: "请输入导出人",
-                trigger: "blur"
-              }]
             },
             {
-              label: "是否导出船名航次(0 否 1是)",
+              label: "是否导出船名航次",
               prop: "isExportVslvoy",
-              rules: [{
-                required: true,
-                message: "请输入是否导出船名航次(0 否 1是)",
-                trigger: "blur"
-              }]
+                width: "140",
+                dicData:[{
+                    label:'否',
+                    value:0
+                },{
+                    label:'是',
+                    value:1
+                },]
             },
             {
-              label: "是否导出主单号(0 否 1是)",
+              label: "是否导出主单号",
               prop: "isExportMblno",
-              rules: [{
-                required: true,
-                message: "请输入是否导出主单号(0 否 1是)",
-                trigger: "blur"
-              }]
+                width: "140",
+                dicData:[{
+                    label:'否',
+                    value:0
+                },{
+                    label:'是',
+                    value:1
+                },]
             },
             {
-              label: "是否导出分单号(0 否 1是)",
+              label: "是否导出分单号",
               prop: "isExportHblno",
-              rules: [{
-                required: true,
-                message: "请输入是否导出分单号(0 否 1是)",
-                trigger: "blur"
-              }]
+                width: "140",
+                dicData:[{
+                    label:'否',
+                    value:0
+                },{
+                    label:'是',
+                    value:1
+                },]
             },
             {
               label: "发票本位币(CNY)",
               prop: "amountCny",
-              rules: [{
-                required: true,
-                message: "请输入发票本位币(CNY)",
-                trigger: "blur"
-              }]
+                width: "140",
             },
             {
-              label: "发票 USD",
+              label: "发票USD",
               prop: "amountUsd",
-              rules: [{
-                required: true,
-                message: "请输入发票 USD",
-                trigger: "blur"
-              }]
+              width: "100"
             },
             {
               label: "税额(CNY)",
               prop: "amountTax",
-              rules: [{
-                required: true,
-                message: "请输入税额(CNY)",
-                trigger: "blur"
-              }]
+                width: "100"
             },
             {
-              label: "合计本位币(CNY )",
+              label: "合计本位币(CNY)",
               prop: "amountLoc",
-              rules: [{
-                required: true,
-                message: "请输入合计本位币(CNY )",
-                trigger: "blur"
-              }]
+                width: "120"
             },
             {
               label: "全电发票备注",
               prop: "elecRemarks",
-              rules: [{
-                required: true,
-                message: "请输入全电发票备注",
-                trigger: "blur"
-              }]
+                width: "120"
             },
             {
               label: "银行进账单出票人名称",
               prop: "bankReceiptCorpName",
-              rules: [{
-                required: true,
-                message: "请输入银行进账单出票人名称",
-                trigger: "blur"
-              }]
+                width: "160"
             },
             {
               label: "银行进账单出票银行",
               prop: "bankReceiptBankName",
-              rules: [{
-                required: true,
-                message: "请输入银行进账单出票银行",
-                trigger: "blur"
-              }]
+                width: "160"
             },
             {
               label: "银行进账单出票银行账号",
               prop: "bankReceiptAccountNo",
-              rules: [{
-                required: true,
-                message: "请输入银行进账单出票银行账号",
-                trigger: "blur"
-              }]
+                width: "160"
             },
             {
-              label: "银行进账单票据种类,支票 汇票 承兑汇票",
+              label: "银行进账单票据种类",
               prop: "bankReceiptBillType",
-              rules: [{
-                required: true,
-                message: "请输入银行进账单票据种类,支票 汇票 承兑汇票",
-                trigger: "blur"
-              }]
+                width: "160"
             },
             {
               label: "银行进账单票据张数",
               prop: "bankReceiptBillCount",
-              rules: [{
-                required: true,
-                message: "请输入银行进账单票据张数",
-                trigger: "blur"
-              }]
+                width: "160"
             },
             {
               label: "银行进账单是否已进账(收款)",
               prop: "bankReceiptIsIncome",
-              rules: [{
-                required: true,
-                message: "请输入银行进账单是否已进账(收款)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "版本",
-              prop: "version",
-              rules: [{
-                required: true,
-                message: "请输入版本",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "状态(0 正常 1停用)",
-              prop: "status",
-              rules: [{
-                required: true,
-                message: "请输入状态(0 正常 1停用)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否已删除(0 否 1是)",
-              prop: "isDeleted",
-              rules: [{
-                required: true,
-                message: "请输入是否已删除(0 否 1是)",
-                trigger: "blur"
-              }]
+                width: "180"
             },
             {
               label: "备注",
@@ -834,6 +502,9 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
         data: []
       };
     },
+      watch:{
+
+      },
     computed: {
       ...mapGetters(["permission"]),
       permissionList() {
@@ -854,13 +525,20 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
     },
       async created() {
           this.option = await this.getColumnData(this.getColumnName(318), this.optionBack);
-          this.dictionaryfun() // 获取字典数据
       },
     methods: {
         // 新建发票
       newbillFun(){
           this.isShow = false;
       },
+        // 编辑
+        editFun(row) {
+            this.isShow = false
+            this.editSave = true
+            this.$nextTick(()=>{
+                this.$refs.fininvoicesDetails.fininvoicesDetailfun(row.id)
+            })
+        },
         // 详情的返回列表
         goBack() {
             // 初始化数据