Browse Source

客户对账页面修改

lijunping 5 months ago
parent
commit
d1d6b4831c

+ 10 - 12
src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -126,18 +126,14 @@ export default {
                         }],
                         overHidden: true,
                     },
-                    {
-                        label: "原业务编号",
-                        prop: "billNo",
-                        width: 120,
-                        overHidden: true
-                    },
+/*
                     {
                         label: "发票号",
                         prop: "invoiceNo",
                         width: 80,
                         overHidden: true
                     },
+*/
                     {
                         label: "费用名称",
                         prop: "feeCnName",
@@ -151,6 +147,12 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        width: 100,
+                        overHidden: true
+                    },
+                    {
                         label: "MB/L NO",
                         prop: "mblno",
                         width: 100,
@@ -250,6 +252,7 @@ export default {
                         width: 100,
                         overHidden: true
                     },
+/*
                     {
                         label: "签收人",
                         prop: "signforName",
@@ -262,6 +265,7 @@ export default {
                         width: 100,
                         overHidden: true
                     },
+*/
                     {
                         label: "BOOKINGNO",
                         prop: "bookingNo",
@@ -269,12 +273,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "HB/L NO",
-                        prop: "hblno",
-                        width: 100,
-                        overHidden: true
-                    },
-                    {
                         label: "船名",
                         prop: "vesselCnName",
                         width: 80,

+ 84 - 81
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -40,7 +40,7 @@
                         <el-form :model="form" ref="form" :rules="rules" label-width="90px" class="demo-ruleForm">
                             <el-row>
                                 <el-row>
-                                    <el-col :span="4">
+                                    <el-col :span="8">
                                         <el-form-item label="所属公司" prop="branchName">
                                             <dic-select v-model="form.branchName" placeholder="所属公司" key="id"
                                                 label="deptName" url="/blade-system/dept/top-list" :filterable="true"
@@ -49,9 +49,9 @@
                                                 @selectChange="dicChange('branchName', $event)"></dic-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
+                                    <el-col :span="16">
                                         <el-form-item label="对账单位" prop="corpCnName">
-                                            <el-col :span="10">
+                                            <el-col :span="16">
                                                 <search-query :datalist="corpData" :selectValue="form.corpCnName"
                                                     :clearable="true" :disabled="editSave || tableData.length"
                                                     :filterable="true" :remote="true" :buttonIf="false"
@@ -61,20 +61,59 @@
                                                     @remoteMethod="corpBcorpsListfun" @corpFocus="corpBcorpsListfun">
                                                 </search-query>
                                             </el-col>
-                                            <el-col :span="9">
+<!--                                            <el-col :span="9">
                                                 <span style="padding-left: 20px"></span>
                                                 <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
                                                     autocomplete="off" :disabled="editSave || tableData.length"
                                                     clearable placeholder="对账单位">
                                                 </el-input>
-                                            </el-col>
-                                            <el-col :span="5">
+                                            </el-col>-->
+<!--                                            <el-col :span="5">
                                                 <el-checkbox style="width: 100%;text-align: right" size="medium"
                                                     :true-label="1" :false-label="0"
                                                     :disabled="editSave || tableData.length"
                                                     v-model="form.corpIsSigned">已签约
                                                 </el-checkbox>
-                                            </el-col>
+                                            </el-col>-->
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="业务开始" prop="businessDateStart">
+                                            <el-date-picker v-model="form.businessDateStart" clearable
+                                                            style="width: 100%;" type="date" size="small"
+                                                            :disabled="editSave || tableData.length" format="yyyy-MM-dd"
+                                                            value-format="yyyy-MM-dd" placeholder="请选择业务开始日期">
+                                            </el-date-picker>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="业务结束" prop="businessDateEnd">
+                                            <el-date-picker v-model="form.businessDateEnd" clearable
+                                                            style="width: 100%;" type="date" size="small"
+                                                            :disabled="editSave || tableData.length" format="yyyy-MM-dd"
+                                                            value-format="yyyy-MM-dd" placeholder="请选择业务结束日期">
+                                            </el-date-picker>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="收 / 付" prop="dc">
+                                            <search-query :datalist="dcData" :selectValue="form.dc"
+                                                          :clearable="true" :disabled="editSave || tableData.length"
+                                                          :buttonIf="false" placeholder="请选择收/付"
+                                                          @corpChange="corpChange($event, 'dc')">
+                                            </search-query>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="币别" prop="curCode">
+                                            <search-query :datalist="curCodeData" :selectValue="form.curCode"
+                                                          :clearable="true" :disabled="editSave || tableData.length"
+                                                          :buttonIf="false" :filterable="true" :remote="true"
+                                                          placeholder="请选择币别"
+                                                          :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                                                          @corpChange="corpChange($event, 'curCode')"
+                                                          @remoteMethod="getRateListfun" @corpFocus="getRateListfun">
+                                            </search-query>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4">
@@ -91,7 +130,7 @@
                                                 placeholder="请输入航次"></el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="3">
+<!--                                    <el-col :span="3">
                                         <el-form-item label="审核" prop="isApproved" label-width="50px">
                                             <search-query :datalist="allyesnoData" :selectValue="form.isApproved"
                                                 :clearable="true" :disabled="editSave || tableData.length"
@@ -101,33 +140,25 @@
                                                 @corpFocus="allyesnoWorkDictsfun">
                                             </search-query>
                                         </el-form-item>
-                                    </el-col>
-                                    <el-col :span="5">
-                                        <el-form-item label="费用名称" prop="feeCnName">
-                                            <dic-select v-model="form.feeCnName" placeholder="费用名称" key="id"
-                                                label="cnName" url="/blade-los/bfees/listAll" :filterable="true"
-                                                :multiple="true" :collapseTags="true"
-                                                :disabled="editSave || tableData.length"></dic-select>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="4">
+                                    </el-col>-->
+<!--                                    <el-col :span="4">
                                         <el-form-item label="业务编号" prop="businessNo">
                                             <el-input style="width: 100%;" v-model="form.businessNo" size="small"
                                                 autocomplete="off" :disabled="editSave || tableData.length" clearable
                                                 placeholder="请输入业务编号">
                                             </el-input>
                                         </el-form-item>
-                                    </el-col>
-                                    <el-col :span="4">
+                                    </el-col>-->
+<!--                                    <el-col :span="4">
                                         <el-form-item label="账单编号" prop="accountNo">
                                             <el-input style="width: 100%;" v-model="form.accountNo" size="small"
                                                 autocomplete="off" :disabled="editSave || tableData.length" clearable
                                                 placeholder="请输入账单编号">
                                             </el-input>
                                         </el-form-item>
-                                    </el-col>
+                                    </el-col>-->
 
-                                    <el-col :span="4">
+                                    <el-col :span="8">
                                         <el-form-item label="MBL NO" prop="mblno">
                                             <el-input style="width: 100%;" v-model="form.mblno" size="small"
                                                 autocomplete="off" :disabled="editSave || tableData.length" clearable
@@ -135,7 +166,7 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="4">
+                                    <el-col :span="8">
                                         <el-form-item label="HBL NO" prop="hblno">
                                             <el-input style="width: 100%;" v-model="form.hblno" size="small"
                                                 autocomplete="off" :disabled="editSave || tableData.length" clearable
@@ -143,7 +174,7 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="3">
+<!--                                    <el-col :span="3">
                                         <el-form-item label="对账" prop="isChecked" label-width="50px">
                                             <search-query :datalist="isCheckedData" :selectValue="form.isChecked"
                                                 :clearable="true" :disabled="editSave || tableData.length"
@@ -153,7 +184,7 @@
                                                 @corpFocus="allyesnoWorkDictsfun">
                                             </search-query>
                                         </el-form-item>
-                                    </el-col>
+                                    </el-col>-->
                                     <!--<el-col :span="4">-->
                                     <!--    <el-form-item label="对账" prop="isChecked" label-width="50px">-->
                                     <!--        <search-query :datalist="allyesnoData"-->
@@ -167,25 +198,9 @@
                                     <!--        </search-query>-->
                                     <!--    </el-form-item>-->
                                     <!--</el-col>-->
-                                    <el-col :span="4">
-                                        <el-form-item label="业务开始日期" prop="businessDateStart">
-                                            <el-date-picker v-model="form.businessDateStart" clearable
-                                                style="width: 100%;" type="date" size="small"
-                                                :disabled="editSave || tableData.length" format="yyyy-MM-dd"
-                                                value-format="yyyy-MM-dd" placeholder="请选择业务开始日期">
-                                            </el-date-picker>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="4">
-                                        <el-form-item label="业务结束日期" prop="businessDateEnd">
-                                            <el-date-picker v-model="form.businessDateEnd" clearable
-                                                style="width: 100%;" type="date" size="small"
-                                                :disabled="editSave || tableData.length" format="yyyy-MM-dd"
-                                                value-format="yyyy-MM-dd" placeholder="请选择业务结束日期">
-                                            </el-date-picker>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="4">
+
+
+<!--                                    <el-col :span="4">
                                         <el-form-item label="财务开始日期" prop="accountDateFrom">
                                             <el-date-picker v-model="form.accountDateFrom" clearable
                                                 style="width: 100%;" type="date" size="small"
@@ -217,11 +232,20 @@
                                                 format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择审核结束日期">
                                             </el-date-picker>
                                         </el-form-item>
-                                    </el-col>
+                                    </el-col>-->
                                 </el-row>
                                 <expand :showBtn="true" :showSpan="true">
                                     <el-row>
                                         <el-col :span="5">
+                                            <el-form-item label="费用名称" prop="feeCnName">
+                                                <dic-select v-model="form.feeCnName" placeholder="费用名称" key="id"
+                                                            label="cnName" url="/blade-los/bfees/listAll" :filterable="true"
+                                                            :multiple="true" :collapseTags="true"
+                                                            :disabled="editSave || tableData.length"></dic-select>
+                                            </el-form-item>
+                                        </el-col>
+
+                                        <el-col :span="5">
                                             <el-form-item label="操作员" prop="updateUserName">
                                                 <search-query :datalist="updateUserData"
                                                     :selectValue="form.updateUserName" :clearable="true"
@@ -241,7 +265,7 @@
                                                     clearable placeholder="请输入BKNO"></el-input>
                                             </el-form-item>
                                         </el-col>
-                                        <el-col :span="5">
+<!--                                        <el-col :span="5">
                                             <el-form-item label="协议签订人" prop="corpAccRemarks">
                                                 <el-input style="width: 100%;" v-model="form.corpAccRemarks"
                                                     size="small" autocomplete="off"
@@ -249,7 +273,7 @@
                                                     placeholder="请输入协议签订人">
                                                 </el-input>
                                             </el-form-item>
-                                        </el-col>
+                                        </el-col>-->
                                         <el-col :span="5">
                                             <el-form-item label="业务类型" prop="businessTypes">
                                                 <search-query :datalist="businessTypesData"
@@ -260,7 +284,7 @@
                                                 </search-query>
                                             </el-form-item>
                                         </el-col>
-                                        <el-col :span="4">
+<!--                                        <el-col :span="4">
                                             <el-form-item label="发票" prop="isInvoice" label-width="50px">
                                                 <search-query :datalist="isInvoiceData" :selectValue="form.isInvoice"
                                                     :clearable="true" :disabled="editSave || tableData.length"
@@ -270,28 +294,7 @@
                                                     @corpFocus="invoiceWorkDictsfun">
                                                 </search-query>
                                             </el-form-item>
-                                        </el-col>
-                                        <el-col :span="5">
-                                            <el-form-item label="收 / 付" prop="dc">
-                                                <search-query :datalist="dcData" :selectValue="form.dc"
-                                                    :clearable="true" :disabled="editSave || tableData.length"
-                                                    :buttonIf="false" placeholder="请选择收/付"
-                                                    @corpChange="corpChange($event, 'dc')">
-                                                </search-query>
-                                            </el-form-item>
-                                        </el-col>
-                                        <el-col :span="5">
-                                            <el-form-item label="币别" prop="curCode">
-                                                <search-query :datalist="curCodeData" :selectValue="form.curCode"
-                                                    :clearable="true" :disabled="editSave || tableData.length"
-                                                    :buttonIf="false" :filterable="true" :remote="true"
-                                                    placeholder="请选择币别"
-                                                    :forParameter="{ key: 'id', label: 'code', value: 'code' }"
-                                                    @corpChange="corpChange($event, 'curCode')"
-                                                    @remoteMethod="getRateListfun" @corpFocus="getRateListfun">
-                                                </search-query>
-                                            </el-form-item>
-                                        </el-col>
+                                        </el-col>-->
                                         <el-col :span="10">
                                             <el-form-item label="业务来源" prop="srcType">
                                                 <el-col :span="10">
@@ -312,7 +315,7 @@
                                                 </el-col>
                                             </el-form-item>
                                         </el-col>
-                                        <el-col :span="4">
+<!--                                        <el-col :span="4">
                                             <el-form-item label="签收" prop="isSignfor" label-width="50px">
                                                 <search-query :datalist="allyesnoData" :selectValue="form.isSignfor"
                                                     :clearable="true" :disabled="editSave || tableData.length"
@@ -322,7 +325,7 @@
                                                     @corpFocus="allyesnoWorkDictsfun">
                                                 </search-query>
                                             </el-form-item>
-                                        </el-col>
+                                        </el-col>-->
                                         <el-col :span="5">
                                             <el-form-item label="对账单号" prop="checkNo">
                                                 <el-input style="width: 100%;" v-model="form.billNo" size="small"
@@ -338,14 +341,14 @@
                                                 </el-date-picker>
                                             </el-form-item>
                                         </el-col>
-                                        <el-col :span="5">
+<!--                                        <el-col :span="5">
                                             <el-form-item label="限定金额" prop="limitedAmount">
                                                 <el-input style="width: 100%;" v-model="form.limitedAmount" size="small"
                                                     autocomplete="off" :disabled="editSave || tableData.length"
                                                     clearable placeholder="请输入限定金额">
                                                 </el-input>
                                             </el-form-item>
-                                        </el-col>
+                                        </el-col>-->
                                         <el-col :span="5">
                                             <el-form-item label="备注" prop="remarks">
                                                 <el-input style="width: 100%;" v-model="form.remarks" size="small"
@@ -354,7 +357,7 @@
                                                 </el-input>
                                             </el-form-item>
                                         </el-col>
-                                        <el-col :span="4">
+<!--                                        <el-col :span="4">
                                             <el-form-item label="销账" prop="isCleared" label-width="50px">
                                                 <search-query :datalist="isClearedData" :selectValue="form.isCleared"
                                                     :clearable="true" :disabled="editSave || tableData.length"
@@ -364,7 +367,7 @@
                                                     @corpFocus="allyesnoWorkDictsfun">
                                                 </search-query>
                                             </el-form-item>
-                                        </el-col>
+                                        </el-col>-->
                                     </el-row>
                                 </expand>
 
@@ -411,11 +414,11 @@
                                     <span class="weightnum">{{ form.amountCrUsd || 0 }}元</span>
                                 </div>
                             </el-col>
-                            <el-col :span="8">
+<!--                            <el-col :span="8">
                                 <div style="text-align: right">
-                                    <!--<el-button  size="small" type="primary" style="margin-right: 8px"-->
-                                    <!--            :loading="saveLoading" >计算合计值-->
-                                    <!--</el-button>-->
+                                    &lt;!&ndash;<el-button  size="small" type="primary" style="margin-right: 8px"&ndash;&gt;
+                                    &lt;!&ndash;            :loading="saveLoading" >计算合计值&ndash;&gt;
+                                    &lt;!&ndash;</el-button>&ndash;&gt;
                                     <el-button size="small" type="primary" style="margin-right: 8px"
                                         :disabled="!form.id || editSave" :loading="saveLoading"
                                         @click="ConfirmReceiptfun">批量签收
@@ -425,7 +428,7 @@
                                         @click="RevokeReceiptfun">撤销签收
                                     </el-button>
                                 </div>
-                            </el-col>
+                            </el-col>-->
                         </el-row>
                     </el-card>