修改禅道1963和禅道1960

public/MP_verify_5G6N9CHR64aAsQlM.txt

@@ -0,0 +1 @@
+5G6N9CHR64aAsQlM

src/api/tradeAgency/tradeAgency.js

@@ -199,4 +199,21 @@ export const feecenterTemplateImport = (row) => {
       method: 'post',
       data: row
     })
+  }
+
+  // 已付尾款
+export const paidAlready = (row) => {
+    return request({
+      url: '/api/blade-los/agent/paidAlready',
+      method: 'post',
+      data: row
+    })
+  }
+  // 撤销已付尾款
+export const revokePaidAlready = (row) => {
+    return request({
+      url: '/api/blade-los/agent/revokePaidAlready',
+      method: 'post',
+      data: row
+    })
   }

src/components/tradeAgency/fee-info.vue

@@ -467,6 +467,26 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "优惠手续费",
+                        prop: "discountedHandlingFees",
+                        overHidden: true,
+                    },
+                    {
+                        label: "税票号",
+                        prop: "taxInvoiceNumber",
+                        overHidden: true,
+                    },
+                    {
+                        label: "税票日期",
+                        prop: "taxInvoiceDate",
+                        overHidden: true,
+                    },
+                    {
+                        label: "扣款时间",
+                        prop: "deductionTime",
+                        overHidden: true,
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         cell: true,
@@ -661,11 +681,31 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "优惠手续费",
+                        prop: "discountedHandlingFees",
+                        overHidden: true,
+                    },
+                    {
                         label: "利润",
                         prop: "profit",
                         overHidden: true,
                     },
                     {
+                        label: "税票号",
+                        prop: "taxInvoiceNumber",
+                        overHidden: true,
+                    },
+                    {
+                        label: "税票日期",
+                        prop: "taxInvoiceDate",
+                        overHidden: true,
+                    },
+                    {
+                        label: "扣款时间",
+                        prop: "deductionTime",
+                        overHidden: true,
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         cell: true,

src/components/tradeAgency/fee-infosimple.vue

@@ -20,8 +20,8 @@
             </template>
             <template slot="corpCnName" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
-                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="feeCnName" slot-scope="{ row }">
@@ -37,8 +37,8 @@
                 <span v-else>{{ row.unitNo }}</span>
             </template>
             <tempalte slot="quantity" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
-                    placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)"
+                    :controls="false" placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
             <tempalte slot="price" slot-scope="{ row }">
@@ -48,8 +48,8 @@
             </tempalte>
             <template slot="curCode" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
-                    :url="'/blade-los/bcurrency/getExrate?date=' + form.businessDate + '&dc=' + row.dc" :filterable="true"
-                    @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
+                    :url="'/blade-los/bcurrency/getExrate?date=' + form.businessDate + '&dc=' + row.dc"
+                    :filterable="true" @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
                 <span v-else>{{ row.curCode }}</span>
             </template>
             <tempalte slot="exrate" slot-scope="{ row }">
@@ -63,8 +63,8 @@
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
             <template slot-scope="{type,size,row,index}" slot="menu">
