货代 11.10

src/views/billM/billingCenter/index.vue

@@ -328,7 +328,7 @@
               }]
             },
             {
-              label: "合计CNY应付(",
+              label: "合计CNY应付",
               prop: "amountCrLoc",
               width:"120",
               rules: [{

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

@@ -35,7 +35,7 @@
                                   v-model="scope.row.editQuantity"
                                   clearable placeholder="请输入件数" @blur="quantityBlur(scope.row)"
                         ></el-input>
-                        <span v-else>{{scope.row.editQuantity}}</span>
+                        <span v-else>{{Number(scope.row.editQuantity).toFixed(0)}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -47,7 +47,7 @@
                                   v-model="scope.row.editGrossWeight"
                                   clearable placeholder="请输入毛重"
                         ></el-input>
-                        <span v-else>{{scope.row.editGrossWeight}}</span>
+                        <span v-else>{{Number(scope.row.editGrossWeight).toFixed(2)}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -59,20 +59,29 @@
                                   v-model="scope.row.editMeasurement"
                                   clearable placeholder="请输入尺码(体积)"
                         ></el-input>
-                        <span v-else>{{scope.row.editMeasurement}}</span>
+                        <span v-else>{{Number(scope.row.editMeasurement).toFixed(2)}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
                     prop="quantity"
                     label="总件数">
+                    <template slot-scope="scope">
+                        {{Number(scope.row.quantity).toFixed(0)}}
+                    </template>
                 </el-table-column>
                 <el-table-column
                     prop="grossWeight"
                     label="总毛重">
+                    <template slot-scope="scope">
+                        {{Number(scope.row.grossWeight).toFixed(2)}}
+                    </template>
                 </el-table-column>
                 <el-table-column
                     prop="measurement"
                     label="总尺码(体积)">
+                    <template slot-scope="scope">
+                        {{Number(scope.row.measurement).toFixed(2)}}
+                    </template>
                 </el-table-column>
                 <el-table-column
                     label="操作"
@@ -118,14 +127,23 @@
                 <el-table-column
                     prop="quantity"
                     label="件数">
+                    <template slot-scope="scope">
+                        {{Number(scope.row.quantity).toFixed(0)}}
+                    </template>
                 </el-table-column>
                 <el-table-column
                     prop="grossWeight"
                     label="毛重">
+                    <template slot-scope="scope">
+                        {{Number(scope.row.grossWeight).toFixed(2)}}
+                    </template>
                 </el-table-column>
                 <el-table-column
                     prop="measurement"
                     label="尺码">
+                    <template slot-scope="scope">
+                        {{Number(scope.row.measurement).toFixed(2)}}
+                    </template>
                 </el-table-column>
                 <el-table-column
                     prop="remarks"
@@ -169,8 +187,8 @@
         methods:{
             // 件数input
             quantityBlur(row){
-                this.$set(row,'editGrossWeight',(row.grossWeight / row.quantity) * row.editQuantity)
-                this.$set(row,'editMeasurement',(row.measurement / row.quantity) * row.editQuantity)
+                this.$set(row,'editGrossWeight',((row.grossWeight / row.quantity) * row.editQuantity).toFixed(2))
+                this.$set(row,'editMeasurement',((row.measurement / row.quantity) * row.editQuantity).toFixed(2))
             },
             // 编辑
             waitingBoxeditfun(row) {

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

@@ -217,7 +217,7 @@
                         </span>
                         <el-date-picker v-model="assemblyForm.etd" clearable style="width: 100%"
                                         type="date" size="small" :disabled="detailData.seeDisabled"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        value-format="yyyy-MM-dd"
                                         placeholder="选择日期">
                         </el-date-picker>
                     </el-form-item>

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

@@ -1114,7 +1114,7 @@ import {dateFormat} from "@/util/date";
                         type: "success",
                         message: "操作成功!"
                     });
-                    this.detailData.seeDisabled = true
+                    // this.detailData.seeDisabled = true
                     this.billsDetailfun(res.data.data.id)
                 })
             },

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

@@ -333,11 +333,33 @@
                      :search="mawbQuery"
                      id="out-table"
                      :header-cell-class-name="headerClassName"
-                     @on-load="mawbOnLoad">
+                     @search-change="mawbSearch"
+                      >
               <template slot="radio"
                         slot-scope="{row}">
                   <el-radio v-model="dialogRadio" :label="row.id" @input="radioInput(row)"></el-radio>
               </template>
+              <template slot-scope="scope" slot="mblno">
+                  <avue-text-ellipsis :text="scope.row.mblno" :height="30" use-tooltip placement="top">
+                      <small slot="more">...</small>
+                  </avue-text-ellipsis>
+              </template>
+              <template slot-scope="scope" slot="hblno">
+                  <avue-text-ellipsis :text="scope.row.hblno" :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>
+
           </avue-crud>
           <span slot="footer" class="dialog-footer">
               <el-button @click="dialogVisible = false">取 消</el-button>
@@ -824,10 +846,12 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
                   {
                       label: "MB/L NO",
                       prop: "mblno",
+                      search:true,
                   },
                   {
                       label: "HB/L NO",
                       prop: "hblno",
+                      search:true,
                   },
                   {
                       label: "开船日期",
@@ -976,8 +1000,8 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
             }
             const obj = this.selectionList[0]
             for (let item of this.selectionList) {
-                if (item.billType == 'MM') {
-                    this.$message.warning("请不要选择主单数据");
+                if (item.billType != 'MH') {
+                    this.$message.warning("请选择分单");
                     return;
                 }
                 if (obj.placeReceiptId != item.placeReceiptId) {
@@ -995,6 +1019,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
             this.mawbQuery.polCnName = obj.polCnName
             this.$nextTick(()=>{
                 this.dialogVisible = true
+                this.mawbOnLoad(this.mawbPage)
             })
         },
         // 退舱
@@ -1228,6 +1253,13 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
                 this.mawbloading = false;
             })
         },
+        // 弹窗的搜索
+        mawbSearch(params, done){
+            this.mawbQuery = params;
+            this.mawbPage.currentPage = 1;
+            this.mawbOnLoad(this.mawbPage,params)
+            done()
+        },
 
         //自定义列保存
         async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/bfeesdefine/index.vue

@@ -92,7 +92,7 @@
                                 :filterable="true" :clearable="true"
                                 :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                                 @remoteMethod="getBaccelementsListfun" @corpChange="accElementCorpChange">
-                      <bfeesdetype></bfeesdetype>
+                      <baccelements></baccelements>
                   </search-query>
               </template>
           </avue-crud>
@@ -139,13 +139,14 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import bunits from "@/views/iosBasicData/bunits/index.vue";
 import bfeesdetype from "@/views/iosBasicData/bfeesdefine/bfeesdetype.vue";
 import rateManagement from '@/views/iosBasicData/rateManagement/index.vue'
+import baccelements from "@/views/iosBasicData/baccelements/index.vue";
 
 import { getToken } from "@/util/auth";
 import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
 
 
 export default {
-  components: { bunits, bfeesdetype, rateManagement, SearchQuery },
+  components: { bunits, bfeesdetype, rateManagement, SearchQuery, baccelements },
   data() {
     return {
         // 是否禁用
@@ -325,12 +326,12 @@ export default {
           {
             label: "核算名称",
             prop: "accElementName",
-              formslot: true
-            // rules: [{
-            //   required: true,
-            //   message: "请输入财务核算要素名称",
-            //   trigger: "blur"
-            // }]
+              formslot: true,
+            rules: [{
+              required: true,
+              message: "请输入财务核算要素名称",
+              trigger: "blur"
+            }]
           },
           {
             label: "科目 Id",

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -1,13 +1,405 @@
 <template>
-    <div>
-        详情
+    <div class="borderless" v-loading="pageLoading">
+        <div class="customer-head">
+            <div class="customer-back">
+                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                           @click="backToList">返回列表
+                </el-button>
+            </div>
+            <div class="add-customer-btn">
+                <el-button  size="small" type="primary" 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
+                            :loading="saveLoading" @click="editCustomer">保 存
+                </el-button>
+            </div>
+        </div>
+
+        <div style="margin: 55px 5px 0px 5px;'">
+            <el-card class="box-card">
+                <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
+                    <el-row>
+                        <el-col :span="5">
+                            <el-form-item label="对账单号" prop="checkNo">
+                                <el-input style="width: 100%;" v-model="form.checkNo"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入对账单号" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="对账日期" prop="billDate">
+                                <el-date-picker v-model="form.billDate" clearable
+                                                style="width: 100%;"
+                                                type="date" size="small"
+                                                :disabled="editSave"
+                                                value-format="yyyy-MM-dd HH:mm"
+                                                placeholder="选择对账日期">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="限定金额" prop="billDate">
+                                <el-input style="width: 100%;" v-model="form.checkNo"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入对账单号" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="备注" prop="remarks">
+                                <el-input style="width: 100%;" v-model="form.remarks"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入备注" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="审核" prop="isApproved" label-width="50px">
+                                <search-query :datalist="allyesnoData"
+                                              :selectValue="form.isApproved"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictValue'}"
+                                              @corpChange="corpChange($event,'isApproved')"
+                                              @corpFocus="allyesnoWorkDictsfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="10">
+                            <el-form-item label="对账单位" prop="isApproved">
+                                <el-col :span="10">
+                                    <search-query :datalist="allyesnoData"
+                                                  :selectValue="form.corpCnName"
+                                                  :clearable="true"
+                                                  :disabled="editSave"
+                                                  :filterable="true"
+                                                  :remote="true"
+                                                  :buttonIf="false"
+                                                  :forParameter="{ key:'dictKey', label:'dictValue', value:'dictValue'}"
+                                                  @corpChange="corpChange($event,'isApproved')"
+                                                  @corpFocus="allyesnoWorkDictsfun" >
+                                    </search-query>
+                                </el-col>
+                                <el-col :span="10">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName"
+                                              size="small" autocomplete="off"
+                                              :disabled="editSave"
+                                              clearable placeholder="请输入" >
+                                    </el-input>
+                                </el-col>
+                                <el-col :span="4">
+                                    <el-checkbox size="medium" :true-label="1" :false-label="0"
+                                                 :disabled="editSave"
+                                                 v-model="form.corpIsSigned">已签约
+                                    </el-checkbox>
+                                </el-col>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="协议签订人" prop="corpAccRemarks">
+                                <el-input style="width: 100%;" v-model="form.corpAccRemarks"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入账期备注" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="账期备注" prop="corpAccRemarks">
+                                <el-input style="width: 100%;" v-model="form.corpAccRemarks"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入账期备注" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="签收" prop="isApproved" label-width="50px">
+                                <search-query :datalist="allyesnoData"
+                                              :selectValue="form.isSignfor"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictValue'}"
+                                              @corpChange="corpChange($event,'isSignfor')"
+                                              @corpFocus="allyesnoWorkDictsfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="收 / 付" prop="dc">
+                                <search-query :datalist="dcData"
+                                              :selectValue="form.dc"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              @corpChange="corpChange($event,'dc')">
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="币别" prop="curCode" label-width="40px">
+                                <search-query :datalist="curCodeData"
+                                              :selectValue="form.curCode"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :filterable="true"
+                                              :remote="true"
+                                              :forParameter="{ key:'id', label:'cnName', value:'cnName'}"
+                                              @corpChange="corpChange($event,'curCode')"
+                                              @remoteMethod="getRateListfun"
+                                              @corpFocus="getRateListfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="操作员" prop="salesName" label-width="60px">
+                                <search-query :datalist="salesData"
+                                              :selectValue="form.salesName"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :filterable="true"
+                                              :remote="true"
+                                              :forParameter="{ key:'id', label:'name', value:'name'}"
+                                              @corpChange="corpChange($event,'salesName')"
+                                              @remoteMethod="salesuserGetListfun"
+                                              @corpFocus="salesuserGetListfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="业务员" prop="salesName" label-width="60px">
+                                <search-query :datalist="salesData"
+                                              :selectValue="form.salesName"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :filterable="true"
+                                              :remote="true"
+                                              :forParameter="{ key:'id', label:'name', value:'name'}"
+                                              @corpChange="corpChange($event,'salesName')"
+                                              @remoteMethod="salesuserGetListfun"
+                                              @corpFocus="salesuserGetListfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="业务类型" prop="salesName" label-width="65px">
+                                <search-query :datalist="businessTypeData"
+                                              :selectValue="form.businessType"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              @corpChange="corpChange($event,'businessType')">
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="销账" prop="isApproved" label-width="50px">
+                                <search-query :datalist="allyesnoData"
+                                              :selectValue="form.isCleared"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictValue'}"
+                                              @corpChange="corpChange($event,'isCleared')"
+                                              @corpFocus="allyesnoWorkDictsfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="JOB NO" prop="corpAccRemarks">
+                                <el-input style="width: 100%;" v-model="form.corpAccRemarks"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入JOB NO" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="ACCT NO" prop="corpAccRemarks">
+                                <el-input style="width: 100%;" v-model="form.corpAccRemarks"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入ACCT NO" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="MBL NO" prop="mblno">
+                                <el-input style="width: 100%;" v-model="form.mblno"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入MBL NO" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="HBL NO" prop="hblno">
+                                <el-input style="width: 100%;" v-model="form.hblno"
+                                          size="small" autocomplete="off"
+                                          :disabled="editSave"
+                                          clearable placeholder="请输入HBL NO" >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="对账" prop="isChecked" label-width="50px">
+                                <search-query :datalist="allyesnoData"
+                                              :selectValue="form.isChecked"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictValue'}"
+                                              @corpChange="corpChange($event,'isChecked')"
+                                              @corpFocus="allyesnoWorkDictsfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="7">
+                            <el-form-item label="ETD 期间" prop="etd">
+                                <el-date-picker
+                                    v-model="form.etd"
+                                    type="datetimerange"
+                                    range-separator="至"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                                    style="width: 100%;"
+                                    size="small"
+                                    :disabled="editSave"
+                                    value-format="yyyy-MM-dd HH:mm"
+                                    placeholder="选择对账日期">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <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="4">
+                            <el-form-item label="发票" prop="isChecked" label-width="50px">
+                                <search-query :datalist="isInvoiceData"
+                                              :selectValue="form.isInvoice"
+                                              :clearable="true"
+                                              :disabled="editSave"
+                                              :buttonIf="false"
+                                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictValue'}"
+                                              @corpChange="corpChange($event,'isInvoice')"
+                                              @corpFocus="allyesnoWorkDictsfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+
+                    </el-row>
+
+                </el-form>
+            </el-card>
+        </div>
+
     </div>
 </template>
 
 <script>
+    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+    import {getWorkDicts} from "@/api/system/dictbiz";
+    import {getRateList} from "@/api/iosBasicData/rateManagement";
+    import {getList as userGetList} from '@/api/system/user'
+
+    export default {
+        components: {SearchQuery},
+        props:{
+            // 编辑还是保存
+            editSave:{
+                type:Boolean,
+                default:true
+            }
+        },
+        data(){
+            return {
+                pageLoading:false, // 全屏加载动画
+                saveLoading:false, // 按钮动画
+                form:{}, // 绑定的数据
+                allyesnoData:[], // 全部是否字典数据
+                isInvoiceData:[],// 发票字典
+                // 收 / 付
+                dcData:[
+                    {
+                        label:'Debit',
+                        value: 'D'
+                    },{
+                        label:'Credit',
+                        value: 'C'
+                    }
+                ],
+                curCodeData:[],// 币别
+                salesData:[], // 业务员
+                // 业务类型
+                businessTypeData:[
+                    {
+                        label:'海运出口',
+                        value:'SE'
+                    },{
+                        label:'海运进口',
+                        value:'SI'
+                    }
+                ],
+
+            }
+        },
+        methods:{
+            // 下拉回调
+            corpChange(value,name){
+                if(name == 'curCode') {
+                }else {
+                    this.$set(this.form,name,value)
+                }
+            },
+            //返回列表
+            backToList() {
+                this.$emit('goBack')
+            },
+            // 请求的接口
+            // 获取全部是否接口
+            allyesnoWorkDictsfun(){
+                getWorkDicts('all_yes_no').then(res=>{
+                    this.allyesnoData = res.data.data;
+                })
+            },
+            // 获取币别数据
+            getRateListfun(cnName){
+                getRateList({current:1,size:10,cnName}).then(res=>{
+                    this.curCodeData = res.data.data.records
+                })
+            },
+            // 获取业务员数据
+            salesuserGetListfun(account = undefined,type = false,){
+                userGetList(1,10,{account}).then(res=>{
+                    this.salesData = res.data.data.records
+                })
+            },
 
+
+        }
+    }
 </script>
 
 <style scoped>
-
+::v-deep.el-form-item {
+    margin-bottom: 0;
+}
 </style>

src/views/iosBasicData/finstlbills/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <basic-container>
+      <basic-container v-if="isShow">
           <avue-crud :option="option"
                      :table-loading="loading"
                      :data="data"
@@ -34,7 +34,6 @@
                              size="small"
                              icon="el-icon-delete"
                              plain
-                             v-if="permission.finstlbills_delete"
                              @click="handleDelete">删 除
                   </el-button>
 
@@ -42,7 +41,8 @@
           </avue-crud>
       </basic-container>
 
-      <finstlbills_details v-if=""></finstlbills_details>
+      <finstlbillsDetails v-if="!isShow" :editSave="editSave" @goBack="goBack"></finstlbillsDetails>
+
   </div>
 </template>
 
@@ -55,6 +55,8 @@
       components:{finstlbillsDetails},
     data() {
       return {
+          // 详情页面和列表切换
+          isShow:true,
         form: {},
         query: {},
         loading: true,
@@ -242,7 +244,7 @@
               prop: "isCleared",
             },
             {
-              label: "是否开发票,用于查询费用, 0 全部， 1 待开 2 已开 2 不开",
+              label: "是否开发票,用于查询费用, 0 全部， 1 待开 2 已开 3 不开",
               prop: "isInvoice",
             },
             {
@@ -327,7 +329,8 @@
             },
           ]
         },
-        data: []
+        data: [],
+        editSave:false, // 编辑保存打印状态
       };
     },
     computed: {
@@ -348,15 +351,29 @@
         return ids.join(",");
       }
     },
-      async created() {
-          this.option = await this.getColumnData(this.getColumnName(314), this.optionBack);
+    async created() {
+      this.option = await this.getColumnData(this.getColumnName(314), this.optionBack);
+    },
+    methods: {
+      // 新建账单
+      newbillFun(){
+          this.isShow = false
+          this.editSave = false
       },
-      methods: {
-        // 新建账单
-        newbillFun(){
-
-        },
-        // 添加
+      // 详情的返回列表
+      goBack() {
+          // 初始化数据
+          // this.detailData = this.$options.data().detailData;
+          if (JSON.stringify(this.$route.query) != "{}") {
+              this.$router.$avueRouter.closeTag();
+              this.$router.push({
+                  path: "/iosBasicData/finstlbills/index"
+              });
+          }
+          this.isShow = true;
+          this.onLoad(this.page, this.search);
+      },
+      // 添加
       rowSave(row, done, loading) {
         finstlbillsSubmit(row).then(() => {
           this.onLoad(this.page);