-                <el-button v-if="row.feeCnName == '预付款'" size="small" type="text" :disabled="disabled"
-                    @click="tip(row, index)">{{ row.$cellEdit
+                <el-button v-if="row.feeCnName == '预付款' || row.feeCnName == '手续费'" size="small" type="text"
+                    :disabled="disabled" @click="tip(row, index)">{{ row.$cellEdit
                         ?
                         '保 存' : '编 辑' }}</el-button>
                 <el-button v-if="row.feeCnName == '预付款'" size="small" type="text" :disabled="disabled"
@@ -92,10 +92,11 @@
                     @click="allClick('确认首款', 'C')">确认首款</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('确认尾款', 'C')">确认尾款</el-button> -->
-                    <span style="color: #67C23A;">金额合计:{{ sumCamount }}</span>
+                <span style="color: #67C23A;">金额合计:{{ sumCamount }}</span>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled|| form.firstStatus == '审核通过'" circle @click="addRow('C')">
+                <el-button type="primary" size="mini" icon="el-icon-plus"
+                    :disabled="disabled || form.firstStatus == '审核通过'" circle @click="addRow('C')">
                 </el-button>
             </template>
             <template slot="index" slot-scope="{row,index}">
@@ -103,8 +104,8 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit && !row.feeType" v-model="row.corpCnName" placeholder="往来单位" key="id"
-                    label="cnName" res="records" url="/blade-los/bcorps/listByType" :filterable="true"
-                    :remote="true" dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    label="cnName" res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
+                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="cntrNoForm" slot-scope="{ row }">
@@ -146,9 +147,8 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrateForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate"
-                    @change="countChange(row, 'C')" :controls="false" placeholder="请输入 结算汇率" size="small"
-                    style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" @change="countChange(row, 'C')"
+                    :controls="false" placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
             <tempalte slot="discountExrate" slot-scope="{ row }">
@@ -156,6 +156,11 @@
                     :controls="false" placeholder="请输入 优惠汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.discountExrate }}</span>
             </tempalte>
+            <tempalte slot="discountedHandlingFees" slot-scope="{ row }">
+                <el-input-number v-if="row.$cellEdit&&row.feeCnName == '手续费'" v-model="row.discountedHandlingFees"
+                    :controls="false" placeholder="请输入 优惠手续费" size="small" style="width: 100%;"></el-input-number>
+                <span v-else>{{ row.discountedHandlingFees }}</span>
+            </tempalte>
         </avue-crud>
     </div>
 </template>
@@ -301,6 +306,11 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "优惠手续费",
+                        prop: "discountedHandlingFees",
+                        overHidden: true,
+                    },
+                    {
                         label: "结算日期",
                         // prop: "stlDate",
                         width: "120",
@@ -522,6 +532,11 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "优惠手续费",
+                        prop: "discountedHandlingFees",
+                        overHidden: true,
+                    },
+                    {
                         label: "利润",
                         prop: "profit",
                         overHidden: true,
@@ -547,15 +562,28 @@ export default {
     },
     methods: {
         tip(row, index) {
-            if (row.$cellEdit) {
-                submitTradeYfk(row).then(res => {
-                    row = res.data.data
-                    this.$message.success("保存成功");
+            if (row.feeCnName == '手续费') {
+                this.$prompt('请输入优惠手续费', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    inputValue:row.amount,
+                    inputType:'number',
+                    closeOnClickModal:false
+                }).then(({ value }) => {
+                    row.discountedHandlingFees=value
                 })
-                this.$set(row, '$cellEdit', false)
             } else {
-                this.$set(row, '$cellEdit', true)
+                if (row.$cellEdit) {
+                    submitTradeYfk(row).then(res => {
+                        row = res.data.data
+                        this.$message.success("保存成功");
+                    })
+                    this.$set(row, '$cellEdit', false)
+                } else {
+                    this.$set(row, '$cellEdit', true)
+                }
             }
+
         },
         rowDel(row, index) {
             this.$confirm("确定将选择数据删除?", {
@@ -623,19 +651,19 @@ export default {
             }
         },
         selectionDChange(list) {
-            let sum=0
+            let sum = 0
             list.forEach(e => {
-                sum=sum+Number(e.amount)
+                sum = sum + Number(e.amount)
             })
-            this.sumDamount=sum.toFixed(2)
+            this.sumDamount = sum.toFixed(2)
             this.selectionDList = list
         },
         selectionCChange(list) {
-            let sum=0
+            let sum = 0
             list.forEach(e => {
-                sum=sum+Number(e.amount)
+                sum = sum + Number(e.amount)
             })
-            this.sumCamount=sum.toFixed(2)
+            this.sumCamount = sum.toFixed(2)
             this.selectionCList = list
         },
         rowDicChange(name, row, el) {

src/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue

@@ -381,7 +381,7 @@
             }
             if (!row.isImage && row.isImage != 0) {
                 this.$message({
-                    message: '请选择文件类型',
+                    message: '请选择是否是图片',
                     type: 'warning'
                 });
                 return;

src/views/iosBasicData/AirtransportExport/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -98,7 +98,7 @@
                 <el-col :span="12">
                     <el-form-item label="联系人:" prop="corpCnName" >
                         <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts"
-                                  size="small" autocomplete="off" clearable placeholder="工厂联系人" >
+                                  size="small" autocomplete="off" clearable placeholder="联系人" >
                         </el-input>
                     </el-form-item>
                 </el-col>

src/views/iosBasicData/AirtransportImport/bills/assembly/filescenter.vue

@@ -381,7 +381,7 @@
             }
             if (!row.isImage && row.isImage != 0) {
                 this.$message({
-                    message: '请选择文件类型',
+                    message: '请选择是否是图片',
                     type: 'warning'
                 });
                 return;

src/views/iosBasicData/AirtransportImport/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -98,7 +98,7 @@
                 <el-col :span="12">
                     <el-form-item label="联系人:" prop="corpCnName" >
                         <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts"
-                                  size="small" autocomplete="off" clearable placeholder="工厂联系人" >
+                                  size="small" autocomplete="off" clearable placeholder="联系人" >
                         </el-input>
                     </el-form-item>
                 </el-col>

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -13,10 +13,11 @@
                 <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="primary" style="margin-right: 8px" :disabled="!form.id || form.isCleared != 1"
-                    v-if="!form.voucherNo&&voucher==1" :loading="saveLoading" @click="generateVoucherfun">生成凭证
+                <el-button size="small" type="primary" style="margin-right: 8px"
+                    :disabled="!form.id || form.isCleared != 1" v-if="!form.voucherNo && voucher == 1"
+                    :loading="saveLoading" @click="generateVoucherfun">生成凭证
                 </el-button>
-                <span v-if="form.voucherNo&&voucher==1" style="font-size: 12px;margin-right: 8px;">已生成凭证</span>
+                <span v-if="form.voucherNo && voucher == 1" style="font-size: 12px;margin-right: 8px;">已生成凭证</span>
                 <el-button size="small" type="warning" plain style="margin-right: 8px" :disabled="!form.id || editPower"
                     v-if="form.isCleared == 1" :loading="saveLoading" @click="finstlbillsRevokeSettlementfun">撤销结算
                 </el-button>
@@ -61,16 +62,16 @@
                             </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 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="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"></dic-select>
+                                        url="/blade-los/bfees/listAll" :filterable="true" :multiple="true"
+                                        :collapseTags="true" :disabled="editSave"></dic-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="4">
@@ -109,8 +110,8 @@
                             <el-col :span="3">
                                 <el-form-item label="币别" prop="curCode">
                                     <search-query :datalist="curCodeData" :selectValue="form.curCode" :clearable="true"
-                                        :disabled="editSave || tableData.length > 0" :buttonIf="false" :filterable="true"
-                                        :remote="true" placeholder="请选择币别"
+                                        :disabled="editSave || tableData.length > 0" :buttonIf="false"
+                                        :filterable="true" :remote="true" placeholder="请选择币别"
                                         :forParameter="{ key: 'id', label: 'code', value: 'code' }"
                                         @corpChange="corpChange($event, 'curCode')" @remoteMethod="getRateListfun"
                                         @corpFocus="getRateListfun">
@@ -119,22 +120,24 @@
                             </el-col>
                             <el-col :span="5">
                                 <el-form-item label="业务编号" prop="businessNo">
-                                    <el-input style="width: 100%;" v-model="form.businessNo" size="small" autocomplete="off"
-                                        :disabled="editSave || tableData.length > 0" clearable placeholder="请输入业务编号">
+                                    <el-input style="width: 100%;" v-model="form.businessNo" size="small"
+                                        autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
+                                        placeholder="请输入业务编号">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="5">
                                 <el-form-item label="来源单号" prop="requestNo">
-                                    <el-input style="width: 100%;" v-model="form.requestNo" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="请输入来源单号">
+                                    <el-input style="width: 100%;" v-model="form.requestNo" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="请输入来源单号">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="5">
                                 <el-form-item label="ACCT NO" prop="accountNo">
-                                    <el-input style="width: 100%;" v-model="form.accountNo" size="small" autocomplete="off"
-                                        :disabled="editSave || tableData.length > 0" clearable placeholder="请输入ACCT NO">
+                                    <el-input style="width: 100%;" v-model="form.accountNo" size="small"
+                                        autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
+                                        placeholder="请输入ACCT NO">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
@@ -154,8 +157,9 @@
                             </el-col>
                             <el-col :span="4">
                                 <el-form-item label="对账单号" prop="checkNo">
-                                    <el-input style="width: 100%;" v-model="form.checkNo" size="small" autocomplete="off"
-                                        :disabled="editSave || tableData.length > 0" clearable placeholder="请输入对账单号">
+                                    <el-input style="width: 100%;" v-model="form.checkNo" size="small"
+                                        autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
+                                        placeholder="请输入对账单号">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
@@ -277,7 +281,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -293,8 +298,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -330,11 +335,11 @@ import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import { getList as getreportsList, reportsGetReportData } from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import { generateFinStlBills } from "@/api/iosBasicData/fininvoices";
-import { dateFormat} from "@/util/date";
+import { dateFormat } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
-import {isProcurement} from "@/api/basicData/configuration";
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
-    components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems,dicSelect },
+    components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems, dicSelect },
     props: {
         // 编辑还是保存
         editSave: {
@@ -395,7 +400,7 @@ export default {
             // 绑定的数据
             form: {
                 dc: null,
-                billDate:dateFormat(new Date())
+                billDate: dateFormat(new Date())
             },
             handleSelectionData: [], // 表格选择的数据
             corpData: [], // 结算单位 数据
@@ -435,17 +440,22 @@ export default {
             roleName: [], // 当前的角色权限
             saberUserInfo: {}, // 当前登录人信息
             editPower: false, // 当前是否可以编辑
-            voucher:0,
+            voucher: 0,
+            auditing: 0
         }
     },
     created() {
         this.roleName = localStorage.getItem('roleName').split(',')
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
-        isProcurement({"param":"automatic.generate.voucher"}).then(res=>{
-                    // res.data.data === '1'
-                    this.voucher = res.data.data
-                })
+        isProcurement({ "param": "automatic.generate.voucher" }).then(res => {
+            // res.data.data === '1'
+            this.voucher = res.data.data
+        })
+        isProcurement({ "param": "whether.auditing" }).then(res => {
+            // res.data.data === '1'
+            this.auditing = res.data.data
+        })
     },
     methods: {
         // 打印
@@ -649,6 +659,19 @@ export default {
                         return;
                     }
                 }
+                if (type == '结算') {
+                    if (this.auditing == 1) {
+                        for (let [index, row] of this.tableData.entries()) {
+                            if (row.feeCnName == '增值税') {
+                                if (!row.taxInvoiceNumber || !row.taxInvoiceDate || !row.deductionTime) {
+                                    this.pageLoading = false
+                                    this.saveLoading = false
+                                    return this.$message.error("请完善第" + Number(index+ 1)  + "行增值税明细信息");
+                                }
+                            }
+                        }
+                    }
+                }
                 this.saveLoading = true // 打开按钮动画
                 if (this.form.estimatedTime) {
                     this.form.estimatedTime = this.form.estimatedTime + ' 00:00:00'
@@ -658,6 +681,7 @@ export default {
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算单
                 this.form.businessTypes = Array.isArray(this.form.businessTypes) ? this.form.businessTypes.join(',') : this.form.businessTypes // 业务类型
+                console.log(this.form.feeCnName ,this.form.feeCnName.join(','))
                 this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
                 this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
                 this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
@@ -723,6 +747,7 @@ export default {
                 }
                 // 判断是结算还是保存
                 if (type == '结算') {
+
                     this.$confirm("确定进行结算操作?", {
                         confirmButtonText: "确定",
                         cancelButtonText: "取消",
@@ -748,7 +773,6 @@ export default {
                                     this.$set(item, 'amountNetUSD', item.amountNet)
                                     this.$set(item, 'stlTtlAmountNetUSD', item.stlTtlAmountNet)
                                     this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
-
                                     this.$set(item, 'currentStlAmountNetUSD', item.currentStlAmountNet)
                                     this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
                                 }
@@ -786,7 +810,7 @@ export default {
                     this.editPower = false
                 }
                 this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(',') : [] // 业务类型转换成数组显示
-                  this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
+                this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
                 this.tableData = this.form.finStlBillsItemsList.map(item => {
                     item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
                     item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
@@ -832,7 +856,7 @@ export default {
             }).then(res => {
                 this.form = res.data.data
                 this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(',') : [] // 业务类型转换成数组显示
-                  this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
+                this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
                 this.tableData = this.form.finStlBillsItemsList.map(item => {
                     item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
                     item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
@@ -1087,7 +1111,7 @@ export default {
         finstlbillsConfirmSettlementfun() {
             this.pageLoading = true
             this.form.businessTypes = Array.isArray(this.form.businessTypes) ? this.form.businessTypes.join(',') : this.form.businessTypes // 业务类型
-            this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
+            // this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
             this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
             this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
             this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + ' 00:00:00' : null

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

@@ -2414,31 +2414,13 @@ export default {
             // 判断必填项
             let sum = '请输入'
             for (let item of this.assemblyForm.feeCenterListD) {
-                if (!item.corpId) {
-                    sum += ` 应收序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应收序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应收序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应收序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             for (let item of this.assemblyForm.feeCenterListC) {
-                if (!item.corpId) {
-                    sum += ` 应付序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应付序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应付序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应付序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum +=  `应付第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             if (sum != '请输入') {

src/views/iosBasicData/OceanFreightImport/bills/assembly/filescenter.vue

@@ -319,7 +319,7 @@ export default {
       }
       if (!row.isImage && row.isImage != 0) {
         this.$message({
-          message: '请选择文件类型',
+          message: '请选择是否是图片',
           type: 'warning'
         });
         return;

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -90,7 +90,7 @@
                 <el-col :span="12">
                     <el-form-item label="联系人:" prop="corpCnName">
                         <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts" size="small"
-                            autocomplete="off" clearable placeholder="工厂联系人">
+                            autocomplete="off" clearable placeholder="联系人">
                         </el-input>
                     </el-form-item>
                 </el-col>

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

@@ -1,9 +1,9 @@
 <template>
     <div>
         <!--:row-style="{height:'20px',padding:'0px',fontSize:'12px'}"-->
-        <el-table ref="tableRef" :cell-style="cellStyle" :header-cell-style="tableHeaderCellStyle" :data="tableData" border
-            style="width: 100%" @selection-change="handleSelectionChange" @row-click="rowClick" :row-style="rowStyle"
-            :row-class-name="rowClassName" @expand-change="expandChange">
+        <el-table ref="tableRef" :cell-style="cellStyle" :header-cell-style="tableHeaderCellStyle" :data="tableData"
+            border style="width: 100%" @selection-change="handleSelectionChange" @row-click="rowClick"
+            :row-style="rowStyle" :row-class-name="rowClassName" @expand-change="expandChange">
             <el-table-column v-if="brfalse" type="selection" width="55">
             </el-table-column>
             <el-table-column type="expand" v-if="brfalse">
@@ -23,8 +23,8 @@
             </el-table-column>
             <el-table-column prop="dc" label="收/付" width="60px">
                 <template slot-scope="{ row }">
-                    <span v-if="row.dc=='D'">收</span>
-                    <span v-if="row.dc=='C'">付</span>
+                    <span v-if="row.dc == 'D'">收</span>
+                    <span v-if="row.dc == 'C'">付</span>
                 </template>
             </el-table-column>
             <el-table-column prop="billNo" label="原业务编号" width="120px">
@@ -54,8 +54,8 @@
             <el-table-column prop="currentStlAmountRMB" label="本次CNY" width="100px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB"
-                        :disabled="scope.row.curCode != 'CNY' || settlementdistar" v-if="(brfalse && !editSave)" size="mini"
-                        autocomplete="off" clearable placeholder="请输入USD" @change="armbChange(scope.row)">
+                        :disabled="scope.row.curCode != 'CNY' || settlementdistar" v-if="(brfalse && !editSave)"
+                        size="mini" autocomplete="off" clearable placeholder="请输入USD" @change="armbChange(scope.row)">
                     </el-input>
                     <span v-else>{{ scope.row.currentStlAmountRMB }}</span>
                 </template>
@@ -63,8 +63,8 @@
             <el-table-column prop="currentStlAmountUSD" label="本次USD" width="100px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD"
-                        :disabled="scope.row.curCode != 'USD' || settlementdistar" v-if="(brfalse && !editSave)" size="mini"
-                        autocomplete="off" clearable placeholder="请输入USD" @change="ausdChange(scope.row)">
+                        :disabled="scope.row.curCode != 'USD' || settlementdistar" v-if="(brfalse && !editSave)"
+                        size="mini" autocomplete="off" clearable placeholder="请输入USD" @change="ausdChange(scope.row)">
                     </el-input>
                     <span v-else>{{ scope.row.currentStlAmountUSD }}</span>
                 </template>
@@ -111,6 +111,30 @@
             </el-table-column>
             <el-table-column prop="stlTtlAmountUSD" label="已结算USD" width="100px">
             </el-table-column>
+            <el-table-column prop="taxInvoiceNumber" label="税票号" width="140px">
+                <template slot-scope="scope">
+                    <el-input style="width: 100%;" v-model="scope.row.taxInvoiceNumber"
+                        v-if="scope.row.feeCnName == '增值税'" size="mini" autocomplete="off" clearable placeholder="请输入税票号">
+                    </el-input>
+                    <span v-else>{{ scope.row.taxInvoiceNumber }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="taxInvoiceDate" label="税票日期" width="140px">
+                <template slot-scope="scope">
+                    <el-date-picker style="width: 100%;" v-model="scope.row.taxInvoiceDate" v-if="scope.row.feeCnName == '增值税'"
+                    size="mini" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                    <span v-else>{{ scope.row.taxInvoiceDate }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="deductionTime" label="扣款时间" width="140px">
+                <template slot-scope="scope">
+                    <el-date-picker style="width: 100%;" v-model="scope.row.deductionTime" v-if="scope.row.feeCnName == '增值税'"
+                    size="mini" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                    <span v-else>{{ scope.row.deductionTime }}</span>
+                </template>
+            </el-table-column>
             <!-- stlTtlAmount 乘 taxRate + surchargeRate-->
             <el-table-column prop="eta" label="ETA">
                 <template slot-scope="{ row }">

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -454,10 +454,7 @@ export default {
                 ],
                 estimatedTime: [
                     { required: true, message: '请输入预计收回', trigger: 'blur' },
-                ],
-                collectionSituation: [
-                    { required: true, message: '请输入收款情况', trigger: 'blur' },
-                ],
+                ]
             },
             roleName: [], // 当前的角色权限
             saberUserInfo: {}, // 当前登录人信息

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

@@ -2454,32 +2454,42 @@ export default {
             }
             // 判断必填项
             let sum = '请输入'
+            // for (let item of this.assemblyForm.feeCenterListD) {
+            //     if (!item.corpId) {
+            //         sum += ` 应收序号${item.$index + 1}往来单位`
+            //     }
+            //     if (!item.feeId) {
+            //         sum += ` 应收序号${item.$index + 1}费用简称`
+            //     }
+            //     if (!item.elementsId) {
+            //         sum += ` 应收序号${item.$index + 1}核算要素`
+            //     }
+            //     if (!item.curCode) {
+            //         sum += ` 应收序号${item.$index + 1}币种`
+            //     }
+            // }
+            // for (let item of this.assemblyForm.feeCenterListC) {
+            //     if (!item.corpId) {
+            //         sum += ` 应付序号${item.$index + 1}往来单位`
+            //     }
+            //     if (!item.feeId) {
+            //         sum += ` 应付序号${item.$index + 1}费用简称`
+            //     }
+            //     if (!item.elementsId) {
+            //         sum += ` 应付序号${item.$index + 1}核算要素`
+            //     }
+            //     if (!item.curCode) {
+            //         sum += ` 应付序号${item.$index + 1}币种`
+            //     }
+            // }
             for (let item of this.assemblyForm.feeCenterListD) {
-                if (!item.corpId) {
-                    sum += ` 应收序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应收序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应收序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应收序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             for (let item of this.assemblyForm.feeCenterListC) {
-                if (!item.corpId) {
-                    sum += ` 应付序号${item.$index + 1}往来单位`
-                }
-                if (!item.feeId) {
-                    sum += ` 应付序号${item.$index + 1}费用简称`
-                }
-                if (!item.elementsId) {
-                    sum += ` 应付序号${item.$index + 1}核算要素`
-                }
-                if (!item.curCode) {
-                    sum += ` 应付序号${item.$index + 1}币种`
+                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
+                    sum +=  `应付第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             if (sum != '请输入') {

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

@@ -387,7 +387,7 @@
             }
             if (!row.isImage && row.isImage != 0) {
                 this.$message({
-                    message: '请选择文件类型',
+                    message: '请选择是否是图片',
                     type: 'warning'
                 });
                 return;

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/DispatchNotice.vue

@@ -90,7 +90,7 @@
                 <el-col :span="12">
                     <el-form-item label="联系人:" prop="corpCnName">
                         <el-input type="age" style="width: 100%;" v-model="documentForm.factoryContacts" size="small"
-                            autocomplete="off" clearable placeholder="工厂联系人">
+                            autocomplete="off" clearable placeholder="联系人">
                         </el-input>
                     </el-form-item>
                 </el-col>

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

@@ -1628,15 +1628,6 @@ export default {
                         if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
                             msgs.push(`应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
                         }
-                        // if (!item.feeId) {
-                        //     msgs.push(`应收第${item.$index + 1}行费用简称`)
-                        // }
-                        // if (!item.elementsId) {
-                        //     msgs.push(`应收第${item.$index + 1}行核算要素`)
-                        // }
-                        // if (!item.curCode) {
-                        //     msgs.push(`应收第${item.$index + 1}行币种`)
-                        // }
                     }
                     for (let item of this.form.feeCenterListC) {
                         if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {

src/views/tirePartsMall/basicData/supplier/detailsPage.vue

@@ -146,11 +146,6 @@ export default {
           },
           dicUrl: "/api/blade-user/salerList",
           filterable: true,
-          rules: [{
-            required: true,
-            message: " ",
-            trigger: "blur"
-          }]
         }, {
           label: '备注',
           prop: "remarks",

src/views/tirePartsMall/configuration/commodity.json

@@ -13,7 +13,7 @@
   "delBtn": false,
   "menuWidth": 80,
   "searchSpan": 8,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
   "searchMenuPosition": "right",
   "border": true,
   "index": true,
@@ -78,15 +78,6 @@
       "overHidden": true
     },
     {
-      "label": "商品编码",
-      "prop": "code",
-      "search": true,
-      "hide": true,
-      "addDisabled": false,
-      "overHidden": true,
-      "width": "120"
-    },
-    {
       "label": "商品分类",
       "prop": "goodsTypeName",
       "slot": true,

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -10,8 +10,8 @@
                 <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
                     @click="$refs.print.openDialog()">预 览
                 </el-button>
-                <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px" :disabled="!form.id"
-                    @click="$refs.report.openDialog()">报表设计
+                <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px"
+                    :disabled="!form.id" @click="$refs.report.openDialog()">报表设计
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editButton"
@@ -21,6 +21,11 @@
                 <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
                     :disabled="isSaveBtn" @click="submit">保 存
                 </el-button>
+                <el-button
+                    v-if='(form.whetherPaidAlready == 0 || form.whetherPaidAlready == null) && form.goodsValue == form.prepaidAmount'
+                    type="success" size="small" plain @click="inPay">已付尾款</el-button>
+                <el-button v-if='form.whetherPaidAlready == 1' type="warning" size="small" plain
+                    @click="revokePay">撤销尾款</el-button>
                 <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success"
                     size="small" :disabled="form.businessStatus != '录入'" @click="application">单据请核
                 </el-button>
@@ -461,7 +466,7 @@
 </template>
 
 <script>
-import { submit, getDetail, removeItem, checkAgent, revokeCheckAgent, copyAgent, generateDownPaymentBill, generateBalancePaymentBill, generatePayment, revokeApplyForPayment, confirmationNotification, generateFreightForwarder, balancePayment, applyForPaymentList } from "@/api/tradeAgency/tradeAgency";
+import { submit, getDetail, removeItem, checkAgent, revokeCheckAgent, copyAgent, generateDownPaymentBill, generateBalancePaymentBill, generatePayment, revokeApplyForPayment, confirmationNotification, generateFreightForwarder, balancePayment, applyForPaymentList, paidAlready, revokePaidAlready } from "@/api/tradeAgency/tradeAgency";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
 import feeInfo from "@/components/tradeAgency/fee-info";
 import dicSelect from "@/components/dicSelect/main";
@@ -1450,6 +1455,31 @@ export default {
                 this.dicCode = 'goods-type'
             }
         },
+        inPay() {
+            this.$confirm('是否继续操作?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                paidAlready(this.form).then(res => {
+                    this.$message.success("操作成功");
+                    this.getDetails(this.form.id)
+                })
+            })
+
+        },
+        revokePay() {
+            this.$confirm('是否继续操作?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                revokePaidAlready(this.form).then(res => {
+                    this.$message.success("操作成功");
+                    this.getDetails(this.form.id)
+                })
+            })
+        },
         dicChange(name, row) {
             if (name == 'corpName') {
                 if (row) {
@@ -1873,7 +1903,7 @@ export default {
                 })
             })
         },
-        wkChange2(){
+        wkChange2() {
             bcurrencyGetExrate({ date: this.wkForm.contractDate, dc: 'D' }).then(res => {
                 res.data.data.forEach(e => {
                     if (this.form.currency == e.code) {